Thu Oct 4 01:23:34 PDT 2012

17 files changed, 154 insertions, 143 deletions

diff --git a/testing/btrfs-progs/PKGBUILD b/testing/btrfs-progs/PKGBUILD
index f40858d29..045e5e038 100644
--- a/testing/btrfs-progs/PKGBUILD
+++ b/testing/btrfs-progs/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 166671 2012-09-15 09:38:19Z tomegun $
+# $Id: PKGBUILD 167942 2012-10-03 23:03:54Z tomegun $
 # Maintainer: Tom Gundersen <teg@jklm.no>
 # Contributor: Tobias Powalowski <tpowa@archlinux.org>
 
 pkgname=btrfs-progs
 pkgver=0.19.20120904
-pkgrel=4
+pkgrel=6
 pkgdesc="btrfs filesystem utilities"
 arch=(i686 x86_64)
 depends=('glibc' 'e2fsprogs')
@@ -14,13 +14,19 @@ conflicts=('btrfs-progs-unstable')
 provides=('btrfs-progs-unstable')
 license=('GPL2')
 source=(ftp://ftp.archlinux.org/other/$pkgname/$pkgname-$pkgver.tar.xz
-        70-btrfs.rules
-        initcpio-install-btrfs
-        initcpio-hook-btrfs)
+	initcpio-install-btrfs
+	initcpio-hook-btrfs)
+install=btrfs.install
 
 build() {
    cd $srcdir/$pkgname-$pkgver
    make CFLAGS="$CFLAGS"
+
+   # install mkinitcpio hooks
+   install -Dm644 "$srcdir/initcpio-install-btrfs" \
+     "$pkgdir/usr/lib/initcpio/install/btrfs"
+   install -Dm644 "$srcdir/initcpio-hook-btrfs" \
+     "$pkgdir/usr/lib/initcpio/hooks/btrfs"
 }
 
 package() {
@@ -31,17 +37,7 @@ package() {
    mv $pkgdir/usr/man $pkgdir/usr/share/man
    mkdir -p ${pkgdir}/sbin
    ln -sf /usr/bin/btrfs ${pkgdir}/sbin/btrfs
-
-   # add udev rule
-   install -Dm644 "$srcdir/70-btrfs.rules" "$pkgdir/usr/lib/udev/rules.d/70-btrfs.rules"
-
-   # install mkinitcpio hooks
-   install -Dm644 "$srcdir/initcpio-install-btrfs" \
-     "$pkgdir/usr/lib/initcpio/install/btrfs"
-   install -Dm644 "$srcdir/initcpio-hook-btrfs" \
-     "$pkgdir/usr/lib/initcpio/hooks/btrfs"
 }
 md5sums=('d9c96e670fac7c2098a9e7ef98d4b2e2'
-         '345c62c8b267082361729ca5b647518f'
-         'e5186ec3fe8a809b7473470128d1c4ab'
+         '2d3df276f80bb09813f56a56d6f93ddd'
          '9fb35142755b477a96cb7292f3d64839')
diff --git a/testing/btrfs-progs/btrfs.install b/testing/btrfs-progs/btrfs.install
new file mode 100644
index 000000000..077d7529a
--- /dev/null
+++ b/testing/btrfs-progs/btrfs.install
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+post_upgrade() {
+  if [ "$(vercmp 0.19.20120904-6 "$2")" -eq 1 ]; then
+    echo "btrfs multi-device support now relies on linux 3.6 or later"
+  fi
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/testing/btrfs-progs/initcpio-install-btrfs b/testing/btrfs-progs/initcpio-install-btrfs
index aad263378..fb64f12e2 100644
--- a/testing/btrfs-progs/initcpio-install-btrfs
+++ b/testing/btrfs-progs/initcpio-install-btrfs
@@ -4,13 +4,11 @@ build() {
     add_module btrfs
     add_binary btrfs
     add_runscript
-
-    add_file /usr/lib/udev/rules.d/70-btrfs.rules
 }
 
 help() {
     cat <<HELPEOF
-This hook provides support for multi-device btrfs volumes.
+This hook provides support for multi-device btrfs volumes, in the absence of udev.
 HELPEOF
 }
 
diff --git a/testing/ghc/PKGBUILD b/testing/ghc/PKGBUILD
index d433daf32..edd527ba7 100644
--- a/testing/ghc/PKGBUILD
+++ b/testing/ghc/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 161441 2012-06-11 17:22:19Z tdziedzic $
+# $Id: PKGBUILD 167880 2012-10-03 15:19:04Z tdziedzic $
 # Maintainer: Thomas Dziedzic <gostrc@gmail.com>
 # Maintainer: Vesa Kaihlavirta <vesa@archlinux.org>
 # Special note for devs looking to upgrade this package:
@@ -7,7 +7,7 @@
 #   This implies that all libraries need to be rebuilt when ghc is rebuilt.
 
 pkgname=ghc
-pkgver=7.4.2
+pkgver=7.6.1
 pkgrel=1
 pkgdesc='The Glasgow Haskell Compiler'
 arch=('i686' 'x86_64')
@@ -19,74 +19,64 @@ makedepends=('ghc' 'perl' 'libxslt' 'docbook-xsl')
 checkdepends=('python2')
 install='ghc.install'
 # keep this otherwise a lot of tests will show as unexpected failures... need to investigate why using -jn for n > 1 does this...
-options=('!makeflags')
+#options=('!makeflags')
 # missing rtl?
-provides=('haskell-array=0.4.0.0'
-          'haskell-base=4.5.1.0'
-          'haskell-binary=0.5.1.0'
+provides=('haskell-array=0.4.0.1'
+          'haskell-base=4.6.0.0'
+          'haskell-binary=0.5.1.1'
           'haskell-bin-package-db=0.0.0.0'
-          'haskell-bytestring=0.9.2.1'
-          'haskell-containers=0.4.2.1'
-          'haskell-deepseq=1.3.0.0'
-          'haskell-directory=1.1.0.2'
-          'haskell-extensible-exceptions=0.1.1.4'
-          'haskell-filepath=1.3.0.0'
-          'haskell-ghc-prim=0.2.0.0'
-          'haskell-haskell2010=1.1.0.1'
-          'haskell-haskell98=2.0.0.1'
-          'haskell-hoopl=3.8.7.3'
-          'haskell-hpc=0.5.1.1'
-          'haskell-integer-gmp=0.4.0.0'
-          'haskell-old-locale=1.0.0.4'
-          'haskell-old-time=1.1.0.0'
+          'haskell-bytestring=0.10.0.0'
+          'haskell-containers=0.5.0.0'
+          'haskell-deepseq=1.3.0.1'
+          'haskell-directory=1.2.0.0'
+          'haskell-filepath=1.3.0.1'
+          'haskell-ghc-prim=0.3.0.0'
+          'haskell-haskell2010=1.1.1.0'
+          'haskell-haskell98=2.0.0.2'
+          'haskell-hoopl=3.9.0.0'
+          'haskell-hpc=0.6.0.0'
+          'haskell-integer-gmp=0.5.0.0'
+          'haskell-old-locale=1.0.0.5'
+          'haskell-old-time=1.1.0.1'
           'haskell-pretty=1.1.1.0'
-          'haskell-process=1.1.0.1'
-          'haskell-template-haskell=2.7.0.0'
-          'haskell-time=1.4'
-          'haskell-unix=2.5.1.1'
-          'haskell-cabal=1.14.0'
-         )
-replaces=('haskell-array<0.4.0.0'
-          'haskell-base<4.5.1.0'
-          'haskell-binary<0.5.1.0'
+          'haskell-process=1.1.0.2'
+          'haskell-template-haskell=2.8.0.0'
+          'haskell-time=1.4.0.1'
+          'haskell-unix=2.6.0.0'
+          'haskell-cabal=1.16.0')
+replaces=('haskell-array<0.4.0.1'
+          'haskell-base<4.6.0.0'
+          'haskell-binary<0.5.1.1'
           'haskell-bin-package-db<0.0.0.0'
-          'haskell-bytestring<0.9.2.1'
-          'haskell-containers<0.4.2.1'
-          'haskell-deepseq<1.3.0.0'
-          'haskell-directory<1.1.0.2'
-          'haskell-extensible-exceptions<0.1.1.4'
-          'haskell-filepath<1.3.0.0'
-          'haskell-ghc-prim<0.2.0.0'
-          'haskell-haskell2010<1.1.0.1'
-          'haskell-haskell98<2.0.0.1'
-          'haskell-hoopl<3.8.7.3'
-          'haskell-hpc<0.5.1.1'
-          'haskell-integer-gmp<0.4.0.0'
-          'haskell-old-locale<1.0.0.4'
-          'haskell-old-time<1.1.0.0'
+          'haskell-bytestring<0.10.0.0'
+          'haskell-containers<0.5.0.0'
+          'haskell-deepseq<1.3.0.1'
+          'haskell-directory<1.2.0.0'
+          'haskell-filepath<1.3.0.1'
+          'haskell-ghc-prim<0.3.0.0'
+          'haskell-haskell2010<1.1.1.0'
+          'haskell-haskell98<2.0.0.2'
+          'haskell-hoopl<3.9.0.0'
+          'haskell-hpc<0.6.0.0'
+          'haskell-integer-gmp<0.5.0.0'
+          'haskell-old-locale<1.0.0.5'
+          'haskell-old-time<1.1.0.1'
           'haskell-pretty<1.1.1.0'
-          'haskell-process<1.1.0.1'
-          'haskell-template-haskell<2.7.0.0'
-          'haskell-time<1.4'
-          'haskell-unix<2.5.1.1'
-          'haskell-cabal<1.14.0'
-         )
+          'haskell-process<1.1.0.2'
+          'haskell-template-haskell<2.8.0.0'
+          'haskell-time<1.4.0.1'
+          'haskell-unix<2.6.0.0'
+          'haskell-cabal<1.16.0')
 source=("http://www.haskell.org/ghc/dist/${pkgver}/ghc-${pkgver}-src.tar.bz2"
         "http://www.haskell.org/ghc/dist/${pkgver}/ghc-${pkgver}-testsuite.tar.bz2"
-        'build.mk'
-        'silence-gen_contents_index.diff')
-md5sums=('267462db5c5a7c245fb26361b77007c4'
-         '528005749c761fe6c12a0079bd84fb90'
-         '88ad4108c26f56fc38466d82aaf9a295'
-         '2ac480d025b706fc47acc58c54b246bb')
+        'build.mk')
+md5sums=('e9d892d2970550ec5e70130b3621f6b6'
+         '0d93c458e3b445a7e524ef6ae459ce11'
+         'c367ef26300648ee9b8aca3dee5c9669')
 
 build() {
   cd ghc-${pkgver}
 
-  # Silence gen_contents_index for the common case.
-  # http://hackage.haskell.org/trac/ghc/ticket/5992
-  patch -Np1 -i ${srcdir}/silence-gen_contents_index.diff
-
   cp ${srcdir}/build.mk mk/build.mk
 
   ./configure \
@@ -96,16 +86,35 @@ build() {
 }
 
 check() {
+  # keep this otherwise a lot of tests will show as unexpected failures... need to investigate why using -jn for n > 1 does this...
+  unset MAKEFLAGS
+
   cd ghc-${pkgver}
 
   # python2 rename
   sed -e 's/PYTHON = python/&2/' -i testsuite/mk/boilerplate.mk
   sed -e 's_#!/usr/bin/env python_&2_' -i testsuite/timeout/calibrate testsuite/timeout/timeout.py
 
-  # note: there is one test failure on i686 only: http://hackage.haskell.org/trac/ghc/ticket/5856
-  #make THREADS=9 test
+  # upstream known failures on both i686 and x86_64:
+  #    ghci.debugger/scripts     break011 [bad stderr] (ghci)
+  #    perf/compiler             parsing001 [stat not good enough] (normal)
+  #    simplCore/should_compile  spec-inline [stderr mismatch] (optasm)
+  # upstream known failures on i686 only:
+  #    numrun012 test fails on i686 works on x86_64 - http://hackage.haskell.org/trac/ghc/ticket/5856
   make test
-  # might be some failures
+
+  # enabling threads to speed up
+  # causes more failures than make test, need to investigate
+  # upstream known failures on both i686 and x86_64:
+  #    perf/compiler             parsing001 [stat not good enough] (normal)
+  #    simplCore/should_compile  spec-inline [stderr mismatch] (optasm)
+  # upstream known failures on i686 only:
+  #    numrun012 test fails on i686 works on x86_64 - http://hackage.haskell.org/trac/ghc/ticket/5856
+  #make THREADS=9 test
+
+  # will most likely cause lots of failures
+  # enable this when upstream has 0 test failures from a simple 'make test'
+  # zero unexpected failures on all tier 1 platforms - http://hackage.haskell.org/trac/ghc/ticket/5757
   #make fulltest
 }
 
diff --git a/testing/ghc/build.mk b/testing/ghc/build.mk
index 73645a957..bb57594bf 100644
--- a/testing/ghc/build.mk
+++ b/testing/ghc/build.mk
@@ -10,6 +10,9 @@
 # Full build with max optimisation and everything enabled (very slow build)
 BuildFlavour = perf
 
+# As above but build GHC using the LLVM backend
+#BuildFlavour = perf-llvm
+
 # Fast build with optimised libraries, no profiling (RECOMMENDED):
 #BuildFlavour = quick
 
@@ -51,6 +54,23 @@ endif
 
 endif
 
+# ---------------- Perf build using LLVM -------------------------------------
+
+ifeq "$(BuildFlavour)" "perf-llvm"
+
+SRC_HC_OPTS     = -O -H64m -fllvm
+GhcStage1HcOpts = -O -fllvm
+GhcStage2HcOpts = -O2 -fllvm
+GhcHcOpts       = -Rghc-timing
+GhcLibHcOpts    = -O2
+GhcLibWays     += p
+
+ifeq "$(PlatformSupportsSharedLibs)" "YES"
+GhcLibWays += dyn
+endif
+
+endif
+
 # -------- A Fast build ------------------------------------------------------
 
 ifeq "$(BuildFlavour)" "quickest"
@@ -151,10 +171,14 @@ endif
 
 ifeq "$(BuildFlavour)" "unreg"
 
+# Note that the LLVM backend works in unregisterised mode as well as
+# registerised mode. This often makes it a good choice for porting
+# GHC.
+
 GhcUnregisterised    = YES
 GhcWithNativeCodeGen = NO
 
-SRC_HC_OPTS          = -O -H64m
+SRC_HC_OPTS          = -O -H64m # -fllvm
 GhcStage1HcOpts      = -O
 GhcStage2HcOpts      = -O2
 GhcHcOpts            = -Rghc-timing
@@ -173,3 +197,4 @@ endif
 # NoFib settings
 NoFibWays =
 STRIP_CMD = :
+
diff --git a/testing/haskell-http/PKGBUILD b/testing/haskell-http/PKGBUILD
index fda58f3c9..5eb7da013 100644
--- a/testing/haskell-http/PKGBUILD
+++ b/testing/haskell-http/PKGBUILD
@@ -5,16 +5,16 @@
 
 _hkgname=HTTP
 pkgname=haskell-http
-pkgver=4000.2.3
+pkgver=4000.2.4
 pkgrel=1
 pkgdesc="A library for client-side HTTP"
 url="http://hackage.haskell.org/package/${_hkgname}"
 license=('custom:BSD3')
 arch=('i686' 'x86_64')
-depends=('ghc=7.4.2-1' 'sh' 'haskell-network=2.3.0.14-1' 'haskell-parsec=3.1.2-2' 'haskell-mtl=2.1.1-1')
+depends=('ghc=7.6.1-1' 'sh' 'haskell-network=2.3.1.0-1' 'haskell-parsec=3.1.3-1' 'haskell-mtl=2.1.2-1')
 source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
 install=${pkgname}.install
-md5sums=('872a1e49c3701c61c354f76716d4e3e7')
+md5sums=('5edcd9fd16a9cb72a140a29442d514b7')
 
 build() {
     cd ${srcdir}/${_hkgname}-${pkgver}
diff --git a/testing/haskell-mtl/PKGBUILD b/testing/haskell-mtl/PKGBUILD
index 4b2f73533..f1fa7c286 100644
--- a/testing/haskell-mtl/PKGBUILD
+++ b/testing/haskell-mtl/PKGBUILD
@@ -4,16 +4,16 @@
 
 _hkgname=mtl
 pkgname=haskell-mtl
-pkgver=2.1.1
+pkgver=2.1.2
 pkgrel=1
 pkgdesc="Monad transformer library"
 url="http://hackage.haskell.org/package/${_hkgname}"
 license=('custom:BSD3')
 arch=('i686' 'x86_64')
-depends=('ghc=7.4.2-1' 'sh' 'haskell-transformers=0.3.0.0-1')
+depends=('ghc=7.6.1-1' 'sh' 'haskell-transformers=0.3.0.0-2')
 source=(http://hackage.haskell.org/packages/archive/${_hkgname}/$pkgver/${_hkgname}-$pkgver.tar.gz)
 install=${pkgname}.install
-md5sums=('0654be687f1492a2ff30cf6f3fb7eed0')
+md5sums=('943c110524d96126bfa0e61f7df1ebcd')
 
 build() {
     cd ${srcdir}/${_hkgname}-${pkgver}
diff --git a/testing/haskell-network/PKGBUILD b/testing/haskell-network/PKGBUILD
index f3a3cc022..7f5d13fc1 100644
--- a/testing/haskell-network/PKGBUILD
+++ b/testing/haskell-network/PKGBUILD
@@ -5,16 +5,16 @@
 
 _hkgname=network
 pkgname=haskell-network
-pkgver=2.3.0.14
+pkgver=2.3.1.0
 pkgrel=1
 pkgdesc="Networking-related facilities"
 url="http://hackage.haskell.org/package/network"
 license=('custom:BSD3')
 arch=('i686' 'x86_64')
-depends=('ghc=7.4.2-1' 'sh' 'haskell-parsec=3.1.2-2')
+depends=('ghc=7.6.1-1' 'sh' 'haskell-parsec=3.1.3-1')
 source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
 install=${pkgname}.install
-md5sums=('1e45cc731647acff8b9c33bda085bf2a')
+md5sums=('d824db8fc068cab60fa178ab330a57a2')
 
 build() {
     cd ${srcdir}/${_hkgname}-${pkgver}
diff --git a/testing/haskell-parsec/PKGBUILD b/testing/haskell-parsec/PKGBUILD
index 2ab24a745..9c7c1aafb 100644
--- a/testing/haskell-parsec/PKGBUILD
+++ b/testing/haskell-parsec/PKGBUILD
@@ -5,16 +5,16 @@
 
 _hkgname=parsec
 pkgname=haskell-parsec
-pkgver=3.1.2
-pkgrel=2
+pkgver=3.1.3
+pkgrel=1
 pkgdesc="Monadic parser combinators"
 url="http://hackage.haskell.org/package/${_hkgname}"
 license=('custom:BSD3')
 arch=('i686' 'x86_64')
-depends=('ghc=7.4.2-1' 'sh' 'haskell-mtl=2.1.1-1' 'haskell-text=0.11.2.1-1')
+depends=('ghc=7.6.1-1' 'sh' 'haskell-mtl=2.1.2-1' 'haskell-text=0.11.2.3-1')
 source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
 install=${pkgname}.install
-md5sums=('c2a75dfd247ae4839e2602b62dc87487')
+md5sums=('d72fc94b81153132c61125a1ec52a4a5')
 
 build() {
     cd ${srcdir}/${_hkgname}-${pkgver}
diff --git a/testing/haskell-random/PKGBUILD b/testing/haskell-random/PKGBUILD
index 56b110289..07cc5e2c2 100644
--- a/testing/haskell-random/PKGBUILD
+++ b/testing/haskell-random/PKGBUILD
@@ -3,12 +3,12 @@
 _hkgname=random
 pkgname=haskell-random
 pkgver=1.0.1.1
-pkgrel=2
+pkgrel=3
 pkgdesc="A basic random number generation library"
 url="http://hackage.haskell.org/package/${_hkgname}"
 license=('custom:BSD3')
 arch=('i686' 'x86_64')
-depends=('ghc=7.4.2-1' 'sh')
+depends=('ghc=7.6.1-1' 'sh')
 source=("http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz")
 install=${pkgname}.install
 md5sums=('9a249cfa7ff6793cbf2be06e9fcd7538')
diff --git a/testing/haskell-text/PKGBUILD b/testing/haskell-text/PKGBUILD
index 31811e339..5a23030d5 100644
--- a/testing/haskell-text/PKGBUILD
+++ b/testing/haskell-text/PKGBUILD
@@ -4,16 +4,16 @@
 
 _hkgname=text
 pkgname=haskell-text
-pkgver=0.11.2.1
+pkgver=0.11.2.3
 pkgrel=1
 pkgdesc="An efficient packed Unicode text type."
 url="http://hackage.haskell.org/package/${_hkgname}"
 license=('custom:BSD3')
 arch=('i686' 'x86_64')
-depends=('ghc=7.4.2-1' 'sh')
+depends=('ghc=7.6.1-1' 'sh')
 source=("http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz")
 install=${pkgname}.install
-md5sums=('77245df79d10ed5f896a9d3f5b17ee74')
+md5sums=('7a469d49a7576fb3a18785cb64d4ee6c')
 
 build() {
     cd ${srcdir}/${_hkgname}-${pkgver}
diff --git a/testing/haskell-transformers/PKGBUILD b/testing/haskell-transformers/PKGBUILD
index c398b1590..c946fe40a 100644
--- a/testing/haskell-transformers/PKGBUILD
+++ b/testing/haskell-transformers/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 161448 2012-06-11 17:22:54Z tdziedzic $
+# $Id: PKGBUILD 167887 2012-10-03 15:19:41Z tdziedzic $
 
 # Maintainer: Thomas Dziedzic <gostrc@gmail.com>
 # Contributor: Rémy Oudompheng <remy@archlinux.org>
@@ -6,12 +6,12 @@
 _hkgname=transformers
 pkgname=haskell-transformers
 pkgver=0.3.0.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Concrete functor and monad transformers"
 url="http://hackage.haskell.org/package/${_hkgname}"
 license=('custom:BSD3')
 arch=('i686' 'x86_64')
-depends=('ghc=7.4.2-1' 'sh')
+depends=('ghc=7.6.1-1' 'sh')
 source=("http://hackage.haskell.org/packages/archive/${_hkgname}/$pkgver/${_hkgname}-$pkgver.tar.gz")
 install=${pkgname}.install
 md5sums=('852dc0b79cc2bcb39136287d3dd385e5')
diff --git a/testing/haskell-zlib/PKGBUILD b/testing/haskell-zlib/PKGBUILD
index 11767ab97..30834b3c1 100644
--- a/testing/haskell-zlib/PKGBUILD
+++ b/testing/haskell-zlib/PKGBUILD
@@ -6,18 +6,22 @@
 _hkgname=zlib
 pkgname=haskell-zlib
 pkgver=0.5.3.3
-pkgrel=4
+pkgrel=5
 pkgdesc="Compression and decompression in the gzip and zlib formats"
 url="http://hackage.haskell.org/package/zlib"
 license=('custom:BSD3')
 arch=('i686' 'x86_64')
-depends=('ghc=7.4.2-1' 'zlib' 'sh')
+depends=('ghc=7.6.1-1' 'zlib' 'sh')
 source=("http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz")
 install=${pkgname}.install
 md5sums=('1649e56d13ce2c6a6a9210227401dbbc')
 
 build() {
     cd ${srcdir}/${_hkgname}-${pkgver}
+
+    # ghc 7.6 includes bytestring 0.10
+    sed 's/bytestring == 0.9.*/bytestring == 0.10.*/' -i zlib.cabal
+
     runhaskell Setup configure -O -p --enable-split-objs --enable-shared \
       --prefix=/usr --docdir=/usr/share/doc/${pkgname} \
       --libsubdir=\$compiler/site-local/\$pkgid
diff --git a/testing/systemd/PKGBUILD b/testing/systemd/PKGBUILD
index 8dc086a4a..f895939ef 100644
--- a/testing/systemd/PKGBUILD
+++ b/testing/systemd/PKGBUILD
@@ -3,29 +3,26 @@
 
 pkgbase=systemd
 pkgname=('systemd' 'systemd-sysvcompat')
-pkgver=193
+pkgver=194
 pkgrel=1
 arch=('i686' 'x86_64')
 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' 'quota-tools' 'xz')
-checkdepends=('python')
+             'pam' 'python' 'quota-tools' 'xz')
 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=('732a9de2b1d2a15cab639c987ff9e90e'
+md5sums=('0ebb73aea444693b9b86f7a76f5df23c'
          'e99e9189aa2f6084ac28b8ddf605aeb8'
-         '59e91c4d7a69b7bf12c86a9982e37ced'
+         'fb37e34ea006c79be1c54cbb0f803414'
          'df69615503ad293c9ddf9d8b7755282d'
          '5543be25f205f853a21fa5ee68e03f0d'
-         '1f435290db227c3a4f4396f86819227e'
          'fd5b5f04ab0a847373d357555129d4c0')
 
 build() {
@@ -37,9 +34,6 @@ 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 \
@@ -141,14 +135,9 @@ package_systemd() {
 
 package_systemd-sysvcompat() {
   pkgdesc="sysvinit compat for systemd"
-  conflicts=('sysvinit' 'initscripts')
+  conflicts=('sysvinit')
   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/testing/systemd/initcpio-install-udev b/testing/systemd/initcpio-install-udev
index 762429983..15124b8f7 100644
--- a/testing/systemd/initcpio-install-udev
+++ b/testing/systemd/initcpio-install-udev
@@ -7,7 +7,7 @@ build() {
     add_binary /usr/lib/systemd/systemd-udevd /usr/bin/udevd
     add_binary /usr/bin/udevadm
 
-    for rules in 50-udev-default.rules 60-persistent-storage.rules 80-drivers.rules; do
+    for rules in 50-udev-default.rules 60-persistent-storage.rules 64-btrfs.rules 80-drivers.rules; do
         add_file "/usr/lib/udev/rules.d/$rules"
     done
     for tool in ata_id scsi_id; do
diff --git a/testing/util-linux/PKGBUILD b/testing/util-linux/PKGBUILD
index e9316da7f..45c057a63 100644
--- a/testing/util-linux/PKGBUILD
+++ b/testing/util-linux/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 166886 2012-09-20 22:22:35Z tomegun $
+# $Id: PKGBUILD 167927 2012-10-03 20:37:22Z tomegun $
 # Maintainer: Tom Gundersen <teg@jklm.no>
 # Contributor: judd <jvinet@zeroflux.org>
 
 pkgname=util-linux
 pkgver=2.22
-pkgrel=6
+pkgrel=7
 pkgdesc="Miscellaneous system utilities for Linux"
 url="http://www.kernel.org/pub/linux/utils/util-linux/"
 arch=('i686' 'x86_64')
diff --git a/testing/util-linux/util-linux.install b/testing/util-linux/util-linux.install
index 35f80e2a2..969a4aecf 100644
--- a/testing/util-linux/util-linux.install
+++ b/testing/util-linux/util-linux.install
@@ -1,13 +1,4 @@
 post_install() {
-  # create user for uuidd
-  if ! getent group uuidd >/dev/null; then
-    groupadd -r uuidd
-  fi
-
-  if ! getent passwd uuidd >/dev/null; then
-    useradd -r -s /sbin/nologin -d / -g uuidd uuidd
-  fi
-
   # we don't want use systemd-tmpfiles here because
   # the package dependency would create a circular dep.
   if [ ! -d run/uuidd ]; then
@@ -27,13 +18,3 @@ post_upgrade() {
 
   post_install
 }
-
-post_remove() {
-  if getent passwd uuidd >/dev/null; then
-    userdel uuidd
-  fi
-
-  if getent group uuidd >/dev/null; then
-    userdel uuidd
-  fi
-}