Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package ghc-warp-tls for openSUSE:Factory checked in at 2026-06-10 16:09:55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ghc-warp-tls (Old) and /work/SRC/openSUSE:Factory/.ghc-warp-tls.new.2375 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ghc-warp-tls" Wed Jun 10 16:09:55 2026 rev:17 rq:1358474 version:3.4.14 Changes: -------- --- /work/SRC/openSUSE:Factory/ghc-warp-tls/ghc-warp-tls.changes 2025-03-25 22:21:18.160718397 +0100 +++ /work/SRC/openSUSE:Factory/.ghc-warp-tls.new.2375/ghc-warp-tls.changes 2026-06-10 16:14:57.354928450 +0200 @@ -1,0 +2,15 @@ +Thu Apr 16 12:28:27 UTC 2026 - Peter Simons <[email protected]> + +- Update warp-tls to version 3.4.14. + ## 3.4.14 + + * Build with `warp-3.4.13`. + [#1071](https://github.com/yesodweb/wai/pull/1071) + +------------------------------------------------------------------- +Tue Jan 13 11:44:25 UTC 2026 - Peter Simons <[email protected]> + +- Update warp-tls to version 3.4.13 revision 1. + Upstream has revised the Cabal build instructions on Hackage. + +------------------------------------------------------------------- Old: ---- warp-tls-3.4.13.tar.gz New: ---- warp-tls-3.4.14.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ghc-warp-tls.spec ++++++ --- /var/tmp/diff_new_pack.RmSmOp/_old 2026-06-10 16:14:59.203005036 +0200 +++ /var/tmp/diff_new_pack.RmSmOp/_new 2026-06-10 16:14:59.207005201 +0200 @@ -1,7 +1,7 @@ # # spec file for package ghc-warp-tls # -# Copyright (c) 2025 SUSE LLC +# Copyright (c) 2026 SUSE LLC # # 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 warp-tls %global pkgver %{pkg_name}-%{version} Name: ghc-%{pkg_name} -Version: 3.4.13 +Version: 3.4.14 Release: 0 Summary: HTTP over TLS support for Warp via the TLS package License: MIT @@ -35,6 +35,8 @@ BuildRequires: ghc-recv-devel BuildRequires: ghc-recv-prof BuildRequires: ghc-rpm-macros +BuildRequires: ghc-stm-devel +BuildRequires: ghc-stm-prof BuildRequires: ghc-streaming-commons-devel BuildRequires: ghc-streaming-commons-prof BuildRequires: ghc-tls-devel ++++++ warp-tls-3.4.13.tar.gz -> warp-tls-3.4.14.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/warp-tls-3.4.13/ChangeLog.md new/warp-tls-3.4.14/ChangeLog.md --- old/warp-tls-3.4.13/ChangeLog.md 2001-09-09 03:46:40.000000000 +0200 +++ new/warp-tls-3.4.14/ChangeLog.md 2026-04-16 14:24:13.000000000 +0200 @@ -1,5 +1,10 @@ # ChangeLog +## 3.4.14 + +* Build with `warp-3.4.13`. + [#1071](https://github.com/yesodweb/wai/pull/1071) + ## 3.4.13 * Introduced new smart constructor `tlsSettingsSni` to make it more convenient diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/warp-tls-3.4.13/Network/Wai/Handler/WarpTLS.hs new/warp-tls-3.4.14/Network/Wai/Handler/WarpTLS.hs --- old/warp-tls-3.4.13/Network/Wai/Handler/WarpTLS.hs 2001-09-09 03:46:40.000000000 +0200 +++ new/warp-tls-3.4.14/Network/Wai/Handler/WarpTLS.hs 2026-04-16 14:24:13.000000000 +0200 @@ -59,6 +59,9 @@ ) where import Control.Applicative ((<|>)) +#if MIN_VERSION_warp(3,4,13) +import Control.Concurrent.STM (newTVarIO, TVar) +#endif import Control.Exception ( Exception, IOException, @@ -72,6 +75,7 @@ throwIO, try, ) +import qualified Control.Exception as E import Control.Monad (guard, void) import qualified Data.ByteString as S import qualified Data.ByteString.Lazy as L @@ -89,7 +93,6 @@ #endif withSocketsDo, ) -import qualified Control.Exception as E import Network.Socket.BufferPool import Network.Socket.ByteString (sendAll) import qualified Network.TLS as TLS @@ -274,10 +277,16 @@ -> Socket -> Application -> IO () -runTLSSocket' tlsset@TLSSettings{..} set credentials mgr sock = - runSettingsConnectionMakerSecure set get +runTLSSocket' tlsset@TLSSettings{..} set credentials mgr sock app = do +#if MIN_VERSION_warp(3,4,13) + (_, newSettings) <- makeServerState set + let get = getter tlsset newSettings sock params + runSettingsConnectionMakerSecure newSettings get app +#else + let get = getter tlsset set sock params + runSettingsConnectionMakerSecure set get app +#endif where - get = getter tlsset set sock params params = TLS.defaultParamsServer { TLS.serverWantClientCert = tlsWantClientCert @@ -382,7 +391,14 @@ where makeConn = do pool <- newBufferPool 2048 16384 - rawRecvN <- makeRecvN bs0 $ receive s pool +#if MIN_VERSION_warp(3,4,13) + appsInProgress <- newTVarIO 0 + (ss, _) <- makeServerState set + let recv = makeGracefulRecv s pool ss appsInProgress +#else + let recv = receive s pool +#endif + rawRecvN <- makeRecvN bs0 recv let recvN = wrappedRecvN rawRecvN ctx <- TLS.contextNew (backend recvN) params TLS.contextHookSetLogging ctx tlsLogging @@ -390,7 +406,11 @@ mconn <- timeout tm $ do TLS.handshake ctx mysa <- getSocketName s +#if MIN_VERSION_warp(3,4,13) + attachConn mysa ctx appsInProgress +#else attachConn mysa ctx +#endif case mconn of Nothing -> throwIO IncompleteHeaders Just conn -> return conn @@ -419,8 +439,16 @@ -- | Get "Connection" and "Transport" for a TLS connection that is already did the handshake. -- @since 3.4.7 -attachConn :: SockAddr -> TLS.Context -> IO (Connection, Transport) +attachConn + :: SockAddr + -> TLS.Context +#if MIN_VERSION_warp(3,4,13) + -> TVar Int -> IO (Connection, Transport) +attachConn mysa ctx appsInProgress = do +#else + -> IO (Connection, Transport) attachConn mysa ctx = do +#endif h2 <- (== Just "h2") <$> TLS.getNegotiatedProtocol ctx isH2 <- I.newIORef h2 writeBuffer <- createWriteBuffer 16384 @@ -440,6 +468,9 @@ , connWriteBuffer = writeBufferRef , connHTTP2 = isH2 , connMySockAddr = mysa +#if MIN_VERSION_warp(3,4,13) + , connAppsInProgress = appsInProgress +#endif } where sendall = TLS.sendData ctx . L.fromChunks . return diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/warp-tls-3.4.13/warp-tls.cabal new/warp-tls-3.4.14/warp-tls.cabal --- old/warp-tls-3.4.13/warp-tls.cabal 2001-09-09 03:46:40.000000000 +0200 +++ new/warp-tls-3.4.14/warp-tls.cabal 2026-04-16 14:24:13.000000000 +0200 @@ -1,5 +1,5 @@ Name: warp-tls -Version: 3.4.13 +Version: 3.4.14 Synopsis: HTTP over TLS support for Warp via the TLS package License: MIT License-file: LICENSE @@ -22,9 +22,10 @@ , bytestring >= 0.9 , wai >= 3.2 && < 3.3 , warp >= 3.3.29 && < 3.5 - , tls >= 2.1.3 && < 2.2 + , tls >= 2.1.3 && < 2.5 , network >= 2.2.1 , streaming-commons + , stm >= 2.3 , tls-session-manager >= 0.0.4 , recv >= 0.1.0 && < 0.2.0 Exposed-modules: Network.Wai.Handler.WarpTLS @@ -39,4 +40,5 @@ source-repository head type: git - location: git://github.com/yesodweb/wai.git + location: https://github.com/yesodweb/wai.git + subdir: warp-tls
