diff options
| -rw-r--r-- | dbus-32/.footprint | 6 | ||||
| -rw-r--r-- | dbus-32/.md5sum | 4 | ||||
| -rwxr-xr-x | dbus-32/30-dbus.launch | 8 | ||||
| -rw-r--r-- | dbus-32/Pkgfile | 12 | ||||
| -rw-r--r-- | dbus-32/rc.dbus | 28 |
5 files changed, 8 insertions, 50 deletions
diff --git a/dbus-32/.footprint b/dbus-32/.footprint index 879d5f29..6d2562c9 100644 --- a/dbus-32/.footprint +++ b/dbus-32/.footprint @@ -7,8 +7,8 @@ drwxr-xr-x root/root usr/lib32/dbus-1.0/include/dbus/ drwxr-xr-x root/root usr/lib32/dbus/ -rwsr-x--- root/messagebus usr/lib32/dbus/dbus-daemon-launch-helper -rwxr-xr-x root/root usr/lib32/libdbus-1.la -lrwxrwxrwx root/root usr/lib32/libdbus-1.so -> libdbus-1.so.3.7.6 -lrwxrwxrwx root/root usr/lib32/libdbus-1.so.3 -> libdbus-1.so.3.7.6 --rwxr-xr-x root/root usr/lib32/libdbus-1.so.3.7.6 +lrwxrwxrwx root/root usr/lib32/libdbus-1.so -> libdbus-1.so.3.7.7 +lrwxrwxrwx root/root usr/lib32/libdbus-1.so.3 -> libdbus-1.so.3.7.7 +-rwxr-xr-x root/root usr/lib32/libdbus-1.so.3.7.7 drwxr-xr-x root/root usr/lib32/pkgconfig/ -rw-r--r-- root/root usr/lib32/pkgconfig/dbus-1.pc diff --git a/dbus-32/.md5sum b/dbus-32/.md5sum index 8b5a61ab..98fee959 100644 --- a/dbus-32/.md5sum +++ b/dbus-32/.md5sum @@ -1,3 +1 @@ -23bc5ff22fe4f9a208d65fbbfd489ad9 30-dbus.launch -b02e9c95027a416987b81f9893831061 dbus-1.6.18.tar.gz -dd882e45b9397a5dbf8650057ee9a340 rc.dbus +16aacf0addca0b4ff8ed0dd3d36dc6f5 dbus-1.6.20.tar.gz diff --git a/dbus-32/30-dbus.launch b/dbus-32/30-dbus.launch deleted file mode 100755 index 6d2a7de6..00000000 --- a/dbus-32/30-dbus.launch +++ /dev/null @@ -1,8 +0,0 @@ -#!/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-32/Pkgfile b/dbus-32/Pkgfile index 45462af0..ed42cbd7 100644 --- a/dbus-32/Pkgfile +++ b/dbus-32/Pkgfile @@ -4,10 +4,9 @@ # Depends on: expat-32 dbus name=dbus-32 -version=1.6.18 +version=1.6.20 release=1 -source=(http://dbus.freedesktop.org/releases/dbus/dbus-$version.tar.gz \ -rc.dbus 30-dbus.launch) +source=(http://dbus.freedesktop.org/releases/dbus/dbus-$version.tar.gz) build() { cd dbus-$version @@ -23,9 +22,6 @@ build() { --with-system-pid-file=/var/run/dbus/dbus.pid make make DESTDIR=$PKG install - 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 - rm -r $PKG/usr/share/doc - rm -rf $PKG/{etc,var} $PKG/usr/{bin,etc,include,man,sbin,share} + + rm -r $PKG/var $PKG/usr/{bin,etc,include,man,sbin,share} } diff --git a/dbus-32/rc.dbus b/dbus-32/rc.dbus deleted file mode 100644 index b3332477..00000000 --- a/dbus-32/rc.dbus +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/sh -# -# /etc/rc.d/dbus: start/stop dbus messagebus daemon -# - -case $1 in - start) - if [ ! -f /var/lib/dbus/machine-id ] - then - /usr/bin/dbus-uuidgen --ensure - fi - /usr/sbin/dbus-daemon --system - ;; - stop) - killall -q /usr/sbin/dbus-daemon - rm -f /var/run/dbus/dbus.pid - ;; - restart) - $0 stop - sleep 2 - $0 start - ;; - *) - echo "Usage: $0 [start|stop|restart]" - ;; -esac - -# End of file |