From nobody Tue Jul 09 13:11:36 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 4WJLwn1rgrz5QNCY; Tue, 09 Jul 2024 13:11:37 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WJLwn11YYz4GWy; Tue, 9 Jul 2024 13:11:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1720530697; 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=eZ/VZr701EY03E4UIpon6p9RWdwI2/4NxgsKxNg25JU=; b=MnV1QVMI8i3fwCg654qXIoxDIisQ8jesVaZXMa9xGDDzggVrmgfpmdU2SS2PjZ/j9oVsdF +3Sqoq/A7eqkkOVvviw4EFwM9bmokB0miIg5IsJfJBVEFBccw5adWi2MZyNq7adgQlK5d+ fJG+ziCGM0tcpoKSOnq0PJ2Cfd3TDzjblqcChxmlGvvBBq0NmQ9OREskT18Z5vk+oKmpB7 E1Jco3FcJKPwL7+D+9mY+Y7ss1J18R19V1Jk+XGaOpH6Tkn8fKBMwQ0uE/Rqrdtu4eslzQ 5xY/WAG8FHwv8yiFnVKwN7Y04QenA86Cr8fq2YqRMxBMPik7jSOAyOEqYsnO5g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1720530697; a=rsa-sha256; cv=none; b=c2WbefnGOP1pVbpgwpKqGquhgHNGzqiKdxfcwGqkFn5Z4FGUTE2M0IwPVl2+QUoaHzQHG1 mm7/W5tkoHHVP62YQBBB9Dqg1kbBFdV18QvBgWIUPZc+XPzeBpCRru1tADU+WNVZM8EA9A zW0fFLQxLEXZJ1AAUoZDwgtb1Mtt6y6aGDbUHeC5tlvsE3PMlAxx/7n4pQXuSkofri8fMx F8x+BZvHOoXAU3lM1oA9jY9Z0gglryuU33hDLpvPqnmqoeHVhcUsDYTWLESkVThqU8rGw2 QoqhDC+TUxbNsni06+tmfCvJP/AzDSkT4oL2t60YVLFAz2aj4e4KHVy60mPuSA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1720530697; 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=eZ/VZr701EY03E4UIpon6p9RWdwI2/4NxgsKxNg25JU=; b=nd5zLc5ugu2ApY9OpRnP/x2UEztb4X03wtCD0f8PjGBPrC0Cgu8U3QaoMcI6jjBPQ3ASHv FaqaF/cjfOW8Q8M/OPsh0yI5t03UUY1LulvkCkOqFUTzAdnmgYl+jVkksKhSm9F9wHlgmX VkjTs/V1/aDFBgs0rR1XrsPCBeYcFcqoLwg6DufQjb0oDNYdnWaOT6akuZNsQxsKzJg9Wu aDwlwQOZekyUEI9tcjbdrCTIjBG8sI6WTfwH015T/25QRwgyvvPfojFHlBjgFEaDSdKY7S nSlQIgdUoZZl/y2lT0bvZbkYkHTg6PdJ9txEsMQIy/Qd2+IA5pKx5tKThHnv9Q== 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 4WJLwn0d8qzbn4; Tue, 9 Jul 2024 13:11:37 +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 469DBaD3025041; Tue, 9 Jul 2024 13:11:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 469DBaHK025038; Tue, 9 Jul 2024 13:11:36 GMT (envelope-from git) Date: Tue, 9 Jul 2024 13:11:36 GMT Message-Id: <202407091311.469DBaHK025038@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: 679a1b0ca082 - main - www/nginx-devel: add QuickJS engine to NGINX JavaScript module 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: 679a1b0ca0828c1f38dd039e2b0b098bcb7981b4 Auto-Submitted: auto-generated The branch main has been updated by osa: URL: https://cgit.FreeBSD.org/ports/commit/?id=679a1b0ca0828c1f38dd039e2b0b098bcb7981b4 commit 679a1b0ca0828c1f38dd039e2b0b098bcb7981b4 Author: Sergey A. Osokin AuthorDate: 2024-07-09 13:10:38 +0000 Commit: Sergey A. Osokin CommitDate: 2024-07-09 13:10:38 +0000 www/nginx-devel: add QuickJS engine to NGINX JavaScript module Bump PORTREVISION. --- www/nginx-devel/Makefile | 17 +++++++++++++---- www/nginx-devel/Makefile.extmod | 4 ++++ www/nginx-devel/Makefile.options.desc | 1 + www/nginx-devel/files/extra-patch-njs-auto-quickjs | 15 +++++++++++++++ 4 files changed, 33 insertions(+), 4 deletions(-) diff --git a/www/nginx-devel/Makefile b/www/nginx-devel/Makefile index 1822f967f882..cfaa5e821710 100644 --- a/www/nginx-devel/Makefile +++ b/www/nginx-devel/Makefile @@ -1,6 +1,6 @@ PORTNAME?= nginx PORTVERSION= 1.27.0 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= www MASTER_SITES= https://nginx.org/download/ \ LOCAL/osa @@ -78,7 +78,8 @@ 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_XML OTEL THREADS WWW +OPTIONS_DEFINE= DEBUG DEBUGLOG DSO FILE_AIO IPV6 NJS NJS_QJS NJS_XML \ + 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 \ @@ -251,9 +252,14 @@ CONFIGURE_ARGS+= --with-ld-opt="-L ${LOCALBASE}/lib -lpcre" LIB_DEPENDS+= libpcre.so:devel/pcre .endif -.if ${PORT_OPTIONS:MNJS} && empty(PORT_OPTIONS:MNJS_XML) +.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 +NJS_CONFIGURE_ARGS+= --no-libxml2 +. endif .endif pre-everything:: @@ -305,6 +311,9 @@ post-patch-HTTP_TARANTOOL-on: post-patch-ICONV-on: @${REINPLACE_CMD} 's!%%PREFIX%%!${LOCALBASE}!g' ${WRKSRC_iconv}/config +post-patch-NJS_QJS-on: + @${REINPLACE_CMD} 's!%%PREFIX%%!${LOCALBASE}!g' ${WRKSRC_njs}/auto/quickjs + post-patch-PASSENGER-on: @${REINPLACE_CMD} \ '168,170s!true!false!' \ diff --git a/www/nginx-devel/Makefile.extmod b/www/nginx-devel/Makefile.extmod index 451c958e3d9f..64690014313a 100644 --- a/www/nginx-devel/Makefile.extmod +++ b/www/nginx-devel/Makefile.extmod @@ -244,6 +244,10 @@ NJS_GH_TUPLE= nginx:njs:0.8.5: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_QJS_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-njs-auto-quickjs + NJS_XML_IMPLIES= HTTP NJS NJS_XML_LIB_DEPENDS= libxml2.so:textproc/libxml2 \ libxslt.so:textproc/libxslt diff --git a/www/nginx-devel/Makefile.options.desc b/www/nginx-devel/Makefile.options.desc index f2b3924b69f8..c22809086c9f 100644 --- a/www/nginx-devel/Makefile.options.desc +++ b/www/nginx-devel/Makefile.options.desc @@ -89,6 +89,7 @@ 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 diff --git a/www/nginx-devel/files/extra-patch-njs-auto-quickjs b/www/nginx-devel/files/extra-patch-njs-auto-quickjs new file mode 100644 index 000000000000..742b880b2059 --- /dev/null +++ b/www/nginx-devel/files/extra-patch-njs-auto-quickjs @@ -0,0 +1,15 @@ +--- ../njs-0.8.5/auto/quickjs.orig 2024-06-25 13:40:20.000000000 -0400 ++++ ../njs-0.8.5/auto/quickjs 2024-07-08 14:45:08.895107000 -0400 +@@ -47,9 +46,9 @@ + 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%%PREFIX%%/include/quickjs/ -L%%PREFIX%%/lib/quickjs/ -lquickjs" ++ njs_feature_incs="%%PREFIX%%/include/quickjs/" ++ njs_feature_libs="-L%%PREFIX%%/lib -lquickjs -lm -ldl -lpthread" + + . auto/feature + fi