From 0612ed77c2291575b02bb0ea260dfad4890cc347 Mon Sep 17 00:00:00 2001 From: Philip Hazel Date: Fri, 1 Oct 2021 16:44:09 +0100 Subject: [PATCH] Update dates and tidy files for 10.38 release. --- ChangeLog | 6 +++--- NEWS | 4 ++-- configure.ac | 4 ++-- doc/html/pcre2_set_compile_extra_options.html | 2 +- src/config.h.generic | 6 +++--- src/pcre2.h.generic | 4 ++-- src/pcre2_compile.c | 4 ++-- 7 files changed, 15 insertions(+), 15 deletions(-) diff --git a/ChangeLog b/ChangeLog index f05df00..e0ac9b3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,8 +1,8 @@ Change Log for PCRE2 -------------------- -Version 10.38-RC1 31-August-2021 --------------------------------- +Version 10.38 01-October-2021 +----------------------------- 1. Fix invalid single character repetition issues in JIT when the repetition is inside a capturing bracket and the bracket is preceeded by character @@ -52,7 +52,7 @@ However, just in case anybody was relying on the old behaviour, there is an option called PCRE2_EXTRA_ALLOW_LOOKAROUND_BSK that enables the old behaviour. An option has also been added to pcre2grep to enable this. -7. Re-enable an optimization which was unintentionally disabled in 10.35. +7. Re-enable a JIT optimization which was unintentionally disabled in 10.35. 8. There is a loop counter to catch excessively crazy patterns when checking the lengths of lookbehinds at compile time. This was incorrectly getting reset diff --git a/NEWS b/NEWS index 41de6db..34f3ee3 100644 --- a/NEWS +++ b/NEWS @@ -2,8 +2,8 @@ News about PCRE2 releases ------------------------- -Version 10.38-RC1 31-August-2021 --------------------------------- +Version 10.38 01-October-2021 +----------------------------- As well as some bug fixes and tidies (as always, see ChangeLog for details), the documentation is updated to list the new URLs, following the move of the diff --git a/configure.ac b/configure.ac index f89bfdc..44bb50d 100644 --- a/configure.ac +++ b/configure.ac @@ -10,8 +10,8 @@ dnl be defined as -RC2, for example. For real releases, it should be empty. m4_define(pcre2_major, [10]) m4_define(pcre2_minor, [38]) -m4_define(pcre2_prerelease, [-RC1]) -m4_define(pcre2_date, [2021-08-31]) +m4_define(pcre2_prerelease, []) +m4_define(pcre2_date, [2021-10-01]) # Libtool shared library interface versions (current:revision:age) m4_define(libpcre2_8_version, [10:3:10]) diff --git a/doc/html/pcre2_set_compile_extra_options.html b/doc/html/pcre2_set_compile_extra_options.html index a0c0592..b1c0a11 100644 --- a/doc/html/pcre2_set_compile_extra_options.html +++ b/doc/html/pcre2_set_compile_extra_options.html @@ -30,7 +30,7 @@ This function sets additional option bits for pcre2_compile() that are housed in a compile context. It completely replaces all the bits. The extra options are:
-  PCRE2_EXTRA_ALLOW_LOOKAROUND_BSK     Allow \K in lookarounds  PCRE2_EXTRA_ALLOW_SURROGATE_ESCAPES  Allow \x{df800} to \x{dfff}
+  PCRE2_EXTRA_ALLOW_LOOKAROUND_BSK     Allow \K in lookarounds PCRE2_EXTRA_ALLOW_SURROGATE_ESCAPES  Allow \x{df800} to \x{dfff}
                                          in UTF-8 and UTF-32 modes
   PCRE2_EXTRA_ALT_BSUX                 Extended alternate \u, \U, and \x handling
   PCRE2_EXTRA_BAD_ESCAPE_IS_LITERAL    Treat all invalid escapes as a literal following character
diff --git a/src/config.h.generic b/src/config.h.generic
index 9a290f1..d07aa60 100644
--- a/src/config.h.generic
+++ b/src/config.h.generic
@@ -233,7 +233,7 @@ sure both macros are undefined; an emulation function will then be used. */
 #define PACKAGE_NAME "PCRE2"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "PCRE2 10.38-RC1"
+#define PACKAGE_STRING "PCRE2 10.38"
 
 /* Define to the one symbol short name of this package. */
 #define PACKAGE_TARNAME "pcre2"
@@ -242,7 +242,7 @@ sure both macros are undefined; an emulation function will then be used. */
 #define PACKAGE_URL ""
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "10.38-RC1"
+#define PACKAGE_VERSION "10.38"
 
 /* The value of PARENS_NEST_LIMIT specifies the maximum depth of nested
    parentheses (of any kind) in a pattern. This limits the amount of system
@@ -435,7 +435,7 @@ sure both macros are undefined; an emulation function will then be used. */
 #endif
 
 /* Version number of package */
-#define VERSION "10.38-RC1"
+#define VERSION "10.38"
 
 /* Define to empty if `const' does not conform to ANSI C. */
 /* #undef const */
diff --git a/src/pcre2.h.generic b/src/pcre2.h.generic
index b753e26..2175caa 100644
--- a/src/pcre2.h.generic
+++ b/src/pcre2.h.generic
@@ -43,8 +43,8 @@ POSSIBILITY OF SUCH DAMAGE.
 
 #define PCRE2_MAJOR           10
 #define PCRE2_MINOR           38
-#define PCRE2_PRERELEASE      -RC1
-#define PCRE2_DATE            2021-08-31
+#define PCRE2_PRERELEASE      
+#define PCRE2_DATE            2021-10-01
 
 /* When an application links to a PCRE DLL in Windows, the symbols that are
 imported have to be identified as such. When building PCRE2, the appropriate
diff --git a/src/pcre2_compile.c b/src/pcre2_compile.c
index 7242964..383159b 100644
--- a/src/pcre2_compile.c
+++ b/src/pcre2_compile.c
@@ -9501,7 +9501,7 @@ Arguments
   retptr    if not NULL, return the ket pointer here
   recurses  chain of recurse_check to catch mutual recursion
   cb        points to the compile block
-  lcptr     points to loop counter 
+  lcptr     points to loop counter
 
 Returns:    0 on success, or an errorcode (cb->erroroffset will be set)
 */
@@ -10091,7 +10091,7 @@ lengths. */
 
 if (has_lookbehind)
   {
-  int loopcount = 0; 
+  int loopcount = 0;
   errorcode = check_lookbehinds(cb.parsed_pattern, NULL, NULL, &cb, &loopcount);
   if (errorcode != 0) goto HAD_CB_ERROR;
   }