Hello community, here is the log from the commit of package ghc-dbus for openSUSE:Factory checked in at 2019-02-24 17:18:36 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ghc-dbus (Old) and /work/SRC/openSUSE:Factory/.ghc-dbus.new.28833 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ghc-dbus" Sun Feb 24 17:18:36 2019 rev:6 rq:678027 version:1.2.4 Changes: -------- --- /work/SRC/openSUSE:Factory/ghc-dbus/ghc-dbus.changes 2019-02-17 12:20:01.904222157 +0100 +++ /work/SRC/openSUSE:Factory/.ghc-dbus.new.28833/ghc-dbus.changes 2019-02-24 17:18:37.008416176 +0100 @@ -1,0 +2,6 @@ +Sat Feb 16 03:02:14 UTC 2019 - [email protected] + +- Update dbus to version 1.2.4. + Upstream does not provide a change log file. + +------------------------------------------------------------------- Old: ---- dbus-1.2.3.tar.gz New: ---- dbus-1.2.4.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ghc-dbus.spec ++++++ --- /var/tmp/diff_new_pack.L0eHEl/_old 2019-02-24 17:18:37.580416074 +0100 +++ /var/tmp/diff_new_pack.L0eHEl/_new 2019-02-24 17:18:37.584416073 +0100 @@ -19,7 +19,7 @@ %global pkg_name dbus %bcond_with tests Name: ghc-%{pkg_name} -Version: 1.2.3 +Version: 1.2.4 Release: 0 Summary: A client library for the D-Bus IPC system License: Apache-2.0 ++++++ dbus-1.2.3.tar.gz -> dbus-1.2.4.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dbus-1.2.3/dbus.cabal new/dbus-1.2.4/dbus.cabal --- old/dbus-1.2.3/dbus.cabal 2019-01-21 04:36:10.000000000 +0100 +++ new/dbus-1.2.4/dbus.cabal 2019-02-15 04:26:05.000000000 +0100 @@ -1,6 +1,6 @@ cabal-version: >=1.8 name: dbus -version: 1.2.3 +version: 1.2.4 license: Apache-2.0 license-file: license.txt maintainer: Andrey Sverdlichenko <[email protected]> @@ -100,7 +100,7 @@ exceptions <0.11, filepath <1.5, lens <4.18, - network <2.9, + network ==2.8.0.0 || >=3.0.1.0 && <3.1, parsec <3.2, random <1.2, split <0.3, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dbus-1.2.3/lib/DBus/Generation.hs new/dbus-1.2.4/lib/DBus/Generation.hs --- old/dbus-1.2.3/lib/DBus/Generation.hs 2019-01-21 04:20:30.000000000 +0100 +++ new/dbus-1.2.4/lib/DBus/Generation.hs 2019-02-14 16:37:47.000000000 +0100 @@ -24,7 +24,6 @@ import Data.Word import Language.Haskell.TH import Prelude hiding (mapM) -import System.IO.Unsafe import System.Posix.Types (Fd(..)) type ClientBusPathR a = ReaderT (Client, T.BusName, T.ObjectPath) IO a diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dbus-1.2.3/lib/DBus/Socket.hs new/dbus-1.2.4/lib/DBus/Socket.hs --- old/dbus-1.2.3/lib/DBus/Socket.hs 2019-01-21 04:20:30.000000000 +0100 +++ new/dbus-1.2.4/lib/DBus/Socket.hs 2019-02-14 16:37:47.000000000 +0100 @@ -354,7 +354,7 @@ let checkToken token = do (_, uid, _) <- socketTransportCredentials t - let wantToken = concatMap (printf "%02X" . ord) (show uid) + let wantToken = concatMap (printf "%02X" . ord) (maybe "XXX" show uid) if token == wantToken then do transportPutLine t ("OK " ++ formatUUID uuid) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dbus-1.2.3/lib/DBus/Transport.hs new/dbus-1.2.4/lib/DBus/Transport.hs --- old/dbus-1.2.3/lib/DBus/Transport.hs 2019-01-21 04:20:30.000000000 +0100 +++ new/dbus-1.2.4/lib/DBus/Transport.hs 2019-02-14 16:37:47.000000000 +0100 @@ -198,9 +198,9 @@ -- | Returns the processID, userID, and groupID of the socket's peer. -- --- See 'getPeerCred'. -socketTransportCredentials :: SocketTransport -> IO (CUInt, CUInt, CUInt) -socketTransportCredentials (SocketTransport a s) = catchIOException a (getPeerCred s) +-- See 'getPeerCredential'. +socketTransportCredentials :: SocketTransport -> IO (Maybe CUInt, Maybe CUInt, Maybe CUInt) +socketTransportCredentials (SocketTransport a s) = catchIOException a (getPeerCredential s) openUnix :: Address -> IO SocketTransport openUnix transportAddr = go where diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dbus-1.2.3/tests/DBusTests/Transport.hs new/dbus-1.2.4/tests/DBusTests/Transport.hs --- old/dbus-1.2.3/tests/DBusTests/Transport.hs 2019-01-21 04:20:30.000000000 +0100 +++ new/dbus-1.2.4/tests/DBusTests/Transport.hs 2019-02-14 16:37:47.000000000 +0100 @@ -256,11 +256,12 @@ fdcountBefore @=? fdcountAfter test_OpenTcp_NotListening :: TestTree -test_OpenTcp_NotListening = testCase "too-many" $ runResourceT $ do +test_OpenTcp_NotListening = testCase "not-listening" $ runResourceT $ do fdcountBefore <- countFileDescriptors (addr, _, key) <- listenRandomIPv4 release key + liftIO $ assertThrows (\err -> and [ "Connection refused" `isInfixOf` transportErrorMessage err @@ -537,8 +538,6 @@ assertThrows (\err -> and [ "accept" `isInfixOf` transportErrorMessage err - , "socket" `isInfixOf` transportErrorMessage err - , "Closed" `isInfixOf` transportErrorMessage err , transportErrorAddress err == Just listeningAddr ]) (transportAccept listener) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dbus-1.2.3/tests/DBusTests/Util.hs new/dbus-1.2.4/tests/DBusTests/Util.hs --- old/dbus-1.2.3/tests/DBusTests/Util.hs 2019-01-21 04:20:30.000000000 +0100 +++ new/dbus-1.2.4/tests/DBusTests/Util.hs 2019-02-14 16:37:47.000000000 +0100 @@ -55,7 +55,6 @@ import qualified Data.ByteString.Lazy import qualified Data.Map as Map import qualified Data.Text as T -import qualified Network as N import qualified Network.Socket as NS import qualified System.Posix as Posix @@ -97,7 +96,7 @@ let sockAddr = NS.SockAddrUnix path (_, sock) <- allocate (NS.socket NS.AF_UNIX NS.Stream NS.defaultProtocol) - N.sClose + NS.close liftIO (NS.bind sock sockAddr) liftIO (NS.listen sock 1) _ <- register (removeFile path) @@ -114,7 +113,7 @@ (key, sock) <- allocate (NS.socket NS.AF_UNIX NS.Stream NS.defaultProtocol) - N.sClose + NS.close liftIO $ NS.bind sock sockAddr liftIO $ NS.listen sock 1 @@ -124,14 +123,19 @@ ]) return (addr, key) -listenRandomIPv4 :: MonadResource m => m (Address, N.Socket, ReleaseKey) +listenRandomIPv4 :: MonadResource m => m (Address, NS.Socket, ReleaseKey) listenRandomIPv4 = do - hostAddr <- liftIO $ NS.inet_addr "127.0.0.1" - let sockAddr = NS.SockAddrInet 0 hostAddr + let hints = NS.defaultHints + { NS.addrFlags = [NS.AI_NUMERICHOST] + , NS.addrFamily = NS.AF_INET + , NS.addrSocketType = NS.Stream + } + hostAddr <- liftIO $ NS.getAddrInfo (Just hints) (Just "127.0.0.1") Nothing + let sockAddr = NS.addrAddress $ head hostAddr (key, sock) <- allocate (NS.socket NS.AF_INET NS.Stream NS.defaultProtocol) - N.sClose + NS.close liftIO $ NS.bind sock sockAddr liftIO $ NS.listen sock 1 @@ -152,7 +156,7 @@ (_, sock) <- allocate (NS.socket NS.AF_INET6 NS.Stream NS.defaultProtocol) - N.sClose + NS.close liftIO $ NS.bind sock sockAddr liftIO $ NS.listen sock 1
