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 2023-04-04 21:24:41 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ghc-warp (Old) and /work/SRC/openSUSE:Factory/.ghc-warp.new.19717 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ghc-warp" Tue Apr 4 21:24:41 2023 rev:14 rq:1076122 version:3.3.25 Changes: -------- --- /work/SRC/openSUSE:Factory/ghc-warp/ghc-warp.changes 2023-01-28 18:52:25.113035248 +0100 +++ /work/SRC/openSUSE:Factory/.ghc-warp.new.19717/ghc-warp.changes 2023-04-04 21:25:03.570773194 +0200 @@ -1,0 +2,22 @@ +Thu Mar 30 17:09:00 UTC 2023 - Peter Simons <psim...@suse.com> + +- Updated spec file to conform with ghc-rpm-macros-2.5.2. + +------------------------------------------------------------------- +Thu Mar 16 02:30:02 UTC 2023 - Peter Simons <psim...@suse.com> + +- Update warp to version 3.3.25. + ## 3.3.25 + + * Catching up the signature change of openFd in the unix package v2.8. + [#926](https://github.com/yesodweb/wai/pull/926) + +------------------------------------------------------------------- +Wed Feb 8 05:29:16 UTC 2023 - Peter Simons <psim...@suse.com> + +- Update warp to version 3.3.24. + ## 3.3.24 + + * Switching the version of the "recv" package from 0.0.x to 0.1.x. + +------------------------------------------------------------------- Old: ---- warp-3.3.23.tar.gz warp.cabal New: ---- warp-3.3.25.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ghc-warp.spec ++++++ --- /var/tmp/diff_new_pack.HXzYv4/_old 2023-04-04 21:25:04.050775913 +0200 +++ /var/tmp/diff_new_pack.HXzYv4/_new 2023-04-04 21:25:04.054775935 +0200 @@ -17,49 +17,81 @@ %global pkg_name warp +%global pkgver %{pkg_name}-%{version} %bcond_with tests Name: ghc-%{pkg_name} -Version: 3.3.23 +Version: 3.3.25 Release: 0 Summary: A fast, light-weight web server for WAI applications 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: ghc-Cabal-devel BuildRequires: ghc-array-devel +BuildRequires: ghc-array-prof BuildRequires: ghc-auto-update-devel +BuildRequires: ghc-auto-update-prof +BuildRequires: ghc-base-devel +BuildRequires: ghc-base-prof BuildRequires: ghc-bsb-http-chunked-devel +BuildRequires: ghc-bsb-http-chunked-prof BuildRequires: ghc-bytestring-devel +BuildRequires: ghc-bytestring-prof BuildRequires: ghc-case-insensitive-devel +BuildRequires: ghc-case-insensitive-prof BuildRequires: ghc-containers-devel +BuildRequires: ghc-containers-prof BuildRequires: ghc-hashable-devel +BuildRequires: ghc-hashable-prof BuildRequires: ghc-http-date-devel +BuildRequires: ghc-http-date-prof BuildRequires: ghc-http-types-devel +BuildRequires: ghc-http-types-prof BuildRequires: ghc-http2-devel +BuildRequires: ghc-http2-prof BuildRequires: ghc-iproute-devel +BuildRequires: ghc-iproute-prof BuildRequires: ghc-network-devel +BuildRequires: ghc-network-prof BuildRequires: ghc-recv-devel +BuildRequires: ghc-recv-prof BuildRequires: ghc-rpm-macros BuildRequires: ghc-simple-sendfile-devel +BuildRequires: ghc-simple-sendfile-prof BuildRequires: ghc-stm-devel +BuildRequires: ghc-stm-prof BuildRequires: ghc-streaming-commons-devel +BuildRequires: ghc-streaming-commons-prof BuildRequires: ghc-text-devel +BuildRequires: ghc-text-prof BuildRequires: ghc-time-manager-devel +BuildRequires: ghc-time-manager-prof BuildRequires: ghc-unix-compat-devel +BuildRequires: ghc-unix-compat-prof BuildRequires: ghc-unix-devel +BuildRequires: ghc-unix-prof BuildRequires: ghc-unliftio-devel +BuildRequires: ghc-unliftio-prof BuildRequires: ghc-vault-devel +BuildRequires: ghc-vault-prof BuildRequires: ghc-wai-devel +BuildRequires: ghc-wai-prof BuildRequires: ghc-word8-devel +BuildRequires: ghc-word8-prof BuildRequires: ghc-x509-devel +BuildRequires: ghc-x509-prof ExcludeArch: %{ix86} %if %{with tests} BuildRequires: ghc-QuickCheck-devel +BuildRequires: ghc-QuickCheck-prof BuildRequires: ghc-directory-devel +BuildRequires: ghc-directory-prof BuildRequires: ghc-hspec-devel +BuildRequires: ghc-hspec-prof BuildRequires: ghc-http-client-devel +BuildRequires: ghc-http-client-prof BuildRequires: ghc-process-devel +BuildRequires: ghc-process-prof %endif %description @@ -77,9 +109,24 @@ %description devel This package provides the Haskell %{pkg_name} library development files. +%package -n ghc-%{pkg_name}-doc +Summary: Haskell %{pkg_name} library documentation +Requires: ghc-filesystem +BuildArch: noarch + +%description -n ghc-%{pkg_name}-doc +This package provides the Haskell %{pkg_name} library documentation. + +%package -n ghc-%{pkg_name}-prof +Summary: Haskell %{pkg_name} profiling library +Requires: ghc-%{pkg_name}-devel = %{version}-%{release} +Supplements: (ghc-%{pkg_name}-devel and ghc-prof) + +%description -n ghc-%{pkg_name}-prof +This package provides the Haskell %{pkg_name} profiling library. + %prep %autosetup -n %{pkg_name}-%{version} -cp -p %{SOURCE1} %{pkg_name}.cabal %build %ghc_lib_build @@ -102,4 +149,9 @@ %files devel -f %{name}-devel.files %doc ChangeLog.md README.md +%files -n ghc-%{pkg_name}-doc -f ghc-%{pkg_name}-doc.files +%license LICENSE + +%files -n ghc-%{pkg_name}-prof -f ghc-%{pkg_name}-prof.files + %changelog ++++++ warp-3.3.23.tar.gz -> warp-3.3.25.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/warp-3.3.23/ChangeLog.md new/warp-3.3.25/ChangeLog.md --- old/warp-3.3.23/ChangeLog.md 2001-09-09 03:46:40.000000000 +0200 +++ new/warp-3.3.25/ChangeLog.md 2001-09-09 03:46:40.000000000 +0200 @@ -1,5 +1,14 @@ # ChangeLog for warp +## 3.3.25 + +* Catching up the signature change of openFd in the unix package v2.8. + [#926](https://github.com/yesodweb/wai/pull/926) + +## 3.3.24 + +* Switching the version of the "recv" package from 0.0.x to 0.1.x. + ## 3.3.23 * Add `setAccept` for hooking the socket `accept` call. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/warp-3.3.23/Network/Wai/Handler/Warp/FdCache.hs new/warp-3.3.25/Network/Wai/Handler/Warp/FdCache.hs --- old/warp-3.3.23/Network/Wai/Handler/Warp/FdCache.hs 2001-09-09 03:46:40.000000000 +0200 +++ new/warp-3.3.25/Network/Wai/Handler/Warp/FdCache.hs 2001-09-09 03:46:40.000000000 +0200 @@ -67,7 +67,11 @@ openFile :: FilePath -> IO Fd openFile path = do +#if MIN_VERSION_unix(2,8,0) + fd <- openFd path ReadOnly defaultFileFlags{nonBlock=False} +#else fd <- openFd path ReadOnly Nothing defaultFileFlags{nonBlock=False} +#endif setFileCloseOnExec fd return fd diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/warp-3.3.23/Network/Wai/Handler/Warp/HTTP2.hs new/warp-3.3.25/Network/Wai/Handler/Warp/HTTP2.hs --- old/warp-3.3.23/Network/Wai/Handler/Warp/HTTP2.hs 2001-09-09 03:46:40.000000000 +0200 +++ new/warp-3.3.25/Network/Wai/Handler/Warp/HTTP2.hs 2001-09-09 03:46:40.000000000 +0200 @@ -34,7 +34,7 @@ http2 :: S.Settings -> InternalInfo -> Connection -> Transport -> Application -> SockAddr -> T.Handle -> ByteString -> IO () http2 settings ii conn transport app origAddr th bs = do istatus <- newIORef False - rawRecvN <- makeReceiveN bs (connRecv conn) (connRecvBuf conn) + rawRecvN <- makeRecvN bs $ connRecv conn writeBuffer <- readIORef $ connWriteBuffer conn -- This thread becomes the sender in http2 library. -- In the case of event source, one request comes and one diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/warp-3.3.23/Network/Wai/Handler/Warp/Internal.hs new/warp-3.3.25/Network/Wai/Handler/Warp/Internal.hs --- old/warp-3.3.23/Network/Wai/Handler/Warp/Internal.hs 2001-09-09 03:46:40.000000000 +0200 +++ new/warp-3.3.25/Network/Wai/Handler/Warp/Internal.hs 2001-09-09 03:46:40.000000000 +0200 @@ -15,7 +15,6 @@ -- ** Receive , Recv , RecvBuf - , makePlainReceiveN -- ** Buffer , Buffer , BufSize diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/warp-3.3.23/Network/Wai/Handler/Warp/Run.hs new/warp-3.3.25/Network/Wai/Handler/Warp/Run.hs --- old/warp-3.3.23/Network/Wai/Handler/Warp/Run.hs 2001-09-09 03:46:40.000000000 +0200 +++ new/warp-3.3.25/Network/Wai/Handler/Warp/Run.hs 2001-09-09 03:46:40.000000000 +0200 @@ -77,7 +77,7 @@ , connClose = close s #endif , connRecv = receive' s bufferPool - , connRecvBuf = receiveBuf s + , connRecvBuf = \_ _ -> return True -- obsoleted , connWriteBuffer = writeBufferRef , connHTTP2 = isH2 } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/warp-3.3.23/Network/Wai/Handler/Warp/Types.hs new/warp-3.3.25/Network/Wai/Handler/Warp/Types.hs --- old/warp-3.3.23/Network/Wai/Handler/Warp/Types.hs 2001-09-09 03:46:40.000000000 +0200 +++ new/warp-3.3.25/Network/Wai/Handler/Warp/Types.hs 2001-09-09 03:46:40.000000000 +0200 @@ -99,6 +99,8 @@ , bufFree :: IO () } +type RecvBuf = Buffer -> BufSize -> IO Bool + -- | Data type to manipulate IO actions for connections. -- This is used to abstract IO actions for plain HTTP and HTTP over TLS. data Connection = Connection { @@ -114,8 +116,7 @@ , connClose :: IO () -- | The connection receiving function. This returns "" for EOF or exceptions. , connRecv :: Recv - -- | The connection receiving function. This tries to fill the buffer. - -- This returns when the buffer is filled or reaches EOF. + -- | Obsoleted. , connRecvBuf :: RecvBuf -- | Reference to a write buffer. When during sending of a 'Builder' -- response it's detected the current 'WriteBuffer' is too small it will be diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/warp-3.3.23/warp.cabal new/warp-3.3.25/warp.cabal --- old/warp-3.3.23/warp.cabal 2001-09-09 03:46:40.000000000 +0200 +++ new/warp-3.3.25/warp.cabal 2001-09-09 03:46:40.000000000 +0200 @@ -1,5 +1,5 @@ Name: warp -Version: 3.3.23 +Version: 3.3.25 Synopsis: A fast, light-weight web server for WAI applications. License: MIT License-file: LICENSE @@ -50,7 +50,7 @@ , http-types >= 0.12 , http2 >= 3.0 && < 5 , iproute >= 1.3.1 - , recv + , recv >= 0.1.0 && < 0.2.0 , simple-sendfile >= 0.2.7 && < 0.3 , stm >= 2.3 , streaming-commons >= 0.1.10 @@ -205,7 +205,7 @@ , iproute >= 1.3.1 , network , process - , recv + , recv >= 0.1.0 && < 0.2.0 , simple-sendfile >= 0.2.4 && < 0.3 , stm >= 2.3 , streaming-commons >= 0.1.10
