* bump

(Portage version: 2.1_pre4-r1)

8 files changed, 18 insertions, 161 deletions

diff --git a/www-servers/nginx/ChangeLog b/www-servers/nginx/ChangeLog
index 86d5c780bd7b..16d99e3140c1 100644
--- a/www-servers/nginx/ChangeLog
+++ b/www-servers/nginx/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for www-servers/nginx
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/ChangeLog,v 1.75 2006/02/22 12:01:07 voxus Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/ChangeLog,v 1.76 2006/02/22 19:46:11 voxus Exp $
+
+*nginx-0.3.30 (22 Feb 2006)
+
+  22 Feb 2006; Konstantin Arkhipov <voxus@gentoo.org> +nginx-0.3.30.ebuild,
+  -nginx-0.3.29.ebuild, -nginx-0.3.29-r1.ebuild,
+  -files/nginx-0.3.29-hardened.patch:
+  Version bump.
 
 *nginx-0.3.29-r1 (22 Feb 2006)
 
diff --git a/www-servers/nginx/Manifest b/www-servers/nginx/Manifest
index 8886f6aaf74b..ff47d5e38e6e 100644
--- a/www-servers/nginx/Manifest
+++ b/www-servers/nginx/Manifest
@@ -10,18 +10,12 @@ SHA256 1bbef0ef32b6b28c9855ba547045686bc463957528b2ec34021e85b0b6aee37b files/di
 MD5 1bb0edeb44d5da60091b0c0d24e87c4f files/digest-nginx-0.3.12 64
 RMD160 3d102341963489f826f01e0d7382c799aa3032d0 files/digest-nginx-0.3.12 64
 SHA256 7a964f8c05d49c4b8c87fb941579122794d754b1855e9abf66120c577327a95a files/digest-nginx-0.3.12 64
-MD5 27a7bedcc2bee2a6bcf27f460b0e3f88 files/digest-nginx-0.3.29 238
-RMD160 3f90e54a8c89e75f3943ed59aec54926cd62ab30 files/digest-nginx-0.3.29 238
-SHA256 60654e41cf66a0f250227af0ad0d249d3ae1f23ee202303ec2b074cf8d55b4c1 files/digest-nginx-0.3.29 238
-MD5 27a7bedcc2bee2a6bcf27f460b0e3f88 files/digest-nginx-0.3.29-r1 238
-RMD160 3f90e54a8c89e75f3943ed59aec54926cd62ab30 files/digest-nginx-0.3.29-r1 238
-SHA256 60654e41cf66a0f250227af0ad0d249d3ae1f23ee202303ec2b074cf8d55b4c1 files/digest-nginx-0.3.29-r1 238
+MD5 9d0f4f987c6e9b1753c602fa9973065a files/digest-nginx-0.3.30 238
+RMD160 032bd90090b0d9193677c435f731055d822139b6 files/digest-nginx-0.3.30 238
+SHA256 510f07984d8b619e4f4a23a600e7b93fd6a390788474ba484fcf7cfe40fef126 files/digest-nginx-0.3.30 238
 MD5 d8f7e621e098b58848a6b5fb045c49c3 files/nginx 994
 RMD160 4b36e15714c84f8e8228d0ca6790c545736d74bb files/nginx 994
 SHA256 17a32f38e066ecc91ad91496e0ab8f0885e5550d42bf62dbecfdf2747a0fb1cd files/nginx 994
-MD5 8986e9cb4da6fafe0660385cd8233b29 files/nginx-0.3.29-hardened.patch 1165
-RMD160 2504bce6f640ad8a8e23ad13bc899ed7f0527a19 files/nginx-0.3.29-hardened.patch 1165
-SHA256 539ec91005a169c0401a2ba8e8e069d7e8d1fe1323c58e33ade209aa55c9adb6 files/nginx-0.3.29-hardened.patch 1165
 MD5 fecedd05099122b1f8169152e5bc9462 files/nginx.conf 1400
 RMD160 d982c853d9145643c4a885012a41fc4acd39080f files/nginx.conf 1400
 SHA256 11adbf9f0903f473b98474d460e41ec1161daa58d37e5c05019b03eae4d944f7 files/nginx.conf 1400
