Fix bug 296168 (logrotate) and 247474 (realip use flag) in www-servers/nginx.

Package-Manager: portage-2.1.6.13/cvs/Linux x86_64

5 files changed, 146 insertions, 3 deletions

diff --git a/www-servers/nginx/ChangeLog b/www-servers/nginx/ChangeLog
index 8d1fa65cd594..399b968a0c13 100644
--- a/www-servers/nginx/ChangeLog
+++ b/www-servers/nginx/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-servers/nginx
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/ChangeLog,v 1.238 2010/01/03 20:07:38 djc Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/ChangeLog,v 1.239 2010/01/03 20:29:40 djc Exp $
+
+*nginx-0.7.64-r3 (03 Jan 2010)
+
+  03 Jan 2010; Dirkjan Ochtman <djc@gentoo.org> +nginx-0.7.64-r3.ebuild,
+  +files/nginx.logrotate, metadata.xml:
+  Fix bug 296168 (logrotate) and 247474 (realip use flag).
 
   03 Jan 2010; Dirkjan Ochtman <djc@gentoo.org> -nginx-0.7.64-r1.ebuild,
   -nginx-0.8.17.ebuild, -files/nginx, -files/nginx.conf,
diff --git a/www-servers/nginx/Manifest b/www-servers/nginx/Manifest
index 81870ef2263d..49c5526d9d2a 100644
--- a/www-servers/nginx/Manifest
+++ b/www-servers/nginx/Manifest
@@ -1,6 +1,7 @@
 AUX nginx-r1 1645 RMD160 d032feec43e4ba31ac5b6fffec478ebbeb49db60 SHA1 49f0db3efaccd3cef545b8c68cfa557ca829352f SHA256 b263a663399d2897dfdf53226d45fc3707bc9230bd687b8003d075a48f60ecaf
 AUX nginx.conf-r4 1410 RMD160 4b188bb03b12de3b38a82e13b1a2bb93848e8948 SHA1 e836c85e98e3b2c633818c286992d32a68c0b5ff SHA256 74d984512901fc9cfd13cac60df06cd468566aae367c35a3205e6daf7e7c32b6
 AUX nginx.init-r2 1657 RMD160 a42538ae12cccfad1108fe2fca387ec666f4fd85 SHA1 7a0706894bed322d8b5814de98bca56d48c458d0 SHA256 9fceee69794de55b6da24ff2d11c72f6bc86339e7088c644b165dc35a9d5afa1
+AUX nginx.logrotate 332 RMD160 65314d1b78142f3653e98e0c2cdff9deec69fd77 SHA1 c6b218d9c4588eb8fd51fe32b9692c39d6138c2b SHA256 eec16aa176ade9d6c428ce5979f6bace1dd2ad5ba609ae22279a57f154e08497
 DIST nginx-0.5.38.tar.gz 490220 RMD160 95d39df12e4756d03844c68374ec7dd52659b48b SHA1 5636e2880a0baf7244befdb055e77c59f21f95c4 SHA256 d601e3b08c3f1fe4a64eac1b9fec876cbc57b99696d5a322c1d9d3ddb01713c9
 DIST nginx-0.6.39.tar.gz 529159 RMD160 b94c1fad3185a520ff7ebb40d17ac2bcbeb04ffb SHA1 ba31c5b64d5d394c788bc3255d93a796b5e0e87e SHA256 daf14292863966b75d0c606b7cd2fbb710d1a5a5e8808ab862205643cc83ff1d
 DIST nginx-0.7.62.tar.gz 595995 RMD160 d830ae34f5bac3c494744a8033f32fb7b3107c11 SHA1 6eeb30d3daf7abcca351d9eba78b5adedd6331c5 SHA256 60ee0e9f7f43a7387fec7752a47ff0d06166d2a37a6ad4cfe7aff77162378d2d
@@ -10,7 +11,8 @@ EBUILD nginx-0.5.38.ebuild 2953 RMD160 82f38767612e0fa42760435b044c0723645b5920
 EBUILD nginx-0.6.39.ebuild 3065 RMD160 8d86dee4b70e98c62f1950d7fbc497335f6bd0c0 SHA1 ca5dc97e05ffe1f6d14cf973b3405a338c762d0c SHA256 c55e5dc81dd6f48513152a34f2c3feea6de495994ab8d8fb43ab9096b8ab563a
 EBUILD nginx-0.7.62.ebuild 3266 RMD160 c43344c6945dc7b0fe8b36054fda2e21b7a19b22 SHA1 26e76db9a98cbe052ceb4b9e3a4d63ab071f2df7 SHA256 dfb55c9fc3cddbf8f9166096795c9f190300aebb84a3314f13729ff07c4768e0
 EBUILD nginx-0.7.64-r2.ebuild 3614 RMD160 49371d1b5d819f90bf38ff0a79bfb300b057697c SHA1 9593bdc23d549e017963396c17480046a2aa619a SHA256 610b6415655954d217492e864a390ebedf5fffee31f8004d201e64d791164924
