Fri Oct 4 01:57:28 PDT 2013

20 files changed, 329 insertions, 314 deletions

diff --git a/community/ccid/PKGBUILD b/community/ccid/PKGBUILD
index ae13ebbf9..b39649246 100644
--- a/community/ccid/PKGBUILD
+++ b/community/ccid/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 94187 2013-07-16 14:49:37Z giovanni $
+# $Id: PKGBUILD 98011 2013-10-03 16:17:48Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Daniel Plaza <daniel.plaza.espi@gmail.com>
 
 pkgname=ccid
-pkgver=1.4.11
+pkgver=1.4.12
 pkgrel=1
 pkgdesc="A generic USB Chip/Smart Card Interface Devices driver"
 arch=('i686' 'x86_64')
@@ -12,8 +12,8 @@ license=('LGPL' 'GPL')
 depends=('pcsclite' 'libusbx')
 makedepends=('pkg-config')
 backup=(etc/reader.conf.d/libccidtwin)
-source=("https://alioth.debian.org/frs/download.php/file/3920/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('20e3d6f045c53707a597cbacb86b6c5b')
+source=("https://alioth.debian.org/frs/download.php/file/3937/${pkgname}-${pkgver}.tar.bz2")
+md5sums=('54a314b60b60a9549febc75b6dc516d5')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/community/highlight/PKGBUILD b/community/highlight/PKGBUILD
index 9bef8a4fe..a7defcdc1 100644
--- a/community/highlight/PKGBUILD
+++ b/community/highlight/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 95716 2013-08-15 21:40:32Z bluewind $
+# $Id: PKGBUILD 98015 2013-10-03 17:42:09Z bluewind $
 # Maintainer: Florian Pritz <flo@xinu.at>
 # Contributor: Jan Fader <jan.fader@web.de>
 pkgbase=highlight
 pkgname=(highlight highlight-gui)
-pkgver=3.15
+pkgver=3.16
 pkgrel=1
 url="http://www.andre-simon.de/doku/highlight/highlight.html"
 license=('GPL')
 arch=('i686' 'x86_64')
 makedepends=(qt4 lua boost)
 source=(http://www.andre-simon.de/zip/$pkgname-$pkgver.tar.bz2{,.asc})
-md5sums=('ca89c1f01449059459d8cb173a9cf2dc'
+md5sums=('88558766efc5109f07b7f5b78e62aea2'
          'SKIP')
 
 build() {
@@ -29,7 +29,7 @@ package_highlight() {
 }
 
 package_highlight-gui() {
-  pkgdesc="Fast and flexible source code highlighter (QT version)"
+  pkgdesc="Fast and flexible source code highlighter (Qt version)"
   depends=('qt4' 'highlight')
   cd "$srcdir/$pkgbase-$pkgver"
 
diff --git a/community/lz4/PKGBUILD b/community/lz4/PKGBUILD
index cb41d89e5..127a04730 100644
--- a/community/lz4/PKGBUILD
+++ b/community/lz4/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 97896 2013-09-30 21:39:10Z seblu $
+# $Id: PKGBUILD 98004 2013-10-03 00:48:10Z seblu $
 # Maintainer: Sébastien Luttringer
 
 # Contacted by mail, author use svn commit as release version.
 # He only push tested release code into svn and support using revision as version
 
 pkgname=lz4
-pkgver=105
+pkgver=106
 pkgrel=1
 pkgdesc='Very fast lossless compression algorithm'
 arch=('i686' 'x86_64')
diff --git a/community/plan9port/PKGBUILD b/community/plan9port/PKGBUILD
index 00581da7b..24d9dc11c 100644
--- a/community/plan9port/PKGBUILD
+++ b/community/plan9port/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 97830 2013-09-30 09:18:30Z arodseth $
+# $Id: PKGBUILD 98017 2013-10-03 19:11:32Z arodseth $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: phrakture <aaronmgriffin--gmail--com>
 # Contributor: Fazlul Shahriar
@@ -6,7 +6,7 @@
 
 pkgname=plan9port
 pkgver=20130927
-pkgrel=1
+pkgrel=2
 pkgdesc='Port of many programs from Plan 9 to Unix-like operating systems'
 arch=('x86_64' 'i686')
 url='http://swtch.com/plan9port/'
@@ -19,18 +19,20 @@ options=('!zipman')
 source=("http://swtch.com/$pkgname/$pkgname-$pkgver.tgz"
         'plan9.sh')
 sha256sums=('580927688ae2df295bf7f78d0ba19588104c6b0403558ffa3cd9ed0b7b110542'
-            '0247c4446497359d305aaec069b07180fbf79ce4fa5191464cd9ebb8c7f0228d')
+            'c216efa3455ba0b22b1723ae62e4c1e21b3a776a760d8fcedb902ff994b701c1')
 
 package() {
   cd plan9
 
+  d=/usr/local # /opt
+
   ./INSTALL -b
   install -Dm755 ../plan9.sh "$pkgdir/etc/profile.d/plan9.sh"
-  install -d "$pkgdir/opt"
+  install -d "$pkgdir$d"
   install -d "$pkgdir/usr/share/doc/$pkgname"
-  cp -r "$srcdir/plan9" "$pkgdir/opt/"
-  cd "$pkgdir/opt/plan9"
-  ./INSTALL -c -r "$pkgdir/opt/plan9"
+  cp -r "$srcdir/plan9" "$pkgdir/$d/"
+  cd "$pkgdir$d/plan9"
+  ./INSTALL -c -r "$pkgdir$d/plan9"
   install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 
   # Clean up
@@ -41,9 +43,9 @@ package() {
     LICENSE
 
   # Fix hardcoded paths
-  for f in `grep -H -r "$pkgdir/opt/plan9" | cut -d: -f1`; do
+  for f in `grep -H -r "$pkgdir$d/plan9" | cut -d: -f1`; do
     echo -n "\t$f"
-    [ -e "$f" ] && sed -i "s:$pkgdir/opt/plan9:/opt/plan9:" "$f" || true
+    [ -e "$f" ] && sed -i "s:$pkgdir$d/plan9:$d/plan9:" "$f" || true
   done
 
   # Fix python scripts
@@ -58,7 +60,7 @@ package() {
   done
 
   # Decompress the plan9 man pages
-  for i in `find /opt/plan9/man -type f`; do
+  for i in `find $pkgdir$d/plan9/man -type f`; do
     if [ ${i##*.} = "gz" ]; then
       gunzip "$i"
     fi
diff --git a/community/plan9port/plan9.sh b/community/plan9port/plan9.sh
index 84c3d7ef4..86109fc57 100644
--- a/community/plan9port/plan9.sh
+++ b/community/plan9port/plan9.sh
@@ -1,2 +1,2 @@
-export PLAN9=/opt/plan9
+export PLAN9=/usr/local/plan9
 export PATH=$PATH:$PLAN9/bin
diff --git a/community/radvd/PKGBUILD b/community/radvd/PKGBUILD
index 66f1d62d5..3666b8871 100644
--- a/community/radvd/PKGBUILD
+++ b/community/radvd/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 97926 2013-10-01 13:07:24Z seblu $
+# $Id: PKGBUILD 98000 2013-10-02 23:02:19Z seblu $
 # Maintainer: Sébastien Luttringer
 # Contributor: Kaiting Chen <kaitocracy@gmail.com>
 # Contributor: Mark Smith <markzzzsmith@yahoo.com.au>
 
 pkgname=radvd
-pkgver=1.9.4
+pkgver=1.9.5
 pkgrel=1
 pkgdesc='IPv6 Router Advertisement Daemon'
 url='http://www.litech.org/radvd/'
@@ -14,7 +14,7 @@ arch=('i686' 'x86_64')
 backup=('etc/radvd.conf')
 source=("http://www.litech.org/radvd/dist/$pkgname-$pkgver.tar.gz"
         "$pkgname.service")
-sha1sums=('15bca3215d7740f5052d8cbd0b2b1e82b9380749'
+sha1sums=('0e65206803ab2bcb4e6012a0d11ecdad4f64ce9c'
           '2fdba3b0ed28c67dc1c04bfd1439fa4dece88bbc')
 build() {
   cd ${pkgname}-${pkgver}
diff --git a/core/gmp/PKGBUILD b/core/gmp/PKGBUILD
index aae1624f2..ba2d8fed4 100644
--- a/core/gmp/PKGBUILD
+++ b/core/gmp/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 186344 2013-05-25 03:05:31Z allan $
+# $Id: PKGBUILD 195874 2013-10-03 04:29:19Z allan $
 # Maintainer: Allan McRae <allan@archlinux.org>
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gmp
-pkgver=5.1.2
+pkgver=5.1.3
 pkgrel=1
 pkgdesc="A free library for arbitrary precision arithmetic"
 arch=('i686' 'x86_64')
@@ -13,7 +13,7 @@ license=('LGPL3')
 options=('!libtool')
 install=gmp.install
 source=(ftp://ftp.gmplib.org/pub/gmp-${pkgver}/gmp-${pkgver}.tar.xz{,.sig})
-md5sums=('06fe2ca164221c59ce74867155cfc1ac'
+md5sums=('e5fe367801ff067b923d1e6a126448aa'
          'SKIP')
 
 build() {
diff --git a/core/heirloom-mailx/PKGBUILD b/core/heirloom-mailx/PKGBUILD
deleted file mode 100644
index d7e82f00c..000000000
--- a/core/heirloom-mailx/PKGBUILD
+++ /dev/null
@@ -1,64 +0,0 @@
-# $Id: PKGBUILD 160422 2012-06-01 20:13:47Z stephane $
-# Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
-# Contributor: Sergej Pupykin <pupykin.s@arch@gmail.com>
-# Contributor: Andreas Wagner <Andreas.Wagner@em.uni-frankfurt.de>
-
-pkgname=heirloom-mailx
-pkgver=12.5
-pkgrel=3
-pkgdesc="A commandline utility for sending and receiving email"
-arch=('i686' 'x86_64')
-url="http://heirloom.sourceforge.net/mailx.html"
-license=('custom')
-groups=('base')
-depends=('openssl' 'krb5')
-optdepends=('smtp-forwarder: for sending mail')
-replaces=('mailx' 'mailx-heirloom')
-provides=('mailx' 'mailx-heirloom')
-conflicts=('mailx' 'mailx-heirloom')
-backup=(etc/mail.rc)
-source=(ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.xz)
-sha1sums=('1998dd6168a68400e533712ae7163c72b6a7c056')
-options=('!makeflags') # Does not build with MAKEFLAGS=-jX, X>1
-
-# source PKGBUILD && mksource
-mksource() {
-  export CVSROOT=:pserver:anonymous@nail.cvs.sourceforge.net:/cvsroot/nail
-  D=nail
-  [ -d "${D}" ] && cvs up "${D}" || cvs co "${D}"
-  
-  _dirname=${pkgname}-${pkgver}
-  mv $D ${_dirname}
-  tar -cJv --exclude=CVS -f ${_dirname}.tar.xz ${_dirname}
-  rm -rf ${_dirname}
-}
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  sed -i 's|/etc/nail.rc|/etc/mail.rc|g' mailx.1
-
-  # For Linux and BSD, this should be set.
-  echo "set bsdcompat" >> nail.rc
-
-  sed -i "s/pg/less/" cmd1.c
-
-  echo PREFIX=/usr \
-       MAILRC=/etc/mail.rc \
-       SENDMAIL=/usr/sbin/sendmail \
-       MAILSPOOL=/var/spool/mail \
-       UCBINSTALL=/usr/bin/install > makeflags
-
-  make `cat makeflags` IPv6=-DHAVE_IPv6_FUNCS
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" `cat makeflags` install
-
-  # For compatibility with the old mailx program
-  ln -sf mailx "${pkgdir}"/usr/bin/mail
-  ln -sf mailx.1.gz "${pkgdir}"/usr/share/man/man1/mail.1.gz
-
-  install -D -m0644 COPYING "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
-}
diff --git a/core/s-nail/PKGBUILD b/core/s-nail/PKGBUILD
new file mode 100644
index 000000000..3a9653c82
--- /dev/null
+++ b/core/s-nail/PKGBUILD
@@ -0,0 +1,53 @@
+# $Id: PKGBUILD 195886 2013-10-03 16:52:03Z bisson $
+# Maintainer: Gaetan Bisson <bisson@archlinux.org>
+# Contributor: Stéphane Gaudreault <stephane@archlinux.org>
+# Contributor: Sergej Pupykin <pupykin.s@arch@gmail.com>
+# Contributor: Andreas Wagner <Andreas.Wagner@em.uni-frankfurt.de>
+
+pkgname=s-nail
+pkgver=14.4.3
+pkgrel=1
+pkgdesc='Mail processing system with a command syntax reminiscent of ed'
+url='http://sourceforge.net/projects/s-nail/'
+license=('custom:BSD')
+arch=('i686' 'x86_64')
+depends=('openssl')
+optdepends=('smtp-forwarder: for sending mail')
+source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}-${pkgver//./_}.tar.gz")
+sha1sums=('39fdade9b622a6addc5e70a5d929b0bc5ef49d00')
+
+groups=('base')
+backup=('etc/mail.rc')
+replaces=('mailx' 'mailx-heirloom' 'heirloom-mailx')
+provides=('mailx' 'mailx-heirloom' 'heirloom-mailx')
+conflicts=('mailx' 'mailx-heirloom' 'heirloom-mailx')
+
+build() {
+	cd "${srcdir}/${pkgname}-${pkgver}"
+	make \
+		PREFIX=/usr \
+		SYSCONFDIR=/etc \
+		MANDIR=/usr/share/man \
+		MAILSPOOL=/var/spool/mail \
+		SID= NAIL=mail \
+		CFLAGS="$CFLAGS $CPPFLAGS" \
+		DESTDIR="${pkgdir}" \
+		all
+}
+
+package() {
+	cd "${srcdir}/${pkgname}-${pkgver}"
+	make \
+		PREFIX=/usr \
+		SYSCONFDIR=/etc \
+		MANDIR=/usr/share/man \
+		MAILSPOOL=/var/spool/mail \
+		SID= NAIL=mail \
+		CFLAGS="$CFLAGS $CPPFLAGS" \
+		DESTDIR="${pkgdir}" \
+		install
+
+	ln -sf mail "${pkgdir}"/usr/bin/mailx
+	ln -sf mail.1.gz "${pkgdir}"/usr/share/man/man1/mailx.1.gz
+	install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING"
+}
diff --git a/core/systemd/0001-fix-lingering-references-to-var-lib-backlight-random.patch b/core/systemd/0001-fix-lingering-references-to-var-lib-backlight-random.patch
new file mode 100644
index 000000000..49b960c81
--- /dev/null
+++ b/core/systemd/0001-fix-lingering-references-to-var-lib-backlight-random.patch
@@ -0,0 +1,54 @@
+From 6c8c92fef72cf6a7ef7109a424ef82dbdc4f6952 Mon Sep 17 00:00:00 2001
+From: Dave Reisner <dreisner@archlinux.org>
+Date: Wed, 2 Oct 2013 07:46:24 -0400
+Subject: [PATCH] fix lingering references to /var/lib/{backlight,random-seed}
+
+This should have been part of ef5bfcf668e6029faa78534dfe.
+---
+ man/systemd-backlight@.service.xml  | 2 +-
+ man/systemd-random-seed.service.xml | 2 +-
+ units/systemd-backlight@.service.in | 2 +-
+ 3 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/man/systemd-backlight@.service.xml b/man/systemd-backlight@.service.xml
+index 2b73625..4318964 100644
+--- a/man/systemd-backlight@.service.xml
++++ b/man/systemd-backlight@.service.xml
+@@ -58,7 +58,7 @@
+                 is a service that restores the display backlight
+                 brightness at early-boot and saves it at shutdown. On
+                 disk, the backlight brightness is stored in
+-                <filename>/var/lib/backlight/</filename>. Note that by
++                <filename>/var/lib/systemd/backlight/</filename>. Note that by
+                 default, only firmware backlight devices are
+                 saved/restored.</para>
+         </refsect1>
+diff --git a/man/systemd-random-seed.service.xml b/man/systemd-random-seed.service.xml
+index 8cd14b7..e5cd037 100644
+--- a/man/systemd-random-seed.service.xml
++++ b/man/systemd-random-seed.service.xml
+@@ -61,7 +61,7 @@
+                 for details. Saving/restoring the random seed across
+                 boots increases the amount of available entropy early
+                 at boot. On disk the random seed is stored in
+-                <filename>/var/lib/random-seed</filename>.</para>
++                <filename>/var/lib/systemd/random-seed</filename>.</para>
+         </refsect1>
+ 
+         <refsect1>
+diff --git a/units/systemd-backlight@.service.in b/units/systemd-backlight@.service.in
+index b0e75db..5caa5d5 100644
+--- a/units/systemd-backlight@.service.in
++++ b/units/systemd-backlight@.service.in
+@@ -9,7 +9,7 @@
+ Description=Load/Save Screen Backlight Brightness of %I
+ Documentation=man:systemd-backlight@.service(8)
+ DefaultDependencies=no
+-RequiresMountsFor=/var/lib/backlight
++RequiresMountsFor=/var/lib/systemd/backlight
+ Conflicts=shutdown.target
+ After=systemd-readahead-collect.service systemd-readahead-replay.service systemd-remount-fs.service
+ Before=sysinit.target shutdown.target
+-- 
+1.8.4
+
diff --git a/core/systemd/0001-polkit-Avoid-race-condition-in-scraping-proc.patch b/core/systemd/0001-polkit-Avoid-race-condition-in-scraping-proc.patch
deleted file mode 100644
index d3c09781c..000000000
--- a/core/systemd/0001-polkit-Avoid-race-condition-in-scraping-proc.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-From 72fd713962ca2c2450e23b01d9e22017a7e28fd4 Mon Sep 17 00:00:00 2001
-From: Colin Walters <walters@verbum.org>
-Date: Thu, 22 Aug 2013 13:55:21 -0400
-Subject: [PATCH] polkit: Avoid race condition in scraping /proc
-
-If a calling process execve()s a setuid program, it can appear to be
-uid 0.  Since we're receiving requests over DBus, avoid this by simply
-passing system-bus-name as a subject.
----
- src/shared/polkit.c | 31 +++++--------------------------
- 1 file changed, 5 insertions(+), 26 deletions(-)
-
-diff --git a/src/shared/polkit.c b/src/shared/polkit.c
-index cea7074..1c5e9e3 100644
---- a/src/shared/polkit.c
-+++ b/src/shared/polkit.c
-@@ -38,12 +38,8 @@ int verify_polkit(
- 
- #ifdef ENABLE_POLKIT
-         DBusMessage *m = NULL, *reply = NULL;
--        const char *unix_process = "unix-process", *pid = "pid", *starttime = "start-time", *cancel_id = "";
-+        const char *system_bus_name = "system-bus-name", *name = "name", *cancel_id = "";
-         uint32_t flags = interactive ? 1 : 0;
--        pid_t pid_raw;
--        uint32_t pid_u32;
--        unsigned long long starttime_raw;
--        uint64_t starttime_u64;
-         DBusMessageIter iter_msg, iter_struct, iter_array, iter_dict, iter_variant;
-         int r;
-         dbus_bool_t authorized = FALSE, challenge = FALSE;
-@@ -68,14 +64,6 @@ int verify_polkit(
- 
- #ifdef ENABLE_POLKIT
- 
--        pid_raw = bus_get_unix_process_id(c, sender, error);
--        if (pid_raw == 0)
--                return -EINVAL;
--
--        r = get_starttime_of_pid(pid_raw, &starttime_raw);
--        if (r < 0)
--                return r;
--
-         m = dbus_message_new_method_call(
-                         "org.freedesktop.PolicyKit1",
-                         "/org/freedesktop/PolicyKit1/Authority",
-@@ -86,22 +74,13 @@ int verify_polkit(
- 
-         dbus_message_iter_init_append(m, &iter_msg);
- 
--        pid_u32 = (uint32_t) pid_raw;
--        starttime_u64 = (uint64_t) starttime_raw;
--
-         if (!dbus_message_iter_open_container(&iter_msg, DBUS_TYPE_STRUCT, NULL, &iter_struct) ||
--            !dbus_message_iter_append_basic(&iter_struct, DBUS_TYPE_STRING, &unix_process) ||
-+            !dbus_message_iter_append_basic(&iter_struct, DBUS_TYPE_STRING, &system_bus_name) ||
-             !dbus_message_iter_open_container(&iter_struct, DBUS_TYPE_ARRAY, "{sv}", &iter_array) ||
-             !dbus_message_iter_open_container(&iter_array, DBUS_TYPE_DICT_ENTRY, NULL, &iter_dict) ||
--            !dbus_message_iter_append_basic(&iter_dict, DBUS_TYPE_STRING, &pid) ||
--            !dbus_message_iter_open_container(&iter_dict, DBUS_TYPE_VARIANT, "u", &iter_variant) ||
--            !dbus_message_iter_append_basic(&iter_variant, DBUS_TYPE_UINT32, &pid_u32) ||
--            !dbus_message_iter_close_container(&iter_dict, &iter_variant) ||
--            !dbus_message_iter_close_container(&iter_array, &iter_dict) ||
--            !dbus_message_iter_open_container(&iter_array, DBUS_TYPE_DICT_ENTRY, NULL, &iter_dict) ||
--            !dbus_message_iter_append_basic(&iter_dict, DBUS_TYPE_STRING, &starttime) ||
--            !dbus_message_iter_open_container(&iter_dict, DBUS_TYPE_VARIANT, "t", &iter_variant) ||
--            !dbus_message_iter_append_basic(&iter_variant, DBUS_TYPE_UINT64, &starttime_u64) ||
-+            !dbus_message_iter_append_basic(&iter_dict, DBUS_TYPE_STRING, &name) ||
-+            !dbus_message_iter_open_container(&iter_dict, DBUS_TYPE_VARIANT, "s", &iter_variant) ||
-+            !dbus_message_iter_append_basic(&iter_variant, DBUS_TYPE_STRING, &sender) ||
-             !dbus_message_iter_close_container(&iter_dict, &iter_variant) ||
-             !dbus_message_iter_close_container(&iter_array, &iter_dict) ||
-             !dbus_message_iter_close_container(&iter_struct, &iter_array) ||
--- 
-1.8.4
-
diff --git a/core/systemd/0001-swap-fix-reverse-dependencies.patch b/core/systemd/0001-swap-fix-reverse-dependencies.patch
deleted file mode 100644
index 7e51918ab..000000000
--- a/core/systemd/0001-swap-fix-reverse-dependencies.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 90060fa6605446bef7078867423b691e4effa575 Mon Sep 17 00:00:00 2001
-From: Tom Gundersen <teg@jklm.no>
-Date: Fri, 13 Sep 2013 14:46:18 +0200
-Subject: [PATCH] swap: fix reverse dependencies
-
-Make sure swap.target correctly requires/wants the swap units.
-
-This fixes https://bugs.freedesktop.org/show_bug.cgi?id=69291.
-
-Reported-by: Hussam Al-Tayeb
----
- src/core/swap.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/core/swap.c b/src/core/swap.c
-index 57d15eb..3950860 100644
---- a/src/core/swap.c
-+++ b/src/core/swap.c
-@@ -220,7 +220,7 @@ static int swap_add_default_dependencies(Swap *s) {
-         }
- 
-         if (!noauto) {
--                r = unit_add_two_dependencies_by_name(UNIT(s), UNIT_BEFORE, (nofail ? UNIT_WANTED_BY : UNIT_REQUIRED_BY),
-+                r = unit_add_two_dependencies_by_name_inverse(UNIT(s), UNIT_AFTER, (nofail ? UNIT_WANTS : UNIT_REQUIRES),
-                                                       SPECIAL_SWAP_TARGET, NULL, true);
-                 if (r < 0)
-                         return r;
--- 
-1.8.4
-
diff --git a/core/systemd/0002-swap-create-.wants-symlink-to-auto-swap-devices.patch b/core/systemd/0002-swap-create-.wants-symlink-to-auto-swap-devices.patch
deleted file mode 100644
index 4b8743464..000000000
--- a/core/systemd/0002-swap-create-.wants-symlink-to-auto-swap-devices.patch
+++ /dev/null
@@ -1,90 +0,0 @@
-From 4e82fe5213bedcb70e25c0270e516d5f2706d8c8 Mon Sep 17 00:00:00 2001
-From: Tom Gundersen <teg@jklm.no>
-Date: Mon, 16 Sep 2013 01:08:32 +0200
-Subject: [PATCH] swap: create .wants symlink to 'auto' swap devices
-
-As we load unit files lazily, we need to make sure something pulls in swap
-units that should be started automatically, otherwise the default dependencies
-will never be applied.
-
-This partially reinstates code removed in
-commit 64347fc2b983f33e7efb0fd2bb44e133fb9f30f4.
-
-Also don't order swap devices after swap.target when they are 'nofail'.
----
- src/core/swap.c                       |  8 ++++++--
- src/fstab-generator/fstab-generator.c | 18 ++++++++++++++++--
- 2 files changed, 22 insertions(+), 4 deletions(-)
-
-diff --git a/src/core/swap.c b/src/core/swap.c
-index 3950860..76c7d45 100644
---- a/src/core/swap.c
-+++ b/src/core/swap.c
-@@ -220,8 +220,12 @@ static int swap_add_default_dependencies(Swap *s) {
-         }
- 
-         if (!noauto) {
--                r = unit_add_two_dependencies_by_name_inverse(UNIT(s), UNIT_AFTER, (nofail ? UNIT_WANTS : UNIT_REQUIRES),
--                                                      SPECIAL_SWAP_TARGET, NULL, true);
-+                if (nofail)
-+                        r = unit_add_dependency_by_name_inverse(UNIT(s),
-+                                UNIT_WANTS, SPECIAL_SWAP_TARGET, NULL, true);
-+                else
-+                        r = unit_add_two_dependencies_by_name_inverse(UNIT(s),
-+                                UNIT_AFTER, UNIT_REQUIRES, SPECIAL_SWAP_TARGET, NULL, true);
-                 if (r < 0)
-                         return r;
-         }
-diff --git a/src/fstab-generator/fstab-generator.c b/src/fstab-generator/fstab-generator.c
-index 6ebe8aa..b73dfa4 100644
---- a/src/fstab-generator/fstab-generator.c
-+++ b/src/fstab-generator/fstab-generator.c
-@@ -66,6 +66,7 @@ static int mount_find_pri(struct mntent *me, int *ret) {
- static int add_swap(const char *what, struct mntent *me) {
-         _cleanup_free_ char *name = NULL, *unit = NULL, *lnk = NULL, *device = NULL;
-         _cleanup_fclose_ FILE *f = NULL;
-+        bool noauto;
-         int r, pri = -1;
- 
-         assert(what);
-@@ -77,6 +78,8 @@ static int add_swap(const char *what, struct mntent *me) {
-                 return pri;
-         }
- 
-+        noauto = !!hasmntopt(me, "noauto");
-+
-         name = unit_name_from_path(what, ".swap");
-         if (!name)
-                 return log_oom();
-@@ -97,8 +100,7 @@ static int add_swap(const char *what, struct mntent *me) {
-         fprintf(f,
-                 "# Automatically generated by systemd-fstab-generator\n\n"
-                 "[Unit]\n"
--                "SourcePath=/etc/fstab\n"
--                "\n"
-+                "SourcePath=/etc/fstab\n\n"
-                 "[Swap]\n"
-                 "What=%s\n",
-                 what);
-@@ -114,6 +116,18 @@ static int add_swap(const char *what, struct mntent *me) {
-                 return -errno;
-         }
- 
-+        if (!noauto) {
-+                lnk = strjoin(arg_dest, "/" SPECIAL_SWAP_TARGET ".wants/", name, NULL);
-+                if (!lnk)
-+                        return log_oom();
-+
-+                mkdir_parents_label(lnk, 0755);
-+                if (symlink(unit, lnk) < 0) {
-+                        log_error("Failed to create symlink %s: %m", lnk);
-+                        return -errno;
-+                }
-+        }
-+
-         return 0;
- }
- 
--- 
-1.8.4
-
diff --git a/core/systemd/PKGBUILD b/core/systemd/PKGBUILD
index e5f054629..c828bc755 100644
--- a/core/systemd/PKGBUILD
+++ b/core/systemd/PKGBUILD
@@ -3,8 +3,8 @@
 
 pkgbase=systemd
 pkgname=('systemd' 'systemd-sysvcompat')
-pkgver=207
-pkgrel=5
+pkgver=208
+pkgrel=1
 arch=('i686' 'x86_64')
 url="http://www.freedesktop.org/wiki/Software/systemd"
 makedepends=('acl' 'cryptsetup' 'dbus-core' 'docbook-xsl' 'gobject-introspection' 'gperf'
@@ -15,30 +15,21 @@ source=("http://www.freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.xz"
         'initcpio-hook-udev'
         'initcpio-install-systemd'
         'initcpio-install-udev'
-        0001-polkit-Avoid-race-condition-in-scraping-proc.patch
-        0001-swap-fix-reverse-dependencies.patch
-        0002-swap-create-.wants-symlink-to-auto-swap-devices.patch)
-md5sums=('7799f3cc9d289b8db1c1fa56ae7ecd88'
+        '0001-fix-lingering-references-to-var-lib-backlight-random.patch')
+md5sums=('df64550d92afbffb4f67a434193ee165'
          '29245f7a240bfba66e2b1783b63b6b40'
          '8b68b0218a3897d4d37a6ccf47914774'
          'bde43090d4ac0ef048e3eaee8202a407'
-         '9eb0a46aa2a3a6d74117f9a174dbe168'
-         '182be4c729aaecde249b7b05b48a481f'
-         'b54fbe35e2689ac36cda9ac4a5a86f24')
+         '1b191c4e7a209d322675fd199e3abc66')
 
 prepare() {
   cd "$pkgname-$pkgver"
-
-  patch -Np1 <"$srcdir"/0001-swap-fix-reverse-dependencies.patch
-  patch -Np1 <"$srcdir"/0002-swap-create-.wants-symlink-to-auto-swap-devices.patch
-  patch -Np1 <"$srcdir"/0001-polkit-Avoid-race-condition-in-scraping-proc.patch
+  patch -Np1 -i ../0001-fix-lingering-references-to-var-lib-backlight-random.patch
 }
 
 build() {
   cd "$pkgname-$pkgver"
 
-  CFLAGS+=' -g'
-
   ./configure \
       --libexecdir=/usr/lib \
       --localstatedir=/var \
@@ -102,7 +93,7 @@ package_systemd() {
   rmdir "$pkgdir/etc/systemd/system/getty.target.wants"
 
   # get rid of RPM macros
-  rm -r "$pkgdir/usr/lib/rpm/macros.d"
+  rm -r "$pkgdir/usr/lib/rpm"
 
   # add back tmpfiles.d/legacy.conf
   install -m644 "systemd-$pkgver/tmpfiles.d/legacy.conf" "$pkgdir/usr/lib/tmpfiles.d"
@@ -117,6 +108,10 @@ package_systemd() {
   install -Dm644 "$srcdir/initcpio-install-udev" "$pkgdir/usr/lib/initcpio/install/udev"
   install -Dm644 "$srcdir/initcpio-hook-udev" "$pkgdir/usr/lib/initcpio/hooks/udev"
 
+  # ensure proper permissions for /var/log/journal
+  chown root:systemd-journal "$pkgdir/var/log/journal"
+  chmod 2755 "$pkgdir/var/log/journal"
+
   ### split out manpages for sysvcompat
   rm -rf "$srcdir/_sysvcompat"
   install -dm755 "$srcdir"/_sysvcompat/usr/share/man/man8/
diff --git a/core/systemd/systemd.install b/core/systemd/systemd.install
index 3b36f0c5d..f22536360 100644
--- a/core/systemd/systemd.install
+++ b/core/systemd/systemd.install
@@ -38,6 +38,19 @@ mask_net_naming() {
   fi
 }
 
+_208_changes() {
+  chown root:systemd-journal var/log/journal
+  chmod 2755 var/log/journal
+
+  if [ -e var/lib/backlight ] && [ ! -e var/lib/systemd/backlight ]; then
+    mv -T var/lib/backlight var/lib/systemd/backlight
+  fi
+
+  if [ -e var/lib/random-seed ] && [ ! -e var/lib/systemd/random-seed ]; then
+    mv -T var/lib/random-seed var/lib/systemd/random-seed
+  fi
+}
+
 post_install() {
   post_common
 
@@ -98,6 +111,10 @@ post_upgrade() {
     printf '    this hook, you must remove it from /etc/mkinitcpio.conf. A "systemd"\n'
     printf '    hook has been added which provides this functionality, and more.\n'
   fi
+
+  if [ "$(vercmp 208-1 "$2")" -eq 1 ]; then
+    _208_changes
+  fi
 }
 
 # vim:set ts=2 sw=2 et:
diff --git a/extra/gconf/PKGBUILD b/extra/gconf/PKGBUILD
index f26385c19..040c3978d 100644
--- a/extra/gconf/PKGBUILD
+++ b/extra/gconf/PKGBUILD
@@ -1,13 +1,13 @@
-# $Id: PKGBUILD 187058 2013-06-03 11:16:33Z allan $
+# $Id: PKGBUILD 195892 2013-10-03 19:08:22Z jgc $
 # Maintainer:  Jan de Groot <jan@archlinux.org>
 
 pkgname=gconf
 pkgver=3.2.6
-pkgrel=2
+pkgrel=3
 pkgdesc="A configuration database system"
 arch=(i686 x86_64)
 license=('LGPL')
-depends=('libxml2' 'polkit' 'libldap' 'dbus-glib' 'gtk3')
+depends=('libxml2' 'polkit' 'libldap' 'dbus-glib')
 makedepends=('intltool' 'gtk-doc' 'gobject-introspection')
 options=('!libtool')
 install=gconf.install
@@ -40,7 +40,7 @@ build() {
 
   ./configure --prefix=/usr --sysconfdir=/etc \
       --localstatedir=/var --libexecdir=/usr/lib/GConf \
-      --disable-static --enable-defaults-service --with-gtk=3.0 \
+      --disable-static --enable-defaults-service \
       --disable-orbit
 
   make pkglibdir=/usr/lib/GConf
diff --git a/extra/gconf/gconf.install b/extra/gconf/gconf.install
index f7945d165..a5ea777a5 100644
--- a/extra/gconf/gconf.install
+++ b/extra/gconf/gconf.install
@@ -9,10 +9,7 @@ post_upgrade() {
   chmod 755 etc/gconf/gconf.xml.system
   usr/bin/gio-querymodules usr/lib/gio/modules
 
-  PID=`pidof gconfd-2`
-  if [ ! -z "${PID}" ]; then
-    kill ${PID}
-  fi
+  pkill /usr/lib/GConf/gconfd-2 || return 0
 }
 
 post_remove() {
diff --git a/extra/pyqt5/PKGBUILD b/extra/pyqt5/PKGBUILD
new file mode 100644
index 000000000..fc6840cac
--- /dev/null
+++ b/extra/pyqt5/PKGBUILD
@@ -0,0 +1,105 @@
+# $Id: PKGBUILD 195876 2013-10-03 10:38:53Z andrea $
+# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+# Contributor: Yichao Yu <yyc1992@gmail.com>
+# Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
+# Contributor: riai <riai@bigfoot.com> Ben <ben@benmazer.net>
+
+pkgbase=pyqt5
+pkgname=pyqt5
+pkgname=('pyqt5-common' 'python-pyqt5' 'python2-pyqt5')
+pkgver=5.1
+pkgrel=1
+arch=('i686' 'x86_64')
+url="http://riverbankcomputing.co.uk/software/pyqt/intro"
+license=('GPL')
+makedepends=('python-sip' 'python2-sip' 'python-opengl' 'python2-opengl'
+             'python2-dbus' 'python-dbus' 'qt5-multimedia' 'qt5-tools'
+             'qt5-svg')
+source=("http://downloads.sourceforge.net/project/pyqt/PyQt5/PyQt-${pkgver}/PyQt-gpl-${pkgver}.tar.gz")
+md5sums=('056f6232bf9ea92baf86e812fd1669f8')
+
+build() {
+  cp -r PyQt-gpl-${pkgver} Py2Qt-gpl-${pkgver}
+
+  cd PyQt-gpl-${pkgver}
+  python3 configure.py \
+    --confirm-license \
+    -v /usr/share/sip/PyQt5 \
+    --qsci-api \
+    -q /usr/bin/qmake-qt5
+
+  # Thanks Gerardo for the rpath fix
+  find -name 'Makefile' | xargs sed -i 's|-Wl,-rpath,/usr/lib||g;s|-Wl,-rpath,.* ||g'
+
+  make
+
+  ### Python2 version ###
+  cd ../Py2Qt-gpl-${pkgver}
+  python2 configure.py \
+    --confirm-license \
+    -v /usr/share/sip/Py2-PyQt5 \
+    --qsci-api \
+    -q /usr/bin/qmake-qt5
+
+  # Thanks Gerardo for the rpath fix
+  find -name 'Makefile' | xargs sed -i 's|-Wl,-rpath,/usr/lib||g;s|-Wl,-rpath,.* ||g'
+
+  make
+}
+
+package_pyqt5-common(){
+  pkgdesc="Common PyQt files shared between python-pyqt5 and python2-pyqt5"
+  depends=('qt5-base')
+
+  cd PyQt-gpl-${pkgver}
+  make -C pyrcc DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install
+  make -C pylupdate DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install
+
+  install -Dm644 PyQt5.api "${pkgdir}"/usr/share/qt/qsci/api/python/PyQt5.api
+}
+
+package_python-pyqt5(){
+  pkgdesc="A set of Python 3.x bindings for the Qt5 toolkit"
+  depends=('python-sip' 'pyqt5-common' 'python' 'python')
+  optdepends=('python-opengl: enable OpenGL 3D graphics in PyQt applications'
+              'python-dbus: for python-dbus mainloop support'
+              'qt5-multimedia: QtMultimedia, QtMultimediaWidgets'
+              'qt5-tools: QtHelp, QtDesigner'
+              'qt5-svg: QtSvg'
+              'qt5-webkit: QtWebKit, QtWebKitWidgets'
+              'qt5-xmlpatterns: QtXmlPatterns'
+              'qt5-declarative: QtQml, qmlplugin')
+
+  cd PyQt-gpl-${pkgver}
+  # INSTALL_ROOT is needed for the QtDesigner module, the other Makefiles use DESTDIR
+  make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install
+
+  # Provided by pyqt-common
+  rm "${pkgdir}"/usr/bin/{pylupdate5,pyrcc5}
+  rm "${pkgdir}"/usr/share/qt/qsci/api/python/PyQt5.api
+}
+
+package_python2-pyqt5(){
+  pkgdesc="A set of Python 2.x bindings for the Qt5 toolkit"
+  depends=('python2-sip' 'pyqt5-common' 'python2')
+  optdepends=('python2-opengl: enable OpenGL 3D graphics in PyQt applications'
+              'python-dbus: for python-dbus mainloop support'
+              'qt5-multimedia: QtMultimedia, QtMultimediaWidgets'
+              'qt5-tools: QtHelp, QtDesigner'
+              'qt5-svg: QtSvg'
+              'qt5-webkit: QtWebKit, QtWebKitWidgets'
+              'qt5-xmlpatterns: QtXmlPatterns'
+              'qt5-declarative: QtQml, qmlplugin')
+
+  cd Py2Qt-gpl-${pkgver}
+  # INSTALL_ROOT is needed for the QtDesigner module, the other Makefiles use DESTDIR
+  make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install
+
+  # Fix conflicts with python-pyqt5
+  mv "${pkgdir}"/usr/bin/{,python2-}pyuic5
+
+  rm "${pkgdir}"/usr/bin/{pylupdate5,pyrcc5}
+  rm "${pkgdir}"/usr/lib/qt/plugins/designer/libpyqt5.so
+  rm "${pkgdir}"/usr/lib/qt/plugins/PyQt5/libpyqt5qmlplugin.so
+  rm "${pkgdir}"/usr/share/qt/qsci/api/python/PyQt5.api
+}
diff --git a/extra/rtkit/0001-SECURITY-Pass-uid-of-caller-to-polkit.patch b/extra/rtkit/0001-SECURITY-Pass-uid-of-caller-to-polkit.patch
new file mode 100644
index 000000000..92e54b950
--- /dev/null
+++ b/extra/rtkit/0001-SECURITY-Pass-uid-of-caller-to-polkit.patch
@@ -0,0 +1,48 @@
+From f44c5776b25ca2abd7569fb8532c6aede9b0c6b0 Mon Sep 17 00:00:00 2001
+From: Colin Walters <walters@verbum.org>
+Date: Thu, 22 Aug 2013 16:05:22 -0400
+Subject: [PATCH] [SECURITY] Pass uid of caller to polkit
+
+Otherwise, we force polkit to look up the uid itself in /proc, which
+is racy if they execve() a setuid binary.
+---
+ rtkit-daemon.c |   11 ++++++++++-
+ 1 files changed, 10 insertions(+), 1 deletions(-)
+
+diff --git a/rtkit-daemon.c b/rtkit-daemon.c
+index 2ebe673..3ecc1f7 100644
+--- a/rtkit-daemon.c
++++ b/rtkit-daemon.c
+@@ -1170,12 +1170,14 @@ static int verify_polkit(DBusConnection *c, struct rtkit_user *u, struct process
+         DBusMessage *m = NULL, *r = NULL;
+         const char *unix_process = "unix-process";
+         const char *pid = "pid";
++        const char *uid = "uid";
+         const char *start_time = "start-time";
+         const char *cancel_id = "";
+         uint32_t flags = 0;
+         uint32_t pid_u32 = p->pid;
+-        uint64_t start_time_u64 = p->starttime;
++        uint32_t uid_u32 = (uint32_t)u->uid;
+         DBusMessageIter iter_msg, iter_struct, iter_array, iter_dict, iter_variant;
++        uint64_t start_time_u64 = p->starttime;
+         int ret;
+         dbus_bool_t authorized = FALSE;
+ 
+@@ -1206,6 +1208,13 @@ static int verify_polkit(DBusConnection *c, struct rtkit_user *u, struct process
+         assert_se(dbus_message_iter_close_container(&iter_dict, &iter_variant));
+         assert_se(dbus_message_iter_close_container(&iter_array, &iter_dict));
+ 
++        assert_se(dbus_message_iter_open_container(&iter_array, DBUS_TYPE_DICT_ENTRY, NULL, &iter_dict));
++        assert_se(dbus_message_iter_append_basic(&iter_dict, DBUS_TYPE_STRING, &uid));
++        assert_se(dbus_message_iter_open_container(&iter_dict, DBUS_TYPE_VARIANT, "u", &iter_variant));
++        assert_se(dbus_message_iter_append_basic(&iter_variant, DBUS_TYPE_UINT32, &uid_u32));
++        assert_se(dbus_message_iter_close_container(&iter_dict, &iter_variant));
++        assert_se(dbus_message_iter_close_container(&iter_array, &iter_dict));
++
+         assert_se(dbus_message_iter_close_container(&iter_struct, &iter_array));
+         assert_se(dbus_message_iter_close_container(&iter_msg, &iter_struct));
+ 
+-- 
+1.7.1
+
diff --git a/extra/rtkit/PKGBUILD b/extra/rtkit/PKGBUILD
index d79889c7e..13b4ee2df 100644
--- a/extra/rtkit/PKGBUILD
+++ b/extra/rtkit/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 194685 2013-09-22 00:26:14Z dreisner $
+# $Id: PKGBUILD 195870 2013-10-02 22:42:11Z heftig $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Corrado Primier <bardo@aur.archlinux.org>
 
 pkgname=rtkit
 pkgver=0.11
-pkgrel=3
+pkgrel=4
 pkgdesc="Realtime Policy and Watchdog Daemon"
 arch=(i686 x86_64)
 url="http://git.0pointer.de/?p=rtkit.git"
@@ -12,15 +12,18 @@ license=(GPL 'custom:BSD')
 depends=(dbus polkit systemd)
 install=rtkit.install
 source=(http://0pointer.de/public/$pkgname-$pkgver.tar.xz
-        libsystemd.patch systemd205.patch)
+        libsystemd.patch systemd205.patch
+        0001-SECURITY-Pass-uid-of-caller-to-polkit.patch)
 md5sums=('a96c33b9827de66033d2311f82d79a5d'
          '35089c0a284005f4abcf45168415857e'
-         '95195a70551057aca833da6bdbf2e35b')
+         '95195a70551057aca833da6bdbf2e35b'
+         '70df212cba2a6366ff960b60d55858d3')
 
 prepare() {
   cd $pkgname-$pkgver
   patch -Np1 -i ../libsystemd.patch
   patch -Np1 -i ../systemd205.patch
+  patch -Np1 -i ../0001-SECURITY-Pass-uid-of-caller-to-polkit.patch
   autoreconf -fi
 }