Sat Oct 6 00:25:32 PDT 2012

6 files changed, 37 insertions, 57 deletions

diff --git a/core/btrfs-progs/PKGBUILD b/core/btrfs-progs/PKGBUILD
index 2c5b6f907..5e690e728 100644
--- a/core/btrfs-progs/PKGBUILD
+++ b/core/btrfs-progs/PKGBUILD
@@ -1,9 +1,10 @@
-# $Id: PKGBUILD 164224 2012-07-27 20:04:40Z dreisner $
+# $Id: PKGBUILD 168061 2012-10-05 15:07:13Z tomegun $
 # Maintainer: Tom Gundersen <teg@jklm.no>
 # Contributor: Tobias Powalowski <tpowa@archlinux.org>
+
 pkgname=btrfs-progs
-pkgver=0.19.20120328
-pkgrel=4
+pkgver=0.19.20120904
+pkgrel=7
 pkgdesc="btrfs filesystem utilities"
 arch=(i686 x86_64)
 depends=('glibc' 'e2fsprogs')
@@ -13,17 +14,22 @@ 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)
-md5sums=('f4504e73cf9254779b78d5b2318ac570'
-         '345c62c8b267082361729ca5b647518f'
-         'e5186ec3fe8a809b7473470128d1c4ab'
-         '9fb35142755b477a96cb7292f3d64839')
+	initcpio-install-btrfs
+	initcpio-hook-btrfs
+	70-btrfs.rules)
+#install=btrfs-progs.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"
+   install -Dm644 "$srcdir/70-btrfs.rules" \
+     "$pkgdir/usr/lib/udev/rules.d/70-btrfs.rules"
 }
 
 package() {
@@ -34,13 +40,8 @@ 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'
+         'e5186ec3fe8a809b7473470128d1c4ab'
+         '9fb35142755b477a96cb7292f3d64839'
+         '345c62c8b267082361729ca5b647518f')
diff --git a/core/btrfs-progs/btrfs-progs.install b/core/btrfs-progs/btrfs-progs.install
new file mode 100644
index 000000000..077d7529a
--- /dev/null
+++ b/core/btrfs-progs/btrfs-progs.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/core/systemd/PKGBUILD b/core/systemd/PKGBUILD
index 8dc086a4a..f895939ef 100644
--- a/core/systemd/PKGBUILD
+++ b/core/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/core/systemd/initcpio-install-udev b/core/systemd/initcpio-install-udev
index 762429983..15124b8f7 100644
--- a/core/systemd/initcpio-install-udev
+++ b/core/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/core/util-linux/PKGBUILD b/core/util-linux/PKGBUILD
index ae7784fe6..deba92866 100644
--- a/core/util-linux/PKGBUILD
+++ b/core/util-linux/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 166963 2012-09-23 12:22:32Z tomegun $
+# $Id: PKGBUILD 168016 2012-10-05 10:13:37Z 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/core/util-linux/util-linux.install b/core/util-linux/util-linux.install
index 35f80e2a2..969a4aecf 100644
--- a/core/util-linux/util-linux.install
+++ b/core/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
-}