diff options
| -rw-r--r-- | abs/core-testing/util-linux-ng/PKGBUILD | 48 | ||||
| -rw-r--r-- | abs/core-testing/util-linux-ng/fix-findmnt.patch | 24 | ||||
| -rw-r--r-- | abs/core-testing/util-linux-ng/util-linux-ng.install | 2 |
3 files changed, 50 insertions, 24 deletions
diff --git a/abs/core-testing/util-linux-ng/PKGBUILD b/abs/core-testing/util-linux-ng/PKGBUILD index 3d72cbc..ef003b1 100644 --- a/abs/core-testing/util-linux-ng/PKGBUILD +++ b/abs/core-testing/util-linux-ng/PKGBUILD @@ -1,39 +1,41 @@ -# $Id: PKGBUILD 29509 2009-03-09 17:25:09Z tpowa $ +# $Id: PKGBUILD 84963 2010-07-05 23:24:20Z thomas $ # Maintainer: judd <jvinet@zeroflux.org> pkgname=util-linux-ng -pkgver=2.14.2 -_loop_date=20090214 -pkgrel=1 +pkgver=2.18 +pkgrel=2 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.7' 'zlib' 'e2fsprogs') +depends=('bash' 'ncurses>=5.7' 'zlib' 'filesystem') replaces=('linux32' 'util-linux') -conflicts=('linux32' 'util-linux') +conflicts=('linux32' 'util-linux' 'e2fsprogs<1.41.8-2') provides=('linux32' 'util-linux') license=('GPL2') -source=(ftp://ftp.kernel.org/pub/linux/utils/${pkgname}/v2.14/${pkgname}-${pkgver}.tar.bz2 - http://loop-aes.sourceforge.net/updates/${pkgname}-${pkgver}-${_loop_date}.diff.bz2) +options=('!libtool') +source=(ftp://ftp.kernel.org/pub/linux/utils/${pkgname}/v2.18/${pkgname}-${pkgver}.tar.bz2 + fix-findmnt.patch) +optdepends=('perl: for chkdupexe support') install=util-linux-ng.install -md5sums=('b9d0053a22cfcbf0b9c0aa6d6eccfbc8' - '72c5b3e961efc1bda2750dbad019e414') +md5sums=('2f5f71e6af969d041d73ab778c141a77' + '7346673932b165faadde2fa2a9c1cd3a') build() { - cd ${srcdir}/${pkgname}-${pkgver} - - # cryptoloop support - patch -Np1 -i ${srcdir}/${pkgname}-${pkgver}-${_loop_date}.diff || return 1 + cd "${srcdir}/${pkgname}-${pkgver}" # 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 + sed -e 's%etc/adjtime%var/lib/hwclock/adjtime%' -i hwclock/hwclock.c || return 1 + mkdir -p "${pkgdir}/var/lib/hwclock" || return 1 + # fix findmnt + patch -p1 -i "${srcdir}/fix-findmnt.patch" + + autoreconf || return 1 + automake || return 1 + ./configure --enable-arch --enable-write --enable-raw --disable-wall --enable-rdev --enable-partx || return 1 make HAVE_SLN=yes ADD_RAW=yes || return 1 - make HAVE_SLN=yes ADD_RAW=yes DESTDIR=${startdir}/pkg install || return 1 + make HAVE_SLN=yes ADD_RAW=yes DESTDIR="${pkgdir}" 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 + 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/fix-findmnt.patch b/abs/core-testing/util-linux-ng/fix-findmnt.patch new file mode 100644 index 0000000..bf6574c --- /dev/null +++ b/abs/core-testing/util-linux-ng/fix-findmnt.patch @@ -0,0 +1,24 @@ +commit a6c90fe597944f68fe49f45f1d8bc0d2e35104d4 +Author: Petr Uzel <petr.uzel-aRb0bU7PRFPrBKCeMvbIDA@public.gmane.org> +Date: Sun Jul 4 20:02:57 2010 +0200 + + libmount: fix merge_optstr (do not truncate 3 trailing characters) + + I believe this is the correct fix. + + Signed-off-by: Petr Uzel <petr.uzel-aRb0bU7PRFPrBKCeMvbIDA@public.gmane.org> + +diff --git a/shlibs/mount/src/tab_parse.c b/shlibs/mount/src/tab_parse.c +index 5dbcfa6..680e1fc 100644 +--- a/shlibs/mount/src/tab_parse.c ++++ b/shlibs/mount/src/tab_parse.c +@@ -254,7 +254,8 @@ static char *merge_optstr(const char *vfs, const char *fs) + if (!strcmp(vfs, fs)) + return strdup(vfs); /* e.g. "aaa" and "aaa" */ + +- sz = strlen(vfs) + strlen(fs) + 2; ++ /* leave space for leading "r[ow],", "," and trailing zero */ ++ sz = strlen(vfs) + strlen(fs) + 5; + res = malloc(sz); + if (!res) + return NULL; diff --git a/abs/core-testing/util-linux-ng/util-linux-ng.install b/abs/core-testing/util-linux-ng/util-linux-ng.install index 22d38db..b057db9 100644 --- a/abs/core-testing/util-linux-ng/util-linux-ng.install +++ b/abs/core-testing/util-linux-ng/util-linux-ng.install @@ -1,5 +1,5 @@ infodir=/usr/share/info -filelist=(ipc.info) +filelist=(ipc.info.gz) post_install() { [ -x usr/bin/install-info ] || return 0 |