Hello community, here is the log from the commit of package dbus-1 checked in at Sat Oct 20 17:36:32 CEST 2007. -------- --- dbus-1/dbus-1.changes 2007-09-25 12:13:43.000000000 +0200 +++ /mounts/work_src_done/STABLE/dbus-1/dbus-1.changes 2007-10-19 18:47:55.187749000 +0200 @@ -1,0 +2,25 @@ +Fri Oct 19 18:46:53 CEST 2007 - jpr@suse.de + +- Correct error in fix for b.n.c 332845, extraneous $DBUS_DAEMON_PID + +------------------------------------------------------------------- +Fri Oct 19 16:39:51 CEST 2007 - meissner@suse.de + +- adjust permissions handling + +------------------------------------------------------------------- +Fri Oct 12 12:35:00 CEST 2007 - thoenig@suse.de + +- Don't use startproc (b.n.c 332845) +- Merge D-Bus package from build service + +------------------------------------------------------------------- +Tue Oct 2 08:00:00 CEST 2007 - tambet@novell.com + +- Update to 1.1.2 for system service activation. +- Add patches from RedHat: + dbus-lsb.patch + dbus-audit-user.patch + dbus-no-abort.patch + +------------------------------------------------------------------- dbus-1-x11.changes: same change Old: ---- dbus-1.0.2.tar.gz dbus-display-errors-from-dbus-launch.diff New: ---- dbus-1.1.2.tar.gz dbus-audit-user.patch dbus-lsb.patch dbus-no-abort.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dbus-1.spec ++++++ --- /var/tmp/diff_new_pack.vV9366/_old 2007-10-20 17:36:20.000000000 +0200 +++ /var/tmp/diff_new_pack.vV9366/_new 2007-10-20 17:36:20.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package dbus-1 (Version 1.0.2) +# spec file for package dbus-1 (Version 1.1.2) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -17,17 +17,22 @@ Summary: D-Bus Message Bus System # COMMON1-BEGIN BuildRequires: doxygen libexpat-devel libzio pkgconfig -Version: 1.0.2 -Release: 60 +Version: 1.1.2 +Release: 1 AutoReqProv: on Source0: dbus-%{version}.tar.gz Source1: rc.boot.dbus Source2: dbus-1.desktop Patch0: dbus-do-not-abort-on-check-thoenig-01.patch -Patch1: dbus-display-errors-from-dbus-launch.diff +# https://bugs.freedesktop.org/show_bug.cgi?id=11491 +Patch1: dbus-lsb.patch +# https://bugs.freedesktop.org/show_bug.cgi?id=12429 +Patch2: dbus-audit-user.patch +# https://bugs.freedesktop.org/show_bug.cgi?id=12430 +Patch3: dbus-no-abort.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build # COMMON1-END -PreReq: /usr/sbin/groupadd /usr/sbin/useradd /sbin/insserv /etc/init.d/boot.localfs +PreReq: permissions /usr/sbin/groupadd /usr/sbin/useradd /sbin/insserv /etc/init.d/boot.localfs %package -n dbus-1-devel Summary: Developer package for D-Bus @@ -127,7 +132,9 @@ %setup -n dbus-%{version} -q # Disable this until we hit RC phase #%patch0 -%patch1 +%patch1 -p1 +%patch2 -p1 +%patch3 -p1 %build autoreconf -fi @@ -141,6 +148,7 @@ --prefix=%{_prefix} \ --bindir=/bin \ --exec_prefix=%{_exec_prefix} \ + --libexecdir=/%{_lib}/%{name} \ --sysconfdir=%{_sysconfdir} \ --datadir=%{_datadir} \ --localstatedir=%{_localstatedir} \ @@ -165,8 +173,8 @@ mkdir -p %{buildroot}/%{_datadir}/susehelp/meta/Development/Libraries/ install -m 0644 %SOURCE2 \ %{buildroot}/%{_datadir}/susehelp/meta/Development/Libraries/dbus-1.desktop -mkdir -p %{buildroot}/%{_datadir}/dbus-1/interfaces mkdir -p %{buildroot}/%{_libdir}/pkgconfig +mkdir -p %{buildroot}/%{_datadir}/dbus-1/interfaces sed -e 's@-I${libdir}@-I${prefix}/%{_lib}@' %{buildroot}/%{_lib}/pkgconfig/dbus-1.pc > %{buildroot}/%{_libdir}/pkgconfig/dbus-1.pc rm -f %{buildroot}/%{_lib}/pkgconfig/dbus-1.pc mkdir -p %{buildroot}/%{_libdir}/dbus-1.0/include/ @@ -192,6 +200,9 @@ mkdir -p %{_localstatedir}/lib/dbus %{insserv_force_if_yast dbus} %{run_ldconfig} +%{run_permissions} +%verifyscript +%verify_permissions -e %{_libexecdir}/dbus-1/dbus-daemon-launch-helper %postun %{restart_on_update dbus} @@ -216,6 +227,7 @@ /bin/dbus-monitor /bin/dbus-send /bin/dbus-uuidgen +/%{_lib}/dbus-1 /%{_lib}/*dbus-1.so.* %{_mandir}/man1/dbus-cleanup-sockets.1.* %{_mandir}/man1/dbus-daemon.1.* @@ -224,6 +236,9 @@ %{_mandir}/man1/dbus-uuidgen.1.* %{_sbindir}/rcdbus %attr(-,messagebus,messagebus) %{_localstatedir}/run/dbus +# See doc/system-activation.txt in source tarball for the rationale +# behind these permissions +%verify(not mode) /%{_lib}/%{name}/dbus-daemon-launch-helper %files -n dbus-1-devel %defattr(-,root,root) @@ -239,6 +254,19 @@ %doc doc/*.txt doc/file-boilerplate.c doc/TODO %{_datadir}/susehelp %changelog +* Fri Oct 19 2007 - jpr@suse.de +- Correct error in fix for b.n.c 332845, extraneous $DBUS_DAEMON_PID +* Fri Oct 19 2007 - meissner@suse.de +- adjust permissions handling +* Fri Oct 12 2007 - thoenig@suse.de +- Don't use startproc (b.n.c 332845) +- Merge D-Bus package from build service +* Tue Oct 02 2007 - tambet@novell.com +- Update to 1.1.2 for system service activation. +- Add patches from RedHat: + dbus-lsb.patch + dbus-audit-user.patch + dbus-no-abort.patch * Tue Sep 25 2007 - dmueller@suse.de - install a interfaces directory * Fri Aug 10 2007 - dmueller@suse.de ++++++ dbus-1-x11.spec ++++++ --- /var/tmp/diff_new_pack.vV9366/_old 2007-10-20 17:36:20.000000000 +0200 +++ /var/tmp/diff_new_pack.vV9366/_new 2007-10-20 17:36:20.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package dbus-1-x11 (Version 1.0.2) +# spec file for package dbus-1-x11 (Version 1.1.2) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -19,14 +19,19 @@ # COMMON1-BEGIN # COMMON1-BEGIN BuildRequires: doxygen libexpat-devel libzio pkgconfig -Version: 1.0.2 -Release: 68 +Version: 1.1.2 +Release: 1 AutoReqProv: on Source0: dbus-%{version}.tar.gz Source1: rc.boot.dbus Source2: dbus-1.desktop Patch0: dbus-do-not-abort-on-check-thoenig-01.patch -Patch1: dbus-display-errors-from-dbus-launch.diff +# https://bugs.freedesktop.org/show_bug.cgi?id=11491 +Patch1: dbus-lsb.patch +# https://bugs.freedesktop.org/show_bug.cgi?id=12429 +Patch2: dbus-audit-user.patch +# https://bugs.freedesktop.org/show_bug.cgi?id=12430 +Patch3: dbus-no-abort.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build # COMMON1-END # COMMON1-END @@ -60,7 +65,9 @@ %setup -n dbus-%{version} -q # Disable this until we hit RC phase #%patch0 -%patch1 +%patch1 -p1 +%patch2 -p1 +%patch3 -p1 %build autoreconf -fi @@ -74,6 +81,7 @@ --prefix=%{_prefix} \ --bindir=/bin \ --exec_prefix=%{_exec_prefix} \ + --libexecdir=/%{_lib}/%{name} \ --sysconfdir=%{_sysconfdir} \ --datadir=%{_datadir} \ --localstatedir=%{_localstatedir} \ @@ -106,6 +114,19 @@ %{_bindir}/dbus-launch %{_mandir}/man1/dbus-launch.1* %changelog +* Fri Oct 19 2007 - jpr@suse.de +- Correct error in fix for b.n.c 332845, extraneous $DBUS_DAEMON_PID +* Fri Oct 19 2007 - meissner@suse.de +- adjust permissions handling +* Fri Oct 12 2007 - thoenig@suse.de +- Don't use startproc (b.n.c 332845) +- Merge D-Bus package from build service +* Tue Oct 02 2007 - tambet@novell.com +- Update to 1.1.2 for system service activation. +- Add patches from RedHat: + dbus-lsb.patch + dbus-audit-user.patch + dbus-no-abort.patch * Tue Sep 25 2007 - dmueller@suse.de - install a interfaces directory * Fri Aug 10 2007 - dmueller@suse.de ++++++ dbus-1.0.2.tar.gz -> dbus-1.1.2.tar.gz ++++++ ++++ 68403 lines of diff (skipped) ++++++ dbus-audit-user.patch ++++++ Index: dbus-1.1.2/bus/selinux.c =================================================================== --- dbus-1.1.2.orig/bus/selinux.c +++ dbus-1.1.2/bus/selinux.c @@ -113,7 +113,7 @@ static const struct avc_lock_callback lo static int audit_fd = -1; #endif -static void +void audit_init(void) { #ifdef HAVE_LIBAUDIT @@ -350,12 +350,8 @@ bus_selinux_full_init (void) freecon (bus_context); - audit_init (); - - return TRUE; -#else - return TRUE; #endif /* HAVE_SELINUX */ + return TRUE; } /** Index: dbus-1.1.2/dbus/dbus-sysdeps-util-unix.c =================================================================== --- dbus-1.1.2.orig/dbus/dbus-sysdeps-util-unix.c +++ dbus-1.1.2/dbus/dbus-sysdeps-util-unix.c @@ -300,7 +300,7 @@ _dbus_change_to_daemon_user (const char * run as ... doesn't really help. But keeps people happy. */ - if (!we_were_root) + if (we_were_root) { cap_value_t new_cap_list[] = { CAP_AUDIT_WRITE }; cap_value_t tmp_cap_list[] = { CAP_AUDIT_WRITE, CAP_SETUID, CAP_SETGID }; @@ -376,7 +376,7 @@ _dbus_change_to_daemon_user (const char } #ifdef HAVE_LIBAUDIT - if (!we_were_root) + if (we_were_root) { if (cap_set_proc (new_caps)) { @@ -395,6 +395,7 @@ _dbus_change_to_daemon_user (const char _dbus_strerror (errno)); return FALSE; } + audit_init(); } #endif ++++++ dbus-lsb.patch ++++++ Index: dbus-1.1.2/bus/messagebus.in =================================================================== --- dbus-1.1.2.orig/bus/messagebus.in +++ dbus-1.1.2/bus/messagebus.in @@ -9,6 +9,16 @@ # processname: dbus-daemon # pidfile: @DBUS_SYSTEM_PID_FILE@ # +### BEGIN INIT INFO +# Provides: messagebus +# Required-Start: $syslog $local_fs +# Required-Stop: $syslog $local_fs +# Default-Start: 2 3 4 5 +# Default-Stop: 0 1 6 +# Short-Description: The D-Bus systemwide message bus +# Description: This is a daemon which broadcasts notifications of system +# events and other messages. See http://www.freedesktop.org/software/dbus +### END INIT INFO # Sanity checks. [ -x @EXPANDED_BINDIR@/dbus-daemon ] || exit 0 ++++++ dbus-no-abort.patch ++++++ Index: dbus-1.1.2/bus/bus.c =================================================================== --- dbus-1.1.2.orig/bus/bus.c +++ dbus-1.1.2/bus/bus.c @@ -1206,7 +1206,7 @@ bus_context_check_security_policy (BusCo dest ? dest : DBUS_SERVICE_DBUS, error)) { - if (dbus_error_is_set (error) && + if (error != NULL && dbus_error_is_set (error) && dbus_error_has_name (error, DBUS_ERROR_NO_MEMORY)) { return FALSE; ++++++ rc.boot.dbus ++++++ --- dbus-1/rc.boot.dbus 2007-07-30 14:42:00.000000000 +0200 +++ /mounts/work_src_done/STABLE/dbus-1/rc.boot.dbus 2007-10-19 18:03:41.647931000 +0200 @@ -68,7 +68,7 @@ fi fi echo -n "Starting D-Bus daemon"; - startproc -f -p $DBUS_DAEMON_PID $DBUS_DAEMON_BIN $DBUS_DAEMON_PARAMETER + $DBUS_DAEMON_BIN $DBUS_DAEMON_PARAMETER rc_status -v ;; stop) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org