Hello community, here is the log from the commit of package ghc-warp-tls for openSUSE:Factory checked in at 2017-02-22 13:53:40 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ghc-warp-tls (Old) and /work/SRC/openSUSE:Factory/.ghc-warp-tls.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ghc-warp-tls" Changes: -------- --- /work/SRC/openSUSE:Factory/ghc-warp-tls/ghc-warp-tls.changes 2016-07-20 09:20:18.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.ghc-warp-tls.new/ghc-warp-tls.changes 2017-02-22 13:53:41.354995817 +0100 @@ -1,0 +2,5 @@ +Mon Jan 30 09:29:32 UTC 2017 - [email protected] + +- Update to version 3.2.3 with cabal2obs. + +------------------------------------------------------------------- Old: ---- warp-tls-3.2.2.tar.gz New: ---- warp-tls-3.2.3.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ghc-warp-tls.spec ++++++ --- /var/tmp/diff_new_pack.XIrVL4/_old 2017-02-22 13:53:41.834927524 +0100 +++ /var/tmp/diff_new_pack.XIrVL4/_new 2017-02-22 13:53:41.838926954 +0100 @@ -1,7 +1,7 @@ # # spec file for package ghc-warp-tls # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,15 +18,14 @@ %global pkg_name warp-tls Name: ghc-%{pkg_name} -Version: 3.2.2 +Version: 3.2.3 Release: 0 Summary: HTTP over TLS support for Warp via the TLS package License: MIT -Group: System/Libraries +Group: Development/Languages/Other Url: https://hackage.haskell.org/package/%{pkg_name} Source0: https://hackage.haskell.org/package/%{pkg_name}-%{version}/%{pkg_name}-%{version}.tar.gz BuildRequires: ghc-Cabal-devel -# Begin cabal-rpm deps: BuildRequires: ghc-bytestring-devel BuildRequires: ghc-cryptonite-devel BuildRequires: ghc-data-default-class-devel @@ -37,12 +36,11 @@ BuildRequires: ghc-wai-devel BuildRequires: ghc-warp-devel BuildRoot: %{_tmppath}/%{name}-%{version}-build -# End cabal-rpm deps %description -Support for SSL is now obsoleted. HTTP/2 can be negotiated by ALPN. -API docs and the README are available at -<http://www.stackage.org/package/warp-tls>. +SSLv1 and SSLv2 are obsoleted by IETF. We should use TLS 1.2 (or TLS 1.1 or TLS +1.0 if necessary). HTTP/2 can be negotiated by ALPN. API docs and the README +are available at <http://www.stackage.org/package/warp-tls>. %package devel Summary: Haskell %{pkg_name} library development files @@ -58,15 +56,12 @@ %prep %setup -q -n %{pkg_name}-%{version} - %build %ghc_lib_build - %install %ghc_lib_install - %post devel %ghc_pkg_recache ++++++ warp-tls-3.2.2.tar.gz -> warp-tls-3.2.3.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/warp-tls-3.2.2/Network/Wai/Handler/WarpTLS.hs new/warp-tls-3.2.3/Network/Wai/Handler/WarpTLS.hs --- old/warp-tls-3.2.2/Network/Wai/Handler/WarpTLS.hs 2016-06-22 07:54:17.000000000 +0200 +++ new/warp-tls-3.2.3/Network/Wai/Handler/WarpTLS.hs 2017-01-27 04:25:50.000000000 +0100 @@ -55,7 +55,7 @@ import qualified Data.IORef as I import Data.Streaming.Network (bindPortTCP, safeRecv) import Data.Typeable (Typeable) -import Network.Socket (Socket, sClose, withSocketsDo, SockAddr, accept) +import Network.Socket (Socket, close, withSocketsDo, SockAddr, accept) import Network.Socket.ByteString (sendAll) import qualified Network.TLS as TLS import qualified Crypto.PubKey.DH as DH @@ -234,7 +234,7 @@ runTLS tset set app = withSocketsDo $ bracket (bindPortTCP (getPort set) (getHost set)) - sClose + close (\sock -> runTLSSocket tset set sock app) ---------------------------------------------------------------- @@ -309,7 +309,7 @@ return (mkConn tlsset s params, sa) mkConn :: TLS.TLSParams params => TLSSettings -> Socket -> params -> IO (Connection, Transport) -mkConn tlsset s params = switch `onException` sClose s +mkConn tlsset s params = switch `onException` close s where switch = do firstBS <- safeRecv s 4096 @@ -334,7 +334,7 @@ where backend recvN = TLS.Backend { TLS.backendFlush = return () - , TLS.backendClose = sClose s + , TLS.backendClose = close s , TLS.backendSend = sendAll' s , TLS.backendRecv = recvN } @@ -344,7 +344,8 @@ connSendMany = TLS.sendData ctx . L.fromChunks , connSendAll = sendall , connSendFile = sendfile - , connClose = close + , connClose = close' + , connFree = freeBuffer writeBuf , connRecv = recv ref , connRecvBuf = recvBuf ref , connWriteBuffer = writeBuf @@ -355,9 +356,8 @@ sendfile fid offset len hook headers = readSendFile writeBuf bufferSize sendall fid offset len hook headers - close = freeBuffer writeBuf `finally` - void (tryIO $ TLS.bye ctx) `finally` - TLS.contextClose ctx + close' = void (tryIO $ TLS.bye ctx) `finally` + TLS.contextClose ctx -- TLS version of recv with a cache for leftover input data. -- The cache is shared with recvBuf. @@ -463,7 +463,7 @@ \r\nConnection: Upgrade\ \r\nContent-Type: text/plain\r\n\r\n" mapM_ (sendAll s) $ L.toChunks lbs - sClose s + close s throwIO InsecureConnectionDenied ---------------------------------------------------------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/warp-tls-3.2.2/warp-tls.cabal new/warp-tls-3.2.3/warp-tls.cabal --- old/warp-tls-3.2.2/warp-tls.cabal 2016-06-22 07:54:17.000000000 +0200 +++ new/warp-tls-3.2.3/warp-tls.cabal 2017-01-27 04:25:50.000000000 +0100 @@ -1,5 +1,5 @@ Name: warp-tls -Version: 3.2.2 +Version: 3.2.3 Synopsis: HTTP over TLS support for Warp via the TLS package License: MIT License-file: LICENSE @@ -10,7 +10,8 @@ Build-Type: Simple Cabal-Version: >=1.6 Stability: Stable -description: Support for SSL is now obsoleted. +description: SSLv1 and SSLv2 are obsoleted by IETF. + We should use TLS 1.2 (or TLS 1.1 or TLS 1.0 if necessary). HTTP/2 can be negotiated by ALPN. API docs and the README are available at <http://www.stackage.org/package/warp-tls>. @@ -20,7 +21,7 @@ Build-Depends: base >= 4 && < 5 , bytestring >= 0.9 , wai >= 3.2 && < 3.3 - , warp >= 3.2 && < 3.3 + , warp >= 3.2.10 && < 3.3 , data-default-class >= 0.0.1 , tls >= 1.3.5 , cryptonite >= 0.12
