www/nginx: Update 3rd party Module

Update the 3rd Party Module PUSH and TARANTOOL
While here, fix the KRB5 Module

Sponsored by:	Netzkommune GmbH

5 files changed, 27 insertions, 36 deletions

diff --git a/www/nginx/Makefile b/www/nginx/Makefile
index f6b38a4a09d2..0bb07dd942c2 100644
--- a/www/nginx/Makefile
+++ b/www/nginx/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	nginx
 PORTVERSION=	1.22.0
-PORTREVISION?=	4
+PORTREVISION?=	5
 PORTEPOCH=	2
 CATEGORIES=	www
 MASTER_SITES=	https://nginx.org/download/ \
diff --git a/www/nginx/Makefile.extmod b/www/nginx/Makefile.extmod
index de86f93b8e03..e6c07047d094 100644
--- a/www/nginx/Makefile.extmod
+++ b/www/nginx/Makefile.extmod
@@ -80,6 +80,7 @@ HTTP_AUTH_KRB5_GH_TUPLE=	stnoonan:spnego-http-auth-nginx-module:c626163:auth_krb
 HTTP_AUTH_KRB5_VARS=		DSO_EXTMODS+=auth_krb5
 HTTP_AUTH_KRB5_EXTRA_PATCHES=	${PATCHDIR}/extra-patch-spnego-http-auth-nginx-module-config \
 				${PATCHDIR}/extra-patch-ngx_http_auth_spnego_module.c
+HTTP_AUTH_KRB5_USES=		gssapi:mit
 
 HTTP_AUTH_LDAP_GH_TUPLE=	kvspb:nginx-auth-ldap:42d195d:http_auth_ldap
 HTTP_AUTH_LDAP_VARS=		DSO_EXTMODS+=http_auth_ldap
@@ -139,7 +140,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.15:push
+HTTP_PUSH_GH_TUPLE=		slact:nchan:v1.3.0:push
 HTTP_PUSH_VARS=			DSO_EXTMODS+=push
 
 HTTP_PUSH_STREAM_GH_TUPLE=	wandenberg:nginx-push-stream-module:0.5.4:pushstream
@@ -161,10 +162,9 @@ HTTP_SUBS_FILTER_VARS=	DSO_EXTMODS+=subs_filter
 
 HTTP_TARANTOOL_LIB_DEPENDS=	libmsgpuck.so:devel/msgpuck \
 				libyajl.so:devel/yajl
-HTTP_TARANTOOL_GH_TUPLE=	tarantool:nginx_upstream_module:1278ee5:nginx_tarantool
+HTTP_TARANTOOL_GH_TUPLE=	tarantool:nginx_upstream_module:aeb8696:nginx_tarantool
 HTTP_TARANTOOL_VARS=		DSO_EXTMODS+=nginx_tarantool
-HTTP_TARANTOOL_EXTRA_PATCHES=	${PATCHDIR}/extra-patch-ngx_http_tarantool-config \
-				${PATCHDIR}/extra-patch-ngx_http_tarantool-src-tp_transcode.c
+HTTP_TARANTOOL_EXTRA_PATCHES=	${PATCHDIR}/extra-patch-ngx_http_tarantool-config
 
 HTTP_UPLOAD_GH_TUPLE=		fdintino:nginx-upload-module:aa42509:upload
 HTTP_UPLOAD_VARS=		DSO_EXTMODS+=upload
diff --git a/www/nginx/distinfo b/www/nginx/distinfo
index 873509ec6205..1f7f2b65a9ca 100644
--- a/www/nginx/distinfo
+++ b/www/nginx/distinfo
@@ -1,4 +1,4 @@
-TIMESTAMP = 1653895106
+TIMESTAMP = 1655449803
 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,14 +75,14 @@ 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.15_GH0.tar.gz) = dbb05bec6a4cf6ad1c1a4e613a2c832669c0eb87847e70ab26bc6c590361a818
-SIZE (slact-nchan-v1.2.15_GH0.tar.gz) = 734488
+SHA256 (slact-nchan-v1.3.0_GH0.tar.gz) = 70ffed635d24aab0ff1ebb595d8b41fde105127dfd50cecac6df86b558778537
+SIZE (slact-nchan-v1.3.0_GH0.tar.gz) = 745161
 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
 SIZE (yaoweibin-ngx_http_substitutions_filter_module-b8a71ea_GH0.tar.gz) = 94039
