Changed build dependencies to pcre2.
A notable exception is build_module.sh where we require both versions. The
idea is that the script might be used for building packages for older NGINX
versions that still have older PCRE code.
diff --git a/alpine/APKBUILD-base.in b/alpine/APKBUILD-base.in
index 13c1792..23976ed 100644
--- a/alpine/APKBUILD-base.in
+++ b/alpine/APKBUILD-base.in
@@ -14,7 +14,7 @@
provides="nginx-r$_base_version"
provider_priority=$_base_release
depends=""
-makedepends="linux-headers openssl-dev pcre-dev zlib-dev"
+makedepends="linux-headers openssl-dev pcre2-dev zlib-dev"
options="!check"
diff --git a/alpine/APKBUILD-module.in b/alpine/APKBUILD-module.in
index 281bc75..4564b87 100644
--- a/alpine/APKBUILD-module.in
+++ b/alpine/APKBUILD-module.in
@@ -12,7 +12,7 @@
arch="all"
license="2-clause BSD-like license"
depends="nginx-r$_base_version %%MODULE_DEPENDS%%"
-makedepends="linux-headers openssl-dev pcre-dev zlib-dev %%MODULE_BUILD_DEPENDS%%"
+makedepends="linux-headers openssl-dev pcre2-dev zlib-dev %%MODULE_BUILD_DEPENDS%%"
provides="$pkgname-r$_base_version %%MODULE_PROVIDES%%"
%%ADD_CONTROL_TAGS%%
diff --git a/alpine/APKBUILD-plus-module.in b/alpine/APKBUILD-plus-module.in
index 6409a47..a80adb8 100644
--- a/alpine/APKBUILD-plus-module.in
+++ b/alpine/APKBUILD-plus-module.in
@@ -13,7 +13,7 @@
arch="all"
license="Proprietary (EULA included)"
depends="nginx-plus-r$_plus_version %%MODULE_DEPENDS%%"
-makedepends="linux-headers openssl-dev pcre-dev zlib-dev %%MODULE_BUILD_DEPENDS%%"
+makedepends="linux-headers openssl-dev pcre2-dev zlib-dev %%MODULE_BUILD_DEPENDS%%"
provides="$pkgname-r$_plus_version %%MODULE_PROVIDES%%"
%%ADD_CONTROL_TAGS%%
diff --git a/build_module.sh b/build_module.sh
index f53887f..9bc4be6 100755
--- a/build_module.sh
+++ b/build_module.sh
@@ -163,7 +163,7 @@
PKG_MGR_INSTALL="yum install $SAY_YES"
PKG_MGR_UPDATE="yum makecache"
PKG_FMT=rpm
- NGINX_PACKAGES="pcre-devel zlib-devel openssl-devel"
+ NGINX_PACKAGES="pcre2-devel pcre-devel zlib-devel openssl-devel"
DEVEL_PACKAGES="rpm-build libxml2 libxslt"
PACKAGING_ROOT=pkg-oss/rpm/
PACKAGING_DIR=rpm/SPECS
@@ -173,7 +173,7 @@
PKG_MGR_INSTALL="apt-get --no-install-suggests --no-install-recommends install $SAY_YES"
PKG_MGR_UPDATE="apt-get update"
PKG_FMT=deb
- NGINX_PACKAGES="libpcre3-dev zlib1g-dev libssl-dev"
+ NGINX_PACKAGES="libpcre2-dev libpcre3-dev zlib1g-dev libssl-dev"
DEVEL_PACKAGES="devscripts fakeroot debhelper dpkg-dev quilt lsb-release build-essential libxml2-utils xsltproc"
PACKAGING_ROOT=pkg-oss/debian/
PACKAGING_DIR=debian
@@ -183,7 +183,7 @@
PKG_MGR_INSTALL="apk add"
PKG_MGR_UPDATE="apk update"
PKG_FMT=apk
- NGINX_PACKAGES="linux-headers openssl-dev pcre-dev zlib-dev"
+ NGINX_PACKAGES="linux-headers openssl-dev pcre2-dev pcre-dev zlib-dev"
DEVEL_PACKAGES="openssl abuild musl-dev"
PACKAGING_ROOT=pkg-oss/alpine/
PACKAGING_DIR=alpine
diff --git a/debian/nginx-module.control.in b/debian/nginx-module.control.in
index 958301f..469adc5 100644
--- a/debian/nginx-module.control.in
+++ b/debian/nginx-module.control.in
@@ -7,7 +7,7 @@
quilt (>= 0.46-7~),
lsb-release,
libssl-dev (>= 1.0.1),
- libpcre3-dev,
+ libpcre2-dev,
zlib1g-dev%%MODULE_BUILD_DEPENDS%%
Standards-Version: 4.1.4
Homepage: %%MODULE_PACKAGE_URL%%
diff --git a/debian/nginx-plus-module.control.in b/debian/nginx-plus-module.control.in
index ad9c109..cae9cbd 100644
--- a/debian/nginx-plus-module.control.in
+++ b/debian/nginx-plus-module.control.in
@@ -7,7 +7,7 @@
quilt (>= 0.46-7~),
lsb-release,
libssl-dev (>= 1.0.1),
- libpcre3-dev,
+ libpcre2-dev,
zlib1g-dev%%MODULE_BUILD_DEPENDS%%
Standards-Version: 4.1.4
Homepage: %%MODULE_PACKAGE_URL%%
diff --git a/debian/nginx.control.in b/debian/nginx.control.in
index 961814f..68dd9e6 100644
--- a/debian/nginx.control.in
+++ b/debian/nginx.control.in
@@ -7,7 +7,7 @@
quilt (>= 0.46-7~),
lsb-release,
libssl-dev (>= 0.9.7),
- libpcre3-dev,
+ libpcre2-dev,
zlib1g-dev
Standards-Version: 4.1.4
Homepage: https://nginx.org
diff --git a/rpm/SPECS/nginx-module.spec.in b/rpm/SPECS/nginx-module.spec.in
index ec227d9..5c5b398 100644
--- a/rpm/SPECS/nginx-module.spec.in
+++ b/rpm/SPECS/nginx-module.spec.in
@@ -64,7 +64,7 @@
BuildRoot: %{_tmppath}/%{name}-%{base_version}-%{base_release}-root
BuildRequires: zlib-devel
-BuildRequires: pcre-devel
+BuildRequires: pcre2-devel
Requires: nginx-r%{base_version}
Provides: %{name}-r%{base_version}
@@ -75,7 +75,7 @@
%debug_package
%endif
-%define WITH_CC_OPT $(echo %{optflags} $(pcre-config --cflags))
+%define WITH_CC_OPT $(echo %{optflags} $(pcre2-config --cflags))
%define WITH_LD_OPT -Wl,-z,relro -Wl,-z,now
%define BASE_CONFIGURE_ARGS $(echo "%%BASE_CONFIGURE_ARGS%%")
diff --git a/rpm/SPECS/nginx-plus-module.spec.in b/rpm/SPECS/nginx-plus-module.spec.in
index cc8923e..e2549a0 100644
--- a/rpm/SPECS/nginx-plus-module.spec.in
+++ b/rpm/SPECS/nginx-plus-module.spec.in
@@ -69,7 +69,7 @@
BuildRoot: %{_tmppath}/%{name}-%{base_version}-%{base_release}-root
BuildRequires: zlib-devel
-BuildRequires: pcre-devel
+BuildRequires: pcre2-devel
Requires: nginx-plus-r%{plus_version}
Provides: %{name}-r%{plus_version}
@@ -80,7 +80,7 @@
%debug_package
%endif
-%define WITH_CC_OPT $(echo %{optflags} $(pcre-config --cflags))
+%define WITH_CC_OPT $(echo %{optflags} $(pcre2-config --cflags))
%define WITH_LD_OPT -Wl,-z,relro -Wl,-z,now
%define BASE_CONFIGURE_ARGS $(echo "%%BASE_CONFIGURE_ARGS%%")
diff --git a/rpm/SPECS/nginx.spec.in b/rpm/SPECS/nginx.spec.in
index ff5a99c..266cdca 100644
--- a/rpm/SPECS/nginx.spec.in
+++ b/rpm/SPECS/nginx.spec.in
@@ -61,7 +61,7 @@
%define bdir %{_builddir}/%{name}-%{base_version}
-%define WITH_CC_OPT $(echo %{optflags} $(pcre-config --cflags)) -fPIC
+%define WITH_CC_OPT $(echo %{optflags} $(pcre2-config --cflags)) -fPIC
%define WITH_LD_OPT -Wl,-z,relro -Wl,-z,now -pie
%define BASE_CONFIGURE_ARGS $(echo "%%BASE_CONFIGURE_ARGS%%")
@@ -91,7 +91,7 @@
BuildRoot: %{_tmppath}/%{name}-%{base_version}-%{base_release}-root
BuildRequires: zlib-devel
-BuildRequires: pcre-devel
+BuildRequires: pcre2-devel
Provides: webserver
Provides: nginx-r%{base_version}
