From nobody Sun Mar 26 16:07:52 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 4Pl17X6VNgz420tL; Sun, 26 Mar 2023 16:07:52 +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 4Pl17X62CRz3M8K; Sun, 26 Mar 2023 16:07:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679846872; 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=EZjGaOmZwsr4CWSZlIuVbBq/cSnF6FRUTi6U229aBZQ=; b=pnqP5ILRadnDEAA7k/7ICm39tu+kfPtHG+jRLwv8tMmQwmOX/pyZeLM8lqS3cFnDLKSc30 XI29sqT32emoKBJYwtxtdoac79x9lpjhTQmKzVK1RFGpWg0mS0St6XGsiTVmy5UUg0kbny fT5LkWPXuWEr5ez28L/KCz1tSJ/71Gfa8SSrLexshXs6k/p8vaObdF1MFkez9DdwVpUUIm RXmAus/NtGhRXhWYGFueETWvwcWpkxYdfSfvOO5szqGg0g+9c8shoFvBSouPcpmJiuoyVG igL043d8nUKjEbrn6SRG+0SJNq62Pmbm7hpZMi+ygtXfGAW+bAvihG53ynDJCw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679846872; 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=EZjGaOmZwsr4CWSZlIuVbBq/cSnF6FRUTi6U229aBZQ=; b=RZ1yShb14SU5mBv//mcm4J14lft9zQYrx61u5If0ZNVl+mgKkj45qC+8tIWTJw+X7FHHYk uXamZRSlgds2vyiXTuQ+WIUiYylDO8cacR0OKffJpISH6GHfqknOOpOpjuuH+LsXUw+N3L 5h9b+s2UYJDEak7lph1nytNYkJbMRLU+QUb4EMZ8hxBx7QXiC7PyVhMjVMLA9kipbv+3lP EA8T18Nz8aQlVLEjau/vcUPCWYbM/zEtVzrNW9Vb+wnoH/VsVwMj6IW7GRbxny3MUA099/ tG7g2qTQuc9+d/poZx6PtbIXtyZC2mDg62PFts8ilkRIn4H383HY7Ri09iJqSw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679846872; a=rsa-sha256; cv=none; b=MD78FxMbFMv7b8dUjDwUXG51f2/5Su1z4qAD7hZprHsBuNJGSsmWosSrR9ldDTgx3Sn+n0 XSREUr6FaB16sWC8HNStotMbSRj2HYoq2aRFKAsD8QPV7YLtA6Y3Yl63YW07eUXjma9rD+ Ffc9rJtBECLi6GQVt4I+H3OnnuNE/XiCFZiYCgKxYrCfpNPpe/JFJFKQyEEcOeJIakyEUb Cl9kASKMXSmJQ4Md4pltHtnl80J+bxrWFY/dRcR54f29Saw1AtZtnthWOzhMgUD2j54AJ5 tIdKIqx+J+lpC+jXJS5oGaS57NFbRmoKbqFj8XJSo7CvxKWdRXINU/b5DaSLLQ== 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 4Pl17X55PSzmdg; Sun, 26 Mar 2023 16:07:52 +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 32QG7qaC052094; Sun, 26 Mar 2023 16:07:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32QG7qKG052093; Sun, 26 Mar 2023 16:07:52 GMT (envelope-from git) Date: Sun, 26 Mar 2023 16:07:52 GMT Message-Id: <202303261607.32QG7qKG052093@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Jochen Neumeister Subject: git: 427a28cd6ad0 - main - www/nginx: Add STREAM_REALIP knob for the ngx_stream_realip 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: 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: joneum X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 427a28cd6ad02fd22de2d8ebaf509c397030a72a Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by joneum: URL: https://cgit.FreeBSD.org/ports/commit/?id=427a28cd6ad02fd22de2d8ebaf509c397030a72a commit 427a28cd6ad02fd22de2d8ebaf509c397030a72a Author: Jochen Neumeister AuthorDate: 2023-03-26 16:05:31 +0000 Commit: Jochen Neumeister CommitDate: 2023-03-26 16:07:46 +0000 www/nginx: Add STREAM_REALIP knob for the ngx_stream_realip module. Also, create STREAMGRP group for stream-specific modules. PR: 267112 Sponsored by: Netzkommune GmbH --- www/nginx/Makefile | 24 ++++++++++++++++++------ www/nginx/Makefile.options.desc | 1 + 2 files changed, 19 insertions(+), 6 deletions(-) diff --git a/www/nginx/Makefile b/www/nginx/Makefile index 97184dba0eeb..2160a3c4b195 100644 --- a/www/nginx/Makefile +++ b/www/nginx/Makefile @@ -69,14 +69,14 @@ GROUPS?=${WWWGRP} NO_OPTIONS_SORT= yes -OPTIONS_GROUP= MAILGRP HTTPGRP +OPTIONS_GROUP= MAILGRP HTTPGRP STREAMGRP # Modules that are part of the base nginx distribution OPTIONS_GROUP_HTTPGRP= GOOGLE_PERFTOOLS HTTP HTTP_ADDITION HTTP_AUTH_REQ \ HTTP_CACHE HTTP_DAV HTTP_FLV HTTP_GUNZIP_FILTER HTTP_GZIP_STATIC \ HTTP_IMAGE_FILTER HTTP_MP4 HTTP_PERL HTTP_RANDOM_INDEX HTTP_REALIP \ HTTP_SECURE_LINK HTTP_SLICE HTTP_SLICE_AHEAD \ - HTTP_SSL HTTP_STATUS HTTP_SUB HTTP_XSLT HTTPV2 HTTPV2_AUTOTUNE \ - STREAM STREAM_SSL STREAM_SSL_PREREAD + HTTP_SSL HTTP_STATUS HTTP_SUB HTTP_XSLT HTTPV2 HTTPV2_AUTOTUNE + # External modules (arrayvar MUST appear after devel_kit for build-dep) OPTIONS_GROUP_HTTPGRP+= AJP AWS_AUTH BROTLI CACHE_PURGE CLOJURE CT DEVEL_KIT \ ARRAYVAR DRIZZLE DYNAMIC_TLS DYNAMIC_HC DYNAMIC_UPSTREAM ECHO ENCRYPTSESSION \ @@ -91,14 +91,20 @@ OPTIONS_GROUP_HTTPGRP+= AJP AWS_AUTH BROTLI CACHE_PURGE CLOJURE CT DEVEL_KIT \ MEMC MODSECURITY3 NAXSI OPENTRACING PASSENGER POSTGRES RDS_CSV \ RDS_JSON REDIS2 RTMP SET_MISC SFLOW SHIBBOLETH SLOWFS_CACHE \ SMALL_LIGHT SRCACHE VOD VTS XSS WEBSOCKIFY + 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 THREADS WWW + OPTIONS_DEFAULT?= DSO FILE_AIO HTTP HTTP_ADDITION HTTP_AUTH_REQ HTTP_CACHE \ HTTP_DAV HTTP_FLV HTTP_GZIP_STATIC HTTP_GUNZIP_FILTER \ HTTP_MP4 HTTP_RANDOM_INDEX HTTP_REALIP HTTP_SECURE_LINK \ HTTP_SLICE HTTP_REWRITE HTTP_SSL HTTP_STATUS HTTP_SUB \ - HTTPV2 MAIL MAIL_SSL PCRE_ONE STREAM STREAM_SSL STREAM_SSL_PREREAD \ - THREADS WWW + HTTPV2 MAIL MAIL_SSL PCRE_ONE STREAM STREAM_SSL STREAM_REALIP \ + STREAM_SSL_PREREAD THREADS WWW OPTIONS_RADIO+= PCRE OPTIONS_RADIO_PCRE= PCRE_ONE PCRE_TWO @@ -118,9 +124,14 @@ ${opt}_IMPLIES= MAIL ${opt}_IMPLIES= HTTP .endfor +.for opt in ${OPTIONS_GROUP_STREAMGRP:NSTREAM} +${opt}_IMPLIES= STREAM +.endfor + # If the target is makesum, make sure that every distfile is fetched. .if ${.TARGETS:Mmakesum} -OPTIONS_DEFAULT= ${OPTIONS_DEFINE} ${OPTIONS_GROUP_HTTP} ${OPTIONS_GROUP_MAIL} +OPTIONS_DEFAULT= ${OPTIONS_DEFINE} ${OPTIONS_GROUP_HTTP} \ + ${OPTIONS_GROUP_MAIL} ${OPTIONS_GROUP_STREAM} .endif # Non-module options handling @@ -176,6 +187,7 @@ MAIL_SMTP_CONFIGURE_OFF= --without-mail_smtp_module MAIL_SSL_USES= ssl MAIL_SSL_CONFIGURE_ON= --with-mail_ssl_module STREAM_VARS= DSO_BASEMODS+=stream +TREAM_REALIP_CONFIGURE_ON= --with-stream_realip_module STREAM_SSL_IMPLIES= HTTP_SSL STREAM_SSL_CONFIGURE_ON= --with-stream_ssl_module STREAM_SSL_PREREAD_CONFIGURE_ON= --with-stream_ssl_preread_module diff --git a/www/nginx/Makefile.options.desc b/www/nginx/Makefile.options.desc index 2e654046e5de..dc62dde971b6 100644 --- a/www/nginx/Makefile.options.desc +++ b/www/nginx/Makefile.options.desc @@ -105,6 +105,7 @@ SLOWFS_CACHE_DESC= 3rd party slowfs_cache module SMALL_LIGHT_DESC= 3rd party small_light module SRCACHE_DESC= 3rd party srcache module STREAM_DESC= Enable stream module +STREAM_REALIP_DESC= Enable stream_realip module STREAM_SSL_DESC= Enable stream_ssl module (SSL req.) STREAM_SSL_PREREAD_DESC= Enable stream_ssl_preread module (SSL req.) THREADS_DESC= Enable threads support