bump pcre2

Freetz-NG · Feb 5, 2025 · 7d88eb2 · 7d88eb2 · github-actions · Feb 5, 2025
1 parent 22beba7
commit 7d88eb2
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 12 deletions.
diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
@@ -160,6 +160,7 @@ Latest changes
    * lz4 1.10.0
    * mbedTLS 2.7.19/2.28.9
    * pango 1.56.1
+   * pcre2 10.45
 
  - Firmware updates:
    * Please see [FIRMWARES](FIRMWARES.md) for the list of currently supported devices and firmwares.

diff --git a/make/libs/pcre2/external.files b/make/libs/pcre2/external.files
@@ -1,2 +1,2 @@
-[ "$EXTERNAL_FREETZ_LIB_libpcre2" == "y" ] && EXTERNAL_FILES+=" ${FREETZ_LIBRARY_DIR}/libpcre2-8.so.0.13.0"
-[ "$EXTERNAL_FREETZ_LIB_libpcre2_posix" == "y" ] && EXTERNAL_FILES+=" ${FREETZ_LIBRARY_DIR}/libpcre2-posix.so.3.0.5"
+[ "$EXTERNAL_FREETZ_LIB_libpcre2" == "y" ] && EXTERNAL_FILES+=" ${FREETZ_LIBRARY_DIR}/libpcre2-8.so.0.14.0"
+[ "$EXTERNAL_FREETZ_LIB_libpcre2_posix" == "y" ] && EXTERNAL_FILES+=" ${FREETZ_LIBRARY_DIR}/libpcre2-posix.so.3.0.6"
diff --git a/make/libs/pcre2/external.in b/make/libs/pcre2/external.in
@@ -4,13 +4,13 @@ config EXTERNAL_FREETZ_LIB_libpcre2
 	default n
 	help
 		externals the following file(s):
-		 ${FREETZ_LIBRARY_DIR}/libpcre2-8.so.0.13.0
+		 ${FREETZ_LIBRARY_DIR}/libpcre2-8.so.0.14.0
 
 config EXTERNAL_FREETZ_LIB_libpcre2_posix
 	depends on EXTERNAL_ENABLED && FREETZ_LIB_libpcre2_posix
 	bool "libpcre2-posix"
 	default n
 	help
 		externals the following file(s):
-		 ${FREETZ_LIBRARY_DIR}/libpcre2-posix.so.3.0.5
+		 ${FREETZ_LIBRARY_DIR}/libpcre2-posix.so.3.0.6
 
diff --git a/make/libs/pcre2/patches/100-no_docs_no_man.pcre.patch b/make/libs/pcre2/patches/100-no_docs_no_man.pcre.patch
@@ -1,6 +1,6 @@
 --- Makefile.in
 +++ Makefile.in
-@@ -3667,8 +3667,8 @@
+@@ -3726,8 +3726,8 @@
 
  info-am:
 

diff --git a/make/libs/pcre2/patches/110-unnecessary-tests.pcre.patch b/make/libs/pcre2/patches/110-unnecessary-tests.pcre.patch
@@ -1,14 +1,14 @@
 --- configure
 +++ configure
-@@ -15072,6 +15072,7 @@
+@@ -15052,6 +15052,7 @@
  rm -f core conftest.err conftest.$ac_objext conftest.beam \
      conftest$ac_exeext conftest.$ac_ext
 
 +if test "$enable_pcregrep_libz" = "yes"; then
  # Check for the availability of libz (aka zlib)
 
         for ac_header in zlib.h
-@@ -15131,8 +15132,10 @@
+@@ -15103,8 +15104,10 @@
  then :
    HAVE_LIBZ=1
  fi
@@ -19,7 +19,7 @@
  # Check for the availability of libbz2. Originally we just used AC_CHECK_LIB,
  # as for libz. However, this had the following problem, diagnosed and fixed by
  # a user:
-@@ -15194,6 +15197,7 @@
+@@ -15165,6 +15168,7 @@
  rm -f core conftest.err conftest.$ac_objext conftest.beam \
      conftest$ac_exeext conftest.$ac_ext
  LIBS="$OLD_LIBS"

diff --git a/make/libs/pcre2/pcre2.mk b/make/libs/pcre2/pcre2.mk
@@ -1,8 +1,8 @@
-$(call PKG_INIT_LIB, 10.44)
-$(PKG)_LIB_VERSION:=0.13.0
-$(PKG)_POSIX_LIB_VERSION:=3.0.5
+$(call PKG_INIT_LIB, 10.45)
+$(PKG)_LIB_VERSION:=0.14.0
+$(PKG)_POSIX_LIB_VERSION:=3.0.6
 $(PKG)_SOURCE:=$(pkg)-$($(PKG)_VERSION).tar.bz2
-$(PKG)_HASH:=d34f02e113cf7193a1ebf2770d3ac527088d485d4e047ed10e5d217c6ef5de96
+$(PKG)_HASH:=21547f3516120c75597e5b30a992e27a592a31950b5140e7b8bfde3f192033c4
 $(PKG)_SITE:=https://github.com/PCRE2Project/pcre2/releases/download/pcre2-$($(PKG)_VERSION)
 ### WEBSITE:=https://www.pcre.org/
 ### MANPAGE:=https://www.pcre.org/current/doc/html/