summaryrefslogtreecommitdiff
path: root/core/util-linux/PKGBUILD
diff options
context:
space:
mode:
Diffstat (limited to 'core/util-linux/PKGBUILD')
-rw-r--r--core/util-linux/PKGBUILD46
1 files changed, 30 insertions, 16 deletions
diff --git a/core/util-linux/PKGBUILD b/core/util-linux/PKGBUILD
index 6bb6c2676..6265ddb53 100644
--- a/core/util-linux/PKGBUILD
+++ b/core/util-linux/PKGBUILD
@@ -1,42 +1,56 @@
-# $Id: PKGBUILD 135595 2011-08-16 14:10:53Z tomegun $
+# $Id: PKGBUILD 137777 2011-09-10 22:03:07Z 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=2
pkgdesc="Miscellaneous system utilities for Linux"
url="http://userweb.kernel.org/~kzak/util-linux-ng/"
arch=('i686' 'x86_64' 'mips64el')
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
+ agetty-typo.patch
+ write-freopen.patch
+ dmesg-non-printk.patch
+ dmesg-space.patch)
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
+
+ # patches from master
+ for patch in agetty-typo.patch write-freopen.patch dmesg-non-printk.patch dmesg-space.patch; do
+ patch -Np1 -i "${srcdir}/${patch}"
+ done
+
# 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'
+ '13838c6dd8df686e0f01ad0f236d2690'
+ '465817ff8f7c08411c8011ee91b50318'
+ 'f3ca75a1a22a2a739c5c22d92dc07ab0'
+ 'd9768f0b42d36d72c02ac7797b922ba1')