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

Conflicts:
	community/geany/PKGBUILD
	community/linux-tools/PKGBUILD
	community/linux-tools/cpupower.conf
	community/linux-tools/cpupower.rc
	community/stk/PKGBUILD
	core/patch/PKGBUILD
	core/systemd/PKGBUILD
	extra/lftp/PKGBUILD
	extra/lftp/lftp-4.3.8-gets.patch
	extra/mysql/PKGBUILD
	extra/qt/PKGBUILD
	extra/transmission/PKGBUILD
	gnome-unstable/gcr/PKGBUILD
	gnome-unstable/glibmm/PKGBUILD
	gnome-unstable/gnome-session/PKGBUILD
	gnome-unstable/libgdata/PKGBUILD
	gnome-unstable/libgnome-keyring/PKGBUILD
	gnome-unstable/pango/PKGBUILD
	gnome-unstable/polkit/PKGBUILD
	gnome-unstable/telepathy-glib/PKGBUILD
	libre/linux-libre/PKGBUILD
	multilib/lib32-libphobos-ldc/PKGBUILD
	multilib/wine/PKGBUILD
	testing/dbus-core/PKGBUILD
	testing/dbus/PKGBUILD
	testing/libusbx/PKGBUILD
	testing/systemd/PKGBUILD
	testing/xf86-video-intel/PKGBUILD

3 files changed, 58 insertions, 12 deletions

diff --git a/core/systemd/0001-tmpfiles-restore-previous-behavior-for-F-f.patch b/core/systemd/0001-tmpfiles-restore-previous-behavior-for-F-f.patch
new file mode 100644
index 000000000..9be6ef28f
--- /dev/null
+++ b/core/systemd/0001-tmpfiles-restore-previous-behavior-for-F-f.patch
@@ -0,0 +1,30 @@
+From 1845fdd967d3a4c06f895413505de3c2429955b0 Mon Sep 17 00:00:00 2001
+From: Dave Reisner <dreisner@archlinux.org>
+Date: Thu, 27 Sep 2012 20:48:13 -0400
+Subject: [PATCH] tmpfiles: restore previous behavior for F/f
+
+d4e9eb91ea changed the behavior for the F and f actions, wrongly sending
+them to glob_item(). Restore the old behavior and shortcut straight to
+write_one_file().
+---
+ src/tmpfiles/tmpfiles.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/src/tmpfiles/tmpfiles.c b/src/tmpfiles/tmpfiles.c
+index f10f908..bf900fa 100644
+--- a/src/tmpfiles/tmpfiles.c
++++ b/src/tmpfiles/tmpfiles.c
+@@ -673,6 +673,10 @@ static int create_item(Item *i) {
+ 
+         case CREATE_FILE:
+         case TRUNCATE_FILE:
++                r = write_one_file(i, i->path);
++                if (r < 0)
++                        return r;
++                break;
+         case WRITE_FILE:
+                 r = glob_item(i, write_one_file);
+                 if (r < 0)
+-- 
+1.7.12.1
+
diff --git a/core/systemd/PKGBUILD b/core/systemd/PKGBUILD
index 9e8841aee..1c826da58 100644
--- a/core/systemd/PKGBUILD
+++ b/core/systemd/PKGBUILD
@@ -3,27 +3,30 @@
 
 pkgbase=systemd
 pkgname=('systemd' 'systemd-sysvcompat')
-pkgver=189
-pkgrel=4
+pkgver=193
+pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.freedesktop.org/wiki/Software/systemd"
 license=('GPL2' 'LGPL2.1' 'MIT')
 makedepends=('acl' 'cryptsetup' 'dbus-core' 'docbook-xsl' 'gobject-introspection' 'gperf'
              'gtk-doc' 'intltool' 'kmod' 'libcap' 'libgcrypt' 'libxslt' 'linux-api-headers'
-             'pam' 'xz')
+             'pam' 'quota-tools' 'xz')
+checkdepends=('python')
 options=('!libtool')
 source=("http://www.freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.xz"
         'initcpio-hook-udev'
         'initcpio-install-udev'
         'initcpio-install-timestamp'
         '0001-Reinstate-TIMEOUT-handling.patch'
+        '0001-tmpfiles-restore-previous-behavior-for-F-f.patch'
         'use-split-usr-path.patch')
