merge of '1c44ae3b4aae69a8d66c7c068c44f337bc51f559'

     and 'd039068c51d6eb51dd6d0bd1dd1306d490e3d527'

5 files changed, 0 insertions, 140 deletions

diff --git a/packages/dbus/dbus-1.0.1/.mtn2git_empty b/packages/dbus/dbus-1.0.1/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/dbus/dbus-1.0.1/.mtn2git_empty
+++ /dev/null
diff --git a/packages/dbus/dbus-1.0.1/cross.patch b/packages/dbus/dbus-1.0.1/cross.patch
deleted file mode 100644
index 268a3ae3de..0000000000
--- a/packages/dbus/dbus-1.0.1/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/packages/dbus/dbus-1.0.1/dbus-1.init b/packages/dbus/dbus-1.0.1/dbus-1.init
deleted file mode 100644
index 38e7574ad5..0000000000
--- a/packages/dbus/dbus-1.0.1/dbus-1.init
+++ /dev/null
@@ -1,96 +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
-      run-parts --reverse --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
-}
-
-case "$1" in
-  start)
-    start_it_up
-  ;;
-  stop)
-    shut_it_down
-  ;;
-  restart|force-reload)
-    shut_it_down
-    sleep 1
-    start_it_up
-  ;;
-  *)
-    echo "Usage: /etc/init.d/$NAME {start|stop|restart|force-reload}" >&2
-    exit 1
-  ;;
-esac
-
-exit 0
diff --git a/packages/dbus/dbus-1.0.1/dbus-exploit-fix.patch b/packages/dbus/dbus-1.0.1/dbus-exploit-fix.patch
deleted file mode 100644
index 7d36dbdf22..0000000000
--- a/packages/dbus/dbus-1.0.1/dbus-exploit-fix.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-https://bugs.freedesktop.org/show_bug.cgi?id=9142
-
-[..] the use case was the following. There
-are three processes A, B, and C. All of them add the same match (same value). A
-is started first, then B, and lastly C. Now, B and C are closed: if B is closed
-before C, A's match is removed; but if C is closed before B, A's match is not
-removed (no buggy behaviour). (B and C call dbus_bus_remove_match on exit.)
-
-diff -pur 0.61-osso23/bus/signals.c 0.61-osso23.new/bus/signals.c
---- 0.61-osso23/bus/signals.c	2006-11-23 16:46:52.589602192 +0200
-+++ 0.61-osso23.new/bus/signals.c	2006-11-23 16:49:28.873843376 +0200
-@@ -1067,6 +1067,9 @@ match_rule_equal (BusMatchRule *a,
-   if (a->flags != b->flags)
-     return FALSE;
- 
-+  if (a->matches_go_to != b->matches_go_to)
-+    return FALSE;
-+
-   if ((a->flags & BUS_MATCH_MESSAGE_TYPE) &&
-       a->message_type != b->message_type)
-     return FALSE;
diff --git a/packages/dbus/dbus-1.0.1/fix-install-daemon.patch b/packages/dbus/dbus-1.0.1/fix-install-daemon.patch
deleted file mode 100644
index c31786357d..0000000000
--- a/packages/dbus/dbus-1.0.1/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