Date: Sunday, May 25, 2014 @ 21:31:44
Author: seblu
Revision: 213576
db-move: moved grep from [testing] to [core] (i686, x86_64)
Added:
grep/repos/core-i686/PKGBUILD
(from rev 213575, grep/repos/testing-i686/PKGBUILD)
grep/repos/core-i686/grep.install
(from rev 213575, grep/repos/testing-i686/grep.install)
grep/repos/core-x86_64/PKGBUILD
(from rev 213575, grep/repos/testing-x86_64/PKGBUILD)
grep/repos/core-x86_64/grep.install
(from rev 213575, grep/repos/testing-x86_64/grep.install)
Deleted:
grep/repos/core-i686/PKGBUILD
grep/repos/core-i686/grep-2.11-exclude-dir-crash.patch
grep/repos/core-i686/grep.install
grep/repos/core-x86_64/PKGBUILD
grep/repos/core-x86_64/grep-2.11-exclude-dir-crash.patch
grep/repos/core-x86_64/grep.install
grep/repos/testing-i686/
grep/repos/testing-x86_64/
-----------------------------------------------+
/PKGBUILD | 70 ++++++++++++++++++++++++
/grep.install | 36 ++++++++++++
core-i686/PKGBUILD | 34 -----------
core-i686/grep-2.11-exclude-dir-crash.patch | 44 ---------------
core-i686/grep.install | 17 -----
core-x86_64/PKGBUILD | 34 -----------
core-x86_64/grep-2.11-exclude-dir-crash.patch | 44 ---------------
core-x86_64/grep.install | 17 -----
8 files changed, 106 insertions(+), 190 deletions(-)
Deleted: core-i686/PKGBUILD
===================================================================
--- core-i686/PKGBUILD 2014-05-25 16:44:23 UTC (rev 213575)
+++ core-i686/PKGBUILD 2014-05-25 19:31:44 UTC (rev 213576)
@@ -1,34 +0,0 @@
-# $Id$
-# Maintainer: Allan McRae <al...@archlinux.org>
-# Contributor: judd <jvi...@zeroflux.org>
-
-pkgname=grep
-pkgver=2.18
-pkgrel=1
-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=('7439f8266f50844b56cc3e2721606541'
- 'SKIP')
-
-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/core-i686/PKGBUILD (from rev 213575,
grep/repos/testing-i686/PKGBUILD)
===================================================================
--- core-i686/PKGBUILD (rev 0)
+++ core-i686/PKGBUILD 2014-05-25 19:31:44 UTC (rev 213576)
@@ -0,0 +1,35 @@
+# $Id$
+# Maintainer: Sébastien Luttringer <se...@archlinux.org>
+# Contributor: Allan McRae <al...@archlinux.org>
+# Contributor: judd <jvi...@zeroflux.org>
+
+pkgname=grep
+pkgver=2.19
+pkgrel=1
+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')
+makedepends=('texinfo')
+install=$pkgname.install
+source=("ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.xz"{,.sig})
+md5sums=('ac732142227d9fe9567d71301e127979'
+ 'SKIP')
+
+build() {
+ cd $pkgname-$pkgver
+ ./configure --prefix=/usr --without-included-regex
+ make
+}
+
+check() {
+ cd $pkgname-$pkgver
+ make check
+}
+
+package() {
+ cd $pkgname-$pkgver
+ make DESTDIR=$pkgdir install
+}
Deleted: core-i686/grep-2.11-exclude-dir-crash.patch
===================================================================
--- core-i686/grep-2.11-exclude-dir-crash.patch 2014-05-25 16:44:23 UTC (rev
213575)
+++ core-i686/grep-2.11-exclude-dir-crash.patch 2014-05-25 19:31:44 UTC (rev
213576)
@@ -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
-
Deleted: core-i686/grep.install
===================================================================
--- core-i686/grep.install 2014-05-25 16:44:23 UTC (rev 213575)
+++ core-i686/grep.install 2014-05-25 19:31:44 UTC (rev 213576)
@@ -1,17 +0,0 @@
-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/core-i686/grep.install (from rev 213575,
grep/repos/testing-i686/grep.install)
===================================================================
--- core-i686/grep.install (rev 0)
+++ core-i686/grep.install 2014-05-25 19:31:44 UTC (rev 213576)
@@ -0,0 +1,18 @@
+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
+}
+
+# vim:set ts=2 sw=2 ft=sh et:
Deleted: core-x86_64/PKGBUILD
===================================================================
--- core-x86_64/PKGBUILD 2014-05-25 16:44:23 UTC (rev 213575)
+++ core-x86_64/PKGBUILD 2014-05-25 19:31:44 UTC (rev 213576)
@@ -1,34 +0,0 @@
-# $Id$
-# Maintainer: Allan McRae <al...@archlinux.org>
-# Contributor: judd <jvi...@zeroflux.org>
-
-pkgname=grep
-pkgver=2.18
-pkgrel=1
-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=('7439f8266f50844b56cc3e2721606541'
- 'SKIP')
-
-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/core-x86_64/PKGBUILD (from rev 213575,
grep/repos/testing-x86_64/PKGBUILD)
===================================================================
--- core-x86_64/PKGBUILD (rev 0)
+++ core-x86_64/PKGBUILD 2014-05-25 19:31:44 UTC (rev 213576)
@@ -0,0 +1,35 @@
+# $Id$
+# Maintainer: Sébastien Luttringer <se...@archlinux.org>
+# Contributor: Allan McRae <al...@archlinux.org>
+# Contributor: judd <jvi...@zeroflux.org>
+
+pkgname=grep
+pkgver=2.19
+pkgrel=1
+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')
+makedepends=('texinfo')
+install=$pkgname.install
+source=("ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.xz"{,.sig})
+md5sums=('ac732142227d9fe9567d71301e127979'
+ 'SKIP')
+
+build() {
+ cd $pkgname-$pkgver
+ ./configure --prefix=/usr --without-included-regex
+ make
+}
+
+check() {
+ cd $pkgname-$pkgver
+ make check
+}
+
+package() {
+ cd $pkgname-$pkgver
+ make DESTDIR=$pkgdir install
+}
Deleted: core-x86_64/grep-2.11-exclude-dir-crash.patch
===================================================================
--- core-x86_64/grep-2.11-exclude-dir-crash.patch 2014-05-25 16:44:23 UTC
(rev 213575)
+++ core-x86_64/grep-2.11-exclude-dir-crash.patch 2014-05-25 19:31:44 UTC
(rev 213576)
@@ -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
-
Deleted: core-x86_64/grep.install
===================================================================
--- core-x86_64/grep.install 2014-05-25 16:44:23 UTC (rev 213575)
+++ core-x86_64/grep.install 2014-05-25 19:31:44 UTC (rev 213576)
@@ -1,17 +0,0 @@
-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/core-x86_64/grep.install (from rev 213575,
grep/repos/testing-x86_64/grep.install)
===================================================================
--- core-x86_64/grep.install (rev 0)
+++ core-x86_64/grep.install 2014-05-25 19:31:44 UTC (rev 213576)
@@ -0,0 +1,18 @@
+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
+}
+
+# vim:set ts=2 sw=2 ft=sh et:
