From f045deffd170cbf92fed5f050bea9cac48977dc8e57da380c5df339738cdb5cc Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Sun, 23 Jun 2013 20:24:58 +0000 Subject: [PATCH] Accepting request 180619 from home:sumski:branches:Base:System Update to 1.7.4. That was intended to superseed previous sr, but didn't expected it will be accepted already :-) OBS-URL: https://build.opensuse.org/request/show/180619 OBS-URL: https://build.opensuse.org/package/show/Base:System/dbus-1?expand=0&rev=121 --- dbus-1-x11.changes | 14 ++++++++++++++ dbus-1-x11.spec | 6 +++++- dbus-1-x11.spec.in | 4 ++++ dbus-1.7.2.tar.gz | 3 --- dbus-1.7.4.tar.gz | 3 +++ dbus-1.changes | 14 ++++++++++++++ dbus-1.spec | 5 ++++- dbus-do-autolaunch.patch | 11 ++++++++++- 8 files changed, 54 insertions(+), 6 deletions(-) delete mode 100644 dbus-1.7.2.tar.gz create mode 100644 dbus-1.7.4.tar.gz diff --git a/dbus-1-x11.changes b/dbus-1-x11.changes index 552f53c..e6809dc 100644 --- a/dbus-1-x11.changes +++ b/dbus-1-x11.changes @@ -1,3 +1,17 @@ +------------------------------------------------------------------- +Sat Jun 22 22:01:17 UTC 2013 - hrvoje.senjan@gmail.com + +- Update to 1.7.4 + + CVE-2013-2168: Fix misuse of va_list that could be used as a + denial of service for system services. + + It should now be safe to call dbus_threads_init_default() from + any thread, at any time + + In dbus-daemon, don't crash if a .service file starts with + key=value + + Fix an assertion failure if we try to activate systemd services + before systemd connects to the bus (fdo#50199) +- Adjusted dbus-do-autolaunch.patch for this release + ------------------------------------------------------------------- Sat Jun 22 18:27:19 UTC 2013 - hrvoje.senjan@gmail.com diff --git a/dbus-1-x11.spec b/dbus-1-x11.spec index f3805ae..d36368e 100644 --- a/dbus-1-x11.spec +++ b/dbus-1-x11.spec @@ -47,7 +47,7 @@ BuildRequires: xmlto BuildRequires: pkgconfig(libsystemd-daemon) BuildRequires: pkgconfig(libsystemd-login) %endif -Version: 1.7.2 +Version: 1.7.4 Release: 0 # bug437293 %ifarch ppc64 @@ -133,12 +133,16 @@ make DESTDIR=$tdir install mkdir -p %{buildroot}/%{_bindir} mkdir -p %{buildroot}/%{_mandir}/man1 mv $tdir/bin/dbus-launch %{buildroot}/%{_bindir} +mv $tdir/bin/dbus-run-session %{buildroot}/%{_bindir} mv $tdir/%{_mandir}/man1/dbus-launch.1* %{buildroot}/%{_mandir}/man1 +mv $tdir/%{_mandir}/man1/dbus-run-session.1* %{buildroot}/%{_mandir}/man1 rm -rf $tdir %files %defattr(-,root,root) %{_bindir}/dbus-launch +%{_bindir}/dbus-run-session %{_mandir}/man1/dbus-launch.1* +%{_mandir}/man1/dbus-run-session.1* %changelog diff --git a/dbus-1-x11.spec.in b/dbus-1-x11.spec.in index 2ba5dcf..d430521 100644 --- a/dbus-1-x11.spec.in +++ b/dbus-1-x11.spec.in @@ -37,12 +37,16 @@ make DESTDIR=$tdir install mkdir -p %{buildroot}/%{_bindir} mkdir -p %{buildroot}/%{_mandir}/man1 mv $tdir/bin/dbus-launch %{buildroot}/%{_bindir} +mv $tdir/bin/dbus-run-session %{buildroot}/%{_bindir} mv $tdir/%{_mandir}/man1/dbus-launch.1* %{buildroot}/%{_mandir}/man1 +mv $tdir/%{_mandir}/man1/dbus-run-session.1* %{buildroot}/%{_mandir}/man1 rm -rf $tdir %files %defattr(-,root,root) %{_bindir}/dbus-launch +%{_bindir}/dbus-run-session %{_mandir}/man1/dbus-launch.1* +%{_mandir}/man1/dbus-run-session.1* %changelog diff --git a/dbus-1.7.2.tar.gz b/dbus-1.7.2.tar.gz deleted file mode 100644 index ec60566..0000000 --- a/dbus-1.7.2.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:212677cc01e63419ef6487e0b394fe3ddbc1e1131b4b3b137e500dd8ea9867d8 -size 1853734 diff --git a/dbus-1.7.4.tar.gz b/dbus-1.7.4.tar.gz new file mode 100644 index 0000000..5d84f00 --- /dev/null +++ b/dbus-1.7.4.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f9421a54a15d858f6a394b520c8d8645e484887210d082a83e0f6ead7945549e +size 1872019 diff --git a/dbus-1.changes b/dbus-1.changes index 552f53c..e6809dc 100644 --- a/dbus-1.changes +++ b/dbus-1.changes @@ -1,3 +1,17 @@ +------------------------------------------------------------------- +Sat Jun 22 22:01:17 UTC 2013 - hrvoje.senjan@gmail.com + +- Update to 1.7.4 + + CVE-2013-2168: Fix misuse of va_list that could be used as a + denial of service for system services. + + It should now be safe to call dbus_threads_init_default() from + any thread, at any time + + In dbus-daemon, don't crash if a .service file starts with + key=value + + Fix an assertion failure if we try to activate systemd services + before systemd connects to the bus (fdo#50199) +- Adjusted dbus-do-autolaunch.patch for this release + ------------------------------------------------------------------- Sat Jun 22 18:27:19 UTC 2013 - hrvoje.senjan@gmail.com diff --git a/dbus-1.spec b/dbus-1.spec index 0bd8848..5224d9f 100644 --- a/dbus-1.spec +++ b/dbus-1.spec @@ -46,7 +46,7 @@ BuildRequires: xmlto BuildRequires: pkgconfig(libsystemd-daemon) BuildRequires: pkgconfig(libsystemd-login) %endif -Version: 1.7.2 +Version: 1.7.4 Release: 0 # bug437293 %ifarch ppc64 @@ -203,6 +203,9 @@ rm -f %{buildroot}/%{_lib}/pkgconfig/dbus-1.pc # rm -f %{buildroot}/bin/dbus-launch rm -f %{buildroot}/%{_mandir}/man1/dbus-launch.1* +rm -f %{buildroot}/bin/dbus-run-session +rm -f %{buildroot}/%{_mandir}/man1/dbus-run-session.1* +rm -f %{buildroot}/%{_datadir}/doc/dbus/dbus-run-session.1.html chmod a-x AUTHORS COPYING HACKING NEWS README doc/*.txt doc/file-boilerplate.c doc/TODO # install -d %{buildroot}%{_sysconfdir}/ConsoleKit/run-session.d diff --git a/dbus-do-autolaunch.patch b/dbus-do-autolaunch.patch index da3bcab..65e6144 100644 --- a/dbus-do-autolaunch.patch +++ b/dbus-do-autolaunch.patch @@ -6,7 +6,16 @@ Index: dbus-1.6.8/dbus/dbus-sysdeps-unix.c =================================================================== --- dbus-1.6.8.orig/dbus/dbus-sysdeps-unix.c +++ dbus-1.6.8/dbus/dbus-sysdeps-unix.c -@@ -3424,7 +3424,7 @@ _dbus_get_autolaunch_address (const char +@@ -3230,7 +3230,7 @@ _dbus_get_tmpdir(void) + return tmpdir; + } + +-#if defined(DBUS_ENABLE_X11_AUTOLAUNCH) || defined(DBUS_ENABLE_LAUNCHD) ++#if 1 + /** + * Execute a subprocess, returning up to 1024 bytes of output + * into @p result. +@@ -3450,7 +3450,7 @@ _dbus_get_autolaunch_address (const char *scope, DBusString *address, DBusError *error) {