From nobody Mon May 13 10:29:54 2024 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 4VdG2V3ZqYz5KgwJ; Mon, 13 May 2024 10:29:54 +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 4VdG2V2vRlz4k8L; Mon, 13 May 2024 10:29:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715596194; 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=to7qBMJiMLw2W58XvemPG6pY6LPWFx8uhVUtkDN3jmM=; b=pPBr6r0MveSQyxZIBY7Il4n1k60wZz+qYBK/XrlaWwieRldp55StqdT5ycB89FY6i3LjO/ r12sSpoxqHK0xljPPx2wORbgCkkT8ZkkIlmAd/dbs28ih7pTpQHmzmo4iLQCxguXnpMXOX IwIxvPjIlvcmP2LlpHHCkttDJVhTAyCAs4vQird//i5oTXe8vNjPEo1mGpmMc2HcQgj72I X8zoY4pOdiI3bFnLrL0SGJQBuj3Qo13H/MB/h+nW4TRWjnRNZIy1cN5WfGiFxwuX2uqeNy SHrqSAC9SRTi1QjkxkfDaF02ER7i0hWHAKBSsYtpPelL4eC+/kxLlBreDzdOMg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1715596194; a=rsa-sha256; cv=none; b=FHyFJJjUjE/XzI35gAmG4YvL2NUhVfaiz/JikCEAr5sEVEkg99XKEuFSFvfuz/BVcFLTud /OlooIzB2xxloOHoynGtqUFowmmgBS/naFoujqyJ1xWaNzA+lCnO2u98OvCx4Mk3o0PWYh Q5lQvWiC9DL8rIrpA2XQsXwdGKLp7SwZrNG/Uz5pYPhkoYHKBys8ydRrVFUY4V/64XHmH2 2ZXT7nud+lroDruor0FWtJGstAEAgnx3Yn1NubAXnT3gf2pUDsGkpUSDsTNf8gksTjXnZp 43/kW163ZsCzY0VKtQLUSCoEWqSGloUF+dTSfNqoop203UyKnclrQh8aUaNe5A== 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=1715596194; 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=to7qBMJiMLw2W58XvemPG6pY6LPWFx8uhVUtkDN3jmM=; b=VDNDp5HELdzyjlqAupJM1MnlqdJnaZAyhH6bt1Sb3gERSCBPTgDilAmkMcvUcPne0FTJ5n 2ltnu5E3JcmoCN2qsZ1c1ZZhPbUrA+KR6vZoghR0PyuhK3ZiIG88ViyzdhTOIUbOuY6pjr tiQ9wnrHg8DB+hl09terXNrJGUe60gKMYi5NNOBv1Ct4J8ociSFgPzqmZnS/k6JBRLv49E eIaB8GiT3uoew0wba1vr/TU9Gi6aeaOK7qrSxWAsFZd3lsfHn6wat2mALbqQWHD83dXqxJ fc0fVaC3lTvHsmyucKdgq+nJyib5diOQD/U5z5av4Xcs1JMYUxtv8/CU+JvYAQ== 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 4VdG2V2SMFzkyy; Mon, 13 May 2024 10:29:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 44DATsXv091549; Mon, 13 May 2024 10:29:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44DATsfk091546; Mon, 13 May 2024 10:29:54 GMT (envelope-from git) Date: Mon, 13 May 2024 10:29:54 GMT Message-Id: <202405131029.44DATsfk091546@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Mateusz Piotrowski <0mp@FreeBSD.org> Subject: git: 5f61eef0e8bb - main - www/nginx: Add support for 3rd party stream-lua-nginx-module 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: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: 0mp X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5f61eef0e8bbaffff7fd816aaf0befc364e8245b Auto-Submitted: auto-generated The branch main has been updated by 0mp: URL: https://cgit.FreeBSD.org/ports/commit/?id=5f61eef0e8bbaffff7fd816aaf0befc364e8245b commit 5f61eef0e8bbaffff7fd816aaf0befc364e8245b Author: Eirik Oeverby AuthorDate: 2024-05-13 09:48:03 +0000 Commit: Mateusz Piotrowski <0mp@FreeBSD.org> CommitDate: 2024-05-13 10:28:23 +0000 www/nginx: Add support for 3rd party stream-lua-nginx-module PR: 277719 Approved by: maintainer timeout Reported by: Eirik Oeverby Sponsored by: Modirum MDPay Sponsored by: Klara, Inc. Co-authored-by: Xavier Beaudouin (cherry picked from commit edac05fd7cb3fa2f9c794165b8ffcfc9e32c20c4) --- www/nginx/Makefile | 2 +- www/nginx/Makefile.extmod | 10 +++++++++- www/nginx/Makefile.options.desc | 1 + www/nginx/distinfo | 2 ++ www/nginx/pkg-plist | 1 + 5 files changed, 14 insertions(+), 2 deletions(-) diff --git a/www/nginx/Makefile b/www/nginx/Makefile index 4d92fc92c11e..b720743e02ba 100644 --- a/www/nginx/Makefile +++ b/www/nginx/Makefile @@ -1,6 +1,6 @@ PORTNAME= nginx PORTVERSION= 1.24.0 -PORTREVISION?= 16 +PORTREVISION?= 17 PORTEPOCH= 3 CATEGORIES= www MASTER_SITES= https://nginx.org/download/ \ diff --git a/www/nginx/Makefile.extmod b/www/nginx/Makefile.extmod index 2f68a38b8462..8e1ec1dd0b48 100644 --- a/www/nginx/Makefile.extmod +++ b/www/nginx/Makefile.extmod @@ -10,7 +10,7 @@ OPTIONS_GROUP_THIRDPARTYGRP= AJP AWS_AUTH BROTLI CACHE_PURGE CLOJURE COOKIE_FLAG HTTP_JSON_STATUS HTTP_MOGILEFS HTTP_MP4_H264 HTTP_NOTICE HTTP_PROXY_CONNECT HTTP_PUSH \ HTTP_PUSH_STREAM HTTP_REDIS HTTP_SLICE_AHEAD HTTP_SUBS_FILTER HTTP_TARANTOOL \ HTTP_UPLOAD HTTP_UPLOAD_PROGRESS HTTP_UPSTREAM_CHECK HTTP_UPSTREAM_FAIR \ - HTTP_UPSTREAM_STICKY HTTP_VIDEO_THUMBEXTRACTOR HTTP_ZIP ICONV LET LINK LUA MEMC \ + HTTP_UPSTREAM_STICKY HTTP_VIDEO_THUMBEXTRACTOR HTTP_ZIP ICONV LET LINK LUA LUASTREAM MEMC \ MODSECURITY3 NAXSI PASSENGER POSTGRES RDS_CSV RDS_JSON REDIS2\ RTMP SET_MISC SFLOW SHIBBOLETH SLOWFS_CACHE SRCACHE STS VOD VTS \ XSS WEBSOCKIFY @@ -229,6 +229,14 @@ LUA_CONFIGURE_ENV= LUAJIT_INC=${LOCALBASE}/include/luajit-2.1 \ LUA_GH_TUPLE= openresty:lua-nginx-module:v0.10.26:lua LUA_VARS= DSO_EXTMODS+=lua +LUASTREAM_IMPLIES= DEVEL_KIT +LUASTREAM_LIB_DEPENDS= libluajit-5.1.so:lang/luajit-openresty +LUASTREAM_RUN_DEPENDS= lua-resty-core>0:www/lua-resty-core +LUASTREAM_CONFIGURE_ENV=LUAJIT_INC=${LOCALBASE}/include/luajit-2.1 \ + LUAJIT_LIB=${LOCALBASE}/lib +LUASTREAM_GH_TUPLE= openresty:stream-lua-nginx-module:v0.0.14:luastream +LUASTREAM_VARS= DSO_EXTMODS+=luastream + LINK_GH_TUPLE= Taymindis:nginx-link-function:3.2.4:link LINK_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-nginx-link-function-config \ ${PATCHDIR}/extra-patch-ngx_link_func_module.c diff --git a/www/nginx/Makefile.options.desc b/www/nginx/Makefile.options.desc index 598e1f75a83f..d299cc6b3607 100644 --- a/www/nginx/Makefile.options.desc +++ b/www/nginx/Makefile.options.desc @@ -82,6 +82,7 @@ IPV6_DESC= Enable IPv6 support LET_DESC= 3rd party let module LINK_DESC= 3rd party link function module LUA_DESC= 3rd party lua module +LUASTREAM_DESC= 3rd party lua stream module MAILGRP_DESC= Modules that require MAIL module MAIL_DESC= Enable IMAP4/POP3/SMTP proxy module MAIL_IMAP_DESC= Enable IMAP4 proxy module diff --git a/www/nginx/distinfo b/www/nginx/distinfo index 3e48677696fc..c038036d9d0a 100644 --- a/www/nginx/distinfo +++ b/www/nginx/distinfo @@ -143,3 +143,5 @@ SHA256 (tg123-websockify-nginx-module-c11bc9a_GH0.tar.gz) = aca454bffcee2476dc92 SIZE (tg123-websockify-nginx-module-c11bc9a_GH0.tar.gz) = 14646 SHA256 (openresty-xss-nginx-module-v0.06_GH0.tar.gz) = 0b12bbc53a41f3e3d6df419c173b8c87434be3e6cd255a8193aa91345a2de6cf SIZE (openresty-xss-nginx-module-v0.06_GH0.tar.gz) = 12448 +SHA256 (openresty-stream-lua-nginx-module-v0.0.14_GH0.tar.gz) = 8e2ff6ad5f91127da3c01757e7e654f1addf9769450d9159601d2cc153953c47 +SIZE (openresty-stream-lua-nginx-module-v0.0.14_GH0.tar.gz) = 381313 diff --git a/www/nginx/pkg-plist b/www/nginx/pkg-plist index 94e0cd5e7946..35d8f66bfad8 100644 --- a/www/nginx/pkg-plist +++ b/www/nginx/pkg-plist @@ -63,6 +63,7 @@ %%DSO%%%%LET%%libexec/nginx/ngx_http_let_module.so %%DSO%%%%LINK%%libexec/nginx/ngx_http_link_func_module.so %%DSO%%%%LUA%%libexec/nginx/ngx_http_lua_module.so +%%DSO%%%%LUASTREAM%%libexec/nginx/ngx_stream_lua_module.so %%DSO%%%%MAIL%%libexec/nginx/ngx_mail_module.so %%DSO%%%%MAIL%%%%CT%%libexec/nginx/ngx_mail_ssl_ct_module.so %%DSO%%%%MEMC%%libexec/nginx/ngx_http_memc_module.so