Attachment 155188 Details for Bug 199163 – 1.7.11

[patch] 1.7.11

nginx-devel.patch (text/plain), 2.88 KB, created by Adam Weinberger on 2015-04-04 16:43:55 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Adam Weinberger

Created: 2015-04-04 16:43:55 UTC

Size: 2.88 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 383229)
>+++ Makefile	(working copy)
>@@ -2,13 +2,13 @@
> # $FreeBSD$
> 
> PORTNAME=	nginx
>-PORTVERSION=	1.7.10
>+PORTVERSION=	1.7.11
> CATEGORIES=	www
> MASTER_SITES=	http://nginx.org/download/
> MASTER_SITES+=	${MASTER_SITE_LOCAL}
> MASTER_SITE_SUBDIR=	osa
>+PKGNAMESUFFIX=	-devel
> DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
>-PKGNAMESUFFIX=	-devel
> 
> MAINTAINER=	osa@FreeBSD.org
> COMMENT=	Robust and small WWW server
>@@ -296,7 +296,7 @@
> 
> .if ${PORT_OPTIONS:MHTTP_AUTH_LDAP}
> # WWW: https://github.com/kvspb/nginx-auth-ldap
>-GIT_HTTP_AUTH_LDAP_VERSION=  c4dc7c9153
>+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}
>@@ -997,7 +997,7 @@
> 	${ECHO_CMD} ${SITE_ARCH_REL}/nginx.pm >> ${TMPPLIST}
> 	${ECHO_CMD} @dirrm ${SITE_ARCH_REL}/auto/nginx >> ${TMPPLIST}
> .endif
>-	@${INSTALL_MAN} ${WRKSRC}/objs/nginx.8 ${STAGEDIR}${MAN8PREFIX}/man/man8
>+	${INSTALL_MAN} ${WRKSRC}/objs/nginx.8 ${STAGEDIR}${MAN8PREFIX}/man/man8
> 
> .if ${PORT_OPTIONS:MNAXSI}
> 	${ECHO_CMD} etc/nginx/naxsi_core.rules >> ${TMPPLIST}
>Index: distinfo
>===================================================================
>--- distinfo	(revision 383229)
>+++ distinfo	(working copy)
>@@ -1,5 +1,5 @@
>-SHA256 (nginx-1.7.10.tar.gz) = df73c1b468cebaf3530a5de910bed45ff2cfccf2cf4b9215d0aa0f4e39cf4460
>-SIZE (nginx-1.7.10.tar.gz) = 828607
>+SHA256 (nginx-1.7.11.tar.gz) = dad9d740210e638bfd480536910083ed13f04c04775eedf877984e1c61a69695
>+SIZE (nginx-1.7.11.tar.gz) = 831490
> SHA256 (giom-nginx_accept_language_module-2f69842.tar.gz) = fbcdf792160a1eff7b9549aeb5209d6e76716ff8e86b05e42c90b2d2f858e011
> SIZE (giom-nginx_accept_language_module-2f69842.tar.gz) = 3399
> SHA256 (nginx-accesskey-2.0.3.tar.gz) = d9e94321e78a02de16c57f3e048fd31059fd8116ed03d6de7180f435c52502b1
>Index: pkg-plist
>===================================================================
>--- pkg-plist	(revision 383229)
>+++ pkg-plist	(working copy)
>@@ -16,7 +16,6 @@
> @unexec if cmp -s %D/%%ETCDIR%%/nginx.conf-dist %D/%%ETCDIR%%/nginx.conf; then rm -f %D/%%ETCDIR%%/nginx.conf; fi
> %%ETCDIR%%/nginx.conf-dist
> @exec if [ ! -f %D/%%ETCDIR%%/nginx.conf ] ; then cp -p %D/%F %B/nginx.conf; fi
>-@dirrmtry %%ETCDIR%%
> %%WWWDATA%%@exec mkdir -p -m 755 %D/www/nginx-dist
> %%WWWDATA%%@exec if [ ! -d %D/www/nginx/ ] ; then ln -fs %D/www/nginx-dist %D/www/nginx; fi
> %%WWWDATA%%www/nginx-dist/EXAMPLE_DIRECTORY-DONT_ADD_OR_TOUCH_ANYTHING
>@@ -24,7 +23,6 @@
> %%WWWDATA%%www/nginx-dist/50x.html
> %%WWWDATA%%@exec chmod a-w %D/www/nginx-dist
> %%WWWDATA%%@unexec if [ -L %D/www/nginx ]; then rm -f %D/www/nginx; fi
>-%%WWWDATA%%@dirrmtry www/nginx-dist
> sbin/nginx
> @unexec if [ -z ${UPGRADE_PORT} ] ; then rm -fr %%NGINX_TMPDIR%%; fi
> man/man8/nginx.8.gz

Actions: View | Diff

Attachments on bug 199163: 155188