summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorph10 <ph10@6239d852-aaf2-0410-a92c-79f79f948069>2020-05-09 15:47:41 +0000
committerph10 <ph10@6239d852-aaf2-0410-a92c-79f79f948069>2020-05-09 15:47:41 +0000
commit858e5ac388c3d623f2ab0c62a881b98a0ecd40a7 (patch)
treeeafc2e4dcbe1b52a48780f49f311d819b9d35b41
parentfee74f6d6852849aec99108caa3440da45880621 (diff)
downloadpcre2-858e5ac388c3d623f2ab0c62a881b98a0ecd40a7.tar.gz
Final file tidies for 10.35.
git-svn-id: svn://vcs.exim.org/pcre2/code/trunk@1254 6239d852-aaf2-0410-a92c-79f79f948069
-rw-r--r--CMakeLists.txt8
-rw-r--r--ChangeLog20
-rw-r--r--NEWS2
-rw-r--r--configure.ac8
-rw-r--r--doc/pcre2.txt60
-rw-r--r--src/config.h.generic6
-rw-r--r--src/pcre2.h.generic4
7 files changed, 54 insertions, 54 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5e9da6b..86b8896 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -203,8 +203,8 @@ SET(PCRE2_SUPPORT_JIT OFF CACHE BOOL
IF(${CMAKE_SYSTEM_NAME} MATCHES Linux|NetBSD)
SET(PCRE2_SUPPORT_JIT_SEALLOC OFF CACHE BOOL
"Enable SELinux compatible execmem allocator in JIT (experimental).")
-ELSE(${CMAKE_SYSTEM_NAME} MATCHES Linux|NetBSD)
- SET(PCRE2_SUPPORT_JIT_SEALLOC IGNORE)
+ELSE(${CMAKE_SYSTEM_NAME} MATCHES Linux|NetBSD)
+ SET(PCRE2_SUPPORT_JIT_SEALLOC IGNORE)
ENDIF(${CMAKE_SYSTEM_NAME} MATCHES Linux|NetBSD)
SET(PCRE2GREP_SUPPORT_JIT ON CACHE BOOL
@@ -332,10 +332,10 @@ ENDIF(PCRE2_SUPPORT_JIT)
IF(PCRE2_SUPPORT_JIT_SEALLOC)
SET(CMAKE_REQUIRED_DEFINITIONS -D_GNU_SOURCE)
- CHECK_SYMBOL_EXISTS(mkostemp stdlib.h REQUIRED)
+ CHECK_SYMBOL_EXISTS(mkostemp stdlib.h REQUIRED)
UNSET(CMAKE_REQUIRED_DEFINITIONS)
IF(${REQUIRED})
- IF(${CMAKE_SYSTEM_NAME} MATCHES Linux|NetBSD)
+ IF(${CMAKE_SYSTEM_NAME} MATCHES Linux|NetBSD)
ADD_DEFINITIONS(-D_GNU_SOURCE)
SET(SLJIT_PROT_EXECUTABLE_ALLOCATOR 1)
ELSE(${CMAKE_SYSTEM_NAME} MATCHES Linux|NetBSD)
diff --git a/ChangeLog b/ChangeLog
index 94c7f03..310eb60 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,7 @@
Change Log for PCRE2
--------------------
-Version 10.35 15-April-2020
+Version 10.35 09-May-2020
---------------------------
1. Use PCRE2_MATCH_EMPTY flag to detect empty matches in JIT.
@@ -101,26 +101,26 @@ LIST(APPEND...) to allow a setting from the command line to be included.
24. CMake build now checks for secure_getenv() and strerror(). Patch by Carlo.
-25. Avoid using [-1] as a suffix in pcre2test because it can provoke a compiler
+25. Avoid using [-1] as a suffix in pcre2test because it can provoke a compiler
warning.
-26. Added tests for __attribute__((uninitialized)) to both the configure and
-CMake build files, and then applied this attribute to the variable called
-stack_frames_vector[] in pcre2_match(). When implemented, this disables
+26. Added tests for __attribute__((uninitialized)) to both the configure and
+CMake build files, and then applied this attribute to the variable called
+stack_frames_vector[] in pcre2_match(). When implemented, this disables
automatic initialization (a facility in clang), which can take time on big
variables.
-27. Updated CMakeLists.txt (patches by Uwe Korn) to add support for
-pcre2-config, the libpcre*.pc files, SOVERSION, VERSION and the
+27. Updated CMakeLists.txt (patches by Uwe Korn) to add support for
+pcre2-config, the libpcre*.pc files, SOVERSION, VERSION and the
MACHO_*_VERSIONS settings for CMake builds.
-28. Another patch to CMakeLists.txt to check for mkostemp (configure already
+28. Another patch to CMakeLists.txt to check for mkostemp (configure already
does). Patch by Carlo Marcelo Arenas Belon.
-29. Check for the existence of memfd_create in both CMake and configure
+29. Check for the existence of memfd_create in both CMake and configure
configurations. Patch by Carlo Marcelo Arenas Belon.
-30. Restrict the configuration setting for the SELinux compatible execmem
+30. Restrict the configuration setting for the SELinux compatible execmem
allocator (change 10.30/44) to Linux and NetBSD.
diff --git a/NEWS b/NEWS
index aeba64c..97b9350 100644
--- a/NEWS
+++ b/NEWS
@@ -17,7 +17,7 @@ as a result of the 10.30 restructuring.
character properties are used for upper/lower case computations on characters
whose code points are greater than 127.
-4. The character tabless (for low-valued characters) can now more easily be
+4. The character tables (for low-valued characters) can now more easily be
saved and restored in binary.
5. Updated to Unicode 13.0.0.
diff --git a/configure.ac b/configure.ac
index 214e46c..180d3dc 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, [35])
-m4_define(pcre2_prerelease, [-RC2])
-m4_define(pcre2_date, [2020-04-15])
+m4_define(pcre2_prerelease, [])
+m4_define(pcre2_date, [2020-05-09])
# Libtool shared library interface versions (current:revision:age)
m4_define(libpcre2_8_version, [10:0:10])
@@ -177,8 +177,8 @@ if test "$enable_jit" = "auto"; then
fi
# Handle --enable-jit-sealloc (disabled by default and only experimental)
-case $host_os in
- linux* | netbsd*)
+case $host_os in
+ linux* | netbsd*)
AC_ARG_ENABLE(jit-sealloc,
AS_HELP_STRING([--enable-jit-sealloc],
[enable SELinux compatible execmem allocator in JIT (experimental)]),
diff --git a/doc/pcre2.txt b/doc/pcre2.txt
index 71fbc3c..4651bba 100644
--- a/doc/pcre2.txt
+++ b/doc/pcre2.txt
@@ -180,8 +180,8 @@ REVISION
Last updated: 17 September 2018
Copyright (c) 1997-2018 University of Cambridge.
------------------------------------------------------------------------------
-
-
+
+
PCRE2API(3) Library Functions Manual PCRE2API(3)
@@ -3796,8 +3796,8 @@ REVISION
Last updated: 19 March 2020
Copyright (c) 1997-2020 University of Cambridge.
------------------------------------------------------------------------------
-
-
+
+
PCRE2BUILD(3) Library Functions Manual PCRE2BUILD(3)
@@ -4390,8 +4390,8 @@ REVISION
Last updated: 20 March 2020
Copyright (c) 1997-2020 University of Cambridge.
------------------------------------------------------------------------------
-
-
+
+
PCRE2CALLOUT(3) Library Functions Manual PCRE2CALLOUT(3)
@@ -4820,8 +4820,8 @@ REVISION
Last updated: 03 February 2019
Copyright (c) 1997-2019 University of Cambridge.
------------------------------------------------------------------------------
-
-
+
+
PCRE2COMPAT(3) Library Functions Manual PCRE2COMPAT(3)
@@ -5029,8 +5029,8 @@ REVISION
Last updated: 13 July 2019
Copyright (c) 1997-2019 University of Cambridge.
------------------------------------------------------------------------------
-
-
+
+
PCRE2JIT(3) Library Functions Manual PCRE2JIT(3)
@@ -5454,8 +5454,8 @@ REVISION
Last updated: 23 May 2019
Copyright (c) 1997-2019 University of Cambridge.
------------------------------------------------------------------------------
-
-
+
+
PCRE2LIMITS(3) Library Functions Manual PCRE2LIMITS(3)
@@ -5524,8 +5524,8 @@ REVISION
Last updated: 02 February 2019
Copyright (c) 1997-2019 University of Cambridge.
------------------------------------------------------------------------------
-
-
+
+
PCRE2MATCHING(3) Library Functions Manual PCRE2MATCHING(3)
@@ -5748,8 +5748,8 @@ REVISION
Last updated: 23 May 2019
Copyright (c) 1997-2019 University of Cambridge.
------------------------------------------------------------------------------
-
-
+
+
PCRE2PARTIAL(3) Library Functions Manual PCRE2PARTIAL(3)
@@ -6128,8 +6128,8 @@ REVISION
Last updated: 04 September 2019
Copyright (c) 1997-2019 University of Cambridge.
------------------------------------------------------------------------------
-
-
+
+
PCRE2PATTERN(3) Library Functions Manual PCRE2PATTERN(3)
@@ -9562,8 +9562,8 @@ REVISION
Last updated: 24 February 2020
Copyright (c) 1997-2020 University of Cambridge.
------------------------------------------------------------------------------
-
-
+
+
PCRE2PERFORM(3) Library Functions Manual PCRE2PERFORM(3)
@@ -9797,8 +9797,8 @@ REVISION
Last updated: 03 February 2019
Copyright (c) 1997-2019 University of Cambridge.
------------------------------------------------------------------------------
-
-
+
+
PCRE2POSIX(3) Library Functions Manual PCRE2POSIX(3)
@@ -10127,8 +10127,8 @@ REVISION
Last updated: 30 January 2019
Copyright (c) 1997-2019 University of Cambridge.
------------------------------------------------------------------------------
-
-
+
+
PCRE2SAMPLE(3) Library Functions Manual PCRE2SAMPLE(3)
@@ -10406,8 +10406,8 @@ REVISION
Last updated: 27 June 2018
Copyright (c) 1997-2018 University of Cambridge.
------------------------------------------------------------------------------
-
-
+
+
PCRE2SYNTAX(3) Library Functions Manual PCRE2SYNTAX(3)
@@ -10922,8 +10922,8 @@ REVISION
Last updated: 28 December 2019
Copyright (c) 1997-2019 University of Cambridge.
------------------------------------------------------------------------------
-
-
+
+
PCRE2UNICODE(3) Library Functions Manual PCRE2UNICODE(3)
@@ -11357,5 +11357,5 @@ REVISION
Last updated: 23 February 2020
Copyright (c) 1997-2020 University of Cambridge.
------------------------------------------------------------------------------
-
-
+
+
diff --git a/src/config.h.generic b/src/config.h.generic
index e460f44..2c3b7f7 100644
--- a/src/config.h.generic
+++ b/src/config.h.generic
@@ -224,7 +224,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.35-RC2"
+#define PACKAGE_STRING "PCRE2 10.35"
/* Define to the one symbol short name of this package. */
#define PACKAGE_TARNAME "pcre2"
@@ -233,7 +233,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.35-RC2"
+#define PACKAGE_VERSION "10.35"
/* 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
@@ -358,7 +358,7 @@ sure both macros are undefined; an emulation function will then be used. */
#endif
/* Version number of package */
-#define VERSION "10.35-RC2"
+#define VERSION "10.35"
/* Define to 1 if on MINIX. */
/* #undef _MINIX */
diff --git a/src/pcre2.h.generic b/src/pcre2.h.generic
index 1ca1661..4a42a79 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 35
-#define PCRE2_PRERELEASE -RC1
-#define PCRE2_DATE 2020-04-15
+#define PCRE2_PRERELEASE
+#define PCRE2_DATE 2020-05-09
/* 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