From 37e5ac74b92a560d54b1102f16a5e0bd7076c1f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= Date: Fri, 14 Feb 2020 08:39:58 +0100 Subject: [PATCH] 8.44 bump --- .gitignore | 2 + Public-Key | 39 ++++ ...f-the-number-after-C-as-it-is-read-i.patch | 55 ----- ...ion-of-LF-from-list-in-the-C-wrapper.patch | 28 --- ...id-sanitizer-complaint-in-POSIX-wrap.patch | 46 ---- ...d-of-sanitize-warnings-mostly-about-.patch | 202 ------------------ pcre.spec | 37 ++-- sources | 3 +- 8 files changed, 56 insertions(+), 356 deletions(-) create mode 100644 Public-Key delete mode 100644 pcre-8.43-Check-the-size-of-the-number-after-C-as-it-is-read-i.patch delete mode 100644 pcre-8.43-Fix-omission-of-LF-from-list-in-the-C-wrapper.patch delete mode 100644 pcre-8.43-Minor-fix-to-avoid-sanitizer-complaint-in-POSIX-wrap.patch delete mode 100644 pcre-8.43-Tidies-to-get-rid-of-sanitize-warnings-mostly-about-.patch diff --git a/.gitignore b/.gitignore index 730356b..48ae57d 100644 --- a/.gitignore +++ b/.gitignore @@ -34,3 +34,5 @@ pcre-8.10.tar.bz2 /pcre-8.42.tar.bz2 /pcre-8.43-RC1.tar.bz2 /pcre-8.43.tar.bz2 +/pcre-8.44.tar.bz2 +/pcre-8.44.tar.bz2.sig diff --git a/Public-Key b/Public-Key new file mode 100644 index 0000000..95dbb71 --- /dev/null +++ b/Public-Key @@ -0,0 +1,39 @@ +This is Philip Hazel's public GPG key. + +-----BEGIN PGP PUBLIC KEY BLOCK----- +Version: GnuPG v1.2.0 (SunOS) + +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 +nmq1bbjAU4QVuIS9nkk2GrGx5+N6cYMy8JqG +=EHsz +-----END PGP PUBLIC KEY BLOCK----- diff --git a/pcre-8.43-Check-the-size-of-the-number-after-C-as-it-is-read-i.patch b/pcre-8.43-Check-the-size-of-the-number-after-C-as-it-is-read-i.patch deleted file mode 100644 index 06b7db0..0000000 --- a/pcre-8.43-Check-the-size-of-the-number-after-C-as-it-is-read-i.patch +++ /dev/null @@ -1,55 +0,0 @@ -From 3a9026509f9c1745f378595e55e5024361ad152d Mon Sep 17 00:00:00 2001 -From: ph10 -Date: Mon, 10 Feb 2020 17:17:34 +0000 -Subject: [PATCH] Check the size of the number after (?C as it is read, in - order to avoid integer overflow. -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -git-svn-id: svn://vcs.exim.org/pcre/code/trunk@1761 2f5784b3-3f2a-0410-8824-cb99058d5e15 -Petr Písař: Ported to 8.43. ---- - pcre_compile.c | 14 ++++++++------ - -diff --git a/pcre_compile.c b/pcre_compile.c -index 079d30a..1e3d6c3 100644 ---- a/pcre_compile.c -+++ b/pcre_compile.c -@@ -6,7 +6,7 @@ - and semantics are as close as possible to those of the Perl 5 language. - - Written by Philip Hazel -- Copyright (c) 1997-2018 University of Cambridge -+ Copyright (c) 1997-2020 University of Cambridge - - ----------------------------------------------------------------------------- - Redistribution and use in source and binary forms, with or without -@@ -7130,17 +7130,19 @@ for (;; ptr++) - int n = 0; - ptr++; - while(IS_DIGIT(*ptr)) -+ { - n = n * 10 + *ptr++ - CHAR_0; -+ if (n > 255) -+ { -+ *errorcodeptr = ERR38; -+ goto FAILED; -+ } -+ } - if (*ptr != CHAR_RIGHT_PARENTHESIS) - { - *errorcodeptr = ERR39; - goto FAILED; - } -- if (n > 255) -- { -- *errorcodeptr = ERR38; -- goto FAILED; -- } - *code++ = n; - PUT(code, 0, (int)(ptr - cd->start_pattern + 1)); /* Pattern offset */ - PUT(code, LINK_SIZE, 0); /* Default length */ --- -2.21.1 - diff --git a/pcre-8.43-Fix-omission-of-LF-from-list-in-the-C-wrapper.patch b/pcre-8.43-Fix-omission-of-LF-from-list-in-the-C-wrapper.patch deleted file mode 100644 index 6c4e97c..0000000 --- a/pcre-8.43-Fix-omission-of-LF-from-list-in-the-C-wrapper.patch +++ /dev/null @@ -1,28 +0,0 @@ -From f74e04f2d8755fdd5cf5e387735593354972ad23 Mon Sep 17 00:00:00 2001 -From: ph10 -Date: Thu, 23 May 2019 16:27:33 +0000 -Subject: [PATCH] Fix omission of (*LF) from list in the C++ wrapper. -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -git-svn-id: svn://vcs.exim.org/pcre/code/trunk@1753 2f5784b3-3f2a-0410-8824-cb99058d5e15 -Petr Písař: Ported to 8.43. ---- - pcrecpp.cc | 1 + - -diff --git a/pcrecpp.cc b/pcrecpp.cc -index 6a3eff8..0d6b140 100644 ---- a/pcrecpp.cc -+++ b/pcrecpp.cc -@@ -92,6 +92,7 @@ static const char *start_options[] = { - "(*LIMIT_RECURSION=", - "(*LIMIT_MATCH=", - "(*CRLF)", -+ "(*LF)", - "(*CR)", - "(*BSR_UNICODE)", - "(*BSR_ANYCRLF)", --- -2.20.1 - diff --git a/pcre-8.43-Minor-fix-to-avoid-sanitizer-complaint-in-POSIX-wrap.patch b/pcre-8.43-Minor-fix-to-avoid-sanitizer-complaint-in-POSIX-wrap.patch deleted file mode 100644 index 121b625..0000000 --- a/pcre-8.43-Minor-fix-to-avoid-sanitizer-complaint-in-POSIX-wrap.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 3564d44ed1e70f1bf1e85b75274699b6720792ff Mon Sep 17 00:00:00 2001 -From: ph10 -Date: Mon, 10 Feb 2020 17:01:27 +0000 -Subject: [PATCH] Minor fix to avoid sanitizer complaint in POSIX wrapper. -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -git-svn-id: svn://vcs.exim.org/pcre/code/trunk@1760 2f5784b3-3f2a-0410-8824-cb99058d5e15 -Petr Písař: Ported to 8.43. ---- - pcreposix.c | 5 ++--- - -diff --git a/pcreposix.c b/pcreposix.c -index a76d6bf..3042d76 100644 ---- a/pcreposix.c -+++ b/pcreposix.c -@@ -6,7 +6,7 @@ - and semantics are as close as possible to those of the Perl 5 language. - - Written by Philip Hazel -- Copyright (c) 1997-2018 University of Cambridge -+ Copyright (c) 1997-2020 University of Cambridge - - ----------------------------------------------------------------------------- - Redistribution and use in source and binary forms, with or without -@@ -298,6 +298,7 @@ if (preg->re_pcre == NULL) - (void)pcre_fullinfo((const pcre *)preg->re_pcre, NULL, PCRE_INFO_CAPTURECOUNT, - &re_nsub); - preg->re_nsub = (size_t)re_nsub; -+preg->re_erroffset = (size_t)(-1); /* No meaning after successful compile */ - return 0; - } - -@@ -335,8 +336,6 @@ if ((eflags & REG_NOTBOL) != 0) options |= PCRE_NOTBOL; - if ((eflags & REG_NOTEOL) != 0) options |= PCRE_NOTEOL; - if ((eflags & REG_NOTEMPTY) != 0) options |= PCRE_NOTEMPTY; - --((regex_t *)preg)->re_erroffset = (size_t)(-1); /* Only has meaning after compile */ -- - /* When no string data is being returned, or no vector has been passed in which - to put it, ensure that nmatch is zero. Otherwise, ensure the vector for holding - the return data is large enough. */ --- -2.21.1 - diff --git a/pcre-8.43-Tidies-to-get-rid-of-sanitize-warnings-mostly-about-.patch b/pcre-8.43-Tidies-to-get-rid-of-sanitize-warnings-mostly-about-.patch deleted file mode 100644 index a60ec9b..0000000 --- a/pcre-8.43-Tidies-to-get-rid-of-sanitize-warnings-mostly-about-.patch +++ /dev/null @@ -1,202 +0,0 @@ -From be73d3747c3b2c0dab935279484bf96d55221106 Mon Sep 17 00:00:00 2001 -From: ph10 -Date: Tue, 11 Feb 2020 18:13:46 +0000 -Subject: [PATCH] Tidies to get rid of sanitize warnings (mostly about left - shifts). -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -git-svn-id: svn://vcs.exim.org/pcre/code/trunk@1762 2f5784b3-3f2a-0410-8824-cb99058d5e15 -Petr Písař: Ported to 8.43. ---- - pcre_compile.c | 16 ++++++++-------- - pcre_jit_compile.c | 6 +++--- - pcretest.c | 12 ++++++------ - testdata/testinput2 | 2 +- - testdata/testoutput2 | 3 +-- - -diff --git a/pcre_compile.c b/pcre_compile.c -index 1e3d6c3..32e5b91 100644 ---- a/pcre_compile.c -+++ b/pcre_compile.c -@@ -68,7 +68,7 @@ COMPILE_PCREx macro will already be appropriately set. */ - - /* Macro for setting individual bits in class bitmaps. */ - --#define SETBIT(a,b) a[(b)/8] |= (1 << ((b)&7)) -+#define SETBIT(a,b) a[(b)/8] |= (1U << ((b)&7)) - - /* Maximum length value to check against when making sure that the integer that - holds the compiled pattern length does not overflow. We make it a bit less than -@@ -129,8 +129,8 @@ overrun before it actually does run off the end of the data block. */ - - /* Private flags added to firstchar and reqchar. */ - --#define REQ_CASELESS (1 << 0) /* Indicates caselessness */ --#define REQ_VARY (1 << 1) /* Reqchar followed non-literal item */ -+#define REQ_CASELESS (1U << 0) /* Indicates caselessness */ -+#define REQ_VARY (1U << 1) /* Reqchar followed non-literal item */ - /* Negative values for the firstchar and reqchar flags */ - #define REQ_UNSET (-2) - #define REQ_NONE (-1) -@@ -3611,7 +3611,7 @@ for(;;) - if (chr > 255) break; - class_bitset = (pcre_uint8 *) - ((list_ptr == list ? code : base_end) - list_ptr[2]); -- if ((class_bitset[chr >> 3] & (1 << (chr & 7))) != 0) return FALSE; -+ if ((class_bitset[chr >> 3] & (1U << (chr & 7))) != 0) return FALSE; - break; - - #if defined SUPPORT_UTF || !defined COMPILE_PCRE8 -@@ -7458,7 +7458,7 @@ for (;; ptr++) - { - open_capitem *oc; - recno = GET2(slot, 0); -- cd->backref_map |= (recno < 32)? (1 << recno) : 1; -+ cd->backref_map |= (recno < 32)? (1U << recno) : 1; - if (recno > cd->top_backref) cd->top_backref = recno; - - /* Check to see if this back reference is recursive, that it, it -@@ -8069,7 +8069,7 @@ for (;; ptr++) - item_hwm_offset = cd->hwm - cd->start_workspace; - *code++ = ((options & PCRE_CASELESS) != 0)? OP_REFI : OP_REF; - PUT2INC(code, 0, recno); -- cd->backref_map |= (recno < 32)? (1 << recno) : 1; -+ cd->backref_map |= (recno < 32)? (1U << recno) : 1; - if (recno > cd->top_backref) cd->top_backref = recno; - - /* Check to see if this back reference is recursive, that it, it -@@ -8682,7 +8682,7 @@ do { - op == OP_SCBRA || op == OP_SCBRAPOS) - { - int n = GET2(scode, 1+LINK_SIZE); -- int new_map = bracket_map | ((n < 32)? (1 << n) : 1); -+ int new_map = bracket_map | ((n < 32)? (1U << n) : 1); - if (!is_anchored(scode, new_map, cd, atomcount)) return FALSE; - } - -@@ -8810,7 +8810,7 @@ do { - op == OP_SCBRA || op == OP_SCBRAPOS) - { - int n = GET2(scode, 1+LINK_SIZE); -- int new_map = bracket_map | ((n < 32)? (1 << n) : 1); -+ int new_map = bracket_map | ((n < 32)? (1U << n) : 1); - if (!is_startline(scode, new_map, cd, atomcount, inassert)) return FALSE; - } - -diff --git a/pcre_jit_compile.c b/pcre_jit_compile.c -index bc5f9c0..4dcf8fc 100644 ---- a/pcre_jit_compile.c -+++ b/pcre_jit_compile.c -@@ -3938,10 +3938,10 @@ static sljit_s32 character_to_int32(pcre_uchar chr) - sljit_s32 value = (sljit_s32)chr; - #if defined COMPILE_PCRE8 - #define SSE2_COMPARE_TYPE_INDEX 0 --return (value << 24) | (value << 16) | (value << 8) | value; -+return ((unsigned int)value << 24) | ((unsigned int)value << 16) | ((unsigned int)value << 8) | (unsigned int)value; - #elif defined COMPILE_PCRE16 - #define SSE2_COMPARE_TYPE_INDEX 1 --return (value << 16) | value; -+return ((unsigned int)value << 16) | value; - #elif defined COMPILE_PCRE32 - #define SSE2_COMPARE_TYPE_INDEX 2 - return value; -@@ -8507,7 +8507,7 @@ if (opcode == OP_ONCE) - /* We temporarily encode the needs_control_head in the lowest bit. - Note: on the target architectures of SLJIT the ((x << 1) >> 1) returns - the same value for small signed numbers (including negative numbers). */ -- BACKTRACK_AS(bracket_backtrack)->u.framesize = (BACKTRACK_AS(bracket_backtrack)->u.framesize << 1) | (needs_control_head ? 1 : 0); -+ BACKTRACK_AS(bracket_backtrack)->u.framesize = ((unsigned int)BACKTRACK_AS(bracket_backtrack)->u.framesize << 1) | (needs_control_head ? 1 : 0); - } - return cc + repeat_length; - } -diff --git a/pcretest.c b/pcretest.c -index f130303..c1ee128 100644 ---- a/pcretest.c -+++ b/pcretest.c -@@ -500,7 +500,7 @@ enum { - #if (defined (SUPPORT_PCRE8) + defined (SUPPORT_PCRE16) + \ - defined (SUPPORT_PCRE32)) >= 2 - --#define CHAR_SIZE (1 << pcre_mode) -+#define CHAR_SIZE (1U << pcre_mode) - - /* There doesn't seem to be an easy way of writing these macros that can cope - with the 3 pairs of bit sizes plus all three bit sizes. So just handle all the -@@ -4443,7 +4443,7 @@ while (!done) - - /* If there is study data, write it. */ - -- if (extra != NULL) -+ if (extra != NULL && (extra->flags & PCRE_EXTRA_STUDY_DATA) != 0) - { - if (fwrite(extra->study_data, 1, true_study_size, f) < - true_study_size) -@@ -4735,7 +4735,7 @@ while (!done) - if (isdigit(*p)) /* Set copy string */ - { - while(isdigit(*p)) n = n * 10 + *p++ - '0'; -- copystrings |= 1 << n; -+ copystrings |= 1U << n; - } - else if (isalnum(*p)) - { -@@ -4798,7 +4798,7 @@ while (!done) - if (isdigit(*p)) - { - while(isdigit(*p)) n = n * 10 + *p++ - '0'; -- getstrings |= 1 << n; -+ getstrings |= 1U << n; - } - else if (isalnum(*p)) - { -@@ -5335,7 +5335,7 @@ while (!done) - - for (i = 0; i < 32; i++) - { -- if ((copystrings & (1 << i)) != 0) -+ if ((copystrings & (1U << i)) != 0) - { - int rc; - char copybuffer[256]; -@@ -5400,7 +5400,7 @@ while (!done) - - for (i = 0; i < 32; i++) - { -- if ((getstrings & (1 << i)) != 0) -+ if ((getstrings & (1U << i)) != 0) - { - int rc; - const char *substring; -diff --git a/testdata/testinput2 b/testdata/testinput2 -index 3528de1..53c9825 100644 ---- a/testdata/testinput2 -+++ b/testdata/testinput2 -@@ -1380,7 +1380,7 @@ - 1X - 123456\P - --//KF>testsavedregex -+//S-KF>testsavedregex - - /abc/IS>testsavedregex - testsavedregex -+//S-KF>testsavedregex - Compiled pattern written to testsavedregex --Study data written to testsavedregex - - /abc/IS>testsavedregex - Capturing subpattern count = 0 --- -2.21.1 - diff --git a/pcre.spec b/pcre.spec index cde2f42..21157dd 100644 --- a/pcre.spec +++ b/pcre.spec @@ -1,8 +1,8 @@ # Is this a stable/testing release: #%%global rcversion RC1 Name: pcre -Version: 8.43 -Release: %{?rcversion:0.}3%{?rcversion:.%rcversion}%{?dist} +Version: 8.44 +Release: %{?rcversion:0.}1%{?rcversion:.%rcversion}%{?dist} %global myversion %{version}%{?rcversion:-%rcversion} Summary: Perl-compatible regular expression library ## Source package only: @@ -28,8 +28,10 @@ Summary: Perl-compatible regular expression library # other files: BSD License: BSD URL: https://www.pcre.org/ -Source: https://ftp.pcre.org/pub/%{name}/%{?rcversion:Testing/}%{name}-%{myversion}.tar.bz2 -# Upstream thinks RPATH is a good idea. +Source0: https://ftp.pcre.org/pub/%{name}/%{?rcversion:Testing/}%{name}-%{myversion}.tar.bz2 +Source1: https://ftp.pcre.org/pub/%{name}/%{?rcversion:Testing/}%{name}-%{myversion}.tar.bz2.sig +Source2: https://ftp.pcre.org/pub/pcre/Public-Key +# Do no set RPATH if libdir is not /usr/lib Patch0: pcre-8.21-multilib.patch # Refused by upstream, bug #675477 Patch1: pcre-8.32-refused_spelling_terminated.patch @@ -40,25 +42,15 @@ Patch2: pcre-8.41-fix_stack_estimator.patch # This amends ABI, application built with this patch cannot run with # previous libpcreposix builds. Patch3: pcre-8.42-Declare-POSIX-regex-function-names-as-macros-to-PCRE.patch -# Add (*LF) to a list of start-of-pattern options in the C++ wrapper, -# upstream bug #2400, in upstream after 8.43 -Patch4: pcre-8.43-Fix-omission-of-LF-from-list-in-the-C-wrapper.patch -# Make erroroffset initializion in a POSIX wrapper thread-safe, -# upstream bug #2447, in upstream after 8.43 -Patch5: pcre-8.43-Minor-fix-to-avoid-sanitizer-complaint-in-POSIX-wrap.patch -# Fix an integer overflow when parsing numbers after "(?C", -# upstream bug #2463, in upstream after 8.43 -Patch6: pcre-8.43-Check-the-size-of-the-number-after-C-as-it-is-read-i.patch -# Fix shifting integer bits and a NULL pointer dereferce in pcretest tool, -# upstream bug #2380, in upstream after 8.43 -Patch7: pcre-8.43-Tidies-to-get-rid-of-sanitize-warnings-mostly-about-.patch BuildRequires: readline-devel BuildRequires: autoconf BuildRequires: automake BuildRequires: coreutils BuildRequires: gcc BuildRequires: gcc-c++ +# glibc-common for iconv BuildRequires: glibc-common +BuildRequires: gnupg2 BuildRequires: libtool BuildRequires: make # perl not used because config.h.generic is pregenerated @@ -131,17 +123,13 @@ Requires: %{name}%{_isa} = %{version}-%{release} Utilities demonstrating PCRE capabilities like pcregrep or pcretest. %prep +%{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE1}' --data='%{SOURCE0}' %setup -q -n %{name}-%{myversion} -# Get rid of rpath %patch0 -p1 %patch1 -p1 %patch2 -p2 %patch3 -p1 -%patch4 -p1 -%patch5 -p1 -%patch6 -p1 -%patch7 -p1 -# Because of rpath patch +# Because of the multilib patch libtoolize --copy --force autoreconf -vif # One contributor's name is non-UTF-8 @@ -190,7 +178,6 @@ make %{?_smp_mflags} check VERBOSE=yes %{_libdir}/libpcre.so.1.* %{_libdir}/libpcreposix.so.0 %{_libdir}/libpcreposix.so.0.* -%{!?_licensedir:%global license %%doc} %license COPYING LICENCE %doc AUTHORS NEWS @@ -225,7 +212,6 @@ make %{?_smp_mflags} check VERBOSE=yes %files static %{_libdir}/*.a -%{!?_licensedir:%global license %%doc} %license COPYING LICENCE %files tools @@ -235,6 +221,9 @@ make %{?_smp_mflags} check VERBOSE=yes %{_mandir}/man1/pcretest.* %changelog +* Fri Feb 14 2020 Petr Pisar - 8.44-1 +- 8.44 bump + * Wed Feb 12 2020 Petr Pisar - 8.43-3 - Make erroroffset initializion in a POSIX wrapper thread-safe (upstream bug #2447) diff --git a/sources b/sources index 47284ca..ef0105a 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ -SHA512 (pcre-8.43.tar.bz2) = 3b4ac2c7ccd77c9575d07a33c3456f40b50731029e62d01fb8f2f5871d7118e12bc9e6bc7a8079769c765e38da5ecf98c4b261b10ff0a2f14f0881b434f67af7 +SHA512 (pcre-8.44.tar.bz2) = f26d850aab5228799e58ac8c2306fb313889332c39e29b118ef1de57677c5c90f970d68d3f475cabc64f8b982a77f04eca990ff1057f3ccf5e19bd137997c4ac +SHA512 (pcre-8.44.tar.bz2.sig) = 252e33b3cffd3b0133618ea896a19c86c816323523ca445d7fd026f08fd31e7a129c25fa3f5e9584939354b86f26eb0db850e1ad4ac56640493f71db454d46ac