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

Conflicts:
	community/curlftpfs/PKGBUILD
	core/libcap/PKGBUILD
	core/libsasl/PKGBUILD
	core/udev/PKGBUILD
	extra/cyrus-sasl/PKGBUILD
	extra/dbus/PKGBUILD
	extra/fluidsynth/PKGBUILD
	extra/mercurial/PKGBUILD
	extra/redland/PKGBUILD
	extra/soprano/PKGBUILD
	multilib/lib32-curl/PKGBUILD
	multilib/lib32-freetype2/PKGBUILD
	multilib/lib32-mesa/PKGBUILD
	multilib/wine/PKGBUILD

2 files changed, 55 insertions, 22 deletions

diff --git a/community/systemd/PKGBUILD b/community/systemd/PKGBUILD
index feda347eb..7548d09b7 100644
--- a/community/systemd/PKGBUILD
+++ b/community/systemd/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 49447 2011-06-16 13:09:25Z dreisner $
-# Maintainer: Dave Reisner <d@falconindy.com>
+# $Id: PKGBUILD 53341 2011-08-03 04:06:06Z dreisner $
+# Maintainer: Dave Reisner <dreisner@archlinux.org>
 
 pkgname=systemd
-pkgver=29
+pkgver=33
 pkgrel=1
 pkgdesc="Session and Startup manager"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.freedesktop.org/wiki/Software/systemd"
 license=('GPL2')
-depends=('dbus-core' 'sysvinit' 'util-linux>=2.19')
-makedepends=('docbook-xsl' 'libxslt' 'cryptsetup' 'gtk2' 'libnotify')
+depends=('dbus-core' 'libcap' 'util-linux>=2.19' 'udev>=172')
+makedepends=('docbook-xsl' 'libxslt' 'cryptsetup' 'gtk2' 'intltool' 'libnotify' 'gperf')
 optdepends=('cryptsetup: required for encrypted block devices'
             'dbus-python: systemd-analyze'
             'gtk2: systemadm'
@@ -20,29 +20,42 @@ optdepends=('cryptsetup: required for encrypted block devices'
             'systemd-arch-units: collection of native unit files for Arch daemon/init scripts')
 groups=('systemd')
 options=('!libtool')
-backup=(etc/systemd/system.conf
-        etc/tmpfiles.d/console.conf
-        usr/lib/tmpfiles.d/legacy.conf
-        usr/lib/tmpfiles.d/systemd.conf
-        usr/lib/tmpfiles.d/x11.conf)
+backup=(etc/dbus-1/system.d/org.freedesktop.systemd1.conf
+        etc/dbus-1/system.d/org.freedesktop.hostname1.conf
+        etc/dbus-1/system.d/org.freedesktop.login1.conf
+        etc/dbus-1/system.d/org.freedesktop.locale1.conf
+        etc/dbus-1/system.d/org.freedesktop.timedate1.conf
+        etc/systemd/system.conf
+        etc/systemd/user.conf
+        etc/systemd/systemd-logind.conf)
 install=systemd.install
 source=("http://www.freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.bz2"
         "os-release")
-md5sums=('e91ffd208c5f03e5c11966eee7b684b0'
+md5sums=('361cad7c3debbdd81c211527509ba181'
          '752636def0db3c03f121f8b4f44a63cd')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
 
+  # Don't unset locale in getty
+  # https://bugzilla.redhat.com/show_bug.cgi?id=663900
+  sed -i -e '/^Environ.*LANG/s/^/#/' \
+         -e '/^ExecStart/s/agetty/& -8/' units/getty@.service.m4
+
   ./configure --prefix=/usr \
-              --with-rootdir= \
               --sysconfdir=/etc \
               --libexecdir=/usr/lib \
+              --libdir=/usr/lib \
               --localstatedir=/var \
+              --with-rootdir= \
+              --with-rootlibdir=/lib \
               --disable-audit \
               --disable-tcpwrap
 
   make
+
+  # fix .so links in manpages
+  sed -i 's|\.so halt\.8|.so systemd.halt.8|' man/{halt,poweroff}.8
 }
 
 package() {
@@ -51,7 +64,7 @@ package() {
   make DESTDIR="$pkgdir" install
 
   install -Dm644 "$srcdir/os-release" "$pkgdir/etc/os-release"
-  printf "d /run/console 755 root root\n" > "$pkgdir/etc/tmpfiles.d/console.conf"
+  printf "d /run/console 755 root root\n" > "$pkgdir/usr/lib/tmpfiles.d/console.conf"
 
   # fix systemd-analyze for python2
   sed -i '1s/python$/python2/' "$pkgdir/usr/bin/systemd-analyze"
@@ -61,5 +74,5 @@ package() {
   for manpage in telinit halt reboot poweroff runlevel shutdown; do
     mv {,systemd.}"$manpage.8"
   done
-}
 
+}
diff --git a/community/systemd/systemd.install b/community/systemd/systemd.install
index 7ec58682a..34f902276 100644
--- a/community/systemd/systemd.install
+++ b/community/systemd/systemd.install
@@ -1,13 +1,21 @@
 #!/bin/sh
 
 checkgroups() {
-  getent group lock >/dev/null || groupadd -g 54 lock
+  if usr/bin/getent group lock >/dev/null; then
+    usr/sbin/groupadd -g 54 lock
+  fi
+}
+
+sd_booted() {
+  [ -e sys/fs/cgroups/systemd ]
 }
 
 post_install() {
   checkgroups
 
-  [ -f /etc/machine-id ] || systemd-machine-id-setup
+  if [ -f etc/machine-id ]; then
+    bin/systemd-machine-id-setup
+  fi
 
   echo "systemd has been installed to /bin/systemd. Please ensure you append"
   echo "init=/bin/systemd to your kernel command line in your bootloader."
@@ -16,16 +24,28 @@ post_install() {
 post_upgrade() {
   checkgroups
 
-  [ -f /etc/machine-id ] || systemd-machine-id-setup
-  systemctl daemon-reexec >/dev/null || :
-}
+  if [ -f etc/machine-id ]; then
+    bin/systemd-machine-id-setup
+  fi
+
+  if sd_booted; then
+    bin/systemctl daemon-reexec >/dev/null
+  fi
+
+  newpkgver=${1%-*}
+  oldpkgver=${2%-*}
 
-pre_remove() {
-  rm -f /etc/systemd/system/default.target
+  # catch v31 need for restarting systemd-logind.service
+  if [ "$newpkgver" -ge 31 ] && [ "$oldpkgver" -lt 31 ]; then
+    # but only if systemd is running
+    if sd_booted; then
+      bin/systemctl try-restart systemd-logind.service
+    fi
+  fi
 }
 
 post_remove() {
-  getent group lock >/dev/null && groupdel lock
+  usr/bin/getent group lock >/dev/null && usr/sbin/groupdel lock
 }
 
 # vim:set ts=2 sw=2 et: