Hello community, here is the log from the commit of package ghc-websockets for openSUSE:Factory checked in at 2017-01-31 12:41:00 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ghc-websockets (Old) and /work/SRC/openSUSE:Factory/.ghc-websockets.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ghc-websockets" Changes: -------- --- /work/SRC/openSUSE:Factory/ghc-websockets/ghc-websockets.changes 2017-01-18 21:40:34.942972891 +0100 +++ /work/SRC/openSUSE:Factory/.ghc-websockets.new/ghc-websockets.changes 2017-02-03 17:40:34.260328929 +0100 @@ -1,0 +2,10 @@ +Sun Dec 4 19:48:14 UTC 2016 - psimons@suse.com + +- Update to version 0.9.8.2 with cabal2obs. + +------------------------------------------------------------------- +Mon Aug 1 10:39:22 UTC 2016 - psimons@suse.com + +- Update to version 0.9.7.0 revision 0 with cabal2obs. + +------------------------------------------------------------------- Old: ---- 1.cabal websockets-0.9.6.2.tar.gz New: ---- websockets-0.9.8.2.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ghc-websockets.spec ++++++ --- /var/tmp/diff_new_pack.dCdGeC/_old 2017-02-03 17:40:34.648274019 +0100 +++ /var/tmp/diff_new_pack.dCdGeC/_new 2017-02-03 17:40:34.652273453 +0100 @@ -19,16 +19,14 @@ %global pkg_name websockets %bcond_with tests Name: ghc-%{pkg_name} -Version: 0.9.6.2 +Version: 0.9.8.2 Release: 0 Summary: A sensible and clean way to write WebSocket-capable servers in Haskell License: BSD-3-Clause -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 -Source1: https://hackage.haskell.org/package/%{pkg_name}-%{version}/revision/1.cabal BuildRequires: ghc-Cabal-devel -# Begin cabal-rpm deps: BuildRequires: ghc-SHA-devel BuildRequires: ghc-attoparsec-devel BuildRequires: ghc-base64-bytestring-devel @@ -50,7 +48,6 @@ BuildRequires: ghc-test-framework-hunit-devel BuildRequires: ghc-test-framework-quickcheck2-devel %endif -# End cabal-rpm deps %description This library allows you to write WebSocket-capable servers. @@ -82,22 +79,15 @@ %prep %setup -q -n %{pkg_name}-%{version} -cp -p %{SOURCE1} %{pkg_name}.cabal - %build %ghc_lib_build - %install %ghc_lib_install - %check -%if %{with tests} -%{cabal} test -%endif - +%cabal_test %post devel %ghc_pkg_recache ++++++ websockets-0.9.6.2.tar.gz -> websockets-0.9.8.2.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/websockets-0.9.6.2/CHANGELOG new/websockets-0.9.8.2/CHANGELOG --- old/websockets-0.9.6.2/CHANGELOG 2016-05-29 13:58:38.000000000 +0200 +++ new/websockets-0.9.8.2/CHANGELOG 2016-11-29 11:15:35.000000000 +0100 @@ -1,3 +1,18 @@ +- 0.9.8.2 + * Bump `HUnit` dependency to 1.5 + +- 0.9.8.1 + * Restore state of the package to version `0.9.7.0` + +- 0.9.8.0 + * This release contained a feature which broke backwards-compatibility. + Hence, it was marked as broken a new release containing the changes will + be uploaded as `0.10.0.0`. + +- 0.9.7.0 + * Fix issue trying to kill builtin server + * Bump `QuickCheck` dependency to 2.9 + - 0.9.6.2 * Bump `binary` dependency for GHC 8.0 compatibility diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/websockets-0.9.6.2/src/Network/WebSockets/Server.hs new/websockets-0.9.8.2/src/Network/WebSockets/Server.hs --- old/websockets-0.9.6.2/src/Network/WebSockets/Server.hs 2016-05-29 13:58:38.000000000 +0200 +++ new/websockets-0.9.8.2/src/Network/WebSockets/Server.hs 2016-11-29 11:15:35.000000000 +0100 @@ -15,8 +15,9 @@ -------------------------------------------------------------------------------- import Control.Concurrent (forkIOWithUnmask) -import Control.Exception (bracket, bracketOnError, - finally, throwIO, mask_) +import Control.Exception (allowInterrupt, bracket, + bracketOnError, finally, mask_, + throwIO) import Control.Monad (forever, void) import Network.Socket (Socket) import qualified Network.Socket as S @@ -60,7 +61,8 @@ (makeListenSocket host port) S.sClose (\sock -> - forever $ mask_ $ do + mask_ $ forever $ do + allowInterrupt (conn, _) <- S.accept sock void $ forkIOWithUnmask $ \unmask -> finally (unmask $ runApp conn opts app) (S.sClose conn) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/websockets-0.9.6.2/websockets.cabal new/websockets-0.9.8.2/websockets.cabal --- old/websockets-0.9.6.2/websockets.cabal 2016-05-29 13:58:38.000000000 +0200 +++ new/websockets-0.9.8.2/websockets.cabal 2016-11-29 11:15:35.000000000 +0100 @@ -1,5 +1,5 @@ Name: websockets -Version: 0.9.6.2 +Version: 0.9.8.2 Synopsis: A sensible and clean way to write WebSocket-capable servers in Haskell. @@ -70,7 +70,7 @@ Build-depends: attoparsec >= 0.10 && < 0.14, - base >= 4 && < 5, + base >= 4.4 && < 5, base64-bytestring >= 0.1 && < 1.1, binary >= 0.5 && < 0.9, blaze-builder >= 0.3 && < 0.5, @@ -97,8 +97,8 @@ Network.WebSockets.Tests.Util Build-depends: - HUnit >= 1.2 && < 1.4, - QuickCheck >= 2.7 && < 2.9, + HUnit >= 1.2 && < 1.6, + QuickCheck >= 2.7 && < 2.10, test-framework >= 0.4 && < 0.9, test-framework-hunit >= 0.2 && < 0.4, test-framework-quickcheck2 >= 0.2 && < 0.4,