fix: ghc-zip-archive - remove flagged files #18624
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,57 @@ | ||
| [components.ghc-zip-archive] | ||
|
|
||
| # Remove the password-protected test zip that fails the package-signing scan. | ||
| # The archive is extracted, the matched file dropped, and the tarball | ||
| # deterministically repacked; the resulting hash is pinned via the source-files | ||
| # entry below. | ||
| [[components.ghc-zip-archive.overlays]] | ||
| description = "Remove password-protected test fixture zip_with_password.zip" | ||
| type = "file-remove" | ||
| archive = "zip-archive-0.4.3.2.tar.gz" | ||
| file = "tests/zip_with_password.zip" | ||
|
Member
Author
There was a problem hiding this comment. Fixed. Added a loose-file |
||
| [components.ghc-zip-archive.overlays.metadata] | ||
| category = "azl-security-compliance" | ||
| upstream-status = "inapplicable" | ||
|
|
||
| # The encrypted-zip test cases consume the removed fixture. Keep the rest of the | ||
| # Cabal suite running (%bcond tests 1) and surgically drop only those cases: their | ||
| # TestList entries and their definitions. | ||
| [[components.ghc-zip-archive.overlays]] | ||
| description = "Drop encrypted-zip cases from the TestList (fixture removed)" | ||
| type = "file-search-replace" | ||
| archive = "zip-archive-0.4.3.2.tar.gz" | ||
| file = "tests/test-zip-archive.hs" | ||
| regex = '\n +, testExtractFilesFailOnEncrypted\n +, testPasswordProtectedRead\n +, testIncorrectPasswordRead' | ||
| [components.ghc-zip-archive.overlays.metadata] | ||
| category = "azl-security-compliance" | ||
| upstream-status = "inapplicable" | ||
|
|
||
| [[components.ghc-zip-archive.overlays]] | ||
| description = "Drop encrypted-zip test definitions (fixture removed)" | ||
| type = "file-search-replace" | ||
| archive = "zip-archive-0.4.3.2.tar.gz" | ||
| file = "tests/test-zip-archive.hs" | ||
| regex = '(?s)testExtractFilesFailOnEncrypted :: FilePath -> Test\n.*?Nothing \(fromEncryptedEntry "INCORRECT" f\)\n\n' | ||
| [components.ghc-zip-archive.overlays.metadata] | ||
| category = "azl-security-compliance" | ||
| upstream-status = "inapplicable" | ||
|
|
||
| # The Cabal manifest lists the removed fixture under Extra-Source-Files; drop that | ||
| # entry too so the manifest stays consistent (Source1 .cabal used by the build). | ||
| [[components.ghc-zip-archive.overlays]] | ||
| description = "Drop removed test zip from the Cabal Extra-Source-Files manifest" | ||
| type = "file-search-replace" | ||
| file = "zip-archive-0.4.3.2.cabal" | ||
| regex = '(?m)^ +tests/zip_with_password\.zip\r?\n' | ||
| [components.ghc-zip-archive.overlays.metadata] | ||
| category = "azl-security-compliance" | ||
| upstream-status = "inapplicable" | ||
|
|
||
| # Pin the post-overlay (repacked) tarball, replacing the upstream sources entry. | ||
| [[components.ghc-zip-archive.source-files]] | ||
| filename = "zip-archive-0.4.3.2.tar.gz" | ||
| hash = "e031946f95c5bad31c979405c5853a21c856cb77e2048f0cafaf867e2f4fbdb301d0f015398fce4271ea8263f9759fe1722354b00ee7c1c21a9deaed20b00445" | ||
| hash-type = "SHA512" | ||
| origin = { type = "overlay" } | ||
| replace-upstream = true | ||
| replace-reason = "Removes tests/zip_with_password.zip (password-protected test fixture) that fails the package-signing scan, and the three test cases that read it; test-only, not shipped in any binary RPM." | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1 +1 @@ | ||
| SHA512 (zip-archive-0.4.3.2.tar.gz) = e031946f95c5bad31c979405c5853a21c856cb77e2048f0cafaf867e2f4fbdb301d0f015398fce4271ea8263f9759fe1722354b00ee7c1c21a9deaed20b00445 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,106 +1,105 @@ | ||
| Name: zip-archive | ||
| Version: 0.4.3.2 | ||
| x-revision: 1 | ||
| Cabal-Version: 2.0 | ||
| Build-type: Simple | ||
| Synopsis: Library for creating and modifying zip archives. | ||
| Description: | ||
| The zip-archive library provides functions for creating, modifying, and | ||
| extracting files from zip archives. The zip archive format is | ||
| documented in <http://www.pkware.com/documents/casestudies/APPNOTE.TXT>. | ||
| . | ||
| Certain simplifying assumptions are made about the zip archives: in | ||
| particular, there is no support for strong encryption, zip files that | ||
| span multiple disks, ZIP64, OS-specific file attributes, or compression | ||
| methods other than Deflate. However, the library should be able to read | ||
| the most common zip archives, and the archives it produces should be | ||
| readable by all standard unzip programs. | ||
| . | ||
| Archives are built and extracted in memory, so manipulating large zip | ||
| files will consume a lot of memory. If you work with large zip files or | ||
| need features not supported by this library, a better choice may be | ||
| <http://hackage.haskell.org/package/zip zip>, which uses a | ||
| memory-efficient streaming approach. However, zip can only read and | ||
| write archives inside instances of MonadIO, so zip-archive is a better | ||
| choice if you want to manipulate zip archives in "pure" contexts. | ||
| . | ||
| As an example of the use of the library, a standalone zip archiver and | ||
| extracter is provided in the source distribution. | ||
| Category: Codec | ||
| Tested-with: GHC == 8.6.5, GHC == 8.8.1, GHC == 8.10.4, GHC == 9.0.1, | ||
| GHC == 8.8.3, GHC == 9.2.1 | ||
| License: BSD3 | ||
| License-file: LICENSE | ||
| Homepage: http://github.com/jgm/zip-archive | ||
| Author: John MacFarlane | ||
| Maintainer: jgm@berkeley.edu | ||
| Extra-Source-Files: changelog | ||
| README.markdown | ||
| tests/test4.zip | ||
| tests/test4/a.txt | ||
| tests/test4/b.bin | ||
| "tests/test4/c/with spaces.txt" | ||
| tests/zip_with_symlinks.zip | ||
| tests/zip_with_evil_path.zip | ||
|
|
||
| Source-repository head | ||
| type: git | ||
| location: git://github.com/jgm/zip-archive.git | ||
|
|
||
| flag executable | ||
| Description: Build the Zip executable. | ||
| Default: False | ||
|
|
||
| Library | ||
| Build-depends: base >= 4.11 && < 5, | ||
| pretty, | ||
| containers, | ||
| binary >= 0.7.2, | ||
| zlib, | ||
| filepath, | ||
| bytestring >= 0.10.0, | ||
| array, | ||
| mtl, | ||
| text >= 0.11, | ||
| digest >= 0.0.0.1, | ||
| directory >= 1.2.0, | ||
| time | ||
| Exposed-modules: Codec.Archive.Zip | ||
| Default-Language: Haskell98 | ||
| Hs-Source-Dirs: src | ||
| Ghc-Options: -Wall | ||
| if os(windows) | ||
| cpp-options: -D_WINDOWS | ||
| else | ||
| Build-depends: unix | ||
|
|
||
| Executable zip-archive | ||
| if flag(executable) | ||
| Buildable: True | ||
| else | ||
| Buildable: False | ||
| Main-is: Main.hs | ||
| Hs-Source-Dirs: . | ||
| Build-Depends: base >= 4.5 && < 5, | ||
| directory >= 1.1, | ||
| bytestring >= 0.9.0, | ||
| zip-archive | ||
| Other-Modules: Paths_zip_archive | ||
| Autogen-Modules: Paths_zip_archive | ||
| Ghc-Options: -Wall | ||
| Default-Language: Haskell98 | ||
|
|
||
| Test-Suite test-zip-archive | ||
| Type: exitcode-stdio-1.0 | ||
| Main-Is: test-zip-archive.hs | ||
| Hs-Source-Dirs: tests | ||
| Build-Depends: base >= 4.11 && < 5, | ||
| directory >= 1.3, bytestring >= 0.9.0, process, time, | ||
| HUnit, zip-archive, temporary, filepath | ||
| Default-Language: Haskell98 | ||
| Ghc-Options: -Wall | ||
| if os(windows) | ||
| cpp-options: -D_WINDOWS | ||
| else | ||
| Build-depends: unix |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Verified via
azldev comp prepare-sources(I inspected the repacked archive:zip_with_password.zipis gone, the other fixtures and the.cabalare intact) andazldev comp render --check-only(no drift). The change only removes a test-only fixture that is not shipped in any binary RPM, plus the three test cases that read it, keeping the rest of the suite under%bcond tests 1— so the library build is unaffected. A fullazldev comp buildin a GHC/Haskell mock chroot isn't runnable in my environment; the full mock build runs in CI.