git: 220f031d3ecd - main - www/nginx-devel: switch to pcre2
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Wed, 01 Mar 2023 20:18:26 UTC
The branch main has been updated by osa:
URL: https://cgit.FreeBSD.org/ports/commit/?id=220f031d3ecd2e510025388e02c6f6050023f07b
commit 220f031d3ecd2e510025388e02c6f6050023f07b
Author: Sergey A. Osokin <osa@FreeBSD.org>
AuthorDate: 2023-03-01 20:09:23 +0000
Commit: Sergey A. Osokin <osa@FreeBSD.org>
CommitDate: 2023-03-01 20:18:21 +0000
www/nginx-devel: switch to pcre2
The pcre library 8.45 has been released Jun 22nd, 2021 and is not
officially supported anymore.
The pcre2 support in nginx was introduced in 1.21.5, it's been
released Dec 28th, 2021. There're few modules are still require
devel/pcre, but since devel/pcre and devel/pcre2 can be coexist
and those few modules are happy with that, let's switch to pcre2
by default.
Also, while I'm here update third-party lua module to its
recent version - 0.10.23.
Bump PORTREVISION.
---
www/nginx-devel/Makefile | 25 ++++++++++---------------
www/nginx-devel/Makefile.extmod | 3 +--
www/nginx-devel/Makefile.options.desc | 2 --
www/nginx-devel/distinfo | 6 +++---
4 files changed, 14 insertions(+), 22 deletions(-)
diff --git a/www/nginx-devel/Makefile b/www/nginx-devel/Makefile
index 19ea035ff50c..443d047d7b60 100644
--- a/www/nginx-devel/Makefile
+++ b/www/nginx-devel/Makefile
@@ -1,6 +1,6 @@
PORTNAME?= nginx
PORTVERSION= 1.23.3
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= www
MASTER_SITES= https://nginx.org/download/ \
LOCAL/osa
@@ -48,7 +48,6 @@ SUB_LIST+= WWWOWN=${WWWOWN} \
HAS_CONFIGURE= yes
CONFIGURE_ARGS+=--prefix=${ETCDIR} \
--with-cc-opt="-I ${LOCALBASE}/include" \
- --with-ld-opt="-L ${LOCALBASE}/lib" \
--conf-path=${ETCDIR}/nginx.conf \
--sbin-path=${PREFIX}/sbin/nginx \
--pid-path=${NGINX_RUNDIR}/nginx.pid \
@@ -83,14 +82,10 @@ OPTIONS_DEFINE= DEBUG DEBUGLOG DSO FILE_AIO IPV6 NJS NJS_XML THREADS WWW
OPTIONS_DEFAULT?= DSO FILE_AIO HTTP HTTP_ADDITION HTTP_AUTH_REQ HTTP_CACHE \
HTTP_DAV HTTP_FLV HTTP_GUNZIP_FILTER HTTP_GZIP_STATIC HTTP_MP4 \
HTTP_RANDOM_INDEX HTTP_REALIP HTTP_SECURE_LINK HTTP_SLICE HTTP_SSL \
- HTTP_STATUS HTTP_SUB HTTPV2 MAIL MAIL_SSL PCRE_ONE STREAM \
+ HTTP_STATUS HTTP_SUB HTTPV2 MAIL MAIL_SSL STREAM \
STREAM_REALIP STREAM_SSL STREAM_SSL_PREREAD THREADS WWW
-OPTIONS_RADIO+= PCRE
-OPTIONS_RADIO_PCRE= PCRE_ONE PCRE_TWO
-PCRE_ONE_LIB_DEPENDS= libpcre.so:devel/pcre
-PCRE_ONE_CONFIGURE_ON= --without-pcre2
-PCRE_TWO_LIB_DEPENDS= libpcre2-8.so:devel/pcre2
+LIB_DEPENDS+= libpcre2-8.so:devel/pcre2
OPTIONS_SUB= yes
@@ -235,11 +230,6 @@ CFLAGS+= -DNDEBUG
CFLAGS+= -Wno-compound-token-split-by-macro
.endif
-.if empty(PORT_OPTIONS:MPCRE_ONE) && empty(PORT_OPTIONS:MPCRE_TWO)
-IGNORE= required at least PCRE_ONE or PCRE_TWO \
- to be defined. Please do 'make config' again
-.endif
-
.if ${PORT_OPTIONS:MHTTPV3} && \
(empty(PORT_OPTIONS:MHTTPV3_BORING) && \
empty(PORT_OPTIONS:MHTTPV3_LSSL) && \
@@ -248,8 +238,13 @@ IGNORE= required HTTPV3_BORING or HTTPV3_LSSL or HTTPV3_QTLS \
to be defined. Please do 'make config' again
.endif
-.if ${PORT_OPTIONS:MPCRE_ONE}
-NJS_CONFIGURE_ARGS= --no-pcre2
+.if empty(PORT_OPTIONS:MDYNAMIC_HC) && empty(PORT_OPTIONS:MLUA) && \
+ empty(PORT_OPTIONS:MMODSECURITY3) && empty(PORT_OPTIONS:MPASSENGER) && \
+ empty(PORT_OPTIONS:MSMALL_LIGHT)
+CONFIGURE_ARGS+= --with-ld-opt="-L ${LOCALBASE}/lib"
+.else
+CONFIGURE_ARGS+= --with-ld-opt="-L ${LOCALBASE}/lib -lpcre"
+LIB_DEPENDS+= libpcre.so:devel/pcre
.endif
.if empty(PORT_OPTIONS:MNJS_XML)
diff --git a/www/nginx-devel/Makefile.extmod b/www/nginx-devel/Makefile.extmod
index 224cb918cd18..3287c5b5907e 100644
--- a/www/nginx-devel/Makefile.extmod
+++ b/www/nginx-devel/Makefile.extmod
@@ -226,7 +226,7 @@ LUA_LIB_DEPENDS= libluajit-5.1.so:lang/luajit-openresty
LUA_RUN_DEPENDS= lua-resty-core>0:www/lua-resty-core
LUA_CONFIGURE_ENV= LUAJIT_INC=${LOCALBASE}/include/luajit-2.1 \
LUAJIT_LIB=${LOCALBASE}/lib
-LUA_GH_TUPLE= openresty:lua-nginx-module:v0.10.23rc1:lua
+LUA_GH_TUPLE= openresty:lua-nginx-module:v0.10.23:lua
LUA_VARS= DSO_EXTMODS+=lua
LINK_GH_TUPLE= Taymindis:nginx-link-function:3.2.4:link
@@ -306,7 +306,6 @@ SLOWFS_CACHE_GH_TUPLE= baysao:ngx_slowfs_cache:d011a18:slowfs_cache
SLOWFS_CACHE_VARS= DSO_EXTMODS+=slowfs_cache
SMALL_LIGHT_USES= magick:6
-SMALL_LIGHT_LIB_DEPENDS= libpcre.so:devel/pcre
SMALL_LIGHT_GH_TUPLE= kawakibi:ngx_small_light:2f5e1d0:small_light
SMALL_LIGHT_VARS= DSO_EXTMODS+=small_light
diff --git a/www/nginx-devel/Makefile.options.desc b/www/nginx-devel/Makefile.options.desc
index bfe005c66f25..1e085518bbd8 100644
--- a/www/nginx-devel/Makefile.options.desc
+++ b/www/nginx-devel/Makefile.options.desc
@@ -94,8 +94,6 @@ NJS_DESC= Enable javascript (NJS) module
NJS_XML_DESC= Enable XML functionality in NJS module
OPENTRACING_DESC= 3rd party opentracing module
PASSENGER_DESC= 3rd party passenger module
-PCRE_ONE_DESC= Enable PCRE1 support
-PCRE_TWO_DESC= Enable PCRE2 support
POSTGRES_DESC= 3rd party postgres module
RDS_CSV_DESC= 3rd party rds_csv module
RDS_JSON_DESC= 3rd party rds_json module
diff --git a/www/nginx-devel/distinfo b/www/nginx-devel/distinfo
index 867ebcc14b4d..6f68b386f5be 100644
--- a/www/nginx-devel/distinfo
+++ b/www/nginx-devel/distinfo
@@ -1,4 +1,4 @@
-TIMESTAMP = 1675811845
+TIMESTAMP = 1677693421
SHA256 (nginx-1.23.3.tar.gz) = 75cb5787dbb9fae18b14810f91cc4343f64ce4c24e27302136fb52498042ba54
SIZE (nginx-1.23.3.tar.gz) = 1108958
SHA256 (nginx_mogilefs_module-1.0.4.tar.gz) = 7ac230d30907f013dff8d435a118619ea6168aa3714dba62c6962d350c6295ae
@@ -99,8 +99,8 @@ SHA256 (baysao-nginx-let-module-c1f23aa_GH0.tar.gz) = 7393809d5d8877812da1bd5b5f
SIZE (baysao-nginx-let-module-c1f23aa_GH0.tar.gz) = 20617
SHA256 (Taymindis-nginx-link-function-3.2.4_GH0.tar.gz) = 20c3679199ba7efe1598f03b2fa0b13591226363c8dd7930d7f02702cd5abada
SIZE (Taymindis-nginx-link-function-3.2.4_GH0.tar.gz) = 139656
-SHA256 (openresty-lua-nginx-module-v0.10.23rc1_GH0.tar.gz) = 8fd7ec5f5b5f638c5115126469744a07c67c0bc8c5a8006a95c98c6e97b0208d
-SIZE (openresty-lua-nginx-module-v0.10.23rc1_GH0.tar.gz) = 724095
+SHA256 (openresty-lua-nginx-module-v0.10.23_GH0.tar.gz) = aabd9907e8b7077c1b4cf4c1d0426e9b10885c5b0bfa87c85c3a97c33c40b503
+SIZE (openresty-lua-nginx-module-v0.10.23_GH0.tar.gz) = 724117
SHA256 (openresty-memc-nginx-module-v0.19_GH0.tar.gz) = 8c2bdbe875e4f5225d0778bfb09a2668f9281d7de6218c7b462a7ba2cee06fe8
SIZE (openresty-memc-nginx-module-v0.19_GH0.tar.gz) = 34654
SHA256 (SpiderLabs-ModSecurity-nginx-v1.0.3_GH0.tar.gz) = 32a42256616cc674dca24c8654397390adff15b888b77eb74e0687f023c8751b