Bump www-servers/nginx 0.7 and 0.8 to 0.7.64 and 0.8.29.

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

4 files changed, 238 insertions, 12 deletions

diff --git a/www-servers/nginx/ChangeLog b/www-servers/nginx/ChangeLog
index d19d00a59d69..204626d0abd5 100644
--- a/www-servers/nginx/ChangeLog
+++ b/www-servers/nginx/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for www-servers/nginx
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/ChangeLog,v 1.230 2009/09/28 15:37:52 voxus Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/ChangeLog,v 1.231 2009/12/08 14:49:37 djc Exp $
+
+*nginx-0.8.29 (08 Dec 2009)
+*nginx-0.7.64 (08 Dec 2009)
+
+  08 Dec 2009; Dirkjan Ochtman <djc@gentoo.org> +nginx-0.7.64.ebuild,
+  +nginx-0.8.29.ebuild:
+  Bump nginx 0.7 and 0.8 to 0.7.64 and 0.8.29.
 
 *nginx-0.8.17 (28 Sep 2009)
 
diff --git a/www-servers/nginx/Manifest b/www-servers/nginx/Manifest
index 2aeddca25586..e3e17d1fc2ad 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
@@ -12,17 +9,14 @@ AUX nginx.conf-r4 1410 RMD160 4b188bb03b12de3b38a82e13b1a2bb93848e8948 SHA1 e836
 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
+DIST nginx-0.7.64.tar.gz 601601 RMD160 88c982dc88a91db3337c1ab74d7a41d503736366 SHA1 e4f71b9a908c23c3d7bfeb63e97c7f85c3d6eed7 SHA256 5705d08af78add2979f566981c86d59f854b0dd350ac09df87c1f55a6846fbcd
 DIST nginx-0.8.17.tar.gz 607192 RMD160 a2919c96a5b51be7d63cd28698ed4a7411a14ead SHA1 3c13e566884f314b29bdb9d90a4664ab0ab7df33 SHA256 229d47bee8c4bd5e6e4b5cb06810573340e17d620c00da618c330793281b473a
+DIST nginx-0.8.29.tar.gz 617202 RMD160 5960e7ec51261ec667f45722333971e26b759af4 SHA1 ff586e833688f1d72507091268e917c164784200 SHA256 64d96f6b37a1b38a21a819d28f7f57e9b1b5de319bc4d1f1907be8e5bdd1d631
 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.ebuild 3261 RMD160 7aa8274c93d0e1998761176208333f0d159b5d12 SHA1 8d6033474d0532cf2fab16addcf9368bf3bf3471 SHA256 d20023dedcbb083e6ed9eefdc0e103c2e95ad773fb79706a0aea61708d98814b
 EBUILD nginx-0.8.17.ebuild 3593 RMD160 1661c53de84e5ab9fc18876615bd7b1051b1e2d8 SHA1 e67a2904063912468c82fcdb181507b6528e449d SHA256 025508e9313338b9727fc1e509eec8f5132dc03fabb2783245673312ce81c7e1
-MISC ChangeLog 37439 RMD160 ea12441eaf50d18081f8780f07a5b1c1b4b3f606 SHA1 14d8f1508f8c3024be540c8cace26c0e8a575b83 SHA256 1dd36201e8f838736594c004f328fcb85335cd1c39fe1d250c8f45e0c20694fa
+EBUILD nginx-0.8.29.ebuild 3591 RMD160 bd9d98419a9eca7f7bb7fc2127e5a67a565ce028 SHA1 13a8f6408b57aeb480cde906535ac5b0889f4332 SHA256 f9bc7a867441382a1f9ac4da6176bc0b2e234ea822f744eb8a228424122c3182
+MISC ChangeLog 37636 RMD160 ed3308cf4f09e387e0d5128bf5e29a220b04fe73 SHA1 048c493091220994ee2d2e6d226dac69b4d56105 SHA256 af9a3956eafbb489636049cc351ac322cfde33cc941d35569fe579587ee9d99a
 MISC metadata.xml 658 RMD160 7294560d00411e37fcc73d1d93f0582f7991b380 SHA1 85d04bdf906447f68042f21c12b18016059c0371 SHA256 e73d513e05935ab2dceb674477ff4ff70e39e48171782e0882a2a44993f01ce8
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAkrA2FoACgkQbwxeDFj+ScoKKgCgpTYnbUi14MioPoo8zvr6n1lV
-MKAAoNRUqVaL//hekK3UXzC16m6EQXdh
-=jR2y
------END PGP SIGNATURE-----
diff --git a/www-servers/nginx/nginx-0.7.64.ebuild b/www-servers/nginx/nginx-0.7.64.ebuild
new file mode 100644
index 000000000000..7e65b5d2a4ad
--- /dev/null
+++ b/www-servers/nginx/nginx-0.7.64.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2009 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.ebuild,v 1.1 2009/12/08 14:49:37 djc Exp $
+
+inherit eutils ssl-cert toolchain-funcs
+
+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 random-index ssl status sub webdav zlib"
+
+DEPEND="dev-lang/perl
+	pcre? ( >=dev-libs/libpcre-4.2 )
+	ssl? ( dev-libs/openssl )
+	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 imap	&& myconf="${myconf} --with-imap" # pop3/imap4 proxy support
+	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"
+
+	tc-export CC
+	./configure \
+		--prefix=/usr \
+		--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 \
+		--with-md5-asm --with-md5=/usr/include \
+		--with-sha1-asm --with-sha1=/usr/include \
+		${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}"|| die "failed to install perl stuff"
+	}
+}
+
+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
+	}
+}
diff --git a/www-servers/nginx/nginx-0.8.29.ebuild b/www-servers/nginx/nginx-0.8.29.ebuild
new file mode 100644
index 000000000000..95f1dec2948a
--- /dev/null
+++ b/www-servers/nginx/nginx-0.8.29.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/nginx-0.8.29.ebuild,v 1.1 2009/12/08 14:49:37 djc Exp $
+
+inherit eutils ssl-cert toolchain-funcs
+
+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 ipv6 pcre perl random-index securelink ssl status sub webdav zlib"
+
+DEPEND="dev-lang/perl
+	pcre? ( >=dev-libs/libpcre-4.2 )
+	ssl? ( dev-libs/openssl )
+	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 ${?}
+	if use ipv6; then
+		ewarn "Note that ipv6 support in nginx is still experimental."
+		ewarn "Be sure to read comments on gentoo bug #274614"
+		ewarn "http://bugs.gentoo.org/show_bug.cgi?id=274614"
+	fi
+}
+
+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 ipv6	&& myconf="${myconf} --with-ipv6"
+	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 imap	&& myconf="${myconf} --with-imap" # pop3/imap4 proxy support
+	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"
+	use securelink && myconf="${myconf} --with-http_secure_link_module"
+
+	tc-export CC
+	./configure \
+		--prefix=/usr \
+		--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 \
+		--with-md5-asm --with-md5=/usr/include \
+		--with-sha1-asm --with-sha1=/usr/include \
+		${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}"|| die "failed to install perl stuff"
+	}
+}
+
+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
+	}
+}