Hello community, here is the log from the commit of package ghc-wai-app-static for openSUSE:Factory checked in at 2020-08-28 21:41:05 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ghc-wai-app-static (Old) and /work/SRC/openSUSE:Factory/.ghc-wai-app-static.new.3399 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ghc-wai-app-static" Fri Aug 28 21:41:05 2020 rev:2 rq:829488 version:3.1.7.2 Changes: -------- --- /work/SRC/openSUSE:Factory/ghc-wai-app-static/ghc-wai-app-static.changes 2020-06-19 17:05:36.096855969 +0200 +++ /work/SRC/openSUSE:Factory/.ghc-wai-app-static.new.3399/ghc-wai-app-static.changes 2020-08-28 21:41:05.372880885 +0200 @@ -1,0 +2,18 @@ +Wed Aug 19 08:07:41 UTC 2020 - Michel Normand <[email protected]> + +- Add _constraints with 6GB min disk space for ppc64/ppc64le + +------------------------------------------------------------------- +Tue Aug 18 10:46:35 UTC 2020 - Peter Simons <[email protected]> + +- Replace %setup -q with the more modern %autosetup macro. + +------------------------------------------------------------------- +Sat Aug 15 02:02:12 UTC 2020 - [email protected] + +- Update wai-app-static to version 3.1.7.2. + ## 3.1.7.2 + + * optparse-applicative 0.16.0.0 support + +------------------------------------------------------------------- Old: ---- wai-app-static-3.1.7.1.tar.gz wai-app-static.cabal New: ---- _constraints wai-app-static-3.1.7.2.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ghc-wai-app-static.spec ++++++ --- /var/tmp/diff_new_pack.qnpMZL/_old 2020-08-28 21:41:05.884881074 +0200 +++ /var/tmp/diff_new_pack.qnpMZL/_new 2020-08-28 21:41:05.888881075 +0200 @@ -19,13 +19,12 @@ %global pkg_name wai-app-static %bcond_with tests Name: ghc-%{pkg_name} -Version: 3.1.7.1 +Version: 3.1.7.2 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 @@ -75,8 +74,7 @@ This package provides the Haskell %{pkg_name} library development files. %prep -%setup -q -n %{pkg_name}-%{version} -cp -p %{SOURCE1} %{pkg_name}.cabal +%autosetup -n %{pkg_name}-%{version} %build %ghc_lib_build ++++++ _constraints ++++++ <constraints> <overwrite> <conditions> <arch>ppc64</arch> <arch>ppc64le</arch> </conditions> <hardware> <disk> <size unit="G">6</size> </disk> </hardware> </overwrite> </constraints> ++++++ wai-app-static-3.1.7.1.tar.gz -> wai-app-static-3.1.7.2.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wai-app-static-3.1.7.1/ChangeLog.md new/wai-app-static-3.1.7.2/ChangeLog.md --- old/wai-app-static-3.1.7.1/ChangeLog.md 2020-01-15 06:48:44.000000000 +0100 +++ new/wai-app-static-3.1.7.2/ChangeLog.md 2020-08-14 08:15:34.000000000 +0200 @@ -1,5 +1,9 @@ # wai-app-static changelog +## 3.1.7.2 + +* optparse-applicative 0.16.0.0 support + ## 3.1.7.1 * Update the test suite too diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wai-app-static-3.1.7.1/Network/Wai/Application/Static.hs new/wai-app-static-3.1.7.2/Network/Wai/Application/Static.hs --- old/wai-app-static-3.1.7.1/Network/Wai/Application/Static.hs 2020-01-15 06:44:52.000000000 +0100 +++ new/wai-app-static-3.1.7.2/Network/Wai/Application/Static.hs 2020-07-04 18:06:28.000000000 +0200 @@ -164,11 +164,13 @@ -- Didn't match, but we have a hash value. Send the file contents -- with an ETag header. -- - -- Note: It would be arguably better to next check - -- if-modified-since and return a 304 if that indicates a match as - -- well. However, the circumstances under which such a situation - -- could arise would be very anomalous, and should likely warrant a - -- new file being sent anyway. + -- RFC7232 (HTTP 1.1): + -- > A recipient MUST ignore If-Modified-Since if the request contains an + -- > If-None-Match header field; the condition in If-None-Match is + -- > considered to be a more accurate replacement for the condition in + -- > If-Modified-Since, and the two are only combined for the sake of + -- > interoperating with older intermediaries that might not implement + -- > If-None-Match. (Just hash, _) -> respond [("ETag", hash)] -- No hash value available, fall back to last modified support. @@ -243,7 +245,7 @@ response :: StaticResponse -> IO W.ResponseReceived response (FileResponse file ch) = do mimetype <- ssGetMimeType ss file - let filesize = fileGetSize file + -- let filesize = fileGetSize file let headers = ("Content-Type", mimetype) -- Let Warp provide the content-length, since it takes -- range requests into account diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wai-app-static-3.1.7.1/WaiAppStatic/CmdLine.hs new/wai-app-static-3.1.7.2/WaiAppStatic/CmdLine.hs --- old/wai-app-static-3.1.7.1/WaiAppStatic/CmdLine.hs 2019-02-17 11:29:36.000000000 +0100 +++ new/wai-app-static-3.1.7.2/WaiAppStatic/CmdLine.hs 2020-08-14 08:25:12.000000000 +0200 @@ -1,4 +1,4 @@ -{-# LANGUAGE DeriveDataTypeable, RecordWildCards #-} +{-# LANGUAGE DeriveDataTypeable, RecordWildCards, CPP #-} -- | Command line version of wai-app-static, used for the warp-static server. module WaiAppStatic.CmdLine ( runCommandLine @@ -39,6 +39,7 @@ } #if MIN_VERSION_optparse_applicative(0, 10, 0) +option' :: Mod OptionFields Int -> Parser Int option' = option auto #else option' = option @@ -113,5 +114,9 @@ where helperOption :: Parser (a -> a) helperOption = +#if MIN_VERSION_optparse_applicative(0,16,0) + abortOption (ShowHelpText Nothing) $ +#else abortOption ShowHelpText $ +#endif mconcat [long "help", help "Show this help text", hidden] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wai-app-static-3.1.7.1/WaiAppStatic/Listing.hs new/wai-app-static-3.1.7.2/WaiAppStatic/Listing.hs --- old/wai-app-static-3.1.7.1/WaiAppStatic/Listing.hs 2017-06-01 14:48:32.000000000 +0200 +++ new/wai-app-static-3.1.7.2/WaiAppStatic/Listing.hs 2020-07-04 18:06:28.000000000 +0200 @@ -64,7 +64,7 @@ -- Add a link to the root of the tree showFolder' :: Bool -> Pieces -> H.Html - showFolder' hasTrailingSlash pieces = showFolder hasTrailingSlash (unsafeToPiece "root" : pieces) + showFolder' hasTrailingSlash pieces' = showFolder hasTrailingSlash (unsafeToPiece "root" : pieces') showFolder :: Bool -> Pieces -> H.Html showFolder _ [] = "/" -- won't happen diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wai-app-static-3.1.7.1/WaiAppStatic/Storage/Embedded/TH.hs new/wai-app-static-3.1.7.2/WaiAppStatic/Storage/Embedded/TH.hs --- old/wai-app-static-3.1.7.1/WaiAppStatic/Storage/Embedded/TH.hs 2018-03-19 13:30:17.000000000 +0100 +++ new/wai-app-static-3.1.7.2/WaiAppStatic/Storage/Embedded/TH.hs 2020-08-14 08:24:20.000000000 +0200 @@ -1,4 +1,4 @@ -{-# LANGUAGE TemplateHaskell, QuasiQuotes, OverloadedStrings, MagicHash #-} +{-# LANGUAGE TemplateHaskell, QuasiQuotes, OverloadedStrings, MagicHash, CPP #-} module WaiAppStatic.Storage.Embedded.TH( Etag , EmbeddableEntry(..) @@ -7,7 +7,6 @@ import Data.ByteString.Builder.Extra (byteStringInsert) import Codec.Compression.GZip (compress) -import Control.Applicative import Data.ByteString.Unsafe (unsafePackAddressLen) import Data.Either (lefts, rights) import GHC.Exts (Int(..)) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wai-app-static-3.1.7.1/WaiAppStatic/Types.hs new/wai-app-static-3.1.7.2/WaiAppStatic/Types.hs --- old/wai-app-static-3.1.7.1/WaiAppStatic/Types.hs 2018-03-19 13:30:17.000000000 +0100 +++ new/wai-app-static-3.1.7.2/WaiAppStatic/Types.hs 2020-07-04 18:06:28.000000000 +0200 @@ -59,6 +59,8 @@ toPieces = mapM toPiece -- | Request coming from a user. Corresponds to @pathInfo@. +-- +-- The root path is the empty list. type Pieces = [Piece] -- | Values for the max-age component of the cache-control response header. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wai-app-static-3.1.7.1/wai-app-static.cabal new/wai-app-static-3.1.7.2/wai-app-static.cabal --- old/wai-app-static-3.1.7.1/wai-app-static.cabal 2020-01-15 06:48:37.000000000 +0100 +++ new/wai-app-static-3.1.7.2/wai-app-static.cabal 2020-08-14 08:24:06.000000000 +0200 @@ -1,5 +1,5 @@ name: wai-app-static -version: 3.1.7.1 +version: 3.1.7.2 license: MIT license-file: LICENSE author: Michael Snoyman <[email protected]> @@ -8,7 +8,7 @@ description: API docs and the README are available at <http://www.stackage.org/package/wai-app-static>. category: Web, Yesod stability: Stable -cabal-version: >= 1.8 +cabal-version: >= 1.10 build-type: Simple homepage: http://www.yesodweb.com/book/web-application-interface Extra-source-files: @@ -25,6 +25,7 @@ Default: False library + default-language: Haskell2010 build-depends: base >= 4 && < 5 , wai >= 3.0 && < 3.3 , bytestring >= 0.10.4 @@ -61,12 +62,12 @@ WaiAppStatic.Storage.Embedded.Runtime WaiAppStatic.Storage.Embedded.TH ghc-options: -Wall - extensions: CPP if flag(print) cpp-options: -DPRINT Executable warp + default-language: Haskell2010 Main-is: warp-static.hs hs-source-dirs: app Build-depends: base >= 4 && < 5 @@ -78,6 +79,7 @@ , mime-types >= 0.1 && < 0.2 test-suite runtests + default-language: Haskell2010 hs-source-dirs: test main-is: ../tests.hs type: exitcode-stdio-1.0
