diff options
| author | root <root@rshg054.dnsready.net> | 2012-09-06 00:03:30 +0000 |
|---|---|---|
| committer | root <root@rshg054.dnsready.net> | 2012-09-06 00:03:30 +0000 |
| commit | af549d0243764531309fa94b1f5cee58982c496a (patch) | |
| tree | afb2851caf91700e83c4062a9e77c6a92fe0326b /testing/coreutils | |
| parent | 58f5e0b164b5f4c9af61b2e42bd10c85f28b9bed (diff) | |
Thu Sep 6 00:03:29 UTC 2012
Diffstat (limited to 'testing/coreutils')
| -rw-r--r-- | testing/coreutils/PKGBUILD | 43 | ||||
| -rw-r--r-- | testing/coreutils/coreutils.install | 14 |
2 files changed, 17 insertions, 40 deletions
diff --git a/testing/coreutils/PKGBUILD b/testing/coreutils/PKGBUILD index eb27e218c..eb99af572 100644 --- a/testing/coreutils/PKGBUILD +++ b/testing/coreutils/PKGBUILD @@ -1,43 +1,25 @@ -# $Id: PKGBUILD 163567 2012-07-16 02:32:53Z dreisner $ +# $Id: PKGBUILD 166163 2012-09-05 01:16:34Z dreisner $ # Maintainer: Allan McRae <allan@archlinux.org> # Contributor: judd <jvinet@zeroflux.org> pkgname=coreutils -pkgver=8.17 -pkgrel=3 +pkgver=8.19 +pkgrel=1 pkgdesc="The basic file, shell and text manipulation utilities of the GNU operating system" arch=('i686' 'x86_64') license=('GPL3') url="http://www.gnu.org/software/coreutils" groups=('base') depends=('glibc' 'pam' 'acl' 'gmp' 'libcap') -replaces=('mktemp') -backup=('etc/pam.d/su') install=${pkgname}.install -options=('!emptydirs') -source=(ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.xz{,.sig} - coreutils-pam.patch - 0001-ls-color-each-symlink-to-relative-name-in-properly.patch - su.pam) -md5sums=('bbda656ce8ca2c6903948f9faa204ba3' - 'ebecd29b095aa21b0b2f833f1ec20d70' - 'aad79a2aa6d566c375d7bdd1b0767278' - 'd7c691898a695a6284a927e6a9426fe4' - 'fa85e5cce5d723275b14365ba71a8aad') +source=(ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.xz{,.sig}) +md5sums=('1a01231a2f3ed37c0efc073ccdda9375' + '7f564749d834397aa67f0f05bacb62d5') build() { cd ${srcdir}/${pkgname}-${pkgver} - # added su wheel group pam patch (from fedora git) - patch -Np1 -i ${srcdir}/coreutils-pam.patch - - # fix coloring for symlinks in / - # upstream commit 6124a3842dfa8484b52e067a8ab8105c3875a4f7 - patch -Np1 -i $srcdir/0001-ls-color-each-symlink-to-relative-name-in-properly.patch - - autoreconf -v - ./configure --prefix=/usr --libexecdir=/usr/lib/coreutils \ - --enable-install-program=su \ + ./configure --prefix=/usr --libexecdir=/usr/lib \ --enable-no-install-program=groups,hostname,kill,uptime \ --enable-pam make @@ -53,14 +35,13 @@ package() { make DESTDIR=${pkgdir} install cd ${pkgdir}/usr/bin - install -dm755 ${pkgdir}/{bin,usr/sbin} + install -dm755 ${pkgdir}/bin # binaries required by FHS _fhs=('cat' 'chgrp' 'chmod' 'chown' 'cp' 'date' 'dd' 'df' 'echo' 'false' - 'ln' 'ls' 'mkdir' 'mknod' 'mv' 'pwd' 'rm' 'rmdir' 'stty' 'su' 'sync' + 'ln' 'ls' 'mkdir' 'mknod' 'mv' 'pwd' 'rm' 'rmdir' 'stty' 'sync' 'true' 'uname') - mv ${_fhs[@]} ${pkgdir}/bin - - mv chroot ${pkgdir}/usr/sbin - install -Dm644 ${srcdir}/su.pam ${pkgdir}/etc/pam.d/su + for i in ${_fhs[@]}; do + ln -s ../usr/bin/$i ${pkgdir}/bin/$i + done } diff --git a/testing/coreutils/coreutils.install b/testing/coreutils/coreutils.install index 8caae6686..22cfcb2a1 100644 --- a/testing/coreutils/coreutils.install +++ b/testing/coreutils/coreutils.install @@ -1,11 +1,9 @@ infodir=usr/share/info -filelist=(coreutils.info) +file=coreutils.info post_install() { - [ -x usr/bin/install-info ] || return 0 - for file in ${filelist[@]}; do - usr/bin/install-info $infodir/$file.gz $infodir/dir 2> /dev/null - done + [[ -x usr/bin/install-info ]] || return 0 + install-info $infodir/$file.gz $infodir/dir 2> /dev/null } post_upgrade() { @@ -13,9 +11,7 @@ post_upgrade() { } pre_remove() { - [ -x usr/bin/install-info ] || return 0 - for file in ${filelist[@]}; do - usr/bin/install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null - done + [[ -x usr/bin/install-info ]] || return 0 + install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null } |