Fix some www-servers/nginx bugs in 0.7.64-r1 (210086, 241756).

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

4 files changed, 138 insertions, 19 deletions

diff --git a/www-servers/nginx/ChangeLog b/www-servers/nginx/ChangeLog
index b0518c00706f..15e484753e81 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.235 2010/01/03 11:32:08 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/ChangeLog,v 1.236 2010/01/03 19:05:39 djc Exp $
+
+*nginx-0.7.64-r1 (03 Jan 2010)
+
+  03 Jan 2010; Dirkjan Ochtman <djc@gentoo.org> +nginx-0.7.64-r1.ebuild,
+  metadata.xml:
+  Fix bugs 241756 (perllocal.pod) and 210086 (mail flags).
 
   03 Jan 2010; Christian Faulhammer <fauli@gentoo.org> nginx-0.8.29.ebuild:
   revert to testing for x86
diff --git a/www-servers/nginx/Manifest b/www-servers/nginx/Manifest
index 1f3fb8a09ace..b3b89513f7fd 100644
--- a/www-servers/nginx/Manifest
+++ b/www-servers/nginx/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX nginx 994 RMD160 4b36e15714c84f8e8228d0ca6790c545736d74bb SHA1 de0a11802cc6f4a1111652416bce131a07ae008c SHA256 17a32f38e066ecc91ad91496e0ab8f0885e5550d42bf62dbecfdf2747a0fb1cd
 AUX nginx-r1 1645 RMD160 d032feec43e4ba31ac5b6fffec478ebbeb49db60 SHA1 49f0db3efaccd3cef545b8c68cfa557ca829352f SHA256 b263a663399d2897dfdf53226d45fc3707bc9230bd687b8003d075a48f60ecaf
 AUX nginx-secure-link-timeout.patch 3103 RMD160 51337d222001fb051d29feaac3f68ab8367357da SHA1 d9f831bc7c378e2c1893a5f9964400a49ecc4f4b SHA256 ff89688109e695c7e3c8dfd39fa7e1310984d790e59bbbf40f29987d3edfd0a5
@@ -18,15 +15,9 @@ DIST nginx-0.8.29.tar.gz 617202 RMD160 5960e7ec51261ec667f45722333971e26b759af4
 EBUILD nginx-0.5.38.ebuild 2953 RMD160 82f38767612e0fa42760435b044c0723645b5920 SHA1 4b6033ac8b4c63a5b207c9ce478a9bc820e4e18d SHA256 6fc8868965a6a1bca92fddf777f6bfdc6550ca0902cd47db895ab3dec5fa406a
 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-r1.ebuild 3542 RMD160 9373349928b03ae7e035a169f5c7784bb45758e6 SHA1 79187ed997e89393f6eed19e701e9c0e57a70671 SHA256 f8c17338271a239d67550e95b87b07d3f39cefe85c845c328992610e50ba7087
 EBUILD nginx-0.7.64.ebuild 3245 RMD160 8964b32796019ad4945313e91c15a8c920fb6054 SHA1 97405f6b86ea9fa946d28097ee8b1e74caf21da0 SHA256 4757d0cee3a57eeab65af6b737e1fabd8a77e6729e7791eb57cfa961b6377e7c
 EBUILD nginx-0.8.17.ebuild 3593 RMD160 1661c53de84e5ab9fc18876615bd7b1051b1e2d8 SHA1 e67a2904063912468c82fcdb181507b6528e449d SHA256 025508e9313338b9727fc1e509eec8f5132dc03fabb2783245673312ce81c7e1
 EBUILD nginx-0.8.29.ebuild 3576 RMD160 8fb6a6ce8003d6f55aa3124714caeca5ee13f4cb SHA1 6363469a2c9d9827a9c6ecc9693bb297594e7945 SHA256 8956bab291d6a3d64aa4e9181c5858c1bea59e4725ccf7efcd276d390d6a880f
-MISC ChangeLog 38128 RMD160 dc409fc95f56418fa43e4f637fea1bdbcd5e00f6 SHA1 48b09244d27d2758a9e8cded9fe03d7fc0321908 SHA256 72cebe87dcd73a9abfab1122bf2832a59a018a4de31735d85c0bc408726d1e5b
-MISC metadata.xml 658 RMD160 7294560d00411e37fcc73d1d93f0582f7991b380 SHA1 85d04bdf906447f68042f21c12b18016059c0371 SHA256 e73d513e05935ab2dceb674477ff4ff70e39e48171782e0882a2a44993f01ce8
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAktAgD0ACgkQNQqtfCuFneNxdgCcCuvLo4keVR+GZAe/ajB6fZX0
-2LMAnRcCtS2lSFAJ/WgSo420A6HSURj6
-=kwob
------END PGP SIGNATURE-----
+MISC ChangeLog 38307 RMD160 f26c6ddbdffa1b61f804c0e3ac69a11d5ce6ae31 SHA1 2098ffab6dd7d7541f909ba320be67771412d460 SHA256 92b0ee69d59fa79774188c03846222960bdeec57f44746c0dad0cc9eecd8216d
+MISC metadata.xml 851 RMD160 4138d0b91f8b10522e390866ee38f5c64b613705 SHA1 c062e2b53c34a90cbd380d6183ac956d96e370b4 SHA256 8096b4d9ad2d39fecdc17107d0376a7e58ffd18707a35cfb16452d5d565c1131
diff --git a/www-servers/nginx/metadata.xml b/www-servers/nginx/metadata.xml
index a211b0313cf2..db99a0493265 100644
--- a/www-servers/nginx/metadata.xml
+++ b/www-servers/nginx/metadata.xml
@@ -1,17 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>no-herd</herd>
-<maintainer>
-	<email>voxus@gentoo.org</email>
-</maintainer>
-<use>
+  <maintainer>
+    <email>djc@gentoo.org</email>
+    <name>Dirkjan Ochtman</name>
+  </maintainer>
+  <maintainer>
+    <email>voxus@gentoo.org</email>
+  </maintainer>
+  <use>
 	<flag name='addition'>Enables HTTP addition filter module</flag>
 	<flag name='flv'>Enables special processing module for flv files</flag>
+	<flag name='pop'>Enables POP3 proxy support</flag>
 	<flag name='random-index'>Enables HTTP random index module</flag>
+	<flag name='smtp'>Enables SMTP proxy support</flag>
 	<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='webdav'>Enable webdav support</flag>
-</use>
+  </use>
 </pkgmetadata>
diff --git a/www-servers/nginx/nginx-0.7.64-r1.ebuild b/www-servers/nginx/nginx-0.7.64-r1.ebuild
new file mode 100644
index 000000000000..63774aeb2ebf
--- /dev/null
+++ b/www-servers/nginx/nginx-0.7.64-r1.ebuild
@@ -0,0 +1,117 @@
+# 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-r1.ebuild,v 1.1 2010/01/03 19:05:39 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 smtp ssl 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 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
+	cp "${FILESDIR}"/nginx-r1 "${T}"/nginx
+	doinitd "${T}"/nginx
+
+	cp "${FILESDIR}"/nginx.conf-r4 conf/nginx.conf
+
+	dodir /etc/${PN}
+	insinto /etc/${PN}
+	doins conf/*
+
+	dodoc CHANGES{,.ru} README
+
+	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
+	}
+}