summaryrefslogtreecommitdiffstats
path: root/abs/core/util-linux/PKGBUILD
diff options
context:
space:
mode:
authorJames Meyer <james.meyer@operamail.com>2014-02-17 00:01:44 (GMT)
committerJames Meyer <james.meyer@operamail.com>2014-02-19 19:03:04 (GMT)
commit15471fc26d53c9431ebf69b06bb6ac0036484d54 (patch)
tree980b9a9c655d127b95235011915aedddb567ec8d /abs/core/util-linux/PKGBUILD
parent76d8789a8f3dd26cd1a6cea90517d75efa922f40 (diff)
downloadlinhes_pkgbuild-15471fc26d53c9431ebf69b06bb6ac0036484d54.zip
linhes_pkgbuild-15471fc26d53c9431ebf69b06bb6ac0036484d54.tar.gz
linhes_pkgbuild-15471fc26d53c9431ebf69b06bb6ac0036484d54.tar.bz2
util-linux 2.2.4
update binary path to /usr/bin refs #961
Diffstat (limited to 'abs/core/util-linux/PKGBUILD')
-rwxr-xr-x[-rw-r--r--]abs/core/util-linux/PKGBUILD50
1 files changed, 35 insertions, 15 deletions
diff --git a/abs/core/util-linux/PKGBUILD b/abs/core/util-linux/PKGBUILD
index 857bcc4..53aa53e 100644..100755
--- a/abs/core/util-linux/PKGBUILD
+++ b/abs/core/util-linux/PKGBUILD
@@ -1,21 +1,26 @@
-# $Id: PKGBUILD 171469 2012-11-17 23:02:13Z allan $
+# $Id: PKGBUILD 201467 2013-12-12 15:33:24Z dreisner $
# Maintainer: Tom Gundersen <teg@jklm.no>
+# Maintainer: Dave Reisner <dreisner@archlinux.org>
# Contributor: judd <jvinet@zeroflux.org>
pkgname=util-linux
-pkgver=2.22.1
-pkgrel=3
+pkgver=2.24
+pkgrel=2
pkgdesc="Miscellaneous system utilities for Linux"
url="http://www.kernel.org/pub/linux/utils/util-linux/"
arch=('i686' 'x86_64')
-groups=('base')
+groups=('base' 'base-devel')
depends=('pam' 'shadow' 'coreutils' 'glibc')
+optdepends=('python: python bindings to libmount')
+makedepends=('systemd' 'python2')
# checkdepends=('bc')
conflicts=('util-linux-ng' 'eject')
-provides=("util-linux-ng=${pkgver}" 'eject')
+provides=("util-linux-ng=$pkgver" 'eject')
license=('GPL2')
-options=('!libtool')
-source=(ftp://ftp.kernel.org/pub/linux/utils/${pkgname}/v2.22/${pkgname}-${pkgver}.tar.xz
+options=('strip' 'debug')
+source=("ftp://ftp.kernel.org/pub/linux/utils/$pkgname/v2.24/$pkgname-$pkgver.tar.xz"
+ 0001-lsblk-fix-D-segfault.patch
+ 0001-pylibmount-correctly-import-from-pylibmount.so.patch
uuidd.tmpfiles
pam-login
pam-common
@@ -27,23 +32,31 @@ backup=(etc/pam.d/chfn
etc/pam.d/su-l)
install=util-linux.install
+prepare() {
+ cd "$pkgname-$pkgver"
+
+ patch -Np1 <"$srcdir"/0001-lsblk-fix-D-segfault.patch
+ patch -Np1 <"$srcdir"/0001-pylibmount-correctly-import-from-pylibmount.so.patch
+}
+
build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
+ cd "$pkgname-$pkgver"
./configure --prefix=/usr \
--libdir=/usr/lib \
+ --bindir=/usr/bin \
--localstatedir=/run \
- --enable-fs-paths-extra=/usr/bin:/usr/sbin \
+ --enable-fs-paths-extra=/usr/bin \
--enable-raw \
--enable-vipw \
--enable-newgrp \
--enable-chfn-chsh \
--enable-write \
--enable-mesg \
- --enable-socket-activation
+ --enable-socket-activation \
+ --with-python=2
# --enable-reset \ # part of ncurses
-# --enable-line \ # not part of any package
# --enable-last \ # not compat
make
@@ -55,12 +68,10 @@ build() {
#}
package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
+ cd "$pkgname-$pkgver"
make DESTDIR="${pkgdir}" install
- cd "${pkgdir}"
-
# setuid chfn and chsh
chmod 4755 "$pkgdir"/usr/bin/{newgrp,ch{sh,fn}}
@@ -74,8 +85,17 @@ package() {
# include tmpfiles fragment for uuidd
# TODO(dreisner): offer this upstream?
install -Dm644 "$srcdir/uuidd.tmpfiles" "$pkgdir/usr/lib/tmpfiles.d/uuidd.conf"
+
+ # usrmove
+ cd "$pkgdir"
+ mv {,usr/}sbin/* usr/bin
+ rmdir sbin usr/sbin
+
+
}
-md5sums=('730cf9932531ed09b53a04ca30fcb4c9'
+md5sums=('4fac6443427f575fc5f3531a4ad2ca01'
+ '1899fe3b853a5835c76cca0501b6b518'
+ 'a18a1e89ffdfa3bc96ae976646a723ec'
'a39554bfd65cccfd8254bb46922f4a67'
'4368b3f98abd8a32662e094c54e7f9b1'
'a31374fef2cba0ca34dfc7078e2969e4'