Version bump (bug #323151, thanks to Johan Bergström).

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

3 files changed, 322 insertions, 2 deletions

diff --git a/www-servers/nginx/ChangeLog b/www-servers/nginx/ChangeLog
index 8effdcdbdc4d..7f111a1d0e9d 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.262 2010/06/04 13:25:50 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/ChangeLog,v 1.263 2010/07/02 05:29:22 dev-zero Exp $
+
+*nginx-0.8.42 (02 Jul 2010)
+
+  02 Jul 2010; Tiziano Müller <dev-zero@gentoo.org> +nginx-0.8.42.ebuild:
+  Version bump (bug #323151, thanks to Johan Bergström).
 
 *nginx-0.8.38-r1 (04 Jun 2010)
 
diff --git a/www-servers/nginx/Manifest b/www-servers/nginx/Manifest
index 7dc4cadc11f2..bab25c84ae8e 100644
--- a/www-servers/nginx/Manifest
+++ b/www-servers/nginx/Manifest
@@ -5,6 +5,7 @@ AUX passenger-CFLAGS.patch 646 RMD160 12f1e5f80fd2694fed612226561670f9a0f7f556 S
 DIST nginx-0.7.65.tar.gz 604451 RMD160 c03386b135ec4d72d2997b19ea70b28aeaa7a6da SHA1 f2dcc8e015903ff1277e6fa427f9b7911c4f35ce SHA256 c9f0ccaf5a09b01edf991f3adde8fced9361965838c0982112fa5c92aa2ec33a
 DIST nginx-0.8.36.tar.gz 623359 RMD160 b29ce2c60ea77f7bad5672939cc16ea39ff1ceac SHA1 4068aca8626892840dce670c5c158d2f8c72663d SHA256 d1b8a54d2d646ff21deaa1e3ec48cca5c143da5d4390e9b3dd001eaa4c9992d9
 DIST nginx-0.8.38.tar.gz 623969 RMD160 62b23252d16a861ea092cbd8bc28882e4f84157d SHA1 8e48ac109b07f0542ccda93e5b4bab67d9598aef SHA256 a97241207e7060aa04571e313908f22e007df5b2667c42274420e6a961b2c8c5
+DIST nginx-0.8.42.tar.gz 642593 RMD160 b60c271071f9796b5f38c2136c6e2e653292ef71 SHA1 daf0b6d2f0c943c4602da94a29cba285a5a72e06 SHA256 9f9687f459a753719bf1668fba30b4cdfb2c892a0410b0b304fa663bfb276dbd
 DIST nginx_http_push_module-0.692.tar.gz 29119 RMD160 9d2be16074cf28115af0f1d8f3646937cda649ad SHA1 72103084cad8f4d3d9a49a6b04cf780e4541605d SHA256 64868708071aa21dbc4c7a07d149dd6ec9108fb7eaf2aad5ad069406151f17fe
 DIST ngx-http-headers-more-0.08.tar.gz 71764 RMD160 63ee177d5abca7c958c88197f02a4063c88dba7c SHA1 b8c6f2499e44fd9fb84bef87b3f4588ddfa70798 SHA256 3e3bc43e98d95b8a0923cf6ec1af5644e855d15e33b6553096e02c53c69bc4d5
 DIST passenger-2.2.11.tar.gz 2058085 RMD160 54ee5ab25155adaf4b6be9dc0aee190a323254e5 SHA1 9c38d364f59cb72c14a2f4c22445252468f08c4e SHA256 9d4aa14a4dfe9daa713aa19a787e1a5bee0db9f3625e17ffebe1e5325aa20a88
@@ -16,5 +17,6 @@ EBUILD nginx-0.7.65.ebuild 3769 RMD160 623f00383af982d7dc7634a4f2b803084dd14dec
 EBUILD nginx-0.8.36-r1.ebuild 9150 RMD160 5ff2f332108d9091f2415d905324b83cd1911d3e SHA1 6fe25c1f54bfcb9048fcb28a142dbd27b71325a4 SHA256 53aa0556376a464dd5dc6d4a31d9c8d96445ae6df677d20b66ed40c956bfe1c2
 EBUILD nginx-0.8.38-r1.ebuild 9808 RMD160 607041291d159f9d32be57c92ede7471714bd29a SHA1 ab5bbd9969b93f8cf07a119ca4a86e4cc38acd4a SHA256 2fd8ac82745f04eb3a4b81b45624c646b64a8c35374fc180865c5cf380bd7814
 EBUILD nginx-0.8.38.ebuild 9801 RMD160 b2844beb21542c55ad637ad68b62b4a547081eec SHA1 26323284847b4ea8552bd0d4400e52225ed30cae SHA256 163e183e6990df3b3eaf1b5007694764be938d11ba1d6e16095cdb29b4d39b2d
-MISC ChangeLog 42573 RMD160 ced9aedfd7776cb3d45a92cee6a2f549ddaea12d SHA1 3cb44d281519a94c86b8823ee42448bc281d4801 SHA256 0e632370c5f1045649a897d0bc1d5108f430e0e8fe138a0d557edc690712262c
+EBUILD nginx-0.8.42.ebuild 9403 RMD160 0e05cf47d9e8033e819a94419d14d8efd1c8857a SHA1 291195a5baf7bb0270a7078fd374c09012ef6b05 SHA256 3820b58f44de0537995d40d74836a859dae920feed4c158f52aa0ddfcaa4792e
+MISC ChangeLog 42736 RMD160 47a05619068376528ca6d7f6ce7e5e2007b80a4d SHA1 73ff688e3865e8a127c74a7e81b76db463090de7 SHA256 c32441e8e94bffd20e786cbe478876879a27fea7e670fc85a698d2c0b6c41a07
 MISC metadata.xml 1357 RMD160 d83e1c10ab29f088e5fe9bfe1cec707247f8abde SHA1 c07f6abb803f7a568e74cbcc8423b570730c9314 SHA256 31ed49b4b5c7f93eb0d4be1cd254542fbcf517b243ac4f8393c0aa8ccf05cdcf
diff --git a/www-servers/nginx/nginx-0.8.42.ebuild b/www-servers/nginx/nginx-0.8.42.ebuild
new file mode 100644
index 000000000000..b8cd1969b7d4
--- /dev/null
+++ b/www-servers/nginx/nginx-0.8.42.ebuild
@@ -0,0 +1,313 @@
+# 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.42.ebuild,v 1.1 2010/07/02 05:29:22 dev-zero Exp $
+
+EAPI="2"
+
+# Maintainer notes:
+# - http_rewrite-independent pcre-support makes sense for matching locations without an actual rewrite
+# - any http-module activates the main http-functionality and overrides USE=-http
+# - keep the following 3 requirements in mind before adding external modules:
+#   * alive upstream
+#   * sane packaging
+#   * builds cleanly
+# - TODO: test the google-perftools module (included in vanilla tarball)
+
+# prevent perl-module from adding automagic perl DEPENDs
+GENTOO_DEPEND_ON_PERL="no"
+
+# http_headers_more (http://github.com/agentzh/headers-more-nginx-module, BSD license)
+HTTP_HEADERS_MORE_MODULE_PV="0.08"
+HTTP_HEADERS_MORE_MODULE_P="ngx-http-headers-more-${HTTP_HEADERS_MORE_MODULE_PV}"
+HTTP_HEADERS_MORE_MODULE_SHA1="5cd9a38"
+
+# http_passenger (http://www.modrails.com/, MIT license)
+# TODO: currently builds some stuff in src_configure
+PASSENGER_PV="2.2.12"
+USE_RUBY="ruby18"
+RUBY_OPTIONAL="yes"
+
+# http_push (http://pushmodule.slact.net/, MIT license)
+HTTP_PUSH_MODULE_P="nginx_http_push_module-0.692"
+
+inherit eutils ssl-cert toolchain-funcs perl-module ruby-ng flag-o-matic
+
+DESCRIPTION="Robust, small and high performance http and reverse proxy server"
+HOMEPAGE="http://nginx.net/
+	http://www.modrails.com/
+	http://pushmodule.slact.net/"
+SRC_URI="http://sysoev.ru/nginx/${P}.tar.gz
+	nginx_modules_http_headers_more? ( http://github.com/agentzh/headers-more-nginx-module/tarball/v${HTTP_HEADERS_MORE_MODULE_PV} -> ${HTTP_HEADERS_MORE_MODULE_P}.tar.gz )
+	nginx_modules_http_passenger? ( mirror://rubyforge/passenger/passenger-${PASSENGER_PV}.tar.gz )
+	nginx_modules_http_push? ( http://pushmodule.slact.net/downloads/${HTTP_PUSH_MODULE_P}.tar.gz )"
+
+LICENSE="BSD BSD-2 GPL-2 MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+
+NGINX_MODULES_STD="access auth_basic autoindex browser charset empty_gif fastcgi
+geo gzip limit_req limit_zone map memcached proxy referer rewrite scgi ssi
+split_clients upstream_ip_hash userid uwsgi"
+NGINX_MODULES_OPT="addition dav degradation flv geoip gzip_static image_filter
+perl random_index realip secure_link stub_status sub xslt"
+NGINX_MODULES_MAIL="imap pop3 smtp"
+NGINX_MODULES_3RD="http_headers_more http_passenger http_push"
+
+IUSE="aio debug +http +http-cache ipv6 libatomic +pcre ssl vim-syntax"
+
+for mod in $NGINX_MODULES_STD; do
+	IUSE="${IUSE} +nginx_modules_http_${mod}"
+done
+
+for mod in $NGINX_MODULES_OPT; do
+	IUSE="${IUSE} nginx_modules_http_${mod}"
+done
+
+for mod in $NGINX_MODULES_MAIL; do
+	IUSE="${IUSE} nginx_modules_mail_${mod}"
+done
+
+for mod in $NGINX_MODULES_3RD; do
+	IUSE="${IUSE} nginx_modules_${mod}"
+done
+
+CDEPEND="
+	pcre? ( >=dev-libs/libpcre-4.2 )
+	ssl? ( dev-libs/openssl )
+	http-cache? ( userland_GNU? ( dev-libs/openssl ) )
+	nginx_modules_http_geo? ( dev-libs/geoip )
+	nginx_modules_http_gzip? ( sys-libs/zlib )
+	nginx_modules_http_gzip_static? ( sys-libs/zlib )
+	nginx_modules_http_image_filter? ( media-libs/gd )
+	nginx_modules_http_perl? ( >=dev-lang/perl-5.8 )
+	nginx_modules_http_rewrite? ( >=dev-libs/libpcre-4.2 )
+	nginx_modules_http_secure_link? ( userland_GNU? ( dev-libs/openssl ) )
+	nginx_modules_http_xslt? ( dev-libs/libxml2 dev-libs/libxslt )
+	nginx_modules_http_passenger? (
+		$(ruby_implementation_depend ruby18)
+		>=dev-ruby/rubygems-0.9.0
+		>=dev-ruby/rake-0.8.1
+		>=dev-ruby/fastthread-1.0.1
+		>=dev-ruby/rack-1.0.0
+	)"
+RDEPEND="${CDEPEND}"
+DEPEND="${CDEPEND}
+	arm? ( dev-libs/libatomic_ops )
+	libatomic? ( dev-libs/libatomic_ops )"
+PDEPEND="vim-syntax? ( app-vim/nginx-syntax )"
+
+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
+
+	if use libatomic; then
+		ewarn "GCC 4.1+ features built-in atomic operations."
+		ewarn "Using libatomic_ops is only needed if using"
+		ewarn "a different compiler or a GCC prior to 4.1"
+	fi
+
+	if [[ -n $NGINX_ADD_MODULES ]]; then
+		ewarn "You are building custom modules via \$NGINX_ADD_MODULES!"
+		ewarn "This nginx installation is not supported!"
+		ewarn "Make sure you can reproduce the bug without those modules"
+		ewarn "_before_ reporting bugs."
+	fi
+
+	if use nginx_modules_http_passenger; then
+		ruby-ng_pkg_setup
+		use debug && append-flags -DPASSENGER_DEBUG
+	fi
+
+	if use !http; then
+		ewarn "To actually disable all http-functionality you also have to disable"
+		ewarn "all nginx http modules."
+	fi
+}
+
+src_unpack() {
+	# prevent ruby-ng.eclass from messing with src_unpack
+	default
+}
+
+src_prepare() {
+	sed -i 's/ make/ \\$(MAKE)/' "${S}"/auto/lib/perl/make
+
+	if use nginx_modules_http_passenger; then
+		cd "${WORKDIR}"/passenger-${PASSENGER_PV}
+		epatch "${FILESDIR}"/passenger-CFLAGS.patch
+	fi
+}
+
+src_configure() {
+	local myconf= http_enabled= mail_enabled=
+
+	use aio && myconf="${myconf} --with-file-aio --with-aio_module"
+	use debug && myconf="${myconf} --with-debug"
+	use ipv6 && myconf="${myconf} --with-ipv6"
+	use libatomic && myconf="${myconf} --with-libatomic"
+	use pcre && myconf="${myconf} --with-pcre"
+
+	# HTTP modules
+	for mod in $NGINX_MODULES_STD; do
+		if use nginx_modules_http_${mod}; then
+			http_enabled=1
+		else
+			myconf="${myconf} --without-http_${mod}_module"
+		fi
+	done
+
+	for mod in $NGINX_MODULES_OPT; do
+		if use nginx_modules_http_${mod}; then
+			http_enabled=1
+			myconf="${myconf} --with-http_${mod}_module"
+		fi
+	done
+
+	if use nginx_modules_http_fastcgi; then
+		myconf="${myconf} --with-http_realip_module"
+	fi
+
+	# third-party modules
+	if use nginx_modules_http_headers_more; then
+		http_enabled=1
+		myconf="${myconf} --add-module=${WORKDIR}/agentzh-headers-more-nginx-module-${HTTP_HEADERS_MORE_MODULE_SHA1}"
+	fi
+
+	if use nginx_modules_http_passenger; then
+		http_enabled=1
+		myconf="${myconf} --add-module=${WORKDIR}/passenger-${PASSENGER_PV}/ext/nginx"
+	fi
+
+	if use nginx_modules_http_push; then
+		http_enabled=1
+		myconf="${myconf} --add-module=${WORKDIR}/${HTTP_PUSH_MODULE_P}"
+	fi
+
+	if use http || use http-cache; then
+		http_enabled=1
+	fi
+
+	if [ $http_enabled ]; then
+		use http-cache || myconf="${myconf} --without-http-cache"
+		use ssl && myconf="${myconf} --with-http_ssl_module"
+	else
+		myconf="${myconf} --without-http --without-http-cache"
+	fi
+
+	# MAIL modules
+	for mod in $NGINX_MODULES_MAIL; do
+		if use nginx_modules_mail_${mod}; then
+			mail_enabled=1
+		else
+			myconf="${myconf} --without-mail_${mod}_module"
+		fi
+	done
+
+	if [ $mail_enabled ]; then
+		myconf="${myconf} --with-mail"
+		use ssl && myconf="${myconf} --with-mail_ssl_module"
+	fi
+
+	# custom modules
+	for mod in $NGINX_ADD_MODULES; do
+		myconf="${myconf} --add-module=${mod}"
+	done
+
+	# http://bugs.gentoo.org/show_bug.cgi?id=286772
+	export LANG=C LC_ALL=C
+	tc-export CC
+
+	./configure \
+		--prefix=/usr \
+		--sbin-path=/usr/sbin/nginx \
+		--conf-path=/etc/${PN}/${PN}.conf \
+		--error-log-path=/var/log/${PN}/error_log \
+		--pid-path=/var/run/${PN}.pid \
+		--lock-path=/var/lock/nginx.lock \
+		--user=${PN} --group=${PN} \
+		--with-cc-opt="-I${ROOT}usr/include" \
+		--with-ld-opt="-L${ROOT}usr/lib" \
+		--http-log-path=/var/log/${PN}/access_log \
+		--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 \
+		--http-scgi-temp-path=/var/tmp/${PN}/scgi \
+		--http-uwsgi-temp-path=/var/tmp/${PN}/uwsgi \
+		${myconf} || die "configure failed"
+}
+
+src_compile() {
+	# http://bugs.gentoo.org/show_bug.cgi?id=286772
+	export LANG=C LC_ALL=C
+	emake LINK="${CC} ${LDFLAGS}" OTHERLDFLAGS="${LDFLAGS}" || die "emake failed"
+}
+
+src_install() {
+	keepdir /var/log/${PN} /var/tmp/${PN}/{client,proxy,fastcgi,scgi,uwsgi}
+
+	dosbin objs/nginx
+	newinitd "${FILESDIR}"/nginx.init-r2 nginx
+
+	cp "${FILESDIR}"/nginx.conf-r4 conf/nginx.conf
+	rm conf/win-utf conf/koi-win conf/koi-utf
+
+	dodir /etc/${PN}
+	insinto /etc/${PN}
+	doins conf/*
+
+	dodoc CHANGES* README
+
+	# logrotate
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/nginx.logrotate nginx
+
+	if use nginx_modules_http_perl; then
+		cd "${S}"/objs/src/http/modules/perl/
+		einstall DESTDIR="${D}" INSTALLDIRS=vendor || die "failed to install perl stuff"
+		fixlocalpod
+	fi
+
+	if use nginx_modules_http_push; then
+		docinto ${HTTP_PUSH_MODULE_P}
+		dodoc "${WORKDIR}"/${HTTP_PUSH_MODULE_P}/{changelog.txt,protocol.txt,README}
+	fi
+
+	if use nginx_modules_http_passenger; then
+		# passengers Rakefile is so horribly broken that we have to do it
+		# manually
+		cd "${WORKDIR}"/passenger-${PASSENGER_PV}
+
+		export RUBY="ruby18"
+
+		insinto $(${RUBY} -rrbconfig -e 'print Config::CONFIG["archdir"]')/phusion_passenger
+		insopts -m 0755
+		doins ext/phusion_passenger/*.so
+		doruby -r lib/phusion_passenger
+
+		exeinto /usr/bin
+		doexe bin/passenger-memory-stats bin/passenger-status
+
+		exeinto /usr/libexec/passenger/bin
+		doexe bin/passenger-spawn-server
+
+		exeinto /usr/libexec/passenger/ext/nginx
+		doexe ext/nginx/HelperServer
+	fi
+}
+
+pkg_postinst() {
+	if use ssl; then
+		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
+	fi
+}