git: e476c05de567 - main - www/nginx*: remove KRB5
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Tue, 31 May 2022 18:50:30 UTC
The branch main has been updated by joneum:
URL: https://cgit.FreeBSD.org/ports/commit/?id=e476c05de56775cd9074f307562cc947f7f5072b
commit e476c05de56775cd9074f307562cc947f7f5072b
Author: Jochen Neumeister <joneum@FreeBSD.org>
AuthorDate: 2022-05-31 18:46:20 +0000
Commit: Jochen Neumeister <joneum@FreeBSD.org>
CommitDate: 2022-05-31 18:50:24 +0000
www/nginx*: remove KRB5
- The Kerberos MIT implementation is the only one is supported by the
third-party spnego module, so remove needless staff.
- Update the 3rd party module PUSH to 1.2.15
- Set PCRE1 als default Option
Sponsored by: Netzkommune GmbH
---
www/nginx-full/Makefile | 4 ++--
www/nginx/Makefile | 12 ++----------
www/nginx/Makefile.extmod | 2 +-
www/nginx/distinfo | 6 +++---
4 files changed, 8 insertions(+), 16 deletions(-)
diff --git a/www/nginx-full/Makefile b/www/nginx-full/Makefile
index b637e56ed68a..2f5e32e46081 100644
--- a/www/nginx-full/Makefile
+++ b/www/nginx-full/Makefile
@@ -1,7 +1,7 @@
# Created by: Bartek Rutkowski <robak@FreeBSD.org>
PORTNAME= nginx
-PORTREVISION= 9
+PORTREVISION= 10
PKGNAMESUFFIX= -full
MAINTAINER= joneum@FreeBSD.org
@@ -23,7 +23,7 @@ OPTIONS_DEFAULT=DSO DEBUG DEBUGLOG FILE_AIO GOOGLE_PERFTOOLS \
MAIL_POP3 MAIL_SMTP MAIL_SSL HTTPV2 NJS STREAM STREAM_SSL \
THREADS WWW AJP AWS_AUTH CACHE_PURGE CLOJURE CT ECHO \
FASTDFS HEADERS_MORE HTTP_ACCEPT_LANGUAGE \
- HTTP_AUTH_DIGEST HTTP_AUTH_KRB5 HTTP_AUTH_LDAP HTTP_AUTH_PAM \
+ HTTP_AUTH_DIGEST HTTP_AUTH_LDAP HTTP_AUTH_PAM \
HTTP_DAV_EXT HTTP_EVAL HTTP_FANCYINDEX HTTP_FOOTER \
HTTP_GEOIP2 HTTP_JSON_STATUS HTTP_MOGILEFS HTTP_MP4_H264 \
HTTP_NOTICE HTTP_PUSH HTTP_PUSH_STREAM HTTP_REDIS \
diff --git a/www/nginx/Makefile b/www/nginx/Makefile
index 5cde9bdf609a..f6b38a4a09d2 100644
--- a/www/nginx/Makefile
+++ b/www/nginx/Makefile
@@ -2,7 +2,7 @@
PORTNAME= nginx
PORTVERSION= 1.22.0
-PORTREVISION?= 3
+PORTREVISION?= 4
PORTEPOCH= 2
CATEGORIES= www
MASTER_SITES= https://nginx.org/download/ \
@@ -98,7 +98,7 @@ 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 STREAM STREAM_SSL STREAM_SSL_PREREAD \
+ HTTPV2 MAIL MAIL_SSL PCRE_ONE STREAM STREAM_SSL STREAM_SSL_PREREAD \
THREADS WWW
OPTIONS_RADIO+= PCRE
@@ -107,11 +107,6 @@ PCRE_ONE_LIB_DEPENDS= libpcre.so:devel/pcre
PCRE_ONE_CONFIGURE_ON= --without-pcre2
PCRE_TWO_LIB_DEPENDS= libpcre2-8.so:devel/pcre2
-OPTIONS_RADIO+= GSSAPI
-OPTIONS_RADIO_GSSAPI= GSSAPI_HEIMDAL GSSAPI_MIT
-GSSAPI_HEIMDAL_USES= gssapi:heimdal,flags
-GSSAPI_MIT_USES= gssapi:mit
-
OPTIONS_SUB= yes
.include "Makefile.options.desc"
@@ -124,9 +119,6 @@ ${opt}_IMPLIES= MAIL
${opt}_IMPLIES= HTTP
.endfor
-GSSAPI_HEIMDAL_IMPLIES= HTTP_AUTH_KRB5
-GSSAPI_MIT_IMPLIES= HTTP_AUTH_KRB5
-
# 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}
diff --git a/www/nginx/Makefile.extmod b/www/nginx/Makefile.extmod
index 2c0d67ab6a00..de86f93b8e03 100644
--- a/www/nginx/Makefile.extmod
+++ b/www/nginx/Makefile.extmod
@@ -139,7 +139,7 @@ HTTP_NOTICE_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-ngx_http_notice_module.c \
${PATCHDIR}/extra-patch-nginx-notice-config
HTTP_NOTICE_VARS= DSO_EXTMODS+=notice
-HTTP_PUSH_GH_TUPLE= slact:nchan:v1.2.12:push
+HTTP_PUSH_GH_TUPLE= slact:nchan:v1.2.15:push
HTTP_PUSH_VARS= DSO_EXTMODS+=push
HTTP_PUSH_STREAM_GH_TUPLE= wandenberg:nginx-push-stream-module:0.5.4:pushstream
diff --git a/www/nginx/distinfo b/www/nginx/distinfo
index e2553d3e0f3d..873509ec6205 100644
--- a/www/nginx/distinfo
+++ b/www/nginx/distinfo
@@ -1,4 +1,4 @@
-TIMESTAMP = 1653569107
+TIMESTAMP = 1653895106
SHA256 (nginx-1.22.0.tar.gz) = b33d569a6f11a01433a57ce17e83935e953ad4dc77cdd4d40f896c88ac26eb53
SIZE (nginx-1.22.0.tar.gz) = 1073322
SHA256 (nginx_mogilefs_module-1.0.4.tar.gz) = 7ac230d30907f013dff8d435a118619ea6168aa3714dba62c6962d350c6295ae
@@ -75,8 +75,8 @@ SHA256 (nginx-modules-ngx_http_json_status_module-1d2f303_GH0.tar.gz) = fdc34e0e
SIZE (nginx-modules-ngx_http_json_status_module-1d2f303_GH0.tar.gz) = 6736
SHA256 (kr-nginx-notice-3c95966_GH0.tar.gz) = e829fc94178cc8c91fef15a1fc44ee7ac162c13eddc0bba4c9427aaa23386885
SIZE (kr-nginx-notice-3c95966_GH0.tar.gz) = 3343
-SHA256 (slact-nchan-v1.2.12_GH0.tar.gz) = 3fd9c51446a65bddabfaf7a0cba8435e3ce6084d0585b6f0eba1a950f14d56a2
-SIZE (slact-nchan-v1.2.12_GH0.tar.gz) = 716150
+SHA256 (slact-nchan-v1.2.15_GH0.tar.gz) = dbb05bec6a4cf6ad1c1a4e613a2c832669c0eb87847e70ab26bc6c590361a818
+SIZE (slact-nchan-v1.2.15_GH0.tar.gz) = 734488
SHA256 (wandenberg-nginx-push-stream-module-0.5.4_GH0.tar.gz) = 5253bb8a804ea679e514137a234637298f044c3ef63c053670bf3802ff3535b1
SIZE (wandenberg-nginx-push-stream-module-0.5.4_GH0.tar.gz) = 183493
SHA256 (yaoweibin-ngx_http_substitutions_filter_module-b8a71ea_GH0.tar.gz) = 08f966328fc1b77e0dbbcacd9532c3905060c20c45b6461b6f2075cd844d0891