From 9074c226019fc69673eea3400ccb81582500c28a Mon Sep 17 00:00:00 2001 From: Micha Glave Date: Mon, 26 Nov 2012 09:49:53 +0100 Subject: [PATCH] nginx with spdy patch from https://bugs.gentoo.org/show_bug.cgi?id=421299 --- www-servers/nginx/Changelog | 2 + www-servers/nginx/Manifest | 33 ++--- www-servers/nginx/metadata.xml | 1 + ...{nginx-1.3.1.ebuild => nginx-1.3.8.ebuild} | 126 ++++++++++++------ 4 files changed, 107 insertions(+), 55 deletions(-) create mode 100644 www-servers/nginx/Changelog rename www-servers/nginx/{nginx-1.3.1.ebuild => nginx-1.3.8.ebuild} (67%) diff --git a/www-servers/nginx/Changelog b/www-servers/nginx/Changelog new file mode 100644 index 0000000..7d9fb27 --- /dev/null +++ b/www-servers/nginx/Changelog @@ -0,0 +1,2 @@ +added patch https://421299.bugs.gentoo.org/attachment.cgi?id=323374 from +https://bugs.gentoo.org/show_bug.cgi?id=421299 diff --git a/www-servers/nginx/Manifest b/www-servers/nginx/Manifest index 972bb39..a68c594 100644 --- a/www-servers/nginx/Manifest +++ b/www-servers/nginx/Manifest @@ -1,15 +1,18 @@ -AUX nginx 994 RMD160 4b36e15714c84f8e8228d0ca6790c545736d74bb SHA1 de0a11802cc6f4a1111652416bce131a07ae008c SHA256 17a32f38e066ecc91ad91496e0ab8f0885e5550d42bf62dbecfdf2747a0fb1cd -AUX nginx-r1 1654 RMD160 80ed3157a6ecbae0b8ccbfa2ebbc4372bb086268 SHA1 47269944620500027d1b803d825d3e890478dfcb SHA256 6e4e954e53a8dad52fce661faca17acb4c3fc536f3708199b67f2d203b40f596 -AUX nginx-secure-link-timeout.patch 3103 RMD160 51337d222001fb051d29feaac3f68ab8367357da SHA1 d9f831bc7c378e2c1893a5f9964400a49ecc4f4b SHA256 ff89688109e695c7e3c8dfd39fa7e1310984d790e59bbbf40f29987d3edfd0a5 -AUX nginx.conf-r4 878 RMD160 9515d77df5ce3f56e7bb06c7274b0b22b1f5a7c2 SHA1 83e00d5a575057f48a13be7c44926ea578a6c4b7 SHA256 c827c2d28959f14ee7ebb1ba9e88071ff8203228df6b24da9ee94ee4ec669fcc -AUX nginx.logrotate 195 RMD160 56a165a6a42355f36f2d125318105708dfb948e1 SHA1 19cfc313d815c57c64df55282ae627c11280a6a6 SHA256 16fcd09e7c62b5693a4eed0924494c9794cd2e86d0e0f4d2d77519b75bf69bb6 -DIST nginx-1.3.1.tar.gz 721002 RMD160 3a3d90ac77b8d2cad58f81dcfd73f3c13ed1052d SHA1 36a4147799e303a6f19cd8ff9fb52c2fc07a840d SHA256 9b30a6f67f0a9eda7db026e12d4f09656f9254cddbb66ff9c0c01d8963dc1d73 -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 -DIST ngx-fancyindex-0.3.1.tar.gz 13148 RMD160 d85ff1de16211c98492f612c06391e9b4150e89d SHA1 5e2c88dbddaa55137804caf632cad3cf708911cb SHA256 49328a175548a456e2e2b78d0be87df7aade60345e07be57f2337c83058da115 -DIST ngx_cache_purge-1.5.tar.gz 7149 RMD160 7b7d351ea91ff3d4161296625a5a4992eee8b7d4 SHA1 f5717a2aee2cc174180627f9bf74a7c2f906047d SHA256 4b9cf48c0cf8f13150dfc329a889c221f6206a44aa9dcf8fa2f347abce55995c -DIST ngx_http_headers_more-0.17rc1.tar.gz 24707 RMD160 1840b4163e72af91155c3bfc6dd1b1efa65fcf22 SHA1 83f7ebe6359e975292f4d9d3037040a5f6ed55c0 SHA256 826b62c13605281f843ad4a612a00b38d71599a673c3112480bff9bdbbcd36cd -DIST ngx_slowfs_cache-1.8.tar.gz 11408 RMD160 3f1457df569d33df81d24205f12451cbfb76e97e SHA1 6e37e81ada462189c40c5abf31a7471a9a74bca2 SHA256 3ab8aa47912a3f7a07cda0a4fbf6d2e870b9c9cbf5477014ac109001cdcb3644 -DIST ngx_upload_progress-0.9.0.tar.gz 17020 RMD160 10ff91748a06afd81abb9fdb203f164ea369463a SHA1 93aadaf6065e1e8afd9f14b9291a66819d3aa4c0 SHA256 3fb903dab595cf6656fa0fc5743a48daffbba2f6b5c554836be630800eaad4e2 -EBUILD nginx-1.3.1.ebuild 12477 RMD160 bc9f219c3eb6efedb57384564d43dfefb98cb4e1 SHA1 bcbd8826b5ef63ada9db11c3740176b65c616481 SHA256 0327960497918025c8b35b0dc03864f6e6c6fe888dcaba3ef53e9a3b6e7ab487 -MISC metadata.xml 711 RMD160 c2426ecf2ca328c1822edcd4fe4e1eb5ba9176c0 SHA1 0b9ea8e217537e7255a9bdd2f5668198c738cf09 SHA256 d3b05c228dd62148c8bc7e46abad586eb9a9f3061ef510e1ed0a4baa77595a99 +AUX nginx 994 SHA256 17a32f38e066ecc91ad91496e0ab8f0885e5550d42bf62dbecfdf2747a0fb1cd SHA512 a0e43823594a7afc29aba6b16f21f5783224f29eb484bd70d9a378e82fdf1d7d2869d3c41395c2aeb5f46161e38f751ceca9b39b39e86ec9177ab6bf7327f116 WHIRLPOOL ac0d582d51edab1ec1fc42165412bed5e7c0ef44c97ca973b948cc437baf2876354f9f4e58cfdfb3a7ed53b1f4bbc3982cfbf767fd9a40cab3a51d49d7bc3d88 +AUX nginx-r1 1654 SHA256 6e4e954e53a8dad52fce661faca17acb4c3fc536f3708199b67f2d203b40f596 SHA512 21a57d0cb42d90584c207747d2adc3543eb01bdafe6e2129886984f8c42fa435ef6bcd4982b31bbe390519668ecf9cb6c4b543b73669db8fe77c897dc276bbd1 WHIRLPOOL b5835f6b55b766adf614eb7b4aa0b5776356e56cbf0921659aadbb5ceb7b9b99bf36bef59323e4a3bb5de6c1ee5c38188d795a4d559a249feb2adcebf9dfcf20 +AUX nginx-secure-link-timeout.patch 3103 SHA256 ff89688109e695c7e3c8dfd39fa7e1310984d790e59bbbf40f29987d3edfd0a5 SHA512 92bfdd5c087b7841b3e2574e923799dc4bfd0cc84cc300029f63c50919661b70204a7dd40e1e5ab4b90e27114c7723fd8a91847b4ff76dfa4bd77b592a505167 WHIRLPOOL 5d7cc6e8feec1fd5c187b284e01150ae9f22fc3886710309e6bfb2853b870d3da12d5f83f618d0538071c54bcb0112c325b7a6ed8ff35ef19cdf8192cd60a994 +AUX nginx.conf-r4 878 SHA256 c827c2d28959f14ee7ebb1ba9e88071ff8203228df6b24da9ee94ee4ec669fcc SHA512 29e936bb71d5c46adc5973f93abf3424330d348d87c22166a87e7be1873ad7942c24c7498988b30ef90be3fc878b584804a37f16449c94b967afbf3bd94b15ee WHIRLPOOL 78d02aafc9e0e8742064e34b7b2146dfb7b5900635653f8bfc6274771da0c1f8d6cbf031a252d559e0b4a2a0ad0e455cfdf214680d19afcd91fb9663c9016d2d +AUX nginx.logrotate 195 SHA256 16fcd09e7c62b5693a4eed0924494c9794cd2e86d0e0f4d2d77519b75bf69bb6 SHA512 08d7cc29f325633c560782ef8ddbeea6c4817c58bd74d138c0f6665777047e69885a6bf0782cfd24595a7d60f3bafd4b7a9605f75ec4fd38a208973d6af51d53 WHIRLPOOL e72cc4e15955a1c01239c7cfb7602da0ad7a0df9be70b8958149ccd99705b328a866007f550394397048e9b497b18c75a399323a16aa6321bcddbb09a4d88463 +DIST nginx-1.3.8.tar.gz 738216 SHA256 8d68f9224f4616c987208bcb3a0bf1ae03740c5ec313b220f995ba50d826fe1c SHA512 c8a5795c576568f2cfa346f9282776d30a938982045bc7c30208efda8775e81d308c50d79008d08a36ef0f55edddd6f8f2b097119a25f40ff3afc217f79000a7 WHIRLPOOL 2f1e62c6f0f51311c8190bceab276b405e626492700a9466240a469921354d939f7d3da11fe936037b3ce4976514efbb054ebeaea8a0673d9e1ddf44ae029029 +DIST nginx_http_push_module-0.692.tar.gz 29119 SHA256 64868708071aa21dbc4c7a07d149dd6ec9108fb7eaf2aad5ad069406151f17fe +DIST nginx_upload_module-2.2.0.tar.gz 25796 SHA256 b1c26abe0427180602e257627b4ed21848c93cc20cefc33af084983767d65805 SHA512 8192cedb2ac6911e8529e1dc63f02ac781cd54a293ab87571866bed11520b01ed5786be6daf79b4a1c34792926548b2fa8404daa0bf31d9fd17c59a64e90b3fe WHIRLPOOL db3ad2790c4beb735d51422d2a8d556385576c4f769addeaa1dd00cae55ee2ab97be9efe420743c87b2f794f816eae7f001e7622648b4f63fbbc60898840f9e8 +DIST ngx_cache_purge-1.6.tar.gz 7296 SHA256 863d6dd60e31b3c24c1f2d314f294c62a4ab5cf37f98c20ded9f6df1018baac8 SHA512 d1e8d3ebd170a3d26eb1dd03a058974ea6a5c0b29e0feb2c7518f9de7524b62816a697b3b17de4199fdb36e405ce88aef722005916ad1d903f44a653e2c3458f WHIRLPOOL 891e82dbef1db64527c767656ae74dd0d2ae230e359654d3aa038ad44d317a95721dd0d7ad8bf7e096ac15e1a8d8c8d8db98e6339ca48a7ec1ad6d9e2f6150b5 +DIST ngx_devel_kit-0.2.17.tar.gz 64964 SHA256 bf5540d76d1867b4411091f16c6c786fd66759099c59483c76c68434020fdb02 SHA512 d2d935ec28719a8046358b248a5d4eef3f39bba437f3fc986a0621a12855acfa541f30720b33dc4afea2718d36e282be8673e7c800fa62f7e1ac67a8839a620d WHIRLPOOL eb55bf12624b07f2357fd05901acb5f5fdc7d83d49388e6e9d3e20394693ff922dbcf7816f604b7592fb16c8067ba96cc0d828368be9de7469138e262457917d +DIST ngx_http_fancyindex-0.3.1.tar.gz 13148 SHA256 49328a175548a456e2e2b78d0be87df7aade60345e07be57f2337c83058da115 SHA512 6d21d8498eac949dc37c36fdfe24e7e4dd172293c840543bb02b6581dbb8982502e5f70d2badce4bfd0dad2b41ab3f01abb746b5b275f286cb01af4f297e2ce5 WHIRLPOOL 47b2f82d766589ed57d0878e63642d609fcb494df25c8265ccfd51b51e4a831eb42cff1e1aedafc6553885383d06ece4d9d493485dbc53df81bb1d300679113b +DIST ngx_http_headers_more-0.17.tar.gz 23324 SHA256 039b8296f3954748fcb86a80076af4d8d5ee8e84340c1f55ccdbef72437357d9 SHA512 b53a7c8783b2a5cc77e3cfdd399873b6ddc5951193e7342e92d4b22f29188994cbccf804bbd8ab04c7db0202f14b924ffbb5acce297f96a6a038194f79177a98 WHIRLPOOL 0ddf6dfb172552ccd57105995aac2b08920df33fc9000210520fdd827295e3f0ecc3a5b59ea8cbfb1c587f12a0ea7c179d8b0cec1415cbf7c0bb097f7fb9d19b +DIST ngx_http_lua-0.5.10.tar.gz 369553 SHA256 d8a2d91f4fb2792c55ecc2c7dcf24e40a1b795ac91e1f73d98b67d000b957ee6 SHA512 3a2088fb5a4da251afc8a500e3626035570f6fbf1bbd943e6ad1f7fa240ee849f07d4bd595a1d8d5137c3db7fcae1793e898efc286c10841b9179562ca60d7ed WHIRLPOOL 04ff8aec6c4de25a49b8394886e0c47a78a56cd4a0f6dac4018de9a474fdf1a1578ffedeede6dcd9bec3885c6296ba077ec9f34e33c3719a059155c6744026d5 +DIST ngx_http_upload_progress-0.9.0.tar.gz 17020 SHA256 3fb903dab595cf6656fa0fc5743a48daffbba2f6b5c554836be630800eaad4e2 SHA512 8b585609983b34a9f3fa39aa18b744be7109beee2e1892ec723deae0353fb366f700e58e120569b7ff364841d271d04b32a9022a0165e9f33e07a21437e1c0ca WHIRLPOOL 42aefc25e98cd0a8f48705638462927494a3b0bcbed1fb0ea7b33a6027a848950347d20d1b055211890ccf4be4f31c7e417614948adeec1272ea01c2e5f0d29a +DIST ngx_slowfs_cache-1.9.tar.gz 11527 SHA256 7a2e07033550f3b594949a4392ac9a34e5583025ffea4e33e39a7f0d9fdc8b42 SHA512 4151ecd9272de332720de8b838fded1e7b192b2426683c3d7e49f67307603154076625b87a218b34609afd0d0fb0827f8a831b38c95cdc0f2a369aade663d25e WHIRLPOOL 24a4f5bb03563557ab1bc32bf82915c36017af3abe4e1ae2a92f1b688f189a3712bced7484d9786598dce0fc1ae7d80bceb184fc23ce9c2a130bc135b6e61a9b +DIST patch.spdy-52.txt 149646 SHA256 64715a608bbb7ad8d99359ebdc57d4bc7d6103778e8e8bf171b7b283c858ec08 SHA512 acb896dea732ac5763b471e9b6d7fc4e40d6c5ed0a82e53f0907369d1f6c7c71289e2c2001c850522853798cdbee40e1e4a74b904f2b1d96fba85a27484706cd WHIRLPOOL 88fc4e912944c4e615453a6155104e7fb17893a42a65ea752fef9d4347328693da9b250fd6f1deaa66eb61d3b63dc2162bed45408a6ed36d443293a2a81a1e68 +EBUILD nginx-1.3.8.ebuild 14370 SHA256 112cdf2725284aff04569b7766da3ecdc87884a2d59d12599c01903c008f9c8f SHA512 a4e80ad6fca7f2a145197147846b9ffe29e42af6b1b1d0b290aa4fbc74e1fdcf1a6f6930fc02c62d00ae48c3dab97d9a976d0eb31bdcc8d983e8501b945109f3 WHIRLPOOL d3384d0c972a4da3d3dff1fce0c10a9f781834911b4ce51dbdfc0e792a3e72fa58383d98e5ecb26add9bfebd686868ee26f4ffeffed8f1a3728a1c0eed68fd2f +MISC metadata.xml 711 SHA256 d3b05c228dd62148c8bc7e46abad586eb9a9f3061ef510e1ed0a4baa77595a99 SHA512 c0219177893ec25ebc819d3b4dc12e8f49bad60faa600d90f572f2eb9058d40b1fc67e48dee71707bd8d0df7721532a08c54da7667c6402f8cd5954e1ca1bab3 WHIRLPOOL 6ec488b91ad22ba103f4a3d64cd5381643d08a36814330c70663c70a5c0f98b3491a24c569c532de6c860581a65083be3df74db0721332aaa77898ac1b6aa6e5 diff --git a/www-servers/nginx/metadata.xml b/www-servers/nginx/metadata.xml index 7ecf88e..658bff7 100644 --- a/www-servers/nginx/metadata.xml +++ b/www-servers/nginx/metadata.xml @@ -14,5 +14,6 @@ Enables stub_status module Enables sub_filter module Enable webdav support + Enable spdy support diff --git a/www-servers/nginx/nginx-1.3.1.ebuild b/www-servers/nginx/nginx-1.3.8.ebuild similarity index 67% rename from www-servers/nginx/nginx-1.3.1.ebuild rename to www-servers/nginx/nginx-1.3.8.ebuild index 6adfb17..a2f5376 100644 --- a/www-servers/nginx/nginx-1.3.1.ebuild +++ b/www-servers/nginx/nginx-1.3.8.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/nginx-1.3.1.ebuild,v 1.1 2012/06/06 08:47:00 patrick Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/nginx-1.3.8.ebuild,v 1.1 2012/11/16 07:13:38 patrick Exp $ EAPI="4" @@ -17,66 +17,91 @@ EAPI="4" # prevent perl-module from adding automagic perl DEPENDs GENTOO_DEPEND_ON_PERL="no" +# devel_kit (https://github.com/simpl/ngx_devel_kit, BSD license) +DEVEL_KIT_MODULE_PV="0.2.17" +DEVEL_KIT_MODULE_P="ngx_devel_kit-${DEVEL_KIT_MODULE_PV}" +DEVEL_KIT_MODULE_SHA1="bc97eea" +DEVEL_KIT_MODULE_URI="https://github.com/simpl/ngx_devel_kit/tarball/v${DEVEL_KIT_MODULE_PV}" +DEVEL_KIT_MODULE_WD="${WORKDIR}/simpl-ngx_devel_kit-${DEVEL_KIT_MODULE_SHA1}" + # http_uploadprogress (https://github.com/masterzen/nginx-upload-progress-module, BSD-2 license) HTTP_UPLOAD_PROGRESS_MODULE_PV="0.9.0" -HTTP_UPLOAD_PROGRESS_MODULE_P="ngx_upload_progress-${HTTP_UPLOAD_PROGRESS_MODULE_PV}" +HTTP_UPLOAD_PROGRESS_MODULE_P="ngx_http_upload_progress-${HTTP_UPLOAD_PROGRESS_MODULE_PV}" HTTP_UPLOAD_PROGRESS_MODULE_SHA1="a788dea" HTTP_UPLOAD_PROGRESS_MODULE_URI="http://github.com/masterzen/nginx-upload-progress-module/tarball/v${HTTP_UPLOAD_PROGRESS_MODULE_PV}" +HTTP_UPLOAD_PROGRESS_MODULE_WD="${WORKDIR}/masterzen-nginx-upload-progress-module-${HTTP_UPLOAD_PROGRESS_MODULE_SHA1}" # http_headers_more (http://github.com/agentzh/headers-more-nginx-module, BSD license) -HTTP_HEADERS_MORE_MODULE_PV="0.17rc1" +HTTP_HEADERS_MORE_MODULE_PV="0.17" HTTP_HEADERS_MORE_MODULE_P="ngx_http_headers_more-${HTTP_HEADERS_MORE_MODULE_PV}" -HTTP_HEADERS_MORE_MODULE_SHA1="3580526" +HTTP_HEADERS_MORE_MODULE_SHA1="b7c8cfc" HTTP_HEADERS_MORE_MODULE_URI="http://github.com/agentzh/headers-more-nginx-module/tarball/v${HTTP_HEADERS_MORE_MODULE_PV}" +HTTP_HEADERS_MORE_MODULE_WD="${WORKDIR}/agentzh-headers-more-nginx-module-${HTTP_HEADERS_MORE_MODULE_SHA1}" # http_push (http://pushmodule.slact.net/, MIT license) HTTP_PUSH_MODULE_PV="0.692" -HTTP_PUSH_MODULE_P="nginx_http_push_module-${HTTP_PUSH_MODULE_PV}" -HTTP_PUSH_MODULE_URI="http://pushmodule.slact.net/downloads/${HTTP_PUSH_MODULE_P}.tar.gz" +HTTP_PUSH_MODULE_P="ngx_http_push-${HTTP_PUSH_MODULE_PV}" +HTTP_PUSH_MODULE_URI="http://pushmodule.slact.net/downloads/nginx_http_push_module-${HTTP_PUSH_MODULE_PV}.tar.gz" +HTTP_PUSH_MODULE_WD="${WORKDIR}/nginx_http_push_module-${HTTP_PUSH_MODULE_PV}" # http_cache_purge (http://labs.frickle.com/nginx_ngx_cache_purge/, BSD-2 license) -HTTP_CACHE_PURGE_MODULE_PV="1.5" -HTTP_CACHE_PURGE_MODULE_P="ngx_cache_purge-${HTTP_CACHE_PURGE_MODULE_PV}" -HTTP_CACHE_PURGE_MODULE_URI="http://labs.frickle.com/files/${HTTP_CACHE_PURGE_MODULE_P}.tar.gz" +HTTP_CACHE_PURGE_MODULE_PV="1.6" +HTTP_CACHE_PURGE_MODULE_P="ngx_http_cache_purge-${HTTP_CACHE_PURGE_MODULE_PV}" +HTTP_CACHE_PURGE_MODULE_URI="http://labs.frickle.com/files/ngx_cache_purge-${HTTP_CACHE_PURGE_MODULE_PV}.tar.gz" +HTTP_CACHE_PURGE_MODULE_WD="${WORKDIR}/ngx_cache_purge-${HTTP_CACHE_PURGE_MODULE_PV}" -# HTTP Upload module from Valery Kholodkov -# (http://www.grid.net.ru/nginx/upload.en.html, BSD license) +# http_upload (http://www.grid.net.ru/nginx/upload.en.html, BSD license) HTTP_UPLOAD_MODULE_PV="2.2.0" -HTTP_UPLOAD_MODULE_P="nginx_upload_module-${HTTP_UPLOAD_MODULE_PV}" -HTTP_UPLOAD_MODULE_URI="http://www.grid.net.ru/nginx/download/${HTTP_UPLOAD_MODULE_P}.tar.gz" +HTTP_UPLOAD_MODULE_P="ngx_http_upload-${HTTP_UPLOAD_MODULE_PV}" +HTTP_UPLOAD_MODULE_URI="http://www.grid.net.ru/nginx/download/nginx_upload_module-${HTTP_UPLOAD_MODULE_PV}.tar.gz" +HTTP_UPLOAD_MODULE_WD="${WORKDIR}/nginx_upload_module-${HTTP_UPLOAD_MODULE_PV}" # http_slowfs_cache (http://labs.frickle.com/nginx_ngx_slowfs_cache/, BSD-2 license) -HTTP_SLOWFS_CACHE_MODULE_PV="1.8" -HTTP_SLOWFS_CACHE_MODULE_P="ngx_slowfs_cache-${HTTP_SLOWFS_CACHE_MODULE_PV}" -HTTP_SLOWFS_CACHE_MODULE_URI="http://labs.frickle.com/files/${HTTP_SLOWFS_CACHE_MODULE_P}.tar.gz" +HTTP_SLOWFS_CACHE_MODULE_PV="1.9" +HTTP_SLOWFS_CACHE_MODULE_P="ngx_http_slowfs_cache-${HTTP_SLOWFS_CACHE_MODULE_PV}" +HTTP_SLOWFS_CACHE_MODULE_URI="http://labs.frickle.com/files/ngx_slowfs_cache-${HTTP_SLOWFS_CACHE_MODULE_PV}.tar.gz" +HTTP_SLOWFS_CACHE_MODULE_WD="${WORKDIR}/ngx_slowfs_cache-${HTTP_SLOWFS_CACHE_MODULE_PV}" -# http_fancyindex_module (http://wiki.nginx.org/NgxFancyIndex, BSD license) +# http_fancyindex (http://wiki.nginx.org/NgxFancyIndex, BSD license) HTTP_FANCYINDEX_MODULE_PV="0.3.1" -HTTP_FANCYINDEX_MODULE_PN="ngx-fancyindex" -# gitorious names the tarbell oddly, hence PNPN -HTTP_FANCYINDEX_MODULE_PNPN="ngx-fancyindex-ngx-fancyindex" -HTTP_FANCYINDEX_MODULE_P="${HTTP_FANCYINDEX_MODULE_PN}-${HTTP_FANCYINDEX_MODULE_PV}" -HTTP_FANCYINDEX_MODULE_URI="http://gitorious.org/${HTTP_FANCYINDEX_MODULE_PN}/${HTTP_FANCYINDEX_MODULE_PN}/archive-tarball/v${HTTP_FANCYINDEX_MODULE_PV}" +HTTP_FANCYINDEX_MODULE_P="ngx_http_fancyindex-${HTTP_FANCYINDEX_MODULE_PV}" +HTTP_FANCYINDEX_MODULE_URI="http://gitorious.org/ngx-fancyindex/ngx-fancyindex/archive-tarball/v${HTTP_FANCYINDEX_MODULE_PV}" +HTTP_FANCYINDEX_MODULE_WD="${WORKDIR}/ngx-fancyindex-ngx-fancyindex" + +# http_lua (https://github.com/chaoslawful/lua-nginx-module, BSD license) +HTTP_LUA_MODULE_PV="0.5.10" +HTTP_LUA_MODULE_P="ngx_http_lua-${HTTP_LUA_MODULE_PV}" +HTTP_LUA_MODULE_SHA1="db0bebe" +HTTP_LUA_MODULE_URI="https://github.com/chaoslawful/lua-nginx-module/tarball/v${HTTP_LUA_MODULE_PV}" +HTTP_LUA_MODULE_WD="${WORKDIR}/chaoslawful-lua-nginx-module-${HTTP_LUA_MODULE_SHA1}" + +# spdy (http://nginx.org/patches/spdy/, BSD license) +SPDY_PATCH_PV="52" +SPDY_PATCH_P="patch.spdy-${SPDY_PATCH_PV}" +SPDY_PATCH_URI="http://nginx.org/patches/spdy/${SPDY_PATCH_P}.txt" inherit eutils ssl-cert toolchain-funcs perl-module flag-o-matic user DESCRIPTION="Robust, small and high performance http and reverse proxy server" HOMEPAGE="http://nginx.org" SRC_URI="http://nginx.org/download/${P}.tar.gz + ${DEVEL_KIT_MODULE_URI} -> ${DEVEL_KIT_MODULE_P}.tar.gz nginx_modules_http_upload_progress? ( ${HTTP_UPLOAD_PROGRESS_MODULE_URI} -> ${HTTP_UPLOAD_PROGRESS_MODULE_P}.tar.gz ) nginx_modules_http_headers_more? ( ${HTTP_HEADERS_MORE_MODULE_URI} -> ${HTTP_HEADERS_MORE_MODULE_P}.tar.gz ) nginx_modules_http_push? ( ${HTTP_PUSH_MODULE_URI} ) nginx_modules_http_cache_purge? ( ${HTTP_CACHE_PURGE_MODULE_URI} ) nginx_modules_http_upload? ( ${HTTP_UPLOAD_MODULE_URI} ) nginx_modules_http_slowfs_cache? ( ${HTTP_SLOWFS_CACHE_MODULE_URI} ) - nginx_modules_http_fancyindex? ( ${HTTP_FANCYINDEX_MODULE_URI} -> ${HTTP_FANCYINDEX_MODULE_P}.tar.gz )" + nginx_modules_http_fancyindex? ( ${HTTP_FANCYINDEX_MODULE_URI} -> ${HTTP_FANCYINDEX_MODULE_P}.tar.gz ) + nginx_modules_http_lua? ( ${HTTP_LUA_MODULE_URI} -> ${HTTP_LUA_MODULE_P}.tar.gz ) + spdy? ( ${SPDY_PATCH_URI} )" LICENSE="as-is BSD BSD-2 GPL-2 MIT" SLOT="0" KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux" 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 +geo gzip limit_req limit_conn 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 mp4 perl random_index realip secure_link stub_status sub xslt" @@ -89,9 +114,10 @@ NGINX_MODULES_3RD=" http_cache_purge http_upload http_slowfs_cache - http_fancyindex" + http_fancyindex + http_lua" -IUSE="aio debug +http +http-cache ipv6 libatomic +pcre pcre-jit selinux ssl vim-syntax" +IUSE="aio debug +http +http-cache ipv6 libatomic +pcre pcre-jit selinux spdy ssl vim-syntax" for mod in $NGINX_MODULES_STD; do IUSE="${IUSE} +nginx_modules_http_${mod}" @@ -111,8 +137,10 @@ done CDEPEND=" pcre? ( >=dev-libs/libpcre-4.2 ) + pcre-jit? ( >=dev-libs/libpcre-8.20[jit] ) selinux? ( sec-policy/selinux-nginx ) ssl? ( dev-libs/openssl ) + spdy? ( >=dev-libs/openssl-1.0.1 ) http-cache? ( userland_GNU? ( dev-libs/openssl ) ) nginx_modules_http_geo? ( dev-libs/geoip ) nginx_modules_http_gzip? ( sys-libs/zlib ) @@ -121,13 +149,17 @@ CDEPEND=" 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_xslt? ( dev-libs/libxml2 dev-libs/libxslt ) + nginx_modules_http_lua? ( || ( dev-lang/lua dev-lang/luajit ) )" RDEPEND="${CDEPEND}" DEPEND="${CDEPEND} arm? ( dev-libs/libatomic_ops ) libatomic? ( dev-libs/libatomic_ops )" PDEPEND="vim-syntax? ( app-vim/nginx-syntax )" -REQUIRED_USE="pcre-jit? ( pcre )" +REQUIRED_USE=" + pcre-jit? ( pcre ) + spdy? ( ssl ) +" pkg_setup() { if use nginx_modules_http_passenger; then @@ -178,6 +210,9 @@ src_prepare() { sed -i 's:.default::' auto/install || die # remove useless files sed -i -e '/koi-/d' -e '/win-/d' auto/install || die + if use spdy; then + epatch "${DISTDIR}/${SPDY_PATCH_P}.txt" + fi } src_configure() { @@ -213,37 +248,43 @@ src_configure() { # third-party modules if use nginx_modules_http_upload_progress; then http_enabled=1 - myconf+=" --add-module=${WORKDIR}/masterzen-nginx-upload-progress-module-${HTTP_UPLOAD_PROGRESS_MODULE_SHA1}" + myconf+=" --add-module=${HTTP_UPLOAD_PROGRESS_MODULE_WD}" fi if use nginx_modules_http_headers_more; then http_enabled=1 - myconf+=" --add-module=${WORKDIR}/agentzh-headers-more-nginx-module-${HTTP_HEADERS_MORE_MODULE_SHA1}" + myconf+=" --add-module=${HTTP_HEADERS_MORE_MODULE_WD}" fi if use nginx_modules_http_push; then http_enabled=1 - myconf+=" --add-module=${WORKDIR}/${HTTP_PUSH_MODULE_P}" + myconf+=" --add-module=${HTTP_PUSH_MODULE_WD}" fi if use nginx_modules_http_cache_purge; then http_enabled=1 - myconf+=" --add-module=${WORKDIR}/${HTTP_CACHE_PURGE_MODULE_P}" + myconf+=" --add-module=${HTTP_CACHE_PURGE_MODULE_WD}" fi if use nginx_modules_http_upload; then http_enabled=1 - myconf+=" --add-module=${WORKDIR}/${HTTP_UPLOAD_MODULE_P}" + myconf+=" --add-module=${HTTP_UPLOAD_MODULE_WD}" fi if use nginx_modules_http_slowfs_cache; then http_enabled=1 - myconf+=" --add-module=${WORKDIR}/${HTTP_SLOWFS_CACHE_MODULE_P}" + myconf+=" --add-module=${HTTP_SLOWFS_CACHE_MODULE_WD}" fi if use nginx_modules_http_fancyindex; then http_enabled=1 - myconf+=" --add-module=${WORKDIR}/${HTTP_FANCYINDEX_MODULE_PNPN}" + myconf+=" --add-module=${HTTP_FANCYINDEX_MODULE_WD}" + fi + + if use nginx_modules_http_lua; then + http_enabled=1 + myconf+=" --add-module=${DEVEL_KIT_MODULE_WD}" + myconf+=" --add-module=${HTTP_LUA_MODULE_WD}" fi if use http || use http-cache; then @@ -331,27 +372,32 @@ src_install() { if use nginx_modules_http_push; then docinto ${HTTP_PUSH_MODULE_P} - dodoc "${WORKDIR}"/${HTTP_PUSH_MODULE_P}/{changelog.txt,protocol.txt,README} + dodoc "${HTTP_PUSH_MODULE_WD}"/{changelog.txt,protocol.txt,README} fi if use nginx_modules_http_cache_purge; then docinto ${HTTP_CACHE_PURGE_MODULE_P} - dodoc "${WORKDIR}"/${HTTP_CACHE_PURGE_MODULE_P}/{CHANGES,README.md,TODO.md} + dodoc "${HTTP_CACHE_PURGE_MODULE_WD}"/{CHANGES,README.md,TODO.md} fi if use nginx_modules_http_upload; then docinto ${HTTP_UPLOAD_MODULE_P} - dodoc "${WORKDIR}"/${HTTP_UPLOAD_MODULE_P}/{Changelog,README} + dodoc "${HTTP_UPLOAD_MODULE_WD}"/{Changelog,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.md} + dodoc "${HTTP_SLOWFS_CACHE_MODULE_WD}"/{CHANGES,README.md} fi if use nginx_modules_http_fancyindex; then docinto ${HTTP_FANCYINDEX_MODULE_P} - dodoc "${WORKDIR}"/${HTTP_FANCYINDEX_MODULE_PNPN}/README.rst + dodoc "${HTTP_FANCYINDEX_MODULE_WD}"/README.rst + fi + + if use nginx_modules_http_lua; then + docinto ${HTTP_LUA_MODULE_P} + dodoc "${HTTP_LUA_MODULE_WD}"/{Changes,README.markdown} fi }