* bumps

Package-Manager: portage-2.1.4_rc14

6 files changed, 240 insertions, 15 deletions

diff --git a/www-servers/nginx/ChangeLog b/www-servers/nginx/ChangeLog
index 882d01958a04..4b0ea910044a 100644
--- a/www-servers/nginx/ChangeLog
+++ b/www-servers/nginx/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for www-servers/nginx
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/ChangeLog,v 1.171 2008/01/03 20:35:50 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/ChangeLog,v 1.172 2008/01/10 10:26:49 voxus Exp $
+
+*nginx-0.6.25 (10 Jan 2008)
+*nginx-0.5.35 (10 Jan 2008)
+
+  10 Jan 2008; Konstantin V. Arkhipov <voxus@gentoo.org>
+  +nginx-0.5.35.ebuild, +nginx-0.6.25.ebuild:
+  Version bumps.
 
   03 Jan 2008; Ulrich Mueller <ulm@gentoo.org> -nginx-0.5.26.ebuild:
   Remove vulnerable version wrt security bugs #174759 and #201691.
diff --git a/www-servers/nginx/Manifest b/www-servers/nginx/Manifest
index a5f52c234ef2..6780d0e37084 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
 MD5 d8f7e621e098b58848a6b5fb045c49c3 files/nginx 994
 RMD160 4b36e15714c84f8e8228d0ca6790c545736d74bb files/nginx 994
@@ -34,7 +31,9 @@ DIST nginx-0.2.6.tar.gz 329236 RMD160 96387007cf325dd7fd78b020f4416431dccd50fa S
 DIST nginx-0.3.61.tar.gz 416967 RMD160 bf4d84d3cdfb6d8f767e75aa9ef69a2bca6c08a0 SHA1 a6202a19e82f8d1c82eec7c7ee754c61e450716b SHA256 19dbfb86c42e38c8ced641b6b8f808951a60003ff711c5f7cc68448a159df6b4
 DIST nginx-0.4.14.tar.gz 440675 RMD160 b46047cb5b39f7d8ac777f97f5e299231592f280 SHA1 b3a98211595dd6b0ee2b0fe7e5103e0cdf34bf08 SHA256 de916da2e01835cafe6fc90457ca14bcd065814b0f920d783aeb57efbbe4539e
 DIST nginx-0.5.34.tar.gz 487815 RMD160 a057651eb9065b1e491ce38c73bc9e4897c982c7 SHA1 f76f6cb1ac0a316f20958bf7dc6a03723fb58edf SHA256 64e255bb76afa1cce2b65ba2b33b4d1cff034654ff20f64b4c285d143f059a3a
+DIST nginx-0.5.35.tar.gz 488926 RMD160 b6f78c584ed430212428276c69e9748a962bc013 SHA1 9e97e6723ee605db14d9cde54053496729f73c18 SHA256 efc6723a2005cc4d6395d7e915c0da91be9e2b133be761de037842b8e8655e68
 DIST nginx-0.6.24.tar.gz 512369 RMD160 910de31852552ca170735f9018a98293a8da2a7d SHA1 e03b24062311b3c04d05df70887a3e1237a681e3 SHA256 a54c3e89b0fad4864d5f24158c6d79f2f0bbad20bd0162054fa9f7a1fa5adb8d
+DIST nginx-0.6.25.tar.gz 513709 RMD160 2cfb09fcd0b3de1f255f8c4baf1a38c18da1f558 SHA1 b773203f0a4f1264d20a01dc776ea99fb017dae1 SHA256 2aab8c3bb85aed6c510c511b0b40f6d6f59ae81df79a49901084afe2ade045bc
 EBUILD nginx-0.1.45.ebuild 1935 RMD160 ad7fba7daf610154845d2e6b96e27472d6d4b61f SHA1 bf8840d9be7e7f824d86bfca8846e227a40810ba SHA256 f81dfd0f45c9ba301b5f9ebffab11508d3dcdb468ab1b023270a74ee1a1c0217
 MD5 62f46895e63da25c83512f589b9e61cb nginx-0.1.45.ebuild 1935
 RMD160 ad7fba7daf610154845d2e6b96e27472d6d4b61f nginx-0.1.45.ebuild 1935
@@ -55,14 +54,22 @@ EBUILD nginx-0.5.34.ebuild 2948 RMD160 1b440d4c68e36350ad332e02d822b67a0e4fd20c
 MD5 55fabd2576c224be2008135a6b2997de nginx-0.5.34.ebuild 2948
 RMD160 1b440d4c68e36350ad332e02d822b67a0e4fd20c nginx-0.5.34.ebuild 2948
 SHA256 aa1d67c60634b498b3ae5e625d2e81fc25ee1d006daee3a585d2819bccee62f4 nginx-0.5.34.ebuild 2948
