From b82f11fd76e83d60504649838e60a235b394160f Mon Sep 17 00:00:00 2001
From: root <root@rshg054.dnsready.net>
Date: Tue, 30 Aug 2011 23:14:43 +0000
Subject: Tue Aug 30 23:14:43 UTC 2011

---
 testing/util-linux/PKGBUILD | 33 +++++++++++++++++----------------
 1 file changed, 17 insertions(+), 16 deletions(-)

(limited to 'testing/util-linux')

diff --git a/testing/util-linux/PKGBUILD b/testing/util-linux/PKGBUILD
index 4a6a3e29f..c01f9882b 100644
--- a/testing/util-linux/PKGBUILD
+++ b/testing/util-linux/PKGBUILD
@@ -1,42 +1,43 @@
-# $Id: PKGBUILD 135567 2011-08-15 22:49:41Z tomegun $
+# $Id: PKGBUILD 136465 2011-08-29 20:31:00Z tomegun $
 # Maintainer: Tom Gundersen <teg@jklm.no>
 # Contributor: judd <jvinet@zeroflux.org>
 
 pkgname=util-linux
-pkgver=2.19.1
-pkgrel=3
+pkgver=2.20
+pkgrel=1
 pkgdesc="Miscellaneous system utilities for Linux"
 url="http://userweb.kernel.org/~kzak/util-linux-ng/"
 arch=('i686' 'x86_64')
 groups=('base')
-depends=('bash' 'ncurses>=5.7' 'zlib' 'filesystem')
+depends=('filesystem')
 replaces=('linux32' 'util-linux-ng')
 conflicts=('linux32' 'util-linux-ng' 'e2fsprogs<1.41.8-2')
 provides=('linux32' "util-linux-ng=${pkgver}")
 license=('GPL2')
 options=('!libtool')
-source=(ftp://ftp.kernel.org/pub/linux/utils/${pkgname}/v2.19/${pkgname}-${pkgver}.tar.bz2
-       mount-segfault-2.19.1.patch
-       two-component-linux.patch)
+source=(ftp://ftp.kernel.org/pub/linux/utils/${pkgname}/v${pkgver}/${pkgname}-${pkgver}.tar.bz2)
 optdepends=('perl: for chkdupexe support')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  # add support for linux 3.0, which is needed mkswap
-  patch -Np1 -i ../two-component-linux.patch
-  # fix https://bugs.archlinux.org/task/24261
-  patch -Np1 -i ../mount-segfault-2.19.1.patch
+
   # hardware clock
-  sed -e 's%etc/adjtime%var/lib/hwclock/adjtime%' -i hwclock/hwclock.c
-  ./configure --enable-arch --enable-write --enable-raw --disable-wall --enable-partx
+  sed -e 's%etc/adjtime%var/lib/hwclock/adjtime%' -i include/pathnames.h
+
+  ./configure --enable-arch\
+              --enable-write\
+              --enable-raw\
+              --disable-wall\
+              --enable-partx
+
   make
 }
 
 package() {
   cd "${srcdir}/${pkgname}-${pkgver}"
+
   install -dm755 "${pkgdir}/var/lib/hwclock"
+
   make DESTDIR="${pkgdir}" install
 }
-md5sums=('3eab06f05163dfa65479c44e5231932c'
-         '3247b52f0e4b8044f23f2f7218e2fdea'
-         '6eb23edb484adf7192e107d1c6d94bd3')
+md5sums=('4dcacdbdafa116635e52b977d9d0e879')
-- 
cgit v1.2.3-54-g00ecf