diff --git a/grep-2.15.tar.xz b/grep-2.15.tar.xz deleted file mode 100644 index 06fac56..0000000 --- a/grep-2.15.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:bf5a834e587974c8c64e71b35b9e75cd21c7ff253c0e7fbfb0a78be794965314 -size 1267312 diff --git a/grep-2.15.tar.xz.sig b/grep-2.15.tar.xz.sig deleted file mode 100644 index 81c7c97..0000000 --- a/grep-2.15.tar.xz.sig +++ /dev/null @@ -1,19 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.19 (GNU/Linux) - -iQJ8BAABCgBmBQJSa/ifXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w -ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQxNTVEM0ZDNTAwQzgzNDQ4NkQxRUVBNjc3 -RkQ5RkNDQjAwMEJFRUVFAAoJEH/Z/MsAC+7uxAkP/0XP/7YlCL1YdpUMsCzmiZqT -hZ5yG5cqqCsr5ESRvfRJ7HhVRGHfDX/3YXfqG8inNCtREKFqMgBxfitqJxHux+sd -jhDAg8qThHu4t4FIgC84kDjokd4OXtBZWLXs10ycEJOVftMVexPEDbi0A9GBiQ8G -JYp/bhjieALDCx1PCO3O6G8cAGgfaEk9sPq0W8bQPGPjtl2jXZKZKL8hRChtqS2A -wT0V4Q547ZI5DZJm3fcZclblwnHWXY2TJh9Ne3z0m4uy7GHz1gvQMKmMAsE+Wct1 -GJPfSjqsmy62cLj0W7pgLFOL5jPZdI6sHGokdvEsEbPQkjqG9yLUeHmsinLjsoVP -c+mfhXnT/IY5PAleMrvteipOLP/SS8G6MyI28Vri4BA/XVSyVzJZ4M6QKIiicKF3 -60lgMwPJWgR3fpgW367eAQwcNsvSD66dOyDMgI/iqLjP+LaoYK09IXGt4ZWJ9QJp -Q88M0tCB6esqxjV9kdt+zgrzpbwJEqLOcB8B8N8dXMLAyb6HiJuN2mgD6hR9D23O -3oiEjKWpRzQRfIXK49YOW+EVjyLGRLlU7SMwgZseJPu+YQZZ2RwHq+Yj831BbJ4u -yRQNC5pZdcaYyv56xZJR2TQK8R/w9HeohmzqCVMHOa4HZv3pVPE7yPdkx0hK1vJ/ -tuu9AXHedPKOyGaP/wjJ -=1fjx ------END PGP SIGNATURE----- diff --git a/grep-2.16.tar.xz b/grep-2.16.tar.xz new file mode 100644 index 0000000..77dc3ec --- /dev/null +++ b/grep-2.16.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:16dfeb5013d8c9f21f40ccec0936f2c1c6a014c828d30488f0d5c6ef7b551162 +size 1210192 diff --git a/grep-2.16.tar.xz.sig b/grep-2.16.tar.xz.sig new file mode 100644 index 0000000..7c4e2fa --- /dev/null +++ b/grep-2.16.tar.xz.sig @@ -0,0 +1,19 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.22 (GNU/Linux) + +iQJ8BAABCgBmBQJSxO/+XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w +ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQxNTVEM0ZDNTAwQzgzNDQ4NkQxRUVBNjc3 +RkQ5RkNDQjAwMEJFRUVFAAoJEH/Z/MsAC+7uyRcP+wdaaHZfFCRYs4HBDQjBQsvD +mqht6oMWCvGmaoLsvKVHWu3D6RkWj47zKARfIXBa5CG+lhrBWbYu5u8IhfPWLEZ+ +XzoJ3lazcndK6MQIbtQTQn2B7g71ZOSoLmq3CN/cUqbgUHPZVB4XYct2Gj33yzDB +Dpu+BzNtOnKWB/BvWyaKVvWyDb28hzJPmMbs+5Vj+XkkHFS3/e3Jr60wrkuz2rUH +5ld6LqjmDW8NF053oC54HxwOEkPSXfUomWHG574IQF6GagVx9oPdN9XzJEdq+W3w +w3ZciOESwcDvXqQN2BCpPEd7wjAHAUfmu2dVWIS5eyT4PiVxbxnvUQGomFwc9iec +MN3Tj7zLdmyc5tVNr0+R/9orY/TK+fU+UDCCY0jgZlJtD9LfDc3aPo86UaUkRiNx +TaDNdAkqlD13ENNftED4/2uY8HvKSMCVYoWm8/AluiapPC79OsOeKjf2S2B4He5v +OGhx8oyq0h7lWirIYtrgtLo3ba6YLy6iKA8wDfSkbj3Llaq/GxCyE9LA7J9mo5Ff +5W2XI7lkSYu0thdJeBkLlVAYMczExMk7jfQigO3mdghAWsbU7/ObpG7Dk4F8Mxid +zdN9A5bq656N9M0hX0G5SYI6yWzilVnRfeNSrg6B9OjOLYF32Xrbmfw6DiwhW9uJ +zxK7ZFdf7jfAfXaRx6Px +=Ynhf +-----END PGP SIGNATURE----- diff --git a/grep-gnulib-ppc64le.patch b/grep-gnulib-ppc64le.patch deleted file mode 100644 index ee05437..0000000 --- a/grep-gnulib-ppc64le.patch +++ /dev/null @@ -1,41 +0,0 @@ -diff --git a/gnulib-tests/test-isnanl.h b/gnulib-tests/test-isnanl.h -index 06e6a7c..2df10f8 100644 ---- a/gnulib-tests/test-isnanl.h -+++ b/gnulib-tests/test-isnanl.h -@@ -51,6 +51,15 @@ main () - /* A bit pattern that is different from a Quiet NaN. With a bit of luck, - it's a Signalling NaN. */ - { -+#if defined __powerpc__ && LDBL_MANT_DIG == 106 -+ /* This is PowerPC "double double", a pair of two doubles. Inf and Nan are -+ represented as the corresponding 64-bit IEEE values in the first double; -+ the second is ignored. Manipulate only the first double. */ -+ #undef NWORDS -+ #define NWORDS \ -+ ((sizeof (double) + sizeof (unsigned int) - 1) / sizeof (unsigned int)) -+#endif -+ - memory_long_double m; - m.value = NaNl (); - # if LDBL_EXPBIT0_BIT > 0 -diff --git a/gnulib-tests/test-signbit.c b/gnulib-tests/test-signbit.c -index e8ea097..7e24292 100644 ---- a/gnulib-tests/test-signbit.c -+++ b/gnulib-tests/test-signbit.c -@@ -151,6 +151,16 @@ test_signbitl () - #define NWORDS \ - ((sizeof (long double) + sizeof (unsigned int) - 1) / sizeof (unsigned int)) - typedef union { long double value; unsigned int word[NWORDS]; } memory_long_double; -+ -+#if defined __powerpc__ && LDBL_MANT_DIG == 106 -+ /* This is PowerPC "double double", a pair of two doubles. Inf and Nan are -+ represented as the corresponding 64-bit IEEE values in the first double; -+ the second is ignored. Manipulate only the first double. */ -+ #undef NWORDS -+ #define NWORDS \ -+ ((sizeof (double) + sizeof (unsigned int) - 1) / sizeof (unsigned int)) -+#endif -+ - memory_long_double m; - m.value = zerol / zerol; - # if LDBL_EXPBIT0_BIT > 0 diff --git a/grep.changes b/grep.changes index cbc28bd..4e88493 100644 --- a/grep.changes +++ b/grep.changes @@ -1,3 +1,22 @@ +------------------------------------------------------------------- +Sun Jan 5 14:01:24 UTC 2014 - andreas.stieger@gmx.de + +- update to 2.16 + * Fix gnulib-provided maint.mk to report correct version number + * The fix to make \s and \S work with multi-byte white space + broke the use of each shortcut whenever followed by a repetition + operator. For example, \s*, \s+, \s? and \s{3} would all + malfunction in a multi-byte locale. + * The fix to make grep -P work better with UTF-8 made it possible + for grep to evoke a larger set of PCRE errors, some of which + could trigger an abort. E.g., this would abort: + printf '\x82'|LC_ALL=en_US.UTF-8 grep -P y + Now grep handles arbitrary PCRE errors + * Handle very long lines (2GiB and longer) on systems with a + deficient read system call. +- removed patches: + * grep-gnulib-ppc64le.patch, upstream source removed + ------------------------------------------------------------------- Mon Dec 23 21:17:06 UTC 2013 - coolo@suse.com diff --git a/grep.spec b/grep.spec index a7f8cc3..1c551de 100644 --- a/grep.spec +++ b/grep.spec @@ -1,7 +1,7 @@ # # spec file for package grep # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -26,7 +26,7 @@ BuildRequires: pcre Url: http://www.gnu.org/software/grep/ Provides: base:/usr/bin/grep PreReq: %{install_info_prereq} -Version: 2.15 +Version: 2.16 Release: 0 Summary: Print lines matching a pattern License: GPL-3.0+ @@ -34,8 +34,6 @@ Group: Productivity/Text/Utilities Source0: http://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.xz Source2: http://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.xz.sig Source3: http://savannah.gnu.org/project/memberlist-gpgkeys.php?group=grep&download=1#/%{name}.keyring -# Fix imported gnulib long double math tests for little-endian PowerPC -Patch1: grep-gnulib-ppc64le.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -45,7 +43,6 @@ the matching lines. %prep %setup -q -%patch1 -p1 %if 0%{?suse_version} < 1120 echo "ac_cv_search_pcre_compile=\${ac_cv_search_pcre_compile=%{_libdir}/libpcre.a}" >config.cache %endif