+EBUILD nginx-0.5.35.ebuild 2950 RMD160 13a64bd2766998d189b2c69a38a9bedf0307cf18 SHA1 c70d8901392d26ae7025a7f0cf15249e213633e3 SHA256 515fbfa338358b39cea583267a4c79877f4720bafbc4841eb90c82c179701777
+MD5 38d5bc843a25a49d324c14580fea84a7 nginx-0.5.35.ebuild 2950
+RMD160 13a64bd2766998d189b2c69a38a9bedf0307cf18 nginx-0.5.35.ebuild 2950
+SHA256 515fbfa338358b39cea583267a4c79877f4720bafbc4841eb90c82c179701777 nginx-0.5.35.ebuild 2950
 EBUILD nginx-0.6.24.ebuild 3060 RMD160 fc3d17df13d0950d74494266eab9b9384c9b4afc SHA1 6909e8f1a47c28858643cc57672cb012d8e53706 SHA256 a0690daf1daf5bda630112bb3c346c6dbd05fdf31af0807ef49bb9f3f3022129
 MD5 19c74895db26d778e3dfbd1cf0bfe09e nginx-0.6.24.ebuild 3060
 RMD160 fc3d17df13d0950d74494266eab9b9384c9b4afc nginx-0.6.24.ebuild 3060
 SHA256 a0690daf1daf5bda630112bb3c346c6dbd05fdf31af0807ef49bb9f3f3022129 nginx-0.6.24.ebuild 3060
-MISC ChangeLog 27679 RMD160 132a4ca02cd50bb0b9550aa22d3e2a493cf0ce51 SHA1 27c785fc0784bf310f04c4c0664937a6a5952321 SHA256 7d99a9d68c919b8acaaa9bc0c0b19701d3181c17444928bba1203d3581c2beb4
-MD5 465de921163367b735fb293c678263a0 ChangeLog 27679
-RMD160 132a4ca02cd50bb0b9550aa22d3e2a493cf0ce51 ChangeLog 27679
-SHA256 7d99a9d68c919b8acaaa9bc0c0b19701d3181c17444928bba1203d3581c2beb4 ChangeLog 27679
+EBUILD nginx-0.6.25.ebuild 3062 RMD160 cccd19364a7b00115a01e0bffa6fd9116da9cf96 SHA1 30cc3c0e30a1d769fc79362cb3e436471051d96e SHA256 34ec6b1547cf341aa66a93ec02c9cedba4677b91ce479380e20ffdf11c378408
+MD5 dba64284f7b7244306003f153d5fc14f nginx-0.6.25.ebuild 3062
+RMD160 cccd19364a7b00115a01e0bffa6fd9116da9cf96 nginx-0.6.25.ebuild 3062
+SHA256 34ec6b1547cf341aa66a93ec02c9cedba4677b91ce479380e20ffdf11c378408 nginx-0.6.25.ebuild 3062
+MISC ChangeLog 27859 RMD160 d2e09bfd8a9093bff8a9840859f30ea69532889d SHA1 8e5f7ce669567a44b3d484c322f0b49d854ec972 SHA256 9a365613e85bdc139c210c007f48320d999919947e265acce382135ae95f6893
+MD5 6d8e3dd713cf112e0b30a1bfa51f4061 ChangeLog 27859
+RMD160 d2e09bfd8a9093bff8a9840859f30ea69532889d ChangeLog 27859
+SHA256 9a365613e85bdc139c210c007f48320d999919947e265acce382135ae95f6893 ChangeLog 27859
 MISC metadata.xml 220 RMD160 7b73eb49ba7071b35813559b0871b5ddb4bcbb32 SHA1 798994deb26bee08b8be0c1197762b4bae655d67 SHA256 82c6d8c120358d0322f44bde92698ac1664b9478ce19428fc50c7048a38b2d26
 MD5 822f3c821527e6a34f23a6a92a884766 metadata.xml 220
 RMD160 7b73eb49ba7071b35813559b0871b5ddb4bcbb32 metadata.xml 220
@@ -82,13 +89,12 @@ SHA256 152d5b60ad4a168b813e02f5a6b2453aa7d232e3d3976ee706ea684bc26acc98 files/di
 MD5 6f543ff933a81cc6be91a70c46c4c2f0 files/digest-nginx-0.5.34 238
 RMD160 a3aafda1d285a99c50cbdc8dae66b5da252c1630 files/digest-nginx-0.5.34 238
 SHA256 65582f484066a6cb1665484b99af8c255d7464647fa29364cb424abb93f000db files/digest-nginx-0.5.34 238
