Date: Sunday, January 27, 2013 @ 13:12:47 Author: allan Revision: 176091
archrelease: copy trunk to testing-i686, testing-x86_64 Added: grep/repos/testing-i686/ grep/repos/testing-i686/PKGBUILD (from rev 176090, grep/trunk/PKGBUILD) grep/repos/testing-i686/grep-2.11-exclude-dir-crash.patch (from rev 176090, grep/trunk/grep-2.11-exclude-dir-crash.patch) grep/repos/testing-i686/grep.install (from rev 176090, grep/trunk/grep.install) grep/repos/testing-x86_64/ grep/repos/testing-x86_64/PKGBUILD (from rev 176090, grep/trunk/PKGBUILD) grep/repos/testing-x86_64/grep-2.11-exclude-dir-crash.patch (from rev 176090, grep/trunk/grep-2.11-exclude-dir-crash.patch) grep/repos/testing-x86_64/grep.install (from rev 176090, grep/trunk/grep.install) --------------------------------------------------+ testing-i686/PKGBUILD | 34 ++++++++++++++++ testing-i686/grep-2.11-exclude-dir-crash.patch | 44 +++++++++++++++++++++ testing-i686/grep.install | 17 ++++++++ testing-x86_64/PKGBUILD | 34 ++++++++++++++++ testing-x86_64/grep-2.11-exclude-dir-crash.patch | 44 +++++++++++++++++++++ testing-x86_64/grep.install | 17 ++++++++ 6 files changed, 190 insertions(+) Copied: grep/repos/testing-i686/PKGBUILD (from rev 176090, grep/trunk/PKGBUILD) =================================================================== --- testing-i686/PKGBUILD (rev 0) +++ testing-i686/PKGBUILD 2013-01-27 12:12:47 UTC (rev 176091) @@ -0,0 +1,34 @@ +# $Id$ +# Maintainer: Allan McRae <al...@archlinux.org> +# Contributor: judd <jvi...@zeroflux.org> + +pkgname=grep +pkgver=2.14 +pkgrel=2 +pkgdesc="A string search utility" +arch=('i686' 'x86_64') +license=('GPL3') +url="http://www.gnu.org/software/grep/grep.html" +groups=('base' 'base-devel') +depends=('glibc' 'pcre' 'sh') +makedepends=('texinfo') +install=${pkgname}.install +source=(ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.xz{,.sig}) +md5sums=('d4a3f03849d1e17ce56ab76aa5a24cab' + 'b94fdcaa058b47a9a25099c26cd2e4c3') + +build() { + cd ${srcdir}/${pkgname}-${pkgver} + ./configure --prefix=/usr --without-included-regex + make +} + +check() { + cd ${srcdir}/${pkgname}-${pkgver} + make check +} + +package() { + cd ${srcdir}/${pkgname}-${pkgver} + make DESTDIR=${pkgdir} install +} Copied: grep/repos/testing-i686/grep-2.11-exclude-dir-crash.patch (from rev 176090, grep/trunk/grep-2.11-exclude-dir-crash.patch) =================================================================== --- testing-i686/grep-2.11-exclude-dir-crash.patch (rev 0) +++ testing-i686/grep-2.11-exclude-dir-crash.patch 2013-01-27 12:12:47 UTC (rev 176091) @@ -0,0 +1,44 @@ +From 12c957f786b12a4dd116f9c40a715d671d17fa16 Mon Sep 17 00:00:00 2001 +From: Allan McRae <al...@archlinux.org> +Date: Mon, 12 Mar 2012 09:28:01 +0100 +Subject: [PATCH] grep: fix segfault with -r --exclude-dir and no file operand + +* src/main.c (grepdir): Don't invoke excluded_file_name on NULL. +* NEWS (Bug fixes): Mention it. +--- + NEWS | 5 +++++ + src/main.c | 2 +- + 2 files changed, 6 insertions(+), 1 deletion(-) + +diff --git a/NEWS b/NEWS +index d0a63d5..d4d70f5 100644 +--- a/NEWS ++++ b/NEWS +@@ -2,6 +2,11 @@ GNU grep NEWS -*- outline -*- + + * Noteworthy changes in release ?.? (????-??-??) [?] + ++** Bug fixes ++ ++ grep no longer segfaults with -r --exclude-dir and no file operand. ++ I.e., ":|grep -r --exclude-dir=D PAT" would segfault. ++ + + * Noteworthy changes in release 2.11 (2012-03-02) [stable] + +diff --git a/src/main.c b/src/main.c +index 2f6c761..f4f1235 100644 +--- a/src/main.c ++++ b/src/main.c +@@ -1361,7 +1361,7 @@ grepdir (char const *dir, struct stats const *stats) + struct stats const *ancestor; + char *name_space; + int status = 1; +- if (excluded_directory_patterns ++ if (dir && excluded_directory_patterns + && excluded_file_name (excluded_directory_patterns, dir)) + return 1; + +-- +1.7.9.3 + Copied: grep/repos/testing-i686/grep.install (from rev 176090, grep/trunk/grep.install) =================================================================== --- testing-i686/grep.install (rev 0) +++ testing-i686/grep.install 2013-01-27 12:12:47 UTC (rev 176091) @@ -0,0 +1,17 @@ +infodir=usr/share/info +file=grep.info + +post_install() { + [ -x usr/bin/install-info ] || return 0 + install-info $infodir/$file.gz $infodir/dir 2> /dev/null +} + +post_upgrade() { + post_install $1 +} + +pre_remove() { + [ -x usr/bin/install-info ] || return 0 + install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null +} + Copied: grep/repos/testing-x86_64/PKGBUILD (from rev 176090, grep/trunk/PKGBUILD) =================================================================== --- testing-x86_64/PKGBUILD (rev 0) +++ testing-x86_64/PKGBUILD 2013-01-27 12:12:47 UTC (rev 176091) @@ -0,0 +1,34 @@ +# $Id$ +# Maintainer: Allan McRae <al...@archlinux.org> +# Contributor: judd <jvi...@zeroflux.org> + +pkgname=grep +pkgver=2.14 +pkgrel=2 +pkgdesc="A string search utility" +arch=('i686' 'x86_64') +license=('GPL3') +url="http://www.gnu.org/software/grep/grep.html" +groups=('base' 'base-devel') +depends=('glibc' 'pcre' 'sh') +makedepends=('texinfo') +install=${pkgname}.install +source=(ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.xz{,.sig}) +md5sums=('d4a3f03849d1e17ce56ab76aa5a24cab' + 'b94fdcaa058b47a9a25099c26cd2e4c3') + +build() { + cd ${srcdir}/${pkgname}-${pkgver} + ./configure --prefix=/usr --without-included-regex + make +} + +check() { + cd ${srcdir}/${pkgname}-${pkgver} + make check +} + +package() { + cd ${srcdir}/${pkgname}-${pkgver} + make DESTDIR=${pkgdir} install +} Copied: grep/repos/testing-x86_64/grep-2.11-exclude-dir-crash.patch (from rev 176090, grep/trunk/grep-2.11-exclude-dir-crash.patch) =================================================================== --- testing-x86_64/grep-2.11-exclude-dir-crash.patch (rev 0) +++ testing-x86_64/grep-2.11-exclude-dir-crash.patch 2013-01-27 12:12:47 UTC (rev 176091) @@ -0,0 +1,44 @@ +From 12c957f786b12a4dd116f9c40a715d671d17fa16 Mon Sep 17 00:00:00 2001 +From: Allan McRae <al...@archlinux.org> +Date: Mon, 12 Mar 2012 09:28:01 +0100 +Subject: [PATCH] grep: fix segfault with -r --exclude-dir and no file operand + +* src/main.c (grepdir): Don't invoke excluded_file_name on NULL. +* NEWS (Bug fixes): Mention it. +--- + NEWS | 5 +++++ + src/main.c | 2 +- + 2 files changed, 6 insertions(+), 1 deletion(-) + +diff --git a/NEWS b/NEWS +index d0a63d5..d4d70f5 100644 +--- a/NEWS ++++ b/NEWS +@@ -2,6 +2,11 @@ GNU grep NEWS -*- outline -*- + + * Noteworthy changes in release ?.? (????-??-??) [?] + ++** Bug fixes ++ ++ grep no longer segfaults with -r --exclude-dir and no file operand. ++ I.e., ":|grep -r --exclude-dir=D PAT" would segfault. ++ + + * Noteworthy changes in release 2.11 (2012-03-02) [stable] + +diff --git a/src/main.c b/src/main.c +index 2f6c761..f4f1235 100644 +--- a/src/main.c ++++ b/src/main.c +@@ -1361,7 +1361,7 @@ grepdir (char const *dir, struct stats const *stats) + struct stats const *ancestor; + char *name_space; + int status = 1; +- if (excluded_directory_patterns ++ if (dir && excluded_directory_patterns + && excluded_file_name (excluded_directory_patterns, dir)) + return 1; + +-- +1.7.9.3 + Copied: grep/repos/testing-x86_64/grep.install (from rev 176090, grep/trunk/grep.install) =================================================================== --- testing-x86_64/grep.install (rev 0) +++ testing-x86_64/grep.install 2013-01-27 12:12:47 UTC (rev 176091) @@ -0,0 +1,17 @@ +infodir=usr/share/info +file=grep.info + +post_install() { + [ -x usr/bin/install-info ] || return 0 + install-info $infodir/$file.gz $infodir/dir 2> /dev/null +} + +post_upgrade() { + post_install $1 +} + +pre_remove() { + [ -x usr/bin/install-info ] || return 0 + install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null +} +