Hi, upcoming nginx release 1.21.5 will support both version of PCRE library. The attached patch enables such support for www/nginx-devel in FreeBSD ports tree.
I appreciate your testing and feedback. Thank you. -- Sergey A. Osokin
diff --git a/www/nginx-devel/Makefile b/www/nginx-devel/Makefile index f5c5eac910cb..9c6c44007e38 100644 --- a/www/nginx-devel/Makefile +++ b/www/nginx-devel/Makefile @@ -1,29 +1,25 @@ # Created by: Sergey A. Osokin <o...@freebsd.org> PORTNAME?= nginx -PORTVERSION= 1.21.4 -PORTREVISION= 1 +PORTVERSION= 1.21.5 CATEGORIES= www -MASTER_SITES= https://nginx.org/download/ \ - LOCAL/osa PKGNAMESUFFIX?= -devel -DISTFILES= ${DISTNAME}${EXTRACT_SUFX} MAINTAINER?= o...@freebsd.org COMMENT?= Robust and small WWW server LICENSE?= BSD2CLAUSE -LICENSE_FILE?= ${WRKSRC}/LICENSE CONFLICTS_INSTALL= nginx PORTSCOUT= limit:^1\.21\.[0-9]* USES= cpe +USE_GITHUB= yes +GH_TUPLE= nginx:nginx:d5f1f16 CPE_VENDOR= f5 CPE_PRODUCT= nginx -USE_GITHUB= nodefault NGINX_VARDIR?= /var NGINX_LOGDIR?= ${NGINX_VARDIR}/log/nginx @@ -47,6 +43,7 @@ SUB_LIST+= WWWOWN=${WWWOWN} \ PREFIX=${PREFIX} HAS_CONFIGURE= yes +CONFIGURE_SCRIPT=auto/configure CONFIGURE_ARGS+=--prefix=${ETCDIR} \ --with-cc-opt="-I ${LOCALBASE}/include" \ --with-ld-opt="-L ${LOCALBASE}/lib" \ @@ -70,7 +67,7 @@ OPTIONS_GROUP= HTTPGRP MAILGRP STREAMGRP OPTIONS_GROUP_HTTPGRP= GOOGLE_PERFTOOLS HTTP HTTP_ADDITION HTTP_AUTH_REQ \ HTTP_CACHE HTTP_DAV HTTP_DEGRADATION HTTP_FLV HTTP_GUNZIP_FILTER \ HTTP_GZIP_STATIC HTTP_IMAGE_FILTER HTTP_MP4 HTTP_PERL \ - HTTP_RANDOM_INDEX HTTP_REALIP HTTP_REWRITE HTTP_SECURE_LINK \ + HTTP_RANDOM_INDEX HTTP_REALIP HTTP_SECURE_LINK \ HTTP_SLICE HTTP_SSL HTTP_STATUS HTTP_SUB HTTP_XSLT HTTPV2 OPTIONS_GROUP_MAILGRP= MAIL MAIL_IMAP MAIL_POP3 MAIL_SMTP MAIL_SSL @@ -81,11 +78,18 @@ OPTIONS_GROUP_STREAMGRP= STREAM STREAM_REALIP STREAM_SSL \ OPTIONS_DEFINE= DEBUG DEBUGLOG DSO FILE_AIO IPV6 NJS 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_REWRITE \ + HTTP_MP4 HTTP_RANDOM_INDEX HTTP_REALIP \ HTTP_SECURE_LINK HTTP_SLICE HTTP_SSL HTTP_STATUS \ - HTTP_SUB HTTPV2 MAIL MAIL_SSL STREAM STREAM_REALIP \ + HTTP_SUB HTTPV2 MAIL MAIL_SSL PCRE_ONE 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= --with-pcre --without-pcre2 +PCRE_TWO_LIB_DEPENDS= libpcre2-8.so:devel/pcre2 +PCRE_TWO_CONFIGURE_ON= --with-pcre + OPTIONS_RADIO+= GSSAPI OPTIONS_RADIO_GSSAPI= GSSAPI_HEIMDAL GSSAPI_MIT GSSAPI_HEIMDAL_USES= gssapi:heimdal,flags @@ -153,9 +157,6 @@ HTTP_PERL_USES= perl5 HTTP_PERL_VARS= DSO_BASEMODS+=http_perl_module HTTP_RANDOM_INDEX_CONFIGURE_ON= --with-http_random_index_module HTTP_REALIP_CONFIGURE_ON= --with-http_realip_module -HTTP_REWRITE_LIB_DEPENDS= libpcre.so:devel/pcre -HTTP_REWRITE_CONFIGURE_ON= --with-pcre -HTTP_REWRITE_CONFIGURE_OFF= --without-http_rewrite_module HTTP_SECURE_LINK_CONFIGURE_ON= --with-http_secure_link_module HTTP_SLICE_CONFIGURE_ON= --with-http_slice_module HTTP_SSL_CONFIGURE_ON= --with-http_ssl_module diff --git a/www/nginx-devel/Makefile.options.desc b/www/nginx-devel/Makefile.options.desc index 66252c898a37..0424d95d8150 100644 --- a/www/nginx-devel/Makefile.options.desc +++ b/www/nginx-devel/Makefile.options.desc @@ -56,7 +56,6 @@ HTTP_RANDOM_INDEX_DESC= Enable http_random_index module HTTP_REALIP_DESC= Enable http_realip module HTTP_REDIS_DESC= 3rd party http_redis module HTTP_RESPONSE_DESC= 3rd party http_response module -HTTP_REWRITE_DESC= Enable http_rewrite module HTTP_SECURE_LINK_DESC= Enable http_secure_link module HTTP_SLICE_DESC= Enable http_slice module HTTP_SLICE_AHEAD_DESC= 3rd party http_slice_ahead module @@ -91,6 +90,8 @@ NAXSI_DESC= 3rd party naxsi module NJS_DESC= Enable javascript 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 1514e9269f2a..ddae8910fc15 100644 --- a/www/nginx-devel/distinfo +++ b/www/nginx-devel/distinfo @@ -1,6 +1,6 @@ -TIMESTAMP = 1638983725 -SHA256 (nginx-1.21.4.tar.gz) = d1f72f474e71bcaaf465dcc7e6f7b6a4705e4b1ed95c581af31df697551f3bfe -SIZE (nginx-1.21.4.tar.gz) = 1070260 +TIMESTAMP = 1640384606 +SHA256 (nginx-nginx-1.21.5-d5f1f16_GH0.tar.gz) = 85223eb81b41430f24350f81faadb003705aac61c114ecefdbb3f9dfdbd96841 +SIZE (nginx-nginx-1.21.5-d5f1f16_GH0.tar.gz) = 1116115 SHA256 (nginx_mogilefs_module-1.0.4.tar.gz) = 7ac230d30907f013dff8d435a118619ea6168aa3714dba62c6962d350c6295ae SIZE (nginx_mogilefs_module-1.0.4.tar.gz) = 11208 SHA256 (nginx_mod_h264_streaming-2.2.7.tar.gz) = 6d974ba630cef59de1f60996c66b401264a345d25988a76037c2856cec756c19
_______________________________________________ nginx-devel mailing list nginx-devel@nginx.org http://mailman.nginx.org/mailman/listinfo/nginx-devel
