diff options
Diffstat (limited to 'www-servers')
| -rw-r--r-- | www-servers/nginx/ChangeLog | 8 | ||||
| -rw-r--r-- | www-servers/nginx/Manifest | 6 | ||||
| -rw-r--r-- | www-servers/nginx/nginx-1.0.2.ebuild (renamed from www-servers/nginx/nginx-0.9.7.ebuild) | 43 |
3 files changed, 49 insertions, 8 deletions
diff --git a/www-servers/nginx/ChangeLog b/www-servers/nginx/ChangeLog index 2449502d102a..5caec1601d74 100644 --- a/www-servers/nginx/ChangeLog +++ b/www-servers/nginx/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for www-servers/nginx # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/ChangeLog,v 1.278 2011/04/19 06:50:24 hollow Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/ChangeLog,v 1.279 2011/05/18 08:12:39 hollow Exp $ + +*nginx-1.0.2 (18 May 2011) + + 18 May 2011; Benedikt Böhm <hollow@gentoo.org> -nginx-0.9.7.ebuild, + +nginx-1.0.2.ebuild: + version bump wrt #367207 19 Apr 2011; Benedikt Böhm <hollow@gentoo.org> files/nginx-0.8.32-ey-balancer.patch, nginx-1.0.0-r1.ebuild: diff --git a/www-servers/nginx/Manifest b/www-servers/nginx/Manifest index cd1e15a4d1eb..7755a58da2a8 100644 --- a/www-servers/nginx/Manifest +++ b/www-servers/nginx/Manifest @@ -7,8 +7,8 @@ AUX passenger-3.0.1-missing-auto-feature.patch 751 RMD160 6fed12aa1aa83ee85cb615 AUX passenger-3.0.1-missing-include.patch 340 RMD160 5e314c6ec809a37c898eed9166a1d0c7e71af41b SHA1 c43aff0bce51143c84f0b24857c4bdec2df161f0 SHA256 a41a53f893ac7737b520d1fec0f2490986aae09afe38d79ab540c141322da7eb AUX passenger-CFLAGS.patch 646 RMD160 12f1e5f80fd2694fed612226561670f9a0f7f556 SHA1 1f9e2df74069a8d863e850a0e7e13bd0e8fc8fcb SHA256 42b5221b418df055cd51d03057d92fb93c4f1bbca56a1ea35cc6f5c5d9e1953d DIST nginx-0.8.53.tar.gz 649835 RMD160 2af0c8e108a68a3936aeca646d33ceaf0f1d56c8 SHA1 9bf78f55ef41aa54ab1c5caad94756d8e3e13aec SHA256 8ab8a87beb555d9ea09fe61d0de86a71ea4e90ef7970df0d38f7acfb9bed6dcf -DIST nginx-0.9.7.tar.gz 654522 RMD160 21f6fde8da9c1a2e59210736fe0af6305a131a90 SHA1 f15de07a3aa59705f47828e958191fd5a0c8009e SHA256 2feb0acee473cc360a620ee862907b9570a4121956c40cbd27da35f5b0a96045 DIST nginx-1.0.0.tar.gz 654760 RMD160 66a4c62163143c8f12a8e71119efc27e4862862e SHA1 1fc6e4b9ac0c709b6c1269dc44080b512aecd3e7 SHA256 3de3d6caeed56751c24ebc5cfb03475620b9eb0fa999c766a01d44dca674c001 +DIST nginx-1.0.2.tar.gz 659097 RMD160 a0e8e65ddb7ab7c67145b7a8c60ceffb77fa1b48 SHA1 ba501c8dd2231ce316933d57f70382fd1cd8fe2d SHA256 c3aaa6aa79d39b92a09f1e1c41c65d1af1df39a0ef68b8c9da9008a6ffba388e DIST nginx-ey-balancer-0.0.6.tar.gz 13192 RMD160 0e1dee4034023fd83639f1cc8333e05736b40a5c SHA1 2a4a97f7e6253b406775f29cff7b0b6b450563e2 SHA256 0b4728cfba04a452a5b9ebc3e304a6724ea914122d56edf0ff7c3b783205a905 DIST nginx_http_push_module-0.692.tar.gz 29119 RMD160 9d2be16074cf28115af0f1d8f3646937cda649ad SHA1 72103084cad8f4d3d9a49a6b04cf780e4541605d SHA256 64868708071aa21dbc4c7a07d149dd6ec9108fb7eaf2aad5ad069406151f17fe DIST nginx_upload_module-2.2.0.tar.gz 25796 RMD160 5734af837be3fe8ec444a7e5e7f6707118594098 SHA1 93d6e83e613a0ce2ed057a434b344fa1b6609b47 SHA256 b1c26abe0427180602e257627b4ed21848c93cc20cefc33af084983767d65805 @@ -19,8 +19,8 @@ DIST passenger-2.2.15.tar.gz 2128473 RMD160 52d0eb505d6c19e45ccc0dac8d1e675aed50 DIST passenger-3.0.1.tar.gz 2958200 RMD160 abf9d25c1d91ba44e6468f186d0e9d2569428842 SHA1 2801e35043ea43d6fae5677a7c36bc43b6fc017e SHA256 765b5528f23a5f65f2cc4b72f2e90d9b93ae777dc36a1f7b6d957b39f3cd55cd EBUILD nginx-0.8.53-r1.ebuild 10606 RMD160 64a2971e97c42a1168bb1885a4745d51e29fa624 SHA1 26fbe692b561528e4fe8264ac2091a0c203a259d SHA256 c9f6d6f7e087b5624e073acc70fd7b64c3351483d0ecd28429b2a980fa70f5f6 EBUILD nginx-0.8.53.ebuild 9995 RMD160 28f8c8fdf47322ecd0bceab07804a1d2f0f4a433 SHA1 7111e7a41e5aba26ae31e854747982be77487e8c SHA256 a9eb0c9e7c0e9020a78645b119287807b4af8aae55d8097d9e74702fd690217f -EBUILD nginx-0.9.7.ebuild 9745 RMD160 e7b5422521b541ecabf93f131a035613a42456cd SHA1 a43f4efc0d78b1649f786cb668658ed256d84aeb SHA256 4d12a5949402396ff5e1cbbb6147d6085f9ef8f34b289d97ae75309a541e3c05 EBUILD nginx-1.0.0-r1.ebuild 11216 RMD160 1bd16eae00c139f82f9985d28d0e903713a937ae SHA1 bf3f4dc9eeb9bad02f9c4ae457b3f74d6d8183d3 SHA256 711daf2672b728522dca2d492aa82d22e36ac73065998601287c2f36bcef4fd6 EBUILD nginx-1.0.0.ebuild 9745 RMD160 33c952be70ae5c93a57a3dbf5daa49b8c2467a9e SHA1 1f44c5aa2d9bdd9e92ad8fe582682fefbbdea8b8 SHA256 845d5464d4280cd598f3906b0fce53db640e188e0e2d715c2deb003eaeac1c77 -MISC ChangeLog 45557 RMD160 c871e2fe0d170c65984d609e5bedc222b118e522 SHA1 96bae772a0476d1558f59ee3126f78dffdbbfe85 SHA256 7034257ee40541a327b27a27795ac06a1d37a6331e96e9abced95e8f5652934f +EBUILD nginx-1.0.2.ebuild 11213 RMD160 99abd29216052067f35584d73da665af09898a6f SHA1 44b5d5c5ce4bae7f6f37a847173c475a791d9aa5 SHA256 d8e012d7894233d013970e7a078dcdf271fe1e422bd55053cbdc8904abc6057e +MISC ChangeLog 45707 RMD160 474b42c81dad2f5a7d5bc3992c07145f7bde349e SHA1 f57af4c034c650775faa64ff3e6e37a4fdef2b45 SHA256 7fa64ade3a590a8201010c4d7f3696f1bae753adab9d81d34816cc1bb9823d66 MISC metadata.xml 2292 RMD160 7f4fcccb4e9a6b603f0459d43a45ca3be0fa4f53 SHA1 0a59c780ca02dd1db34dbb2aecb6220d3b4567a7 SHA256 0f31896a536f46c66c248a89ce24fdf662989ec6bef15ad053b652dff4b4e369 diff --git a/www-servers/nginx/nginx-0.9.7.ebuild b/www-servers/nginx/nginx-1.0.2.ebuild index 44f79d5b1dcc..5d7035e771ea 100644 --- a/www-servers/nginx/nginx-0.9.7.ebuild +++ b/www-servers/nginx/nginx-1.0.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/nginx-0.9.7.ebuild,v 1.1 2011/04/08 08:32:19 hollow Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/nginx-1.0.2.ebuild,v 1.1 2011/05/18 08:12:39 hollow Exp $ EAPI="2" @@ -34,6 +34,15 @@ HTTP_CACHE_PURGE_MODULE_P="ngx_cache_purge-${HTTP_CACHE_PURGE_MODULE_PV}" HTTP_UPLOAD_MODULE_PV="2.2.0" HTTP_UPLOAD_MODULE_P="nginx_upload_module-${HTTP_UPLOAD_MODULE_PV}" +# ey-balancer/maxconn module (https://github.com/ry/nginx-ey-balancer, as-is) +HTTP_EY_BALANCER_MODULE_PV="0.0.6" +HTTP_EY_BALANCER_MODULE_P="nginx-ey-balancer-${HTTP_EY_BALANCER_MODULE_PV}" +HTTP_EY_BALANCER_MODULE_SHA1="d373670" + +# http_slowfs_cache (http://labs.frickle.com/nginx_ngx_slowfs_cache/, BSD-2 license) +HTTP_SLOWFS_CACHE_MODULE_PV="1.5" +HTTP_SLOWFS_CACHE_MODULE_P="ngx_slowfs_cache-${HTTP_SLOWFS_CACHE_MODULE_PV}" + inherit eutils ssl-cert toolchain-funcs perl-module flag-o-matic DESCRIPTION="Robust, small and high performance http and reverse proxy server" @@ -44,9 +53,11 @@ 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_push? ( http://pushmodule.slact.net/downloads/${HTTP_PUSH_MODULE_P}.tar.gz ) nginx_modules_http_cache_purge? ( http://labs.frickle.com/files/${HTTP_CACHE_PURGE_MODULE_P}.tar.gz ) - nginx_modules_http_upload? ( http://www.grid.net.ru/nginx/download/${HTTP_UPLOAD_MODULE_P}.tar.gz )" + nginx_modules_http_upload? ( http://www.grid.net.ru/nginx/download/${HTTP_UPLOAD_MODULE_P}.tar.gz ) + nginx_modules_http_ey_balancer? ( https://github.com/ry/nginx-ey-balancer/tarball/v${HTTP_EY_BALANCER_MODULE_PV} -> ${HTTP_EY_BALANCER_MODULE_P}.tar.gz ) + nginx_modules_http_slowfs_cache? ( http://labs.frickle.com/files/${HTTP_SLOWFS_CACHE_MODULE_P}.tar.gz )" -LICENSE="BSD BSD-2 GPL-2 MIT" +LICENSE="as-is BSD BSD-2 GPL-2 MIT" SLOT="0" KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd" @@ -57,7 +68,7 @@ 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_cache_purge http_headers_more http_passenger http_push -http_upload" +http_upload http_ey_balancer http_slowfs_cache" IUSE="aio debug +http +http-cache ipv6 libatomic +pcre ssl vim-syntax" @@ -146,6 +157,10 @@ pkg_setup() { src_prepare() { sed -i 's/ make/ \\$(MAKE)/' "${S}"/auto/lib/perl/make + + if use nginx_modules_http_ey_balancer; then + epatch "${FILESDIR}"/nginx-0.8.32-ey-balancer.patch + fi } src_configure() { @@ -198,6 +213,16 @@ src_configure() { myconf="${myconf} --add-module=${WORKDIR}/${HTTP_UPLOAD_MODULE_P}" fi + if use nginx_modules_http_ey_balancer; then + http_enabled=1 + myconf="${myconf} --add-module=${WORKDIR}/ry-nginx-ey-balancer-${HTTP_EY_BALANCER_MODULE_SHA1}" + fi + + if use nginx_modules_http_slowfs_cache; then + http_enabled=1 + myconf="${myconf} --add-module=${WORKDIR}/${HTTP_SLOWFS_CACHE_MODULE_P}" + fi + if use http || use http-cache; then http_enabled=1 fi @@ -297,6 +322,16 @@ src_install() { docinto ${HTTP_UPLOAD_MODULE_P} dodoc "${WORKDIR}"/${HTTP_UPLOAD_MODULE_P}/{Changelog,README} fi + + if use nginx_modules_http_ey_balancer; then + docinto ${HTTP_EY_BALANCER_MODULE_P} + dodoc "${WORKDIR}"/ry-nginx-ey-balancer-${HTTP_EY_BALANCER_MODULE_SHA1}/README + fi + + if use nginx_modules_http_slowfs_cache; then + docinto ${HTTP_SLOWFS_CACHE_MODULE_P} + dodoc "${WORKDIR}"/${HTTP_SLOWFS_CACHE_MODULE_P}/{CHANGES,README} + fi } pkg_postinst() { |