Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package ghc-dbus for openSUSE:Factory checked in at 2024-12-20 23:10:30 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ghc-dbus (Old) and /work/SRC/openSUSE:Factory/.ghc-dbus.new.1881 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ghc-dbus" Fri Dec 20 23:10:30 2024 rev:30 rq:1231437 version:1.3.9 Changes: -------- --- /work/SRC/openSUSE:Factory/ghc-dbus/ghc-dbus.changes 2024-05-03 10:27:18.607662207 +0200 +++ /work/SRC/openSUSE:Factory/.ghc-dbus.new.1881/ghc-dbus.changes 2024-12-20 23:10:52.337095691 +0100 @@ -1,0 +2,6 @@ +Sat Oct 26 18:12:15 UTC 2024 - Peter Simons <[email protected]> + +- Update dbus to version 1.3.9. + Upstream does not provide a change log file. + +------------------------------------------------------------------- Old: ---- dbus-1.3.3.tar.gz New: ---- dbus-1.3.9.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ghc-dbus.spec ++++++ --- /var/tmp/diff_new_pack.1XYFem/_old 2024-12-20 23:10:53.501143633 +0100 +++ /var/tmp/diff_new_pack.1XYFem/_new 2024-12-20 23:10:53.501143633 +0100 @@ -20,7 +20,7 @@ %global pkgver %{pkg_name}-%{version} %bcond_with tests Name: ghc-%{pkg_name} -Version: 1.3.3 +Version: 1.3.9 Release: 0 Summary: A client library for the D-Bus IPC system License: Apache-2.0 ++++++ dbus-1.3.3.tar.gz -> dbus-1.3.9.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dbus-1.3.3/benchmarks/DBusBenchmarks.hs new/dbus-1.3.9/benchmarks/DBusBenchmarks.hs --- old/dbus-1.3.3/benchmarks/DBusBenchmarks.hs 2023-08-22 19:28:18.000000000 +0200 +++ new/dbus-1.3.9/benchmarks/DBusBenchmarks.hs 1970-01-01 01:00:00.000000000 +0100 @@ -1,91 +0,0 @@ -{-# LANGUAGE OverloadedStrings #-} - --- Copyright (C) 2010-2011 John Millikin <[email protected]> --- --- Licensed under the Apache License, Version 2.0 (the "License"); --- you may not use this file except in compliance with the License. --- You may obtain a copy of the License at --- --- http://www.apache.org/licenses/LICENSE-2.0 --- --- Unless required by applicable law or agreed to in writing, software --- distributed under the License is distributed on an "AS IS" BASIS, --- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. --- See the License for the specific language governing permissions and --- limitations under the License. - -module Main (benchmarks, main) where - -import Criterion.Types -import Data.Word (Word32) -import Unsafe.Coerce (unsafeCoerce) -import qualified Criterion.Main - -import DBus - -serial :: Word32 -> Serial -serial = unsafeCoerce -- FIXME: should the Serial constructor be exposed to - -- clients? - -empty_MethodCall :: MethodCall -empty_MethodCall = methodCall "/" "org.i" "m" - -empty_MethodReturn :: MethodReturn -empty_MethodReturn = methodReturn (serial 0) - -benchMarshal :: Message msg => String -> msg -> Benchmark -benchMarshal name msg = bench name (whnf (marshalWithFds LittleEndian (serial 0)) msg) - -benchUnmarshal :: Message msg => String -> msg -> Benchmark -benchUnmarshal name msg = bench name (whnf (uncurry unmarshalWithFds) (bytes, fds)) where - Right (bytes, fds) = marshalWithFds LittleEndian (serial 0) msg - -parseSig :: String -> Maybe Signature -parseSig = parseSignature - -benchmarks :: [Benchmark] -benchmarks = - [ bgroup "Types" - [ bgroup "Signature" - [ bench "parseSignature/small" (nf parseSig "y") - , bench "parseSignature/medium" (nf parseSig "yyyyuua(yv)") - , bench "parseSignature/large" (nf parseSig "a{s(asiiiiasa(siiia{s(iiiiv)}))}") - ] - , bgroup "ObjectPath" - [ bench "objectPath_/small" (nf objectPath_ "/") - , bench "objectPath_/medium" (nf objectPath_ "/foo/bar") - , bench "objectPath_/large" (nf objectPath_ "/f0OO/b4R/baz_qux/blahblahblah") - ] - , bgroup "InterfaceName" - [ bench "interfaceName_/small" (nf interfaceName_ "f.b") - , bench "interfaceName_/medium" (nf interfaceName_ "foo.bar.baz") - , bench "interfaceName_/large" (nf interfaceName_ "f0OOO.b4R.baz_qux.blahblahblah") - ] - , bgroup "MemberName" - [ bench "memberName_/small" (nf memberName_ "f") - , bench "memberName_/medium" (nf memberName_ "FooBar") - , bench "memberName_/large" (nf memberName_ "f0OOOb4RBazQuxBlahBlahBlah") - ] - , bgroup "ErrorName" - [ bench "errorName_/small" (nf errorName_ "f.b") - , bench "errorName_/medium" (nf errorName_ "foo.bar.baz") - , bench "errorName_/large" (nf errorName_ "f0OOO.b4R.baz_qux.blahblahblah") - ] - , bgroup "BusName" - [ bench "busName_/small" (nf busName_ "f.b") - , bench "busName_/medium" (nf busName_ "foo.bar.baz") - , bench "busName_/large" (nf busName_ "f0OOO.b4R.baz-qux.blahblahblah") - ] - ] - , bgroup "Marshal" - [ benchMarshal "MethodCall/empty" empty_MethodCall - , benchMarshal "MethodReturn/empty" empty_MethodReturn - ] - , bgroup "Unmarshal" - [ benchUnmarshal "MethodCall/empty" empty_MethodCall - , benchUnmarshal "MethodReturn/empty" empty_MethodReturn - ] - ] - -main :: IO () -main = Criterion.Main.defaultMain benchmarks diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dbus-1.3.3/dbus.cabal new/dbus-1.3.9/dbus.cabal --- old/dbus-1.3.3/dbus.cabal 2024-04-24 23:17:46.000000000 +0200 +++ new/dbus-1.3.9/dbus.cabal 2024-10-26 19:45:24.000000000 +0200 @@ -1,5 +1,5 @@ name: dbus -version: 1.3.3 +version: 1.3.9 license: Apache-2.0 license-file: license.txt author: John Millikin <[email protected]> @@ -85,16 +85,16 @@ , bytestring < 0.13 , cereal < 0.6 , conduit >= 1.3.0 && < 1.4 - , containers < 0.7 + , containers < 0.8 , deepseq < 1.6 , exceptions < 0.11 - , filepath < 1.5 - , lens < 5.3 - , network >= 3.1.2.1 && < 3.2 + , filepath < 1.6 + , lens < 5.4 + , network >= 3.2 && < 3.3 , parsec < 3.2 , random < 1.3 , split < 0.3 - , template-haskell >= 2.18 && < 2.22 + , template-haskell >= 2.18 && < 2.23 , text < 2.2 , th-lift < 0.9 , transformers < 0.7 @@ -131,11 +131,11 @@ , base >=4 && <5 , bytestring < 0.13 , cereal < 0.6 - , containers < 0.7 + , containers < 0.8 , directory < 1.4 - , extra < 1.8 - , filepath < 1.5 - , network >= 3.1.2.1 && < 3.2 + , extra < 1.9 + , filepath < 1.6 + , network >= 3.2 && < 3.3 , parsec < 3.2 , process < 1.7 , QuickCheck < 2.16 @@ -143,7 +143,7 @@ , resourcet < 1.4 , tasty < 1.6 , tasty-hunit < 0.11 - , tasty-quickcheck < 0.11 + , tasty-quickcheck < 0.12 , temporary >= 1.3 && < 1.4 , text < 2.2 , transformers < 0.7 @@ -170,15 +170,3 @@ DBusTests.Util DBusTests.Variant DBusTests.Wire - -benchmark dbus_benchmarks - 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 - , base >=4 && <5 - , criterion < 1.7 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dbus-1.3.3/lib/DBus/Transport.hs new/dbus-1.3.9/lib/DBus/Transport.hs --- old/dbus-1.3.3/lib/DBus/Transport.hs 2024-04-24 23:17:46.000000000 +0200 +++ new/dbus-1.3.9/lib/DBus/Transport.hs 2024-10-26 19:44:40.000000000 +0200 @@ -56,7 +56,7 @@ import Foreign.Ptr (castPtr, plusPtr) import Foreign.Storable (sizeOf) import Network.Socket -import Network.Socket.Address (SocketAddress(..)) +import Network.Socket.Internal (NullSockAddr(..)) import qualified Network.Socket.Address import Network.Socket.ByteString (recvMsg) import qualified System.Info @@ -183,19 +183,10 @@ transportGetWithFds (SocketTransport addr s) n = catchIOException addr (recvWithFds s n) transportClose (SocketTransport addr s) = catchIOException addr (close s) --- todo: import NullSockAddr from network package, when released --- (https://github.com/haskell/network/pull/562) -data NullSockAddr = NullSockAddr - -instance SocketAddress NullSockAddr where - sizeOfSocketAddress NullSockAddr = 0 - peekSocketAddress _ptr = return NullSockAddr - pokeSocketAddress _ptr NullSockAddr = return () - sendWithFds :: Socket -> ByteString -> [Fd] -> IO () sendWithFds s msg fds = loop 0 where loop acc = do - let cmsgs = if acc == 0 then (encodeCmsg <$> fds) else [] + let cmsgs = if acc == 0 then (encodeCmsg . (pure :: Fd -> [Fd]) <$> fds) else [] n <- unsafeUseAsCString msg $ \cstr -> do let buf = [(plusPtr (castPtr cstr) acc, len - acc)] Network.Socket.Address.sendBufMsg s NullSockAddr buf cmsgs mempty @@ -512,7 +503,7 @@ -- from the network package in future (https://github.com/haskell/network/issues/566) decodeFdCmsg :: Cmsg -> Maybe [Fd] decodeFdCmsg (Cmsg cmsid (PS fptr off len)) - | cmsid /= CmsgIdFd = Nothing + | cmsid /= CmsgIdFds = Nothing | otherwise = unsafeDupablePerformIO $ withForeignPtr fptr $ \p0 -> do let p = castPtr (p0 `plusPtr` off)
