summaryrefslogtreecommitdiff
path: root/core/util-linux
diff options
context:
space:
mode:
authorNicolás Reynolds <fauno@kiwwwi.com.ar>2012-06-02 21:25:54 -0300
committerNicolás Reynolds <fauno@kiwwwi.com.ar>2012-06-02 21:25:54 -0300
commit8b9ddc7fec12ba69e50ece961525c90bed96df99 (patch)
treefc12914f9d27317b3d3f1df6f0009f02ebb7668a /core/util-linux
parent40134114ddb57a36863a256ffdc5b65a8edb5a67 (diff)
parentd915cad658736d96368750201c34df752048751a (diff)
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts: community-testing/perl-berkeleydb/PKGBUILD community/egoboo/PKGBUILD community/kdenlive/PKGBUILD community/postgis/PKGBUILD core/lvm2/PKGBUILD extra/gvfs/PKGBUILD extra/libatasmart/PKGBUILD extra/mesa/PKGBUILD extra/pixman/PKGBUILD extra/pulseaudio/PKGBUILD extra/system-config-printer/PKGBUILD extra/xorg-server/PKGBUILD kde-unstable/kdenetwork/PKGBUILD multilib/lib32-mesa/PKGBUILD testing/imagemagick/PKGBUILD testing/php/PKGBUILD testing/php/logrotate.d.php-fpm testing/php/php-fpm.conf.in.patch testing/php/rc.d.php-fpm testing/xf86-video-intel/PKGBUILD
Diffstat (limited to 'core/util-linux')
-rw-r--r--core/util-linux/PKGBUILD16
1 files changed, 9 insertions, 7 deletions
diff --git a/core/util-linux/PKGBUILD b/core/util-linux/PKGBUILD
index a44b32432..24fa9ec2c 100644
--- a/core/util-linux/PKGBUILD
+++ b/core/util-linux/PKGBUILD
@@ -1,21 +1,20 @@
-# $Id: PKGBUILD 155728 2012-04-06 00:04:01Z tomegun $
+# $Id: PKGBUILD 160349 2012-06-01 12:56:46Z dreisner $
# Maintainer: Tom Gundersen <teg@jklm.no>
# Contributor: judd <jvinet@zeroflux.org>
pkgname=util-linux
-pkgver=2.21.1
-pkgrel=2
+pkgver=2.21.2
+pkgrel=1
pkgdesc="Miscellaneous system utilities for Linux"
url="http://www.kernel.org/pub/linux/utils/util-linux/"
arch=('i686' 'x86_64' 'mips64el')
groups=('base')
-depends=('udev')
+depends=('udev' 'pam')
conflicts=('util-linux-ng')
provides=("util-linux-ng=${pkgver}")
license=('GPL2')
options=('!libtool')
source=(ftp://ftp.kernel.org/pub/linux/utils/${pkgname}/v2.21/${pkgname}-${pkgver}.tar.xz)
-optdepends=('perl: for chkdupexe support')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
@@ -29,7 +28,7 @@ build() {
--enable-write \
--enable-raw \
--disable-wall \
- --enable-libmount-mount
+ --enable-new-mount
make
}
@@ -47,7 +46,10 @@ package() {
install -dm755 var/lib/hwclock
+ # broken tool, going away in next major release, so just remove it now
+ rm "${pkgdir}"/usr/{bin/chkdupexe,share/man/man1/chkdupexe.1}
+
# delete stray empty dir, fixed upstream
rm -r usr/share/man/ru
}
-md5sums=('ad602dcd528f340b1329cfa6200d8f80')
+md5sums=('54ba880f1d66782c2287ee2c898520e9')