Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package ghc-warp for openSUSE:Factory checked in at 2022-08-10 17:13:29 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ghc-warp (Old) and /work/SRC/openSUSE:Factory/.ghc-warp.new.1521 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ghc-warp" Wed Aug 10 17:13:29 2022 rev:11 rq:994054 version:3.3.21 Changes: -------- --- /work/SRC/openSUSE:Factory/ghc-warp/ghc-warp.changes 2022-02-11 23:12:00.999398407 +0100 +++ /work/SRC/openSUSE:Factory/.ghc-warp.new.1521/ghc-warp.changes 2022-08-10 17:14:41.797926715 +0200 @@ -1,0 +2,17 @@ +Mon May 30 01:06:32 UTC 2022 - Peter Simons <psim...@suse.com> + +- Update warp to version 3.3.21. + ## 3.3.21 + + * Support GHC 9.4 [#889](https://github.com/yesodweb/wai/pull/889) + +------------------------------------------------------------------- +Mon Mar 7 22:47:21 UTC 2022 - Peter Simons <psim...@suse.com> + +- Update warp to version 3.3.20. + ## 3.3.20 + + * Adding "x509" flag. + [#871](https://github.com/yesodweb/wai/pull/871) + +------------------------------------------------------------------- Old: ---- warp-3.3.19.tar.gz New: ---- warp-3.3.21.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ghc-warp.spec ++++++ --- /var/tmp/diff_new_pack.Wm4Ijl/_old 2022-08-10 17:14:42.369928208 +0200 +++ /var/tmp/diff_new_pack.Wm4Ijl/_new 2022-08-10 17:14:42.377928229 +0200 @@ -19,7 +19,7 @@ %global pkg_name warp %bcond_with tests Name: ghc-%{pkg_name} -Version: 3.3.19 +Version: 3.3.21 Release: 0 Summary: A fast, light-weight web server for WAI applications License: MIT ++++++ warp-3.3.19.tar.gz -> warp-3.3.21.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/warp-3.3.19/ChangeLog.md new/warp-3.3.21/ChangeLog.md --- old/warp-3.3.19/ChangeLog.md 2001-09-09 03:46:40.000000000 +0200 +++ new/warp-3.3.21/ChangeLog.md 2001-09-09 03:46:40.000000000 +0200 @@ -1,5 +1,14 @@ # ChangeLog for warp +## 3.3.21 + +* Support GHC 9.4 [#889](https://github.com/yesodweb/wai/pull/889) + +## 3.3.20 + +* Adding "x509" flag. + [#871](https://github.com/yesodweb/wai/pull/871) + ## 3.3.19 * Allowing the eMFILE exception in acceptNewConnection. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/warp-3.3.19/Network/Wai/Handler/Warp/HTTP2/Request.hs new/warp-3.3.21/Network/Wai/Handler/Warp/HTTP2/Request.hs --- old/warp-3.3.19/Network/Wai/Handler/Warp/HTTP2/Request.hs 2001-09-09 03:46:40.000000000 +0200 +++ new/warp-3.3.21/Network/Wai/Handler/Warp/HTTP2/Request.hs 2001-09-09 03:46:40.000000000 +0200 @@ -1,3 +1,4 @@ +{-# LANGUAGE CPP #-} {-# LANGUAGE BangPatterns #-} module Network.Wai.Handler.Warp.HTTP2.Request ( @@ -22,7 +23,10 @@ import Network.Wai.Handler.Warp.HTTP2.Types import Network.Wai.Handler.Warp.Imports -import Network.Wai.Handler.Warp.Request (getFileInfoKey, pauseTimeoutKey, getClientCertificateKey) +import Network.Wai.Handler.Warp.Request (getFileInfoKey, pauseTimeoutKey) +#ifdef MIN_VERSION_x509 +import Network.Wai.Handler.Warp.Request (getClientCertificateKey) +#endif import qualified Network.Wai.Handler.Warp.Settings as S (Settings, settingsNoParsePath) import Network.Wai.Handler.Warp.Types @@ -86,7 +90,9 @@ $ Vault.insert setHTTP2DataKey (writeIORef ref) $ Vault.insert modifyHTTP2DataKey (modifyIORef' ref) $ Vault.insert pauseTimeoutKey (T.pause th) +#ifdef MIN_VERSION_x509 $ Vault.insert getClientCertificateKey (getTransportClientCertificate transport) +#endif Vault.empty getHTTP2DataKey :: Vault.Key (IO (Maybe HTTP2Data)) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/warp-3.3.19/Network/Wai/Handler/Warp/Request.hs new/warp-3.3.21/Network/Wai/Handler/Warp/Request.hs --- old/warp-3.3.19/Network/Wai/Handler/Warp/Request.hs 2001-09-09 03:46:40.000000000 +0200 +++ new/warp-3.3.21/Network/Wai/Handler/Warp/Request.hs 2001-09-09 03:46:40.000000000 +0200 @@ -9,7 +9,9 @@ , headerLines , pauseTimeoutKey , getFileInfoKey +#ifdef MIN_VERSION_x509 , getClientCertificateKey +#endif , NoKeepAliveRequest (..) ) where @@ -22,7 +24,9 @@ import qualified Data.IORef as I import Data.Typeable (Typeable) import qualified Data.Vault.Lazy as Vault +#ifdef MIN_VERSION_x509 import Data.X509 +#endif import qualified Network.HTTP.Types as H import Network.Socket (SockAddr) import Network.Wai @@ -72,7 +76,9 @@ rawPath = if settingsNoParsePath settings then unparsedPath else path vaultValue = Vault.insert pauseTimeoutKey (Timeout.pause th) $ Vault.insert getFileInfoKey (getFileInfo ii) +#ifdef MIN_VERSION_x509 $ Vault.insert getClientCertificateKey (getTransportClientCertificate transport) +#endif Vault.empty (rbody, remainingRef, bodyLength) <- bodyAndSource src cl te -- body producing function which will produce '100-continue', if needed @@ -317,6 +323,8 @@ getFileInfoKey = unsafePerformIO Vault.newKey {-# NOINLINE getFileInfoKey #-} +#ifdef MIN_VERSION_x509 getClientCertificateKey :: Vault.Key (Maybe CertificateChain) getClientCertificateKey = unsafePerformIO Vault.newKey {-# NOINLINE getClientCertificateKey #-} +#endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/warp-3.3.19/Network/Wai/Handler/Warp/Settings.hs new/warp-3.3.21/Network/Wai/Handler/Warp/Settings.hs --- old/warp-3.3.19/Network/Wai/Handler/Warp/Settings.hs 2001-09-09 03:46:40.000000000 +0200 +++ new/warp-3.3.21/Network/Wai/Handler/Warp/Settings.hs 2001-09-09 03:46:40.000000000 +0200 @@ -249,7 +249,16 @@ -- @since 3.3.17 defaultFork :: ((forall a. IO a -> IO a) -> IO ()) -> IO () defaultFork io = +#if __GLASGOW_HASKELL__ >= 904 + IO $ \s0 -> + case io unsafeUnmask of + IO io' -> + case (fork# io' s0) of + (# s1, _tid #) -> + (# s1, () #) +#else IO $ \s0 -> case (fork# (io unsafeUnmask) s0) of (# s1, _tid #) -> (# s1, () #) +#endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/warp-3.3.19/Network/Wai/Handler/Warp/Types.hs new/warp-3.3.21/Network/Wai/Handler/Warp/Types.hs --- old/warp-3.3.19/Network/Wai/Handler/Warp/Types.hs 2001-09-09 03:46:40.000000000 +0200 +++ new/warp-3.3.21/Network/Wai/Handler/Warp/Types.hs 2001-09-09 03:46:40.000000000 +0200 @@ -8,7 +8,9 @@ import qualified Data.ByteString as S import Data.IORef (IORef, readIORef, writeIORef, newIORef) import Data.Typeable (Typeable) +#ifdef MIN_VERSION_x509 import Data.X509 +#endif import Foreign.Ptr (Ptr) import System.Posix.Types (Fd) import qualified System.TimeManager as T @@ -180,12 +182,16 @@ , tlsMinorVersion :: Int , tlsNegotiatedProtocol :: Maybe ByteString -- ^ The result of Application Layer Protocol Negociation in RFC 7301 , tlsChiperID :: Word16 +#ifdef MIN_VERSION_x509 , tlsClientCertificate :: Maybe CertificateChain +#endif } -- ^ Encrypted channel: TLS or SSL | QUIC { quicNegotiatedProtocol :: Maybe ByteString , quicChiperID :: Word16 +#ifdef MIN_VERSION_x509 , quicClientCertificate :: Maybe CertificateChain +#endif } isTransportSecure :: Transport -> Bool @@ -196,7 +202,9 @@ isTransportQUIC QUIC{} = True isTransportQUIC _ = False +#ifdef MIN_VERSION_x509 getTransportClientCertificate :: Transport -> Maybe CertificateChain getTransportClientCertificate TCP = Nothing getTransportClientCertificate (TLS _ _ _ _ cc) = cc getTransportClientCertificate (QUIC _ _ cc) = cc +#endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/warp-3.3.19/Network/Wai/Handler/Warp.hs new/warp-3.3.21/Network/Wai/Handler/Warp.hs --- old/warp-3.3.19/Network/Wai/Handler/Warp.hs 2001-09-09 03:46:40.000000000 +0200 +++ new/warp-3.3.21/Network/Wai/Handler/Warp.hs 2001-09-09 03:46:40.000000000 +0200 @@ -99,7 +99,9 @@ , pauseTimeout , FileInfo(..) , getFileInfo +#ifdef MIN_VERSION_x509 , clientCertificate +#endif , withApplication , withApplicationSettings , testWithApplication @@ -128,7 +130,9 @@ import UnliftIO.Exception (SomeException, throwIO) import Data.Streaming.Network (HostPreference) import qualified Data.Vault.Lazy as Vault +#ifdef MIN_VERSION_x509 import Data.X509 +#endif import qualified Network.HTTP.Types as H import Network.Socket (SockAddr) import Network.Wai (Request, Response, vault) @@ -516,8 +520,10 @@ getGracefulCloseTimeout2 :: Settings -> Int getGracefulCloseTimeout2 = settingsGracefulCloseTimeout2 +#ifdef MIN_VERSION_x509 -- | Getting information of client certificate. -- -- Since 3.3.5 clientCertificate :: Request -> Maybe CertificateChain clientCertificate = join . Vault.lookup getClientCertificateKey . vault +#endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/warp-3.3.19/warp.cabal new/warp-3.3.21/warp.cabal --- old/warp-3.3.19/warp.cabal 2001-09-09 03:46:40.000000000 +0200 +++ new/warp-3.3.21/warp.cabal 2001-09-09 03:46:40.000000000 +0200 @@ -1,5 +1,5 @@ Name: warp -Version: 3.3.19 +Version: 3.3.21 Synopsis: A fast, light-weight web server for WAI applications. License: MIT License-file: LICENSE @@ -32,6 +32,10 @@ Description: print debug output. not suitable for production Default: False +Flag x509 + Description: Adds a dependency on the x509 library to enable getting TLS client certificates. + Default: True + Library Build-Depends: base >= 4.12 && < 5 , array @@ -55,8 +59,9 @@ , vault >= 0.3 , wai >= 3.2 && < 3.3 , word8 - , x509 , unliftio + if flag(x509) + Build-Depends: x509 if impl(ghc < 8) Build-Depends: semigroups if flag(network-bytestring) @@ -182,6 +187,7 @@ Type: exitcode-stdio-1.0 Ghc-Options: -Wall -threaded + Build-Tool-Depends: hspec-discover:hspec-discover Build-Depends: base >= 4.8 && < 5 , HUnit , QuickCheck @@ -213,9 +219,9 @@ , vault , wai >= 3.2 && < 3.3 , word8 - , x509 , unliftio - -- Build-Tool-Depends: hspec-discover:hspec-discover + if flag(x509) + Build-Depends: x509 if impl(ghc < 8) Build-Depends: semigroups , transformers @@ -253,8 +259,9 @@ , network , time-manager , unix-compat - , x509 , unliftio + if flag(x509) + Build-Depends: x509 if impl(ghc < 8) Build-Depends: semigroups
