Date: Sun, 22 Apr 2018 08:46:10 -0700 From: Cy Schubert <Cy.Schubert@cschubert.com> To: Jochen Neumeister <joneum@FreeBSD.org>, "ports-committers@freebsd.org" <ports-committers@freebsd.org>, "svn-ports-all@freebsd.org" <svn-ports-all@freebsd.org>, "svn-ports-head@freebsd.org" <svn-ports-head@freebsd.org> Subject: RE: svn commit: r468031 - in head/www/nginx: . files Message-ID: <20180422154600.BE100181@spqr.komquats.com>
next in thread | raw e-mail | index | archive | help
Thank you. This helps a lot with the private heimdal in base project. --- Sent using a tiny phone keyboard. Apologies for any typos and autocorrect. Also, this old phone only supports top post. Apologies. Cy Schubert <Cy.Schubert@cschubert.com> or <cy@freebsd.org> The need of the many outweighs the greed of the few. --- -----Original Message----- From: Jochen Neumeister Sent: 22/04/2018 08:05 To: ports-committers@freebsd.org; svn-ports-all@freebsd.org; svn-ports-head= @freebsd.org Subject: svn commit: r468031 - in head/www/nginx: . files Author: joneum Date: Sun Apr 22 14:59:23 2018 New Revision: 468031 URL: https://svnweb.freebsd.org/changeset/ports/468031 Log: HTTP_AUTH_KRB5 option is not fully implemented. This patch makes it build= with security/krb5 and security/heimdal =20 PR: 226044 Reviewed by: brnrd Differential Revision: https://reviews.freebsd.org/D14973 Modified: head/www/nginx/Makefile head/www/nginx/Makefile.extmod head/www/nginx/Makefile.options.desc head/www/nginx/files/extra-patch-spnego-http-auth-nginx-module-config Modified: head/www/nginx/Makefile =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- head/www/nginx/Makefile Sun Apr 22 13:52:01 2018 (r468030) +++ head/www/nginx/Makefile Sun Apr 22 14:59:23 2018 (r468031) @@ -71,7 +71,7 @@ OPTIONS_GROUP_HTTPGRP=3D GOOGLE_PERFTOOLS HTTP HTTP_ADDI HTTP_REWRITE HTTP_SECURE_LINK HTTP_SLICE HTTP_SSL HTTP_STATUS HTTP_SUB \ HTTP_XSLT HTTPV2 STREAM STREAM_SSL STREAM_SSL_PREREAD # External modules (arrayvar MUST appear after devel_kit for build-dep) -OPTIONS_GROUP_HTTPGRP+=3D AJP AWS_AUTH BROTLI CACHE_PURGE CLOJURE CT DEVE= L_KIT \ +OPTIONS_GROUP_HTTPGRP+=3D AJP AWS_AUTH BROTLI CACHE_PURGE CLOJURE CT DEVEL= _KIT \ ARRAYVAR DRIZZLE DYNAMIC_UPSTREAM ECHO ENCRYPTSESSION FASTDFS FORMINPUT \ GRIDFS HEADERS_MORE HTTP_ACCEPT_LANGUAGE HTTP_AUTH_DIGEST HTTP_AUTH_KRB5 = \ HTTP_AUTH_LDAP HTTP_AUTH_PAM HTTP_DAV_EXT HTTP_EVAL HTTP_FANCYINDEX \ @@ -84,12 +84,19 @@ OPTIONS_GROUP_HTTPGRP+=3D AJP AWS_AUTH BROTLI CACHE_PU= R SET_MISC SFLOW SHIBBOLETH SLOWFS_CACHE SMALL_LIGHT SRCACHE XSS OPTIONS_GROUP_MAILGRP=3D MAIL MAIL_IMAP MAIL_POP3 MAIL_SMTP MAIL_SSL OPTIONS_DEFINE=3D DEBUG DEBUGLOG DSO FILE_AIO IPV6 THREADS WWW -OPTIONS_DEFAULT?=3DDSO FILE_AIO HTTP HTTP_ADDITION HTTP_AUTH_REQ HTTP_CACH= E \ +OPTIONS_DEFAULT?=3D DSO FILE_AIO HTTP HTTP_ADDITION HTTP_AUTH_REQ HTTP_CAC= HE \ 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 \ THREADS WWW + +OPTIONS_RADIO+=3D GSSAPI +OPTIONS_RADIO_GSSAPI=3D GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT +GSSAPI_BASE_USES=3D gssapi +GSSAPI_HEIMDAL_USES=3D gssapi:heimdal,flags +GSSAPI_MIT_USES=3D gssapi:mit + OPTIONS_SUB=3D yes =20 .include "Makefile.options.desc" @@ -101,6 +108,10 @@ ${opt}_IMPLIES=3D MAIL .for opt in ${OPTIONS_GROUP_HTTPGRP:NHTTP} WWW ${opt}_IMPLIES=3D HTTP .endfor + +GSSAPI_BASE_IMPLIES=3D HTTP_AUTH_KRB5 +GSSAPI_HEIMDAL_IMPLIES=3D HTTP_AUTH_KRB5 +GSSAPI_MIT_IMPLIES=3D HTTP_AUTH_KRB5 =20 # If the target is makesum, make sure that every distfile is fetched. .if ${.TARGETS:Mmakesum} Modified: head/www/nginx/Makefile.extmod =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- head/www/nginx/Makefile.extmod Sun Apr 22 13:52:01 2018 (r468030) +++ head/www/nginx/Makefile.extmod Sun Apr 22 14:59:23 2018 (r468031) @@ -83,11 +83,7 @@ HTTP_AUTH_DIGEST_VARS=3D DSO_EXTMODS+=3Dauth_digest =20 HTTP_AUTH_KRB5_GH_TUPLE=3D stnoonan:spnego-http-auth-nginx-module:7e028a5:= auth_krb5 HTTP_AUTH_KRB5_VARS=3D DSO_EXTMODS+=3Dauth_krb5 -#HTTP_AUTH_KRB5_EXTRA_PATCHES=3D${PATCHDIR}/extra-patch-spnego-http-auth-n= ginx-module-config -#OPTIONS_RADIO+=3D GSSAPI -#OPTIONS_RADIO_GSSAPI+=3D GSSAPI_HEIMDAL GSSAPI_MIT -#GSSAPI_HEIMDAL_USES=3D gssapi:heimdal,flags -#GSSAPI_MIT_USES=3D gssapi:mit +HTTP_AUTH_KRB5_EXTRA_PATCHES=3D ${PATCHDIR}/extra-patch-spnego-http-auth-n= ginx-module-config =20 HTTP_AUTH_LDAP_GH_TUPLE=3D kvspb:nginx-auth-ldap:42d195d:http_auth_ldap HTTP_AUTH_LDAP_VARS=3D DSO_EXTMODS+=3Dhttp_auth_ldap Modified: head/www/nginx/Makefile.options.desc =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- head/www/nginx/Makefile.options.desc Sun Apr 22 13:52:01 2018 (r468030) +++ head/www/nginx/Makefile.options.desc Sun Apr 22 14:59:23 2018 (r468031) @@ -20,6 +20,7 @@ FILE_AIO_DESC=3D Enable file aio FORMINPUT_DESC=3D 3rd party form_input module GOOGLE_PERFTOOLS_DESC=3D Enable google perftools module GRIDFS_DESC=3D 3rd party gridfs module +GSSAPI_DESC=3D GSSAPI implementation (imply HTTP_AUTH_KRB5) HEADERS_MORE_DESC=3D 3rd party headers_more module HTTPGRP_DESC=3D Modules that require HTTP module HTTPV2_DESC=3D Enable HTTP/2 protocol support (SSL req.) Modified: head/www/nginx/files/extra-patch-spnego-http-auth-nginx-module-co= nfig =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- head/www/nginx/files/extra-patch-spnego-http-auth-nginx-module-config S= un Apr 22 13:52:01 2018 (r468030) +++ head/www/nginx/files/extra-patch-spnego-http-auth-nginx-module-config S= un Apr 22 14:59:23 2018 (r468031) @@ -1,9 +1,20 @@ --- ../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.28= 3398000 -0400 -@@ -1,5 +1,5 @@ ++++ ../spnego-http-auth-nginx-module-7e028a5/config 2018-04-20 00:15:08.51= 5289000 +0200 +@@ -1,9 +1,6 @@ ngx_addon_name=3Dngx_http_auth_spnego_module -ngx_feature_libs=3D"-lgssapi_krb5 -lkrb5 -lcom_err" -+ngx_feature_libs=3D"%%GSSAPILIBS%% -lcom_err" +- +-if uname -o | grep -q FreeBSD; then +- ngx_feature_libs=3D"$ngx_feature_libs -lgssapi" +-fi ++ngx_feature_libs=3D"%%GSSAPILIBS%%" ++ngx_module_incs=3D"%%GSSAPINCDIR%%" =20 - if uname -o | grep -q FreeBSD; then - ngx_feature_libs=3D"$ngx_feature_libs -lgssapi" + if test -n "$ngx_module_link"; then + ngx_module_type=3DHTTP +@@ -16,3 +13,5 @@ else + NGX_ADDON_SRCS=3D"$NGX_ADDON_SRCS $ngx_addon_dir/ngx_http_auth_spnego= _module.c" + CORE_LIBS=3D"$CORE_LIBS $ngx_feature_libs" + fi ++ ++LDFLAGS=3D"-L%%GSSAPILIBDIR%% $LDFLAGS"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20180422154600.BE100181>