[arch-commits] Commit in util-linux/trunk (PKGBUILD)

[Tom Gundersen]

    Date: Tuesday, September 4, 2012 @ 12:49:31
  Author: tomegun
Revision: 166132

upgpkg: util-linux 2.22-1

upstream release

take some binaries from coreutils, sysvinit-tools, procps-ng and eject

Modified:
  util-linux/trunk/PKGBUILD

----------+
 PKGBUILD |   35 ++++++++++++++++++-----------------
 1 file changed, 18 insertions(+), 17 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-09-04 16:38:14 UTC (rev 166131)
+++ PKGBUILD	2012-09-04 16:49:31 UTC (rev 166132)
@@ -3,18 +3,19 @@
 # Contributor: judd <jvinet at zeroflux.org>
 
 pkgname=util-linux
-pkgver=2.21.2
-pkgrel=5
+pkgver=2.22
+pkgrel=1
 pkgdesc="Miscellaneous system utilities for Linux"
 url="http://www.kernel.org/pub/linux/utils/util-linux/"
 arch=('i686' 'x86_64')
 groups=('base')
 depends=('pam')
-conflicts=('util-linux-ng')
-provides=("util-linux-ng=${pkgver}")
+makedepends=('bc') # for check() only
+conflicts=('util-linux-ng' 'eject')
+provides=("util-linux-ng=${pkgver}" 'eject')
 license=('GPL2')
 options=('!libtool')
-source=(ftp://ftp.kernel.org/pub/linux/utils/${pkgname}/v2.21/${pkgname}-${pkgver}.tar.xz
+source=(ftp://ftp.kernel.org/pub/linux/utils/${pkgname}/v2.22/${pkgname}-${pkgver}.tar.xz
         pam-login
         pam-common)
 backup=(etc/pam.d/chfn etc/pam.d/chsh etc/pam.d/login)
@@ -26,12 +27,18 @@
   ./configure --prefix=/usr \
               --libdir=/usr/lib \
               --enable-fs-paths-extra=/usr/bin:/usr/sbin \
+              --enable-raw \
+              --enable-vipw \
+              --enable-newgrp \
+              --enable-chfn-chsh \
               --enable-write \
-              --enable-raw \
-              --disable-wall \
-              --enable-new-mount \
-              --enable-login-utils
+              --enable-mesg \
+              --enable-socket-activation
 
+#              --enable-reset \ # part of ncurses
+#              --enable-last \ # not part of any package
+#              --enable-line \ # not compat
+
   make
 }
 
@@ -46,20 +53,14 @@
 
   cd "${pkgdir}"
 
-  # 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
-
   # setuid chfn and chsh
-  chmod 4755 "$pkgdir"/usr/bin/ch{sh,fn}
+  chmod 4755 "$pkgdir"/usr/bin/{newgrp,ch{sh,fn}}
 
   # install PAM files for login-utils
   install -Dm644 "$srcdir/pam-common" "$pkgdir/etc/pam.d/chfn"
   install -m644 "$srcdir/pam-common" "$pkgdir/etc/pam.d/chsh"
   install -m644 "$srcdir/pam-login" "$pkgdir/etc/pam.d/login"
 }
-md5sums=('54ba880f1d66782c2287ee2c898520e9'
+md5sums=('ba2d8cc12a937231c80a04f7f7149303'
          '4368b3f98abd8a32662e094c54e7f9b1'
          'a31374fef2cba0ca34dfc7078e2969e4')