diff options
author | Michał Masłowski <mtjm@mtjm.eu> | 2012-07-23 18:13:37 +0200 |
---|---|---|
committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-07-23 18:13:37 +0200 |
commit | cc565b7309a5708f2375b5f6926d173fd122119d (patch) | |
tree | c1d4adcda7f0b767537620aea02633158e17218a /testing/grep | |
parent | c25ed1401d3fa3dd6827c33bc11b660dcd425f23 (diff) | |
parent | a65eb6fe2ea0ffa22c65de34506c88aeeb3c88ee (diff) |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community-testing/electricsheep/PKGBUILD
community/bitcoin/PKGBUILD
community/gnash/PKGBUILD
community/mongodb/PKGBUILD
community/xmlrpc-c/PKGBUILD
community/xmoto/PKGBUILD
core/kbd/PKGBUILD
extra/elfutils/PKGBUILD
extra/gtk2/PKGBUILD
extra/hddtemp/PKGBUILD
extra/libpst/PKGBUILD
extra/mkvtoolnix/PKGBUILD
extra/php-apc/PKGBUILD
extra/pulseaudio/PKGBUILD
extra/pyqt/PKGBUILD
extra/quota-tools/PKGBUILD
extra/rhythmbox/PKGBUILD
extra/virtuoso/PKGBUILD
extra/vlc/PKGBUILD
extra/xf86-video-siliconmotion/PKGBUILD
kde-unstable/soprano/PKGBUILD
libre/epdfview-libre/PKGBUILD
libre/pacman/PKGBUILD
multilib/lib32-libpulse/PKGBUILD
multilib/wine/PKGBUILD
multilib/zsnes/PKGBUILD
testing/bash/PKGBUILD
testing/bison/PKGBUILD
testing/dbus-core/PKGBUILD
testing/dbus/PKGBUILD
testing/readline/PKGBUILD
testing/systemd/PKGBUILD
Diffstat (limited to 'testing/grep')
-rw-r--r-- | testing/grep/PKGBUILD | 34 | ||||
-rw-r--r-- | testing/grep/grep-2.11-exclude-dir-crash.patch | 44 | ||||
-rw-r--r-- | testing/grep/grep.install | 21 |
3 files changed, 0 insertions, 99 deletions
diff --git a/testing/grep/PKGBUILD b/testing/grep/PKGBUILD deleted file mode 100644 index 0b6547630..000000000 --- a/testing/grep/PKGBUILD +++ /dev/null @@ -1,34 +0,0 @@ -# $Id: PKGBUILD 163569 2012-07-16 02:50:23Z dreisner $ -# Maintainer: Allan McRae <allan@archlinux.org> -# Contributor: judd <jvinet@zeroflux.org> - -pkgname=grep -pkgver=2.13 -pkgrel=2 -pkgdesc="A string search utility" -arch=('i686' 'x86_64') -license=('GPL3') -url="http://www.gnu.org/software/grep/grep.html" -groups=('base') -depends=('glibc' 'pcre' 'sh') -makedepends=('texinfo') -install=${pkgname}.install -source=(ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.xz{,.sig}) -md5sums=('5894d484e6c02249f9702d0d8a472115' - '99acaa4d45ab931be2ecba49a1766df7') - -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 -} diff --git a/testing/grep/grep-2.11-exclude-dir-crash.patch b/testing/grep/grep-2.11-exclude-dir-crash.patch deleted file mode 100644 index 6b1731768..000000000 --- a/testing/grep/grep-2.11-exclude-dir-crash.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 12c957f786b12a4dd116f9c40a715d671d17fa16 Mon Sep 17 00:00:00 2001 -From: Allan McRae <allan@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 - diff --git a/testing/grep/grep.install b/testing/grep/grep.install deleted file mode 100644 index 7cd31301f..000000000 --- a/testing/grep/grep.install +++ /dev/null @@ -1,21 +0,0 @@ -infodir=usr/share/info -filelist=(grep.info) - -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 -} - |