sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

dbus: Drop old 1.0.* and 1.1.* versions

This commit is contained in:
Richard Purdie 2009-01-02 17:05:01 +00:00
parent 23486c1532
commit 8fa334d02a
15 changed files with 0 additions and 411 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
meta/packages/dbus/dbus-1.0.3/99_dbus vendored
View File

@ -1 +0,0 @@
d messagebus messagebus 0755 /var/run/dbus none

10
meta/packages/dbus/dbus-1.0.3/cross.patch vendored
View File

@ -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)

110
meta/packages/dbus/dbus-1.0.3/dbus-1.init vendored
View File

@ -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

13
meta/packages/dbus/dbus-1.0.3/fix-install-daemon.patch vendored
View File

@ -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

30
meta/packages/dbus/dbus-1.0.3/tmpdir.patch vendored
View File

@ -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"

1
meta/packages/dbus/dbus-1.1.20/99_dbus vendored
View File

@ -1 +0,0 @@
d messagebus messagebus 0755 /var/run/dbus none

10
meta/packages/dbus/dbus-1.1.20/cross.patch vendored
View File

@ -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)

121
meta/packages/dbus/dbus-1.1.20/dbus-1.init vendored
View File

@ -1,121 +0,0 @@
#! /bin/sh
### BEGIN INIT INFO
# Provides: dbus
# Required-Start: $remote_fs $syslog
# Required-Stop: $remote_fs $syslog
# Default-Start: 2 3 4 5
# Default-Stop: 1
# Short-Description: D-Bus systemwide message bus
# Description: D-Bus is a simple interprocess messaging system, used
# for sending messages between applications.
### END INIT INFO
#
# -*- 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

14
meta/packages/dbus/dbus-1.1.20/fix-dbus-launch-x11.patch vendored
View File

@ -1,14 +0,0 @@
Index: dbus-1.1.20/tools/dbus-launch.c
===================================================================
--- dbus-1.1.20.orig/tools/dbus-launch.c
+++ dbus-1.1.20/tools/dbus-launch.c
@@ -966,7 +966,9 @@ main (int argc, char **argv)
char write_pid_fd_as_string[MAX_FD_LEN];
char write_address_fd_as_string[MAX_FD_LEN];
+#ifdef DBUS_BUILD_X11
xdisplay = NULL;
+#endif
if (close_stderr)
do_close_stderr ();

13
meta/packages/dbus/dbus-1.1.20/fix-install-daemon.patch vendored
View File

@ -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

30
meta/packages/dbus/dbus-1.1.20/tmpdir.patch vendored
View File

@ -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"

28
meta/packages/dbus/dbus-native_1.0.3.bb
View File

@ -1,28 +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"
SRC_URI = "http://dbus.freedesktop.org/releases/dbus/dbus-${PV}.tar.gz \
file://cross.patch;patch=1 \
"
inherit autotools pkgconfig gettext native
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
}

20
meta/packages/dbus/dbus-native_1.1.20.bb
View File

@ -1,20 +0,0 @@
require dbus.inc
inherit native
DEPENDS = "glib-2.0-native libxml2-native expat-native"
PR = "r2"
SRC_URI += "file://fix-dbus-launch-x11.patch;patch=1"
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
}
do_install() {
:
}

4
meta/packages/dbus/dbus_1.0.3.bb
View File

@ -1,4 +0,0 @@
require dbus.inc
DEFAULT_PREFERENCE = "1"
PR = "r6"

6
meta/packages/dbus/dbus_1.1.20.bb
View File

@ -1,6 +0,0 @@
include dbus.inc
PR = "r5"
SRC_URI += "file://fix-dbus-launch-x11.patch;patch=1 \
file://fix-install-daemon.patch;patch=1 "