diff options
| -rw-r--r-- | base/dbus/.footprint.i686 | 13 | ||||
| -rw-r--r-- | base/dbus/.footprint.x86_64 | 13 | ||||
| -rw-r--r-- | base/dbus/.md5sum.i686 | 2 | ||||
| -rw-r--r-- | base/dbus/.md5sum.x86_64 | 2 | ||||
| -rw-r--r-- | base/dbus/80-dbus | 12 | ||||
| -rwxr-xr-x | base/dbus/Pkgfile | 6 |
6 files changed, 33 insertions, 15 deletions
diff --git a/base/dbus/.footprint.i686 b/base/dbus/.footprint.i686 index f58a894a0..a2cf16aca 100644 --- a/base/dbus/.footprint.i686 +++ b/base/dbus/.footprint.i686 @@ -53,23 +53,24 @@ drwxr-xr-x root/root usr/include/dbus-1.0/dbus/ -rw-r--r-- root/root usr/include/dbus-1.0/dbus/dbus.h drwxr-xr-x root/root usr/lib/ drwxr-xr-x root/root usr/lib/dbus-1.0/ +-rwsr-x--- root/messagebus usr/lib/dbus-1.0/dbus-daemon-launch-helper 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.3.5.4 -lrwxrwxrwx root/root usr/lib/libdbus-1.so.3 -> libdbus-1.so.3.5.4 --rwxr-xr-x root/root usr/lib/libdbus-1.so.3.5.4 +lrwxrwxrwx root/root usr/lib/libdbus-1.so -> libdbus-1.so.3.5.5 +lrwxrwxrwx root/root usr/lib/libdbus-1.so.3 -> libdbus-1.so.3.5.5 +-rwxr-xr-x root/root usr/lib/libdbus-1.so.3.5.5 drwxr-xr-x root/root usr/lib/pkgconfig/ -rw-r--r-- root/root usr/lib/pkgconfig/dbus-1.pc -drwxr-xr-x root/root usr/libexec/ -drwxr-xr-x root/root usr/libexec/dbus-1/ --rwsr-x--- root/messagebus usr/libexec/dbus-daemon-launch-helper 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/ drwxr-xr-x root/root usr/share/dbus-1/system-services/ +drwxr-xr-x root/root usr/share/doc/ +drwxr-xr-x root/root usr/share/doc/dbus/ +drwxr-xr-x root/root usr/share/doc/dbus/api/ drwxr-xr-x root/root usr/share/man/ drwxr-xr-x root/root usr/share/man/man1/ -rw-r--r-- root/root usr/share/man/man1/dbus-cleanup-sockets.1.gz diff --git a/base/dbus/.footprint.x86_64 b/base/dbus/.footprint.x86_64 index f58a894a0..a2cf16aca 100644 --- a/base/dbus/.footprint.x86_64 +++ b/base/dbus/.footprint.x86_64 @@ -53,23 +53,24 @@ drwxr-xr-x root/root usr/include/dbus-1.0/dbus/ -rw-r--r-- root/root usr/include/dbus-1.0/dbus/dbus.h drwxr-xr-x root/root usr/lib/ drwxr-xr-x root/root usr/lib/dbus-1.0/ +-rwsr-x--- root/messagebus usr/lib/dbus-1.0/dbus-daemon-launch-helper 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.3.5.4 -lrwxrwxrwx root/root usr/lib/libdbus-1.so.3 -> libdbus-1.so.3.5.4 --rwxr-xr-x root/root usr/lib/libdbus-1.so.3.5.4 +lrwxrwxrwx root/root usr/lib/libdbus-1.so -> libdbus-1.so.3.5.5 +lrwxrwxrwx root/root usr/lib/libdbus-1.so.3 -> libdbus-1.so.3.5.5 +-rwxr-xr-x root/root usr/lib/libdbus-1.so.3.5.5 drwxr-xr-x root/root usr/lib/pkgconfig/ -rw-r--r-- root/root usr/lib/pkgconfig/dbus-1.pc -drwxr-xr-x root/root usr/libexec/ -drwxr-xr-x root/root usr/libexec/dbus-1/ --rwsr-x--- root/messagebus usr/libexec/dbus-daemon-launch-helper 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/ drwxr-xr-x root/root usr/share/dbus-1/system-services/ +drwxr-xr-x root/root usr/share/doc/ +drwxr-xr-x root/root usr/share/doc/dbus/ +drwxr-xr-x root/root usr/share/doc/dbus/api/ drwxr-xr-x root/root usr/share/man/ drwxr-xr-x root/root usr/share/man/man1/ -rw-r--r-- root/root usr/share/man/man1/dbus-cleanup-sockets.1.gz diff --git a/base/dbus/.md5sum.i686 b/base/dbus/.md5sum.i686 index 6b60669b8..62de9d6f7 100644 --- a/base/dbus/.md5sum.i686 +++ b/base/dbus/.md5sum.i686 @@ -1,3 +1,3 @@ 627e775981fea688723dc6063f996998 dbus -99b165f727dd8a5c4b7e2c20a8bf5db6 dbus-1.4.6.tar.gz +e30253e15f0f4e6c5ee9e6f0eba5046c dbus-1.4.8.tar.gz f78a3655ff83e4e991f5679840fe1b0b session-local.conf diff --git a/base/dbus/.md5sum.x86_64 b/base/dbus/.md5sum.x86_64 index 6b60669b8..62de9d6f7 100644 --- a/base/dbus/.md5sum.x86_64 +++ b/base/dbus/.md5sum.x86_64 @@ -1,3 +1,3 @@ 627e775981fea688723dc6063f996998 dbus -99b165f727dd8a5c4b7e2c20a8bf5db6 dbus-1.4.6.tar.gz +e30253e15f0f4e6c5ee9e6f0eba5046c dbus-1.4.8.tar.gz f78a3655ff83e4e991f5679840fe1b0b session-local.conf diff --git a/base/dbus/80-dbus b/base/dbus/80-dbus new file mode 100644 index 000000000..676d99551 --- /dev/null +++ b/base/dbus/80-dbus @@ -0,0 +1,12 @@ +#!/bin/bash + +# launches a session dbus instance + +dbuslaunch="`which dbus-launch 2>/dev/null`" +if [ -n "$dbuslaunch" ] && [ -x "$dbuslaunch" ] && [ -z "$DBUS_SESSION_BUS_ADDRESS" ]; then + if [ -n "$command" ]; then + command="$dbuslaunch --exit-with-session $command" + else + eval `$dbuslaunch --sh-syntax --exit-with-session` + fi +fi diff --git a/base/dbus/Pkgfile b/base/dbus/Pkgfile index ba030a731..307f33872 100755 --- a/base/dbus/Pkgfile +++ b/base/dbus/Pkgfile @@ -5,7 +5,7 @@ # Run on: expat,xorg-libsm,xorg-libice,xorg-libx11,xorg-libxcb,xorg-libxau,xorg-libxdmcp name=dbus -version=1.4.6 +version=1.4.8 release=1 source=(http://dbus.freedesktop.org/releases/dbus/$name-$version.tar.gz \ session-local.conf\ @@ -17,12 +17,16 @@ build() { tar xvf $scripts-$scriptsversion.tar.bz2 cd $name-$version ./configure --prefix=/usr \ + --libexecdir=/usr/lib/dbus-1.0 \ --localstatedir=/var \ --sysconfdir=/etc make make DESTDIR=$PKG install mkdir -p $PKG/etc/dbus-1 mv ../session-local.conf $PKG/etc/dbus-1/ + + rmdir $PKG/usr/lib/dbus-1.0/dbus-1 + cd ../$scripts-$scriptsversion make DESTDIR=$PKG install-dbus install -m755 ../dbus $PKG/etc/rc.d/init.d/ |