www/nginx-devel: update third-party http_auth_krb5 (spnego) module (+)

Resurrect GSSAPI radio button for http_auth_krb5 module, last one
builds just fine with both implementations now.

While I'm here:
o) sort pkg-plist;
o) update portscout.

Bump PORTREVISION.

2 files changed, 2 insertions, 54 deletions

diff --git a/www/nginx-devel/files/extra-patch-ngx_http_auth_spnego_module.c b/www/nginx-devel/files/extra-patch-ngx_http_auth_spnego_module.c
deleted file mode 100644
index 40aea7e6e875..000000000000
--- a/www/nginx-devel/files/extra-patch-ngx_http_auth_spnego_module.c
+++ /dev/null
@@ -1,52 +0,0 @@
---- ../spnego-http-auth-nginx-module-c626163/ngx_http_auth_spnego_module.c.orig
-+++ ../spnego-http-auth-nginx-module-c626163/ngx_http_auth_spnego_module.c
-@@ -502,6 +502,7 @@ ngx_http_auth_spnego_headers_basic_only(ngx_http_request_t *r,
-     }
- 
-     r->headers_out.www_authenticate->hash = 1;
-+    r->headers_out.www_authenticate->next = NULL;
-     r->headers_out.www_authenticate->key.len = sizeof("WWW-Authenticate") - 1;
-     r->headers_out.www_authenticate->key.data = (u_char *)"WWW-Authenticate";
-     r->headers_out.www_authenticate->value.len = value.len;
-@@ -538,6 +539,7 @@ ngx_http_auth_spnego_headers(ngx_http_request_t *r,
-     }
- 
-     r->headers_out.www_authenticate->hash = 1;
-+    r->headers_out.www_authenticate->next = NULL;
-     r->headers_out.www_authenticate->key.len = sizeof("WWW-Authenticate") - 1;
-     r->headers_out.www_authenticate->key.data = (u_char *)"WWW-Authenticate";
-     r->headers_out.www_authenticate->value.len = value.len;
-@@ -559,6 +561,7 @@ ngx_http_auth_spnego_headers(ngx_http_request_t *r,
-         }
- 
-         r->headers_out.www_authenticate->hash = 2;
-+        r->headers_out.www_authenticate->next = NULL;
-         r->headers_out.www_authenticate->key.len =
-             sizeof("WWW-Authenticate") - 1;
-         r->headers_out.www_authenticate->key.data =
-@@ -758,6 +761,12 @@ ngx_http_auth_spnego_store_delegated_creds(ngx_http_request_t *r,
-     char *ccname = NULL;
-     char *escaped = NULL;
- 
-+    if ((kerr = krb5_init_context(&kcontext))) {
-+        spnego_log_error("Kerberos error: Cannot initialize kerberos context");
-+        spnego_log_krb5_error(kcontext, kerr);
-+        goto done;
-+    }
-+
-     if (!delegated_creds.data) {
-         spnego_log_error(
-             "ngx_http_auth_spnego_store_delegated_creds() NULL credentials");
-@@ -766,12 +775,6 @@ ngx_http_auth_spnego_store_delegated_creds(ngx_http_request_t *r,
-         goto done;
-     }
- 
--    if ((kerr = krb5_init_context(&kcontext))) {
--        spnego_log_error("Kerberos error: Cannot initialize kerberos context");
--        spnego_log_krb5_error(kcontext, kerr);
--        goto done;
--    }
--
-     if ((kerr = krb5_parse_name(kcontext, (char *)principal_name->data,
-                                 &principal))) {
-         spnego_log_error("Kerberos error: Cannot parse principal %s",
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 7ea16b2ff99e..a54e89e58a23 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-c626163/config.orig	2020-08-27 07:59:28.423636000 -0400
-+++ ../spnego-http-auth-nginx-module-c626163/config	2020-08-27 08:01:42.152121000 -0400
+--- ../spnego-http-auth-nginx-module-3575542/config.orig	2020-08-27 07:59:28.423636000 -0400
++++ ../spnego-http-auth-nginx-module-3575542/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"