* closing bugs #156126 and 156426

Package-Manager: portage-2.1.2_rc3-r6

diff --git a/www-servers/nginx/ChangeLog b/www-servers/nginx/ChangeLog
index 16fe40b5fd1d1b37825a5e1b4fcacfce490962f2..6767f1500534fac6a80c5897e8d71a795b518bdb 100644 (file)
--- a/www-servers/nginx/ChangeLog
+++ b/www-servers/nginx/ChangeLog
@@ -1,6 +1,12 @@
 # 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.124 2006/12/17 13:09:55 voxus Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/ChangeLog,v 1.125 2006/12/17 18:22:23 voxus Exp $
+
+*nginx-0.5.4-r1 (17 Dec 2006)
+
+  17 Dec 2006; Konstantin V. Arkhipov <voxus@gentoo.org>
+  +files/nginx.conf-r3, +nginx-0.5.4-r1.ebuild:
+  Closing bugs #156126 and 156426.
 
 *nginx-0.5.4 (17 Dec 2006)
 

diff --git a/www-servers/nginx/Manifest b/www-servers/nginx/Manifest
index 953aa15cd81f0102e742e16a3d78ac3116436d29..548b947258e21931428ce7aee1cb690a67494579 100644 (file)
--- 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
@@ -21,6 +18,10 @@ AUX nginx.conf-r2 1044 RMD160 5ddc034f31a54da00b57503cfc5a7e0be2189cef SHA1 988e
 MD5 a3565ae3a6d86ee206f2d5dd318092f2 files/nginx.conf-r2 1044
 RMD160 5ddc034f31a54da00b57503cfc5a7e0be2189cef files/nginx.conf-r2 1044
 SHA256 722b5588c975c523caea14bd90866be5d260f7d0fcdf1af90d2110b2db7ee448 files/nginx.conf-r2 1044
+AUX nginx.conf-r3 1039 RMD160 cc181fdfdbbd26eabfc60821d9bd92bc2632905c SHA1 5ddb38fd85e1a99f69b5efc62b22a4633c924f67 SHA256 93c926f698a21946687340d553d584c47408359d5bb64651fc967274659662fc
+MD5 c0b0a2dd92028a9213557d5bec63de70 files/nginx.conf-r3 1039
+RMD160 cc181fdfdbbd26eabfc60821d9bd92bc2632905c files/nginx.conf-r3 1039
+SHA256 93c926f698a21946687340d553d584c47408359d5bb64651fc967274659662fc files/nginx.conf-r3 1039
 DIST nginx-0.1.45.tar.gz 322706 RMD160 625ba47cdcc8d15bdcfb195c3a96d40e13e48bb6 SHA1 d4edab196fcfb6f74a57fd9713b679f6bd662a3b SHA256 4e9977cac9ce7abf37fdccac2e20f0371309cef0fb97f96b1e3253c5da992846
 DIST nginx-0.2.6.tar.gz 329236 RMD160 96387007cf325dd7fd78b020f4416431dccd50fa SHA1 0c12b23d201e621877a157960023e2c4db9aea9a SHA256 606e186ec7d6687a0c764ecea834bfeaa223066ed9774fd2f3819f942ec752a1
 DIST nginx-0.3.61.tar.gz 416967 RMD160 bf4d84d3cdfb6d8f767e75aa9ef69a2bca6c08a0 SHA1 a6202a19e82f8d1c82eec7c7ee754c61e450716b SHA256 19dbfb86c42e38c8ced641b6b8f808951a60003ff711c5f7cc68448a159df6b4
@@ -42,14 +43,18 @@ EBUILD nginx-0.4.14.ebuild 2295 RMD160 a2a41ada9b41da37a5edaca7aa4fb2c210af21d7
 MD5 558110ad939e4cff51d14bd2010628d6 nginx-0.4.14.ebuild 2295
 RMD160 a2a41ada9b41da37a5edaca7aa4fb2c210af21d7 nginx-0.4.14.ebuild 2295
 SHA256 89e5fefc0c9f964582fe4858360f4b475a5c374f3cb2093f8c23502f88704c02 nginx-0.4.14.ebuild 2295
