Version bump www-servers/nginx to 0.8.34.

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

3 files changed, 139 insertions, 2 deletions

diff --git a/www-servers/nginx/ChangeLog b/www-servers/nginx/ChangeLog
index ac50c45d5ce7..80e274c60244 100644
--- a/www-servers/nginx/ChangeLog
+++ b/www-servers/nginx/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for www-servers/nginx
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/ChangeLog,v 1.244 2010/02/02 08:39:21 djc Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/ChangeLog,v 1.245 2010/03/04 10:49:25 djc Exp $
+
+*nginx-0.8.34 (04 Mar 2010)
+
+  04 Mar 2010; Dirkjan Ochtman <djc@gentoo.org> +nginx-0.8.34.ebuild:
+  Version bump to 0.8.34.
 
 *nginx-0.8.33 (02 Feb 2010)
 *nginx-0.7.65 (02 Feb 2010)
diff --git a/www-servers/nginx/Manifest b/www-servers/nginx/Manifest
index 8772165bdae1..fe75ac8306ea 100644
--- a/www-servers/nginx/Manifest
+++ b/www-servers/nginx/Manifest
@@ -10,6 +10,7 @@ DIST nginx-0.7.65.tar.gz 604451 RMD160 c03386b135ec4d72d2997b19ea70b28aeaa7a6da
 DIST nginx-0.8.31.tar.gz 619261 RMD160 2a453d5194316fd5374193c6effd768f3afaec1e SHA1 48c7dc662dc1388e1aa4f5cc9f620a3bd2f27a5b SHA256 a810044bd7768da89d794dea8d6fb8503c5c46b0cfc4221e5151e04c4b91904e
 DIST nginx-0.8.32.tar.gz 619865 RMD160 4abacc587bf5fb400933d48bbbd7e92283de8683 SHA1 03c8177ec4943a9f7c33dbd20b1ef5d8dd5a0f9b SHA256 31f70b30ad0838615acb580eef40576f59d96ef72a1e276af2049f6ed4da189a
 DIST nginx-0.8.33.tar.gz 620448 RMD160 3ab3ea6d07fcac74465dbf40af824fccfd7f5fdd SHA1 bf3e3ab90609a62e8896f49895c3f4b4fa308270 SHA256 4366fa657a31f841944498c55bed3f2d18abeaeee4114873f3087033d629074e
+DIST nginx-0.8.34.tar.gz 621534 RMD160 9472f7d2b7b456d54fdc8e4c8dcb35e6531d4a67 SHA1 bf9a291ee7c20ea6aca4e785af59c8b662ec1d24 SHA256 f7cf3bcd0dcd3473ebff76aeee12974112d035737a2fc7f38b0a190f3a2949f6
 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
@@ -19,5 +20,6 @@ EBUILD nginx-0.7.65.ebuild 3769 RMD160 21659d016eec875f7d2071a9d4379347dc09a403
 EBUILD nginx-0.8.31.ebuild 4152 RMD160 11c0d450ce2e991c18e7c23650c756c8d2a973cb SHA1 8cbedfe0fb850b0117b6885c237303a9971cff31 SHA256 733f23552748bd2b70d7d2ab0860db53c7d10ccf58ab1e41e5bd96bc97bcc402
 EBUILD nginx-0.8.32.ebuild 4152 RMD160 f1270265c4c0eb3209eea0b676e7cb215e270be2 SHA1 8ae55d0ba5984a32622db9d55349255a8b136b29 SHA256 e42bdfa5ed447ceea3698b4cd55efa49da56ec808df4ec7c66733c7e644cb0f2
 EBUILD nginx-0.8.33.ebuild 4152 RMD160 d85478366d822eadebc13ed51d177dfae568568a SHA1 489c95051272d42251e515e7e1dd6f9170d41340 SHA256 d18facb0b50a4a847f4269dbe932281b0574ac273189f11adf43748457469805
-MISC ChangeLog 39740 RMD160 58d7615ff3fa1c85899071b5f40088945b2c4b83 SHA1 29bec63b17d1dac762aa1c74d01c380709478f7d SHA256 2b7a9a9d1d6a563a647cebf2dd243437fa805a06c995f8ad681b0ab4ec1bc858
+EBUILD nginx-0.8.34.ebuild 4152 RMD160 ae12f98f0fd32e51eb8575e79b81c39ec20ca5f3 SHA1 5c901efda028acf5197584eca2d501dd50b2dad7 SHA256 c0dbfed1c5a99da10f8770aa88a69dfcdcca5151177e68e24c969dcea78265d9
+MISC ChangeLog 39866 RMD160 385bbc0d4535e97fe8561f0d1184ff1d33f74c64 SHA1 69d1e16ad494592b6e4a8b38b8cb598bae96e198 SHA256 834a110ed0bad793baca880de0c7b7ef0c57b2db19d2e71ef7e7a9cf1af4d7d9
 MISC metadata.xml 1051 RMD160 8b26725dc2963f93521b4250ee0a0b5f53e65dc7 SHA1 9d27e68ea1b064e244d9468b5ed1177f57a6595d SHA256 a179c21f4f703f739dc3fea2bf1cb647f9be12d68faad93a178579aa5c0b24b9
diff --git a/www-servers/nginx/nginx-0.8.34.ebuild b/www-servers/nginx/nginx-0.8.34.ebuild
new file mode 100644
index 000000000000..b2d571052ca5
--- /dev/null
+++ b/www-servers/nginx/nginx-0.8.34.ebuild
@@ -0,0 +1,130 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/nginx-0.8.34.ebuild,v 1.1 2010/03/04 10:49:25 djc Exp $
+
+inherit eutils ssl-cert toolchain-funcs perl-module
+
+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 aio debug fastcgi flv imap ipv6 pcre perl pop random-index realip securelink smtp ssl static-gzip status sub webdav zlib"
+
+DEPEND="dev-lang/perl
+	dev-libs/openssl
+	pcre? ( >=dev-libs/libpcre-4.2 )
+	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 aio		&& myconf="${myconf} --with-file-aio"
+	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 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 realip	&& myconf="${myconf} --with-http_realip_module"
+	use static-gzip		&& myconf="${myconf} --with-http_gzip_static_module"
+	use random-index	&& myconf="${myconf} --with-http_random_index_module"
+	use securelink		&& myconf="${myconf} --with-http_secure_link_module"
+
+	if use smtp || use pop || use imap; then
+		myconf="${myconf} --with-mail"
+		use ssl && myconf="${myconf} --with-mail_ssl_module"
+	fi
+	use imap || myconf="${myconf} --without-mail_imap_module"
+	use pop || myconf="${myconf} --without-mail_pop3_module"
+	use smtp || myconf="${myconf} --without-mail_smtp_module"
+
+	tc-export CC
+	./configure \
+		--prefix=/usr \
+		--with-cc-opt="-I${ROOT}/usr/include" \
+		--with-ld-opt="-L${ROOT}/usr/lib" \
+		--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 \
+		${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
+	newinitd "${FILESDIR}"/nginx.init-r2 nginx || die
+
+	cp "${FILESDIR}"/nginx.conf-r4 conf/nginx.conf
+
+	dodir /etc/${PN}
+	insinto /etc/${PN}
+	doins conf/*
+
+	dodoc CHANGES{,.ru} README
+
+	# logrotate
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/nginx.logrotate nginx || die
+
+	use perl && {
+		cd "${S}"/objs/src/http/modules/perl/
+		einstall DESTDIR="${D}" INSTALLDIRS=vendor || die "failed to install perl stuff"
+		fixlocalpod
+	}
+}
+
+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
+	}
+}