-md5sums=('ac2eb313f5dce79622f60aac56bca66d'
+md5sums=('732a9de2b1d2a15cab639c987ff9e90e'
          'e99e9189aa2f6084ac28b8ddf605aeb8'
          '59e91c4d7a69b7bf12c86a9982e37ced'
          'df69615503ad293c9ddf9d8b7755282d'
          '5543be25f205f853a21fa5ee68e03f0d'
-         '482dba45a783f06c2239f1355f4ce72f')
+         '1f435290db227c3a4f4396f86819227e'
+         'fd5b5f04ab0a847373d357555129d4c0')
 
 build() {
   cd "$pkgname-$pkgver"
@@ -34,6 +37,9 @@ build() {
   # hang onto this until we do the /{,s}bin merge
   patch -Np1 <"$srcdir/use-split-usr-path.patch"
 
+  # upstream commit 1845fdd967d3a4c06f895413505de3c2429955b0
+  patch -Np1 <"$srcdir/0001-tmpfiles-restore-previous-behavior-for-F-f.patch"
+
   ./configure \
       --libexecdir=/usr/lib \
       --localstatedir=/var \
@@ -49,6 +55,10 @@ build() {
   make
 }
 
+check() {
+  make -C "$pkgname-$pkgver" check
+}
+
 package_systemd() {
   pkgdesc="system and service manager"
   depends=('acl' 'bash' 'dbus-core' 'glib2' 'kbd' 'kmod' 'hwids' 'libcap' 'libgcrypt'
@@ -60,7 +70,8 @@ package_systemd() {
               'python2-cairo: systemd-analyze'
               'python2-dbus: systemd-analyze'
               'systemd-sysvcompat: symlink package to provide sysvinit binaries'
-              'cryptsetup: required for encrypted block devices')
+              'cryptsetup: required for encrypted block devices'
+              'quota-tools: kernel-level quota management')
   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
@@ -130,9 +141,14 @@ package_systemd() {
 
 package_systemd-sysvcompat() {
   pkgdesc="sysvinit compat for systemd"
-  conflicts=('sysvinit')
+  conflicts=('sysvinit' 'initscripts')
   depends=('sysvinit-tools')
 
+  # the initscripts conflict here isn't actually needed, but in order to make
+  # this package remove both sysvinit and initscripts, the initscripts conflict
+  # is needed. There's no case in which you would ever want initscripts installed
+  # without sysvinit, and vice versa, as in both cases, they are unusable.
+
   mv "$srcdir/_sysvcompat"/* "$pkgdir"
 
   install -dm755 "$pkgdir/sbin"
diff --git a/core/systemd/use-split-usr-path.patch b/core/systemd/use-split-usr-path.patch
index 057045bf1..2fd32998d 100644
--- a/core/systemd/use-split-usr-path.patch
+++ b/core/systemd/use-split-usr-path.patch
@@ -1,6 +1,6 @@
---- a/src/core/main.c	2012-07-17 19:46:24.000000000 -0400
-+++ b/src/core/main.c	2012-07-27 10:04:13.000000000 -0400
-@@ -1379,11 +1379,7 @@
+--- a/src/core/main.c	2012-09-20 23:02:54.000000000 -0400
++++ b/src/core/main.c	2012-09-20 23:03:13.000000000 -0400
+@@ -1455,11 +1455,7 @@
  
          /* Set up PATH unless it is already set */
          setenv("PATH",
@@ -9,6 +9,6 @@
 -#else
 -               "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin",
 -#endif
-                arg_running_as == MANAGER_SYSTEM);
+                arg_running_as == SYSTEMD_SYSTEM);
  
-         if (arg_running_as == MANAGER_SYSTEM) {
+         if (arg_running_as == SYSTEMD_SYSTEM) {