Version bump for stable nginx branch (bug #472524), also update the following modules to latest: headers_more, fancyindex (fixes bug #478402), auth_pam, upstream_check, naxsi, rtmp. Add new modules: echo (bug #471314), modsecurity (bug #484370). Building metrics requires stub_status (bug #480952). Warn the user to check the ownership on the log directory (bug #473036, may be improved by checking the permissions explicitly).

Package-Manager: portage-2.1.11.63/cvs/Linux x86_64
Manifest-Sign-Key: 0x1E0CA85F!

4 files changed, 639 insertions, 22 deletions

diff --git a/www-servers/nginx/ChangeLog b/www-servers/nginx/ChangeLog
index 0c89f7c0aa16..19a9c270bd5d 100644
--- a/www-servers/nginx/ChangeLog
+++ b/www-servers/nginx/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for www-servers/nginx
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/ChangeLog,v 1.365 2013/09/14 10:02:06 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/ChangeLog,v 1.366 2013/09/27 13:38:50 dev-zero Exp $
+
+*nginx-1.4.2 (27 Sep 2013)
+
+  27 Sep 2013; Tiziano Müller <dev-zero@gentoo.org>
+  +files/modsecurity-2.7.5-include-paths.patch, +nginx-1.4.2.ebuild:
+  Version bump for stable nginx branch (bug #472524), also update the following
+  modules to latest: headers_more, fancyindex (fixes bug #478402), auth_pam,
+  upstream_check, naxsi, rtmp. Add new modules: echo (bug #471314), modsecurity
+  (bug #484370). Building metrics requires stub_status (bug #480952). Warn the
+  user to check the ownership on the log directory (bug #473036, may be improved
+  by checking the permissions explicitly).
 
   14 Sep 2013; Agostino Sarubbo <ago@gentoo.org> nginx-1.4.1-r5.ebuild:
   Stable for x86, wrt bug #476688
diff --git a/www-servers/nginx/Manifest b/www-servers/nginx/Manifest
index 078dc9893d1b..c8881708635a 100644
--- a/www-servers/nginx/Manifest
+++ b/www-servers/nginx/Manifest
@@ -1,49 +1,42 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
-
+AUX modsecurity-2.7.5-include-paths.patch 1018 SHA256 9a5ea83bf75268c432cf950cc557e99095c7ad8ad5e869f9a0c12693c89ccbff SHA512 99e05345425e4713ba46b8fb3c6af9e78bbf2cf048ddc928289a364fc55090232a07943dfaad5b32054df24051d47c9750efadde6cda66123018f9575bc01187 WHIRLPOOL 9e6a21243feb0b378126f76f39d284fc82b270dfe159c4d10ac88677af3e3e5fd15edf2d17ba69a1eb0b6911a83cd83eceb9e8a0fa57d16c10583f8c14402f4f
 AUX nginx-1.4.1-fix-perl-install-path.patch 403 SHA256 0f10cf594208d99942cd07b13799bdd62ad9dc62479b302c0390de381c7fdf28 SHA512 b8f6876831e1149b1421fff4919f8d4893e5fc46aad8a91d4cf2e0b21767b59820b8e227e3b722b80060832844ef191f30aa5dc056daeb49e55a05702d72858f WHIRLPOOL a29dc1b707695ad29b5e967c545b6059120ce9d1a95b828062f6507d8ccd730c95fc82843564baa51d644e138d40fc93b0a84c916a4d77a51c1495625a103809
 AUX nginx.conf 1358 SHA256 6ff6c9301ea2a4d74a335b9119d7f9dba87d4e83793cf22d837d49f061763096 SHA512 1873c9e54ea5020160c86da3f300e3eac589c0d30cdbe3446476b5b3f5bd388da95224cfb1a020b41720c9ce55ab6bb945dcc41612d5850da0e2ae0ceeeaa587 WHIRLPOOL 7672245bd11d6ed987e13d6bfe4dbc2140cc3d2e22616c49ab7ed5f42135c96b5779e4dfd16ba9e2d82aa59d98cd56a4872d18c3774e357ef79385fc874387d2
 AUX nginx.initd-r2 2005 SHA256 9d5fca09d0161446a5cec30a0694cdc0656469403a008920a52a190051218b36 SHA512 871f5e05d3a5e496708b49863917bc8fa163c7ca974261aaacdf2e9c4aa923582889da92bd23e0129915a1467efdd9befc9a6e50f9eb1d173cd1ec05508c6c1b WHIRLPOOL 4468188d830bd2d1587b3ae857640bb07e48e9d5d2b51b3ce1e6a11da62ccf226025c4e8d78e0b69b253aa9c5a663ea02b95980715a32c464fd4c74dd5656b96
 AUX nginx.logrotate 356 SHA256 4d3c038104eaeb4cb012bd8547f9d3eb578df205ccd43884fbf72945accc6bd0 SHA512 c66f8307c24ed98e3135069b3ce6aaf7bbca864747cbf909eae65726ac71fd5f7f56d7ed963a6aedfcdb8a05a91d3988030281f4cad28735de90ae28a85bc245 WHIRLPOOL 95001d0b76a350ce9ce96bfb342a93c8110fbd174484489ac2a64c2f6c496a53d967d303a6cbbefa820ff4e93dcd2d5d968cee5b7d33a83445578b458b5d3c51
 AUX nginx.service 386 SHA256 e4e2bcb41f66f0a7e618f254d47b8fb0f6258efa77a83a1259293e4566f24d87 SHA512 3be27f2520df3633efc78f0b5af0a4d71b7e1f33d71c5e7f87f8dd42ddcb6cd692f51a7133c02a09441be813ac67670c0cd6f0781327d3c65c7bfd57cba59dc7 WHIRLPOOL e63bbcae119a69fa31b1c246baaf4c224608a5d368b0695c7208d42e215b95d56dff4a6fcfa66ea82bb9b1f7b3b26d15c7ba14772eb4620d951c57e869a97a20
 AUX nginx.service-r1 327 SHA256 17c404c5130115e3ebadb09e25cff0103b48ae7dbff2284fa690161fda7888ae SHA512 9b6bcf74df2f74ae6a2c255ebf2d826ea92ed9921b9995da6c9a0c5656e2863a2fe5293ef8a656fbd36298602cc88ffc5d7acfbbf143c23a78c9689d61b05df9 WHIRLPOOL 126c56732b8bd9948595727aa8c056c44df05f4c8e708b00c9de715a7260e4e120fd9e076672312b55c889ff4a3ca100ce696165a4eaf93d89e808e1e28653fa
+DIST modsecurity-apache_2.7.5.tar.gz 1045387 SHA256 9e907536278d8da80d3dbb29aeffe9c4ec37ce9b641035b2da64e993135647a2 SHA512 dd6d4b58c5abb7440d2b9a429a548485b5aebecf1859c93427bdcf30cdbc93c975e455f3f843cf82c4efdf2db06f6a43bf4db2bfdd84adabddeb5dabacedc141 WHIRLPOOL 4d71f3ae86ca1dda9d1547b140decde24ee5116733ecf86a0a95797e3ce9bf1e29cf42116a2a69b332132c3ad749fe5f18566bbe7dc6d60f47b378a0ef6d6cbc
 DIST nginx-1.4.1.tar.gz 767107 SHA256 bca5d1e89751ba29406185e1736c390412603a7e6b604f5b4575281f6565d119 SHA512 174902d24a60b609688600761374e4ba42e0444439ead84c79ff2e82d0233f8759b57a0b76b82a1f571e38ecce0d7059dc2f057672a7004b6f0060968b4b981e WHIRLPOOL d8a95b32fa5af256b5d0f41bdbcbc381d68fc72a4db2dd0cc3dbe1cc298495a08129a279939aad4da0bcfb5867c5538551e5f6e8332c0bc328d17f490f5e7525
+DIST nginx-1.4.2.tar.gz 767688 SHA256 5361ffb7b0ebf8b1a04369bc3d1295eaed091680c1c58115f88d56c8e51f3611 SHA512 987acd1f2f20a6e231e73f07fc77bef57c332c09c3b06ca125ad385835eb9e1fc9adca6962456d02edb976207140974d3695bcb96bf65d3a6d54c5c3db856115 WHIRLPOOL 14edc46517feda996a47d5e94700249fae25c380315e1ca5d5470fdfb42b237817f01aee47f032c4ccab6da40ce21d32cf244554df1308902522a3cc4d4cb79c
 DIST ngx_dav_ext-0.0.2.tar.gz 6056 SHA256 603d961c15ba2633ee5ae1f13b80a5455dceee61071d1dab7d2ea91a0981585c SHA512 78178ed0cc8eeb257fd9ef104e99dfb825143acb7becd762f88b2398bab2457c2ea6484be789d4b0e30b72f7661e7490da19495654204248f457666a951e7e41 WHIRLPOOL 6a7182d6dd7296315bf4c02da78f5dfb0e96deee5a686045679ebfdfe3430a26ea110a0a0804dff21024ec57b0ef70b98b8ac13c5ddd9b0b6e72fc6ec56ef83b
 DIST ngx_devel_kit-0.2.18-r1.tar.gz 64972 SHA256 c9c9f0a1b068d38c6c45b15d9605f1b2344dbcd45abf0764cd8e2ba92d6a3d2c SHA512 949a4c090272d8a112770dd47fb0dd55b1ebc9991f93b5ffe18ffa03f24fecba9a2e80bd32b8d2103ee4d26cf95a8ba68793a3bd2d33e8dc3c12b6dc9bf781ff WHIRLPOOL 80fe1c70c7c836afe2a52faaa58f72588ad2e6c79c1454d8808774fe3a2bfed71481aaa1c7255a467c8e6cd77243af232538fff26453ee761778f3162983bff1
 DIST ngx_http_auth_pam-1.2.tar.gz 5424 SHA256 5a85970ba61a99f55a26d2536a11d512b39bbd622f5737d25a9a8c10db81efa9 SHA512 ea731386e73206a9b0ded4bfbf32eb4adff90932ddf2afff1ebe0c94152691730093b6a03ee4cbbab78e4ef14b67f092402c29f531348a01a0cb0fd40e89fcc3 WHIRLPOOL 825fe84549eaae3b5d8ee601c24b788e857764c635264d62414f51fe21b3a35ef1ad7dd5797d7fc56ee4bef320a36017207d11cbab78fe91812905d8d66e13c5
+DIST ngx_http_auth_pam-1.3.tar.gz 6363 SHA256 199dff5d11fbb3b6ddf9c8a60cc141970125a3f8e7a06f245e3175e93ca947e3 SHA512 3c86f709397dfd3edbd98f729193cb7b61895777d02244f1cf255ba5e4cd8e7bcb5bf537bf3d1086a513e46f117fdcb7610d7085dead35f5d36f74b5b3864ef8 WHIRLPOOL fc5b42a6a1143e9d3845e1470caa7bd60cf8e5a01e0dd53925fbf76cba072add024d24e4f926d3d0b3e27eccf5faa839b05f2549144beac6ffc43614b7ca5b19
 DIST ngx_http_cache_purge-2.1.tar.gz 10535 SHA256 424005af0c04e59ffa65a65e446081d4f95ee76a801a7555e001c67810bcb3b9 SHA512 1b70b2c35601949edd53d55922e81425aef0b2c486b071c2bcf53db7c5278e55966ffd2c9e32f599ee63e147a395e708d442515fe414f39b323d26722324db8b WHIRLPOOL f020841139988ae516969ffcd5bf7b2c264749fef5c20a5c8f0cca70f5eddcd3efcb3676bbe9a4550535de7b53fcd7326294fcae2a14dc6bf66d1ab77205b83f
+DIST ngx_http_dav_ext-0.0.2.tar.gz 6056 SHA256 603d961c15ba2633ee5ae1f13b80a5455dceee61071d1dab7d2ea91a0981585c SHA512 78178ed0cc8eeb257fd9ef104e99dfb825143acb7becd762f88b2398bab2457c2ea6484be789d4b0e30b72f7661e7490da19495654204248f457666a951e7e41 WHIRLPOOL 6a7182d6dd7296315bf4c02da78f5dfb0e96deee5a686045679ebfdfe3430a26ea110a0a0804dff21024ec57b0ef70b98b8ac13c5ddd9b0b6e72fc6ec56ef83b
+DIST ngx_http_echo-0.48.tar.gz 74860 SHA256 c4b9eeec554f472632054243587ae89bfa79938a346c72cfe223429693354902 SHA512 d8be09d14f0849e569d2d3784de743beee3c7de2409f66a98d2f175e90f69b918221fbf888c0263aca83562b2cda9b6998adb571935be49009bb2a1e018fae43 WHIRLPOOL a1939283a0f626db44a682885f8c7b3269e585e08691a91f8b72d249095b5423cc61085f92ae78b3423a387ac02f5468f35551e1935862d4167f0d2f39153384
 DIST ngx_http_fancyindex-0.3.1.1.tar.gz 13146 SHA256 227896f7d69866f7432c1b19a03dd47ae3463fc4afda117951da7a497a97cfd0 SHA512 25bf420964bf9489face93ac415d531e0b52f281b8f993b85eca75b159099f269af183a63b895ea0ba855bb08f23d4b5e5dd6aefd96b63b4e7e478bba0d2e145 WHIRLPOOL 971c9e9899ac4552c0d7ef0068f740fec431e89be3b666a4e01db882dc36b6d55ee2eb3459c9e8e5173bc303bc24c4ec99569949bde557506f2b63959959568d
+DIST ngx_http_fancyindex-0.3.2.tar.gz 13302 SHA256 c96d782bc77f5ba215abb486220f68cb5aa7451646fcc2d608adda655b21653a SHA512 a372ea6f4208c7b49c3f81f41e9a34bf574d7e7bd6c1452ae2f050c85fdd0d2892f8e41a51bb83947e516641d6ef8fedb554a7e2b60af0a40908dd57f0c9bb3b WHIRLPOOL 3db4decf29bc456b572bcd06782f7b3a20504680598a60f94b54d1db5449942784f027f7d4c7881ac7840cba2ca1799f1355eb8483dc9d19ea1e16e0818ffaec
 DIST ngx_http_fancyindex-fd3950172a9e6595ad9ec68c11600e2afe6a2674.tar.gz 13176 SHA256 d7e836b9dd1004ed265862dacc399ba14276d9050569119129e8088affc4cd0f SHA512 aaf71748409f25f6b5ca0244ec8c0a87cd494d376335b1b1a16d5012e98ef32e987cffb1ef89c70321dba69653a0e3c489c4575badb147a600efd7235eea630a WHIRLPOOL 867c60be5dad60c1e78d6b185181ddb778043c770b52740658483a886612a709b6ad43467577d368ccdb182fccd74f25577c54035735d7b2778b45911b1bf3fb
 DIST ngx_http_headers_more-0.20-r1.tar.gz 26769 SHA256 0e7c5e9dc9daade8b508a9f0cd0cd887329d1ae19d80294bc588939afed9e9d9 SHA512 c31be114943f5831ad9cbac8ac0c9c1995c513205e7d3d87761788e7fdd9ea7d60992dbd51cccf26777e96658091ef091e98c2e384b1041f9bce0dacdfa81c3e WHIRLPOOL 94ae99aa9c682c6406db39f4552fd6e33c735644c930f30617b6b32efd116962b630fb1a36ff37671d1c5c8de480045e426e3779e6b9c5991cbd7d93568d6d2d
+DIST ngx_http_headers_more-0.22-r1.tar.gz 27214 SHA256 b8b70cbca5144f2c2999d12b332917131af6e7b91bc618c67a744f2e899fdf85 SHA512 69fcd232f50fe453cee76a4b0b016f22b32daae08296daa8f301b0dc9d8da9d567cf2d7545fa3d2a9dff397aabf9b7687eaa7a9cf851111ba7389f889566a324 WHIRLPOOL 1b04db389bbc79cd43adbfb6e66ca9a5f8cbc7c9801f74b960267ef15f0f334507bf1d2aaf0de12d82793ef0643fbfd0825979c9b9d36a3edf3cb056f633bbb3
 DIST ngx_http_lua-0.8.1.tar.gz 478976 SHA256 1b4fbdcf55765fa7214d00d3d70f9c02d6922970b005649622612476e65e994f SHA512 a0eb7f839bc332ff658fd2885072591c0719bba93e7490420821daee23b6b6d26b6395222635c0841d3a322a9b77aa76411a52f137b7da356c90ed64b8f9602a WHIRLPOOL 3d5262fd97fef6d2e6ad090c9c105ac5a9659fd58eed16a2a555273dbce66d67dd0143531571897e013d45a595a3cc806bcaf7a445f56ad42f0cde8f82e8b01b
+DIST ngx_http_lua-0.8.10.tar.gz 492045 SHA256 384d1ab4b10caea10b1123ae6a8015cb9927828f6b9f91db32d8eb8784dd4f9e SHA512 a70fd6ffb954815df09b1356dd91f1da9f60b3549a31932e8971b23df5e4d8ff2fda256216576822be5d547beb65ca0cad7e1d1b622c69012ca77f4e707f9d05 WHIRLPOOL 561a6be7fc5372b54b4c07aa60b7ce6469175b2af59cc315e768b3aa7d8c4d30e0f84ce82dd2d635b85bc61ec8a1c07e3b96c6bbdebd1e316df55e32436f63b0
 DIST ngx_http_naxsi-0.50.tar.gz 49809 SHA256 7cece5f9d9c5df9e09af1e1023bc8e04bbbbe953e67461b893b8240e82ca52ef SHA512 cc641683211ba379b7e4d02417b9b78cc3c25b80ec2eb072b90b1515e08a40ada9ce320f618db6e60bf0eb3ae27961a1c5ad90c735cc21244bd54c1ddb50e74e WHIRLPOOL a000dc2b7b628e685885463823e202cfbaaaffe62daaa50c93a65b79560718600cf9319ccf0ea861a1207c660415818f7085e090dcea49308cadbe4379b476fe
+DIST ngx_http_naxsi-0.52-1.tar.gz 162044 SHA256 0f23b0f17f03591775e95294a115d609ad47e2874e5f01c4fed1ebb680ea07bc SHA512 e1d3b4b3284d5b3f44ec5888023e6853c06519f99f3de768d8420d50a8bd50ae4d77c2413e441caa5dedc420f28ab3413d79fe56fc9aee8636a9b20adea7be74 WHIRLPOOL b42c4dc99c2a0b670b4e06ee9b5a0eb1b38b96f670c04c56fa30f13b8d3263836b54ff641dc1effd0e461f0fb3e0b935f945c2467b27c83f80b8407a3b42f739
 DIST ngx_http_push-0.692.tar.gz 29119 SHA256 64868708071aa21dbc4c7a07d149dd6ec9108fb7eaf2aad5ad069406151f17fe SHA512 79821cacf5db4b1309e3f1c8d6980f83b1093dd3f291db5298bfdeb0d889fc0629625dcf3135d1cf7554b43308ef7172a4f40596928ab3069426801177ed3c1c WHIRLPOOL f1c846a4aa2d4491ee3063266d27b9854d860bbba44ef6e2ea33ebe1f570177e836c593a84cc2c7e22357bd43411f9d5b55852ee96a98dccdc18e7edf6768c95
 DIST ngx_http_slowfs_cache-1.10.tar.gz 11809 SHA256 1e81453942e5b0877de1f1f06c56ae82918ea9818255cb935bcb673c95a758a1 SHA512 fbc9609a8d6913aeefe535f206b9e53477503f131934ead2ae5a6169e395af2f5fb54778704824d5eeb22a4ef40a11ebbcde580db62a631f70edcc2cfc06b15d WHIRLPOOL a02ed77422c47d9e476f8746186d19d632ddb953635d8d9dd51ff076225a78044286ee7e114478bc02e4b2a422e4fdc207154fc287629dd2cd7c3f9a634dad18
 DIST ngx_http_upload_progress-0.9.0-r1.tar.gz 16990 SHA256 93e29b9b437a2e34713de54c2861ea51151624aca09f73f9f44d1caaff01a6b1 SHA512 a602b797f1a928c72752edf44629e48d5b8ab3c979ea0996645a978ba898b2a11c8b12bf09bd2282c4b1503bb8caaba4e4fbf357d644fbc5744c9e7264d07519 WHIRLPOOL 6b3f9feb1a7d2a4bd2f80dd20748ee5918e187e7b026c53ed9bc189696b90521bb5beabce9e00936c5bbf625cc73ccf131d8a9c219d4f399d8ae2c44ba378ebc
+DIST ngx_http_upstream_check-0.1.9.tar.gz 116307 SHA256 b3bb240fb236ba9ae3e807de0f69aa0804d100496c1063a523b29a184e438562 SHA512 b50c15aa311e38101d9b4f6178684a43abcfa66d0483dbf62b3dc5b595d85f59b52a4f564a5f35c54966042074598fef0fc59635ea38c064ec0e8921d9c3229d WHIRLPOOL f878e4833d445a75076455aba34f85a23c0377d922d9ff3d542f887379730e127e969fe3108cd476279d7ff1aa396f686e9e7b8594fb38eb2ea36d3d928602e6
 DIST ngx_http_upstream_check-99f39394f387211641a1668d61faf2d5186ea1f5.tar.gz 116341 SHA256 dd67680ed563fa6fedae09be2938c64521c8ad4f5480dc965f7daeb93d202df8 SHA512 24549b2713c578b354b3a34bfeee29fa26ac764800e5a8cb8f711f2663c17eee9a95b0dbd53bb57a847b79e3c81e0c5d862f99f459aa12a9f86f51fcdc2e01a1 WHIRLPOOL 0f31dc0866c50b1886f4e7b9eb6ff6466aa1f849598bef018a418daebfcdbdbf3fe0fa18fc9fdd26b58b0bc071a6dbadf2a96ab737ace2ad5025171d09949b49
 DIST ngx_metrics-0.1.1.tar.gz 2964 SHA256 1c62ebb31e3caafad91720962770b0e7a4287f195520cf12471c262ac19b154e SHA512 d36a8fb0104c83b6b564e03b351aa750cab08650264c74d6f786af357bfb7006b531a93270dd961896ea8dafe27e5db8548ede714c5f52c4742876bc73af4b5e WHIRLPOOL 2796f5a97e76dfcc91133240e8e90ba493f0356f781a173d8cacdd09eba64b75ef531db398c0566fda395124700de8c991b771433e376ca0d5898c2ea6f82868
 DIST ngx_rtmp-0.9.20.tar.gz 444918 SHA256 9276662146463c860b8ba84d1356d41e155f49ad13bf97ddcc076c5746a8867c SHA512 78b1e4a296bc455d41acc9c89a49ac7f56a896a068e58f0774b66b78a90a832a84c30c96a2bf6cd2d65573915ededc204f76bc58d590e3834e5c7ae1488db8e7 WHIRLPOOL 26b4d332f44f0e13a3b7fe921c817a73afbc12bea519a3ca8488789f334883dd1aba4ee7968099ea05cfae42c10de95397afe79eb8f844daa611ee748e5c43a1
+DIST ngx_rtmp-1.0.4.tar.gz 450035 SHA256 156ff2f7e893e226debcb2a2d4b512d352999dad3681628400a8a5af793980a6 SHA512 a46a3229251df041ce4f1dc2df42d932a2881ae145c0ae84167c18b29e36b5c58891a32e8717af9f3b09cf6e553f8b28f50f7f94e532cefed2fb14348a6001ff WHIRLPOOL 7dc74931689319318d6c6be29c5edae828955f87dbf107cc50ecd64896ed02102d310907e54f1e9f3e396f18d2d3333e8dbccce4f89d7ddc25ff36e16034179a
 DIST ngx_syslog-0.25.tar.gz 91070 SHA256 8bafa901d2f9af0b54f1a014fdfaa07140bd4584cfada3189eddd2a7ff5b0195 SHA512 c869dc5c26484477cd9663bc860235a39813a41ac8be4b8f8f3c062c723aa431247d3b5915c962c7fcff36889d5541e8c844eaf6ece88c2c61d2f180f643f8b5 WHIRLPOOL 1829f60f9ab26c131d8fce56b2ff15276a2e99e2f6f96749ebf417e6e3d438249c79de8e6210d702acac8a1309fca417b12894428b53f280c76564a6839b4a2d
 EBUILD nginx-1.4.1-r2.ebuild 17555 SHA256 b0e6a0052c92c202df3dc400ef68c39b82cc48c8ba7732ad7a33e3a74eba5772 SHA512 761e8b254bf02a2c2b576feceb7c9b17245c2524ccfed28fb47a2654ad0a3cb776596d60195f0ed67f130eac78970bfd8d48b916f1cc1832a077fcf205fb36f3 WHIRLPOOL b0c90cfdbf874b000adf461a0c001407aa80c80df550608753fb2cb6f6cc892d70ac146fab9113f97e78b83d31b95737a0103049a5e8ab8a660965e519acabca
 EBUILD nginx-1.4.1-r3.ebuild 17580 SHA256 f2818021b5d3a94c1948bdcc3d4e42f6a0fb80a03a8901bb7fde5b02cbccc42e SHA512 87a48adc77784b4c18d037eca5e8f4fb6f1d77d77048b764fa3ba6764172b5f76f805838c7ade71b40f74a46f614e5d13b8be17f6526164cf8c9f046d7563730 WHIRLPOOL 4553a937b6029ae516d39db0b2b6c9ad4d9791b8fd6310799c32c61ec1bc4f99d8e4503b0fa30bc30e3362809577e710df2903a8a76fd360075dd49e981e25fb
 EBUILD nginx-1.4.1-r4.ebuild 18418 SHA256 efbc3c0b0a1d1875aae4b77f72fd6b72f1c370a0c306aec0c4b72526b9c451b9 SHA512 763c2c7b4e683234a119065167a4d0feb00e0d4128b02192eafedf397461acc47d3bbed9cc99f9dcec9e4ebf5f2ff71799127540c3e07cb8e04dba885eeb6d7e WHIRLPOOL 397a3d6628939f2a3ef595f613bedac48690e66c4127fa09a54e5c2e2e2480fd8943ff3fd808f7c7a8af5da9ec417cf8b91ab749595225e520d12726f3e0cebf
 EBUILD nginx-1.4.1-r5.ebuild 20048 SHA256 4ae5b33bc615956efd9eaec58f90a2f871af54c6151c58af399997168cac44d3 SHA512 81cafa0225997a63410df9a2dbc32245e381c4003eaa4d7cf68bf70e8514c357db7bb5d265810a0c826b388e3fbcfc1e4e89858819559567bc6fca2f6fd4165d WHIRLPOOL c1ada9b5ede6c527eb134b3eeeb4e9aeba45a7aa27a7077e47974519bfa7f6f6fead951438b00497ddadbab9aed2a8175924b74922959eaf55987d45c493e62e
-MISC ChangeLog 60165 SHA256 ff7766ee3d086fdeafdc5c00010980ac0fcc215ef1760b86f92d046b18487a77 SHA512 3d381805555eeb62d78e6837ed2653e0ed1c8a7a2aa7c0bba0d98293187e9c119d9f8552e4d3f6868b2facba167f1899416f0fbb1018f230426f5b4210916476 WHIRLPOOL 81d71100d7e27ccb69789ad9e29e89c4e608f2f8fb8e92fb9c54754dc90008a5dd3e9a2812d35958266f83f05f7cf219095e1d9a8b6fe94ff1fca580d430cf55
+EBUILD nginx-1.4.2.ebuild 22236 SHA256 106ffdaf7d51e7fc7d49e3e5e0ebf25f81494b25a73106fa89bc5a87a9b312e3 SHA512 ccfbb1c51a54baf1ec57a006413bc1dde4e2e31f2940ed9ce2ae0df3433eb2058f991e46eee5a81a18c4fdd364f4b37c3c172baef05e89842b891d72205af5f6 WHIRLPOOL d53bdea57bd7a3f4d287a14d1ed2fcf2cd8f8306ff1df74a53b8f9f47a2cf9cf65b54f456c0154334155fc6398b6f4db1e270168652cd05c3292a311b7924f17
+MISC ChangeLog 60761 SHA256 4b2e894e98baab727da56eb02836dd19358c77780736962db3147c0c37d8357d SHA512 803bf14ea7bcc551fd9ebeb9fd6f5a599d3c2b0edbc510a4069a2888133a8484441cf80b0ae5cf04dc40e299a3edb11586b735ff6210966d37dad30e9f7ca55f WHIRLPOOL 118ed1b716cfd4ab27c119bbdf67a7c902bb4ab4e2360e93068b548a11b180e0d184fae33287d264dd3bd1369cbc4795cd15ba77179dc5d8ef17ddabe5915b7f
 MISC metadata.xml 795 SHA256 d37f5b7696235a7a9d9c313382869061f72f879ad8442de200f1b07269b431dd SHA512 9f1ed0db27552cd59309d7ad87ff2b38a90a7619e0a1ffa0dbefac7f0aa356cd3852fc99e1a7cf8eddf21eeeea80b6c6236819e9ce5bfb81e439f54f85be3c0a WHIRLPOOL 5831c3119637647bcb615d870a31066a12e3c8a5a773681afe9ef3a30c2765e7550724c660bec99543e1a8c8a11252d71ce0bd39c67bdc47b72f7ce98a56666b
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
-
-iQIcBAEBCgAGBQJSNDQYAAoJELp701BxlEWfA0UP/RMhgGQKGY8JCz5lH93bCapY
-ELIGuQpc2uSI8y7AHltTV+k+VLXaUuLI3nk2LJCy0uIgPxxb8csxztnhIjEfzOqU
-EV4kM3JLz0gN7JwQBZZOHZKuslApGT2VjxTr9KFP72VGZzyClg4kiK+dXIkC8fju
-kVaBAbYeTXHi5lc09d0rYd30ShlKbGtQIeWmf2n4ArqLaEUq5ElXyznwT+/SyDOT
-tGtgMVR2ZRDj5aFCnFGYzFz03ssgq4BsNivjZX4F/CMzvOqh9VIRiuyG/Rc/3qdG
-qM/fGHaFxiJUtU01QdmZ7Jn3gV6P/suhVHQlXaXaOqQQ0YT72M3uNInTZNGs4Jjq
-XJ16/9Ib9nqn9KCgYJ1VArIa6ejahQyf8vZXLcAOlTRLKMc8+nl3DEW1xXJSmd/w
-lNOZGVfbJg0tEG3n9zKJmHKmaM/ymE7yLrAbAU70b8K33m3I1ROn6H0WdLHHhtar
-i0A5R+EvIjmPJXAUFSZe9M0QFJoAyxCI/uCAY05GapvUIT1zqTDW4SiF1N1tyJnl
-32Y/0fkZLN0UjX/Ugr0Z3FxXh41Eh9uUwmfa7RgjCncw6mRzkvh3OHvwzCTMik51
-bP15klsl797ByhVLXYmi8GiBAwc1Yrtz027oJViO8lkOt8BvkLeoxp/Cw2qAFACq
-XMoH8Cpn1GBtMf7R9jRm
-=JSz+
------END PGP SIGNATURE-----
diff --git a/www-servers/nginx/files/modsecurity-2.7.5-include-paths.patch b/www-servers/nginx/files/modsecurity-2.7.5-include-paths.patch
new file mode 100644
index 000000000000..cb9bd796431d
--- /dev/null
+++ b/www-servers/nginx/files/modsecurity-2.7.5-include-paths.patch
@@ -0,0 +1,9 @@
+diff -rupN modsecurity/config modsecurity-patched/config
+--- modsecurity/config	2013-07-26 13:05:25.000000000 +0300
++++ modsecurity-patched/config	2013-09-09 15:55:23.290192067 +0300
+@@ -4,4 +4,4 @@ HTTP_AUX_FILTER_MODULES="ngx_http_modsec
+ NGX_ADDON_SRCS="$NGX_ADDON_SRCS $ngx_addon_dir/ngx_http_modsecurity.c $ngx_addon_dir/apr_bucket_nginx.c $ngx_addon_dir/ngx_pool_context.c"
+ NGX_ADDON_DEPS="$NGX_ADDON_DEPS $ngx_addon_dir/apr_bucket_nginx.h $ngx_addon_dir/ngx_pool_context.h"
+ CORE_LIBS="$CORE_LIBS $ngx_addon_dir/../../standalone/.libs/standalone.a -L/usr/local/apr/lib -lapr-1  -L/usr/local/apr/lib -laprutil-1 -lpcre -lxml2 -lz -lm -ldl  "
+-CORE_INCS="$CORE_INCS $ngx_addon_dir $ngx_addon_dir/../../standalone $ngx_addon_dir/../../apache2 /usr/include/libxml2  /usr/local/apache2/include /usr/local/apr/include/apr-1 /usr/local/apr/include/apr-1"
++CORE_INCS="$CORE_INCS $ngx_addon_dir $ngx_addon_dir/../../standalone $ngx_addon_dir/../../apache2 /usr/include/libxml2  /usr/include/apache2 /usr/include/apr-1"
diff --git a/www-servers/nginx/nginx-1.4.2.ebuild b/www-servers/nginx/nginx-1.4.2.ebuild
new file mode 100644
index 000000000000..5f60096a8cc6
--- /dev/null
+++ b/www-servers/nginx/nginx-1.4.2.ebuild
@@ -0,0 +1,604 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/nginx-1.4.2.ebuild,v 1.1 2013/09/27 13:38:50 dev-zero Exp $
+
+EAPI="5"
+
+# 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 requirements in mind before adding external modules:
+#   * alive upstream
+#   * sane packaging
+#   * builds cleanly
+#   * does not need a patch for nginx core
+# - TODO: test the google-perftools module (included in vanilla tarball)
+
+# prevent perl-module from adding automagic perl DEPENDs
+GENTOO_DEPEND_ON_PERL="no"
+
+# syslog
+SYSLOG_MODULE_PV="0.25"
+SYSLOG_MODULE_NGINX_PV="1.3.14"
+SYSLOG_MODULE_P="ngx_syslog-${SYSLOG_MODULE_PV}"
+SYSLOG_MODULE_URI="https://github.com/yaoweibin/nginx_syslog_patch/archive/v${SYSLOG_MODULE_PV}.tar.gz"
+SYSLOG_MODULE_WD="${WORKDIR}/nginx_syslog_patch-${SYSLOG_MODULE_PV}"
+
+# devel_kit (https://github.com/simpl/ngx_devel_kit, BSD license)
+DEVEL_KIT_MODULE_PV="0.2.18"
+DEVEL_KIT_MODULE_P="ngx_devel_kit-${DEVEL_KIT_MODULE_PV}-r1"
+DEVEL_KIT_MODULE_URI="https://github.com/simpl/ngx_devel_kit/archive/v${DEVEL_KIT_MODULE_PV}.tar.gz"
+DEVEL_KIT_MODULE_WD="${WORKDIR}/ngx_devel_kit-${DEVEL_KIT_MODULE_PV}"
+
+# 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_http_upload_progress-${HTTP_UPLOAD_PROGRESS_MODULE_PV}-r1"
+HTTP_UPLOAD_PROGRESS_MODULE_URI="https://github.com/masterzen/nginx-upload-progress-module/archive/v${HTTP_UPLOAD_PROGRESS_MODULE_PV}.tar.gz"
+HTTP_UPLOAD_PROGRESS_MODULE_WD="${WORKDIR}/nginx-upload-progress-module-${HTTP_UPLOAD_PROGRESS_MODULE_PV}"
+
+# http_headers_more (http://github.com/agentzh/headers-more-nginx-module, BSD license)
+HTTP_HEADERS_MORE_MODULE_PV="0.22"
+HTTP_HEADERS_MORE_MODULE_P="ngx_http_headers_more-${HTTP_HEADERS_MORE_MODULE_PV}-r1"
+HTTP_HEADERS_MORE_MODULE_URI="https://github.com/agentzh/headers-more-nginx-module/archive/v${HTTP_HEADERS_MORE_MODULE_PV}.tar.gz"
+HTTP_HEADERS_MORE_MODULE_WD="${WORKDIR}/headers-more-nginx-module-${HTTP_HEADERS_MORE_MODULE_PV}"
+
+# http_push (http://pushmodule.slact.net/, MIT license)
+HTTP_PUSH_MODULE_PV="0.692"
+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="2.1"
+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_slowfs_cache (http://labs.frickle.com/nginx_ngx_slowfs_cache/, BSD-2 license)
+HTTP_SLOWFS_CACHE_MODULE_PV="1.10"
+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 (http://wiki.nginx.org/NgxFancyIndex, BSD license)
+HTTP_FANCYINDEX_MODULE_PV="0.3.2"
+HTTP_FANCYINDEX_MODULE_P="ngx_http_fancyindex-${HTTP_FANCYINDEX_MODULE_PV}"
+HTTP_FANCYINDEX_MODULE_URI="https://github.com/aperezdc/ngx-fancyindex/archive/v${HTTP_FANCYINDEX_MODULE_PV}.tar.gz"
+HTTP_FANCYINDEX_MODULE_WD="${WORKDIR}/ngx-fancyindex-${HTTP_FANCYINDEX_MODULE_PV}"
+
+# http_lua (https://github.com/chaoslawful/lua-nginx-module, BSD license)
+HTTP_LUA_MODULE_PV="0.8.10"
+HTTP_LUA_MODULE_P="ngx_http_lua-${HTTP_LUA_MODULE_PV}"
+HTTP_LUA_MODULE_URI="https://github.com/chaoslawful/lua-nginx-module/archive/v${HTTP_LUA_MODULE_PV}.tar.gz"
+HTTP_LUA_MODULE_WD="${WORKDIR}/lua-nginx-module-${HTTP_LUA_MODULE_PV}"
+
+# http_auth_pam (http://web.iti.upv.es/~sto/nginx/, BSD-2 license)
+HTTP_AUTH_PAM_MODULE_PV="1.3"
+HTTP_AUTH_PAM_MODULE_P="ngx_http_auth_pam-${HTTP_AUTH_PAM_MODULE_PV}"
+HTTP_AUTH_PAM_MODULE_URI="http://web.iti.upv.es/~sto/nginx/ngx_http_auth_pam_module-${HTTP_AUTH_PAM_MODULE_PV}.tgz"
+HTTP_AUTH_PAM_MODULE_WD="${WORKDIR}/ngx_http_auth_pam_module-${HTTP_AUTH_PAM_MODULE_PV}"
+
+# http_upstream_check (https://github.com/yaoweibin/nginx_upstream_check_module, BSD license)
+HTTP_UPSTREAM_CHECK_MODULE_PV="0.1.9"
+HTTP_UPSTREAM_CHECK_MODULE_P="ngx_http_upstream_check-${HTTP_UPSTREAM_CHECK_MODULE_PV}"
+HTTP_UPSTREAM_CHECK_MODULE_URI="https://github.com/yaoweibin/nginx_upstream_check_module/archive/v${HTTP_UPSTREAM_CHECK_MODULE_PV}.tar.gz"
+HTTP_UPSTREAM_CHECK_MODULE_WD="${WORKDIR}/nginx_upstream_check_module-${HTTP_UPSTREAM_CHECK_MODULE_PV}"
+
+# http_metrics (https://github.com/madvertise/ngx_metrics, BSD license)
+HTTP_METRICS_MODULE_PV="0.1.1"
+HTTP_METRICS_MODULE_P="ngx_metrics-${HTTP_METRICS_MODULE_PV}"
+HTTP_METRICS_MODULE_URI="https://github.com/madvertise/ngx_metrics/archive/v${HTTP_METRICS_MODULE_PV}.tar.gz"
+HTTP_METRICS_MODULE_WD="${WORKDIR}/ngx_metrics-${HTTP_METRICS_MODULE_PV}"
+
+# naxsi-core (https://github.com/nbs-system/naxsi, GPLv2+)
+HTTP_NAXSI_MODULE_PV="0.52-1"
+HTTP_NAXSI_MODULE_P="ngx_http_naxsi-${HTTP_NAXSI_MODULE_PV}"
+HTTP_NAXSI_MODULE_URI="https://github.com/nbs-system/naxsi/archive/${HTTP_NAXSI_MODULE_PV}.tar.gz"
+HTTP_NAXSI_MODULE_WD="${WORKDIR}/naxsi-${HTTP_NAXSI_MODULE_PV}/naxsi_src"
+
+# nginx-rtmp-module (http://github.com/arut/nginx-rtmp-module, BSD license)
+RTMP_MODULE_PV="1.0.4"
+RTMP_MODULE_P="ngx_rtmp-${RTMP_MODULE_PV}"
+RTMP_MODULE_URI="http://github.com/arut/nginx-rtmp-module/archive/v${RTMP_MODULE_PV}.tar.gz"
+RTMP_MODULE_WD="${WORKDIR}/nginx-rtmp-module-${RTMP_MODULE_PV}"
+
+# nginx-dav-ext-module (http://github.com/arut/nginx-dav-ext-module, BSD license)
+HTTP_DAV_EXT_MODULE_PV="0.0.2"
+HTTP_DAV_EXT_MODULE_P="ngx_http_dav_ext-${HTTP_DAV_EXT_MODULE_PV}"
+HTTP_DAV_EXT_MODULE_URI="http://github.com/arut/nginx-dav-ext-module/archive/v${HTTP_DAV_EXT_MODULE_PV}.tar.gz"
+HTTP_DAV_EXT_MODULE_WD="${WORKDIR}/nginx-dav-ext-module-${HTTP_DAV_EXT_MODULE_PV}"
+
+# echo-nginx-module (https://github.com/agentzh/echo-nginx-module, BSD license)
+HTTP_ECHO_MODULE_PV="0.48"
+HTTP_ECHO_MODULE_P="ngx_http_echo-${HTTP_ECHO_MODULE_PV}"
+HTTP_ECHO_MODULE_URI="https://github.com/agentzh/echo-nginx-module/archive/v${HTTP_ECHO_MODULE_PV}.tar.gz"
+HTTP_ECHO_MODULE_WD="${WORKDIR}/echo-nginx-module-${HTTP_ECHO_MODULE_PV}"
+
+# mod_security for nginx, keep the MODULE_P here consistent with upstream to
+# avoid tarball duplication
+HTTP_SECURITY_MODULE_PV="2.7.5"
+HTTP_SECURITY_MODULE_P="modsecurity-apache_${HTTP_SECURITY_MODULE_PV}"
+HTTP_SECURITY_MODULE_URI="https://www.modsecurity.org/tarball/${HTTP_SECURITY_MODULE_PV}/${HTTP_SECURITY_MODULE_P}.tar.gz"
+HTTP_SECURITY_MODULE_WD="${WORKDIR}/${HTTP_SECURITY_MODULE_P}"
+
+inherit eutils ssl-cert toolchain-funcs perl-module flag-o-matic user systemd versionator
+
+DESCRIPTION="Robust, small and high performance http and reverse proxy server"
+HOMEPAGE="http://nginx.org"
+SRC_URI="http://nginx.org/download/${P}.tar.gz
+	syslog? ( ${SYSLOG_MODULE_URI} -> ${SYSLOG_MODULE_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} -> ${HTTP_PUSH_MODULE_P}.tar.gz )
+	nginx_modules_http_cache_purge? ( ${HTTP_CACHE_PURGE_MODULE_URI} -> ${HTTP_CACHE_PURGE_MODULE_P}.tar.gz )
+	nginx_modules_http_slowfs_cache? ( ${HTTP_SLOWFS_CACHE_MODULE_URI} -> ${HTTP_SLOWFS_CACHE_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 )
+	nginx_modules_http_auth_pam? ( ${HTTP_AUTH_PAM_MODULE_URI} -> ${HTTP_AUTH_PAM_MODULE_P}.tar.gz )
+	nginx_modules_http_upstream_check? ( ${HTTP_UPSTREAM_CHECK_MODULE_URI} -> ${HTTP_UPSTREAM_CHECK_MODULE_P}.tar.gz )
+	nginx_modules_http_metrics? ( ${HTTP_METRICS_MODULE_URI} -> ${HTTP_METRICS_MODULE_P}.tar.gz )
+	nginx_modules_http_naxsi? ( ${HTTP_NAXSI_MODULE_URI} -> ${HTTP_NAXSI_MODULE_P}.tar.gz )
+	rtmp? ( ${RTMP_MODULE_URI} -> ${RTMP_MODULE_P}.tar.gz )
+	nginx_modules_http_dav_ext? ( ${HTTP_DAV_EXT_MODULE_URI} -> ${HTTP_DAV_EXT_MODULE_P}.tar.gz )
+	nginx_modules_http_echo? ( ${HTTP_ECHO_MODULE_URI} -> ${HTTP_ECHO_MODULE_P}.tar.gz )
+	nginx_modules_http_security? ( ${HTTP_SECURITY_MODULE_URI} -> ${HTTP_SECURITY_MODULE_P}.tar.gz )"
+
+LICENSE="BSD-2 BSD SSLeay MIT GPL-2 GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+
+NGINX_MODULES_STD="access auth_basic autoindex browser charset empty_gif fastcgi
+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 gunzip gzip_static image_filter
+mp4 perl random_index realip secure_link spdy stub_status sub xslt"
+NGINX_MODULES_MAIL="imap pop3 smtp"
+NGINX_MODULES_3RD="
+	http_upload_progress
+	http_headers_more
+	http_push
+	http_cache_purge
+	http_slowfs_cache
+	http_fancyindex
+	http_lua
+	http_auth_pam
+	http_upstream_check
+	http_metrics
+	http_naxsi
+	http_dav_ext
+	http_echo
+	http_security"
+
+IUSE="aio debug +http +http-cache ipv6 libatomic +pcre pcre-jit rtmp selinux ssl
+syslog userland_GNU 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 )
+	pcre-jit? ( >=dev-libs/libpcre-8.20[jit] )
+	selinux? ( sec-policy/selinux-nginx )
+	ssl? ( dev-libs/openssl )
+	http-cache? ( userland_GNU? ( dev-libs/openssl ) )
+	nginx_modules_http_geoip? ( dev-libs/geoip )
+	nginx_modules_http_gunzip? ( sys-libs/zlib )
+	nginx_modules_http_gzip? ( sys-libs/zlib )
+	nginx_modules_http_gzip_static? ( sys-libs/zlib )
+	nginx_modules_http_image_filter? ( media-libs/gd[jpeg,png] )
+	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_spdy? ( >=dev-libs/openssl-1.0.1c )
+	nginx_modules_http_xslt? ( dev-libs/libxml2 dev-libs/libxslt )
+	nginx_modules_http_lua? ( || ( dev-lang/lua dev-lang/luajit ) )
+	nginx_modules_http_auth_pam? ( virtual/pam )
+	nginx_modules_http_metrics? ( dev-libs/yajl )
+	nginx_modules_http_dav_ext? ( dev-libs/expat )
+	nginx_modules_http_security? ( >=dev-libs/libxml2-2.7.8 dev-libs/apr-util www-servers/apache )"
+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 )
+	nginx_modules_http_lua? ( nginx_modules_http_rewrite )
+	nginx_modules_http_naxsi? ( pcre )
+	nginx_modules_http_dav_ext? ( nginx_modules_http_dav )
+	nginx_modules_http_metrics? ( nginx_modules_http_stub_status )
+	nginx_modules_http_security? ( pcre )"
+
+pkg_setup() {
+	NGINX_HOME="/var/lib/nginx"
+	NGINX_HOME_TMP="${NGINX_HOME}/tmp"
+
+	ebegin "Creating nginx user and group"
+	enewgroup ${PN}
+	enewuser ${PN} -1 -1 "${NGINX_HOME}" ${PN}
+	eend $?
+
+	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 !http; then
+		ewarn "To actually disable all http-functionality you also have to disable"
+		ewarn "all nginx http modules."
+	fi
+}
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-1.4.1-fix-perl-install-path.patch"
+
+	if use syslog; then
+		epatch "${SYSLOG_MODULE_WD}"/syslog_${SYSLOG_MODULE_NGINX_PV}.patch
+	fi
+
+	if use nginx_modules_http_upstream_check; then
+		epatch "${HTTP_UPSTREAM_CHECK_MODULE_WD}"/check_1.2.6+.patch
+	fi
+
+	if use nginx_modules_http_security; then
+		cd "${HTTP_SECURITY_MODULE_WD}/nginx/modsecurity"
+		epatch "${FILESDIR}/modsecurity-${HTTP_SECURITY_MODULE_PV}-include-paths.patch"
+		cd -
+	fi
+
+	find auto/ -type f -print0 | xargs -0 sed -i 's:\&\& make:\&\& \\$(MAKE):' || die
+	# We have config protection, don't rename etc files
+	sed -i 's:.default::' auto/install || die
+	# remove useless files
+	sed -i -e '/koi-/d' -e '/win-/d' auto/install || die
+
+	epatch_user
+}
+
+src_configure() {
+	local myconf= http_enabled= mail_enabled=
+
+	use aio       && myconf+=" --with-file-aio --with-aio_module"
+	use debug     && myconf+=" --with-debug"
+	use ipv6      && myconf+=" --with-ipv6"
+	use libatomic && myconf+=" --with-libatomic"
+	use pcre      && myconf+=" --with-pcre"
+	use pcre-jit  && myconf+=" --with-pcre-jit"
+
+	# syslog support
+	if use syslog; then
+		myconf+=" --add-module=${SYSLOG_MODULE_WD}"
+	fi
+
+	# HTTP modules
+	for mod in $NGINX_MODULES_STD; do
+		if use nginx_modules_http_${mod}; then
+			http_enabled=1
+		else
+			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+=" --with-http_${mod}_module"
+		fi
+	done
+
+	if use nginx_modules_http_fastcgi; then
+		myconf+=" --with-http_realip_module"
+	fi
+
+	# third-party modules
+	if use nginx_modules_http_upload_progress; then
+		http_enabled=1
+		myconf+=" --add-module=${HTTP_UPLOAD_PROGRESS_MODULE_WD}"
+	fi
+
+	if use nginx_modules_http_headers_more; then
+		http_enabled=1
+		myconf+=" --add-module=${HTTP_HEADERS_MORE_MODULE_WD}"
+	fi
+
+	if use nginx_modules_http_push; then
+		http_enabled=1
+		myconf+=" --add-module=${HTTP_PUSH_MODULE_WD}"
+	fi
+
+	if use nginx_modules_http_cache_purge; then
+		http_enabled=1
+		myconf+=" --add-module=${HTTP_CACHE_PURGE_MODULE_WD}"
+	fi
+
+	if use nginx_modules_http_slowfs_cache; then
+		http_enabled=1
+		myconf+=" --add-module=${HTTP_SLOWFS_CACHE_MODULE_WD}"
+	fi
+
+	if use nginx_modules_http_fancyindex; then
+		http_enabled=1
+		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 nginx_modules_http_auth_pam; then
+		http_enabled=1
+		myconf+=" --add-module=${HTTP_AUTH_PAM_MODULE_WD}"
+	fi
+
+	if use nginx_modules_http_upstream_check; then
+		http_enabled=1
+		myconf+=" --add-module=${HTTP_UPSTREAM_CHECK_MODULE_WD}"
+	fi
+
+	if use nginx_modules_http_metrics; then
+		http_enabled=1
+		myconf+=" --add-module=${HTTP_METRICS_MODULE_WD}"
+	fi
+
+	if use nginx_modules_http_naxsi ; then
+		http_enabled=1
+		myconf+=" --add-module=${HTTP_NAXSI_MODULE_WD}"
+	fi
+
+	if use rtmp ; then
+		http_enabled=1
+		myconf+=" --add-module=${RTMP_MODULE_WD}"
+	fi
+
+	if use nginx_modules_http_dav_ext ; then
+		http_enabled=1
+		myconf+=" --add-module=${HTTP_DAV_EXT_MODULE_WD}"
+	fi
+
+	if use nginx_modules_http_echo ; then
+		http_enabled=1
+		myconf+=" --add-module=${HTTP_ECHO_MODULE_WD}"
+	fi
+
+	if use nginx_modules_http_security ; then
+		http_enabled=1
+		myconf+=" --add-module=${HTTP_SECURITY_MODULE_WD}/nginx/modsecurity"
+	fi
+
+	if use http || use http-cache; then
+		http_enabled=1
+	fi
+
+	if [ $http_enabled ]; then
+		use http-cache || myconf+=" --without-http-cache"
+		use ssl && myconf+=" --with-http_ssl_module"
+	else
+		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+=" --without-mail_${mod}_module"
+		fi
+	done
+
+	if [ $mail_enabled ]; then
+		myconf+=" --with-mail"
+		use ssl && myconf+=" --with-mail_ssl_module"
+	fi
+
+	# custom modules
+	for mod in $NGINX_ADD_MODULES; do
+		myconf+=" --add-module=${mod}"
+	done
+
+	# https://bugs.gentoo.org/286772
+	export LANG=C LC_ALL=C
+	tc-export CC
+
+	if ! use prefix; then
+		myconf+=" --user=${PN} --group=${PN}"
+	fi
+
+	./configure \
+		--prefix="${EPREFIX}"/usr \
+		--conf-path="${EPREFIX}"/etc/${PN}/${PN}.conf \
+		--error-log-path="${EPREFIX}"/var/log/${PN}/error_log \
+		--pid-path="${EPREFIX}"/run/${PN}.pid \
+		--lock-path="${EPREFIX}"/run/lock/${PN}.lock \
+		--with-cc-opt="-I${EROOT}usr/include" \
+		--with-ld-opt="-L${EROOT}usr/lib" \
+		--http-log-path="${EPREFIX}"/var/log/${PN}/access_log \
+		--http-client-body-temp-path="${EPREFIX}/${NGINX_HOME_TMP}"/client \
+		--http-proxy-temp-path="${EPREFIX}/${NGINX_HOME_TMP}"/proxy \
+		--http-fastcgi-temp-path="${EPREFIX}/${NGINX_HOME_TMP}"/fastcgi \
+		--http-scgi-temp-path="${EPREFIX}/${NGINX_HOME_TMP}"/scgi \
+		--http-uwsgi-temp-path="${EPREFIX}/${NGINX_HOME_TMP}"/uwsgi \
+		${myconf} || die "configure failed"
+
+	if use nginx_modules_http_security; then
+		cd "${HTTP_SECURITY_MODULE_WD}"
+		./configure --enable-standalone-module || die "configure failed for mod_security"
+	fi
+}
+
+src_compile() {
+	use nginx_modules_http_security && emake -C "${HTTP_SECURITY_MODULE_WD}"
+
+	# https://bugs.gentoo.org/286772
+	export LANG=C LC_ALL=C
+	emake LINK="${CC} ${LDFLAGS}" OTHERLDFLAGS="${LDFLAGS}"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	cp "${FILESDIR}"/nginx.conf "${ED}"/etc/nginx/nginx.conf || die
+
+	newinitd "${FILESDIR}"/nginx.initd-r2 nginx
+
+	systemd_newunit "${FILESDIR}"/nginx.service-r1 nginx.service
+
+	doman man/nginx.8
+	dodoc CHANGES* README
+
+	# just keepdir. do not copy the default htdocs files (bug #449136)
+	keepdir /var/www/localhost
+	rm -rf "${D}"/usr/html || die
+
+	keepdir /var/log/nginx "${NGINX_HOME_TMP}"/{,client,proxy,fastcgi,scgi,uwsgi}
+
+	# this solves a problem with SELinux where nginx doesn't see the directories
+	# as root and tries to create them as nginx
+	fperms 0750 "${NGINX_HOME_TMP}"
+	fowners ${PN}:0 "${NGINX_HOME_TMP}"
+
+	fperms 0700 /var/log/nginx "${NGINX_HOME_TMP}"/{client,proxy,fastcgi,scgi,uwsgi}
+	fowners ${PN}:${PN} /var/log/nginx "${NGINX_HOME_TMP}"/{client,proxy,fastcgi,scgi,uwsgi}
+
+	# 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
+		fixlocalpod
+	fi
+
+	if use syslog; then
+		docinto ${SYSLOG_MODULE_P}
+		dodoc "${SYSLOG_MODULE_WD}"/README
+	fi
+
+	if use nginx_modules_http_push; then
+		docinto ${HTTP_PUSH_MODULE_P}
+		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 "${HTTP_CACHE_PURGE_MODULE_WD}"/{CHANGES,README.md,TODO.md}
+	fi
+
+	if use nginx_modules_http_slowfs_cache; then
+		docinto ${HTTP_SLOWFS_CACHE_MODULE_P}
+		dodoc "${HTTP_SLOWFS_CACHE_MODULE_WD}"/{CHANGES,README.md}
+	fi
+
+	if use nginx_modules_http_fancyindex; then
+		docinto ${HTTP_FANCYINDEX_MODULE_P}
+		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
+
+	if use nginx_modules_http_auth_pam; then
+		docinto ${HTTP_AUTH_PAM_MODULE_P}
+		dodoc "${HTTP_AUTH_PAM_MODULE_WD}"/{README,ChangeLog}
+	fi
+
+	if use nginx_modules_http_upstream_check; then
+		docinto ${HTTP_UPSTREAM_CHECK_MODULE_P}
+		dodoc "${HTTP_UPSTREAM_CHECK_MODULE_WD}"/{README,CHANGES}
+	fi
+
+# README.md is still empty
+#	if use nginx_modules_http_metrics; then
+#		docinto ${HTTP_METRICS_MODULE_P}
+#		dodoc "${HTTP_METRICS_MODULE_WD}"/README.md
+#	fi
+
+	if use nginx_modules_http_naxsi; then
+		insinto /etc/nginx
+		doins "${HTTP_NAXSI_MODULE_WD}"/../naxsi_config/naxsi_core.rules
+	fi
+
+	if use rtmp; then
+		docinto ${RTMP_MODULE_P}
+		dodoc "${RTMP_MODULE_WD}"/{AUTHORS,README.md,TODO,stat.xsl}
+	fi
+
+	if use nginx_modules_http_dav_ext; then
+		docinto ${HTTP_DAV_EXT_MODULE_P}
+		dodoc "${HTTP_DAV_EXT_MODULE_WD}"/README
+	fi
+
+	if use nginx_modules_http_echo; then
+		docinto ${HTTP_ECHO_MODULE_P}
+		dodoc "${HTTP_ECHO_MODULE_WD}"/{README,README.markdown,doc/HttpEchoModule.wiki}
+	fi
+
+	if use nginx_modules_http_security; then
+		docinto ${HTTP_SECURITY_MODULE_P}
+		dodoc "${HTTP_SECURITY_MODULE_WD}"/{CHANGES,README.TXT,authors.txt}
+	fi
+}
+
+pkg_postinst() {
+	if use ssl; then
+		if [ ! -f "${EROOT}"/etc/ssl/${PN}/${PN}.key ]; then
+			install_cert /etc/ssl/${PN}/${PN}
+			use prefix || chown ${PN}:${PN} "${EROOT}"/etc/ssl/${PN}/${PN}.{crt,csr,key,pem}
+		fi
+	fi
+
+	if use nginx_modules_http_lua && use nginx_modules_http_spdy; then
+		ewarn "Lua 3rd party module author warns against using ${P} with"
+		ewarn "NGINX_MODULES_HTTP=\"lua spdy\". For more info, see http://git.io/OldLsg"
+	fi
+
+	# This is the proper fix for bug #458726/#469094, resp. CVE-2013-0337 for
+	# existing installations
+	local fix_perms=0
+
+	for rv in ${REPLACING_VERSIONS} ; do
+		version_compare ${rv} 1.4.1-r2
+		[[ $? -eq 1 ]] && fix_perms=1
+	done
+
+	if [[ $fix_perms -eq 1 ]] ; then
+		ewarn "To fix a security bug (CVE-2013-0337, bug #458726) had the following"
+		ewarn "directories the world-readable bit removed (if set):"
+		ewarn "  ${EPREFIX}/var/log/nginx"
+		ewarn "  ${EPREFIX}${NGINX_HOME_TMP}/{,client,proxy,fastcgi,scgi,uwsgi}"
+		ewarn "Check if this is correct for your setup before restarting nginx!"
+		ewarn "This is a one-time change and will not happen on subsequent updates."
+		ewarn "Furthermore nginx' temp directories got moved to ${NGINX_HOME_TMP}"
+		chmod o-rwx "${EPREFIX}"/var/log/nginx "${EPREFIX}/${NGINX_HOME_TMP}"/{,client,proxy,fastcgi,scgi,uwsgi}
+	fi
+
+	ewarn "Please make sure that the nginx user or group has"
+	ewarn "'rx' permissions on /var/log/nginx (default on a fresh install)"
+	ewarn "Otherwise you end up with empty log files after a logrotate."
+}