From 2d7c38919de82b233504b3d061fd47c898e3e536df4fe018c1b12ba981cfa450 Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Fri, 3 May 2013 11:59:28 +0000 Subject: [PATCH] Accepting request 173427 from home:sumski:branches:Base:System Update to 1.7.2 OBS-URL: https://build.opensuse.org/request/show/173427 OBS-URL: https://build.opensuse.org/package/show/Base:System/dbus-1?expand=0&rev=118 --- dbus-1-x11.changes | 45 +++++++ dbus-1-x11.spec | 10 +- dbus-1.6.8.tar.gz | 3 - dbus-1.7.2.tar.gz | 3 + dbus-1.changes | 37 ++++++ dbus-1.spec | 17 ++- dbus-move-everything-to-run-directory.patch | 129 -------------------- 7 files changed, 105 insertions(+), 139 deletions(-) delete mode 100644 dbus-1.6.8.tar.gz create mode 100644 dbus-1.7.2.tar.gz delete mode 100644 dbus-move-everything-to-run-directory.patch diff --git a/dbus-1-x11.changes b/dbus-1-x11.changes index 9c8524d..cc36a7b 100644 --- a/dbus-1-x11.changes +++ b/dbus-1-x11.changes @@ -1,3 +1,48 @@ +------------------------------------------------------------------- +Thu Apr 25 21:02:26 UTC 2013 - hrvoje.senjan@gmail.com + +- Update to 1.7.2 + + Diagnose incorrect use of dbus_connection_get_data() with negative + slot (i.e. before allocating the slot) rather than returning junk + (fdo #63127) + + The --with-dbus-session-bus-default-address configure option is no + longer supported + + Under systemd, log to syslog only, not stderr, avoiding duplication + (fdo#61399, fdo#39987) + + Under systemd, remove unnecessary dependency on syslog.socket + (fdo#63531) + + Allow use of systemd-logind without the rest of systemd + (fdo#62585) +- Dropped dbus-move-everything-to-run-directory.patch, since we can + define location of system pid and socket with configure flags and + set the flags accordingly +- Added xmlto BuildRequires, it is needed now for man files + +------------------------------------------------------------------- +Wed Apr 24 20:01:10 UTC 2013 - hrvoje.senjan@gmail.com + +- Update to 1.6.10 + + Following Unicode Corrigendum #9, the noncharacters U+nFFFE, U+nFFFF, + U+FDD0..U+FDEF are allowed in UTF-8 strings again. (fdo#63072) + + Diagnose incorrect use of dbus_connection_get_data() with negative slot + (i.e. before allocating the slot) rather than returning junk (fdo#63127) + + In the activation helper, when compiled for tests, do not reset the system + bus address, fixing the regression tests. (fdo#52202) + + Fix building with Valgrind 3.8, at the cost of causing harmless warnings + with Valgrind 3.6 on some compilers (fdo#55932) + + Don't leak temporary fds pointing to /dev/null (fdo#56927,) + + Create session.d, system.d directories under CMake (fdo#41319) + + Include alloca.h for alloca() if available, fixing compilation on + Solaris 10 (fdo#63071) + +------------------------------------------------------------------- +Fri Feb 22 17:13:02 CET 2013 - hpj@suse.com + +- Spec file changes moving files from /var/run to /run. +- Add dbus-move-everything-to-run-directory.patch by rmilasan. This + moves everything (pid files, lock files, etc.) to /run. +- Add dbus-fall-back-to-old-run-directory.patch (bnc#802525). + ------------------------------------------------------------------- Mon Feb 18 13:06:24 UTC 2013 - rmilasan@suse.com diff --git a/dbus-1-x11.spec b/dbus-1-x11.spec index 1212357..f3805ae 100644 --- a/dbus-1-x11.spec +++ b/dbus-1-x11.spec @@ -42,11 +42,12 @@ BuildRequires: libexpat-devel BuildRequires: libtool BuildRequires: pkg-config BuildRequires: update-desktop-files +BuildRequires: xmlto %if %{with_systemd} BuildRequires: pkgconfig(libsystemd-daemon) BuildRequires: pkgconfig(libsystemd-login) %endif -Version: 1.6.8 +Version: 1.7.2 Release: 0 # bug437293 %ifarch ppc64 @@ -61,6 +62,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 hpj@suse.com bnc#802525 - Avoid clients hanging after move to /run +Patch2: dbus-fall-back-to-old-run-directory.patch %if 0%{?suse_version} > 1100 %bcond_without selinux %else @@ -84,6 +87,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 @@ -113,7 +117,9 @@ export V=1 --enable-systemd \ %endif --enable-libaudit \ - --with-console-auth-dir=/var/run/dbus/at_console/ \ + --with-console-auth-dir=/run/dbus/at_console/ \ + --with-system-pid-file=/run/dbus/pid \ + --with-system-socket=/run/dbus/system_bus_socket \ --with-systemdsystemunitdir=%{_unitdir} make %{?_smp_mflags} doxygen -u && doxygen diff --git a/dbus-1.6.8.tar.gz b/dbus-1.6.8.tar.gz deleted file mode 100644 index 673b72d..0000000 --- a/dbus-1.6.8.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:fc1370ef38abeeb13f55c905ec002e60705fb0bfde3b8d21c8d6eb8056c11bac -size 1929630 diff --git a/dbus-1.7.2.tar.gz b/dbus-1.7.2.tar.gz new file mode 100644 index 0000000..ec60566 --- /dev/null +++ b/dbus-1.7.2.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:212677cc01e63419ef6487e0b394fe3ddbc1e1131b4b3b137e500dd8ea9867d8 +size 1853734 diff --git a/dbus-1.changes b/dbus-1.changes index 6351b31..cc36a7b 100644 --- a/dbus-1.changes +++ b/dbus-1.changes @@ -1,3 +1,40 @@ +------------------------------------------------------------------- +Thu Apr 25 21:02:26 UTC 2013 - hrvoje.senjan@gmail.com + +- Update to 1.7.2 + + Diagnose incorrect use of dbus_connection_get_data() with negative + slot (i.e. before allocating the slot) rather than returning junk + (fdo #63127) + + The --with-dbus-session-bus-default-address configure option is no + longer supported + + Under systemd, log to syslog only, not stderr, avoiding duplication + (fdo#61399, fdo#39987) + + Under systemd, remove unnecessary dependency on syslog.socket + (fdo#63531) + + Allow use of systemd-logind without the rest of systemd + (fdo#62585) +- Dropped dbus-move-everything-to-run-directory.patch, since we can + define location of system pid and socket with configure flags and + set the flags accordingly +- Added xmlto BuildRequires, it is needed now for man files + +------------------------------------------------------------------- +Wed Apr 24 20:01:10 UTC 2013 - hrvoje.senjan@gmail.com + +- Update to 1.6.10 + + Following Unicode Corrigendum #9, the noncharacters U+nFFFE, U+nFFFF, + U+FDD0..U+FDEF are allowed in UTF-8 strings again. (fdo#63072) + + Diagnose incorrect use of dbus_connection_get_data() with negative slot + (i.e. before allocating the slot) rather than returning junk (fdo#63127) + + In the activation helper, when compiled for tests, do not reset the system + bus address, fixing the regression tests. (fdo#52202) + + Fix building with Valgrind 3.8, at the cost of causing harmless warnings + with Valgrind 3.6 on some compilers (fdo#55932) + + Don't leak temporary fds pointing to /dev/null (fdo#56927,) + + Create session.d, system.d directories under CMake (fdo#41319) + + Include alloca.h for alloca() if available, fixing compilation on + Solaris 10 (fdo#63071) + ------------------------------------------------------------------- Fri Feb 22 17:13:02 CET 2013 - hpj@suse.com diff --git a/dbus-1.spec b/dbus-1.spec index c3cfd89..30c67f8 100644 --- a/dbus-1.spec +++ b/dbus-1.spec @@ -41,11 +41,12 @@ BuildRequires: libexpat-devel BuildRequires: libtool BuildRequires: pkg-config BuildRequires: update-desktop-files +BuildRequires: xmlto %if %{with_systemd} BuildRequires: pkgconfig(libsystemd-daemon) BuildRequires: pkgconfig(libsystemd-login) %endif -Version: 1.6.8 +Version: 1.7.2 Release: 0 # bug437293 %ifarch ppc64 @@ -60,10 +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 # PATCH-FIX-OPENSUSE hpj@suse.com bnc#802525 - Avoid clients hanging after move to /run -Patch3: dbus-fall-back-to-old-run-directory.patch +Patch2: dbus-fall-back-to-old-run-directory.patch %if 0%{?suse_version} > 1100 %bcond_without selinux %else @@ -140,7 +139,6 @@ bus daemon). %patch0 -p1 %patch1 -p1 %patch2 -p1 -%patch3 -p1 %build autoreconf -fi @@ -171,6 +169,8 @@ export V=1 %endif --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-systemdsystemunitdir=%{_unitdir} make %{?_smp_mflags} doxygen -u && doxygen @@ -317,6 +317,13 @@ mkdir -p /run/systemd/system %doc %{_datadir}/doc/dbus/dbus-tutorial.html %doc %{_datadir}/doc/dbus/diagram.* %doc %{_datadir}/doc/dbus/system-activation.txt +%doc %{_datadir}/doc/dbus/dbus-cleanup-sockets.1.html +%doc %{_datadir}/doc/dbus/dbus-daemon.1.html +%doc %{_datadir}/doc/dbus/dbus-launch.1.html +%doc %{_datadir}/doc/dbus/dbus-monitor.1.html +%doc %{_datadir}/doc/dbus/dbus-send.1.html +%doc %{_datadir}/doc/dbus/dbus-uuidgen.1.html +%doc %{_datadir}/doc/dbus/dbus.devhelp %doc doc/*.txt doc/file-boilerplate.c doc/TODO %{_datadir}/susehelp diff --git a/dbus-move-everything-to-run-directory.patch b/dbus-move-everything-to-run-directory.patch deleted file mode 100644 index 7b04039..0000000 --- a/dbus-move-everything-to-run-directory.patch +++ /dev/null @@ -1,129 +0,0 @@ -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 DBUS_SYSTEM_BUS_ADDRESS environment - variable. If that variable is not set, applications should try - to connect to the well-known address -- unix:path=/var/run/dbus/system_bus_socket. -+ unix:path=/run/dbus/system_bus_socket. - [2] -

- 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 DBUS_SYSTEM_BUS_ADDRESS environment - variable. If that variable is not set, applications should try - to connect to the well-known address -- unix:path=/var/run/dbus/system_bus_socket. -+ unix:path=/run/dbus/system_bus_socket. - - - 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 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 - #undef interface - --#define DBUS_CONSOLE_DIR "/var/run/console/" -+#define DBUS_CONSOLE_DIR "/run/console/" - - - void _dbus_win_set_errno (int err);