Date: Friday, May 23, 2014 @ 21:12:45 Author: seblu Revision: 213421 upgpkg: grep 2.19-1
- upstream bump - cleanup Modified: grep/trunk/PKGBUILD grep/trunk/grep.install Deleted: grep/trunk/grep-2.11-exclude-dir-crash.patch -----------------------------------+ PKGBUILD | 25 ++++++++++---------- grep-2.11-exclude-dir-crash.patch | 44 ------------------------------------ grep.install | 11 ++++----- 3 files changed, 19 insertions(+), 61 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2014-05-23 18:41:23 UTC (rev 213420) +++ PKGBUILD 2014-05-23 19:12:45 UTC (rev 213421) @@ -1,34 +1,35 @@ # $Id$ -# Maintainer: Allan McRae <al...@archlinux.org> +# Maintainer: Sébastien Luttringer <se...@archlinux.org> +# Contributor: Allan McRae <al...@archlinux.org> # Contributor: judd <jvi...@zeroflux.org> pkgname=grep -pkgver=2.18 +pkgver=2.19 pkgrel=1 -pkgdesc="A string search utility" +pkgdesc='A string search utility' arch=('i686' 'x86_64') license=('GPL3') -url="http://www.gnu.org/software/grep/grep.html" +url='http://www.gnu.org/software/grep/grep.html' groups=('base' 'base-devel') -depends=('glibc' 'pcre' 'sh') +depends=('glibc' 'pcre') makedepends=('texinfo') -install=${pkgname}.install -source=(ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.xz{,.sig}) -md5sums=('7439f8266f50844b56cc3e2721606541' +install=$pkgname.install +source=("ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.xz"{,.sig}) +md5sums=('ac732142227d9fe9567d71301e127979' 'SKIP') build() { - cd ${srcdir}/${pkgname}-${pkgver} + cd $pkgname-$pkgver ./configure --prefix=/usr --without-included-regex make } check() { - cd ${srcdir}/${pkgname}-${pkgver} + cd $pkgname-$pkgver make check } package() { - cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=${pkgdir} install + cd $pkgname-$pkgver + make DESTDIR=$pkgdir install } Deleted: grep-2.11-exclude-dir-crash.patch =================================================================== --- grep-2.11-exclude-dir-crash.patch 2014-05-23 18:41:23 UTC (rev 213420) +++ grep-2.11-exclude-dir-crash.patch 2014-05-23 19:12:45 UTC (rev 213421) @@ -1,44 +0,0 @@ -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 - Modified: grep.install =================================================================== --- grep.install 2014-05-23 18:41:23 UTC (rev 213420) +++ grep.install 2014-05-23 19:12:45 UTC (rev 213421) @@ -2,16 +2,17 @@ file=grep.info post_install() { - [ -x usr/bin/install-info ] || return 0 - install-info $infodir/$file.gz $infodir/dir 2> /dev/null + [[ -x usr/bin/install-info ]] || return 0 + install-info "$infodir/$file.gz" "$infodir/dir" 2> /dev/null } post_upgrade() { - post_install $1 + post_install "$1" } pre_remove() { - [ -x usr/bin/install-info ] || return 0 - install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null + [[ -x usr/bin/install-info ]] || return 0 + install-info --delete "$infodir/$file.gz" "$infodir/dir" 2> /dev/null } +# vim:set ts=2 sw=2 ft=sh et: