* bump and bugs #199375, #200240 and #201691

Package-Manager: portage-2.1.4_rc9

6 files changed, 40 insertions, 30 deletions

diff --git a/www-servers/nginx/ChangeLog b/www-servers/nginx/ChangeLog
index 1a935e876b82..3cc981572061 100644
--- a/www-servers/nginx/ChangeLog
+++ b/www-servers/nginx/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-servers/nginx
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/ChangeLog,v 1.166 2007/11/29 12:14:29 voxus Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/ChangeLog,v 1.167 2007/12/09 14:27:35 voxus Exp $
+
+*nginx-0.6.21 (09 Dec 2007)
+
+  09 Dec 2007; Konstantin V. Arkhipov <voxus@gentoo.org>
+  nginx-0.5.33.ebuild, -nginx-0.6.20.ebuild, +nginx-0.6.21.ebuild:
+  Version bump, also closes bugs #199375, #200240 and #201691.
 
 *nginx-0.6.20 (29 Nov 2007)
 
diff --git a/www-servers/nginx/Manifest b/www-servers/nginx/Manifest
index 01e7936d8026..bbe32addb1b4 100644
--- a/www-servers/nginx/Manifest
+++ b/www-servers/nginx/Manifest
@@ -32,7 +32,7 @@ DIST nginx-0.3.61.tar.gz 416967 RMD160 bf4d84d3cdfb6d8f767e75aa9ef69a2bca6c08a0
 DIST nginx-0.4.14.tar.gz 440675 RMD160 b46047cb5b39f7d8ac777f97f5e299231592f280 SHA1 b3a98211595dd6b0ee2b0fe7e5103e0cdf34bf08 SHA256 de916da2e01835cafe6fc90457ca14bcd065814b0f920d783aeb57efbbe4539e
 DIST nginx-0.5.26.tar.gz 471489 RMD160 ba8bc959709ae2ff7f02d9a46faaea70bbcd5922 SHA1 86b7ccc4bfbaa44bca979e23c4a5bbf0ef090ee3 SHA256 90f143b1e07af27cdceb60ed69b88cb6720d622ddc2ee93fd30c8a831441bb1d
 DIST nginx-0.5.33.tar.gz 485441 RMD160 1836b4019f450b562bbffade6ea2046f6b640062 SHA1 d8c321126c57d3a5cf06914541465bf44a6f3904 SHA256 b7cf8c2ca93ac4ce474a98ed3f9ce49559c3b0aa90454d64aa24af890b51a72c
-DIST nginx-0.6.20.tar.gz 507118 RMD160 286646d2e38b627472b4262c3067057b5cb34881 SHA1 e6c570849d8f9d130d8d84d710b231313900b78c SHA256 748c04b74f11822a23fa435a3fc42a61ddc49d7847879b04669a7fbe9a29693b
+DIST nginx-0.6.21.tar.gz 507780 RMD160 d0c6e86f6553e364def3c2ef06ec4d7d0bb2fe97 SHA1 bfea79cc61efcf22b5acd692c5facc60f0321f3a SHA256 59c7785f6c58377c178792d2ffc908ab42b6d3f1a2c2bac1e01ca51fa0ad5872
 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
@@ -53,18 +53,18 @@ EBUILD nginx-0.5.26.ebuild 2740 RMD160 a5f1845f92ee1dc7c1d89cf87ca7b1b7e647a8b6
 MD5 b43f99ae6899b9ba81acf505334b7fde nginx-0.5.26.ebuild 2740
 RMD160 a5f1845f92ee1dc7c1d89cf87ca7b1b7e647a8b6 nginx-0.5.26.ebuild 2740
 SHA256 1b3e5c2704f443f290c7a1364fc175248f0d16c2dd517f23215c6d446e5a8ccd nginx-0.5.26.ebuild 2740
