Switch to PCRE2

README.md

@@ -14,7 +14,7 @@ Install necessary distribution packages. For example on debian/ubuntu:
 ```
 apt update -y
 apt upgrade -y
-apt install -y git autoconf automake m4 make bison flex binutils libtool gcc g++ libc-dev libpam0g-dev python3 psmisc libtokyocabinet-dev libssl-dev libpcre3-dev default-jre-headless build-essential fakeroot ntp dpkg-dev debhelper pkg-config nfs-common sudo apt-utils wget libncurses5 rsync libexpat1-dev libexpat1 curl
+apt install -y git autoconf automake m4 make bison flex binutils libtool gcc g++ libc-dev libpam0g-dev python3 psmisc libtokyocabinet-dev libssl-dev libpcre2-dev default-jre-headless build-essential fakeroot ntp dpkg-dev debhelper pkg-config nfs-common sudo apt-utils wget libncurses5 rsync libexpat1-dev libexpat1 curl
 apt purge -y emacs emacs24 libltdl-dev libltdl7
 ```
 
@@ -138,7 +138,8 @@ File `install-dependencies` and the relevant subdirectories in `deps-packaging`
 | [LMDB](https://github.com/LMDB/lmdb/)                                            | 0.9.30 | 0.9.30 | 0.9.30 |                          |
 | [OpenLDAP](http://www.openldap.org/software/download/OpenLDAP/openldap-release/) | 2.6.4  | 2.6.4  | 2.6.4  | Enterprise agent only    |
 | [OpenSSL](http://openssl.org/)                                                   | 1.1.1t | 3.0.8  | 3.1.1  |                          |
-| [PCRE](http://ftp.csx.cam.ac.uk/pub/software/programming/pcre/)                  | 8.45   | 8.45   | 8.45   |                          |
+| [PCRE](http://ftp.csx.cam.ac.uk/pub/software/programming/pcre/)                  | 8.45   | 8.45   | -      |                          |
+| [PCRE2](https://github.com/PCRE2Project/pcre2/releases/)                         | -      | -      | 10.42  |                          |
 | [pthreads-w32](ftp://sourceware.org/pub/pthreads-win32/)                         | 2-9-1  | 2-9-1  | 2-9-1  | Windows Enterprise agent |
 | [SASL2](https://cyrusimap.org/mediawiki/index.php/Downloads)                     | 2.1.28 | 2.1.28 | 2.1.28 | Solaris Enterprise agent |
 | [zlib](http://www.zlib.net/)                                                     | 1.2.13 | 1.2.13 | 1.2.13 |                          |

build-scripts/compile-options

@@ -108,7 +108,7 @@ case "$OS_FAMILY" in
     solaris|aix)  var_append DEPS "libgcc" ;;
 esac
 
-var_append DEPS "$EMBEDDED_DB pcre"
+var_append DEPS "$EMBEDDED_DB pcre2"
 
 if ! [ x"$SYSTEM_SSL" = x1 ]
 then

build-scripts/configure

@@ -15,7 +15,7 @@ esac
 
 P=$BUILDPREFIX
 
-ARGS="--prefix=$P --libdir=$P/lib --with-workdir=$P --sysconfdir=/etc --with-openssl=$P --with-pcre=$P --with-init-script"
+ARGS="--prefix=$P --libdir=$P/lib --with-workdir=$P --sysconfdir=/etc --with-openssl=$P --with-pcre2=$P --with-init-script"
 
 if [ $EMBEDDED_DB = lmdb ]
 then

build-scripts/configure-docs

@@ -6,6 +6,6 @@
 
 P=/var/cfengine
 
-ARGS="--prefix=$P --with-openssl=$P --with-pcre=$P --with-lmdb=$P --enable-docs=all"
+ARGS="--prefix=$P --with-openssl=$P --with-pcre2=$P --with-lmdb=$P --enable-docs=all"
 
 cd $BASEDIR/core && env $OPTS ./configure $ARGS

deps-packaging/apache/cfbuild-apache.spec

@@ -35,7 +35,7 @@ CPPFLAGS=-I%{buildprefix}/include
     --with-ldap=%{prefix} \
     --with-apr=%{prefix} \
     --with-apr-util=%{prefix} \
-    --with-pcre=%{prefix}/bin/pcre-config \
+    --with-pcre=%{prefix}/bin/pcre2-config \
     --with-mpm=prefork \
     CPPFLAGS="$CPPFLAGS"
 

deps-packaging/apache/debian/rules

@@ -23,7 +23,7 @@ build-stamp:
 --with-ldap=$(PREFIX) \
 --with-apr=$(PREFIX) \
 --with-apr-util=$(PREFIX) \
---with-pcre=$(PREFIX)/bin/pcre-config \
+--with-pcre=$(PREFIX)/bin/pcre2-config \
 --with-mpm=prefork \
 CPPFLAGS="$(CPPFLAGS)"
 	make