From ea5b925831a312457aaa51eb584970205108b70a Mon Sep 17 00:00:00 2001
From: Ross Burton <ross@openedhand.com>
Date: Wed, 27 Feb 2008 17:32:15 +0000
Subject: dbus: sneak in the security fix release

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@3875 311d38ba-8fff-0310-9ca6-ca027cbcb966
---
 meta/conf/distro/poky.conf                         |   4 +-
 meta/packages/dbus/dbus-1.0.2/cross.patch          |  10 --
 meta/packages/dbus/dbus-1.0.2/dbus-1.init          | 110 ---------------------
 .../dbus/dbus-1.0.2/fix-install-daemon.patch       |  13 ---
 meta/packages/dbus/dbus-1.0.2/tmpdir.patch         |  30 ------
 meta/packages/dbus/dbus-1.0.3/cross.patch          |  10 ++
 meta/packages/dbus/dbus-1.0.3/dbus-1.init          | 110 +++++++++++++++++++++
 .../dbus/dbus-1.0.3/fix-install-daemon.patch       |  13 +++
 meta/packages/dbus/dbus-1.0.3/tmpdir.patch         |  30 ++++++
 meta/packages/dbus/dbus-native_1.0.2.bb            |  31 ------
 meta/packages/dbus/dbus-native_1.0.3.bb            |  31 ++++++
 meta/packages/dbus/dbus_1.0.2.bb                   |   4 -
 meta/packages/dbus/dbus_1.0.3.bb                   |   4 +
 13 files changed, 200 insertions(+), 200 deletions(-)
 delete mode 100644 meta/packages/dbus/dbus-1.0.2/cross.patch
 delete mode 100644 meta/packages/dbus/dbus-1.0.2/dbus-1.init
 delete mode 100644 meta/packages/dbus/dbus-1.0.2/fix-install-daemon.patch
 delete mode 100644 meta/packages/dbus/dbus-1.0.2/tmpdir.patch
 create mode 100644 meta/packages/dbus/dbus-1.0.3/cross.patch
 create mode 100644 meta/packages/dbus/dbus-1.0.3/dbus-1.init
 create mode 100644 meta/packages/dbus/dbus-1.0.3/fix-install-daemon.patch
 create mode 100644 meta/packages/dbus/dbus-1.0.3/tmpdir.patch
 delete mode 100644 meta/packages/dbus/dbus-native_1.0.2.bb
 create mode 100644 meta/packages/dbus/dbus-native_1.0.3.bb
 delete mode 100644 meta/packages/dbus/dbus_1.0.2.bb
 create mode 100644 meta/packages/dbus/dbus_1.0.3.bb

diff --git a/meta/conf/distro/poky.conf b/meta/conf/distro/poky.conf
index e94e835d41..15d065ef96 100644
--- a/meta/conf/distro/poky.conf
+++ b/meta/conf/distro/poky.conf
@@ -206,8 +206,8 @@ PREFERRED_VERSION_cairo ?= "1.4.14"
 PREFERRED_VERSION_pango ?= "1.18.3"
 PREFERRED_VERSION_gtk+ ?= "2.12.7"
 
-PREFERRED_VERSION_dbus ?= "1.0.2"
-PREFERRED_VERSION_dbus-native ?= "1.0.2"
+PREFERRED_VERSION_dbus ?= "1.0.3"
+PREFERRED_VERSION_dbus-native ?= "1.0.3"
 PREFERRED_VERSION_dbus-glib ?= "0.74"
 PREFERRED_VERSION_dbus-glib-native ?= "0.74"
 PREFERRED_VERSION_gnome-vfs ?= "2.20.0"
