From 7f1b370fcbb2ef44e857479af243463f14927c25 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Nov 19 2015 15:51:17 +0000 Subject: import dbus-1.6.12-13.el7 --- diff --git a/SOURCES/dbus-1.6.12-auth-process-ok-message-dispatch-test-fix.patch b/SOURCES/dbus-1.6.12-auth-process-ok-message-dispatch-test-fix.patch new file mode 100644 index 0000000..5f0ef18 --- /dev/null +++ b/SOURCES/dbus-1.6.12-auth-process-ok-message-dispatch-test-fix.patch @@ -0,0 +1,47 @@ +From b17615cda8a7ec80692d84e544b71e8183461aa5 Mon Sep 17 00:00:00 2001 +From: Roy Li +Date: Wed, 21 Jan 2015 09:28:53 +0000 +Subject: [PATCH] dbus: clear guid_from_server if send_negotiate_unix_fd failed + +Once send_negotiate_unix_fd failed, this failure will happen, since +auth->guid_from_server has been set to some value before +send_negotiate_unix_fd. send_negotiate_unix_fd failure will lead to this +auth be handled by process_ok again, but this auth->guid_from_server is +not zero. + +So we should clear auth->guid_from_server if send_negotiate_unix_fd +failed. + +http://lists.freedesktop.org/archives/dbus/2014-February/016122.html +https://bugs.freedesktop.org/show_bug.cgi?id=75589 +https://bugzilla.redhat.com/show_bug.cgi?id=1183755 + +Signed-off-by: Roy Li +--- + dbus/dbus-auth.c | 10 +++++++++- + 1 file changed, 9 insertions(+), 1 deletion(-) + +diff --git a/dbus/dbus-auth.c b/dbus/dbus-auth.c +index d2c37a7..dd6e61d 100644 +--- a/dbus/dbus-auth.c ++++ b/dbus/dbus-auth.c +@@ -1572,7 +1572,15 @@ process_ok(DBusAuth *auth, + _dbus_string_get_const_data (& DBUS_AUTH_CLIENT (auth)->guid_from_server)); + + if (auth->unix_fd_possible) +- return send_negotiate_unix_fd(auth); ++ { ++ if (!send_negotiate_unix_fd (auth)) ++ { ++ _dbus_string_set_length (& DBUS_AUTH_CLIENT (auth)->guid_from_server, 0); ++ return FALSE; ++ } ++ ++ return TRUE; ++ } + + _dbus_verbose("Not negotiating unix fd passing, since not possible\n"); + return send_begin (auth); +-- +2.2.1 + diff --git a/SOURCES/dbus-1.6.12-reduce-session-conf-fd-limits.patch b/SOURCES/dbus-1.6.12-reduce-session-conf-fd-limits.patch new file mode 100644 index 0000000..e6c26e5 --- /dev/null +++ b/SOURCES/dbus-1.6.12-reduce-session-conf-fd-limits.patch @@ -0,0 +1,14 @@ +diff -urN dbus-1.6.12.old/bus/session.conf.in dbus-1.6.12/bus/session.conf.in +--- dbus-1.6.12.old/bus/session.conf.in 2013-02-12 11:45:32.000000000 +0000 ++++ dbus-1.6.12/bus/session.conf.in 2015-02-10 19:28:00.203226659 +0000 +@@ -52,8 +52,8 @@ + 4096 + 120000 + 240000 +- 100000 +- 10000 ++ 900 ++ 92 + 100000 + 10000 + 50000 diff --git a/SOURCES/dbus-1.6.12-refresh-man-pages-and-dbus-launch-help.patch b/SOURCES/dbus-1.6.12-refresh-man-pages-and-dbus-launch-help.patch new file mode 100644 index 0000000..6249055 --- /dev/null +++ b/SOURCES/dbus-1.6.12-refresh-man-pages-and-dbus-launch-help.patch @@ -0,0 +1,66 @@ +diff -urN dbus-1.6.12.old/doc/dbus-launch.1 dbus-1.6.12/doc/dbus-launch.1 +--- dbus-1.6.12.old/doc/dbus-launch.1 2012-08-13 19:08:25.000000000 +0100 ++++ dbus-1.6.12/doc/dbus-launch.1 2015-05-29 13:32:50.450058799 +0100 +@@ -7,7 +7,7 @@ + dbus\-launch \- Utility to start a message bus from a shell script + .SH SYNOPSIS + .PP +-.B dbus\-launch [\-\-version] [\-\-sh\-syntax] [\-\-csh\-syntax] [\-\-auto\-syntax] [\-\-exit\-with\-session] [\-\-autolaunch=MACHINEID] [\-\-config\-file=FILENAME] [PROGRAM] [ARGS...] ++.B dbus\-launch [\-\-version] [\-\-help] [\-\-sh\-syntax] [\-\-csh\-syntax] [\-\-auto\-syntax] [\-\-binary\-syntax] [\-\-close\-stderr] [\-\-exit\-with\-session] [\-\-autolaunch=MACHINEID] [\-\-config\-file=FILENAME] [PROGRAM] [ARGS...] + + .SH DESCRIPTION + +@@ -190,6 +190,10 @@ + .I "\-\-version" + Print the version of dbus\-launch + ++.TP ++.I "\-\-help" ++Print the help info of dbus\-launch ++ + .SH NOTES + + If you run +diff -urN dbus-1.6.12.old/doc/dbus-send.1 dbus-1.6.12/doc/dbus-send.1 +--- dbus-1.6.12.old/doc/dbus-send.1 2012-06-06 11:45:55.000000000 +0100 ++++ dbus-1.6.12/doc/dbus-send.1 2015-05-29 13:21:58.335924252 +0100 +@@ -8,7 +8,8 @@ + .SH SYNOPSIS + .PP + .B dbus\-send +-[\fB\-\-system\fP | \fB\-\-session\fP] ++[\fB\-\-help\fP] ++[\fB\-\-system\fP | \fB\-\-session\fP | \fB\-\-address=\fIADDRESS\fP] + [\fB\-\-dest=\fINAME\fP] + [\fB\-\-print\-reply\fP[\fB=literal\fP]] + [\fB\-\-reply\-timeout=\fIMSEC\fP] +@@ -98,8 +99,14 @@ + .B "\-\-session" + Send to the session message bus. (This is the default.) + .TP ++.BI \-\-address= ADDRESS ++Send to \fIADDRESS\fP. ++.TP + .BI \-\-type= TYPE + Specify \fBmethod_call\fP or \fBsignal\fP (defaults to "\fBsignal\fP"). ++.TP ++.B "\-\-help" ++Print the help info of dbus\-send. + + .SH AUTHOR + dbus\-send was written by Philip Blundell. +diff -urN dbus-1.6.12.old/tools/dbus-launch.c dbus-1.6.12/tools/dbus-launch.c +--- dbus-1.6.12.old/tools/dbus-launch.c 2013-06-12 13:55:29.000000000 +0100 ++++ dbus-1.6.12/tools/dbus-launch.c 2015-05-29 13:36:25.645035413 +0100 +@@ -181,7 +181,10 @@ + static void + usage (int ecode) + { +- fprintf (stderr, "dbus-launch [--version] [--help] [--sh-syntax] [--csh-syntax] [--auto-syntax] [--exit-with-session]\n"); ++ fprintf (stderr, "dbus-launch [--version] [--help] [--sh-syntax]" ++ " [--csh-syntax] [--auto-syntax] [--binary-syntax] [--close-stderr]" ++ " [--exit-with-session] [--autolaunch=MACHINEID]" ++ " [--config-file=FILENAME] [PROGRAM] [ARGS...]\n"); + exit (ecode); + } + diff --git a/SPECS/dbus.spec b/SPECS/dbus.spec index 42b6835..048ed94 100644 --- a/SPECS/dbus.spec +++ b/SPECS/dbus.spec @@ -13,7 +13,7 @@ Summary: D-BUS message bus Name: dbus Epoch: 1 Version: 1.6.12 -Release: 11%{?dist} +Release: 13%{?dist} URL: http://www.freedesktop.org/software/dbus/ #VCS: git:git://git.freedesktop.org/git/dbus/dbus Source0: http://dbus.freedesktop.org/releases/dbus/%{name}-%{version}.tar.gz @@ -56,6 +56,11 @@ Patch3: 0001-_dbus_babysitter_unref-avoid-infinite-loop-if-waitpi.patch Patch4: avoid-undefined-7c00ed22d9b5c33f5b33221e906946b11a9bde3b.patch Patch5: 0001-tests-Disable-name-test.patch Patch6: dbus-1.6.12-mls-listnames.patch +Patch7: dbus-1.6.12-auth-process-ok-message-dispatch-test-fix.patch +Patch8: dbus-1.6.12-reduce-session-conf-fd-limits.patch + +# https://bugzilla.redhat.com/show_bug.cgi?id=949022 +Patch9: dbus-1.6.12-refresh-man-pages-and-dbus-launch-help.patch %description D-BUS is a system for sending messages between applications. It is @@ -111,6 +116,9 @@ in this separate package so server systems need not install X. %patch4 -p1 %patch5 -p1 %patch6 -p1 +%patch7 -p1 +%patch8 -p1 +%patch9 -p1 %build if test -f autogen.sh; then env NOCONFIGURE=1 ./autogen.sh; else autoreconf -v -f -i; fi @@ -256,7 +264,19 @@ fi %{_includedir}/* %changelog -* Fri Nov 27 2014 David King - 1:1.6.12-11 +* Fri May 29 2015 David King - 1:1.6.12-13 +- Fix bogus dates in changelog (#1054193) + +* Fri May 29 2015 David King - 1:1.6.12-13 +- Refresh man pages and add dbus-launch options (#949022) + +* Fri May 29 2015 David King - 1:1.6.12-13 +- Reduce fd limits in default session.conf (#1133732) + +* Wed Jan 21 2015 David King - 1:1.6.12-12 +- Fix message dispatch test failure (#1183755) + +* Fri Nov 28 2014 David King - 1:1.6.12-11 - Fix scope after if statement for MLS check (#1118399) * Thu Nov 27 2014 David King - 1:1.6.12-10 @@ -330,7 +350,7 @@ fi * Sun Apr 22 2012 Lennart Poettering - 1:1.4.20-2 - Make D-Bus work in containers -* Tue Apr 13 2012 Colin Walters +* Fri Apr 13 2012 Colin Walters - Update to 1.4.20; closes #806082 - Ensure /var/lib/dbus exists; this seems to have been dropped from upstream build rules. @@ -364,7 +384,7 @@ fi * Thu Jul 29 2010 Lennart Poettering - 1:1.3.2-0.1.885483%{?dist} - Conversion from systemd-install to systemctl -* Wed Jul 9 2010 Lennart Poettering - 1:1.3.2-0.0.885483 +* Fri Jul 9 2010 Lennart Poettering - 1:1.3.2-0.0.885483 - git Snapshot with systemd activation * Wed Jun 23 2010 Lennart Poettering - 1:1.3.1-1 @@ -663,7 +683,7 @@ only system will. - Update to 0.92 - remove old patches -* Thu Jul 22 2006 John (J5) Palmieri - 0.90-8 +* Sat Jul 22 2006 John (J5) Palmieri - 0.90-8 - add patch to fix timeout removal assertion * Thu Jul 20 2006 John (J5) Palmieri - 0.90-7 @@ -763,7 +783,7 @@ only system will. * Thu Dec 01 2005 John (J5) Palmieri - 0.60-1 - upgrade to 0.60 -* Mon Sep 08 2005 John (J5) Palmieri - 0.50-1 +* Thu Sep 08 2005 John (J5) Palmieri - 0.50-1 - upgrade to 0.50 * Mon Aug 29 2005 John (J5) Palmieri - 0.36.2-1 @@ -796,7 +816,7 @@ and those that go into %%{python_sitelib}/dbus (they differ on 64bit) - remove dbus-0.32-deadlock-fix.patch - remove dbus-0.33-types.patch -* Wed Jun 18 2005 John (J5) Palmieri - 0.33-4 +* Sat Jun 18 2005 John (J5) Palmieri - 0.33-4 - Add new libaudit patch from Steve Grub and enable in configure (Bug #159218) @@ -811,10 +831,10 @@ uint16's in the python bindings - update to upstream 0.33 - renable selinux audit patch -* Mon Apr 12 2005 John (J5) Palmieri - 0.32-6 +* Tue Apr 12 2005 John (J5) Palmieri - 0.32-6 - Added patch to fix deadlocks when using recursive g_mains -* Mon Apr 12 2005 John (J5) Palmieri - 0.32-5 +* Tue Apr 12 2005 John (J5) Palmieri - 0.32-5 - replace selinux_init patch with selinux_chroot_workaround patch to work around bad selinux interactions when using chroots on the beehive build machines @@ -924,7 +944,7 @@ uint16's in the python bindings * Thu Aug 05 2004 John (J5) Palmieri - Added BuildRequires for libselinux-devel and Requires for libselinux -* Tue Aug 02 2004 Colin Walters +* Mon Aug 02 2004 Colin Walters - Add SE-DBus patch * Fri Jul 30 2004 John (J5) Palmieri