From nobody Wed Mar 01 20:18:26 2023 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PRltC13lmz3vJjp; Wed, 1 Mar 2023 20:18:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PRltC0V6sz4Lkc; Wed, 1 Mar 2023 20:18:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677701907; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=91JDpKoHXjnOS1ZqP93SJa2kDGp47mRciYA4umm487M=; b=f38KCbYy01KnX211v3Mq63OF9iBd8jRlUk6DOiRRsvDrAIKPb4d6+JJeZPehZoW2fDsNyi MxzPd9Y1GV1WPPmIGqx6LvCEZbyELJgadBRNG12lp8sdFGG38w7qSwauruC0YWhZ2lTIeJ yhDVw13aHyBmy7rdMxp/0IUsaJUHimNgGt7ZKNBL7rpXx6EuY7+rP1leJsr0OpcdiSMe3A H+LNrGSjUwB3FBiVEXFjVF3QkppXkQPXx/mC9rtTw+JhYCSdylKa7acXSnRI0jQGuUKVok ptNlHWBJUxQLjmt20lh8Gz3jjA5kl8YaXegq+HXS2aT8k/mdrjmP7rQ+e7Yk0g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677701907; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=91JDpKoHXjnOS1ZqP93SJa2kDGp47mRciYA4umm487M=; b=YHObONwe4gGHBTVvP08ApPU95jy+ATfAV3uV6VX0KyFNXZSeuAcaodvjTmenXjKL3EDarT G97yoR+4tdNqmrpctvTBXMYgtTTrtEe8BEFCffQvXHmaN5N5RWSBznzpLSPKJG0IRDtIq3 GFMvsd533xiXS4qZFwnvjcXhhquHY9BYsTSB1ClqbFd7C5SU4Arc3+SfBlwN+sbDfM8oJR UiETcG7eEPryhmOmmSCB73XjvtYsgQ9j8MLEZO4ZUqDbOebic8A524b0TgfU0AqaTI3ned iyalnX5nwzmbrtbidQx+grDSB7A8qvZC1raoeUCDnA8MPQcBUM1zAwI8YMiN0g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677701907; a=rsa-sha256; cv=none; b=sYLjyWabj+eQ32FDArAIFVmm5UCrliRENO7UJEVGfTcljvTIfVo9xOc06r/ZYTaZMZE841 umPxriCrxla4IVbKcZMuxG1PQc7Erj+yAEvEmNvJhovCaUuqtTKJYOZwqwsROMMYQ1050X vkcHExLKDGRhVGRV5+p7er67AyrOjKTM15DHmZ6hHPKtKaKDfhHcPD6xIS6gRLcz9wJ60V vSTiTZajmjQju1SuQ7OeWpEl9b4akO/1k+gGXnI7BQ1tEYEyZPRy8KmH8jYVIU5YDtUDo5 Ghak0fqw+3NDQoZ1UB710493ffIWmHIEnBg0qWyq/AugmSp75RSZMHfsKZ4fow== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PRltB6dFXzngK; Wed, 1 Mar 2023 20:18:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 321KIQvH065346; Wed, 1 Mar 2023 20:18:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 321KIQxf065345; Wed, 1 Mar 2023 20:18:26 GMT (envelope-from git) Date: Wed, 1 Mar 2023 20:18:26 GMT Message-Id: <202303012018.321KIQxf065345@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: "Sergey A. Osokin" Subject: git: 220f031d3ecd - main - www/nginx-devel: switch to pcre2 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: osa X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 220f031d3ecd2e510025388e02c6f6050023f07b Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by osa: URL: https://cgit.FreeBSD.org/ports/commit/?id=220f031d3ecd2e510025388e02c6f6050023f07b commit 220f031d3ecd2e510025388e02c6f6050023f07b Author: Sergey A. Osokin AuthorDate: 2023-03-01 20:09:23 +0000 Commit: Sergey A. Osokin 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