Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el

Conflicts:
	multilib/lib32-libphobos-ldc/PKGBUILD
	multilib/wine_gecko/PKGBUILD
	testing/dbus-core/PKGBUILD
	testing/dbus-core/dbus
	testing/dbus-core/dbus.install
	testing/psmisc/PKGBUILD
	testing/systemd/PKGBUILD
	testing/systemd/systemd-tools.install
	testing/systemd/systemd.install
	testing/sysvinit/PKGBUILD

3 files changed, 37 insertions, 35 deletions

diff --git a/core/dbus-core/PKGBUILD b/core/dbus-core/PKGBUILD
index 00d997621..8801c15d8 100644
--- a/core/dbus-core/PKGBUILD
+++ b/core/dbus-core/PKGBUILD
@@ -1,33 +1,36 @@
-# $Id: PKGBUILD 156105 2012-04-14 07:39:59Z andyrtr $
+# $Id: PKGBUILD 162315 2012-06-24 22:30:38Z dreisner $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Link Dupont <link@subpop.net>
 #
 pkgname=dbus-core
-pkgver=1.4.20
-pkgrel=2
+pkgver=1.6.0
+pkgrel=4
 pkgdesc="Freedesktop.org message bus system"
 url="http://www.freedesktop.org/Software/dbus"
 arch=(i686 x86_64 'mips64el')
 license=('GPL' 'custom')
-depends=('expat>=2.0.1' 'coreutils' 'filesystem' 'shadow') # shadow for install scriptlet FS#29341
+depends=('expat>=2.0.1' 'coreutils' 'filesystem' 'libsystemd' 'shadow') # shadow for install scriptlet FS#29341
 makedepends=('libx11')
 conflicts=('dbus<1.2.3-2')
 options=(!libtool)
 install=dbus.install
-source=(http://dbus.freedesktop.org/releases/dbus/dbus-${pkgver}.tar.gz
+source=(http://dbus.freedesktop.org/releases/dbus/dbus-${pkgver}.tar.gz{,.asc}
         dbus)
-md5sums=('79eca2f2c1894ac347acce128314428b'
-         '08f93dd19cffd1b45ab05c1fd4efb560')
+md5sums=('16dcae2dd0c76e398381601ac9acdec4'
+         '0ebde9920bde83fe26ce32351a7d8954'
+         'f0364f3f5dc5f653bb05d39aa36e3264')
 
 build() {
   cd "${srcdir}/dbus-${pkgver}"
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
       --libexecdir=/usr/lib/dbus-1.0 --with-dbus-user=81 \
-      --with-system-pid-file=/var/run/dbus.pid \
+      --with-system-pid-file=/run/dbus/pid \
+      --with-system-socket=/run/dbus/system_bus_socket \
       --enable-inotify --disable-dnotify \
       --disable-verbose-mode --disable-static \
       --disable-tests --disable-asserts \
-      --with-systemdsystemunitdir=/usr/lib/systemd/system
+      --with-systemdsystemunitdir=/usr/lib/systemd/system \
+      --enable-systemd
   make
 }
 
@@ -45,6 +48,6 @@ package(){
   #Fix configuration file
   sed -i -e 's|<user>81</user>|<user>dbus</user>|' "${pkgdir}/etc/dbus-1/system.conf"
 
-  install -d -m755 "${pkgdir}/usr/share/licenses/dbus-core"
+  install -dm755 "${pkgdir}/usr/share/licenses/dbus-core"
   install -m644 COPYING "${pkgdir}/usr/share/licenses/dbus-core/"
 }
diff --git a/core/dbus-core/dbus b/core/dbus-core/dbus
index 66b84cae0..bf532a274 100644
--- a/core/dbus-core/dbus
+++ b/core/dbus-core/dbus
@@ -4,18 +4,14 @@
 . /etc/rc.conf
 . /etc/rc.d/functions
 
-case "$1" in
+case $1 in
     start)
         stat_busy "Starting D-BUS system messagebus"
