Hello community, here is the log from the commit of package ghc-dbus for openSUSE:Factory checked in at 2020-06-19 17:11:50 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ghc-dbus (Old) and /work/SRC/openSUSE:Factory/.ghc-dbus.new.3606 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ghc-dbus" Fri Jun 19 17:11:50 2020 rev:15 rq:815073 version:1.2.15.1 Changes: -------- --- /work/SRC/openSUSE:Factory/ghc-dbus/ghc-dbus.changes 2020-05-11 13:35:20.540361489 +0200 +++ /work/SRC/openSUSE:Factory/.ghc-dbus.new.3606/ghc-dbus.changes 2020-06-19 17:11:54.425862224 +0200 @@ -1,0 +2,6 @@ +Tue Jun 9 09:10:54 UTC 2020 - [email protected] + +- Update dbus to version 1.2.15.1. + Upstream does not provide a change log file. + +------------------------------------------------------------------- Old: ---- dbus-1.2.14.tar.gz New: ---- dbus-1.2.15.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ghc-dbus.spec ++++++ --- /var/tmp/diff_new_pack.l86YXz/_old 2020-06-19 17:11:55.449864940 +0200 +++ /var/tmp/diff_new_pack.l86YXz/_new 2020-06-19 17:11:55.453864950 +0200 @@ -1,7 +1,7 @@ # # spec file for package ghc-dbus # -# Copyright (c) 2020 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,7 +19,7 @@ %global pkg_name dbus %bcond_with tests Name: ghc-%{pkg_name} -Version: 1.2.14 +Version: 1.2.15.1 Release: 0 Summary: A client library for the D-Bus IPC system License: Apache-2.0 ++++++ dbus-1.2.14.tar.gz -> dbus-1.2.15.1.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dbus-1.2.14/dbus.cabal new/dbus-1.2.15.1/dbus.cabal --- old/dbus-1.2.14/dbus.cabal 2020-04-28 04:55:31.000000000 +0200 +++ new/dbus-1.2.15.1/dbus.cabal 2020-05-11 05:48:50.000000000 +0200 @@ -1,6 +1,6 @@ -cabal-version: >=1.8 +cabal-version: >=1.10 name: dbus -version: 1.2.14 +version: 1.2.15.1 license: Apache-2.0 license-file: license.txt maintainer: Andrey Sverdlichenko <[email protected]> @@ -89,6 +89,7 @@ DBus.TH DBus.Transport hs-source-dirs: lib + default-language: Haskell2010 ghc-options: -W -Wall build-depends: base ==4.*, @@ -137,6 +138,7 @@ DBusTests.Util DBusTests.Variant DBusTests.Wire + default-language: Haskell2010 ghc-options: -W -Wall -fno-warn-orphans build-depends: dbus -any, @@ -153,7 +155,7 @@ QuickCheck <2.15, random <1.2, resourcet <1.3, - tasty <1.3, + tasty <1.4, tasty-hunit <0.11, tasty-quickcheck <0.11, text <1.3, @@ -165,6 +167,7 @@ type: exitcode-stdio-1.0 main-is: DBusBenchmarks.hs hs-source-dirs: benchmarks + default-language: Haskell2010 ghc-options: -Wall -fno-warn-orphans build-depends: dbus -any, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dbus-1.2.14/lib/DBus/Internal/Wire.hs new/dbus-1.2.15.1/lib/DBus/Internal/Wire.hs --- old/dbus-1.2.14/lib/DBus/Internal/Wire.hs 2020-04-27 04:35:18.000000000 +0200 +++ new/dbus-1.2.15.1/lib/DBus/Internal/Wire.hs 2020-05-11 05:23:55.000000000 +0200 @@ -464,8 +464,8 @@ unmarshalArray :: Type -> Unmarshal (Vector Value) unmarshalArray itemType = do let getOffset = do - (UnmarshalState _ o) <- getState - return o + (UnmarshalState _ o) <- getState + return o byteCount <- unmarshalWord32 skipPadding (alignment itemType) start <- getOffset @@ -611,10 +611,10 @@ -> m (Either UnmarshalError ReceivedMessage) unmarshalMessageM getBytes' = runErrorT $ do let getBytes count = do - bytes <- ErrorT (liftM Right (getBytes' count)) - if Data.ByteString.length bytes < count - then throwErrorT (UnmarshalError "Unexpected end of input while parsing message header.") - else return bytes + bytes <- ErrorT (liftM Right (getBytes' count)) + if Data.ByteString.length bytes < count + then throwErrorT (UnmarshalError "Unexpected end of input while parsing message header.") + else return bytes let Just fixedSig = parseSignature "yyyyuuu" fixedBytes <- getBytes 16 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dbus-1.2.14/lib/DBus/Socket.hs new/dbus-1.2.15.1/lib/DBus/Socket.hs --- old/dbus-1.2.14/lib/DBus/Socket.hs 2020-04-27 04:35:18.000000000 +0200 +++ new/dbus-1.2.15.1/lib/DBus/Socket.hs 2020-05-11 05:23:55.000000000 +0200 @@ -347,20 +347,20 @@ serverAuthExternal :: SocketTransport -> UUID -> IO Bool serverAuthExternal t uuid = do let waitForBegin = do - resp <- transportGetLine t - if resp == "BEGIN" - then return () - else waitForBegin + resp <- transportGetLine t + if resp == "BEGIN" + then return () + else waitForBegin let checkToken token = do - (_, uid, _) <- socketTransportCredentials t - let wantToken = concatMap (printf "%02X" . ord) (maybe "XXX" show uid) - if token == wantToken - then do - transportPutLine t ("OK " ++ formatUUID uuid) - waitForBegin - return True - else return False + (_, uid, _) <- socketTransportCredentials t + let wantToken = concatMap (printf "%02X" . ord) (maybe "XXX" show uid) + if token == wantToken + then do + transportPutLine t ("OK " ++ formatUUID uuid) + waitForBegin + return True + else return False c <- transportGet t 1 if c /= Char8.pack "\x00" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dbus-1.2.14/tests/DBusTests/Introspection.hs new/dbus-1.2.15.1/tests/DBusTests/Introspection.hs --- old/dbus-1.2.14/tests/DBusTests/Introspection.hs 2020-04-27 04:35:18.000000000 +0200 +++ new/dbus-1.2.15.1/tests/DBusTests/Introspection.hs 2020-05-11 05:23:55.000000000 +0200 @@ -129,10 +129,10 @@ subObject :: ObjectPath -> Gen I.Object subObject parentPath = sized $ \n -> resize (min n 4) $ do let nonRoot = do - x <- resize 10 arbitrary - case formatObjectPath x of - "/" -> nonRoot - x' -> return x' + x <- resize 10 arbitrary + case formatObjectPath x of + "/" -> nonRoot + x' -> return x' thisPath <- nonRoot let path' = case formatObjectPath parentPath of diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dbus-1.2.14/tests/DBusTests/Socket.hs new/dbus-1.2.15.1/tests/DBusTests/Socket.hs --- old/dbus-1.2.14/tests/DBusTests/Socket.hs 2020-04-27 04:35:18.000000000 +0200 +++ new/dbus-1.2.15.1/tests/DBusTests/Socket.hs 2020-05-11 05:04:31.000000000 +0200 @@ -91,32 +91,32 @@ openedVar <- forkVar (open addr) bracket (takeMVar acceptedVar) close $ \sock1 -> do - bracket (takeMVar openedVar) close $ \sock2 -> do - -- client -> server - do - serialVar <- newEmptyMVar - sentVar <- forkVar (send sock2 msg (putMVar serialVar)) - receivedVar <- forkVar (receive sock1) - - serial <- takeMVar serialVar - sent <- takeMVar sentVar - received <- takeMVar receivedVar - - sent @?= () - received @?= ReceivedMethodCall serial msg - - -- server -> client - do - serialVar <- newEmptyMVar - sentVar <- forkVar (send sock1 msg (putMVar serialVar)) - receivedVar <- forkVar (receive sock2) - - serial <- takeMVar serialVar - sent <- takeMVar sentVar - received <- takeMVar receivedVar + bracket (takeMVar openedVar) close $ \sock2 -> do + -- client -> server + do + serialVar <- newEmptyMVar + sentVar <- forkVar (send sock2 msg (putMVar serialVar)) + receivedVar <- forkVar (receive sock1) + + serial <- takeMVar serialVar + sent <- takeMVar sentVar + received <- takeMVar receivedVar + + sent @?= () + received @?= ReceivedMethodCall serial msg + + -- server -> client + do + serialVar <- newEmptyMVar + sentVar <- forkVar (send sock1 msg (putMVar serialVar)) + receivedVar <- forkVar (receive sock2) + + serial <- takeMVar serialVar + sent <- takeMVar sentVar + received <- takeMVar receivedVar - sent @?= () - received @?= ReceivedMethodCall serial msg + sent @?= () + received @?= ReceivedMethodCall serial msg dummyAuth :: Transport t => Authenticator t dummyAuth = authenticator
