Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package ghc-zip for openSUSE:Factory checked in at 2021-02-16 22:39:14 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ghc-zip (Old) and /work/SRC/openSUSE:Factory/.ghc-zip.new.28504 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ghc-zip" Tue Feb 16 22:39:14 2021 rev:3 rq:870885 version:1.7.0 Changes: -------- --- /work/SRC/openSUSE:Factory/ghc-zip/ghc-zip.changes 2021-01-20 18:25:58.951435482 +0100 +++ /work/SRC/openSUSE:Factory/.ghc-zip.new.28504/ghc-zip.changes 2021-02-16 22:48:48.766573921 +0100 @@ -1,0 +2,10 @@ +Tue Jan 19 12:44:54 UTC 2021 - [email protected] + +- Update zip to version 1.7.0. + ## Zip 1.7.0 + + * Set user permissions on linux platform as follows: if an existing file is + added, use its permissions; if an entry is generated from a bytestring or + a stream, use 0600. This behavior mimics the zip utility. + +------------------------------------------------------------------- Old: ---- zip-1.6.0.tar.gz zip.cabal New: ---- zip-1.7.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ghc-zip.spec ++++++ --- /var/tmp/diff_new_pack.92cRD9/_old 2021-02-16 22:48:49.670574627 +0100 +++ /var/tmp/diff_new_pack.92cRD9/_new 2021-02-16 22:48:49.674574629 +0100 @@ -19,13 +19,12 @@ %global pkg_name zip %bcond_with tests Name: ghc-%{pkg_name} -Version: 1.6.0 +Version: 1.7.0 Release: 0 Summary: Operations on zip archives License: BSD-3-Clause 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: chrpath BuildRequires: ghc-Cabal-devel BuildRequires: ghc-bytestring-devel @@ -49,6 +48,7 @@ BuildRequires: ghc-time-devel BuildRequires: ghc-transformers-base-devel BuildRequires: ghc-transformers-devel +BuildRequires: ghc-unix-devel ExcludeArch: %{ix86} %if %{with tests} BuildRequires: ghc-QuickCheck-devel @@ -71,7 +71,6 @@ %prep %autosetup -n %{pkg_name}-%{version} -cp -p %{SOURCE1} %{pkg_name}.cabal %build %ghc_lib_build ++++++ zip-1.6.0.tar.gz -> zip-1.7.0.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zip-1.6.0/CHANGELOG.md new/zip-1.7.0/CHANGELOG.md --- old/zip-1.6.0/CHANGELOG.md 2001-09-09 03:46:40.000000000 +0200 +++ new/zip-1.7.0/CHANGELOG.md 2001-09-09 03:46:40.000000000 +0200 @@ -1,3 +1,9 @@ +## Zip 1.7.0 + +* Set user permissions on linux platform as follows: if an existing file is + added, use its permissions; if an entry is generated from a bytestring or + a stream, use 0600. This behavior mimics the zip utility. + ## Zip 1.6.0 * Added support for Zstandard (zstd) compression diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zip-1.6.0/Codec/Archive/Zip/Internal.hs new/zip-1.7.0/Codec/Archive/Zip/Internal.hs --- old/zip-1.6.0/Codec/Archive/Zip/Internal.hs 2001-09-09 03:46:40.000000000 +0200 +++ new/zip-1.7.0/Codec/Archive/Zip/Internal.hs 2001-09-09 03:46:40.000000000 +0200 @@ -65,6 +65,10 @@ import System.IO import System.IO.Error (isDoesNotExistError) +#ifndef mingw32_HOST_OS +import qualified Codec.Archive.Zip.Unix as Unix +#endif + #ifdef ENABLE_BZIP2 import qualified Data.Conduit.BZlib as BZ #endif @@ -495,8 +499,8 @@ GenericOrigin -> currentTime Borrowed ed -> edModTime ed extFileAttr = case o of - GenericOrigin -> M.findWithDefault 0 s eaExtFileAttr - Borrowed _ -> M.findWithDefault 0 s eaExtFileAttr + GenericOrigin -> M.findWithDefault defaultFileMode s eaExtFileAttr + Borrowed _ -> M.findWithDefault defaultFileMode s eaExtFileAttr oldExtraFields = case o of GenericOrigin -> M.empty Borrowed ed -> edExtraField ed @@ -1198,3 +1202,14 @@ ffff = 0xffff ffffffff = 0xffffffff #endif + +-- | Default permissions for the files, permissions not set on windows, +-- and are set to rw on unix. It mimics behavior of zip utility +defaultFileMode :: Word32 + +#ifdef mingw32_HOST_OS +defaultFileMode = 0 + +#else +defaultFileMode = Unix.fromFileMode 0o600 +#endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zip-1.6.0/Codec/Archive/Zip.hs new/zip-1.7.0/Codec/Archive/Zip.hs --- old/zip-1.6.0/Codec/Archive/Zip.hs 2001-09-09 03:46:40.000000000 +0200 +++ new/zip-1.7.0/Codec/Archive/Zip.hs 2001-09-09 03:46:40.000000000 +0200 @@ -1,3 +1,4 @@ +{-# LANGUAGE CPP #-} {-# LANGUAGE GeneralizedNewtypeDeriving #-} {-# LANGUAGE LambdaCase #-} {-# LANGUAGE MultiParamTypeClasses #-} @@ -175,6 +176,11 @@ import qualified System.FilePath as FP import System.IO.Error (isDoesNotExistError) +#ifndef mingw32_HOST_OS +import qualified Codec.Archive.Zip.Unix as Unix +import qualified System.Posix as Unix +#endif + ---------------------------------------------------------------------------- -- Archive monad @@ -455,6 +461,11 @@ addPending (I.SinkEntry t src s) addPending (I.SetModTime modTime s) +#ifndef mingw32_HOST_OS + status <- liftIO $ Unix.getFileStatus path + setExternalFileAttrs (Unix.fromFileMode (Unix.fileMode status)) s +#endif + -- | Copy an entry ???as is??? from another zip archive. If the entry does not -- exist in that archive, 'EntryDoesNotExist' will be eventually thrown. copyEntry :: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zip-1.6.0/README.md new/zip-1.7.0/README.md --- old/zip-1.6.0/README.md 2001-09-09 03:46:40.000000000 +0200 +++ new/zip-1.7.0/README.md 2001-09-09 03:46:40.000000000 +0200 @@ -96,9 +96,9 @@ `zip` supports the following compression methods: * Store (no compression, just store files ???as is???) -* [DEFLATE](deflate) -* [Bzip2](bzip2) -* [Zstandard](zstd) +* [DEFLATE] +* [Bzip2] +* [Zstandard] The best way to add a new compression method to the library is to write a conduit that will do the compression and publish it as a library. `zip` can @@ -283,6 +283,6 @@ [libzip]: https://en.wikipedia.org/wiki/Libzip [specification]: https://pkware.cachefly.net/webdocs/APPNOTE/APPNOTE-6.3.3.TXT -[deflate]: https://en.wikipedia.org/wiki/DEFLATE -[bzip2]: https://en.wikipedia.org/wiki/Bzip2 -[zstd]: https://en.wikipedia.org/wiki/Zstandard +[DEFLATE]: https://en.wikipedia.org/wiki/DEFLATE +[Bzip2]: https://en.wikipedia.org/wiki/Bzip2 +[Zstandard]: https://en.wikipedia.org/wiki/Zstandard diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zip-1.6.0/tests/Main.hs new/zip-1.7.0/tests/Main.hs --- old/zip-1.6.0/tests/Main.hs 2001-09-09 03:46:40.000000000 +0200 +++ new/zip-1.7.0/tests/Main.hs 2001-09-09 03:46:40.000000000 +0200 @@ -116,11 +116,12 @@ instance Arbitrary RelPath where arbitrary = do p <- - intercalate "/" - <$> listOf1 - ( (++) <$> vectorOf 3 charGen - <*> listOf1 charGen - ) + resize 10 $ + intercalate "/" + <$> listOf1 + ( (++) <$> vectorOf 3 charGen + <*> listOf1 charGen + ) case mkEntrySelector p of Nothing -> arbitrary Just _ -> return (RelPath p) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zip-1.6.0/zip.cabal new/zip-1.7.0/zip.cabal --- old/zip-1.6.0/zip.cabal 2001-09-09 03:46:40.000000000 +0200 +++ new/zip-1.7.0/zip.cabal 2001-09-09 03:46:40.000000000 +0200 @@ -1,11 +1,11 @@ cabal-version: 1.18 name: zip -version: 1.6.0 +version: 1.7.0 license: BSD3 license-file: LICENSE.md maintainer: Mark Karpov <[email protected]> author: Mark Karpov <[email protected]> -tested-with: ghc ==8.6.5 ghc ==8.8.4 ghc ==8.10.1 +tested-with: ghc ==8.6.5 ghc ==8.8.4 ghc ==8.10.3 homepage: https://github.com/mrkkrp/zip bug-reports: https://github.com/mrkkrp/zip/issues synopsis: Operations on zip archives @@ -52,7 +52,7 @@ default-language: Haskell2010 build-depends: base >=4.12 && <5.0, - bytestring >=0.9 && <0.11, + bytestring >=0.9 && <0.12, case-insensitive >=1.2.0.2 && <1.3, cereal >=0.3 && <0.6, conduit >=1.3 && <1.4, @@ -96,7 +96,8 @@ cpp-options: -DZIP_OS=0 else - cpp-options: -DZIP_OS=3 + cpp-options: -DZIP_OS=3 + build-depends: unix <2.8 executable haskell-zip-app main-is: Main.hs @@ -123,7 +124,7 @@ build-depends: base >=4.12 && <5.0, QuickCheck >=2.4 && <3.0, - bytestring >=0.9 && <0.11, + bytestring >=0.9 && <0.12, conduit >=1.3 && <1.4, containers >=0.5 && <0.7, directory >=1.2.2 && <1.4,
