summaryrefslogtreecommitdiff
path: root/www/nginx-devel/Makefile
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--www/nginx-devel/Makefile21
-rw-r--r--www/nginx-devel/Makefile.extmod8
-rw-r--r--www/nginx-devel/Makefile.options.desc2
3 files changed, 17 insertions, 14 deletions
diff --git a/www/nginx-devel/Makefile b/www/nginx-devel/Makefile
index 16871c36cc9a..c2ef0c8d2134 100644
--- a/www/nginx-devel/Makefile
+++ b/www/nginx-devel/Makefile
@@ -1,12 +1,15 @@
PORTNAME?= nginx
-PORTVERSION= 1.28.0
-PORTREVISION= 8
+PORTVERSION= 1.29.0
+PORTREVISION= 4
CATEGORIES= www
MASTER_SITES= https://nginx.org/download/ \
LOCAL/osa
PKGNAMESUFFIX?= -devel
DISTFILES= ${DISTNAME}${EXTRACT_SUFX}
+PATCH_SITES= https://github.com/nginx/nginx/commit/
+PATCHFILES= 0bb7489cb2fcc60ce24fae2d5581c7441bfa0931.patch:-p1
+
MAINTAINER?= osa@FreeBSD.org
COMMENT?= Robust and small WWW server
WWW= https://nginx.com/
@@ -72,7 +75,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
@@ -173,15 +176,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..a85626300cbf 100644
--- a/www/nginx-devel/Makefile.extmod
+++ b/www/nginx-devel/Makefile.extmod
@@ -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
@@ -236,7 +236,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..5e88c02b674e 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