Accepting request 180683 from Base:System

Update to 1.7.4. That was intended to superseed previous sr, but didn't expected it will be accepted already :-) (forwarded request 180619 from sumski)

OBS-URL: https://build.opensuse.org/request/show/180683
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/dbus-1?expand=0&rev=102
This commit is contained in:
Stephan Kulow 2013-06-25 05:47:46 +00:00 committed by Git OBS Bridge
commit 4eb7f1fe8e
9 changed files with 71 additions and 10 deletions

View File

@ -1,3 +1,25 @@
-------------------------------------------------------------------
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
- Remove the override that was added in solving bnc#802525, as it
causes similar situation when upgrading dbus and systemd
simultaneously.
- Adjusted rc.boot.dbus script so it uses /run instead of /var/run
-------------------------------------------------------------------
Thu Apr 25 21:02:26 UTC 2013 - hrvoje.senjan@gmail.com

View File

@ -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

View File

@ -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

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:212677cc01e63419ef6487e0b394fe3ddbc1e1131b4b3b137e500dd8ea9867d8
size 1853734

3
dbus-1.7.4.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:f9421a54a15d858f6a394b520c8d8645e484887210d082a83e0f6ead7945549e
size 1872019

View File

@ -1,3 +1,25 @@
-------------------------------------------------------------------
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
- Remove the override that was added in solving bnc#802525, as it
causes similar situation when upgrading dbus and systemd
simultaneously.
- Adjusted rc.boot.dbus script so it uses /run instead of /var/run
-------------------------------------------------------------------
Thu Apr 25 21:02:26 UTC 2013 - hrvoje.senjan@gmail.com

View File

@ -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
@ -224,9 +227,6 @@ ln -sf /bin/dbus-send %{buildroot}/usr/bin/dbus-send
%{stop_on_removal dbus}
%post
# Temporarily override the socket path systemd sees, so the running D-Bus process won't be clobbered.
mkdir -p /run/systemd/system
/usr/bin/sed 's#ListenStream=/run/dbus/system_bus_socket#ListenStream=/var/run/dbus/system_bus_socket#' < /usr/lib/systemd/system/dbus.socket > /run/systemd/system/dbus.socket
/bin/dbus-uuidgen --ensure
%{insserv_force_if_yast dbus}

View File

@ -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)
{

View File

@ -22,7 +22,7 @@ DBUS_DAEMON_BIN=/bin/dbus-daemon
test -x $DBUS_DAEMON_BIN || exit 5
DBUS_DAEMON_PARAMETER="--system";
DBUS_DAEMON_PID_DIR="/var/run/dbus"
DBUS_DAEMON_PID_DIR="/run/dbus"
DBUS_DAEMON_PID=$DBUS_DAEMON_PID_DIR/pid
DBUS_MACHINE_ID_DIR="/var/lib/dbus"