rpms/dbus/FC-6 dbus-rh-upgrade-config.sh, NONE, 1.1 dbus-1.0.1-fix-upgrade-mess.patch, 1.1, 1.2 dbus.spec, 1.113, 1.114 session.conf, 1.1, 1.2 system.conf, 1.1, NONE

Thu Dec 21 18:39:04 UTC 2006

Author: rstrode

Update of /cvs/dist/rpms/dbus/FC-6
In directory cvs.devel.redhat.com:/tmp/cvs-serv15456

Modified Files:
	dbus-1.0.1-fix-upgrade-mess.patch dbus.spec session.conf 
Added Files:
	dbus-rh-upgrade-config.sh 
Removed Files:
	system.conf 
Log Message:
- instead of moving config file like we did in 1.0.1-5, just
  ship a compatible config file and upgrade on reboot
  (bug 218207 again)

--- NEW FILE dbus-rh-upgrade-config.sh ---
#!/bin/sh

MD5SUM="22fc46fda1b2cfd93ccb1f5825bdf0d5  /etc/dbus-1/session.conf"

set -e

if [ "$1" != "--force" ]; then

    # if we've already upgraded the config then bail
    [ -e /var/lib/dbus/.rh-config-is-upgraded ] && exit 0

    # if someone else has modified the config then bail
    echo "${MD5SUM}" | md5sum --check --status || exit 0
fi

sed -i -e 's@<servicedir>/usr/share/dbus-1/services</servicedir>@<standard_session_servicedirs />@g' /etc/dbus-1/session.conf

# we've upgraded the config, don't do it again
touch /var/lib/dbus/.rh-config-is-upgraded

dbus-1.0.1-fix-upgrade-mess.patch:
 bus.c         |   18 ++++++++++--------
 main.c        |   36 ++++++++++++++++++++++++++++--------
 messagebus.in |    4 ++++
 3 files changed, 42 insertions(+), 16 deletions(-)