+EBUILD nginx-0.5.4-r1.ebuild 2456 RMD160 8e4960ddae4ef602e4105f5567e1534fc1b78705 SHA1 9c5276fdd4ce01652259f9f7e27a59f7e5106a69 SHA256 90523f56193e8c5082ec18cb61e3438dc69bc50c0891c4d7fb039a906d3b70f0
+MD5 9efd9cbc7f910fa5c982f58b191966de nginx-0.5.4-r1.ebuild 2456
+RMD160 8e4960ddae4ef602e4105f5567e1534fc1b78705 nginx-0.5.4-r1.ebuild 2456
+SHA256 90523f56193e8c5082ec18cb61e3438dc69bc50c0891c4d7fb039a906d3b70f0 nginx-0.5.4-r1.ebuild 2456
 EBUILD nginx-0.5.4.ebuild 2294 RMD160 5bd47f890d9b7ed36b20baa43ce31eaf114e1e5e SHA1 92daf6bc8f0ebd9ab6472fd580a0ae80ec177ba7 SHA256 a0bbd0cf023cab5a21c0a52bbad76bc67ca8ec5ea2c0a655634a836bb14bb1ba
 MD5 b4ea6118c9f5b76cc24fa48bac1e04ef nginx-0.5.4.ebuild 2294
 RMD160 5bd47f890d9b7ed36b20baa43ce31eaf114e1e5e nginx-0.5.4.ebuild 2294
 SHA256 a0bbd0cf023cab5a21c0a52bbad76bc67ca8ec5ea2c0a655634a836bb14bb1ba nginx-0.5.4.ebuild 2294
-MISC ChangeLog 20206 RMD160 1784fa8ee791692a16a99b8e49c805f2eb05657d SHA1 371bc47a12e56505ff731753d7728bf89952f3a6 SHA256 2f7c1739bbfab24ac9373623e8379cd5e7ac2f8857ff1049091a61b1ade01eac
-MD5 754a4b780cdda77986030e3db30a3115 ChangeLog 20206
-RMD160 1784fa8ee791692a16a99b8e49c805f2eb05657d ChangeLog 20206
-SHA256 2f7c1739bbfab24ac9373623e8379cd5e7ac2f8857ff1049091a61b1ade01eac ChangeLog 20206
+MISC ChangeLog 20378 RMD160 32f60ee602ef7b970bc88769f33531658550075a SHA1 d79ccd171c4c75d5a1336596c65bb9cdfbbace17 SHA256 c6cde157b483ae6a0741ac1facd3a656c9bbd7b420cf1dac3beb1550356af6c2
+MD5 2172922b11c2c32623d78bb96a3f59d5 ChangeLog 20378
+RMD160 32f60ee602ef7b970bc88769f33531658550075a ChangeLog 20378
+SHA256 c6cde157b483ae6a0741ac1facd3a656c9bbd7b420cf1dac3beb1550356af6c2 ChangeLog 20378
 MISC metadata.xml 220 RMD160 7b73eb49ba7071b35813559b0871b5ddb4bcbb32 SHA1 798994deb26bee08b8be0c1197762b4bae655d67 SHA256 82c6d8c120358d0322f44bde92698ac1664b9478ce19428fc50c7048a38b2d26
 MD5 822f3c821527e6a34f23a6a92a884766 metadata.xml 220
 RMD160 7b73eb49ba7071b35813559b0871b5ddb4bcbb32 metadata.xml 220