+EBUILD nginx-0.7.64-r3.ebuild 3772 RMD160 4127fbd10f4da093a2a76498b00e708316a9f468 SHA1 19f5b4a4c27f3fbd7de8b97164a0fe805ad4718a SHA256 5593770c57b6b0eb19db70d142a93008037f96a8088026fd0beccde83d789f49
 EBUILD nginx-0.7.64.ebuild 3245 RMD160 8964b32796019ad4945313e91c15a8c920fb6054 SHA1 97405f6b86ea9fa946d28097ee8b1e74caf21da0 SHA256 4757d0cee3a57eeab65af6b737e1fabd8a77e6729e7791eb57cfa961b6377e7c
 EBUILD nginx-0.8.29.ebuild 3576 RMD160 8fb6a6ce8003d6f55aa3124714caeca5ee13f4cb SHA1 6363469a2c9d9827a9c6ecc9693bb297594e7945 SHA256 8956bab291d6a3d64aa4e9181c5858c1bea59e4725ccf7efcd276d390d6a880f
-MISC ChangeLog 38787 RMD160 2a3dc945c8daff1654b389d4d0afd20558f43dbc SHA1 7849934ce111e981d9c3f9a02c6281b74bfffd4b SHA256 9903b60bfa35e0544f9fdb52cd6db6dfeb60825ef3ba8efdec60e0f7199c780f
-MISC metadata.xml 928 RMD160 fd890dc533e983fdd0e4fea0477bffba8b55b5cc SHA1 216bc16ba507719e7c09d664ae29b9424c65035e SHA256 61fd512d4084b45de4d573b73de49f779e5748747d96ff3d34ecc635998cd624
+MISC ChangeLog 38992 RMD160 c5f6b87dde16ef1023a357eccac9803474e3ddb4 SHA1 68aaba95199de757fa2c263126bf308eeef64df3 SHA256 207457267fe0fce356cb24b1de561925728b15d6f3b60fa64b9eb4e40cd2a55a
+MISC metadata.xml 978 RMD160 6cf33e104298aefacce82d8de174a85ab5fa118f SHA1 f4a37ad34cd72f5b96c0a110400f75f29c8a8352 SHA256 f6f378093aaa78b63ef1fdaf1cb2ffcb5d2186f59627466a17339eeb27bb92bb
diff --git a/www-servers/nginx/files/nginx.logrotate b/www-servers/nginx/files/nginx.logrotate
new file mode 100644
index 000000000000..b8e3b02150cb
--- /dev/null
+++ b/www-servers/nginx/files/nginx.logrotate
@@ -0,0 +1,12 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/files/nginx.logrotate,v 1.1 2010/01/03 20:29:40 djc Exp $
+
+/var/log/nginx/*_log {
+	missingok
+	sharedscripts
+	postrotate
+		kill -USR1 `cat /var/run/nginx.pid`
+	endscript
+}
+
diff --git a/www-servers/nginx/metadata.xml b/www-servers/nginx/metadata.xml
index 5c70fc9bd28a..2e30f72531c9 100644
--- a/www-servers/nginx/metadata.xml
+++ b/www-servers/nginx/metadata.xml
@@ -18,6 +18,7 @@
 	<flag name='securelink'>Enable HTTP secure link module</flag>
 	<flag name='status'>Enables stub_status module</flag>
 	<flag name='sub'>Enables sub_filter module</flag>
+	<flag name='realip'>Enables realip module</flag>
 	<flag name='webdav'>Enable webdav support</flag>
   </use>
 </pkgmetadata>
diff --git a/www-servers/nginx/nginx-0.7.64-r3.ebuild b/www-servers/nginx/nginx-0.7.64-r3.ebuild
new file mode 100644
index 000000000000..14529d0aa7b6
--- /dev/null
+++ b/www-servers/nginx/nginx-0.7.64-r3.ebuild
@@ -0,0 +1,122 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/nginx-0.7.64-r3.ebuild,v 1.1 2010/01/03 20:29:40 djc Exp $
+
+inherit eutils ssl-cert toolchain-funcs perl-module
+
+DESCRIPTION="Robust, small and high performance http and reverse proxy server"
+
+HOMEPAGE="http://nginx.net/"
+SRC_URI="http://sysoev.ru/nginx/${P}.tar.gz"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+IUSE="addition debug fastcgi flv imap pcre perl pop random-index realip smtp ssl static-gzip status sub webdav zlib"
+
+DEPEND="dev-lang/perl
+	dev-libs/openssl
+	pcre? ( >=dev-libs/libpcre-4.2 )
+	zlib? ( sys-libs/zlib )
+	perl? ( >=dev-lang/perl-5.8 )"
+
+pkg_setup() {
+	ebegin "Creating nginx user and group"
+	enewgroup ${PN}
+	enewuser ${PN} -1 -1 -1 ${PN}
+	eend ${?}
+}
+
+src_unpack() {
+	unpack ${A}
+	sed -i 's/ make/ \\$(MAKE)/' "${S}"/auto/lib/perl/make || die
+}
+
+src_compile() {
+	local myconf
+
+	# threads support is broken atm.
+	#
+	# if use threads; then
+	# 	einfo
+	# 	ewarn "threads support is experimental at the moment"
+	# 	ewarn "do not use it on production systems - you've been warned"
+	# 	einfo
+	# 	myconf="${myconf} --with-threads"
+	# fi
+
+	use addition && myconf="${myconf} --with-http_addition_module"
+	use fastcgi	|| myconf="${myconf} --without-http_fastcgi_module"
+	use fastcgi	&& myconf="${myconf} --with-http_realip_module"
+	use flv		&& myconf="${myconf} --with-http_flv_module"
+	use zlib	|| myconf="${myconf} --without-http_gzip_module"
+	use pcre	|| {
+		myconf="${myconf} --without-pcre --without-http_rewrite_module"
+	}
+	use debug	&& myconf="${myconf} --with-debug"
+	use ssl		&& myconf="${myconf} --with-http_ssl_module"
+	use perl	&& myconf="${myconf} --with-http_perl_module"
+	use status	&& myconf="${myconf} --with-http_stub_status_module"
+	use webdav	&& myconf="${myconf} --with-http_dav_module"
+	use sub		&& myconf="${myconf} --with-http_sub_module"
+	use realip	&& myconf="${myconf} --with-http_realip_module"
+	use static-gzip		&& myconf="${myconf} --with-http_gzip_static_module"
+	use random-index	&& myconf="${myconf} --with-http_random_index_module"
+
+	if use smtp || use pop || use imap; then
+		myconf="${myconf} --with-mail"
+		use ssl && myconf="${myconf} --with-mail_ssl_module"
+	fi
+	use imap || myconf="${myconf} --without-mail_imap_module"
+	use pop || myconf="${myconf} --without-mail_pop3_module"
+	use smtp || myconf="${myconf} --without-mail_smtp_module"
+
+	tc-export CC
+	./configure \
+		--prefix=/usr \
+		--with-cc-opt="-I${ROOT}/usr/include" \
+		--with-ld-opt="-L${ROOT}/usr/lib" \
+		--conf-path=/etc/${PN}/${PN}.conf \
+		--http-log-path=/var/log/${PN}/access_log \
+		--error-log-path=/var/log/${PN}/error_log \
+		--pid-path=/var/run/${PN}.pid \
+		--http-client-body-temp-path=/var/tmp/${PN}/client \
+		--http-proxy-temp-path=/var/tmp/${PN}/proxy \
+		--http-fastcgi-temp-path=/var/tmp/${PN}/fastcgi \
+		${myconf} || die "configure failed"
+
+	emake LINK="${CC} ${LDFLAGS}" OTHERLDFLAGS="${LDFLAGS}" || die "failed to compile"
+}
+
+src_install() {
+	keepdir /var/log/${PN} /var/tmp/${PN}/{client,proxy,fastcgi}
+
+	dosbin objs/nginx
+	newinitd "${FILESDIR}"/nginx.init-r2 nginx || die
+
+	cp "${FILESDIR}"/nginx.conf-r4 conf/nginx.conf
+
+	dodir /etc/${PN}
+	insinto /etc/${PN}
+	doins conf/*
+
+	dodoc CHANGES{,.ru} README
+
+	# logrotate
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/nginx.logrotate nginx || die
+
+	use perl && {
+		cd "${S}"/objs/src/http/modules/perl/
+		einstall DESTDIR="${D}" INSTALLDIRS=vendor || die "failed to install perl stuff"
+		fixlocalpod
+	}
+}
+
+pkg_postinst() {
+	use ssl && {
+		if [ ! -f "${ROOT}"/etc/ssl/${PN}/${PN}.key ]; then
+			install_cert /etc/ssl/${PN}/${PN}
+			chown ${PN}:${PN} "${ROOT}"/etc/ssl/${PN}/${PN}.{crt,csr,key,pem}
+		fi
+	}
+}