diff -Nru haskell-network-2.6.3.5/CHANGELOG.md haskell-network-2.6.3.6/CHANGELOG.md --- haskell-network-2.6.3.5/CHANGELOG.md 2018-03-27 23:42:13.000000000 +0000 +++ haskell-network-2.6.3.6/CHANGELOG.md 2018-07-07 14:30:56.000000000 +0000 @@ -1,3 +1,7 @@ +## Version 2.6.3.6 + * Removed unnecessary withMVar, which caused locking on close. + [#330](https://github.com/haskell/network/pull/330) + ## Version 2.6.3.5 * Reverting "Do not closeFd within sendFd" [#271](https://github.com/haskell/network/pull/271) diff -Nru haskell-network-2.6.3.5/configure.ac haskell-network-2.6.3.6/configure.ac --- haskell-network-2.6.3.5/configure.ac 2018-03-27 23:42:13.000000000 +0000 +++ haskell-network-2.6.3.6/configure.ac 2018-07-07 14:30:56.000000000 +0000 @@ -1,4 +1,4 @@ -AC_INIT([Haskell network package], [2.6.3.5], [libraries@haskell.org], [network]) +AC_INIT([Haskell network package], [2.6.3.6], [libraries@haskell.org], [network]) ac_includes_default="$ac_includes_default #ifdef HAVE_SYS_SOCKET_H @@ -101,7 +101,7 @@ fi dnl -------------------------------------------------- -dnl * test for GETPEEREID(3) +dnl * test for GETPEEREID(3) dnl -------------------------------------------------- AC_MSG_CHECKING(for getpeereid in unistd.h) AC_CHECK_FUNC( getpeereid, AC_DEFINE([HAVE_GETPEEREID], [1], [Define to 1 if you have getpeereid.] )) diff -Nru haskell-network-2.6.3.5/debian/changelog haskell-network-2.6.3.6/debian/changelog --- haskell-network-2.6.3.5/debian/changelog 2018-04-09 20:39:50.000000000 +0000 +++ haskell-network-2.6.3.6/debian/changelog 2018-09-30 08:10:57.000000000 +0000 @@ -1,3 +1,14 @@ +haskell-network (2.6.3.6-1) unstable; urgency=medium + + [ Clint Adams ] + * Set Rules-Requires-Root to no. + + [ Ilias Tsitsimpis ] + * Bump debhelper compat level to 10 + * New upstream release + + -- Ilias Tsitsimpis Sun, 30 Sep 2018 11:10:57 +0300 + haskell-network (2.6.3.5-1) unstable; urgency=medium [ Ilias Tsitsimpis ] diff -Nru haskell-network-2.6.3.5/debian/compat haskell-network-2.6.3.6/debian/compat --- haskell-network-2.6.3.5/debian/compat 2018-04-09 20:39:50.000000000 +0000 +++ haskell-network-2.6.3.6/debian/compat 2018-09-30 08:10:57.000000000 +0000 @@ -1 +1 @@ -9 +10 diff -Nru haskell-network-2.6.3.5/debian/control haskell-network-2.6.3.6/debian/control --- haskell-network-2.6.3.5/debian/control 2018-04-09 20:39:50.000000000 +0000 +++ haskell-network-2.6.3.6/debian/control 2018-09-30 08:10:57.000000000 +0000 @@ -3,7 +3,8 @@ Uploaders: Joachim Breitner , Dmitry Bogatov Priority: optional Section: haskell -Build-Depends: debhelper (>= 9), +Rules-Requires-Root: no +Build-Depends: debhelper (>= 10), haskell-devscripts (>= 0.13), autotools-dev, cdbs, @@ -13,7 +14,7 @@ Standards-Version: 4.1.4 Homepage: https://github.com/haskell/network Vcs-Browser: https://salsa.debian.org/haskell-team/DHG_packages/tree/master/p/haskell-network -Vcs-Git: https://salsa.debian.org/haskell-team/DHG_packages.git +Vcs-Git: https://salsa.debian.org/haskell-team/DHG_packages.git [p/haskell-network] X-Description: Haskell low-level network library Library `network' provides means to perform network operations on level of ByteString's and sockets. diff -Nru haskell-network-2.6.3.5/Network/Socket.hsc haskell-network-2.6.3.6/Network/Socket.hsc --- haskell-network-2.6.3.5/Network/Socket.hsc 2018-03-27 23:42:13.000000000 +0000 +++ haskell-network-2.6.3.6/Network/Socket.hsc 2018-07-07 14:30:56.000000000 +0000 @@ -578,7 +578,8 @@ -> IO (Socket, -- Readable Socket SockAddr) -- Peer details -accept sock@(MkSocket s family stype protocol status) = withMVar status $ \currentStatus -> do +accept sock@(MkSocket s family stype protocol status) = do + currentStatus <- readMVar status if not $ isAcceptable family stype currentStatus then ioError $ userError $ diff -Nru haskell-network-2.6.3.5/network.cabal haskell-network-2.6.3.6/network.cabal --- haskell-network-2.6.3.5/network.cabal 2018-03-27 23:42:13.000000000 +0000 +++ haskell-network-2.6.3.6/network.cabal 2018-07-07 14:30:56.000000000 +0000 @@ -1,5 +1,5 @@ name: network -version: 2.6.3.5 +version: 2.6.3.6 license: BSD3 license-file: LICENSE maintainer: Kazu Yamamoto, Evan Borden