+MD5 146fd6bab3cc3a7b5c0546419b7a97e2 files/digest-nginx-0.5.35 238
+RMD160 52c24485127336cfd2b3a2829121ca95c011a873 files/digest-nginx-0.5.35 238
+SHA256 a4fa80c462b7c70e7779a9dabf5be15ea22762ec4e4c835eca8a6885289cae4c files/digest-nginx-0.5.35 238
 MD5 b6d1ba976219599e40138bb2e07544e7 files/digest-nginx-0.6.24 238
 RMD160 2c69b2505a10a70e1a9a903b15e5194086d4d3e9 files/digest-nginx-0.6.24 238
 SHA256 4a402137fef627ff0aa9d8d4c0ce2b7683c5561d833500a983072c3e6f71377e files/digest-nginx-0.6.24 238
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.8 (GNU/Linux)
-
-iEYEARECAAYFAkd9RzMACgkQOeoy/oIi7uzxsQCePB8x7r/v4VMAiFHgO4GCdmxd
-mW4AoNU+YtdAePTwpABLYRelDeN589Sx
-=5IfJ
------END PGP SIGNATURE-----
+MD5 aee11eac9b60c50f407bc70597315ef5 files/digest-nginx-0.6.25 238
+RMD160 f819a91c0619b792325bebfeeae5612108ead442 files/digest-nginx-0.6.25 238
+SHA256 4d45e9f41b72540727e12d2fe3dbf46f7eadc6e107e2f5e142e77ca02e5008dc files/digest-nginx-0.6.25 238
diff --git a/www-servers/nginx/files/digest-nginx-0.5.35 b/www-servers/nginx/files/digest-nginx-0.5.35
new file mode 100644
index 000000000000..7c7e0b2136e4
--- /dev/null
+++ b/www-servers/nginx/files/digest-nginx-0.5.35
@@ -0,0 +1,3 @@
+MD5 1100d8a2f811777f38eff44fe6548d7e nginx-0.5.35.tar.gz 488926
+RMD160 b6f78c584ed430212428276c69e9748a962bc013 nginx-0.5.35.tar.gz 488926
+SHA256 efc6723a2005cc4d6395d7e915c0da91be9e2b133be761de037842b8e8655e68 nginx-0.5.35.tar.gz 488926
diff --git a/www-servers/nginx/files/digest-nginx-0.6.25 b/www-servers/nginx/files/digest-nginx-0.6.25
new file mode 100644
index 000000000000..2b3cd8e39cb2
--- /dev/null
+++ b/www-servers/nginx/files/digest-nginx-0.6.25
@@ -0,0 +1,3 @@
+MD5 dcb3489809d43cf355b2a9129f306087 nginx-0.6.25.tar.gz 513709
+RMD160 2cfb09fcd0b3de1f255f8c4baf1a38c18da1f558 nginx-0.6.25.tar.gz 513709
+SHA256 2aab8c3bb85aed6c510c511b0b40f6d6f59ae81df79a49901084afe2ade045bc nginx-0.6.25.tar.gz 513709
diff --git a/www-servers/nginx/nginx-0.5.35.ebuild b/www-servers/nginx/nginx-0.5.35.ebuild
new file mode 100644
index 000000000000..54efad9c2f25
--- /dev/null
+++ b/www-servers/nginx/nginx-0.5.35.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/nginx-0.5.35.ebuild,v 1.1 2008/01/10 10:26:49 voxus Exp $
+
+inherit eutils ssl-cert
+
+DESCRIPTION="Robust, small and high performance http and reverse proxy server"
+
+HOMEPAGE="http://sysoev.ru/nginx/"
+SRC_URI="http://sysoev.ru/nginx/${P}.tar.gz"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="debug fastcgi flv imap pcre perl 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 nginx
+	enewuser nginx -1 -1 /dev/null nginx
+	eend ${?}
+}
+
+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 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"
+
+	./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 \
+		${myconf} || die "configure failed"
+
+	emake || 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 "${ROOT}"/etc/${PN}
+	insinto "${ROOT}"/etc/${PN}
+	doins conf/*
+
+	dodoc CHANGES{,.ru} LICENSE 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
+			dodir "${ROOT}"/etc/ssl/${PN}
+			insinto "${ROOT}"etc/ssl/${PN}/
+			insopts -m0644 -o nginx -g nginx
+			install_cert /etc/ssl/nginx/nginx
+		fi
+	}
+}
diff --git a/www-servers/nginx/nginx-0.6.25.ebuild b/www-servers/nginx/nginx-0.6.25.ebuild
new file mode 100644
index 000000000000..987e86215456
--- /dev/null
+++ b/www-servers/nginx/nginx-0.6.25.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/nginx-0.6.25.ebuild,v 1.1 2008/01/10 10:26:49 voxus Exp $
+
+inherit eutils ssl-cert
+
+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"
+IUSE="addition debug fastcgi flv imap pcre perl 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 nginx
+	enewuser nginx -1 -1 /dev/null nginx
+	eend ${?}
+}
+
+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"
+
+	./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 || 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 "${ROOT}"/etc/${PN}
+	insinto "${ROOT}"/etc/${PN}
+	doins conf/*
+
+	dodoc CHANGES{,.ru} LICENSE 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
+			dodir "${ROOT}"/etc/ssl/${PN}
+			insinto "${ROOT}"etc/ssl/${PN}/
+			insopts -m0644 -o nginx -g nginx
+			install_cert /etc/ssl/nginx/nginx
+		fi
+	}
+}