diff options
| -rw-r--r-- | abs/core/m4/PKGBUILD | 41 | ||||
| -rw-r--r-- | abs/core/m4/__changelog | 1 | ||||
| -rw-r--r-- | abs/core/m4/m4-1.4.16-readlink-einval.patch | 12 | ||||
| -rw-r--r-- | abs/core/m4/m4.install | 10 | ||||
| -rw-r--r-- | abs/core/m4/m4/PKGBUILD | 28 | ||||
| -rw-r--r-- | abs/core/m4/m4/m4.install | 20 |
6 files changed, 45 insertions, 67 deletions
diff --git a/abs/core/m4/PKGBUILD b/abs/core/m4/PKGBUILD index b0738c8..29f1c9c 100644 --- a/abs/core/m4/PKGBUILD +++ b/abs/core/m4/PKGBUILD @@ -1,24 +1,37 @@ -# $Id: PKGBUILD 17049 2008-10-24 17:18:43Z andyrtr $ -# Maintainer: Andreas Radke <andyrtr@archlinux.org> +# $Id: PKGBUILD 142068 2011-11-04 23:36:00Z allan $ +# Maintainer: Allan McRae <allan@archlinux.org> +# Contributor: Andreas Radke <andyrtr@archlinux.org> pkgname=m4 -pkgver=1.4.12 -pkgrel=1 -pkgdesc="m4 macro processor" -arch=(i686 x86_64) -license=('GPL') +pkgver=1.4.16 +pkgrel=2 +pkgdesc="The GNU macro processor" +arch=('i686' 'x86_64') url="http://www.gnu.org/software/m4" -install=m4.install +license=('GPL3') groups=('base-devel') -depends=('glibc' 'bash' 'texinfo') -source=(ftp://ftp.gnu.org/gnu/m4/$pkgname-$pkgver.tar.gz) -md5sums=('0499a958a561781b125c740f18061ea8') +depends=('glibc' 'bash') +install=m4.install +source=(ftp://ftp.gnu.org/gnu/m4/$pkgname-$pkgver.tar.xz{,.sig} + m4-1.4.16-readlink-einval.patch) +md5sums=('7548ec061a1ba993790159764f522d0e' + 'eebe5c94e74e7551e2e30c5844f1b653' + 'cea138fa9b568d06e46269611cec8dd0') build() { cd ${srcdir}/$pkgname-$pkgver + patch -Np1 -i $srcdir/m4-1.4.16-readlink-einval.patch + sed -i '/gets is a security hole/d' lib/stdio.in.h ./configure --prefix=/usr - make || return 1 - make prefix=${pkgdir}/usr install || return 1 + make +} - rm -f ${pkgdir}/usr/share/info/dir +check() { + cd ${srcdir}/$pkgname-$pkgver + make check +} + +package() { + cd ${srcdir}/$pkgname-$pkgver + make prefix=${pkgdir}/usr install } diff --git a/abs/core/m4/__changelog b/abs/core/m4/__changelog new file mode 100644 index 0000000..f7bfd9a --- /dev/null +++ b/abs/core/m4/__changelog @@ -0,0 +1 @@ +sed -i '/gets is a security hole/d' lib/stdio.in.h diff --git a/abs/core/m4/m4-1.4.16-readlink-einval.patch b/abs/core/m4/m4-1.4.16-readlink-einval.patch new file mode 100644 index 0000000..6a98751 --- /dev/null +++ b/abs/core/m4/m4-1.4.16-readlink-einval.patch @@ -0,0 +1,12 @@ +diff -up m4-1.4.16/tests/test-readlink.h.orig m4-1.4.16/tests/test-readlink.h +--- m4-1.4.16/tests/test-readlink.h.orig 2011-09-19 12:44:58.745546826 +0200 ++++ m4-1.4.16/tests/test-readlink.h 2011-09-19 12:46:00.079548410 +0200 +@@ -38,7 +38,7 @@ test_readlink (ssize_t (*func) (char con + ASSERT (errno == ENOENT); + errno = 0; + ASSERT (func ("", buf, sizeof buf) == -1); +- ASSERT (errno == ENOENT); ++ ASSERT (errno == ENOENT || errno == EINVAL); + errno = 0; + ASSERT (func (".", buf, sizeof buf) == -1); + ASSERT (errno == EINVAL); diff --git a/abs/core/m4/m4.install b/abs/core/m4/m4.install index 7954ba9..be41381 100644 --- a/abs/core/m4/m4.install +++ b/abs/core/m4/m4.install @@ -1,9 +1,10 @@ -infodir=/usr/share/info +infodir=usr/share/info filelist=(m4.info m4.info-1 m4.info-2) post_install() { + [ -x usr/bin/install-info ] || return 0 for file in ${filelist[@]}; do - install-info $infodir/$file $infodir/dir 2> /dev/null + install-info $infodir/$file.gz $infodir/dir 2> /dev/null done } @@ -12,9 +13,8 @@ post_upgrade() { } pre_remove() { + [ -x usr/bin/install-info ] || return 0 for file in ${filelist[@]}; do - install-info --delete $infodir/$file $infodir/dir 2> /dev/null + install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null done } - -# vim:set ts=2 sw=2 et: diff --git a/abs/core/m4/m4/PKGBUILD b/abs/core/m4/m4/PKGBUILD deleted file mode 100644 index 9e0a802..0000000 --- a/abs/core/m4/m4/PKGBUILD +++ /dev/null @@ -1,28 +0,0 @@ -# $Id: PKGBUILD 90203 2010-09-09 05:37:32Z allan $ -# Maintainer: Allan McRae <allan@archlinux.org> -# Contributor: Andreas Radke <andyrtr@archlinux.org> - -pkgname=m4 -pkgver=1.4.15 -pkgrel=1 -pkgdesc="The GNU macro processor" -arch=('i686' 'x86_64') -url="http://www.gnu.org/software/m4" -license=('GPL3') -groups=('base-devel') -depends=('glibc' 'bash') -install=m4.install -source=(ftp://ftp.gnu.org/gnu/m4/$pkgname-$pkgver.tar.xz) -md5sums=('1caf3410e6590f493834dc99ee04d027') - -build() { - cd ${srcdir}/$pkgname-$pkgver - ./configure --prefix=/usr - make - make check -} - -package() { - cd ${srcdir}/$pkgname-$pkgver - make prefix=${pkgdir}/usr install -} diff --git a/abs/core/m4/m4/m4.install b/abs/core/m4/m4/m4.install deleted file mode 100644 index 88a9606..0000000 --- a/abs/core/m4/m4/m4.install +++ /dev/null @@ -1,20 +0,0 @@ -infodir=/usr/share/info -filelist=(m4.info m4.info-1 m4.info-2) - -post_install() { - [ -x usr/bin/install-info ] || return 0 - for file in ${filelist[@]}; do - install-info $infodir/$file.gz $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 - install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null - done -} |