From a379af41caaf1aa979231047baabce25116723e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= Date: Mon, 16 Dec 2013 11:24:09 +0100 Subject: [PATCH] 8.34 bump --- .gitignore | 1 + ...sh-with-a-data-line-longer-than-6553.patch | 54 ------------------- pcre.spec | 7 ++- sources | 2 +- 4 files changed, 7 insertions(+), 57 deletions(-) delete mode 100644 pcre-8.33-RC1-Fix-pcretest-crash-with-a-data-line-longer-than-6553.patch diff --git a/.gitignore b/.gitignore index 70617eb..e6aa32d 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,4 @@ pcre-8.10.tar.bz2 /pcre-8.32.tar.bz2 /pcre-8.33-RC1.tar.bz2 /pcre-8.33.tar.bz2 +/pcre-8.34.tar.bz2 diff --git a/pcre-8.33-RC1-Fix-pcretest-crash-with-a-data-line-longer-than-6553.patch b/pcre-8.33-RC1-Fix-pcretest-crash-with-a-data-line-longer-than-6553.patch deleted file mode 100644 index f2d4865..0000000 --- a/pcre-8.33-RC1-Fix-pcretest-crash-with-a-data-line-longer-than-6553.patch +++ /dev/null @@ -1,54 +0,0 @@ -From bf2c63fda75cca4ab3006b6ccdf0f18fafe4fca5 Mon Sep 17 00:00:00 2001 -From: ph10 -Date: Fri, 10 May 2013 16:22:40 +0000 -Subject: [PATCH] Fix pcretest crash with a data line longer than 65536 bytes. - -git-svn-id: svn://vcs.exim.org/pcre/code/trunk@1327 2f5784b3-3f2a-0410-8824-cb99058d5e15 - -Petr Pisar: Port to 8.31-RC1 - -diff --git a/pcretest.c b/pcretest.c -index 6ef3252..25f3853 100644 ---- a/pcretest.c -+++ b/pcretest.c -@@ -4411,7 +4411,8 @@ while (!done) - - #ifndef NOUTF - /* Check that the data is well-formed UTF-8 if we're in UTF mode. To create -- invalid input to pcre_exec, you must use \x?? or \x{} sequences. */ -+ invalid input to pcre_exec, you must use \x?? or \x{} sequences. */ -+ - if (use_utf) - { - pcre_uint8 *q; -@@ -4429,21 +4430,23 @@ while (!done) - - #ifdef SUPPORT_VALGRIND - /* Mark the dbuffer as addressable but undefined again. */ -+ - if (dbuffer != NULL) - { - VALGRIND_MAKE_MEM_UNDEFINED(dbuffer, dbuffer_size * CHAR_SIZE); - } - #endif - -- /* Allocate a buffer to hold the data line. len+1 is an upper bound on -- the number of pcre_uchar units that will be needed. */ -- if (dbuffer == NULL || (size_t)len >= dbuffer_size) -+ /* Allocate a buffer to hold the data line; len+1 is an upper bound on -+ the number of pcre_uchar units that will be needed. */ -+ -+ while (dbuffer == NULL || (size_t)len >= dbuffer_size) - { - dbuffer_size *= 2; - dbuffer = (pcre_uint8 *)realloc(dbuffer, dbuffer_size * CHAR_SIZE); - if (dbuffer == NULL) - { -- fprintf(stderr, "pcretest: malloc(%d) failed\n", (int)dbuffer_size); -+ fprintf(stderr, "pcretest: realloc(%d) failed\n", (int)dbuffer_size); - exit(1); - } - } --- -1.8.1.4 - diff --git a/pcre.spec b/pcre.spec index 21588a8..86a06c1 100644 --- a/pcre.spec +++ b/pcre.spec @@ -1,8 +1,8 @@ # This is stable release: #%%global rcversion RC1 Name: pcre -Version: 8.33 -Release: %{?rcversion:0.}3%{?rcversion:.%rcversion}%{?dist} +Version: 8.34 +Release: %{?rcversion:0.}1%{?rcversion:.%rcversion}%{?dist} %global myversion %{version}%{?rcversion:-%rcversion} Summary: Perl-compatible regular expression library Group: System Environment/Libraries @@ -121,6 +121,9 @@ make check %{_mandir}/man1/pcretest.* %changelog +* Mon Dec 16 2013 Petr Pisar - 8.34-1 +- 8.34 bump + * Wed Oct 16 2013 Petr Pisar - 8.33-3 - Disable strict-aliasing on PPC64 (bug #881232) diff --git a/sources b/sources index aad47c5..c092ad7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -21514018448ac10062ece7a668fca949 pcre-8.33.tar.bz2 +5439e321351bddd5533551bbce128d07 pcre-8.34.tar.bz2