Attachment 191924 Details for Bug 226044 – Updated patch

[patch] Updated patch

nginx.patch (text/plain), 2.66 KB, created by Christian Ullrich on 2018-03-29 12:28:57 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Christian Ullrich

Created: 2018-03-29 12:28:57 UTC

Size: 2.66 KB

patch

obsolete

>diff --git a/www/nginx/Makefile.extmod b/www/nginx/Makefile.extmod
>index cf951f7a5466..dc17fd1cfcc6 100644
>--- a/www/nginx/Makefile.extmod
>+++ b/www/nginx/Makefile.extmod
>@@ -83,11 +83,11 @@ HTTP_AUTH_DIGEST_VARS=		DSO_EXTMODS+=auth_digest
> 
> HTTP_AUTH_KRB5_GH_TUPLE=	stnoonan:spnego-http-auth-nginx-module:7e028a5:auth_krb5
> HTTP_AUTH_KRB5_VARS=		DSO_EXTMODS+=auth_krb5
>-#HTTP_AUTH_KRB5_EXTRA_PATCHES=${PATCHDIR}/extra-patch-spnego-http-auth-nginx-module-config
>-#OPTIONS_RADIO+=		GSSAPI
>-#OPTIONS_RADIO_GSSAPI+=	GSSAPI_HEIMDAL GSSAPI_MIT
>-#GSSAPI_HEIMDAL_USES=	gssapi:heimdal,flags
>-#GSSAPI_MIT_USES=	gssapi:mit
>+HTTP_AUTH_KRB5_EXTRA_PATCHES=${PATCHDIR}/extra-patch-spnego-http-auth-nginx-module-config
>+OPTIONS_RADIO+=		GSSAPI
>+OPTIONS_RADIO_GSSAPI+=	GSSAPI_HEIMDAL GSSAPI_MIT
>+GSSAPI_HEIMDAL_USES=	gssapi:heimdal,flags
>+GSSAPI_MIT_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
>diff --git a/www/nginx/Makefile.options.desc b/www/nginx/Makefile.options.desc
>index 6021e5d6a1a3..778f3e163d6e 100644
>--- a/www/nginx/Makefile.options.desc
>+++ b/www/nginx/Makefile.options.desc
>@@ -20,6 +20,7 @@ FILE_AIO_DESC=			Enable file aio
> FORMINPUT_DESC=			3rd party form_input module
> GOOGLE_PERFTOOLS_DESC=		Enable google perftools module
> GRIDFS_DESC=			3rd party gridfs module
>+GSSAPI_DESC=			GSSAPI Security API used in HTTP_AUTH_KRB5
> HEADERS_MORE_DESC=		3rd party headers_more module
> HTTPGRP_DESC=			Modules that require HTTP module
> HTTPV2_DESC=			Enable HTTP/2 protocol support (SSL req.)
>diff --git a/www/nginx/files/extra-patch-spnego-http-auth-nginx-module-config b/www/nginx/files/extra-patch-spnego-http-auth-nginx-module-config
>index 5f8d7523c16e..ba9def9ed25f 100644
>--- a/www/nginx/files/extra-patch-spnego-http-auth-nginx-module-config
>+++ b/www/nginx/files/extra-patch-spnego-http-auth-nginx-module-config
>@@ -1,9 +1,13 @@
>---- ../spnego-http-auth-nginx-module-0c6ff3f/config.orig	2017-04-15 13:07:01.159506000 -0400
>-+++ ../spnego-http-auth-nginx-module-0c6ff3f/config	2017-04-15 13:07:36.283398000 -0400
>-@@ -1,5 +1,5 @@
>+--- ../spnego-http-auth-nginx-module-7e028a5/config.orig	2017-10-16 22:45:10.000000000 +0200
>++++ ../spnego-http-auth-nginx-module-7e028a5/config	2018-03-29 14:14:33.002411000 +0200
>+@@ -1,9 +1,5 @@
>  ngx_addon_name=ngx_http_auth_spnego_module
> -ngx_feature_libs="-lgssapi_krb5 -lkrb5 -lcom_err"
>+-
>+-if uname -o | grep -q FreeBSD; then
>+-    ngx_feature_libs="$ngx_feature_libs -lgssapi"
>+-fi
> +ngx_feature_libs="%%GSSAPILIBS%% -lcom_err"
>  
>- if uname -o | grep -q FreeBSD; then
>-     ngx_feature_libs="$ngx_feature_libs -lgssapi"
>+ if test -n "$ngx_module_link"; then
>+     ngx_module_type=HTTP

Actions: View | Diff

Attachments on bug 226044: 190798 | 191924