From 91706f080d1e906f4b32ff34197c56aaea7faae8 Mon Sep 17 00:00:00 2001 From: citrus-it Date: Wed, 19 Jul 2017 13:56:27 +0000 Subject: [PATCH 1/2] dbus: update to 1.11.14 --- build/dbus/build.sh | 3 ++- build/dbus/testsuite.log | 50 ++++++++++++++++++++++++++++++++++++++++ doc/packages.md | 2 +- 3 files changed, 53 insertions(+), 2 deletions(-) create mode 100644 build/dbus/testsuite.log diff --git a/build/dbus/build.sh b/build/dbus/build.sh index c94ccfdaa6..7539581061 100755 --- a/build/dbus/build.sh +++ b/build/dbus/build.sh @@ -28,7 +28,7 @@ . ../../lib/functions.sh PROG=dbus -VER=1.11.12 +VER=1.11.14 PKG=dbus ##IGNORE## SUMMARY="$PROG - IPC-based message notifications" DESC="$SUMMARY" @@ -81,6 +81,7 @@ download_source $PROG $PROG $VER patch_source prep_build build +run_testsuite check make_isa_stub post_install diff --git a/build/dbus/testsuite.log b/build/dbus/testsuite.log new file mode 100644 index 0000000000..cad12f3fb8 --- /dev/null +++ b/build/dbus/testsuite.log @@ -0,0 +1,50 @@ +Making check in dbus +Making check in bus +Making check in tools +Making check in test +Making check in . + GEN copy-config-local +-- No need to copy test data as srcdir = builddir + GEN uninstalled-config-local +PASS: test-shell 1 +PASS: test-shell 2 +PASS: test-shell 3 +PASS: test-shell 4 +PASS: test-shell 5 +PASS: test-shell 6 +PASS: test-shell 7 +PASS: test-shell 8 +PASS: test-shell 9 +PASS: test-shell 10 +PASS: test-shell 11 +PASS: test-printf 1 +PASS: test-printf 2 +PASS: test-printf 3 +PASS: test-printf 4 +PASS: test-printf 5 +PASS: test-printf 6 +PASS: test-printf 7 +============================================================================ +Testsuite summary for dbus 1.11.14 +============================================================================ +# TOTAL: 18 +# PASS: 18 +# SKIP: 0 +# XFAIL: 0 +# FAIL: 0 +# XPASS: 0 +# ERROR: 0 +============================================================================ +Making check in name-test +============================================================================ +Testsuite summary for dbus 1.11.14 +============================================================================ +# TOTAL: 0 +# PASS: 0 +# SKIP: 0 +# XFAIL: 0 +# FAIL: 0 +# XPASS: 0 +# ERROR: 0 +============================================================================ +Making check in doc diff --git a/doc/packages.md b/doc/packages.md index 1a7875a2a9..cc70620757 100644 --- a/doc/packages.md +++ b/doc/packages.md @@ -53,7 +53,7 @@ | shell/pipe-viewer | 1.6.6 | http://www.ivarch.com/programs/pv.shtml | shell/tcsh | 6.20.0 | http://www.tcsh.org/ | shell/zsh | 5.3.1 | http://zsh.sourceforge.net/News/ -| system/library/dbus | 1.11.12 | https://www.freedesktop.org/wiki/Software/dbus/#index5h1 +| system/library/dbus | 1.11.14 | https://www.freedesktop.org/wiki/Software/dbus/#index5h1 | system/library/pcap | 1.8.1 | http://www.tcpdump.org/#latest-releases | system/management/ipmitool | 1.8.18 | https://sourceforge.net/projects/ipmitool/ | system/management/snmp/net-snmp | 5.7.3 | http://www.net-snmp.org/download.html From 2e7ce7a738eb09945098ea75460611d86ac019ba Mon Sep 17 00:00:00 2001 From: citrus-it Date: Wed, 19 Jul 2017 14:08:43 +0000 Subject: [PATCH 2/2] remove minor version incorporation on dbus --- build/jeos/omnios-userland.p5m | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/jeos/omnios-userland.p5m b/build/jeos/omnios-userland.p5m index c5c368e207..e77a4749e5 100644 --- a/build/jeos/omnios-userland.p5m +++ b/build/jeos/omnios-userland.p5m @@ -97,7 +97,7 @@ depend fmri=system/install/kayak@1.1,5.11-@PVER@ type=incorporate depend fmri=system/install/kayak-kernel@1.1,5.11-@PVER@ type=incorporate depend fmri=system/kvm@1.0,5.11-@PVER@ type=incorporate depend fmri=system/library/c++/sunpro@0.5.11,5.11-@PVER@ type=incorporate -depend fmri=system/library/dbus@1.11.12,5.11-@PVER@ type=incorporate +depend fmri=system/library/dbus@1.11,5.11-@PVER@ type=incorporate depend fmri=system/library/g++-4-runtime@4.8.1,5.11-@PVER@ type=incorporate depend fmri=system/library/gcc-4-runtime@4.8.1,5.11-@PVER@ type=incorporate depend fmri=system/library/g++-5-runtime@5.1,5.11-@PVER@ type=incorporate