Merge branch 'master' of ssh://kiao.no-ip.info:443/~/pakxe

7 files changed, 6 insertions, 84 deletions

diff --git a/base/dbus/.footprint.i686 b/base/dbus/.footprint.i686
index 50638f868..be9cde8c7 100644
--- a/base/dbus/.footprint.i686
+++ b/base/dbus/.footprint.i686
@@ -7,7 +7,7 @@ drwxr-xr-x	root/root	etc/dbus-1/session.d/
 drwxr-xr-x	root/root	etc/dbus-1/system.d/
 drwxr-xr-x	root/root	etc/rc.d/
 drwxr-xr-x	root/root	etc/rc.d/init.d/
--rwxr-xr-x	root/root	etc/rc.d/init.d/dbus
+-rwxr-xr--	root/root	etc/rc.d/init.d/dbus
 drwxr-xr-x	root/root	etc/rc.d/rc0.d/
 lrwxrwxrwx	root/root	etc/rc.d/rc0.d/K85dbus -> ../init.d/dbus
 drwxr-xr-x	root/root	etc/rc.d/rc1.d/
@@ -69,9 +69,6 @@ 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 50638f868..be9cde8c7 100644
--- a/base/dbus/.footprint.x86_64
+++ b/base/dbus/.footprint.x86_64
@@ -7,7 +7,7 @@ drwxr-xr-x	root/root	etc/dbus-1/session.d/
 drwxr-xr-x	root/root	etc/dbus-1/system.d/
 drwxr-xr-x	root/root	etc/rc.d/
 drwxr-xr-x	root/root	etc/rc.d/init.d/
--rwxr-xr-x	root/root	etc/rc.d/init.d/dbus
+-rwxr-xr--	root/root	etc/rc.d/init.d/dbus
 drwxr-xr-x	root/root	etc/rc.d/rc0.d/
 lrwxrwxrwx	root/root	etc/rc.d/rc0.d/K85dbus -> ../init.d/dbus
 drwxr-xr-x	root/root	etc/rc.d/rc1.d/
@@ -69,9 +69,6 @@ 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 62de9d6f7..dde96cbcf 100644
--- a/base/dbus/.md5sum.i686
+++ b/base/dbus/.md5sum.i686
@@ -1,3 +1,2 @@
-627e775981fea688723dc6063f996998  dbus
 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 62de9d6f7..dde96cbcf 100644
--- a/base/dbus/.md5sum.x86_64
+++ b/base/dbus/.md5sum.x86_64
@@ -1,3 +1,2 @@
-627e775981fea688723dc6063f996998  dbus
 e30253e15f0f4e6c5ee9e6f0eba5046c  dbus-1.4.8.tar.gz
 f78a3655ff83e4e991f5679840fe1b0b  session-local.conf
diff --git a/base/dbus/80-dbus b/base/dbus/80-dbus
deleted file mode 100644
index 676d99551..000000000
--- a/base/dbus/80-dbus
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/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 ad24728c8..7325471a8 100755
--- a/base/dbus/Pkgfile
+++ b/base/dbus/Pkgfile
@@ -4,10 +4,9 @@
 # Packager: thierryn1 at hispeed dot ch
 name=dbus
 version=1.4.8
-release=2
+release=3
 source=(http://dbus.freedesktop.org/releases/dbus/$name-$version.tar.gz \
-       session-local.conf\
-       dbus)
+       session-local.conf )
 
 build() {
 	source /etc/blfs-bootscripts
@@ -34,14 +33,13 @@ build() {
 
         cd ../$scripts-$scriptsversion
         make DESTDIR=$PKG install-dbus
-        install -m755 ../dbus $PKG/etc/rc.d/init.d/
 	mv $PKG/etc/rc.d/rc0.d/K{30,85}dbus
 	mv $PKG/etc/rc.d/rc6.d/K{30,85}dbus
 	mv $PKG/etc/rc.d/rc1.d/K{30,85}dbus
-
+	sed -i "s/dbus\/pid/dbus.pid/" $PKG/etc/rc.d/init.d/dbus
 	mkdir -p $PKG/usr/lib/dbus-1.0/services
 	mkdir -p $PKG/usr/share/dbus-1/services
 	mkdir -p $PKG/etc/dbus-1/system.d/
 	mkdir -p $PKG/etc/dbus-1/session.d/
-#	rm -r $PKG/usr/share/doc
+	rm -r $PKG/usr/share/doc
 }
diff --git a/base/dbus/dbus b/base/dbus/dbus
deleted file mode 100644
index c2c5f5086..000000000
--- a/base/dbus/dbus
+++ /dev/null
@@ -1,56 +0,0 @@
-#!/bin/sh
-# Begin $rc_base/init.d/messagebus
-
-# Based on sysklogd script from LFS-3.1 and earlier.
-# Rewritten by Gerard Beekmans  - gerard@linuxfromscratch.org
-
-#$LastChangedBy: dnicholson $
-#$Date: 2007-07-09 18:30:26 -0500 (Mon, 09 Jul 2007) $
-
-. /etc/sysconfig/rc
-. $rc_functions
-newgroup=messagebus
-newuser=messagebus
-newid=18
-
-# check for messagebus group or add one
-getent group $newgroup > /dev/null || /usr/sbin/groupadd -g $newid $newgroup
-
-# check for messagebus user or add one
-getent passwd $newuser > /dev/null || /usr/sbin/useradd -g $newgroup \
--u $newid -d /dev/null \
--s /bin/false -c "D-BUS Message Daemon User" $newuser
-
-pidfile=/var/run/dbus/pid
-socket=/var/run/dbus/system_bus_socket
-
-case "$1" in
-        start)
-                boot_mesg "Starting the D-Bus Messagebus Daemon..."
-                /usr/bin/dbus-uuidgen --ensure
-                loadproc -p "$pidfile" /usr/bin/dbus-daemon --system
-                ;;
-
-        stop)
-                boot_mesg "Stopping the D-Bus Messagebus Daemon..."
-                killproc -p "$pidfile" /usr/bin/dbus-daemon
-                [ $? -eq 0 ] && rm -f "$socket"
-                ;;
-
-        restart)
-                $0 stop
-                sleep 1
-                $0 start
-                ;;
-
-        status)
-                statusproc /usr/bin/dbus-daemon
-                ;;
-
-        *)
-                echo "Usage: $0 {start|stop|restart|status}"
-                exit 1
-                ;;
-esac
-
-# End $rc_base/init.d/messagebus