@@ -40,9 +34,6 @@ SHA256 ec4a8c3fa5f8917e96042d464ee1ed55420a78e69b0ee98f69e796712aadbc78 nginx-0.
 MD5 095ed1434baabf705fdbe6c4fbc92cf1 nginx-0.3.12.ebuild 1935
 RMD160 949a3e1f7336513591f4e68713c883940347a700 nginx-0.3.12.ebuild 1935
 SHA256 4b886077a85f3753f21909c2f0f1aac8744d9c8b9816198c37f5ca4f89bc40f4 nginx-0.3.12.ebuild 1935
-MD5 a7e848dfc7188f0758365f475b1978fe nginx-0.3.29-r1.ebuild 2173
-RMD160 83f579f3effde68dc7c68768245d7ee398cab763 nginx-0.3.29-r1.ebuild 2173
-SHA256 be654c5c07158cfc266090998cba3710a332aed4776a58181bc6b5c2161579cb nginx-0.3.29-r1.ebuild 2173
-MD5 5fa4d2433e2fe700df503ce2af183f1d nginx-0.3.29.ebuild 2082
-RMD160 b2edccce06a0ac77d464ce03e35d31c042d78989 nginx-0.3.29.ebuild 2082
-SHA256 4882ede68bdcabaced1051b497d2ba74da532b4bcbfea2ad62f2706d17007331 nginx-0.3.29.ebuild 2082
+MD5 5fa4d2433e2fe700df503ce2af183f1d nginx-0.3.30.ebuild 2082
+RMD160 b2edccce06a0ac77d464ce03e35d31c042d78989 nginx-0.3.30.ebuild 2082
+SHA256 4882ede68bdcabaced1051b497d2ba74da532b4bcbfea2ad62f2706d17007331 nginx-0.3.30.ebuild 2082
diff --git a/www-servers/nginx/files/digest-nginx-0.3.29 b/www-servers/nginx/files/digest-nginx-0.3.29
deleted file mode 100644
index 141623844c31..000000000000
--- a/www-servers/nginx/files/digest-nginx-0.3.29
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 7831dcb7753094edd66494cab8b45b6b nginx-0.3.29.tar.gz 385539
-RMD160 a36301fe3f4b7e39970f99885dcf1081cc23c997 nginx-0.3.29.tar.gz 385539
-SHA256 01a3bc6787528c2216da9de8b9df05b4cfb1e9e5d8f94cb02454206e6e561f09 nginx-0.3.29.tar.gz 385539
diff --git a/www-servers/nginx/files/digest-nginx-0.3.29-r1 b/www-servers/nginx/files/digest-nginx-0.3.29-r1
deleted file mode 100644
index 141623844c31..000000000000
--- a/www-servers/nginx/files/digest-nginx-0.3.29-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 7831dcb7753094edd66494cab8b45b6b nginx-0.3.29.tar.gz 385539
-RMD160 a36301fe3f4b7e39970f99885dcf1081cc23c997 nginx-0.3.29.tar.gz 385539
-SHA256 01a3bc6787528c2216da9de8b9df05b4cfb1e9e5d8f94cb02454206e6e561f09 nginx-0.3.29.tar.gz 385539
diff --git a/www-servers/nginx/files/digest-nginx-0.3.30 b/www-servers/nginx/files/digest-nginx-0.3.30
new file mode 100644
index 000000000000..22ba3dedeb6f
--- /dev/null
+++ b/www-servers/nginx/files/digest-nginx-0.3.30
@@ -0,0 +1,3 @@
+MD5 3bb44aaac2b89d096ac157b03e2f2017 nginx-0.3.30.tar.gz 386163
+RMD160 32c4af1c05c421a7b4ab0aca76588b382e543bc8 nginx-0.3.30.tar.gz 386163
+SHA256 32dd362f732630767207308ec2f9b78344ee43fc457cde142dd6c0dea3476060 nginx-0.3.30.tar.gz 386163
diff --git a/www-servers/nginx/files/nginx-0.3.29-hardened.patch b/www-servers/nginx/files/nginx-0.3.29-hardened.patch
deleted file mode 100644
index 0277697f944c..000000000000
--- a/www-servers/nginx/files/nginx-0.3.29-hardened.patch
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/core/ngx_cpuinfo.c	Wed Feb  8 14:39:29 2006
-+++ src/core/ngx_cpuinfo.c	Wed Feb 22 12:59:56 2006
-@@ -14,6 +14,38 @@
- static ngx_inline void ngx_cpuid(uint32_t i, uint32_t *buf);
- 
- 
-+#if ( __i386__ )
-+
-+static ngx_inline void
-+ngx_cpuid(uint32_t i, uint32_t *buf)
-+{
-+
-+    /*
-+     * we could not use %ebx as parameter if gcc building with -fPIC
-+     * and we could not push %ebx on stack
-+     */
-+
-+    __asm__ (
-+
-+    "    mov    %%ebx, %%esi;  "
-+
-+    "    cpuid;                "
-+    "    mov    %%eax, %0;     "
-+    "    mov    %%ebx, %1;     "
-+    "    mov    %%edx, %2;     "
-+    "    mov    %%ecx, %3;     "
-+
-+    "    mov    %%esi, %%ebx;  "
-+
-+    : "=m" (buf[0]), "=m" (buf[1]), "=m" (buf[2]), "=m" (buf[3])
-+    : "a" (i)
-+    : "ecx", "edx", "esi" );
-+}
-+
-+
-+#else /* __amd64__ */
-+
-+
- static ngx_inline void
- ngx_cpuid(uint32_t i, uint32_t *buf)
- {
-@@ -32,6 +64,8 @@
- }
- 
- 
-+#endif
-+
- /* auto detect the L2 cache line size of modern and widespread CPUs */
- 
- void
-@@ -53,6 +87,8 @@
-     if (vbuf[0] == 0) {
-         return;
-     }
-+
-+ngx_log_error(NGX_LOG_ALERT, ngx_cycle->log, 0, "CPU: \"%s\"", vendor);
- 
-     ngx_cpuid(1, cpu);
- 
diff --git a/www-servers/nginx/nginx-0.3.29-r1.ebuild b/www-servers/nginx/nginx-0.3.29-r1.ebuild
deleted file mode 100644
index 4c92a976c4bf..000000000000
--- a/www-servers/nginx/nginx-0.3.29-r1.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/nginx-0.3.29-r1.ebuild,v 1.1 2006/02/22 12:01:07 voxus Exp $
-
-inherit eutils
-
-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 imap pcre perl threads ssl 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 )"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S} || die
-
-	epatch ${FILESDIR}/${P}-hardened.patch
-}
-
-src_compile() {
-	local myconf
-
-	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 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"
-
-	./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
-	doinitd ${FILESDIR}/nginx
-
-	rm conf/nginx.conf
-	cp ${FILESDIR}/nginx.conf-r1 ${T}/nginx.conf
-
-	dodir /etc/${PN}
-	insinto /etc/${PN}
-	doins conf/* ${T}/nginx.conf
-
-	dodoc CHANGES{,.ru} LICENSE README
-}
diff --git a/www-servers/nginx/nginx-0.3.29.ebuild b/www-servers/nginx/nginx-0.3.30.ebuild
index 12be9247494b..bd2d39933ffd 100644
--- a/www-servers/nginx/nginx-0.3.29.ebuild
+++ b/www-servers/nginx/nginx-0.3.30.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/nginx-0.3.29.ebuild,v 1.1 2006/02/20 22:45:00 voxus Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/nginx-0.3.30.ebuild,v 1.1 2006/02/22 19:46:11 voxus Exp $
 
 inherit eutils