@@ -69,10 +74,6 @@ SHA256 152d5b60ad4a168b813e02f5a6b2453aa7d232e3d3976ee706ea684bc26acc98 files/di
 MD5 01d14d0a94c529b4500fb6fcf3797dfd files/digest-nginx-0.5.4 235
 RMD160 afe66bb1f9777f488a4047c7fbd528e5543ba541 files/digest-nginx-0.5.4 235
 SHA256 53bfc25d74ac799935e5e8b90af1b90675fe59f2b92a87635e9115b7ef11e44f files/digest-nginx-0.5.4 235
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.6 (GNU/Linux)
-
-iD8DBQFFhUGtbwxeDFj+ScoRAr76AJ0cfZBBbtwW61Rn6zT5wMpleWxXiwCfX26C
-mAF53uGPoVns3tPpzVkR54k=
-=QrTS
------END PGP SIGNATURE-----
+MD5 01d14d0a94c529b4500fb6fcf3797dfd files/digest-nginx-0.5.4-r1 235
+RMD160 afe66bb1f9777f488a4047c7fbd528e5543ba541 files/digest-nginx-0.5.4-r1 235
+SHA256 53bfc25d74ac799935e5e8b90af1b90675fe59f2b92a87635e9115b7ef11e44f files/digest-nginx-0.5.4-r1 235

diff --git a/www-servers/nginx/files/digest-nginx-0.5.4-r1 b/www-servers/nginx/files/digest-nginx-0.5.4-r1
new file mode 100644 (file)
index 0000000..8ad087f
--- /dev/null
+++ b/www-servers/nginx/files/digest-nginx-0.5.4-r1
@@ -0,0 +1,3 @@
+MD5 2295a1f9441a0e48c5668544eef03d12 nginx-0.5.4.tar.gz 442554
+RMD160 c2b4c75e74bedd207262e1dca2778cbe37fe0f04 nginx-0.5.4.tar.gz 442554
+SHA256 746ae459965510e6441bfad75b06bb13c0038ea52469a83cc779c14b3bad8373 nginx-0.5.4.tar.gz 442554

diff --git a/www-servers/nginx/files/nginx.conf-r3 b/www-servers/nginx/files/nginx.conf-r3
new file mode 100644 (file)
index 0000000..a924424
--- /dev/null
+++ b/www-servers/nginx/files/nginx.conf-r3
@@ -0,0 +1,57 @@
+user nginx nginx;
+worker_processes 1;
+
+error_log /var/log/nginx/error_log info;
+
+events {
+       worker_connections  8192;
+       use epoll;
+}
+
+http {
+       include         /etc/nginx/mime.types;
+       default_type    application/octet-stream;
+
+       log_format main
+               '$remote_addr - $remote_user [$time_local] '
+               '"$request" $status $bytes_sent '
+               '"$http_referer" "$http_user_agent" '
+               '"$gzip_ratio"';
+                                                                              
+       client_header_timeout   10m;
+       client_body_timeout     10m;
+       send_timeout            10m;
+
+       connection_pool_size            256;
+       client_header_buffer_size       1k;
+       large_client_header_buffers     4 2k;
+       request_pool_size               4k;
+
+       gzip on;
+       gzip_min_length 1100;
+       gzip_buffers    4 8k;
+       gzip_types      text/plain;
+
+       output_buffers  1 32k;
+       postpone_output 1460;
+
+       sendfile        on;
+       tcp_nopush      on;
+       tcp_nodelay     on;
+
+       keepalive_timeout       75 20;
+
+       ignore_invalid_headers  on;
+
+       index index.html;
+
+       server {
+               listen          127.0.0.1;
+               server_name     localhost;
+
+               access_log      /var/log/nginx/localhost.access_log main;
+               error_log       /var/log/nginx/localhost.error_log;
+
+               root /var/www/localhost/htdocs;
+       }
+}

diff --git a/www-servers/nginx/nginx-0.5.4-r1.ebuild b/www-servers/nginx/nginx-0.5.4-r1.ebuild
new file mode 100644 (file)
index 0000000..d53c930
--- /dev/null
+++ b/www-servers/nginx/nginx-0.5.4-r1.ebuild
@@ -0,0 +1,86 @@
+# 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.5.4-r1.ebuild,v 1.1 2006/12/17 18:22:23 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 status 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
+
+       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 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"
+
+       ./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-r3 conf/nginx.conf
+
+       dodir /etc/${PN}
+       insinto /etc/${PN}
+       doins conf/*
+
+       dodoc CHANGES{,.ru} LICENSE README
+
+       use perl && {
+               cd ${S}/objs/src/http/modules/perl/
+               make DESTDIR=${D} install || die "failed to install perl stuff"
+       }
+}