From 6b509d4955254ef440acaa52ee7780206230aad7 Mon Sep 17 00:00:00 2001
From: Peter Wemm <peter@FreeBSD.org>
Date: Tue, 2 Jun 2015 07:51:00 +0000
Subject: [PATCH] Update the optional (defaults to off) ldap authentication
 module to a more recent version.  Of particular importance is that the old
 one connected/disconnected to the ldap server for every single URL being
 served while this one has a configurable cache.

PR:		200550
Reviewed by:	osa
---
 www/nginx-devel/Makefile | 9 +++++----
 www/nginx-devel/distinfo | 4 ++--
 www/nginx/Makefile       | 9 +++++----
 www/nginx/distinfo       | 4 ++--
 4 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/www/nginx-devel/Makefile b/www/nginx-devel/Makefile
index 5ac850348759..5880bdeb4b09 100644
--- a/www/nginx-devel/Makefile
+++ b/www/nginx-devel/Makefile
@@ -293,10 +293,11 @@ CONFIGURE_ARGS+=--add-module=${WRKSRC_auth_digest}
 
 .if ${PORT_OPTIONS:MHTTP_AUTH_LDAP}
 # WWW: https://github.com/kvspb/nginx-auth-ldap
-GIT_HTTP_AUTH_LDAP_VERSION=	c4dc7c9153
-MASTER_SITES+=	LOCAL/rm:http_auth_ldap
-DISTFILES+=	http_auth_ldap-${GIT_HTTP_AUTH_LDAP_VERSION}.tar.gz:http_auth_ldap
-CONFIGURE_ARGS+=--add-module=${WRKDIR}/http_auth_ldap-${GIT_HTTP_AUTH_LDAP_VERSION}
+GIT_HTTP_AUTH_LDAP_VERSION=	928856aa95
+GH_ACCOUNT+=	kvspb:http_auth_ldap
+GH_PROJECT+=	nginx-auth-ldap:http_auth_ldap
+GH_TAGNAME+=	${GIT_HTTP_AUTH_LDAP_VERSION}:http_auth_ldap
+CONFIGURE_ARGS+=--add-module=${WRKDIR}/nginx-auth-ldap-${GIT_HTTP_AUTH_LDAP_VERSION}
 USE_OPENLDAP=	yes
 .endif
 
diff --git a/www/nginx-devel/distinfo b/www/nginx-devel/distinfo
index 04f89ce25723..42c67886a052 100644
--- a/www/nginx-devel/distinfo
+++ b/www/nginx-devel/distinfo
@@ -2,8 +2,8 @@ SHA256 (nginx-1.9.1.tar.gz) = 09f555fae694c0944f172b575ad239f56d40d14559d98e843d
 SIZE (nginx-1.9.1.tar.gz) = 855402
 SHA256 (nginx-accesskey-2.0.3.tar.gz) = d9e94321e78a02de16c57f3e048fd31059fd8116ed03d6de7180f435c52502b1
 SIZE (nginx-accesskey-2.0.3.tar.gz) = 2632
-SHA256 (http_auth_ldap-c4dc7c9153.tar.gz) = ac082a36afdbcfd883303bc2b1aaea5f2b4d2a772ad8eec9ecf3328e81300e1a
-SIZE (http_auth_ldap-c4dc7c9153.tar.gz) = 5323
+SHA256 (kvspb-nginx-auth-ldap-928856aa95_GH0.tar.gz) = de21b7d9ef0953e96736f6b02d11236c46b138a0bc7889725e8b31f7482e67de
+SIZE (kvspb-nginx-auth-ldap-928856aa95_GH0.tar.gz) = 15237
 SHA256 (ngx_http_auth_pam_module-1.2.tar.gz) = 5a85970ba61a99f55a26d2536a11d512b39bbd622f5737d25a9a8c10db81efa9
 SIZE (ngx_http_auth_pam_module-1.2.tar.gz) = 5424
 SHA256 (ngx_cache_purge-2.3.tar.gz) = 279e0d8a46d3b1521fd43b3f78bc1c08b263899142a7cc5058c1c0361a92c89c
diff --git a/www/nginx/Makefile b/www/nginx/Makefile
index 0d303482fbd1..069b9642e2db 100644
--- a/www/nginx/Makefile
+++ b/www/nginx/Makefile
@@ -290,10 +290,11 @@ CONFIGURE_ARGS+=--add-module=${WRKSRC_auth_digest}
 
 .if ${PORT_OPTIONS:MHTTP_AUTH_LDAP}
 # WWW: https://github.com/kvspb/nginx-auth-ldap
-GIT_HTTP_AUTH_LDAP_VERSION=	c4dc7c9153
-MASTER_SITES+=	LOCAL/rm:http_auth_ldap
-DISTFILES+=	http_auth_ldap-${GIT_HTTP_AUTH_LDAP_VERSION}.tar.gz:http_auth_ldap
-CONFIGURE_ARGS+=--add-module=${WRKDIR}/http_auth_ldap-${GIT_HTTP_AUTH_LDAP_VERSION}
+GIT_HTTP_AUTH_LDAP_VERSION=	928856aa95
+GH_ACCOUNT+=	kvspb:http_auth_ldap
+GH_PROJECT+=	nginx-auth-ldap:http_auth_ldap
+GH_TAGNAME+=	${GIT_HTTP_AUTH_LDAP_VERSION}:http_auth_ldap
+CONFIGURE_ARGS+=--add-module=${WRKDIR}/nginx-auth-ldap-${GIT_HTTP_AUTH_LDAP_VERSION}
 USE_OPENLDAP=	yes
 .endif
 
diff --git a/www/nginx/distinfo b/www/nginx/distinfo
index 4ff0941d5f74..a8a03a140fa4 100644
--- a/www/nginx/distinfo
+++ b/www/nginx/distinfo
@@ -2,8 +2,8 @@ SHA256 (nginx-1.8.0.tar.gz) = 23cca1239990c818d8f6da118320c4979aadf5386deda691b1
 SIZE (nginx-1.8.0.tar.gz) = 832104
 SHA256 (nginx-accesskey-2.0.3.tar.gz) = d9e94321e78a02de16c57f3e048fd31059fd8116ed03d6de7180f435c52502b1
 SIZE (nginx-accesskey-2.0.3.tar.gz) = 2632
-SHA256 (http_auth_ldap-c4dc7c9153.tar.gz) = ac082a36afdbcfd883303bc2b1aaea5f2b4d2a772ad8eec9ecf3328e81300e1a
-SIZE (http_auth_ldap-c4dc7c9153.tar.gz) = 5323
+SHA256 (kvspb-nginx-auth-ldap-928856aa95_GH0.tar.gz) = de21b7d9ef0953e96736f6b02d11236c46b138a0bc7889725e8b31f7482e67de
+SIZE (kvspb-nginx-auth-ldap-928856aa95_GH0.tar.gz) = 15237
 SHA256 (ngx_http_auth_pam_module-1.2.tar.gz) = 5a85970ba61a99f55a26d2536a11d512b39bbd622f5737d25a9a8c10db81efa9
 SIZE (ngx_http_auth_pam_module-1.2.tar.gz) = 5424
 SHA256 (ngx_cache_purge-2.3.tar.gz) = 279e0d8a46d3b1521fd43b3f78bc1c08b263899142a7cc5058c1c0361a92c89c