-	if [ ! -x /var/run/dbus ] ; then
-	    install -m755 -g 81 -o 81 -d /var/run/dbus
-	fi
-        if [ -x /usr/bin/dbus-uuidgen ] ; then
-            /usr/bin/dbus-uuidgen --ensure
+        if [[ ! -d /run/dbus ]] ; then
+            install -m755 -g 81 -o 81 -d /run/dbus
         fi
 
-        /usr/bin/dbus-daemon --system
-        if [ $? -gt 0 ]; then
+        if ! dbus-daemon --system; then
             stat_fail
         else
             add_daemon dbus
@@ -24,27 +20,25 @@ case "$1" in
         ;;
     stop)
         stat_busy "Stopping D-BUS system messagebus"
-	[ -f /var/run/dbus.pid ] && kill `cat /var/run/dbus.pid` >/dev/null 2>&1
-        if [ $? -gt 0 ]; then
+        if ! { [[ -f /run/dbus/pid ]] && kill $(</run/dbus/pid); }; then
             stat_fail
         else
-	    rm -f /var/run/dbus.pid
+            rm -f /run/dbus/pid
             rm_daemon dbus
             stat_done
         fi
         ;;
     restart)
         $0 stop
-	sleep 1
+        sleep 1
         $0 start
         ;;
     reload)
         stat_busy "Reloading D-BUS configuration"
-        [ -f /var/run/dbus.pid ] && /usr/bin/dbus-send \
+        if ! { [[ -f /run/dbus/pid ]] && dbus-send \
                 --system --type=method_call \
                 --dest=org.freedesktop.DBus \
-                / org.freedesktop.DBus.ReloadConfig
-        if [ $? -gt 0 ]; then
+                / org.freedesktop.DBus.ReloadConfig; }; then
             stat_fail
         else
             stat_done
@@ -52,6 +46,6 @@ case "$1" in
         ;;
     *)
         echo "usage: $0 {start|stop|restart|reload}"
-	;;
+        ;;
 esac
 exit 0
diff --git a/core/dbus-core/dbus.install b/core/dbus-core/dbus.install
index 44f4475ee..88a568429 100644
--- a/core/dbus-core/dbus.install
+++ b/core/dbus-core/dbus.install
@@ -1,24 +1,29 @@
 post_install() {
-  getent group dbus >/dev/null || usr/sbin/groupadd -g 81 dbus
-  getent passwd dbus >/dev/null || usr/sbin/useradd -c 'System message bus' -u 81 -g dbus -d '/' -s /bin/false dbus
-  usr/bin/passwd -l dbus &>/dev/null
-  dbus-uuidgen --ensure
+  getent group dbus >/dev/null || groupadd -g 81 dbus
+  getent passwd dbus >/dev/null || useradd -c 'System message bus' -u 81 -g dbus -d '/' -s /bin/false dbus
+  passwd -l dbus &>/dev/null
+
+  if [[ ! -L var/lib/dbus/machine-id ]]; then
+    [[ -e var/lib/dbus/machine-id && ! -e etc/machine-id ]] && mv var/lib/dbus/machine-id etc/
+    ln -sf ../../../etc/machine-id var/lib/dbus/
+  fi
+  dbus-uuidgen --ensure=etc/machine-id
 }
 
 post_upgrade() {
   post_install
 
-  #Make sure new rc script can shutdown running dbus
-  if [ -f var/run/dbus/pid ]; then
-    mv var/run/dbus/pid var/run/dbus.pid
+  # Make sure new rc script can shutdown running dbus
+  if [ -f run/dbus.pid -a -d run/dbus ]; then
+    mv run/dbus.pid run/dbus/pid
   fi
 }
 
 post_remove() {
   if getent passwd dbus >/dev/null; then
-    usr/sbin/userdel dbus
+    userdel dbus
   fi
   if getent group dbus >/dev/null; then
-    usr/sbin/groupdel dbus
+    groupdel dbus
   fi
 }