Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package ghc-wai-app-static for openSUSE:Factory checked in at 2022-08-10 17:13:28 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ghc-wai-app-static (Old) and /work/SRC/openSUSE:Factory/.ghc-wai-app-static.new.1521 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ghc-wai-app-static" Wed Aug 10 17:13:28 2022 rev:5 rq:994052 version:3.1.7.4 Changes: -------- --- /work/SRC/openSUSE:Factory/ghc-wai-app-static/ghc-wai-app-static.changes 2020-12-22 11:48:56.157982375 +0100 +++ /work/SRC/openSUSE:Factory/.ghc-wai-app-static.new.1521/ghc-wai-app-static.changes 2022-08-10 17:14:39.341920305 +0200 @@ -1,0 +2,19 @@ +Sun Mar 20 09:10:29 UTC 2022 - Peter Simons <[email protected]> + +- Update wai-app-static to version 3.1.7.4. + ## 3.1.7.4 + + * Fix a bug when the cryptonite flag is disabled. [#874](https://github.com/yesodweb/wai/pull/874) + + ## 3.1.7.3 + + * Introduce a flag to avoid the cryptonite dependency. [#871](https://github.com/yesodweb/wai/pull/871) + +------------------------------------------------------------------- +Mon Feb 28 02:29:08 UTC 2022 - Peter Simons <[email protected]> + +- Update wai-app-static to version 3.1.7.3. + Upstream has not updated the file "ChangeLog.md" since the last + release. + +------------------------------------------------------------------- Old: ---- wai-app-static-3.1.7.2.tar.gz wai-app-static.cabal New: ---- wai-app-static-3.1.7.4.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ghc-wai-app-static.spec ++++++ --- /var/tmp/diff_new_pack.EGuOfE/_old 2022-08-10 17:14:40.081922236 +0200 +++ /var/tmp/diff_new_pack.EGuOfE/_new 2022-08-10 17:14:40.089922257 +0200 @@ -1,7 +1,7 @@ # # spec file for package ghc-wai-app-static # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,13 +19,12 @@ %global pkg_name wai-app-static %bcond_with tests Name: ghc-%{pkg_name} -Version: 3.1.7.2 +Version: 3.1.7.4 Release: 0 Summary: WAI application for static serving License: MIT 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-blaze-html-devel @@ -77,7 +76,6 @@ %prep %autosetup -n %{pkg_name}-%{version} -cp -p %{SOURCE1} %{pkg_name}.cabal %build %ghc_lib_build ++++++ wai-app-static-3.1.7.2.tar.gz -> wai-app-static-3.1.7.4.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wai-app-static-3.1.7.2/ChangeLog.md new/wai-app-static-3.1.7.4/ChangeLog.md --- old/wai-app-static-3.1.7.2/ChangeLog.md 2020-08-14 08:15:34.000000000 +0200 +++ new/wai-app-static-3.1.7.4/ChangeLog.md 2022-03-20 10:09:31.000000000 +0100 @@ -1,5 +1,13 @@ # wai-app-static changelog +## 3.1.7.4 + +* Fix a bug when the cryptonite flag is disabled. [#874](https://github.com/yesodweb/wai/pull/874) + +## 3.1.7.3 + +* Introduce a flag to avoid the cryptonite dependency. [#871](https://github.com/yesodweb/wai/pull/871) + ## 3.1.7.2 * optparse-applicative 0.16.0.0 support diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wai-app-static-3.1.7.2/WaiAppStatic/Storage/Embedded/Runtime.hs new/wai-app-static-3.1.7.4/WaiAppStatic/Storage/Embedded/Runtime.hs --- old/wai-app-static-3.1.7.2/WaiAppStatic/Storage/Embedded/Runtime.hs 2020-07-04 18:06:28.000000000 +0200 +++ new/wai-app-static-3.1.7.4/WaiAppStatic/Storage/Embedded/Runtime.hs 2022-02-28 03:27:03.000000000 +0100 @@ -1,3 +1,4 @@ +{-# LANGUAGE CPP #-} -- | Lookup files stored in memory instead of from the filesystem. module WaiAppStatic.Storage.Embedded.Runtime ( -- * Settings @@ -15,8 +16,13 @@ import qualified Data.Text as T import Data.Ord import qualified Data.ByteString as S +#ifdef MIN_VERSION_cryptonite import Crypto.Hash (hash, MD5, Digest) import Data.ByteArray.Encoding +#else +import Crypto.Hash.MD5 (hash) +import Data.ByteString.Base64 (encode) +#endif import WaiAppStatic.Storage.Filesystem (defaultFileServerSettings) import System.FilePath (isPathSeparator) @@ -94,4 +100,8 @@ } runHash :: ByteString -> ByteString +#ifdef MIN_VERSION_cryptonite runHash = convertToBase Base64 . (hash :: S.ByteString -> Digest MD5) +#else +runHash = encode . hash +#endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wai-app-static-3.1.7.2/WaiAppStatic/Storage/Filesystem.hs new/wai-app-static-3.1.7.4/WaiAppStatic/Storage/Filesystem.hs --- old/wai-app-static-3.1.7.2/WaiAppStatic/Storage/Filesystem.hs 2020-07-04 18:06:28.000000000 +0200 +++ new/wai-app-static-3.1.7.4/WaiAppStatic/Storage/Filesystem.hs 2022-03-20 10:09:31.000000000 +0100 @@ -1,3 +1,4 @@ +{-# LANGUAGE CPP #-} {-# LANGUAGE ScopedTypeVariables #-} {-# LANGUAGE OverloadedStrings #-} {-# LANGUAGE BangPatterns #-} @@ -25,8 +26,13 @@ import Network.Mime import System.PosixCompat.Files (fileSize, getFileStatus, modificationTime, isRegularFile) import Data.Maybe (catMaybes) +#ifdef MIN_VERSION_cryptonite import Data.ByteArray.Encoding import Crypto.Hash (hashlazy, MD5, Digest) +#else +import Data.ByteString.Base64 (encode) +import Crypto.Hash.MD5 (hashlazy) +#endif import qualified Data.ByteString.Lazy as BL (hGetContents) import qualified Data.Text as T @@ -122,8 +128,13 @@ hashFile :: FilePath -> IO ByteString hashFile fp = withBinaryFile fp ReadMode $ \h -> do f <- BL.hGetContents h +#ifdef MIN_VERSION_cryptonite let !hash = hashlazy f :: Digest MD5 return $ convertToBase Base64 hash +#else + let !hash = hashlazy f + return . encode $ hash +#endif hashFileIfExists :: ETagLookup hashFileIfExists fp = do diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wai-app-static-3.1.7.2/wai-app-static.cabal new/wai-app-static-3.1.7.4/wai-app-static.cabal --- old/wai-app-static-3.1.7.2/wai-app-static.cabal 2020-08-14 08:24:06.000000000 +0200 +++ new/wai-app-static-3.1.7.4/wai-app-static.cabal 2022-03-20 10:09:31.000000000 +0100 @@ -1,5 +1,5 @@ name: wai-app-static -version: 3.1.7.2 +version: 3.1.7.4 license: MIT license-file: LICENSE author: Michael Snoyman <[email protected]> @@ -24,9 +24,13 @@ Description: print debug info Default: False +Flag cryptonite + Description: Use the cryptonite library for MD5 computation + Default: True + library default-language: Haskell2010 - build-depends: base >= 4 && < 5 + build-depends: base >= 4.12 && < 5 , wai >= 3.0 && < 3.3 , bytestring >= 0.10.4 , http-types >= 0.7 @@ -38,8 +42,6 @@ , old-locale >= 1.0.0.2 , file-embed >= 0.0.3.1 , text >= 0.7 - , cryptonite >= 0.6 - , memory >= 0.7 , http-date , blaze-html >= 0.5 , blaze-markup >= 0.5.1 @@ -48,9 +50,15 @@ , template-haskell >= 2.7 , zlib >= 0.5 , filepath - , wai-extra >= 3.0 && < 3.1 + , wai-extra >= 3.0 && < 3.2 , optparse-applicative >= 0.7 , warp >= 3.0.11 && < 3.4 + if flag(cryptonite) + build-depends: cryptonite >= 0.6 + , memory >= 0.7 + else + build-depends: base64-bytestring >= 0.1 + , cryptohash-md5 >= 0.11.101 exposed-modules: Network.Wai.Application.Static WaiAppStatic.Storage.Filesystem