Index: dbus-1.0.1-fix-upgrade-mess.patch
===================================================================
RCS file: /cvs/dist/rpms/dbus/FC-6/dbus-1.0.1-fix-upgrade-mess.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- dbus-1.0.1-fix-upgrade-mess.patch	15 Dec 2006 17:39:07 -0000	1.1
+++ dbus-1.0.1-fix-upgrade-mess.patch	21 Dec 2006 18:39:02 -0000	1.2
@@ -1,59 +1,18 @@
---- dbus-1.0.1/bus/system.conf.in.fix-upgrade-mess	2006-08-03 16:34:36.000000000 -0400
-+++ dbus-1.0.1/bus/system.conf.in	2006-12-15 12:12:04.000000000 -0500
-@@ -1,5 +1,5 @@
- <!-- This configuration file controls the systemwide message bus.
--     Add a system-local.conf and edit that rather than changing this 
-+     Add a /etc/dbus-1/system-local.conf and edit that rather than changing this 
-      file directly. -->
- 
- <!-- Note that there are any number of ways you can hose yourself
-@@ -50,12 +50,16 @@
-   </policy>
- 
-   <!-- Config files are placed here that among other things, punch 
--       holes in the above policy for specific services. -->
--  <includedir>system.d</includedir>
-+       holes in the above policy for specific services. 
-+       
-+       FIXME: for Fedora 7 we should move this to
-+       /usr/share/dbus-1
-+  -->
-+  <includedir>/etc/dbus-1/system.d</includedir>
- 
-   <!-- This is included last so local configuration can override what's 
-        in this standard file -->
--  <include ignore_missing="yes">system-local.conf</include>
-+  <include ignore_missing="yes">/etc/dbus-1/system-local.conf</include>
- 
-   <include if_selinux_enabled="yes" selinux_root_relative="yes">contexts/dbus_contexts</include>
- 
---- dbus-1.0.1/bus/Makefile.am.fix-upgrade-mess	2006-10-01 11:36:18.000000000 -0400
-+++ dbus-1.0.1/bus/Makefile.am	2006-12-15 12:21:40.000000000 -0500
-@@ -1,10 +1,11 @@
- 
- configdir=$(sysconfdir)/dbus-1
-+distropolicydir=$(datadir)/dbus-1
- 
- INCLUDES=-I$(top_srcdir) $(DBUS_BUS_CFLAGS)				\
- 	-DDAEMON_NAME=\"dbus-daemon\"  -DDBUS_COMPILATION		\
--	-DDBUS_SYSTEM_CONFIG_FILE=\""$(configdir)/system.conf"\"	\
--	-DDBUS_SESSION_CONFIG_FILE=\""$(configdir)/session.conf"\"
-+	-DDBUS_SYSTEM_CONFIG_FILE=\""$(distropolicydir)/system.conf"\"	\
-+	-DDBUS_SESSION_CONFIG_FILE=\""$(distropolicydir)/session.conf"\"
- 
- EFENCE=
- 
-@@ -12,7 +13,7 @@
- 	session.conf.in				\
- 	system.conf.in
- 
--config_DATA=					\
-+distropolicy_DATA=				\
- 	session.conf				\
- 	system.conf
- 
---- dbus-1.0.1/bus/bus.c.fix-upgrade-mess	2006-11-06 11:02:19.000000000 -0500
-+++ dbus-1.0.1/bus/bus.c	2006-12-15 12:12:04.000000000 -0500
+--- dbus-1.0.1/bus/messagebus.in.fix-upgrade-mess	2006-12-19 22:48:31.000000000 -0800
++++ dbus-1.0.1/bus/messagebus.in	2006-12-19 22:50:20.000000000 -0800
+@@ -28,6 +28,10 @@
+         @EXPANDED_BINDIR@/dbus-uuidgen --ensure
+     fi
+ 
++    if [ -x /usr/libexec/dbus-rh-upgrade-config.sh ] ; then
++	    /usr/libexec/dbus-rh-upgrade-config.sh
++    fi
++
+     daemon --check $servicename $processname --system
+     RETVAL=$?
+     echo
+--- dbus-1.0.1/bus/bus.c.fix-upgrade-mess	2006-11-06 08:02:19.000000000 -0800
++++ dbus-1.0.1/bus/bus.c	2006-12-18 21:49:54.000000000 -0800
 @@ -402,6 +402,7 @@
  {
    DBusString full_address;
@@ -91,8 +50,8 @@
    /* Drop existing conf-dir watches (if applicable) */
  
    if (is_reload)
---- dbus-1.0.1/bus/main.c.fix-upgrade-mess	2006-09-16 11:34:34.000000000 -0400
-+++ dbus-1.0.1/bus/main.c	2006-12-15 12:12:04.000000000 -0500
+--- dbus-1.0.1/bus/main.c.fix-upgrade-mess	2006-09-16 08:34:34.000000000 -0700
++++ dbus-1.0.1/bus/main.c	2006-12-18 21:49:54.000000000 -0800
 @@ -37,6 +37,7 @@
  #define RELOAD_READ_END 0
  #define RELOAD_WRITE_END 1
@@ -168,21 +127,3 @@
  int
  main (int argc, char **argv)
  {
---- dbus-1.0.1/bus/session.conf.in.fix-upgrade-mess	2006-11-01 18:30:46.000000000 -0500
-+++ dbus-1.0.1/bus/session.conf.in	2006-12-15 12:12:04.000000000 -0500
-@@ -1,5 +1,5 @@
- <!-- This configuration file controls the per-user-login-session message bus.
--     Add a session-local.conf and edit that rather than changing this 
-+     Add a /etc/dbus-1/session-local.conf and edit that rather than changing this 
-      file directly. -->
- 
- <!DOCTYPE busconfig PUBLIC "-//freedesktop//DTD D-Bus Bus Configuration 1.0//EN"
-@@ -23,7 +23,7 @@
- 
-   <!-- This is included last so local configuration can override what's 
-        in this standard file -->
--  <include ignore_missing="yes">session-local.conf</include>
-+  <include ignore_missing="yes">/etc/dbus-1/session-local.conf</include>
- 
-   <include if_selinux_enabled="yes" selinux_root_relative="yes">contexts/dbus_contexts</include>
- 


Index: dbus.spec
===================================================================
RCS file: /cvs/dist/rpms/dbus/FC-6/dbus.spec,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -r1.113 -r1.114
--- dbus.spec	16 Dec 2006 02:45:57 -0000	1.113
+++ dbus.spec	21 Dec 2006 18:39:02 -0000	1.114
@@ -8,11 +8,11 @@
 Summary: D-BUS message bus
 Name: dbus
 Version: 1.0.1 
-Release: 8%{?dist}
+Release: 9%{?dist}
 URL: http://www.freedesktop.org/software/dbus/
 Source0: %{name}-%{version}.tar.gz
 Source1: session.conf
-Source2: system.conf
+Source2: dbus-rh-upgrade-config.sh
 License: AFL/GPL
 Group: System Environment/Libraries
 BuildRoot: %{_tmppath}/%{name}-root
@@ -75,7 +75,7 @@
 %patch4 -p1 -b .audit_system
 %patch6 -p1 -b .no_fatal_checks
 %patch7 -p1 -b .pthread-holder-fix
-#%patch8 -p1 -b .fix-upgrade-mess
+%patch8 -p1 -b .fix-upgrade-mess
 %patch9 -p1 -b .dbus-0.22-fix-match-rule-equal.patch
 
 autoreconf -f -i
@@ -111,11 +111,10 @@
 
 mkdir -p $RPM_BUILD_ROOT/%{_libdir}/pkgconfig
 
-#install -m444 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/dbus-1
-#install -m444 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/dbus-1
+install -m644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/dbus-1
 
-#chmod 444 $RPM_BUILD_ROOT%{_datadir}/dbus-1/session.conf
-#chmod 444 $RPM_BUILD_ROOT%{_datadir}/dbus-1/system.conf
+mkdir -p $RPM_BUILD_ROOT%{_libexecdir}
+install -m755 %{SOURCE2} $RPM_BUILD_ROOT%{_libexecdir}
 
 #change the arch-deps.h include directory to /usr/lib[64] instead of /lib[64]
 sed -e 's at -I${libdir}@-I${prefix}/%{_lib}@' $RPM_BUILD_ROOT/%{_lib}/pkgconfig/dbus-1.pc > $RPM_BUILD_ROOT/%{_libdir}/pkgconfig/dbus-1.pc
@@ -169,11 +168,10 @@
 /bin/dbus-cleanup-sockets
 /bin/dbus-monitor
 /bin/dbus-uuidgen
+%{_libexecdir}/dbus-rh-upgrade-config.sh
 /%{_lib}/*dbus-1*.so.*
 %{_datadir}/man/man*/*
 %{_datadir}/dbus-1/services
-#%{_datadir}/dbus-1/*.conf
-#%{_sysconfdir}/dbus-1/*.conf
 
 %files x11
 %defattr(-,root,root)
@@ -189,6 +187,11 @@
 %{_includedir}/*
 
 %changelog
+* Thu Dec 21 2006 Ray Strode <rstrode at redhat.com> - 1.0.1-9
+- instead of moving config file like we did in 1.0.1-5, just
+  ship a compatible config file and upgrade on reboot
+  (bug 218207 again)
+
 * Fri Dec 15 2006 Ray Strode <rstrode at redhat.com> - 1.0.1-8
 - undo the patch in 1.0.1-5.fc6 to get the security update
   in 1.0.1-7.fc6 out independent of bug 218207


Index: session.conf
===================================================================
RCS file: /cvs/dist/rpms/dbus/FC-6/session.conf,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- session.conf	15 Dec 2006 17:39:07 -0000	1.1
+++ session.conf	21 Dec 2006 18:39:02 -0000	1.2
@@ -1,19 +1,30 @@
-<!-- 
-     ** WARNING **
-     
-     This file is obsolete and changes to it will be ignored.
-
-     It was installed to address a bad upgrade bug where Fedora
-     Core 6 users would get logged out during a yum update
-     transaction.
-
-     See
-     https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=218207
-     for more information.
-
-     Normally, you should not need to adjust the dbus bus daemon
-     policy.  If for some reason you do, though, create
-     /etc/dbus-1/session-local.conf, and put your changes there.
--->
+<!-- This configuration file controls the per-user-login-session message bus.
+     Add a session-local.conf and edit that rather than changing this 
+     file directly. -->
 
-<!DOCTYPE busconfig PUBLIC "-//freedesktop//DTD D-Bus Bus Configuration 1.0//EN" "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd"><busconfig><type>session</type><listen>unix:tmpdir=/tmp</listen><servicedir>/usr/share/dbus-1/services</servicedir><policy context="default"><allow send_destination="*"/><allow eavesdrop="true"/><allow own="*"/></policy><include ignore_missing="yes">session-local.conf</include><include if_selinux_enabled="yes" selinux_root_relative="yes">contexts/dbus_contexts</include></busconfig>
+<!DOCTYPE busconfig PUBLIC "-//freedesktop//DTD D-Bus Bus Configuration 1.0//EN"
+ "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
+<busconfig>
+  <!-- Our well-known bus type, don't change this -->
+  <type>session</type>
+
+  <listen>unix:tmpdir=/tmp</listen>
+
+  <servicedir>/usr/share/dbus-1/services</servicedir>
+
+  <policy context="default">
+    <!-- Allow everything to be sent -->
+    <allow send_destination="*"/>
+    <!-- Allow everything to be received -->
+    <allow eavesdrop="true"/>
+    <!-- Allow anyone to own anything -->
+    <allow own="*"/>
+  </policy>
+
+  <!-- This is included last so local configuration can override what's 
+       in this standard file -->
+  <include ignore_missing="yes">session-local.conf</include>
+
+  <include if_selinux_enabled="yes" selinux_root_relative="yes">contexts/dbus_contexts</include>
+
+</busconfig>


--- system.conf DELETED ---


