svn commit: r410193 - in head/www: nginx nginx-devel

Sergey A. Osokin osa at FreeBSD.org
Sat Mar 5 17:42:59 UTC 2016


Author: osa
Date: Sat Mar  5 17:42:57 2016
New Revision: 410193
URL: https://svnweb.freebsd.org/changeset/ports/410193

Log:
  Fix third-party accesskey module behaviour when "satisfy any;" defined.
  
  Spotted by:	Oleksandr V. Typlyns'kyi <astral at wangsamp.km.ua>
  Discussion:	http://mailman.nginx.org/pipermail/nginx-ru/2010-March/032654.html (in Russian)

Modified:
  head/www/nginx-devel/Makefile
  head/www/nginx/Makefile

Modified: head/www/nginx-devel/Makefile
==============================================================================
--- head/www/nginx-devel/Makefile	Sat Mar  5 17:18:37 2016	(r410192)
+++ head/www/nginx-devel/Makefile	Sat Mar  5 17:42:57 2016	(r410193)
@@ -1000,6 +1000,11 @@ post-patch:
 	@${REINPLACE_CMD} 's!%%HTTP_PORT%%!${HTTP_PORT}!; \
 		s!%%PREFIX%%!${PREFIX}!' \
 		${WRKSRC}/conf/nginx.conf
+.if ${PORT_OPTIONS:MHTTP_ACCESSKEY}
+	@${REINPLACE_CMD} \
+		'128s!NGX_OK!NGX_DECLINED!' \
+		${WRKDIR}/nginx-accesskey-${NGINX_ACCESSKEY_VERSION}/ngx_http_accesskey_module.c
+.endif
 .if ${PORT_OPTIONS:MHTTP_AUTH_KRB5}
 	@${REINPLACE_CMD} \
 		's!%%GSSAPILIBS%%!${GSSAPILIBS}!' \

Modified: head/www/nginx/Makefile
==============================================================================
--- head/www/nginx/Makefile	Sat Mar  5 17:18:37 2016	(r410192)
+++ head/www/nginx/Makefile	Sat Mar  5 17:42:57 2016	(r410193)
@@ -964,6 +964,11 @@ post-patch:
 	@${REINPLACE_CMD} 's!%%HTTP_PORT%%!${HTTP_PORT}!; \
 		s!%%PREFIX%%!${PREFIX}!' \
 		${WRKSRC}/conf/nginx.conf
+.if ${PORT_OPTIONS:MHTTP_ACCESSKEY}
+	@${REINPLACE_CMD} \
+		'128s!NGX_OK!NGX_DECLINED!' \
+		${WRKDIR}/nginx-accesskey-${NGINX_ACCESSKEY_VERSION}/ngx_http_accesskey_module.c
+.endif
 .if ${PORT_OPTIONS:MHTTP_AUTH_KRB5}
 	@${REINPLACE_CMD} \
 		's!%%GSSAPILIBS%%!${GSSAPILIBS}!' \


More information about the svn-ports-head mailing list