diff options
Diffstat (limited to 'core')
-rw-r--r-- | core/coreutils/PKGBUILD | 35 | ||||
-rw-r--r-- | core/coreutils/coreutils-8.22-shuf-segfault.patch | 74 | ||||
-rw-r--r-- | core/gcc/PKGBUILD | 14 | ||||
-rw-r--r-- | core/libtool/PKGBUILD | 6 |
4 files changed, 27 insertions, 102 deletions
diff --git a/core/coreutils/PKGBUILD b/core/coreutils/PKGBUILD index 26113ba39..d79bf9a0a 100644 --- a/core/coreutils/PKGBUILD +++ b/core/coreutils/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 210100 2014-04-09 22:21:54Z thomas $ +# $Id: PKGBUILD 217740 2014-07-22 22:49:21Z seblu $ # Maintainer: Sébastien "Seblu" Luttringer -# Maintainer: Bartłomiej Piotrowski <bpiotrowski@archlinux.org> +# Contributor: Bartłomiej Piotrowski <bpiotrowski@archlinux.org> # Contributor: Allan McRae <allan@archlinux.org> # Contributor: judd <jvinet@zeroflux.org> pkgname=coreutils -pkgver=8.22 -pkgrel=4 +pkgver=8.23 +pkgrel=1 pkgdesc='The basic file, shell and text manipulation utilities of the GNU operating system' arch=('i686' 'x86_64') license=('GPL3') @@ -14,24 +14,21 @@ url='http://www.gnu.org/software/coreutils' groups=('base') depends=('glibc' 'pam' 'acl' 'gmp' 'libcap' 'openssl') install=$pkgname.install -source=(ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.xz{,.sig} - coreutils-8.22-shuf-segfault.patch - 0001-cp-don-t-reserve-a-device-number.patch) -md5sums=('8fb0ae2267aa6e728958adc38f8163a2' - 'SKIP' - '94f7e6f373f37beb236caabed8fcdb52' - 'ac3825f60b6e0300e375f656a3667c52') +source=("ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.xz"{,.sig}) +md5sums=('abed135279f87ad6762ce57ff6d89c41' + 'SKIP') -prepare() { - cd $pkgname-$pkgver - patch -p1 -i ../coreutils-8.22-shuf-segfault.patch - patch -p1 -i ../0001-cp-don-t-reserve-a-device-number.patch -} +#prepare() { +# cd $pkgname-$pkgver +#} build() { cd $pkgname-$pkgver - ./configure --prefix=/usr --libexecdir=/usr/lib --with-openssl \ - --enable-no-install-program=groups,hostname,kill,uptime + ./configure \ + --prefix=/usr \ + --libexecdir=/usr/lib \ + --with-openssl \ + --enable-no-install-program=groups,hostname,kill,uptime make } @@ -44,3 +41,5 @@ package() { cd $pkgname-$pkgver make DESTDIR="$pkgdir" install } + +# vim:set ts=2 sw=2 et: diff --git a/core/coreutils/coreutils-8.22-shuf-segfault.patch b/core/coreutils/coreutils-8.22-shuf-segfault.patch deleted file mode 100644 index e22b3c7b2..000000000 --- a/core/coreutils/coreutils-8.22-shuf-segfault.patch +++ /dev/null @@ -1,74 +0,0 @@ -From 24eb395471176e24762b08bfcef7562911537504 Mon Sep 17 00:00:00 2001 -From: Paul Eggert <eggert@cs.ucla.edu> -Date: Sun, 23 Feb 2014 15:34:48 -0800 -Subject: [PATCH] shuf: with -r, don't dump core if the input is empty - -Problem reported by valiant xiao in <http://bugs.gnu.org/16855>. -* NEWS: Document this. -* src/shuf.c (main): With -r, report an error if the input is empty. -* tests/misc/shuf.sh: Test for the bug. ---- - NEWS | 3 +++ - src/shuf.c | 15 +++++++++++---- - tests/misc/shuf.sh | 4 ++++ - 3 files changed, 18 insertions(+), 4 deletions(-) - -diff --git a/NEWS b/NEWS -index e72942b..2df246d 100644 ---- a/NEWS -+++ b/NEWS -@@ -22,6 +22,9 @@ GNU coreutils NEWS -*- outline -*- - it would display an error, requiring --no-dereference to avoid the issue. - [bug introduced in coreutils-5.3.0] - -+ shuf -r no longer dumps core if the input is empty. -+ [bug introduced in coreutils-8.22] -+ - ** New features - - od accepts a new option: --endian=TYPE to handle inputs with different byte -diff --git a/src/shuf.c b/src/shuf.c -index d4641fe..2a91072 100644 ---- a/src/shuf.c -+++ b/src/shuf.c -@@ -576,11 +576,18 @@ main (int argc, char **argv) - /* Generate output according to requested method */ - if (repeat) - { -- if (input_range) -- i = write_random_numbers (randint_source, head_lines, -- lo_input, hi_input, eolbyte); -+ if (head_lines == 0) -+ i = 0; - else -- i = write_random_lines (randint_source, head_lines, line, n_lines); -+ { -+ if (n_lines == 0) -+ error (EXIT_FAILURE, 0, _("No lines to repeat")); -+ if (input_range) -+ i = write_random_numbers (randint_source, head_lines, -+ lo_input, hi_input, eolbyte); -+ else -+ i = write_random_lines (randint_source, head_lines, line, n_lines); -+ } - } - else - { -diff --git a/tests/misc/shuf.sh b/tests/misc/shuf.sh -index d3ea1f2..d7251d1 100755 ---- a/tests/misc/shuf.sh -+++ b/tests/misc/shuf.sh -@@ -43,6 +43,10 @@ compare in out1 || { fail=1; echo "not a permutation" 1>&2; } - t=$(shuf -e a b c d e | sort | fmt) - test "$t" = 'a b c d e' || { fail=1; echo "not a permutation" 1>&2; } - -+# coreutils-8.22 dumps core. -+shuf -er -+test $? -eq 1 || fail=1 -+ - # Before coreutils-6.3, this would infloop. - # "seq 1860" produces 8193 (8K + 1) bytes of output. - seq 1860 | shuf > /dev/null || fail=1 --- -1.8.5.3 - diff --git a/core/gcc/PKGBUILD b/core/gcc/PKGBUILD index 0a0b826a6..e4520b443 100644 --- a/core/gcc/PKGBUILD +++ b/core/gcc/PKGBUILD @@ -1,14 +1,14 @@ -# $Id: PKGBUILD 215535 2014-06-28 10:00:36Z allan $ +# $Id: PKGBUILD 217741 2014-07-23 02:41:01Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc # NOTE: libtool requires rebuilt with each new gcc version pkgname=('gcc' 'gcc-libs' 'gcc-fortran' 'gcc-objc' 'gcc-ada' 'gcc-go') -pkgver=4.9.0 +pkgver=4.9.1 _pkgver=4.9 -pkgrel=5 -_snapshot=4.9-20140604 +pkgrel=1 +#_snapshot=4.9-20140604 pkgdesc="The GNU Compiler Collection" arch=('i686' 'x86_64') license=('GPL' 'LGPL' 'FDL' 'custom') @@ -16,11 +16,11 @@ url="http://gcc.gnu.org" makedepends=('binutils>=2.24' 'libmpc' 'cloog' 'gcc-ada' 'doxygen') checkdepends=('dejagnu' 'inetutils') options=('!emptydirs') -source=(#ftp://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-${pkgver}.tar.bz2 - ftp://gcc.gnu.org/pub/gcc/snapshots/${_snapshot}/gcc-${_snapshot}.tar.bz2 +source=(ftp://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-${pkgver}.tar.bz2 + #ftp://gcc.gnu.org/pub/gcc/snapshots/${_snapshot}/gcc-${_snapshot}.tar.bz2 gcc-4.8-filename-output.patch gcc-4.9-isl-0.13-hack.patch) -md5sums=('57aa4ff81c56262dc89994853c4d0149' +md5sums=('fddf71348546af523353bd43d34919c1' '40cb437805e2f7a006aa0d0c3098ab0f' 'f26ae06b9cbc8abe86f5ee4dc5737da8') diff --git a/core/libtool/PKGBUILD b/core/libtool/PKGBUILD index f26e3a883..08ca6d352 100644 --- a/core/libtool/PKGBUILD +++ b/core/libtool/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 211962 2014-05-02 08:39:41Z allan $ +# $Id: PKGBUILD 217742 2014-07-23 02:41:03Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # Contributor: judd <jvinet@zeroflux.org> @@ -6,8 +6,8 @@ pkgname=('libtool' 'libltdl') pkgver=2.4.2 -_gccver=4.9.0 -pkgrel=13 +_gccver=4.9.1 +pkgrel=14 pkgdesc="A generic library support script" arch=('i686' 'x86_64') url="http://www.gnu.org/software/libtool" |