diff --git a/meta/packages/dbus/dbus-1.0.2/cross.patch b/meta/packages/dbus/dbus-1.0.2/cross.patch
deleted file mode 100644
index 268a3ae3de..0000000000
--- a/meta/packages/dbus/dbus-1.0.2/cross.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- /tmp/configure.in	2006-11-09 21:47:10.000000000 +0100
-+++ dbus-0.95/configure.in	2006-11-09 21:48:13.108554000 +0100
-@@ -719,6 +719,7 @@
-     exit (0);
- ]])],
-               [ac_cv_have_abstract_sockets=yes],
-+	      [ac_cv_have_abstract_sockets=no],
-               [ac_cv_have_abstract_sockets=no]
- )])
- AC_LANG_POP(C)
diff --git a/meta/packages/dbus/dbus-1.0.2/dbus-1.init b/meta/packages/dbus/dbus-1.0.2/dbus-1.init
deleted file mode 100644
index 0725083c69..0000000000
--- a/meta/packages/dbus/dbus-1.0.2/dbus-1.init
+++ /dev/null
@@ -1,110 +0,0 @@
-#! /bin/sh
-# -*- coding: utf-8 -*-
-# Debian init.d script for D-BUS
-# Copyright © 2003 Colin Walters <walters@debian.org>
-
-set -e
-
-DAEMON=/usr/bin/dbus-daemon
-NAME=dbus
-DAEMONUSER=messagebus
-PIDDIR=/var/run/dbus
-PIDFILE=$PIDDIR/pid
-UUIDDIR=/var/lib/dbus
-DESC="system message bus"
-EVENTDIR=/etc/dbus-1/event.d
-
-test -x $DAEMON || exit 0
-
-# Source defaults file; edit that file to configure this script.
-ENABLED=1
-PARAMS=""
-if [ -e /etc/default/dbus ]; then
-  . /etc/default/dbus
-fi
-
-test "$ENABLED" != "0" || exit 0
-
-start_it_up()
-{
-  if [ ! -d $PIDDIR ]; then
-    mkdir -p $PIDDIR
-    chown $DAEMONUSER $PIDDIR
-    chgrp $DAEMONUSER $PIDDIR
-  fi
-  if [ -e $PIDFILE ]; then
-    PIDDIR=/proc/$(cat $PIDFILE)
-    if [ -d ${PIDDIR} -a  "$(readlink -f ${PIDDIR}/exe)" = "${DAEMON}" ]; then 
-      echo "$DESC already started; not starting."
-    else
-      echo "Removing stale PID file $PIDFILE."
-      rm -f $PIDFILE
-    fi
-  fi
-
-  if [ ! -d $UUIDDIR ]; then
-    mkdir -p $UUIDDIR
-    chown $DAEMONUSER $UUIDDIR
-    chgrp $DAEMONUSER $UUIDDIR
-  fi
- 
-  dbus-uuidgen --ensure  
-
-  echo -n "Starting $DESC: "
-  start-stop-daemon --start --quiet --pidfile $PIDFILE \
-    --user $DAEMONUSER --exec $DAEMON -- --system $PARAMS
-  echo "$NAME."
-  if [ -d $EVENTDIR ]; then
-      run-parts --arg=start $EVENTDIR
-  fi
-}
-
-shut_it_down()
-{
-  if [ -d $EVENTDIR ]; then
-      # TODO: --reverse when busybox supports it
-      run-parts --arg=stop $EVENTDIR
-  fi
-  echo -n "Stopping $DESC: "
-  start-stop-daemon --stop  --quiet --pidfile $PIDFILE \
-    --user $DAEMONUSER
-  # We no longer include these arguments so that start-stop-daemon
-  # can do its job even given that we may have been upgraded.
-  # We rely on the pidfile being sanely managed
-  # --exec $DAEMON -- --system $PARAMS
-  echo "$NAME."
-  rm -f $PIDFILE
-}
-
-reload_it()
-{
-  echo -n "Reloading $DESC config: "
-  dbus-send --print-reply --system --type=method_call \
-            --dest=org.freedesktop.DBus \
-            / org.freedesktop.DBus.ReloadConfig > /dev/null
-  # hopefully this is enough time for dbus to reload it's config file.
-  echo "done."
-}
-
-case "$1" in
-  start)
-    start_it_up
-  ;;
-  stop)
-    shut_it_down
-  ;;
-  reload|force-reload)
-    reload_it
-  ;;
-  restart)
-    shut_it_down
-    sleep 1
-    start_it_up
-  ;;
-  *)
-    echo "Usage: /etc/init.d/$NAME {start|stop|restart|reload|force-reload}" >&2
-    exit 1
-  ;;
-esac
-
-exit 0
diff --git a/meta/packages/dbus/dbus-1.0.2/fix-install-daemon.patch b/meta/packages/dbus/dbus-1.0.2/fix-install-daemon.patch
deleted file mode 100644
index c31786357d..0000000000
--- a/meta/packages/dbus/dbus-1.0.2/fix-install-daemon.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: dbus-0.94/bus/Makefile.am
-===================================================================
---- dbus-0.94.orig/bus/Makefile.am	2006-10-01 17:36:18.000000000 +0200
-+++ dbus-0.94/bus/Makefile.am	2006-10-14 21:40:05.000000000 +0200
-@@ -110,7 +110,7 @@
- 		$(mkinstalldirs) $(DESTDIR)$(DBUS_DAEMONDIR); \
- 		chmod 755 $(DESTDIR)$(DBUS_DAEMONDIR); \
- 	fi
--	$(INSTALL_PROGRAM) dbus-daemon $(DESTDIR)$(DBUS_DAEMONDIR)
-+	$(INSTALL_PROGRAM) .libs/dbus-daemon $(DESTDIR)$(DBUS_DAEMONDIR)
- 	$(mkinstalldirs) $(DESTDIR)$(localstatedir)/run/dbus
- 	$(mkinstalldirs) $(DESTDIR)$(configdir)/system.d
- 	$(mkinstalldirs) $(DESTDIR)$(datadir)/dbus-1/services
diff --git a/meta/packages/dbus/dbus-1.0.2/tmpdir.patch b/meta/packages/dbus/dbus-1.0.2/tmpdir.patch
deleted file mode 100644
index 838b903f0a..0000000000
--- a/meta/packages/dbus/dbus-1.0.2/tmpdir.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- dbus-0.22/configure.in.orig	2004-08-13 00:57:16.000000000 +0200
-+++ dbus-0.22/configure.in	2004-12-30 21:15:57.000000000 +0100
-@@ -1047,15 +1048,18 @@
- AC_SUBST(ABSOLUTE_TOP_BUILDDIR)
- 
- #### Find socket directories
--if ! test -z "$TMPDIR" ; then
--   DEFAULT_SOCKET_DIR=$TMPDIR
--elif ! test -z "$TEMP" ; then
--   DEFAULT_SOCKET_DIR=$TEMP
--elif ! test -z "$TMP" ; then
--   DEFAULT_SOCKET_DIR=$TMP
--else
--   DEFAULT_SOCKET_DIR=/tmp
--fi
-+#if ! test -z "$TMPDIR" ; then
-+#   DEFAULT_SOCKET_DIR=$TMPDIR
-+#elif ! test -z "$TEMP" ; then
-+#   DEFAULT_SOCKET_DIR=$TEMP
-+#elif ! test -z "$TMP" ; then
-+#   DEFAULT_SOCKET_DIR=$TMP
-+#else
-+#   DEFAULT_SOCKET_DIR=/tmp
-+#fi
-+
-+# checks disabled to avoid expanding this at build time
-+DEFAULT_SOCKET_DIR=/tmp
- 
- if ! test -z "$with_test_socket_dir" ; then
-    TEST_SOCKET_DIR="$with_test_socket_dir"
diff --git a/meta/packages/dbus/dbus-1.0.3/cross.patch b/meta/packages/dbus/dbus-1.0.3/cross.patch
new file mode 100644
index 0000000000..268a3ae3de
--- /dev/null
+++ b/meta/packages/dbus/dbus-1.0.3/cross.patch
@@ -0,0 +1,10 @@
+--- /tmp/configure.in	2006-11-09 21:47:10.000000000 +0100
++++ dbus-0.95/configure.in	2006-11-09 21:48:13.108554000 +0100
+@@ -719,6 +719,7 @@
+     exit (0);
+ ]])],
+               [ac_cv_have_abstract_sockets=yes],
++	      [ac_cv_have_abstract_sockets=no],
+               [ac_cv_have_abstract_sockets=no]
+ )])
+ AC_LANG_POP(C)
diff --git a/meta/packages/dbus/dbus-1.0.3/dbus-1.init b/meta/packages/dbus/dbus-1.0.3/dbus-1.init
new file mode 100644
index 0000000000..0725083c69
--- /dev/null
+++ b/meta/packages/dbus/dbus-1.0.3/dbus-1.init
@@ -0,0 +1,110 @@
+#! /bin/sh
+# -*- coding: utf-8 -*-
+# Debian init.d script for D-BUS
+# Copyright © 2003 Colin Walters <walters@debian.org>
+
+set -e
+
+DAEMON=/usr/bin/dbus-daemon
+NAME=dbus
+DAEMONUSER=messagebus
+PIDDIR=/var/run/dbus
+PIDFILE=$PIDDIR/pid
+UUIDDIR=/var/lib/dbus
+DESC="system message bus"
+EVENTDIR=/etc/dbus-1/event.d
+
+test -x $DAEMON || exit 0
+
+# Source defaults file; edit that file to configure this script.
+ENABLED=1
+PARAMS=""
+if [ -e /etc/default/dbus ]; then
+  . /etc/default/dbus
+fi
+
+test "$ENABLED" != "0" || exit 0
+
+start_it_up()
+{
+  if [ ! -d $PIDDIR ]; then
+    mkdir -p $PIDDIR
+    chown $DAEMONUSER $PIDDIR
+    chgrp $DAEMONUSER $PIDDIR
+  fi
+  if [ -e $PIDFILE ]; then
+    PIDDIR=/proc/$(cat $PIDFILE)
+    if [ -d ${PIDDIR} -a  "$(readlink -f ${PIDDIR}/exe)" = "${DAEMON}" ]; then 
+      echo "$DESC already started; not starting."
+    else
+      echo "Removing stale PID file $PIDFILE."
+      rm -f $PIDFILE
+    fi
+  fi
+
+  if [ ! -d $UUIDDIR ]; then
+    mkdir -p $UUIDDIR
+    chown $DAEMONUSER $UUIDDIR
+    chgrp $DAEMONUSER $UUIDDIR
+  fi
+ 
+  dbus-uuidgen --ensure  
+
+  echo -n "Starting $DESC: "
+  start-stop-daemon --start --quiet --pidfile $PIDFILE \
+    --user $DAEMONUSER --exec $DAEMON -- --system $PARAMS
+  echo "$NAME."
+  if [ -d $EVENTDIR ]; then
+      run-parts --arg=start $EVENTDIR
+  fi
+}
+
+shut_it_down()
+{
+  if [ -d $EVENTDIR ]; then
+      # TODO: --reverse when busybox supports it
+      run-parts --arg=stop $EVENTDIR
+  fi
+  echo -n "Stopping $DESC: "
+  start-stop-daemon --stop  --quiet --pidfile $PIDFILE \
+    --user $DAEMONUSER
+  # We no longer include these arguments so that start-stop-daemon
+  # can do its job even given that we may have been upgraded.
+  # We rely on the pidfile being sanely managed
+  # --exec $DAEMON -- --system $PARAMS
+  echo "$NAME."
+  rm -f $PIDFILE
+}
+
+reload_it()
+{
+  echo -n "Reloading $DESC config: "
+  dbus-send --print-reply --system --type=method_call \
+            --dest=org.freedesktop.DBus \
+            / org.freedesktop.DBus.ReloadConfig > /dev/null
+  # hopefully this is enough time for dbus to reload it's config file.
+  echo "done."
+}
+
+case "$1" in
+  start)
+    start_it_up
+  ;;
+  stop)
+    shut_it_down
+  ;;
+  reload|force-reload)
+    reload_it
+  ;;
+  restart)
+    shut_it_down
+    sleep 1
+    start_it_up
+  ;;
+  *)
+    echo "Usage: /etc/init.d/$NAME {start|stop|restart|reload|force-reload}" >&2
+    exit 1
+  ;;
+esac
+
+exit 0
diff --git a/meta/packages/dbus/dbus-1.0.3/fix-install-daemon.patch b/meta/packages/dbus/dbus-1.0.3/fix-install-daemon.patch
new file mode 100644
index 0000000000..c31786357d
--- /dev/null
+++ b/meta/packages/dbus/dbus-1.0.3/fix-install-daemon.patch
@@ -0,0 +1,13 @@
+Index: dbus-0.94/bus/Makefile.am
+===================================================================
+--- dbus-0.94.orig/bus/Makefile.am	2006-10-01 17:36:18.000000000 +0200
++++ dbus-0.94/bus/Makefile.am	2006-10-14 21:40:05.000000000 +0200
+@@ -110,7 +110,7 @@
+ 		$(mkinstalldirs) $(DESTDIR)$(DBUS_DAEMONDIR); \
+ 		chmod 755 $(DESTDIR)$(DBUS_DAEMONDIR); \
+ 	fi
+-	$(INSTALL_PROGRAM) dbus-daemon $(DESTDIR)$(DBUS_DAEMONDIR)
++	$(INSTALL_PROGRAM) .libs/dbus-daemon $(DESTDIR)$(DBUS_DAEMONDIR)
+ 	$(mkinstalldirs) $(DESTDIR)$(localstatedir)/run/dbus
+ 	$(mkinstalldirs) $(DESTDIR)$(configdir)/system.d
+ 	$(mkinstalldirs) $(DESTDIR)$(datadir)/dbus-1/services
diff --git a/meta/packages/dbus/dbus-1.0.3/tmpdir.patch b/meta/packages/dbus/dbus-1.0.3/tmpdir.patch
new file mode 100644
index 0000000000..838b903f0a
--- /dev/null
+++ b/meta/packages/dbus/dbus-1.0.3/tmpdir.patch
@@ -0,0 +1,30 @@
+--- dbus-0.22/configure.in.orig	2004-08-13 00:57:16.000000000 +0200
++++ dbus-0.22/configure.in	2004-12-30 21:15:57.000000000 +0100
+@@ -1047,15 +1048,18 @@
+ AC_SUBST(ABSOLUTE_TOP_BUILDDIR)
+ 
+ #### Find socket directories
+-if ! test -z "$TMPDIR" ; then
+-   DEFAULT_SOCKET_DIR=$TMPDIR
+-elif ! test -z "$TEMP" ; then
+-   DEFAULT_SOCKET_DIR=$TEMP
+-elif ! test -z "$TMP" ; then
+-   DEFAULT_SOCKET_DIR=$TMP
+-else
+-   DEFAULT_SOCKET_DIR=/tmp
+-fi
++#if ! test -z "$TMPDIR" ; then
++#   DEFAULT_SOCKET_DIR=$TMPDIR
++#elif ! test -z "$TEMP" ; then
++#   DEFAULT_SOCKET_DIR=$TEMP
++#elif ! test -z "$TMP" ; then
++#   DEFAULT_SOCKET_DIR=$TMP
++#else
++#   DEFAULT_SOCKET_DIR=/tmp
++#fi
++
++# checks disabled to avoid expanding this at build time
++DEFAULT_SOCKET_DIR=/tmp
+ 
+ if ! test -z "$with_test_socket_dir" ; then
+    TEST_SOCKET_DIR="$with_test_socket_dir"
diff --git a/meta/packages/dbus/dbus-native_1.0.2.bb b/meta/packages/dbus/dbus-native_1.0.2.bb
deleted file mode 100644
index 72e2190f78..0000000000
--- a/meta/packages/dbus/dbus-native_1.0.2.bb
+++ /dev/null
@@ -1,31 +0,0 @@
-DESCRIPTION = "message bus system for applications to talk to one another"
-HOMEPAGE = "http://www.freedesktop.org/Software/dbus"
-LICENSE = "GPL"
-SECTION = "base"
-
-PR = "r0"
-
-DEPENDS = "glib-2.0-native libxml2-native expat-native"
-
-DEFAULT_PREFERENCE = "-1"
-
-FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/dbus-1.0.2"
-SRC_URI = "http://dbus.freedesktop.org/releases/dbus/dbus-${PV}.tar.gz \
-	   file://cross.patch;patch=1 \
-	   "
-
-inherit autotools pkgconfig gettext native
-
-S = "${WORKDIR}/dbus-${PV}"
-
-EXTRA_OECONF = " --disable-tests --disable-checks --disable-xml-docs \
-                 --disable-doxygen-docs --with-xml=expat --without-x"
-
-do_stage () {
-	oe_runmake install
-	autotools_stage_all
-
-	# for dbus-glib-native introspection generation
-	install -d ${STAGING_DATADIR}/dbus
-	install -m 0644 bus/session.conf ${STAGING_DATADIR}/dbus/session.conf
-}
diff --git a/meta/packages/dbus/dbus-native_1.0.3.bb b/meta/packages/dbus/dbus-native_1.0.3.bb
new file mode 100644
index 0000000000..55889a1a8b
--- /dev/null
+++ b/meta/packages/dbus/dbus-native_1.0.3.bb
@@ -0,0 +1,31 @@
+DESCRIPTION = "message bus system for applications to talk to one another"
+HOMEPAGE = "http://www.freedesktop.org/Software/dbus"
+LICENSE = "GPL"
+SECTION = "base"
+
+PR = "r0"
+
+DEPENDS = "glib-2.0-native libxml2-native expat-native"
+
+DEFAULT_PREFERENCE = "-1"
+
+FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/dbus-${PV}"
+SRC_URI = "http://dbus.freedesktop.org/releases/dbus/dbus-${PV}.tar.gz \
+	   file://cross.patch;patch=1 \
+	   "
+
+inherit autotools pkgconfig gettext native
+
+S = "${WORKDIR}/dbus-${PV}"
+
+EXTRA_OECONF = " --disable-tests --disable-checks --disable-xml-docs \
+                 --disable-doxygen-docs --with-xml=expat --without-x"
+
+do_stage () {
+	oe_runmake install
+	autotools_stage_all
+
+	# for dbus-glib-native introspection generation
+	install -d ${STAGING_DATADIR}/dbus
+	install -m 0644 bus/session.conf ${STAGING_DATADIR}/dbus/session.conf
+}
diff --git a/meta/packages/dbus/dbus_1.0.2.bb b/meta/packages/dbus/dbus_1.0.2.bb
deleted file mode 100644
index 4ccc807239..0000000000
--- a/meta/packages/dbus/dbus_1.0.2.bb
+++ /dev/null
@@ -1,4 +0,0 @@
-require dbus.inc
-DEFAULT_PREFERENCE = "1"
-
-PR = "r6"
diff --git a/meta/packages/dbus/dbus_1.0.3.bb b/meta/packages/dbus/dbus_1.0.3.bb
new file mode 100644
index 0000000000..4ccc807239
--- /dev/null
+++ b/meta/packages/dbus/dbus_1.0.3.bb
@@ -0,0 +1,4 @@
+require dbus.inc
+DEFAULT_PREFERENCE = "1"
+
+PR = "r6"
-- 
cgit v1.2.3-54-g00ecf