-EBUILD nginx-0.5.33.ebuild 2894 RMD160 8f28574596f2da522020156958445616feb7cdca SHA1 e0ae8cc15a76571cd0bf92e3b4088b8a6c82c930 SHA256 179e5a19320c5180d6421ef73abde4a96bad4a730b7b9af5fa161cbdc30ead66
-MD5 46886c13a051e13fe53f32f74ba64c92 nginx-0.5.33.ebuild 2894
-RMD160 8f28574596f2da522020156958445616feb7cdca nginx-0.5.33.ebuild 2894
-SHA256 179e5a19320c5180d6421ef73abde4a96bad4a730b7b9af5fa161cbdc30ead66 nginx-0.5.33.ebuild 2894
-EBUILD nginx-0.6.20.ebuild 2894 RMD160 eba7666c64ea55c66b3221eec88cf1917d52f8a4 SHA1 7587065a0c98aa1a0a317c0d546116c636d48cf9 SHA256 ae27a96dfd6bd62dcdc1eb4a0002dfd91b98a4de8964f7c7ec32f1d3efcefe42
-MD5 842ac1dc1f56d5f507e404bcbffbc249 nginx-0.6.20.ebuild 2894
-RMD160 eba7666c64ea55c66b3221eec88cf1917d52f8a4 nginx-0.6.20.ebuild 2894
-SHA256 ae27a96dfd6bd62dcdc1eb4a0002dfd91b98a4de8964f7c7ec32f1d3efcefe42 nginx-0.6.20.ebuild 2894
-MISC ChangeLog 26894 RMD160 982380779c882c555e888cad446be163e98924a9 SHA1 a2f2e8870103dca9963de7b3c20052bb5dcf2fc4 SHA256 343444c9a58d988b443d32f6c8df2c12f62bd0538e90b792eec8cbffe2802d11
-MD5 5311d2b0e918aab73418272e6fade964 ChangeLog 26894
-RMD160 982380779c882c555e888cad446be163e98924a9 ChangeLog 26894
-SHA256 343444c9a58d988b443d32f6c8df2c12f62bd0538e90b792eec8cbffe2802d11 ChangeLog 26894
+EBUILD nginx-0.5.33.ebuild 2950 RMD160 0624e1b3bfd0722a94ca7fc5830e0a3ea76a96d5 SHA1 7614a29f15675a92405566197bc6c9153afae8ef SHA256 ed35d9266c1a4ffa26ea8b56a35fd7c447d9d46e3dbc5fe1aa0ae6b855a95153
+MD5 5483112c6fdf9347290c4dac3047f40f nginx-0.5.33.ebuild 2950
+RMD160 0624e1b3bfd0722a94ca7fc5830e0a3ea76a96d5 nginx-0.5.33.ebuild 2950
+SHA256 ed35d9266c1a4ffa26ea8b56a35fd7c447d9d46e3dbc5fe1aa0ae6b855a95153 nginx-0.5.33.ebuild 2950
+EBUILD nginx-0.6.21.ebuild 3062 RMD160 2a9784563952221e380cca8fbbdd975e1e5a57cf SHA1 eae6a021b62edb1c568c17101d8310cfe937ddc1 SHA256 04e98c2a7a1a7e52663f88c50c226f46be12ec6f47a414b72cb1ccb89992f981
+MD5 67a29b6531d930891f9e124e3e802d1d nginx-0.6.21.ebuild 3062
+RMD160 2a9784563952221e380cca8fbbdd975e1e5a57cf nginx-0.6.21.ebuild 3062
+SHA256 04e98c2a7a1a7e52663f88c50c226f46be12ec6f47a414b72cb1ccb89992f981 nginx-0.6.21.ebuild 3062
+MISC ChangeLog 27111 RMD160 885bb3ccf88df3b17c5a058c33041805d37b3d6b SHA1 2775a290f6e38f46922249ee3b8e9756e63ae350 SHA256 1aae5dcf914d1cbcbbdbd0bd61643386a204c85ea07054cab89277cb255dccad
+MD5 e1262b5b14e5eeb3213c9325399694e1 ChangeLog 27111
+RMD160 885bb3ccf88df3b17c5a058c33041805d37b3d6b ChangeLog 27111
+SHA256 1aae5dcf914d1cbcbbdbd0bd61643386a204c85ea07054cab89277cb255dccad ChangeLog 27111
 MISC metadata.xml 220 RMD160 7b73eb49ba7071b35813559b0871b5ddb4bcbb32 SHA1 798994deb26bee08b8be0c1197762b4bae655d67 SHA256 82c6d8c120358d0322f44bde92698ac1664b9478ce19428fc50c7048a38b2d26
 MD5 822f3c821527e6a34f23a6a92a884766 metadata.xml 220
 RMD160 7b73eb49ba7071b35813559b0871b5ddb4bcbb32 metadata.xml 220
@@ -87,6 +87,6 @@ SHA256 ca405c75de6cbd653fd9612456337a3631a48acc8b0fd41e283ae7273c15946b files/di
 MD5 ce3595ae22cc4561740c95ab024d5ad2 files/digest-nginx-0.5.33 238
 RMD160 5129c6f6855b0fd338506f6571fb81c61c2f03f7 files/digest-nginx-0.5.33 238
 SHA256 68a8e5038243b95fff9f8e0098ddcac7b31a0b624fe3c7d381eaa5267c3dfcc0 files/digest-nginx-0.5.33 238
