From dbe2aeccd6f1240791833acf3b8a252dd01aea124c5faa6c5c320ff274bdcbe7 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 14 Feb 2019 02:01:39 +0000 Subject: [PATCH 1/2] osc copypac from project:devel:languages:haskell:ghc-8.6.x package:ghc-zip-archive revision:6, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-zip-archive?expand=0&rev=52 --- ghc-zip-archive.spec | 2 + zip-archive.cabal | 107 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 109 insertions(+) create mode 100644 zip-archive.cabal diff --git a/ghc-zip-archive.spec b/ghc-zip-archive.spec index 84f0950..47af1b8 100644 --- a/ghc-zip-archive.spec +++ b/ghc-zip-archive.spec @@ -26,6 +26,7 @@ License: BSD-3-Clause Group: Development/Libraries/Haskell URL: https://hackage.haskell.org/package/%{pkg_name} Source0: https://hackage.haskell.org/package/%{pkg_name}-%{version}/%{pkg_name}-%{version}.tar.gz +Source1: https://hackage.haskell.org/package/%{pkg_name}-%{version}/revision/1.cabal#/%{pkg_name}.cabal BuildRequires: ghc-Cabal-devel BuildRequires: ghc-array-devel BuildRequires: ghc-binary-devel @@ -82,6 +83,7 @@ This package provides the Haskell %{pkg_name} library development files. %prep %setup -q -n %{pkg_name}-%{version} +cp -p %{SOURCE1} %{pkg_name}.cabal %build %ghc_lib_build diff --git a/zip-archive.cabal b/zip-archive.cabal new file mode 100644 index 0000000..ffa9ca1 --- /dev/null +++ b/zip-archive.cabal @@ -0,0 +1,107 @@ +Name: zip-archive +Version: 0.4 +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 . + . + 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 + , 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 == 7.8.2, GHC == 7.10.3, GHC == 8.0.2, + GHC == 8.2.2, GHC == 8.4.3, GHC == 8.6.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_password.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.5 && < 5, + pretty, + containers, + binary >= 0.6, + zlib, + filepath, + bytestring >= 0.10.0, + array, + mtl, + text >= 0.11, + digest >= 0.0.0.1, + directory >= 1.2.2, + 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.2 && < 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.2 && < 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 + build-tools: unzip From a71f718c19a52d360ece0c17a556cf4a945e8fe1ed9f68d01b2aab72bfcd9c10 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 26 Apr 2019 21:25:48 +0000 Subject: [PATCH 2/2] osc copypac from project:devel:languages:haskell:ghc-8.6.x package:ghc-zip-archive revision:8, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-zip-archive?expand=0&rev=53 --- ghc-zip-archive.changes | 14 +++ ghc-zip-archive.spec | 4 +- zip-archive-0.4.1.tar.gz | 3 + zip-archive-0.4.tar.gz | 3 - zip-archive.cabal | 214 +++++++++++++++++++-------------------- 5 files changed, 126 insertions(+), 112 deletions(-) create mode 100644 zip-archive-0.4.1.tar.gz delete mode 100644 zip-archive-0.4.tar.gz diff --git a/ghc-zip-archive.changes b/ghc-zip-archive.changes index 60d7c2e..0db70f8 100644 --- a/ghc-zip-archive.changes +++ b/ghc-zip-archive.changes @@ -1,3 +1,17 @@ +------------------------------------------------------------------- +Wed Apr 24 02:02:17 UTC 2019 - psimons@suse.com + +- Update zip-archive to version 0.4.1. + zip-archive 0.4.1 + + * writEntry behavior change: Improve raising of UnsafePath error (#55). + Previously we raised this error spuriously when archives were unpacked + outside the working directory. Now we raise it if eRelativePath contains + ".." as a path component, or eRelativePath path is an absolute path and + there is no separate destination directory. (Note that `/foo/bar` is fine + as a path as long as a destination directory, e.g. `/usr/local`, is + specified.) + ------------------------------------------------------------------- Tue Dec 4 03:02:25 UTC 2018 - psimons@suse.com diff --git a/ghc-zip-archive.spec b/ghc-zip-archive.spec index 47af1b8..047093e 100644 --- a/ghc-zip-archive.spec +++ b/ghc-zip-archive.spec @@ -1,7 +1,7 @@ # # spec file for package ghc-zip-archive # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,7 +19,7 @@ %global pkg_name zip-archive %bcond_with tests Name: ghc-%{pkg_name} -Version: 0.4 +Version: 0.4.1 Release: 0 Summary: Library for creating and modifying zip archives License: BSD-3-Clause diff --git a/zip-archive-0.4.1.tar.gz b/zip-archive-0.4.1.tar.gz new file mode 100644 index 0000000..a96b235 --- /dev/null +++ b/zip-archive-0.4.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c5d5c9976241dcc25b0d8753dc526bb1bfef60f30dee38c53a7ae56e6be9b1b1 +size 20967 diff --git a/zip-archive-0.4.tar.gz b/zip-archive-0.4.tar.gz deleted file mode 100644 index a6dca78..0000000 --- a/zip-archive-0.4.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5fbea91d95ae1b1ec73aed8a8c67c8bae89bc3b6f7d9da898f07209e4a4ada19 -size 20859 diff --git a/zip-archive.cabal b/zip-archive.cabal index ffa9ca1..fa28bea 100644 --- a/zip-archive.cabal +++ b/zip-archive.cabal @@ -1,107 +1,107 @@ -Name: zip-archive -Version: 0.4 -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 . - . - 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 - , 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 == 7.8.2, GHC == 7.10.3, GHC == 8.0.2, - GHC == 8.2.2, GHC == 8.4.3, GHC == 8.6.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_password.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.5 && < 5, - pretty, - containers, - binary >= 0.6, - zlib, - filepath, - bytestring >= 0.10.0, - array, - mtl, - text >= 0.11, - digest >= 0.0.0.1, - directory >= 1.2.2, - 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.2 && < 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.2 && < 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 - build-tools: unzip +Name: zip-archive +Version: 0.4.1 +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 . + . + 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 + , 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 == 7.8.2, GHC == 7.10.3, GHC == 8.0.2, + GHC == 8.2.2, GHC == 8.4.3, GHC == 8.6.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_password.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.5 && < 5, + pretty, + containers, + binary >= 0.6, + 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.2 && < 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.2 && < 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 + build-tools: unzip