From 3b88b61d0c7b33279892b767f088376fa6a7f8e8800ea6feeb760a122a35a535 Mon Sep 17 00:00:00 2001 From: Johannes Meixner Date: Fri, 24 Sep 2010 12:55:39 +0000 Subject: [PATCH 1/3] Accepting request 49038 from home:jsmeix:branches:Base:System Fixed --without-included-rege (missing x at the end) typo in the spec file OBS-URL: https://build.opensuse.org/request/show/49038 OBS-URL: https://build.opensuse.org/package/show/Base:System/grep?expand=0&rev=9 --- grep.changes | 8 ++++++++ grep.spec | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/grep.changes b/grep.changes index 847cf76..c1e6edd 100644 --- a/grep.changes +++ b/grep.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Fri Sep 24 14:47:33 CEST 2010 - jsmeix@suse.de + +- Replaced configure typo '--without-included-rege' + in grep.spec (only in case of suse_version < 1120) + with '--without-included-regex' (which is the default + on systems with recent-enough version of the GNU C Library). + ------------------------------------------------------------------- Thu Sep 23 12:47:04 CEST 2010 - jsmeix@suse.de diff --git a/grep.spec b/grep.spec index 9e376be..c44eb82 100644 --- a/grep.spec +++ b/grep.spec @@ -47,7 +47,7 @@ echo "ac_cv_search_pcre_compile=\${ac_cv_search_pcre_compile=%{_libdir}/libpcre. %build %if 0%{?suse_version} < 1120 -%configure -C --bindir=/bin --without-included-rege +%configure -C --bindir=/bin --without-included-regex %else AUTOPOINT=true autoreconf --force --install %configure --bindir=/bin --without-included-regex From 47cebbd2000eb73f9d59cf06a1c9dc1c63ca07fc41b7a6e51cb81bb8d6b1aac2 Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Sun, 26 Sep 2010 22:36:43 +0000 Subject: [PATCH 2/3] Accepting request 49040 from Base:System checked in (request 49040) OBS-URL: https://build.opensuse.org/request/show/49040 OBS-URL: https://build.opensuse.org/package/show/Base:System/grep?expand=0&rev=10 --- grep.changes | 8 -------- grep.spec | 2 +- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/grep.changes b/grep.changes index c1e6edd..847cf76 100644 --- a/grep.changes +++ b/grep.changes @@ -1,11 +1,3 @@ -------------------------------------------------------------------- -Fri Sep 24 14:47:33 CEST 2010 - jsmeix@suse.de - -- Replaced configure typo '--without-included-rege' - in grep.spec (only in case of suse_version < 1120) - with '--without-included-regex' (which is the default - on systems with recent-enough version of the GNU C Library). - ------------------------------------------------------------------- Thu Sep 23 12:47:04 CEST 2010 - jsmeix@suse.de diff --git a/grep.spec b/grep.spec index c44eb82..9e376be 100644 --- a/grep.spec +++ b/grep.spec @@ -47,7 +47,7 @@ echo "ac_cv_search_pcre_compile=\${ac_cv_search_pcre_compile=%{_libdir}/libpcre. %build %if 0%{?suse_version} < 1120 -%configure -C --bindir=/bin --without-included-regex +%configure -C --bindir=/bin --without-included-rege %else AUTOPOINT=true autoreconf --force --install %configure --bindir=/bin --without-included-regex From c80f2e2b773a2e8384f252fcef969d1ccb8ccc3394da154b4797fc458c2f56a2 Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Wed, 10 Aug 2011 09:57:16 +0000 Subject: [PATCH 3/3] Accepting request 78414 from home:elvigia:branches:Base:System - Upgrade to version 2.9 * grep no longer clobbers heap for an ERE like '(^| )*( |$)'' )' * grep -P no longer aborts when PCRE's backtracking limit is exceeded * grep's interpretation of range expression is now more consistent OBS-URL: https://build.opensuse.org/request/show/78414 OBS-URL: https://build.opensuse.org/package/show/Base:System/grep?expand=0&rev=11 --- grep-2.7.tar.bz2 | 3 --- grep-2.9.tar.bz2 | 3 +++ grep.changes | 16 ++++++++++++++++ grep.spec | 12 ++++++------ 4 files changed, 25 insertions(+), 9 deletions(-) delete mode 100644 grep-2.7.tar.bz2 create mode 100644 grep-2.9.tar.bz2 diff --git a/grep-2.7.tar.bz2 b/grep-2.7.tar.bz2 deleted file mode 100644 index d21dbf9..0000000 --- a/grep-2.7.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:25061240265afa4ccf9383d11ddb5d3ccff12a2810f227286f7e566d506f239e -size 1166732 diff --git a/grep-2.9.tar.bz2 b/grep-2.9.tar.bz2 new file mode 100644 index 0000000..86f6a3d --- /dev/null +++ b/grep-2.9.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c7e1fabf8bb600b19f367d8040ed7a32f4c7612e0477ed994cb35d1216223de1 +size 1414132 diff --git a/grep.changes b/grep.changes index 847cf76..42a3ad3 100644 --- a/grep.changes +++ b/grep.changes @@ -1,3 +1,19 @@ +------------------------------------------------------------------- +Wed Aug 10 03:17:41 UTC 2011 - crrodriguez@opensuse.org + +- Upgrade to version 2.9 +* grep no longer clobbers heap for an ERE like '(^| )*( |$)'' )' +* grep -P no longer aborts when PCRE's backtracking limit is exceeded +* grep's interpretation of range expression is now more consistent + +------------------------------------------------------------------- +Fri Sep 24 14:47:33 CEST 2010 - jsmeix@suse.de + +- Replaced configure typo '--without-included-rege' + in grep.spec (only in case of suse_version < 1120) + with '--without-included-regex' (which is the default + on systems with recent-enough version of the GNU C Library). + ------------------------------------------------------------------- Thu Sep 23 12:47:04 CEST 2010 - jsmeix@suse.de diff --git a/grep.spec b/grep.spec index 9e376be..30d7286 100644 --- a/grep.spec +++ b/grep.spec @@ -28,8 +28,8 @@ Group: Productivity/Text/Utilities Provides: base:/usr/bin/grep AutoReqProv: on PreReq: %{install_info_prereq} -Version: 2.7 -Release: 1 +Version: 2.9 +Release: 2 Summary: Print lines matching a pattern Source: grep-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -47,10 +47,10 @@ echo "ac_cv_search_pcre_compile=\${ac_cv_search_pcre_compile=%{_libdir}/libpcre. %build %if 0%{?suse_version} < 1120 -%configure -C --bindir=/bin --without-included-rege +%configure -C --bindir=/bin --disable-silent-rules --without-included-regex %else AUTOPOINT=true autoreconf --force --install -%configure --bindir=/bin --without-included-regex +%configure --disable-silent-rules --bindir=/bin --without-included-regex %endif %{__make} %{?_smp_mflags} @@ -76,7 +76,7 @@ ln -sf ../../bin/grep $RPM_BUILD_ROOT/usr/bin/grep %doc README AUTHORS NEWS THANKS TODO /bin/* /usr/bin/* -%doc %{_mandir}/man1/*.gz -%doc %{_infodir}/*.gz +%{_mandir}/man1/*.gz +%{_infodir}/*.gz %changelog