-SHA256 (tarantool-nginx_upstream_module-1278ee5_GH0.tar.gz) = 34d51afcd464582e6011a5d3abe6829c5690ddb9b50c993dfdafb4c725a4803a
-SIZE (tarantool-nginx_upstream_module-1278ee5_GH0.tar.gz) = 48378
+SHA256 (tarantool-nginx_upstream_module-aeb8696_GH0.tar.gz) = 514aa57155c73c2e3f7bdfe00c580183df343f2fa4b34e77f040cf6557caffae
+SIZE (tarantool-nginx_upstream_module-aeb8696_GH0.tar.gz) = 75708
 SHA256 (fdintino-nginx-upload-module-aa42509_GH0.tar.gz) = 2285245bdef11656e5bcc866e693e48f84b7443d36924f45a6fb8647cd35319a
 SIZE (fdintino-nginx-upload-module-aa42509_GH0.tar.gz) = 42221
 SHA256 (masterzen-nginx-upload-progress-module-afb2d31_GH0.tar.gz) = 6318851cc3a624aaad3b1f4cd9f51f79c86575c53dfe0c28bbdcf9470b6a33e6
diff --git a/www/nginx/files/extra-patch-ngx_http_tarantool-config b/www/nginx/files/extra-patch-ngx_http_tarantool-config
index ce805292837b..196a8135ca2d 100644
--- a/www/nginx/files/extra-patch-ngx_http_tarantool-config
+++ b/www/nginx/files/extra-patch-ngx_http_tarantool-config
@@ -1,20 +1,24 @@
---- ../nginx_upstream_module-1278ee5/config.orig	2016-08-07 15:39:47.000000000 -0400
-+++ ../nginx_upstream_module-1278ee5/config	2016-08-07 16:38:59.298414000 -0400
-@@ -1,14 +1,14 @@
- ngx_addon_name="ngx_http_tnt_module"
- 
--__lib_yajl="$ngx_addon_dir/third_party/yajl/build/yajl-2.1.0/lib/libyajl_s.a"
-+__lib_yajl="%%PREFIX%%/lib/libyajl.so"
- 
- __module_src_dir="$ngx_addon_dir/src"
- 
- __include_paths=" \
-           $ngx_addon_dir/src                                       \
+--- ../nginx_upstream_module-aeb8696/config.orig	2017-09-18 11:54:00.000000000 -0400
++++ ../nginx_upstream_module-aeb8696/config	2017-12-04 21:56:41.978227000 -0500
+@@ -7,18 +7,10 @@
            $ngx_addon_dir/third_party                               \
+           "
+ 
+-test -f $ngx_addon_dir/third_party/yajl/build/yajl-2.1.0/lib/libyajl_s.a &&
+-test -f $ngx_addon_dir/third_party/msgpuck/libmsgpuck.a && {
+-  libs="                                                                \
+-      $ngx_addon_dir/third_party/yajl/build/yajl-2.1.0/lib/libyajl_s.a  \
+-      $ngx_addon_dir/third_party/msgpuck/libmsgpuck.a                   \
+-      "
+-
+-  include_paths="${include_paths} \
 -          $ngx_addon_dir/third_party/msgpuck                       \
 -          $ngx_addon_dir/third_party/yajl/build/yajl-2.1.0/include \
++include_paths="${include_paths} \
 +          %%PREFIX%%/include/msgpuck \
 +          %%PREFIX%%/include/yajl \
            "
+-}
+ 
+ module_src_dir="$ngx_addon_dir/src"
  
- __sources=" \
diff --git a/www/nginx/files/extra-patch-ngx_http_tarantool-src-tp_transcode.c b/www/nginx/files/extra-patch-ngx_http_tarantool-src-tp_transcode.c
deleted file mode 100644
index f2c71685a9a7..000000000000
--- a/www/nginx/files/extra-patch-ngx_http_tarantool-src-tp_transcode.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- ../nginx_upstream_module-1278ee5/src/tp_transcode.c.orig	2016-08-08 03:39:47.000000000 +0800
-+++ ../nginx_upstream_module-1278ee5/src/tp_transcode.c	2018-03-01 04:23:02.513740000 +0800
-@@ -38,10 +38,6 @@
- #  define GNU_SOURCES 1
- #endif /* !GNU_SOURCES */
- 
--#if !defined(MP_SOURCE)
--#  define MP_SOURCE 1
--#endif /* !MP_SOURCE */
--
- #include "tp_ext.h"
- #include "tp_transcode.h"
-