upstream sync for util-linux-ng

2 files changed, 42 insertions, 15 deletions

diff --git a/abs/core-testing/util-linux-ng/PKGBUILD b/abs/core-testing/util-linux-ng/PKGBUILD
index c7e6073..3d72cbc 100644
--- a/abs/core-testing/util-linux-ng/PKGBUILD
+++ b/abs/core-testing/util-linux-ng/PKGBUILD
@@ -1,33 +1,39 @@
-# $Id: PKGBUILD 10319 2008-08-26 04:36:19Z allan $
+# $Id: PKGBUILD 29509 2009-03-09 17:25:09Z tpowa $
 # Maintainer: judd <jvinet@zeroflux.org>
 pkgname=util-linux-ng
-pkgver=2.14
-pkgrel=14
+pkgver=2.14.2
+_loop_date=20090214
+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.6-7' 'zlib' 'e2fsprogs')
+depends=('bash' 'ncurses>=5.7' 'zlib' 'e2fsprogs')
 replaces=('linux32' 'util-linux')
 conflicts=('linux32' 'util-linux')
 provides=('linux32' 'util-linux')
-license=('GPL')
+license=('GPL2')
 source=(ftp://ftp.kernel.org/pub/linux/utils/${pkgname}/v2.14/${pkgname}-${pkgver}.tar.bz2
-	http://loop-aes.sourceforge.net/updates/util-linux-ng-2.14-20080624.diff.bz2)
-md5sums=('23f227da49df36f33fe47e917e332cd8'
-         'e76c888bd140d7bd5bbd5f5b098bc1e7')
+	http://loop-aes.sourceforge.net/updates/${pkgname}-${pkgver}-${_loop_date}.diff.bz2)
+install=util-linux-ng.install
+md5sums=('b9d0053a22cfcbf0b9c0aa6d6eccfbc8'
+         '72c5b3e961efc1bda2750dbad019e414')
 
 build() {
-  cd ${startdir}/src/${pkgname}-${pkgver}
-  #./autogen.sh
+  cd ${srcdir}/${pkgname}-${pkgver}
+
   # cryptoloop support
-  patch -Np1 -i ${startdir}/src/util-linux-ng-2.14-20080624.diff || return 1
+  patch -Np1 -i ${srcdir}/${pkgname}-${pkgver}-${_loop_date}.diff || return 1
+  # hardware clock
   sed -e 's%etc/adjtime%var/lib/hwclock/adjtime%' -i hwclock/hwclock.c 
   mkdir -p ${startdir}/pkg/var/lib/hwclock
   ./configure --enable-arch --enable-write --enable-raw --disable-wall --enable-rdev
   make HAVE_SLN=yes ADD_RAW=yes || return 1
-  make HAVE_SLN=yes ADD_RAW=yes DESTDIR=${startdir}/pkg install
-  rm -f ${startdir}/pkg/bin/kill
-  rm -f ${startdir}/pkg/usr/share/man/man1/kill.1
-  rm -f ${startdir}/pkg/usr/share/man/man5/nfs.5
+  make HAVE_SLN=yes ADD_RAW=yes DESTDIR=${startdir}/pkg install || return 1
+  # remove files
+  rm -f ${pkgdir}/bin/kill
+  rm -f ${pkgdir}/usr/share/man/man1/kill.1
+  rm -f ${pkgdir}/usr/share/man/man5/nfs.5
   rm -f ${pkgdir}/usr/share/info/dir
 }
+
diff --git a/abs/core-testing/util-linux-ng/util-linux-ng.install b/abs/core-testing/util-linux-ng/util-linux-ng.install
new file mode 100644
index 0000000..22d38db
--- /dev/null
+++ b/abs/core-testing/util-linux-ng/util-linux-ng.install
@@ -0,0 +1,21 @@
+infodir=/usr/share/info
+filelist=(ipc.info)
+
+post_install() {
+ [ -x usr/bin/install-info ] || return 0
+ for file in ${filelist[@]}; do
+    usr/bin/install-info $infodir/$file $infodir/dir 2> /dev/null
+ done
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+pre_remove() {
+ [ -x usr/bin/install-info ] || return 0
+  for file in ${filelist[@]}; do
+    usr/bin/install-info --delete $infodir/$file $infodir/dir 2> /dev/null
+  done
+}
+