From nobody Fri Dec 20 16:22:55 2024 X-Original-To: dev-commits-ports-all@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 4YFCPq60Xfz5WwgV; Fri, 20 Dec 2024 16:22:55 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YFCPq5M70z43ct; Fri, 20 Dec 2024 16:22:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734711775; 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=9NC+IbL4duRveNYNWmdouPoUU9NrJqsZqeeMYuYBlmQ=; b=kOu0/h7xDRSenW7JIP17UPekfH+AsRtmv5luinO6kcTXDujSHWGDL1bbJ5GZYGV3M7rJB5 b6yqMGG5bBSDc8B8lZlxyBVAms5bLIPONwx9Tb3wVnK+GeE3fLjjGgFB1UATSO5jM/w5Rg nnGmZI5zcA2njKowgM/fDtAaxOD6pIqS/0tCb8xktCkeUSUn+vMLg3dPcLvNWzhGtTm47l ZjGFGOmvv+jo4X58Inxv0+epIPdtFyRioRScFestjkNIuW/RRgwV6aUgezOLTaTLlQ7awZ t40/d2Ic2cakWJHpFQmeW6tyc8DYt58HTVfonPh//Kcf5Wciqu0n8bpp2IO2PA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734711775; 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=9NC+IbL4duRveNYNWmdouPoUU9NrJqsZqeeMYuYBlmQ=; b=yo9+xrI/eD8BT25Xhsea2tx9BH4G0b+oKEKWNR/vnMditORG8rPS8cIYmqOTpkjvpO09I+ uGCJJ/inXKev3cXQPxfoGavcIkdEt0vmKTjzpGoi+p0TLaAMsK7boplShguoTbfkNWYCn8 f7/QwjJ2QTyNG9lDmgjVCbfcWAoU34yonQMoVVbNw9a/S649EAyQq0/9n0xM/K6J0fFMLp YZ7y/nbaO+4DywCPHm1Po27u6B6/uVInGyef2UJTpRT79HovNKdNUa4VUyKF8Nd40Yafx+ ofliyVrXJi9Z7LJtboCYrNySG2+usmrZOeZixTi2v0w0Vg4hibM6wHT5FSamUg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1734711775; a=rsa-sha256; cv=none; b=dCt8+9u7umw4WPqvmVH9G1Y65T+50/fvSkyHQQr/WumKQ48vRU3LzwersoBR0YndEAx+aB Et3cSCb1I/0lspHNCrUn9BOdYPy8HJXSXxYcYAOg69LbiQzCxws2b9gaFlYk8GP/auZYGQ TZ5cR8JnM5Wkp0QyU1z/q0E2grtO9ejzZaiR2f9ZXUn7PLlB42ft00nk73U+Qh4T5eKWgX VCnImilU5GB+roM+d8myhsX2rkFZlN5Tbh5JMIFt3hcLKGImQxK6PhuxyrAMYmEWbbZbGy jpBfjF+mBoD0q6hBo6sXFuks+ELuIW4w/Dvf46jh1ulhSCGAhwf4+iyAwSOK6g== 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 4YFCPq4yGtzlk5; Fri, 20 Dec 2024 16:22:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4BKGMtLl000593; Fri, 20 Dec 2024 16:22:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BKGMt0l000590; Fri, 20 Dec 2024 16:22:55 GMT (envelope-from git) Date: Fri, 20 Dec 2024 16:22:55 GMT Message-Id: <202412201622.4BKGMt0l000590@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: c6a9ca835e69 - main - www/nginx-devel: optimize NJS infrastructure (+) List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@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: c6a9ca835e692259d21f49277b3fda5fa2777275 Auto-Submitted: auto-generated The branch main has been updated by osa: URL: https://cgit.FreeBSD.org/ports/commit/?id=c6a9ca835e692259d21f49277b3fda5fa2777275 commit c6a9ca835e692259d21f49277b3fda5fa2777275 Author: Sergey A. Osokin AuthorDate: 2024-12-20 16:16:53 +0000 Commit: Sergey A. Osokin CommitDate: 2024-12-20 16:22:50 +0000 www/nginx-devel: optimize NJS infrastructure (+) - remove NJS_QJS and NJS_XML knobs, always build such components - add arguments to NJS' configure - remove needless patches - the port depends on devel/pcre2, so move `--with-ld-opt' to the main configure level Bump PORTREVISION. --- www/nginx-devel/Makefile | 18 ++++++------------ www/nginx-devel/Makefile.extmod | 15 ++++++--------- www/nginx-devel/Makefile.options.desc | 2 -- www/nginx-devel/files/extra-patch-njs-auto-quickjs | 15 --------------- www/nginx-devel/files/extra-patch-njs-nginx-config | 13 ------------- 5 files changed, 12 insertions(+), 51 deletions(-) diff --git a/www/nginx-devel/Makefile b/www/nginx-devel/Makefile index d9ebf6441772..9c83b69d517d 100644 --- a/www/nginx-devel/Makefile +++ b/www/nginx-devel/Makefile @@ -1,6 +1,6 @@ PORTNAME?= nginx PORTVERSION= 1.27.3 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= www MASTER_SITES= https://nginx.org/download/ \ LOCAL/osa @@ -48,6 +48,7 @@ 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 \ @@ -78,8 +79,7 @@ OPTIONS_GROUP_MAILGRP= MAIL MAIL_IMAP MAIL_POP3 MAIL_SMTP MAIL_SSL OPTIONS_GROUP_STREAMGRP= STREAM STREAM_REALIP STREAM_SSL \ STREAM_SSL_PREREAD -OPTIONS_DEFINE= DEBUG DEBUGLOG DSO FILE_AIO IPV6 NJS NJS_QJS NJS_XML \ - OTEL THREADS WWW +OPTIONS_DEFINE= DEBUG DEBUGLOG DSO FILE_AIO IPV6 NJS OTEL 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 \ @@ -246,20 +246,14 @@ CONFIGURE_ENV+= EXTRA_PRE_CXXFLAGS="-std=c++14" .endif .if empty(PORT_OPTIONS:MMODSECURITY3) -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 ${PORT_OPTIONS:MNJS} -. if empty(PORT_OPTIONS:MNJS_QJS) -NJS_CONFIGURE_ARGS+= --no-quickjs -. endif -. if empty(PORT_OPTIONS:MNJS_XML) -CONFIGURE_ENV+= NJS_LIBXSLT=NO -NJS_CONFIGURE_ARGS+= --no-libxml2 -. endif +NJS_CONFIGURE_ARGS= --cc-opt="-I${LOCALBASE}/include/quickjs" \ + --ld-opt="-L${LOCALBASE}/lib" \ + --with-quickjs .endif .if ${PORT_OPTIONS:MCT} diff --git a/www/nginx-devel/Makefile.extmod b/www/nginx-devel/Makefile.extmod index 433b7fd88d9a..868ff34a7424 100644 --- a/www/nginx-devel/Makefile.extmod +++ b/www/nginx-devel/Makefile.extmod @@ -242,17 +242,14 @@ NAXSI_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-naxsi-libinjection__sqli_c \ ${PATCHDIR}/extra-patch-naxsi_config NJS_GH_TUPLE= nginx:njs:0.8.8:njs -NJS_VARS= DSO_EXTMODS+=njs NJS_SUBDIR=/nginx -NJS_IMPLIES= STREAM - -NJS_QJS_IMPLIES= HTTP NJS -NJS_QJS_LIB_DEPENDS= libquickjs.so:lang/quickjs +NJS_CONFIGURE_ON= --with-cc-opt="-I ${LOCALBASE}/include/quickjs" +NJS_LIB_DEPENDS= libquickjs.so:lang/quickjs \ + libxml2.so:textproc/libxml2 \ + libxslt.so:textproc/libxslt NJS_QJS_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-njs-auto-quickjs \ ${PATCHDIR}/extra-patch-njs-nginx-config - -NJS_XML_IMPLIES= HTTP NJS -NJS_XML_LIB_DEPENDS= libxml2.so:textproc/libxml2 \ - libxslt.so:textproc/libxslt +NJS_VARS= DSO_EXTMODS+=njs NJS_SUBDIR=/nginx +NJS_IMPLIES= HTTP STREAM OTEL_GH_TUPLE= osokin:nginx-otel:3a655df:otel OTEL_VARS= DSO_EXTMODS+=otel OTEL_SUBDIR=/ diff --git a/www/nginx-devel/Makefile.options.desc b/www/nginx-devel/Makefile.options.desc index c22809086c9f..c0d32d40b727 100644 --- a/www/nginx-devel/Makefile.options.desc +++ b/www/nginx-devel/Makefile.options.desc @@ -89,8 +89,6 @@ MEMC_DESC= 3rd party memc (memcached) module MODSECURITY3_DESC= 3rd party modsecurity3 module NAXSI_DESC= 3rd party naxsi module NJS_DESC= Enable javascript (NJS) module -NJS_QJS_DESC= Enable QuickJS engine in NJS module -NJS_XML_DESC= Enable XML functionality in NJS module OTEL_DESC= Enable OpenTELemetry module PASSENGER_DESC= 3rd party passenger module POSTGRES_DESC= 3rd party postgres module diff --git a/www/nginx-devel/files/extra-patch-njs-auto-quickjs b/www/nginx-devel/files/extra-patch-njs-auto-quickjs deleted file mode 100644 index 6fe199bd9e73..000000000000 --- a/www/nginx-devel/files/extra-patch-njs-auto-quickjs +++ /dev/null @@ -1,15 +0,0 @@ ---- ../njs-0.8.8/auto/quickjs.orig 2024-12-15 17:49:15 UTC -+++ ../njs-0.8.8/auto/quickjs -@@ -46,9 +46,9 @@ if [ $NJS_TRY_QUICKJS = YES ]; then - fi - - if [ $njs_found = no ]; then -- njs_feature="QuickJS library -I/usr/include/quickjs/ -L/usr/lib/quickjs/ -lquickjs" -- njs_feature_incs="/usr/include/quickjs/" -- njs_feature_libs="-L/usr/lib/quickjs/ -lquickjs -lm -ldl -lpthread" -+ njs_feature="QuickJS library -I%%LOCALBASE%%/include/quickjs/ -L%%LOCALBASE%%/lib/ -lquickjs" -+ njs_feature_incs="%%LOCALBASE%%/include/quickjs/" -+ njs_feature_libs="-L%%LOCALBASE%%/lib/ -lquickjs -lm -ldl -lpthread" - - . auto/feature - fi diff --git a/www/nginx-devel/files/extra-patch-njs-nginx-config b/www/nginx-devel/files/extra-patch-njs-nginx-config deleted file mode 100644 index e9a340ab733f..000000000000 --- a/www/nginx-devel/files/extra-patch-njs-nginx-config +++ /dev/null @@ -1,13 +0,0 @@ ---- ../njs-0.8.8/nginx/config.orig 2024-12-16 11:16:44.892658000 -0500 -+++ ../njs-0.8.8/nginx/config 2024-12-16 11:19:57.566877000 -0500 -@@ -60,8 +60,8 @@ - fi - - if [ $ngx_found = no ]; then -- ngx_feature="QuickJS library -I/usr/include/quickjs/ -L/usr/lib/quickjs/ -lquickjs" -- ngx_feature_libs="-L/usr/lib/quickjs/ -lquickjs -lm -ldl -lpthread" -+ ngx_feature="QuickJS library -I%%LOCALBASE%%/include/quickjs/ -L%%LOCALBASE%%/lib/ -lquickjs" -+ ngx_feature_libs="-L%%LOCALBASE%%/lib/ -lquickjs -lm -ldl -lpthread" - - . auto/feature - fi