From 30406c38760d69f9da68163021b5b10edb12c9f685caa61d9183a70071ad94a3 Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Tue, 11 Oct 2011 22:44:48 +0000 Subject: [PATCH 1/3] =?UTF-8?q?-=20update=20to=20version=201.5.8:=20=20?= =?UTF-8?q?=E2=80=A2=20Clean=20up=20dead=20code,=20and=20make=20more=20war?= =?UTF-8?q?nings=20fatal=20in=20development=20builds=20=20=20(fd.o=20#3923?= =?UTF-8?q?1,=20fd.o=20#41012;=20Simon=20McVittie)=20=20=E2=80=A2=20Add=20?= =?UTF-8?q?a=20regression=20test=20for=20fd.o=20#38005=20(fd.o=20#39836,?= =?UTF-8?q?=20Simon=20McVittie)=20=20=E2=80=A2=20Add=20=5FDBUS=5FSTATIC=5F?= =?UTF-8?q?ASSERT=20and=20use=20it=20to=20check=20invariants=20=20?= =?UTF-8?q?=E2=80=A2=20Fix=20a=20small=20memory=20leak,=20and=20a=20failur?= =?UTF-8?q?e=20to=20report=20errors,=20when=20updating=20=20a=20service=20?= =?UTF-8?q?file=20entry=20for=20activation=20(fd.o=20#39230,=20Simon=20McV?= =?UTF-8?q?ittie)=20=20=C2=B7=20Clean=20up=20(non-abstract)=20Unix=20socke?= =?UTF-8?q?ts=20on=20bus=20daemon=20exit=20=20=C2=B7=20On=20systems=20that?= =?UTF-8?q?=20use=20libcap-ng=20but=20not=20systemd,=20drop=20supplemental?= =?UTF-8?q?=20groups=20=20=20=20when=20switching=20to=20the=20daemon=20use?= =?UTF-8?q?r=20(Red=20Hat=20#726953,=20Steve=20Grubb)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - add libtool as buildrequire to make the spec file more reliable - update to version 1.5.8: • Clean up dead code, and make more warnings fatal in development builds (fd.o #39231, fd.o #41012; Simon McVittie) • Add a regression test for fd.o #38005 (fd.o #39836, Simon McVittie) • Add _DBUS_STATIC_ASSERT and use it to check invariants • Fix a small memory leak, and a failure to report errors, when updating a service file entry for activation (fd.o #39230, Simon McVittie) · Clean up (non-abstract) Unix sockets on bus daemon exit · On systems that use libcap-ng but not systemd, drop supplemental groups when switching to the daemon user (Red Hat #726953, Steve Grubb) OBS-URL: https://build.opensuse.org/package/show/Base:System/dbus-1?expand=0&rev=68 --- dbus-1-x11.changes | 19 +++++++++++++++++++ dbus-1-x11.spec | 6 +++++- dbus-1.5.6.tar.gz | 3 --- dbus-1.5.8.tar.gz | 3 +++ dbus-1.changes | 14 ++++++++++++++ dbus-1.spec | 2 +- 6 files changed, 42 insertions(+), 5 deletions(-) delete mode 100644 dbus-1.5.6.tar.gz create mode 100644 dbus-1.5.8.tar.gz diff --git a/dbus-1-x11.changes b/dbus-1-x11.changes index 3f1e211..490188c 100644 --- a/dbus-1-x11.changes +++ b/dbus-1-x11.changes @@ -1,3 +1,22 @@ +------------------------------------------------------------------- +Wed Oct 12 00:32:50 CEST 2011 - dmueller@suse.de + +- update to version 1.5.8: + • Clean up dead code, and make more warnings fatal in development builds + (fd.o #39231, fd.o #41012; Simon McVittie) + • Add a regression test for fd.o #38005 (fd.o #39836, Simon McVittie) + • Add _DBUS_STATIC_ASSERT and use it to check invariants + • Fix a small memory leak, and a failure to report errors, when updating + a service file entry for activation (fd.o #39230, Simon McVittie) + · Clean up (non-abstract) Unix sockets on bus daemon exit + · On systems that use libcap-ng but not systemd, drop supplemental groups + when switching to the daemon user (Red Hat #726953, Steve Grubb) + +------------------------------------------------------------------- +Fri Sep 30 20:07:53 UTC 2011 - coolo@suse.com + +- add libtool as buildrequire to make the spec file more reliable + ------------------------------------------------------------------- Sun Sep 18 17:17:12 UTC 2011 - jengelh@medozas.de diff --git a/dbus-1-x11.spec b/dbus-1-x11.spec index c21323b..37bde82 100644 --- a/dbus-1-x11.spec +++ b/dbus-1-x11.spec @@ -15,6 +15,7 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # +# norootforbuild Name: dbus-1-x11 @@ -29,7 +30,7 @@ Summary: D-Bus Message Bus System BuildRequires: doxygen libexpat-devel libzio pkg-config update-desktop-files BuildRequires: audit-devel BuildRequires: libtool -Version: 1.5.6 +Version: 1.5.8 Release: 1 # bug437293 %ifarch ppc64 @@ -104,6 +105,9 @@ mv $tdir/bin/dbus-launch %{buildroot}/%{_bindir} mv $tdir/%{_mandir}/man1/dbus-launch.1* %{buildroot}/%{_mandir}/man1 rm -rf $tdir +%clean +%{__rm} -rf %{buildroot} + %files %defattr(-,root,root) %{_bindir}/dbus-launch diff --git a/dbus-1.5.6.tar.gz b/dbus-1.5.6.tar.gz deleted file mode 100644 index 446e836..0000000 --- a/dbus-1.5.6.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a1a07a80e7dbd763ee869a80ccff4f01d0824b79af6c1821b84540cb9118e5a1 -size 1894520 diff --git a/dbus-1.5.8.tar.gz b/dbus-1.5.8.tar.gz new file mode 100644 index 0000000..35ba29e --- /dev/null +++ b/dbus-1.5.8.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6e1cd5248562b5362e9a1ad8314459fe2f60ee3b9622ce0afd68cc9df8ae7c5e +size 1904708 diff --git a/dbus-1.changes b/dbus-1.changes index 48192ad..490188c 100644 --- a/dbus-1.changes +++ b/dbus-1.changes @@ -1,3 +1,17 @@ +------------------------------------------------------------------- +Wed Oct 12 00:32:50 CEST 2011 - dmueller@suse.de + +- update to version 1.5.8: + • Clean up dead code, and make more warnings fatal in development builds + (fd.o #39231, fd.o #41012; Simon McVittie) + • Add a regression test for fd.o #38005 (fd.o #39836, Simon McVittie) + • Add _DBUS_STATIC_ASSERT and use it to check invariants + • Fix a small memory leak, and a failure to report errors, when updating + a service file entry for activation (fd.o #39230, Simon McVittie) + · Clean up (non-abstract) Unix sockets on bus daemon exit + · On systems that use libcap-ng but not systemd, drop supplemental groups + when switching to the daemon user (Red Hat #726953, Steve Grubb) + ------------------------------------------------------------------- Fri Sep 30 20:07:53 UTC 2011 - coolo@suse.com diff --git a/dbus-1.spec b/dbus-1.spec index 88318d0..c135c92 100644 --- a/dbus-1.spec +++ b/dbus-1.spec @@ -27,7 +27,7 @@ Summary: D-Bus Message Bus System BuildRequires: doxygen libexpat-devel libzio pkg-config update-desktop-files BuildRequires: audit-devel BuildRequires: libtool -Version: 1.5.6 +Version: 1.5.8 Release: 1 # bug437293 %ifarch ppc64 From 7a33fefe72d91d5d93c28633522431e1c7ef3fbe4efa8b89022dbce37de2328e Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Wed, 12 Oct 2011 09:51:10 +0000 Subject: [PATCH 2/3] - add patch to enable X11 autolaunch even if configure thinks it can't be done (bnc#707817) - add patch to enable X11 autolaunch even if configure thinks it can't be done (bnc#707817) OBS-URL: https://build.opensuse.org/package/show/Base:System/dbus-1?expand=0&rev=69 --- dbus-1-x11.changes | 6 ++++++ dbus-1-x11.spec | 5 ++++- dbus-1.changes | 6 ++++++ dbus-1.spec | 5 ++++- dbus-do-autolaunch.patch | 17 +++++++++++++++++ pre_checkin.sh | 1 + 6 files changed, 38 insertions(+), 2 deletions(-) create mode 100644 dbus-do-autolaunch.patch diff --git a/dbus-1-x11.changes b/dbus-1-x11.changes index 490188c..88b12da 100644 --- a/dbus-1-x11.changes +++ b/dbus-1-x11.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Oct 12 09:47:55 UTC 2011 - coolo@suse.com + +- add patch to enable X11 autolaunch even if configure thinks + it can't be done (bnc#707817) + ------------------------------------------------------------------- Wed Oct 12 00:32:50 CEST 2011 - dmueller@suse.de diff --git a/dbus-1-x11.spec b/dbus-1-x11.spec index 37bde82..c486313 100644 --- a/dbus-1-x11.spec +++ b/dbus-1-x11.spec @@ -43,6 +43,8 @@ Source2: dbus-1.desktop Source3: dbus_at_console.ck Source4: baselibs.conf Patch0: dbus-log-deny.patch +# PATCH-FIX-OPENSUSE coolo@suse.de -- force a feature configure won't accept without x11 in buildrequires +Patch1: dbus-do-autolaunch.patch %if 0%{?suse_version} > 1100 %bcond_without selinux %else @@ -65,6 +67,7 @@ in this separate package so server systems need not install X. # COMMON2-BEGIN %setup -n %{_name}-%{version} -q %patch0 -p1 +%patch1 -p1 %build autoreconf -fi @@ -89,7 +92,7 @@ export V=1 %endif --enable-libaudit \ --with-console-auth-dir=/var/run/dbus/at_console/ \ - --with-systemdsystemunitdir=/lib/systemd/system + --with-systemdsystemunitdir=/lib/systemd/system make %{?_smp_mflags} doxygen -u && doxygen ./cleanup-man-pages.sh diff --git a/dbus-1.changes b/dbus-1.changes index 490188c..88b12da 100644 --- a/dbus-1.changes +++ b/dbus-1.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Oct 12 09:47:55 UTC 2011 - coolo@suse.com + +- add patch to enable X11 autolaunch even if configure thinks + it can't be done (bnc#707817) + ------------------------------------------------------------------- Wed Oct 12 00:32:50 CEST 2011 - dmueller@suse.de diff --git a/dbus-1.spec b/dbus-1.spec index c135c92..ae84e62 100644 --- a/dbus-1.spec +++ b/dbus-1.spec @@ -40,6 +40,8 @@ Source2: dbus-1.desktop Source3: dbus_at_console.ck Source4: baselibs.conf Patch0: dbus-log-deny.patch +# PATCH-FIX-OPENSUSE coolo@suse.de -- force a feature configure won't accept without x11 in buildrequires +Patch1: dbus-do-autolaunch.patch %if 0%{?suse_version} > 1100 %bcond_without selinux %else @@ -96,6 +98,7 @@ bus daemon). # COMMON2-BEGIN %setup -n %{_name}-%{version} -q %patch0 -p1 +%patch1 -p1 %build autoreconf -fi @@ -120,7 +123,7 @@ export V=1 %endif --enable-libaudit \ --with-console-auth-dir=/var/run/dbus/at_console/ \ - --with-systemdsystemunitdir=/lib/systemd/system + --with-systemdsystemunitdir=/lib/systemd/system make %{?_smp_mflags} doxygen -u && doxygen ./cleanup-man-pages.sh diff --git a/dbus-do-autolaunch.patch b/dbus-do-autolaunch.patch new file mode 100644 index 0000000..4a9a4ef --- /dev/null +++ b/dbus-do-autolaunch.patch @@ -0,0 +1,17 @@ +From: Stephan Kulow + +We want x11 autolaunch even if we have no x11 in the build environment + +Index: dbus-1.5.8/dbus/dbus-sysdeps-unix.c +=================================================================== +--- dbus-1.5.8.orig/dbus/dbus-sysdeps-unix.c 2011-09-21 19:20:06.000000000 +0200 ++++ dbus-1.5.8/dbus/dbus-sysdeps-unix.c 2011-10-12 11:39:26.099779864 +0200 +@@ -3339,7 +3339,7 @@ _dbus_get_autolaunch_address (const char + DBusString *address, + DBusError *error) + { +-#ifdef DBUS_ENABLE_X11_AUTOLAUNCH ++#if 1 + /* Perform X11-based autolaunch. (We also support launchd-based autolaunch, + * but that's done elsewhere, and if it worked, this function wouldn't + * be called.) */ diff --git a/pre_checkin.sh b/pre_checkin.sh index bbb2248..21f83b6 100644 --- a/pre_checkin.sh +++ b/pre_checkin.sh @@ -19,3 +19,4 @@ for spec in dbus-1-x11.spec; do #fi done +osc service localrun format_spec_file From 02bb687cdb5df675a016ede9f3ac8cee05b8b84e54c5f09ea14565e6574d1578 Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Wed, 12 Oct 2011 10:00:47 +0000 Subject: [PATCH 3/3] * Clean up dead code, and make more warnings fatal in development builds * Add a regression test for fd.o #38005 (fd.o #39836, Simon McVittie) * Add _DBUS_STATIC_ASSERT and use it to check invariants * Fix a small memory leak, and a failure to report errors, when updating a service file entry for activation (fd.o #39230, Simon McVittie) * Clean up (non-abstract) Unix sockets on bus daemon exit * On systems that use libcap-ng but not systemd, drop supplemental groups * Clean up dead code, and make more warnings fatal in development builds * Add a regression test for fd.o #38005 (fd.o #39836, Simon McVittie) * Add _DBUS_STATIC_ASSERT and use it to check invariants * Fix a small memory leak, and a failure to report errors, when updating a service file entry for activation (fd.o #39230, Simon McVittie) * Clean up (non-abstract) Unix sockets on bus daemon exit * On systems that use libcap-ng but not systemd, drop supplemental groups OBS-URL: https://build.opensuse.org/package/show/Base:System/dbus-1?expand=0&rev=70 --- dbus-1-x11.changes | 14 +++++++------- dbus-1.changes | 14 +++++++------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/dbus-1-x11.changes b/dbus-1-x11.changes index 88b12da..f40f840 100644 --- a/dbus-1-x11.changes +++ b/dbus-1-x11.changes @@ -8,14 +8,14 @@ Wed Oct 12 09:47:55 UTC 2011 - coolo@suse.com Wed Oct 12 00:32:50 CEST 2011 - dmueller@suse.de - update to version 1.5.8: - • Clean up dead code, and make more warnings fatal in development builds + * Clean up dead code, and make more warnings fatal in development builds (fd.o #39231, fd.o #41012; Simon McVittie) - • Add a regression test for fd.o #38005 (fd.o #39836, Simon McVittie) - • Add _DBUS_STATIC_ASSERT and use it to check invariants - • Fix a small memory leak, and a failure to report errors, when updating - a service file entry for activation (fd.o #39230, Simon McVittie) - · Clean up (non-abstract) Unix sockets on bus daemon exit - · On systems that use libcap-ng but not systemd, drop supplemental groups + * Add a regression test for fd.o #38005 (fd.o #39836, Simon McVittie) + * Add _DBUS_STATIC_ASSERT and use it to check invariants + * Fix a small memory leak, and a failure to report errors, when updating + a service file entry for activation (fd.o #39230, Simon McVittie) + * Clean up (non-abstract) Unix sockets on bus daemon exit + * On systems that use libcap-ng but not systemd, drop supplemental groups when switching to the daemon user (Red Hat #726953, Steve Grubb) ------------------------------------------------------------------- diff --git a/dbus-1.changes b/dbus-1.changes index 88b12da..f40f840 100644 --- a/dbus-1.changes +++ b/dbus-1.changes @@ -8,14 +8,14 @@ Wed Oct 12 09:47:55 UTC 2011 - coolo@suse.com Wed Oct 12 00:32:50 CEST 2011 - dmueller@suse.de - update to version 1.5.8: - • Clean up dead code, and make more warnings fatal in development builds + * Clean up dead code, and make more warnings fatal in development builds (fd.o #39231, fd.o #41012; Simon McVittie) - • Add a regression test for fd.o #38005 (fd.o #39836, Simon McVittie) - • Add _DBUS_STATIC_ASSERT and use it to check invariants - • Fix a small memory leak, and a failure to report errors, when updating - a service file entry for activation (fd.o #39230, Simon McVittie) - · Clean up (non-abstract) Unix sockets on bus daemon exit - · On systems that use libcap-ng but not systemd, drop supplemental groups + * Add a regression test for fd.o #38005 (fd.o #39836, Simon McVittie) + * Add _DBUS_STATIC_ASSERT and use it to check invariants + * Fix a small memory leak, and a failure to report errors, when updating + a service file entry for activation (fd.o #39230, Simon McVittie) + * Clean up (non-abstract) Unix sockets on bus daemon exit + * On systems that use libcap-ng but not systemd, drop supplemental groups when switching to the daemon user (Red Hat #726953, Steve Grubb) -------------------------------------------------------------------