Revert the last change
OBS-URL: https://build.opensuse.org/package/show/Base:System/dbus-1?expand=0&rev=164
This commit is contained in:
Fridrich Strba
Git OBS Bridge
parent
39da40ba2b
commit
f01b6437b2
127
project.diff
127
project.diff
@ -1,127 +0,0 @@
|
||||
--- dbus-1-x11.changes.orig
|
||||
+++ dbus-1-x11.changes
|
||||
@@ -1,4 +1,26 @@
|
||||
-------------------------------------------------------------------
|
||||
+Thu May 15 11:06:07 UTC 2014 - fstrba@suse.com
|
||||
+
|
||||
+- Move system socket back from /run/dbus to /var/run/dbus
|
||||
+ * From upstream reasoning:
|
||||
+
|
||||
+ Some specifications we want to stay compatibility actually
|
||||
+ document /var/run, not /run, and we should stay compatible with
|
||||
+ that. In order to make sure our D-Bus implementation works on
|
||||
+ any system, regardless if running systemd or not, we should
|
||||
+ always use /var/run which is the only path mandated by the
|
||||
+ D-Bus spec.
|
||||
+
|
||||
+ Similar, glibc hardcodes the utmp location to /var/run, and
|
||||
+ this is exposed in _UTMP_PATH in limits.h, hence let's stay in
|
||||
+ sync with this public API, too.
|
||||
+
|
||||
+ We simply do not support systems where /var/run is not a
|
||||
+ symlink -> /run. Hence both are equivalent. Staying compatible
|
||||
+ with upstream specifications hence weighs more than cleaning up
|
||||
+ superficial appearance.
|
||||
+
|
||||
+-------------------------------------------------------------------
|
||||
Sat May 3 17:21:00 UTC 2014 - hrvoje.senjan@gmail.com
|
||||
|
||||
- Update to 1.8.2:
|
||||
@@ -17,7 +39,7 @@ Sat May 3 17:21:00 UTC 2014 - hrvoje.se
|
||||
instead of the previous 64 (fdo#71297)
|
||||
- cope with \r\n newlines in regression tests, since on
|
||||
Windows, dbus-daemon.exe uses text mode (fdo#75863)
|
||||
-
|
||||
+
|
||||
-------------------------------------------------------------------
|
||||
Mon Jan 20 22:08:24 UTC 2014 - hrvoje.senjan@gmail.com
|
||||
|
||||
--- dbus-1-x11.spec.orig
|
||||
+++ dbus-1-x11.spec
|
||||
@@ -119,6 +119,8 @@ export CXXFLAGS="${RPM_OPT_FLAGS} -fno-s
|
||||
export CFLAGS="$CFLAGS -fstack-protector"
|
||||
export CXXFLAGS="$CXXFLAGS -fstack-protector"
|
||||
export V=1
|
||||
+# keeping socket in /var/run as for upstream explanation in:
|
||||
+# http://cgit.freedesktop.org/systemd/systemd/commit/?id=df1e02046144f41176c32ed011369fd8dba36b76
|
||||
%configure \
|
||||
--disable-static \
|
||||
--with-pic \
|
||||
@@ -139,7 +141,7 @@ export V=1
|
||||
--enable-libaudit \
|
||||
--with-console-auth-dir=/run/dbus/at_console/ \
|
||||
--with-system-pid-file=/run/dbus/pid \
|
||||
- --with-system-socket=/run/dbus/system_bus_socket \
|
||||
+ --with-system-socket=/var/run/dbus/system_bus_socket \
|
||||
--with-systemdsystemunitdir=%{_unitdir}
|
||||
make %{?_smp_mflags}
|
||||
%if %{with docs}
|
||||
--- dbus-1.changes.orig
|
||||
+++ dbus-1.changes
|
||||
@@ -1,4 +1,26 @@
|
||||
-------------------------------------------------------------------
|
||||
+Thu May 15 11:06:07 UTC 2014 - fstrba@suse.com
|
||||
+
|
||||
+- Move system socket back from /run/dbus to /var/run/dbus
|
||||
+ * From upstream reasoning:
|
||||
+
|
||||
+ Some specifications we want to stay compatibility actually
|
||||
+ document /var/run, not /run, and we should stay compatible with
|
||||
+ that. In order to make sure our D-Bus implementation works on
|
||||
+ any system, regardless if running systemd or not, we should
|
||||
+ always use /var/run which is the only path mandated by the
|
||||
+ D-Bus spec.
|
||||
+
|
||||
+ Similar, glibc hardcodes the utmp location to /var/run, and
|
||||
+ this is exposed in _UTMP_PATH in limits.h, hence let's stay in
|
||||
+ sync with this public API, too.
|
||||
+
|
||||
+ We simply do not support systems where /var/run is not a
|
||||
+ symlink -> /run. Hence both are equivalent. Staying compatible
|
||||
+ with upstream specifications hence weighs more than cleaning up
|
||||
+ superficial appearance.
|
||||
+
|
||||
+-------------------------------------------------------------------
|
||||
Sat May 3 17:21:00 UTC 2014 - hrvoje.senjan@gmail.com
|
||||
|
||||
- Update to 1.8.2:
|
||||
@@ -17,7 +39,7 @@ Sat May 3 17:21:00 UTC 2014 - hrvoje.se
|
||||
instead of the previous 64 (fdo#71297)
|
||||
- cope with \r\n newlines in regression tests, since on
|
||||
Windows, dbus-daemon.exe uses text mode (fdo#75863)
|
||||
-
|
||||
+
|
||||
-------------------------------------------------------------------
|
||||
Mon Jan 20 22:08:24 UTC 2014 - hrvoje.senjan@gmail.com
|
||||
|
||||
--- dbus-1.spec.orig
|
||||
+++ dbus-1.spec
|
||||
@@ -110,6 +110,8 @@ export CXXFLAGS="${RPM_OPT_FLAGS} -fno-s
|
||||
export CFLAGS="$CFLAGS -fstack-protector"
|
||||
export CXXFLAGS="$CXXFLAGS -fstack-protector"
|
||||
export V=1
|
||||
+# keeping socket in /var/run as for upstream explanation in:
|
||||
+# http://cgit.freedesktop.org/systemd/systemd/commit/?id=df1e02046144f41176c32ed011369fd8dba36b76
|
||||
%configure \
|
||||
--disable-static \
|
||||
--with-pic \
|
||||
@@ -130,7 +132,7 @@ export V=1
|
||||
--enable-libaudit \
|
||||
--with-console-auth-dir=/run/dbus/at_console/ \
|
||||
--with-system-pid-file=/run/dbus/pid \
|
||||
- --with-system-socket=/run/dbus/system_bus_socket \
|
||||
+ --with-system-socket=/var/run/dbus/system_bus_socket \
|
||||
--with-systemdsystemunitdir=%{_unitdir}
|
||||
make %{?_smp_mflags}
|
||||
%if %{with docs}
|
||||
--- rc.boot.dbus.orig
|
||||
+++ rc.boot.dbus
|
||||
@@ -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="/run/dbus"
|
||||
+DBUS_DAEMON_PID_DIR="/var/run/dbus"
|
||||
DBUS_DAEMON_PID=$DBUS_DAEMON_PID_DIR/pid
|
||||
|
||||
DBUS_MACHINE_ID_DIR="/var/lib/dbus"
|
||||
Loading…
Reference in New Issue
Block a user