jlec 15/03/10 12:45:41 Modified: nginx-1.7.10.ebuild ChangeLog Log: Import changes from proxy maintainer Johan Bergstroem, https://github.com/gentoo/proxy-maintainers/pull/22 (Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key B9D4F231BD1558AB!)
Revision Changes Path 1.2 www-servers/nginx/nginx-1.7.10.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/nginx/nginx-1.7.10.ebuild?rev=1.2&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/nginx/nginx-1.7.10.ebuild?rev=1.2&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/nginx/nginx-1.7.10.ebuild?r1=1.1&r2=1.2 Index: nginx-1.7.10.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/www-servers/nginx/nginx-1.7.10.ebuild,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- nginx-1.7.10.ebuild 10 Mar 2015 09:34:27 -0000 1.1 +++ nginx-1.7.10.ebuild 10 Mar 2015 12:45:41 -0000 1.2 @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/nginx-1.7.10.ebuild,v 1.1 2015/03/10 09:34:27 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/nginx-1.7.10.ebuild,v 1.2 2015/03/10 12:45:41 jlec Exp $ EAPI="5" @@ -498,11 +498,11 @@ --with-cc-opt="-I${EROOT}usr/include" \ --with-ld-opt="-L${EROOT}usr/$(get_libdir)" \ --http-log-path="${EPREFIX}"/var/log/${PN}/access_log \ - --http-client-body-temp-path="${EPREFIX}/${NGINX_HOME_TMP}"/client \ - --http-proxy-temp-path="${EPREFIX}/${NGINX_HOME_TMP}"/proxy \ - --http-fastcgi-temp-path="${EPREFIX}/${NGINX_HOME_TMP}"/fastcgi \ - --http-scgi-temp-path="${EPREFIX}/${NGINX_HOME_TMP}"/scgi \ - --http-uwsgi-temp-path="${EPREFIX}/${NGINX_HOME_TMP}"/uwsgi \ + --http-client-body-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/client \ + --http-proxy-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/proxy \ + --http-fastcgi-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/fastcgi \ + --http-scgi-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/scgi \ + --http-uwsgi-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/uwsgi \ ${myconf} || die "configure failed" # A purely cosmetic change that makes nginx -V more readable. This can be @@ -520,9 +520,9 @@ } src_install() { - emake DESTDIR="${D}" install + emake DESTDIR="${D%/}" install - cp "${FILESDIR}"/nginx.conf "${ED}"/etc/nginx/nginx.conf || die + cp "${FILESDIR}"/nginx.conf "${ED}"etc/nginx/nginx.conf || die newinitd "${FILESDIR}"/nginx.initd-r2 nginx @@ -533,7 +533,7 @@ # just keepdir. do not copy the default htdocs files (bug #449136) keepdir /var/www/localhost - rm -rf "${D}"/usr/html || die + rm -rf "${D}"usr/html || die # set up a list of directories to keep local keepdir_list="${NGINX_HOME_TMP}"/client @@ -641,9 +641,9 @@ pkg_postinst() { if use ssl; then - if [ ! -f "${EROOT}"/etc/ssl/${PN}/${PN}.key ]; then + if [ ! -f "${EROOT}"etc/ssl/${PN}/${PN}.key ]; then install_cert /etc/ssl/${PN}/${PN} - use prefix || chown ${PN}:${PN} "${EROOT}"/etc/ssl/${PN}/${PN}.{crt,csr,key,pem} + use prefix || chown ${PN}:${PN} "${EROOT}"etc/ssl/${PN}/${PN}.{crt,csr,key,pem} fi fi @@ -669,7 +669,7 @@ ewarn "Check if this is correct for your setup before restarting nginx!" ewarn "This is a one-time change and will not happen on subsequent updates." ewarn "Furthermore nginx' temp directories got moved to ${NGINX_HOME_TMP}" - chmod -f o-rwx "${EPREFIX}"/var/log/nginx "${EPREFIX}/${NGINX_HOME_TMP}"/{,client,proxy,fastcgi,scgi,uwsgi} + chmod -f o-rwx "${EPREFIX}"/var/log/nginx "${EPREFIX}${NGINX_HOME_TMP}"/{,client,proxy,fastcgi,scgi,uwsgi} fi # If the nginx user can't change into or read the dir, display a warning. 1.403 www-servers/nginx/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/nginx/ChangeLog?rev=1.403&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/nginx/ChangeLog?rev=1.403&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/nginx/ChangeLog?r1=1.402&r2=1.403 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/www-servers/nginx/ChangeLog,v retrieving revision 1.402 retrieving revision 1.403 diff -u -r1.402 -r1.403 --- ChangeLog 10 Mar 2015 09:34:27 -0000 1.402 +++ ChangeLog 10 Mar 2015 12:45:41 -0000 1.403 @@ -1,6 +1,10 @@ # ChangeLog for www-servers/nginx # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/ChangeLog,v 1.402 2015/03/10 09:34:27 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/ChangeLog,v 1.403 2015/03/10 12:45:41 jlec Exp $ + + 10 Mar 2015; Justin Lecher <[email protected]> nginx-1.7.10.ebuild: + Import changes from proxy maintainer Johan Bergstroem, + https://github.com/gentoo/proxy-maintainers/pull/22 *nginx-1.7.10 (10 Mar 2015)
