diff options
Diffstat (limited to 'dbus')
-rw-r--r-- | dbus/.footprint | 70 | ||||
-rw-r--r-- | dbus/.md5sum | 5 | ||||
-rwxr-xr-x | dbus/30-dbus.launch | 8 | ||||
-rw-r--r-- | dbus/Pkgfile | 24 | ||||
-rw-r--r-- | dbus/README | 12 | ||||
-rw-r--r-- | dbus/rc.dbus | 4 |
6 files changed, 45 insertions, 78 deletions
diff --git a/dbus/.footprint b/dbus/.footprint index 7a146b992..5bf303771 100644 --- a/dbus/.footprint +++ b/dbus/.footprint @@ -1,15 +1,16 @@ drwxr-xr-x root/root etc/ +drwxr-xr-x root/root etc/X11/ +drwxr-xr-x root/root etc/X11/xinit/ +drwxr-xr-x root/root etc/X11/xinit/xinitrc.d/ +-rwxr-xr-x root/root etc/X11/xinit/xinitrc.d/30-dbus.launch drwxr-xr-x root/root etc/rc.d/ -rwxr-xr-x root/root etc/rc.d/dbus drwxr-xr-x root/root usr/ drwxr-xr-x root/root usr/bin/ --rwxr-xr-x root/root usr/bin/dbus-binding-tool -rwxr-xr-x root/root usr/bin/dbus-cleanup-sockets --rwxr-xr-x root/root usr/bin/dbus-daemon -rwxr-xr-x root/root usr/bin/dbus-launch -rwxr-xr-x root/root usr/bin/dbus-monitor -rwxr-xr-x root/root usr/bin/dbus-send --rwxr-xr-x root/root usr/bin/dbus-viewer drwxr-xr-x root/root usr/etc/ drwxr-xr-x root/root usr/etc/dbus-1/ -rw-r--r-- root/root usr/etc/dbus-1/session.conf @@ -22,11 +23,6 @@ drwxr-xr-x root/root usr/include/dbus-1.0/dbus/ -rw-r--r-- root/root usr/include/dbus-1.0/dbus/dbus-bus.h -rw-r--r-- root/root usr/include/dbus-1.0/dbus/dbus-connection.h -rw-r--r-- root/root usr/include/dbus-1.0/dbus/dbus-errors.h --rw-r--r-- root/root usr/include/dbus-1.0/dbus/dbus-glib-bindings.h --rw-r--r-- root/root usr/include/dbus-1.0/dbus/dbus-glib-error-enum.h --rw-r--r-- root/root usr/include/dbus-1.0/dbus/dbus-glib-lowlevel.h --rw-r--r-- root/root usr/include/dbus-1.0/dbus/dbus-glib.h --rw-r--r-- root/root usr/include/dbus-1.0/dbus/dbus-gtype-specialized.h -rw-r--r-- root/root usr/include/dbus-1.0/dbus/dbus-macros.h -rw-r--r-- root/root usr/include/dbus-1.0/dbus/dbus-memory.h -rw-r--r-- root/root usr/include/dbus-1.0/dbus/dbus-message.h @@ -43,62 +39,12 @@ drwxr-xr-x root/root usr/lib/dbus-1.0/ drwxr-xr-x root/root usr/lib/dbus-1.0/include/ drwxr-xr-x root/root usr/lib/dbus-1.0/include/dbus/ -rw-r--r-- root/root usr/lib/dbus-1.0/include/dbus/dbus-arch-deps.h --rw-r--r-- root/root usr/lib/libdbus-1.a -rwxr-xr-x root/root usr/lib/libdbus-1.la -lrwxrwxrwx root/root usr/lib/libdbus-1.so -> libdbus-1.so.2.0.0 -lrwxrwxrwx root/root usr/lib/libdbus-1.so.2 -> libdbus-1.so.2.0.0 --rwxr-xr-x root/root usr/lib/libdbus-1.so.2.0.0 --rw-r--r-- root/root usr/lib/libdbus-glib-1.a --rwxr-xr-x root/root usr/lib/libdbus-glib-1.la -lrwxrwxrwx root/root usr/lib/libdbus-glib-1.so -> libdbus-glib-1.so.2.0.0 -lrwxrwxrwx root/root usr/lib/libdbus-glib-1.so.2 -> libdbus-glib-1.so.2.0.0 --rwxr-xr-x root/root usr/lib/libdbus-glib-1.so.2.0.0 +lrwxrwxrwx root/root usr/lib/libdbus-1.so -> libdbus-1.so.3.0.0 +lrwxrwxrwx root/root usr/lib/libdbus-1.so.3 -> libdbus-1.so.3.0.0 +-rwxr-xr-x root/root usr/lib/libdbus-1.so.3.0.0 drwxr-xr-x root/root usr/lib/pkgconfig/ -rw-r--r-- root/root usr/lib/pkgconfig/dbus-1.pc --rw-r--r-- root/root usr/lib/pkgconfig/dbus-glib-1.pc -drwxr-xr-x root/root usr/lib/python2.4/ -drwxr-xr-x root/root usr/lib/python2.4/site-packages/ --rw-r--r-- root/root usr/lib/python2.4/site-packages/dbus.pth -drwxr-xr-x root/root usr/lib/python2.4/site-packages/dbus/ --rw-r--r-- root/root usr/lib/python2.4/site-packages/dbus/__init__.py --rw-r--r-- root/root usr/lib/python2.4/site-packages/dbus/__init__.pyc --rw-r--r-- root/root usr/lib/python2.4/site-packages/dbus/__init__.pyo --rw-r--r-- root/root usr/lib/python2.4/site-packages/dbus/_dbus.py --rw-r--r-- root/root usr/lib/python2.4/site-packages/dbus/_dbus.pyc --rw-r--r-- root/root usr/lib/python2.4/site-packages/dbus/_dbus.pyo --rw-r--r-- root/root usr/lib/python2.4/site-packages/dbus/_util.py --rw-r--r-- root/root usr/lib/python2.4/site-packages/dbus/_util.pyc --rw-r--r-- root/root usr/lib/python2.4/site-packages/dbus/_util.pyo --rw-r--r-- root/root usr/lib/python2.4/site-packages/dbus/dbus_bindings.a --rwxr-xr-x root/root usr/lib/python2.4/site-packages/dbus/dbus_bindings.la --rwxr-xr-x root/root usr/lib/python2.4/site-packages/dbus/dbus_bindings.so --rw-r--r-- root/root usr/lib/python2.4/site-packages/dbus/dbus_glib_bindings.a --rwxr-xr-x root/root usr/lib/python2.4/site-packages/dbus/dbus_glib_bindings.la --rwxr-xr-x root/root usr/lib/python2.4/site-packages/dbus/dbus_glib_bindings.so --rw-r--r-- root/root usr/lib/python2.4/site-packages/dbus/decorators.py --rw-r--r-- root/root usr/lib/python2.4/site-packages/dbus/decorators.pyc --rw-r--r-- root/root usr/lib/python2.4/site-packages/dbus/decorators.pyo --rw-r--r-- root/root usr/lib/python2.4/site-packages/dbus/exceptions.py --rw-r--r-- root/root usr/lib/python2.4/site-packages/dbus/exceptions.pyc --rw-r--r-- root/root usr/lib/python2.4/site-packages/dbus/exceptions.pyo --rw-r--r-- root/root usr/lib/python2.4/site-packages/dbus/glib.py --rw-r--r-- root/root usr/lib/python2.4/site-packages/dbus/glib.pyc --rw-r--r-- root/root usr/lib/python2.4/site-packages/dbus/glib.pyo --rw-r--r-- root/root usr/lib/python2.4/site-packages/dbus/introspect_parser.py --rw-r--r-- root/root usr/lib/python2.4/site-packages/dbus/introspect_parser.pyc --rw-r--r-- root/root usr/lib/python2.4/site-packages/dbus/introspect_parser.pyo --rw-r--r-- root/root usr/lib/python2.4/site-packages/dbus/matchrules.py --rw-r--r-- root/root usr/lib/python2.4/site-packages/dbus/matchrules.pyc --rw-r--r-- root/root usr/lib/python2.4/site-packages/dbus/matchrules.pyo --rw-r--r-- root/root usr/lib/python2.4/site-packages/dbus/proxies.py --rw-r--r-- root/root usr/lib/python2.4/site-packages/dbus/proxies.pyc --rw-r--r-- root/root usr/lib/python2.4/site-packages/dbus/proxies.pyo --rw-r--r-- root/root usr/lib/python2.4/site-packages/dbus/service.py --rw-r--r-- root/root usr/lib/python2.4/site-packages/dbus/service.pyc --rw-r--r-- root/root usr/lib/python2.4/site-packages/dbus/service.pyo --rw-r--r-- root/root usr/lib/python2.4/site-packages/dbus/types.py --rw-r--r-- root/root usr/lib/python2.4/site-packages/dbus/types.pyc --rw-r--r-- root/root usr/lib/python2.4/site-packages/dbus/types.pyo drwxr-xr-x root/root usr/man/ drwxr-xr-x root/root usr/man/man1/ -rw-r--r-- root/root usr/man/man1/dbus-cleanup-sockets.1.gz @@ -106,6 +52,8 @@ drwxr-xr-x root/root usr/man/man1/ -rw-r--r-- root/root usr/man/man1/dbus-launch.1.gz -rw-r--r-- root/root usr/man/man1/dbus-monitor.1.gz -rw-r--r-- root/root usr/man/man1/dbus-send.1.gz +drwxr-xr-x root/root usr/sbin/ +-rwxr-xr-x root/root usr/sbin/dbus-daemon drwxr-xr-x root/root usr/share/ drwxr-xr-x root/root usr/share/dbus-1/ drwxr-xr-x root/root usr/share/dbus-1/services/ diff --git a/dbus/.md5sum b/dbus/.md5sum index 354959357..aa3bf79a3 100644 --- a/dbus/.md5sum +++ b/dbus/.md5sum @@ -1,2 +1,3 @@ -ba7692f63d0e9f1ef06703dff56cb650 dbus-0.62.tar.gz -85ab55dfd2008265d900b1cb1570a434 rc.dbus +23bc5ff22fe4f9a208d65fbbfd489ad9 30-dbus.launch +ea2be58c80a80631ba5b3c92cffd335c dbus-0.92.tar.gz +0dc978461c9f75b6203f7c0cd0481b22 rc.dbus diff --git a/dbus/30-dbus.launch b/dbus/30-dbus.launch new file mode 100755 index 000000000..6d2a7de65 --- /dev/null +++ b/dbus/30-dbus.launch @@ -0,0 +1,8 @@ +#!/bin/sh + +if [ -x /usr/bin/dbus-launch ] +then + eval `dbus-launch --sh-syntax --exit-with-session` + export DBUS_SESSION_BUS_ADDRESS + export DBUS_SESSION_BUS_PID +fi diff --git a/dbus/Pkgfile b/dbus/Pkgfile index 7df2f0636..aaeeb81ce 100644 --- a/dbus/Pkgfile +++ b/dbus/Pkgfile @@ -1,27 +1,25 @@ -# Description: A message system +# Description: A message bus system # URL: http://freedesktop.org/wiki/Software_2fdbus # Maintainer: Matt Housh, jaeger at crux dot nu -# Depends on: expat, glib, gtk, libxml2 +# Depends on: expat name=dbus -version=0.62 +version=0.92 release=1 -source=(http://dbus.freedesktop.org/releases/$name-$version.tar.gz \ - rc.$name) +source=(http://dbus.freedesktop.org/releases/dbus/$name-$version.tar.gz \ + rc.dbus 30-dbus.launch) build() { cd $name-$version ./configure --prefix=/usr \ + --with-dbus-daemondir=/usr/sbin \ --localstatedir=/var \ - --enable-glib \ - --enable-gtk \ - --enable-python \ + --disable-static \ --with-dbus-user=messagebus \ - --disable-mono \ - --disable-mono-docs \ - --disable-tests + --with-xml=expat make make DESTDIR=$PKG install - install -D -o root -g root -m 0755 $SRC/rc.$name \ - $PKG/etc/rc.d/$name + install -D -m 0755 $SRC/rc.dbus $PKG/etc/rc.d/dbus + install -D -m 0755 $SRC/30-dbus.launch \ + $PKG/etc/X11/xinit/xinitrc.d/30-dbus.launch } diff --git a/dbus/README b/dbus/README new file mode 100644 index 000000000..d8812593c --- /dev/null +++ b/dbus/README @@ -0,0 +1,12 @@ +README for dbus 0.92 + +REQUIREMENTS + +PRE/POST-INSTALL + Create a user/group messagebus with a unused id < 99: + + 'groupadd -g 81 messagebus' + 'useradd -n -u 81 -g messagebus -d /var/empty -s /bin/false messagebus' + 'passwd -l messagebus' + +PRECAUTION diff --git a/dbus/rc.dbus b/dbus/rc.dbus index 5639c8a97..0923b8d8a 100644 --- a/dbus/rc.dbus +++ b/dbus/rc.dbus @@ -5,10 +5,10 @@ case $1 in start) - /usr/bin/dbus-daemon --system + /usr/sbin/dbus-daemon --system ;; stop) - killall -q /usr/bin/dbus-daemon + killall -q /usr/sbin/dbus-daemon rm -f /var/run/dbus/pid ;; restart) |