Hello community,
here is the log from the commit of package dbus-1 for openSUSE:Factory checked
in at 2013-10-08 10:47:41
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/dbus-1 (Old)
and /work/SRC/openSUSE:Factory/.dbus-1.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "dbus-1"
Changes:
--------
--- /work/SRC/openSUSE:Factory/dbus-1/dbus-1-x11.changes 2013-09-30
09:31:35.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.dbus-1.new/dbus-1-x11.changes 2013-10-08
10:47:42.000000000 +0200
@@ -1,0 +2,16 @@
+Mon Oct 7 08:18:23 UTC 2013 - fridrich.st...@suse.com
+
+- Create /var/lib/dbus/machine-id only if there is no /etc/machine-id
+ present on the system. Dbus knows how to use the system-wide
+ machine-id file and this solves problems where the two files have
+ different values (bnc#831626)
+
+-------------------------------------------------------------------
+Fri Oct 4 15:43:21 UTC 2013 - hrvoje.sen...@gmail.com
+
+- Check for existence of /var/lib/old_run_path: if found, only then
+ is dbus ListenStream swapped for old run path. This is done for
+ supporting 12.3 to 13.1 upgrade (bnc#802525)
+- Fix rpmlint warnings about %verifyscript and %set_permissions
+
+-------------------------------------------------------------------
dbus-1.changes: same change
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ dbus-1-x11.spec ++++++
--- /var/tmp/diff_new_pack.3oWpxQ/_old 2013-10-08 10:47:43.000000000 +0200
+++ /var/tmp/diff_new_pack.3oWpxQ/_new 2013-10-08 10:47:43.000000000 +0200
@@ -202,6 +202,9 @@
mkdir -p %{buildroot}/usr/bin
ln -sf /bin/dbus-send %{buildroot}/usr/bin/dbus-send
+%verifyscript -n dbus-1
+%verify_permissions -e /lib/dbus-1/dbus-daemon-launch-helper
+
%pre -n dbus-1
/usr/sbin/groupadd -r messagebus 2> /dev/null || :
/usr/sbin/useradd -r -s /bin/false -c "User for D-Bus" -d /run/dbus -g
messagebus messagebus 2> /dev/null || :
@@ -210,11 +213,17 @@
%{stop_on_removal dbus}
%post -n dbus-1
+if [ -e /var/lib/old_run_path ]; then
+# Temporarily override the socket path systemd sees, so the running D-Bus
process won't be clobbered. This is needed as long
+# upgrade path from 12.3 is supported (bnc#802525)
+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
+rm /var/lib/old_run_path
+fi
/bin/dbus-uuidgen --ensure
%{insserv_force_if_yast dbus}
/sbin/ldconfig
-%verifyscript
-%verify_permissions -e /lib/dbus-1/dbus-daemon-launch-helper
+%set_permissions /lib/dbus-1/dbus-daemon-launch-helper
%postun -n dbus-1
%{insserv_cleanup}
++++++ dbus-1-x11.spec.in ++++++
--- /var/tmp/diff_new_pack.3oWpxQ/_old 2013-10-08 10:47:43.000000000 +0200
+++ /var/tmp/diff_new_pack.3oWpxQ/_new 2013-10-08 10:47:43.000000000 +0200
@@ -98,8 +98,8 @@
chmod a-x AUTHORS COPYING HACKING NEWS README doc/*.txt doc/file-boilerplate.c
doc/TODO
-rm %{buildroot}%{_includedir}/dbus-1.0/dbus/*.h
-rm %{buildroot}/%{_lib}/libdbus-1* %{buildroot}/%{_lib}/pkgconfig/*pc
+rm %{buildroot}%{_includedir}/dbus-1.0/dbus/*.h
+rm %{buildroot}/%{_lib}/libdbus-1* %{buildroot}/%{_lib}/pkgconfig/*pc
rm %{buildroot}/%{_lib}/dbus-1.0/include/dbus/*.h
#
@@ -113,6 +113,9 @@
mkdir -p %{buildroot}/usr/bin
ln -sf /bin/dbus-send %{buildroot}/usr/bin/dbus-send
+%verifyscript -n dbus-1
+%verify_permissions -e /lib/dbus-1/dbus-daemon-launch-helper
+
%pre -n dbus-1
/usr/sbin/groupadd -r messagebus 2> /dev/null || :
/usr/sbin/useradd -r -s /bin/false -c "User for D-Bus" -d /run/dbus -g
messagebus messagebus 2> /dev/null || :
@@ -121,11 +124,17 @@
%{stop_on_removal dbus}
%post -n dbus-1
+if [ -e /var/lib/old_run_path ]; then
+# Temporarily override the socket path systemd sees, so the running D-Bus
process won't be clobbered. This is needed as long
+# upgrade path from 12.3 is supported (bnc#802525)
+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
+rm /var/lib/old_run_path
+fi
/bin/dbus-uuidgen --ensure
%{insserv_force_if_yast dbus}
/sbin/ldconfig
-%verifyscript
-%verify_permissions -e /lib/dbus-1/dbus-daemon-launch-helper
+%set_permissions /lib/dbus-1/dbus-daemon-launch-helper
%postun -n dbus-1
%{insserv_cleanup}
++++++ rc.boot.dbus ++++++
--- /var/tmp/diff_new_pack.3oWpxQ/_old 2013-10-08 10:47:43.000000000 +0200
+++ /var/tmp/diff_new_pack.3oWpxQ/_new 2013-10-08 10:47:43.000000000 +0200
@@ -27,6 +27,7 @@
DBUS_MACHINE_ID_DIR="/var/lib/dbus"
DBUS_MACHINE_ID=$DBUS_MACHINE_ID_DIR/machine-id
+SYSTEM_MACHINE_ID="/etc/machine-id"
DBUS_UUIIDGEN_BIN=/bin/dbus-uuidgen
@@ -49,7 +50,7 @@
case "$1" in
start)
- if [ -x $DBUS_UUIIDGEN_BIN -a ! -e $DBUS_MACHINE_ID ] ; then
+ if [ -x $DBUS_UUIIDGEN_BIN -a ! -e $DBUS_MACHINE_ID -a ! -e
$SYSTEM_MACHINE_ID ] ; then
if [ ! -d $DBUS_MACHINE_ID_DIR ] ; then
mkdir -p $DBUS_MACHINE_ID_DIR
chown messagebus:messagebus $DBUS_MACHINE_ID_DIR
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
