summaryrefslogtreecommitdiff
path: root/www/nginx-devel
diff options
context:
space:
mode:
Diffstat (limited to 'www/nginx-devel')
-rw-r--r--www/nginx-devel/Makefile18
-rw-r--r--www/nginx-devel/Makefile.extmod14
-rw-r--r--www/nginx-devel/Makefile.options.desc3
-rw-r--r--www/nginx-devel/distinfo24
-rw-r--r--www/nginx-devel/files/extra-patch-spnego-http-auth-nginx-module-config4
-rw-r--r--www/nginx-devel/pkg-plist1
-rw-r--r--www/nginx-devel/version.mk1
7 files changed, 38 insertions, 27 deletions
diff --git a/www/nginx-devel/Makefile b/www/nginx-devel/Makefile
index cd1f17a6c250..bdc0d6d52163 100644
--- a/www/nginx-devel/Makefile
+++ b/www/nginx-devel/Makefile
@@ -1,5 +1,7 @@
PORTNAME?= nginx
-PORTVERSION= 1.29.0
+PORTVERSION= ${NGINX_VERSION}
+.include "version.mk"
+PORTREVISION= 1
CATEGORIES= www
MASTER_SITES= https://nginx.org/download/ \
LOCAL/osa
@@ -71,7 +73,7 @@ OPTIONS_GROUP_HTTPGRP= GOOGLE_PERFTOOLS HTTP HTTP_ADDITION HTTP_AUTH_REQ \
HTTP_GZIP_STATIC HTTP_IMAGE_FILTER HTTP_MP4 HTTP_PERL \
HTTP_RANDOM_INDEX HTTP_REALIP HTTP_SECURE_LINK HTTP_SLICE HTTP_SSL \
HTTP_STATUS HTTP_SUB HTTP_XSLT HTTPV2 HTTPV3 HTTPV3_BORING HTTPV3_LSSL \
- HTTPV3_QTLS
+ HTTPV3_OSSL35
OPTIONS_GROUP_MAILGRP= MAIL MAIL_IMAP MAIL_POP3 MAIL_SMTP MAIL_SSL
@@ -172,15 +174,15 @@ HTTPV3_CONFIGURE_ON= --with-http_v3_module
HTTPV3_BORING_BUILD_DEPENDS= ${LOCALBASE}/bin/bssl:security/boringssl
HTTPV3_BORING_RUN_DEPENDS= ${LOCALBASE}/bin/bssl:security/boringssl
HTTPV3_BORING_IMPLIES= HTTPV3
-HTTPV3_BORING_PREVENTS= HTTPV3_LSSL HTTPV3_QTLS
+HTTPV3_BORING_PREVENTS= HTTPV3_LSSL HTTPV3_OSSL35
HTTPV3_LSSL_BUILD_DEPENDS= ${LOCALBASE}/include/tls.h:security/libressl-devel
HTTPV3_LSSL_RUN_DEPENDS= ${LOCALBASE}/include/tls.h:security/libressl-devel
HTTPV3_LSSL_IMPLIES= HTTPV3
-HTTPV3_LSSL_PREVENTS= HTTPV3_BORING HTTPV3_QTLS
-HTTPV3_QTLS_BUILD_DEPENDS= ${LOCALBASE}/include/openssl/quic.h:security/openssl-quictls
-HTTPV3_QTLS_RUN_DEPENDS= ${LOCALBASE}/include/openssl/quic.h:security/openssl-quictls
-HTTPV3_QTLS_IMPLIES= HTTPV3
-HTTPV3_QTLS_PREVENTS= HTTPV3_BORING HTTPV3_LSSL
+HTTPV3_LSSL_PREVENTS= HTTPV3_BORING HTTPV3_OSSL35
+HTTPV3_OSSL35_BUILD_DEPENDS= ${LOCALBASE}/include/openssl/quic.h:security/openssl35
+HTTPV3_OSSL35_RUN_DEPENDS= ${LOCALBASE}/include/openssl/quic.h:security/openssl35
+HTTPV3_OSSL35_IMPLIES= HTTPV3
+HTTPV3_OSSL35_PREVENTS= HTTPV3_BORING HTTPV3_LSSL
MAIL_VARS= DSO_BASEMODS+=mail
MAIL_IMAP_CONFIGURE_OFF= --without-mail_imap_module
MAIL_POP3_CONFIGURE_OFF= --without-mail_pop3_module
diff --git a/www/nginx-devel/Makefile.extmod b/www/nginx-devel/Makefile.extmod
index 517412b50ecd..18273974c667 100644
--- a/www/nginx-devel/Makefile.extmod
+++ b/www/nginx-devel/Makefile.extmod
@@ -11,7 +11,7 @@ OPTIONS_GROUP_THIRDPARTYGRP= AJP AWS_AUTH BROTLI CACHE_PURGE \
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 \
- LUASTREAM MEMC MODSECURITY3 NAXSI PASSENGER POSTGRES RDS_CSV RDS_JSON \
+ LUASTREAM MEMC MODSECURITY3 NATS NAXSI PASSENGER POSTGRES RDS_CSV RDS_JSON \
REDIS2 RTMP SET_MISC SFLOW SHIBBOLETH SLOWFS_CACHE SRCACHE STS \
VOD VTS XSS WEBSOCKIFY ZSTD
@@ -47,7 +47,7 @@ DYNAMIC_UPSTREAM_IMPLIES= STREAM
DYNAMIC_UPSTREAM_GH_TUPLE= ZigzagAK:ngx_dynamic_upstream:ab67fe7:dynamic_upstream
DYNAMIC_UPSTREAM_VARS= DSO_EXTMODS+=dynamic_upstream
-DEVEL_KIT_GH_TUPLE= vision5:ngx_devel_kit:v0.3.3:devel_kit
+DEVEL_KIT_GH_TUPLE= vision5:ngx_devel_kit:v0.3.4:devel_kit
DEVEL_KIT_VARS= FIRST_DSO_EXTMODS+=devel_kit
ENCRYPTSESSION_IMPLIES= DEVEL_KIT
@@ -66,7 +66,7 @@ GRIDFS_LIB_DEPENDS= libbson-1.0.so:devel/libbson \
libmongoc-1.0.so:devel/mongo-c-driver
GRIDFS_VARS= DSO_EXTMODS+=gridfs GRIDFS_SUBDIR=/nginx-gridfs
-HEADERS_MORE_GH_TUPLE= openresty:headers-more-nginx-module:84a65d6:headers_more
+HEADERS_MORE_GH_TUPLE= openresty:headers-more-nginx-module:v0.39:headers_more
HEADERS_MORE_VARS= DSO_EXTMODS+=headers_more
HTTP_ACCEPT_LANGUAGE_GH_TUPLE= dvershinin:nginx_accept_language_module:5683967:accept_language
@@ -80,7 +80,7 @@ HTTP_AUTH_JWT_LIB_DEPENDS= libjwt.so:www/libjwt
HTTP_AUTH_JWT_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-ngx_http_auth_jwt_module.c
HTTP_AUTH_JWT_VARS= DSO_EXTMODS+=auth_jwt
-HTTP_AUTH_KRB5_GH_TUPLE= stnoonan:spnego-http-auth-nginx-module:60f0811:auth_krb5
+HTTP_AUTH_KRB5_GH_TUPLE= stnoonan:spnego-http-auth-nginx-module:v1.1.3:auth_krb5
HTTP_AUTH_KRB5_VARS= DSO_EXTMODS+=auth_krb5
HTTP_AUTH_KRB5_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-spnego-http-auth-nginx-module-config
@@ -229,6 +229,10 @@ MODSECURITY3_LIB_DEPENDS= libmodsecurity.so:security/modsecurity3
MODSECURITY3_GH_TUPLE= owasp-modsecurity:ModSecurity-nginx:fd28e6a:modsecurity3
MODSECURITY3_VARS= DSO_EXTMODS+=modsecurity3
+NATS_GH_TUPLE= nats-io:nginx-nats:6f7adf1:nats
+NATS_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-ngx_nats.c
+NATS_VARS= DSO_EXTMODS+=nats NATS_SUBDIR=/src
+
NAXSI_NGINX_VER= 1.7
NAXSI_GH_TUPLE= wargio:naxsi:${NAXSI_NGINX_VER}:naxsi \
libinjection:libinjection:b9fcaaf:libinjection
@@ -236,7 +240,7 @@ NAXSI_VARS= DSO_EXTMODS+=naxsi NAXSI_SUBDIR=/naxsi_src
NAXSI_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-naxsi-libinjection__sqli_c \
${PATCHDIR}/extra-patch-naxsi_config
-NJS_GH_TUPLE= nginx:njs:0.9.0:njs
+NJS_GH_TUPLE= nginx:njs:0.9.1:njs
NJS_CONFIGURE_ON= --with-cc-opt="-I ${LOCALBASE}/include/quickjs"
NJS_LIB_DEPENDS= libquickjs.so:lang/quickjs \
libxml2.so:textproc/libxml2 \
diff --git a/www/nginx-devel/Makefile.options.desc b/www/nginx-devel/Makefile.options.desc
index 6d26b8650d1d..1c64ea17938e 100644
--- a/www/nginx-devel/Makefile.options.desc
+++ b/www/nginx-devel/Makefile.options.desc
@@ -22,7 +22,7 @@ HTTPV2_DESC= Enable HTTP/2 protocol support (SSL req.)
HTTPV3_DESC= Enable HTTP/3 protocol support
HTTPV3_BORING_DESC= Use security/boringssl
HTTPV3_LSSL_DESC= Use security/libressl-devel
-HTTPV3_QTLS_DESC= Use security/openssl-quictls
+HTTPV3_OSSL35_DESC= Use security/openssl35
HTTP_ACCEPT_LANGUAGE_DESC= 3rd party accept_language module
HTTP_ADDITION_DESC= Enable http_addition module
HTTP_AUTH_DIGEST_DESC= 3rd party http_authdigest module
@@ -87,6 +87,7 @@ MAIL_SMTP_DESC= Enable SMTP proxy module
MAIL_SSL_DESC= Enable mail_ssl module
MEMC_DESC= 3rd party memc (memcached) module
MODSECURITY3_DESC= 3rd party modsecurity3 module
+NATS_DESC= 3rd party nats module
NAXSI_DESC= 3rd party naxsi module
NJS_DESC= Enable javascript (NJS) module
OTEL_DESC= Enable OpenTELemetry module
diff --git a/www/nginx-devel/distinfo b/www/nginx-devel/distinfo
index 57f090a2a1d3..817f95e0210e 100644
--- a/www/nginx-devel/distinfo
+++ b/www/nginx-devel/distinfo
@@ -1,6 +1,6 @@
-TIMESTAMP = 1750864974
-SHA256 (nginx-1.29.0.tar.gz) = 109754dfe8e5169a7a0cf0db6718e7da2db495753308f933f161e525a579a664
-SIZE (nginx-1.29.0.tar.gz) = 1284291
+TIMESTAMP = 1755472140
+SHA256 (nginx-1.29.1.tar.gz) = c589f7e7ed801ddbd904afbf3de26ae24eb0cce27c7717a2e94df7fb12d6ad27
+SIZE (nginx-1.29.1.tar.gz) = 1285529
SHA256 (nginx_mogilefs_module-1.0.4.tar.gz) = 7ac230d30907f013dff8d435a118619ea6168aa3714dba62c6962d350c6295ae
SIZE (nginx_mogilefs_module-1.0.4.tar.gz) = 11208
SHA256 (osokin-ngx_http_redis-0.4.0_GH0.tar.gz) = e5b699243035575cb8ffcd26fc3a8287bcd11ff414e30fd0a52c96729fd22d0d
@@ -17,8 +17,8 @@ SHA256 (google-ngx_brotli-a71f931_GH0.tar.gz) = b3312a045d5303a40d02beb34711b8ca
SIZE (google-ngx_brotli-a71f931_GH0.tar.gz) = 16376
SHA256 (nginx-modules-ngx_cache_purge-a84b0f3_GH0.tar.gz) = ddfd4fdd99075d906b7b75c49f56ec96b76df7951dfa54502e0f83890447031f
SIZE (nginx-modules-ngx_cache_purge-a84b0f3_GH0.tar.gz) = 17162
-SHA256 (vision5-ngx_devel_kit-v0.3.3_GH0.tar.gz) = faa2fcd5168b10764d35081356511d5f84db5c526a1aa4b6add2db94b6853b2b
-SIZE (vision5-ngx_devel_kit-v0.3.3_GH0.tar.gz) = 66561
+SHA256 (vision5-ngx_devel_kit-v0.3.4_GH0.tar.gz) = 14a28063294f645d457b1eb10e3c23bbba44398f1c5f021421b58b6f8ab31662
+SIZE (vision5-ngx_devel_kit-v0.3.4_GH0.tar.gz) = 66474
SHA256 (openresty-drizzle-nginx-module-c631276_GH0.tar.gz) = 215ebeb3bad3a907f13fbdae66a25939b6820bdba2f339394cbb9c8b8557308a
SIZE (openresty-drizzle-nginx-module-c631276_GH0.tar.gz) = 51675
SHA256 (ZigzagAK-ngx_dynamic_upstream-ab67fe7_GH0.tar.gz) = 4610da3ce9c35e3eef0e6d12a6285b9c8020f6d44fb094b4af94c1275bc01156
@@ -33,16 +33,16 @@ SHA256 (calio-form-input-nginx-module-v0.12_GH0.tar.gz) = 5c1869d55897075adb3fdf
SIZE (calio-form-input-nginx-module-v0.12_GH0.tar.gz) = 11090
SHA256 (nieoding-nginx-gridfs-059bdc3_GH0.tar.gz) = 9b059b5ae7b602d12d32d5ebe2700827ea625f22c0fb3b9956242e11de63845b
SIZE (nieoding-nginx-gridfs-059bdc3_GH0.tar.gz) = 4674
-SHA256 (openresty-headers-more-nginx-module-84a65d6_GH0.tar.gz) = e99175b8eddcaaaea94856c9a9a90036f8b959c016cedf42cbfbc9cdd63b035f
-SIZE (openresty-headers-more-nginx-module-84a65d6_GH0.tar.gz) = 29468
+SHA256 (openresty-headers-more-nginx-module-v0.39_GH0.tar.gz) = dde68d3fa2a9fc7f52e436d2edc53c6d703dcd911283965d889102d3a877c778
+SIZE (openresty-headers-more-nginx-module-v0.39_GH0.tar.gz) = 29616
SHA256 (dvershinin-nginx_accept_language_module-5683967_GH0.tar.gz) = a58feb576f2231498b8a3863d3c6fba45c7d48bc48735fa714e07a7bfbedb6e3
SIZE (dvershinin-nginx_accept_language_module-5683967_GH0.tar.gz) = 3425
SHA256 (atomx-nginx-http-auth-digest-ac91c88_GH0.tar.gz) = 31b2a737d3d5d118a286a0b8a6e2637eda313dba07a9a5824e4c6e33ea6e2b80
SIZE (atomx-nginx-http-auth-digest-ac91c88_GH0.tar.gz) = 17890
SHA256 (TeslaGov-ngx-http-auth-jwt-module-2.3.1_GH0.tar.gz) = a3865859a1476bd5e8a1468d9dee23d46c716b6b932649fde04238748eafe6d5
SIZE (TeslaGov-ngx-http-auth-jwt-module-2.3.1_GH0.tar.gz) = 32459
-SHA256 (stnoonan-spnego-http-auth-nginx-module-60f0811_GH0.tar.gz) = 205e1ee4b5fcab1a7f136e39c569ddb470a35120761b8acc1463bda5e3062c42
-SIZE (stnoonan-spnego-http-auth-nginx-module-60f0811_GH0.tar.gz) = 30464
+SHA256 (stnoonan-spnego-http-auth-nginx-module-v1.1.3_GH0.tar.gz) = 0e1e54f8ab7d76f922881f13d870edf8b820ef645b19013774c825110d011640
+SIZE (stnoonan-spnego-http-auth-nginx-module-v1.1.3_GH0.tar.gz) = 32975
SHA256 (kvspb-nginx-auth-ldap-241200e_GH0.tar.gz) = d3aa3a5ead311b34059d6ab1b6d2cf3ac8269c47a87b768523c07381229db470
SIZE (kvspb-nginx-auth-ldap-241200e_GH0.tar.gz) = 18541
SHA256 (sto-ngx_http_auth_pam_module-v1.5.5_GH0.tar.gz) = 98a71617d9119ae784993e3789ce8766fdf2ff2479691f3dc6cf8d8763f8d364
@@ -101,12 +101,14 @@ SHA256 (openresty-memc-nginx-module-v0.20_GH0.tar.gz) = a42dd56dd6e2144755a127bc
SIZE (openresty-memc-nginx-module-v0.20_GH0.tar.gz) = 34736
SHA256 (owasp-modsecurity-ModSecurity-nginx-fd28e6a_GH0.tar.gz) = deafee4e4145a73b9369999e261368b34d4f7ff1be2596a559abd9e1d5df5526
SIZE (owasp-modsecurity-ModSecurity-nginx-fd28e6a_GH0.tar.gz) = 1160686
+SHA256 (nats-io-nginx-nats-6f7adf1_GH0.tar.gz) = 2fc9489e85a6d871524dea36ae801b60cbfc2a9f332c91ef3843d5f8e6f79652
+SIZE (nats-io-nginx-nats-6f7adf1_GH0.tar.gz) = 31761
SHA256 (wargio-naxsi-1.7_GH0.tar.gz) = adee817da71913f64a9fb0fca142d9520bb0e5014b1acc797841cd8e31273f4d
SIZE (wargio-naxsi-1.7_GH0.tar.gz) = 1132392
SHA256 (libinjection-libinjection-b9fcaaf_GH0.tar.gz) = 7812e1316b61a7a7d3a65a57a07c6d5235ac40fe35e6edda983f31a44661a38e
SIZE (libinjection-libinjection-b9fcaaf_GH0.tar.gz) = 2218207
-SHA256 (nginx-njs-0.9.0_GH0.tar.gz) = 7b0446f0b3e0b63b57883e0464d883f0ac4eab82ec7746599d37563dc6808203
-SIZE (nginx-njs-0.9.0_GH0.tar.gz) = 942562
+SHA256 (nginx-njs-0.9.1_GH0.tar.gz) = 61365eea69c6862fc8a5b5df531503ae49499f6bcd5af932496b84850a2824a4
+SIZE (nginx-njs-0.9.1_GH0.tar.gz) = 966480
SHA256 (osokin-nginx-otel-3a655df_GH0.tar.gz) = 71ee1561303c289d4562148f8719b60796c36abe16de1b3c10d10b8e6f03a952
SIZE (osokin-nginx-otel-3a655df_GH0.tar.gz) = 27169
SHA256 (konstruxi-ngx_postgres-8aa7359_GH0.tar.gz) = c69ad4495de7c7883ebc23e1e6c4cc83a4ac6a7fddd4d5c12e49d33b65f7c50b
diff --git a/www/nginx-devel/files/extra-patch-spnego-http-auth-nginx-module-config b/www/nginx-devel/files/extra-patch-spnego-http-auth-nginx-module-config
index f64ca870f20a..07eedaf37496 100644
--- a/www/nginx-devel/files/extra-patch-spnego-http-auth-nginx-module-config
+++ b/www/nginx-devel/files/extra-patch-spnego-http-auth-nginx-module-config
@@ -1,5 +1,5 @@
---- ../spnego-http-auth-nginx-module-60f0811/config.orig 2020-08-27 07:59:28.423636000 -0400
-+++ ../spnego-http-auth-nginx-module-60f0811/config 2020-08-27 08:01:42.152121000 -0400
+--- ../spnego-http-auth-nginx-module-1.1.3/config.orig 2020-08-27 07:59:28.423636000 -0400
++++ ../spnego-http-auth-nginx-module-1.1.3/config 2020-08-27 08:01:42.152121000 -0400
@@ -1,8 +1,9 @@
ngx_addon_name=ngx_http_auth_spnego_module
-ngx_feature_libs="-lgssapi_krb5 -lkrb5 -lcom_err"
diff --git a/www/nginx-devel/pkg-plist b/www/nginx-devel/pkg-plist
index 906d67d94d7c..262046e775dd 100644
--- a/www/nginx-devel/pkg-plist
+++ b/www/nginx-devel/pkg-plist
@@ -62,6 +62,7 @@
%%DSO%%%%MAIL%%libexec/nginx/ngx_mail_module.so
%%DSO%%%%MEMC%%libexec/nginx/ngx_http_memc_module.so
%%DSO%%%%MODSECURITY3%%libexec/nginx/ngx_http_modsecurity_module.so
+%%DSO%%%%NATS%%libexec/nginx/ngx_nats_module.so
%%DSO%%%%NAXSI%%libexec/nginx/ngx_http_naxsi_module.so
%%DSO%%%%OTEL%%libexec/nginx/ngx_otel_module.so
%%DSO%%%%PASSENGER%%libexec/nginx/ngx_http_passenger_module.so
diff --git a/www/nginx-devel/version.mk b/www/nginx-devel/version.mk
new file mode 100644
index 000000000000..7b51e340f733
--- /dev/null
+++ b/www/nginx-devel/version.mk
@@ -0,0 +1 @@
+NGINX_VERSION= 1.29.1