-MD5 38008105a30d7b2e55fba28b9655e090 files/digest-nginx-0.6.20 238
-RMD160 82935394fb45944a8ee38e15d40e6c7506f631d1 files/digest-nginx-0.6.20 238
-SHA256 a285a5a47f8e4d579511244ffd0f884d712657db594ac2f75f76002223181b6d files/digest-nginx-0.6.20 238
+MD5 1233182cd237fc6a20ee73e6e120e568 files/digest-nginx-0.6.21 238
+RMD160 07800d27d7bedc822293b67d1678a02ec0ab9f20 files/digest-nginx-0.6.21 238
+SHA256 018aef54a87a3a05b3c984b9b7922c7f599b4fb0aa20f7e4adecf4c65e93e580 files/digest-nginx-0.6.21 238
diff --git a/www-servers/nginx/files/digest-nginx-0.6.20 b/www-servers/nginx/files/digest-nginx-0.6.20
deleted file mode 100644
index b2540a012cce..000000000000
--- a/www-servers/nginx/files/digest-nginx-0.6.20
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 85299a2d133329402df07fa166edec4b nginx-0.6.20.tar.gz 507118
-RMD160 286646d2e38b627472b4262c3067057b5cb34881 nginx-0.6.20.tar.gz 507118
-SHA256 748c04b74f11822a23fa435a3fc42a61ddc49d7847879b04669a7fbe9a29693b nginx-0.6.20.tar.gz 507118
diff --git a/www-servers/nginx/files/digest-nginx-0.6.21 b/www-servers/nginx/files/digest-nginx-0.6.21
new file mode 100644
index 000000000000..c41785879801
--- /dev/null
+++ b/www-servers/nginx/files/digest-nginx-0.6.21
@@ -0,0 +1,3 @@
+MD5 1dcd5f1390db3d2b63ab670b9d44cc80 nginx-0.6.21.tar.gz 507780
+RMD160 d0c6e86f6553e364def3c2ef06ec4d7d0bb2fe97 nginx-0.6.21.tar.gz 507780
+SHA256 59c7785f6c58377c178792d2ffc908ab42b6d3f1a2c2bac1e01ca51fa0ad5872 nginx-0.6.21.tar.gz 507780
diff --git a/www-servers/nginx/nginx-0.5.33.ebuild b/www-servers/nginx/nginx-0.5.33.ebuild
index 8d84efc45273..241603beb251 100644
--- a/www-servers/nginx/nginx-0.5.33.ebuild
+++ b/www-servers/nginx/nginx-0.5.33.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/nginx-0.5.33.ebuild,v 1.1 2007/11/08 13:28:59 voxus Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/nginx-0.5.33.ebuild,v 1.2 2007/12/09 14:27:35 voxus Exp $
 
 inherit eutils ssl-cert
 
@@ -92,10 +92,11 @@ src_install() {
 
 pkg_postinst() {
 	use ssl && {
-		if [ ! -f "${ROOT}"etc/ssl/${PN}/${PN}.key ]; then
-			insinto "${ROOT}"etc/ssl/${PN}
+		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
-			docert nginx
+			install_cert /etc/ssl/nginx/nginx
 		fi
 	}
 }
diff --git a/www-servers/nginx/nginx-0.6.20.ebuild b/www-servers/nginx/nginx-0.6.21.ebuild
index c801f26a6bd3..f90b4ac55e39 100644
--- a/www-servers/nginx/nginx-0.6.20.ebuild
+++ b/www-servers/nginx/nginx-0.6.21.ebuild
@@ -1,17 +1,17 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/nginx-0.6.20.ebuild,v 1.1 2007/11/29 12:14:29 voxus Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/nginx-0.6.21.ebuild,v 1.1 2007/12/09 14:27:35 voxus Exp $
 
 inherit eutils ssl-cert
 
 DESCRIPTION="Robust, small and high performance http and reverse proxy server"
 
-HOMEPAGE="http://sysoev.ru/nginx/"
+HOMEPAGE="http://nginx.net/"
 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"
+IUSE="addition debug fastcgi flv imap pcre perl ssl status sub webdav zlib"
 
 DEPEND="dev-lang/perl
 	pcre? ( >=dev-libs/libpcre-4.2 )
@@ -39,6 +39,7 @@ src_compile() {
 	# 	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"
@@ -64,6 +65,7 @@ src_compile() {
 		--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"
@@ -92,10 +94,11 @@ src_install() {
 
 pkg_postinst() {
 	use ssl && {
-		if [ ! -f "${ROOT}"etc/ssl/${PN}/${PN}.key ]; then
-			insinto "${ROOT}"etc/ssl/${PN}
+		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
-			docert nginx
+			install_cert /etc/ssl/nginx/nginx
 		fi
 	}
 }