From 9e6c835afb726b1eb283d7b81b37b86dd5e5f0a0 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Wed, 4 Nov 2015 19:29:17 +0000
Subject: grep: update to 2.22

---
 abs/core/grep/PKGBUILD                          | 34 ++++++++++---------
 abs/core/grep/grep-2.11-exclude-dir-crash.patch | 44 -------------------------
 abs/core/grep/grep.install                      | 17 ++++------
 3 files changed, 25 insertions(+), 70 deletions(-)
 delete mode 100644 abs/core/grep/grep-2.11-exclude-dir-crash.patch

diff --git a/abs/core/grep/PKGBUILD b/abs/core/grep/PKGBUILD
index b878e71..c910394 100644
--- a/abs/core/grep/PKGBUILD
+++ b/abs/core/grep/PKGBUILD
@@ -1,34 +1,36 @@
-# $Id: PKGBUILD 163715 2012-07-18 02:16:59Z dreisner $
-# Maintainer: Allan McRae <allan@archlinux.org>
+# $Id$
+# Maintainer: Sébastien Luttringer <seblu@archlinux.org>
+# Contributor: Allan McRae <allan@archlinux.org>
 # Contributor: judd <jvinet@zeroflux.org>
 
 pkgname=grep
-pkgver=2.13
-pkgrel=2
-pkgdesc="A string search utility"
+pkgver=2.22
+pkgrel=1
+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')
+url='http://www.gnu.org/software/grep/grep.html'
+groups=('base' 'base-devel')
+depends=('glibc' 'pcre')
 makedepends=('texinfo')
-install=${pkgname}.install
-source=(ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.xz{,.sig})
-md5sums=('5894d484e6c02249f9702d0d8a472115'
-         '99acaa4d45ab931be2ecba49a1766df7')
+install=$pkgname.install
+validpgpkeys=('155D3FC500C834486D1EEA677FD9FCCB000BEEEE') # Jim Meyering
+source=("ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.xz"{,.sig})
+md5sums=('e1015e951a49a82b02e38891026ef5df'
+         '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
 }
diff --git a/abs/core/grep/grep-2.11-exclude-dir-crash.patch b/abs/core/grep/grep-2.11-exclude-dir-crash.patch
deleted file mode 100644
index 6b17317..0000000
--- a/abs/core/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/abs/core/grep/grep.install b/abs/core/grep/grep.install
index 7cd3130..a594d9c 100644
--- a/abs/core/grep/grep.install
+++ b/abs/core/grep/grep.install
@@ -1,21 +1,18 @@
 infodir=usr/share/info
-filelist=(grep.info)
+file=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
+  [[ -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
-  for file in ${filelist[@]}; do
-    install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
-  done
+  [[ -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:
-- 
cgit v0.12

