Accepting request 149887 from Base:System
- Move everything (pid files, lock files, etc.) to /run. add: dbus-move-everything-to-run-directory.patch - Move everything (pid files, lock files, etc.) to /run. add: dbus-move-everything-to-run-directory.patch (forwarded request 149789 from rmilasan) OBS-URL: https://build.opensuse.org/request/show/149887 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/dbus-1?expand=0&rev=98
This commit is contained in:
commit
a67b096e91
@ -1,3 +1,9 @@
|
||||
-------------------------------------------------------------------
|
||||
Thu Jan 24 10:51:29 UTC 2013 - rmilasan@suse.com
|
||||
|
||||
- Move everything (pid files, lock files, etc.) to /run.
|
||||
add: dbus-move-everything-to-run-directory.patch
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sun Nov 18 17:59:23 UTC 2012 - hrvoje.senjan@gmail.com
|
||||
|
||||
|
@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package dbus-1-x11
|
||||
#
|
||||
# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||
# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
@ -61,6 +61,8 @@ 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
|
||||
# PATCH-FIX-OPENSUSE rmilasan@suse.com - move pid and any temp files to /run
|
||||
Patch2: dbus-move-everything-to-run-directory.patch
|
||||
%if 0%{?suse_version} > 1100
|
||||
%bcond_without selinux
|
||||
%else
|
||||
@ -84,6 +86,7 @@ in this separate package so server systems need not install X.
|
||||
%setup -n %{_name}-%{version} -q
|
||||
%patch0 -p1
|
||||
%patch1 -p1
|
||||
%patch2 -p1
|
||||
|
||||
%build
|
||||
autoreconf -fi
|
||||
|
@ -1,3 +1,9 @@
|
||||
-------------------------------------------------------------------
|
||||
Thu Jan 24 10:51:29 UTC 2013 - rmilasan@suse.com
|
||||
|
||||
- Move everything (pid files, lock files, etc.) to /run.
|
||||
add: dbus-move-everything-to-run-directory.patch
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sun Nov 18 17:59:23 UTC 2012 - hrvoje.senjan@gmail.com
|
||||
|
||||
|
@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package dbus-1
|
||||
#
|
||||
# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||
# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
@ -60,6 +60,8 @@ 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
|
||||
# PATCH-FIX-OPENSUSE rmilasan@suse.com - move pid and any temp files to /run
|
||||
Patch2: dbus-move-everything-to-run-directory.patch
|
||||
%if 0%{?suse_version} > 1100
|
||||
%bcond_without selinux
|
||||
%else
|
||||
@ -135,6 +137,7 @@ bus daemon).
|
||||
%setup -n %{_name}-%{version} -q
|
||||
%patch0 -p1
|
||||
%patch1 -p1
|
||||
%patch2 -p1
|
||||
|
||||
%build
|
||||
autoreconf -fi
|
||||
|
@ -2,11 +2,11 @@ From: Stephan Kulow <coolo@suse.de>
|
||||
|
||||
We want x11 autolaunch even if we have no x11 in the build environment
|
||||
|
||||
Index: dbus-1.5.8/dbus/dbus-sysdeps-unix.c
|
||||
Index: dbus-1.6.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
|
||||
--- 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
|
||||
DBusString *address,
|
||||
DBusError *error)
|
||||
{
|
||||
|
129
dbus-move-everything-to-run-directory.patch
Normal file
129
dbus-move-everything-to-run-directory.patch
Normal file
@ -0,0 +1,129 @@
|
||||
Index: dbus-1.6.8/configure
|
||||
===================================================================
|
||||
--- dbus-1.6.8.orig/configure
|
||||
+++ dbus-1.6.8/configure
|
||||
@@ -22254,7 +22254,7 @@ fi
|
||||
if ! test -z "$with_system_socket"; then
|
||||
DBUS_SYSTEM_SOCKET=$with_system_socket
|
||||
else
|
||||
- DBUS_SYSTEM_SOCKET=${EXPANDED_LOCALSTATEDIR}/run/dbus/system_bus_socket
|
||||
+ DBUS_SYSTEM_SOCKET=/run/dbus/system_bus_socket
|
||||
fi
|
||||
|
||||
|
||||
@@ -22278,9 +22278,9 @@ _ACEOF
|
||||
if ! test -z "$with_system_pid_file"; then
|
||||
DBUS_SYSTEM_PID_FILE=$with_system_pid_file
|
||||
elif test x$with_init_scripts = xredhat ; then
|
||||
- DBUS_SYSTEM_PID_FILE=${EXPANDED_LOCALSTATEDIR}/run/messagebus.pid
|
||||
+ DBUS_SYSTEM_PID_FILE=/run/messagebus.pid
|
||||
else
|
||||
- DBUS_SYSTEM_PID_FILE=${EXPANDED_LOCALSTATEDIR}/run/dbus/pid
|
||||
+ DBUS_SYSTEM_PID_FILE=/run/dbus/pid
|
||||
fi
|
||||
|
||||
|
||||
@@ -22289,7 +22289,7 @@ fi
|
||||
if ! test -z "$with_console_auth_dir"; then
|
||||
DBUS_CONSOLE_AUTH_DIR=$with_console_auth_dir
|
||||
else
|
||||
- DBUS_CONSOLE_AUTH_DIR=/var/run/console/
|
||||
+ DBUS_CONSOLE_AUTH_DIR=/run/console/
|
||||
fi
|
||||
|
||||
|
||||
Index: dbus-1.6.8/configure.ac
|
||||
===================================================================
|
||||
--- dbus-1.6.8.orig/configure.ac
|
||||
+++ dbus-1.6.8/configure.ac
|
||||
@@ -1517,7 +1517,7 @@ AM_CONDITIONAL(HAVE_SYSTEMD, [test -n "$
|
||||
if ! test -z "$with_system_socket"; then
|
||||
DBUS_SYSTEM_SOCKET=$with_system_socket
|
||||
else
|
||||
- DBUS_SYSTEM_SOCKET=${EXPANDED_LOCALSTATEDIR}/run/dbus/system_bus_socket
|
||||
+ DBUS_SYSTEM_SOCKET=/run/dbus/system_bus_socket
|
||||
fi
|
||||
|
||||
AC_SUBST(DBUS_SYSTEM_SOCKET)
|
||||
@@ -1533,9 +1533,9 @@ AC_DEFINE_UNQUOTED(DBUS_SYSTEM_BUS_DEFAU
|
||||
if ! test -z "$with_system_pid_file"; then
|
||||
DBUS_SYSTEM_PID_FILE=$with_system_pid_file
|
||||
elif test x$with_init_scripts = xredhat ; then
|
||||
- DBUS_SYSTEM_PID_FILE=${EXPANDED_LOCALSTATEDIR}/run/messagebus.pid
|
||||
+ DBUS_SYSTEM_PID_FILE=/run/messagebus.pid
|
||||
else
|
||||
- DBUS_SYSTEM_PID_FILE=${EXPANDED_LOCALSTATEDIR}/run/dbus/pid
|
||||
+ DBUS_SYSTEM_PID_FILE=/run/dbus/pid
|
||||
fi
|
||||
|
||||
AC_SUBST(DBUS_SYSTEM_PID_FILE)
|
||||
@@ -1544,7 +1544,7 @@ AC_SUBST(DBUS_SYSTEM_PID_FILE)
|
||||
if ! test -z "$with_console_auth_dir"; then
|
||||
DBUS_CONSOLE_AUTH_DIR=$with_console_auth_dir
|
||||
else
|
||||
- DBUS_CONSOLE_AUTH_DIR=/var/run/console/
|
||||
+ DBUS_CONSOLE_AUTH_DIR=/run/console/
|
||||
fi
|
||||
|
||||
AC_SUBST(DBUS_CONSOLE_AUTH_DIR)
|
||||
Index: dbus-1.6.8/doc/dbus-specification.html
|
||||
===================================================================
|
||||
--- dbus-1.6.8.orig/doc/dbus-specification.html
|
||||
+++ dbus-1.6.8/doc/dbus-specification.html
|
||||
@@ -2599,7 +2599,7 @@
|
||||
in the <code class="literal">DBUS_SYSTEM_BUS_ADDRESS</code> environment
|
||||
variable. If that variable is not set, applications should try
|
||||
to connect to the well-known address
|
||||
- <code class="literal">unix:path=/var/run/dbus/system_bus_socket</code>.
|
||||
+ <code class="literal">unix:path=/run/dbus/system_bus_socket</code>.
|
||||
<sup>[<a name="idp5733888" href="#ftn.idp5733888" class="footnote">2</a>]</sup>
|
||||
</p><p>
|
||||
On Unix systems, the system bus should default to searching
|
||||
Index: dbus-1.6.8/doc/dbus-specification.xml
|
||||
===================================================================
|
||||
--- dbus-1.6.8.orig/doc/dbus-specification.xml
|
||||
+++ dbus-1.6.8/doc/dbus-specification.xml
|
||||
@@ -4717,7 +4717,7 @@
|
||||
in the <literal>DBUS_SYSTEM_BUS_ADDRESS</literal> environment
|
||||
variable. If that variable is not set, applications should try
|
||||
to connect to the well-known address
|
||||
- <literal>unix:path=/var/run/dbus/system_bus_socket</literal>.
|
||||
+ <literal>unix:path=/run/dbus/system_bus_socket</literal>.
|
||||
<footnote>
|
||||
<para>
|
||||
The D-Bus reference implementation actually honors the
|
||||
Index: dbus-1.6.8/cmake/CMakeLists.txt
|
||||
===================================================================
|
||||
--- dbus-1.6.8.orig/cmake/CMakeLists.txt
|
||||
+++ dbus-1.6.8/cmake/CMakeLists.txt
|
||||
@@ -414,7 +414,7 @@ if (WIN32)
|
||||
# bus-test expects a non empty string
|
||||
set (DBUS_SYSTEM_PID_FILE "/dbus-pid")
|
||||
else (WIN32)
|
||||
- set (DBUS_SYSTEM_PID_FILE ${EXPANDED_LOCALSTATEDIR}/run/dbus/pid)
|
||||
+ set (DBUS_SYSTEM_PID_FILE "/run/dbus/pid")
|
||||
endif (WIN32)
|
||||
|
||||
#AC_ARG_WITH(system-socket, AS_HELP_STRING([--with-system-socket=[filename]],[UNIX domain socket for systemwide daemon]))
|
||||
@@ -424,7 +424,7 @@ endif (WIN32)
|
||||
if (WIN32)
|
||||
set (DBUS_CONSOLE_AUTH_DIR "")
|
||||
else (WIN32)
|
||||
- set (DBUS_CONSOLE_AUTH_DIR "/var/run/console/")
|
||||
+ set (DBUS_CONSOLE_AUTH_DIR "/run/console/")
|
||||
endif (WIN32)
|
||||
|
||||
#AC_ARG_WITH(dbus_user, AS_HELP_STRING([--with-dbus-user=<user>],[User for running the DBUS daemon (messagebus)]))
|
||||
Index: dbus-1.6.8/dbus/dbus-sysdeps-win.h
|
||||
===================================================================
|
||||
--- dbus-1.6.8.orig/dbus/dbus-sysdeps-win.h
|
||||
+++ dbus-1.6.8/dbus/dbus-sysdeps-win.h
|
||||
@@ -36,7 +36,7 @@ extern void *_dbus_win_get_dll_hmodule (
|
||||
#include <windows.h>
|
||||
#undef interface
|
||||
|
||||
-#define DBUS_CONSOLE_DIR "/var/run/console/"
|
||||
+#define DBUS_CONSOLE_DIR "/run/console/"
|
||||
|
||||
|
||||
void _dbus_win_set_errno (int err);
|
@ -4,7 +4,7 @@
|
||||
#
|
||||
reason="$1"
|
||||
|
||||
dir=/var/run/dbus/at_console
|
||||
dir=/run/dbus/at_console
|
||||
|
||||
# for at_console we are only interested in local sessions
|
||||
test "$CK_SESSION_IS_LOCAL" = true || exit 0
|
||||
|
@ -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"
|
||||
@ -31,7 +31,7 @@ DBUS_MACHINE_ID=$DBUS_MACHINE_ID_DIR/machine-id
|
||||
DBUS_UUIIDGEN_BIN=/bin/dbus-uuidgen
|
||||
|
||||
CONSOLEKIT_DAEMON_BIN="/usr/sbin/console-kit-daemon"
|
||||
CONSOLEKIT_PID_DIR="/var/run/ConsoleKit"
|
||||
CONSOLEKIT_PID_DIR="/run/ConsoleKit"
|
||||
CONSOLEKIT_PID=$CONSOLEKIT_PID_DIR/pid
|
||||
|
||||
# Source LSB init functions
|
||||
@ -112,7 +112,7 @@ case "$1" in
|
||||
## Optional: Probe for the necessity of a reload, print out the
|
||||
## argument to this init script which is required for a reload.
|
||||
## Note: probe is not (yet) part of LSB (as of 1.2)
|
||||
# test /etc/FOO/FOO.conf -nt /var/run/FOO.pid && echo reload
|
||||
# test /etc/FOO/FOO.conf -nt /run/FOO.pid && echo reload
|
||||
;;
|
||||
*)
|
||||
echo "Usage: $0 {start|stop|status|try-restart|restart|force-reload|reload|probe}"
|
||||
|
Loading…
Reference in New Issue
Block a user