new version

author: Yuriy Ustushenko <yoreek@yahoo.com> 2013-05-14 22:51:28 +0300
committer: Yuriy Ustushenko <yoreek@yahoo.com> 2013-05-14 22:51:28 +0300
commit: 3ca7a0ce568c4f89c342952cb9e131b36224dc5f (patch)
tree: afdbe4cbbfc13cc68fb1d2833c35bd3bb9f65ae6 /www-servers
parent: new version (diff)
download: yoreek-3ca7a0ce568c4f89c342952cb9e131b36224dc5f.tar.gz
yoreek-3ca7a0ce568c4f89c342952cb9e131b36224dc5f.tar.bz2
yoreek-3ca7a0ce568c4f89c342952cb9e131b36224dc5f.zip
10 files changed, 350 insertions, 537 deletions
diff --git a/www-servers/nginx/ChangeLog b/www-servers/nginx/ChangeLog
index 1140da0..d64cb23 100644
--- a/www-servers/nginx/ChangeLog
+++ b/www-servers/nginx/ChangeLog
@@ -1,6 +1,79 @@
 # 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.345 2013/03/31 01:55:20 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/ChangeLog,v 1.358 2013/05/14 06:59:27 dev-zero Exp $
+
+*nginx-1.4.1-r3 (14 May 2013)
+
+  14 May 2013; Tiziano Müller <dev-zero@gentoo.org> +files/nginx.service-r1,
+  +nginx-1.4.1-r3.ebuild, -files/nginx.initd, -files/nginx.initd-r1,
+  -files/nginx.tmpfiles, -files/nginx.tmpfiles-r1:
+  Fix systemd unit due to removed tmpfiles (bug #469784). Remove left-overs from
+  old-version-cleanup.
+
+  13 May 2013; Agostino Sarubbo <ago@gentoo.org> -nginx-1.2.6-r1.ebuild,
+  -nginx-1.2.8.ebuild, -nginx-1.4.1-r1.ebuild, -nginx-1.4.1.ebuild:
+  Remove old
+
+  13 May 2013; Agostino Sarubbo <ago@gentoo.org> nginx-1.4.1-r2.ebuild:
+  Stable for x86, wrt bug #468870
+
+  13 May 2013; Agostino Sarubbo <ago@gentoo.org> nginx-1.4.1-r2.ebuild:
+  Stable for amd64, wrt bug #468870
+
+  13 May 2013; Jason A. Donenfeld <zx2c4@gentoo.org> nginx-1.4.1-r2.ebuild:
+  Use epatch_user to allow custom patches from users.
+
+*nginx-1.4.1-r2 (13 May 2013)
+
+  13 May 2013; Tiziano Müller <dev-zero@gentoo.org>
+  +files/nginx-1.4.1-fix-perl-install-path.patch, +files/nginx.initd-r2,
+  +nginx-1.4.1-r2.ebuild:
+  Set permissions for log- and tmp-dir in ebuild only, including a one-time
+  postinst-fix for bug #469094, resp. bug #458726. Moved the tmp-dirs to
+  /var/lib/nginx/tmp and set the nginx-homedir to /var/lib/nginx (following the
+  other distros here). Fix perl-module installation to use /usr instead of
+  /usr/local for PREFIX.
+
+  11 May 2013; Markus Meier <maekke@gentoo.org> nginx-1.4.1-r1.ebuild:
+  add ~arm, bug #456752
+
+*nginx-1.4.1-r1 (08 May 2013)
+
+  08 May 2013; Tiziano Müller <dev-zero@gentoo.org> +files/nginx.initd-r1,
+  +files/nginx.tmpfiles-r1, +nginx-1.4.1-r1.ebuild, -nginx-1.4.0-r1.ebuild,
+  -nginx-1.4.0.ebuild:
+  Drop vulnerable versions, fix bug #458726 again for /var/tmp/nginx and
+  stricter default permissions for /var/log/nginx.
+
+*nginx-1.4.1 (08 May 2013)
+
+  08 May 2013; Tiziano Müller <dev-zero@gentoo.org> +nginx-1.4.1.ebuild:
+  Version bump for bug #468870, added gunzip flag (bug #468770), bumped
+  devel_kit to 0.2.18, headers_more to 0.20, slowfs_cache to 1.10.
+
+*nginx-1.4.0-r1 (02 May 2013)
+
+  02 May 2013; Benedikt Böhm <hollow@gentoo.org> +nginx-1.4.0-r1.ebuild,
+  files/nginx.logrotate:
+  fix lua module compatibility; add check_upstream and metrics module
+
+*nginx-1.4.0 (25 Apr 2013)
+
+  25 Apr 2013; Benedikt Böhm <hollow@gentoo.org> nginx-1.2.8.ebuild,
+  -nginx-1.3.11.ebuild, -nginx-1.3.15.ebuild, -nginx-1.3.16.ebuild,
+  +nginx-1.4.0.ebuild, +files/nginx.service, +files/nginx.tmpfiles,
+  files/nginx.initd:
+  version bump. fixes #446734, #462214, #467106, #466526, #466246
+
+*nginx-1.3.16 (19 Apr 2013)
+
+  19 Apr 2013; Patrick Lauer <patrick@gentoo.org> +nginx-1.3.16.ebuild:
+  Bump for #456224
+
+*nginx-1.2.8 (19 Apr 2013)
+
+  19 Apr 2013; Patrick Lauer <patrick@gentoo.org> +nginx-1.2.8.ebuild:
+  Bump to 1.2.8 #456224
 
 *nginx-1.3.15 (31 Mar 2013)
 
diff --git a/www-servers/nginx/Manifest b/www-servers/nginx/Manifest
index 6454e9a..746d0d2 100644
--- a/www-servers/nginx/Manifest
+++ b/www-servers/nginx/Manifest
@@ -1,25 +1,24 @@
+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 2209 SHA256 c55b36e8632ec13fbbe9b4cec161a78eda3022ac15f1acfeb6184113473d3b30 SHA512 85e3ff4bdc661e7901683dfdeb6a91f557e89cf17aba03f399c337531b529823b8de89f0e8ef21391a402c4071e98479570c8b08729daa94051709651f4f4b8e WHIRLPOOL 4492c95247b46626f9d104dd2809741ae7c6dee186c48b361b4c1244166e488cb997c58732e9a7d536888ab2efb81d08e5fef168feb4bd587de7b96805f1d43c
-AUX nginx.logrotate 364 SHA256 9e3e090dfd10861d5f9b279e19113ce8d05caf9f33d488f6aabf9f19ac0cf925 SHA512 bdb56d90cfa163a9b22262c77d702cfa2319c0c61e3ce2cc2a0c099681bbd6a631a2e2f442ee28802e178799c592e5dd560f3bd33bf2c86d7ecf2b40a204746c WHIRLPOOL be1b76c1d51e6e597f9b441753dda3a943c31ccfb94f02a8da6edcd5c8f22b251df3086b6029101143beef0ca9c624d3ee709aca3e307ab0c910002931c1dc08
-DIST nginx-1.2.6.tar.gz 726025 SHA256 0510af71adac4b90484ac8caf3b8bd519a0f7126250c2799554d7a751a2db388 SHA512 659f01b0349292f7176f9bf6981bb0b270d724c5bd621556a0f1521d220995393789f6aea42ad3d1044207b9b2fb0aa40f81a069dbcb8eec4b3503b1e0826d64 WHIRLPOOL 48b0f715c43c27ad6aafc70e93f38e95b75dba27b4f010d002c4a0eb85faec0a68e2c7e9f7cc6e76253938c17df3ab528b29f727676a0ade9ed3cc46097ef66f
-DIST nginx-1.3.11.tar.gz 744064 SHA256 a3e0921e0021e7049dd0fd60206aa1725c24019ffc64eba162df3e35712ce07e SHA512 1a8cee3224a22b0f20746b3a12b2de65664d98672825071762a78f995cc4723a0468ecde3c90c88eb954105f1b872058a4a676d32c42e194821a30ddfebd499e WHIRLPOOL ed3f8ae593e0e883670dc4099edd989c62d933cfdd4a61be5f58ecef8545e50bd8146f98c52c5fb274914f2c2f32d4da0875d2a7e99f06f9ea240621897319bb
-DIST nginx-1.3.15.tar.gz 772759 SHA256 3267574f007cba5d947ad04d2aebd45ffec06565d019791bc536229bbc6d3b84 SHA512 144f512a1d47a3a55cc336bc58082daea5eedd9e8b6af4ed035972e93f1d37ce1721893bbc03d49a0c3f0eda7dc6ec4f8ab07710312519d8550ab55089f5f724 WHIRLPOOL 30dabc2b874c00a1a7100857d63bb0d2e5cfde477321fc06dc323c763fc79ebef0a26fef918b8057e3974b54bc1dff7ead11c36ce23811638e62fac00da39fa3
-DIST ngx_devel_kit-0.2.17-r1.tar.gz 64960 SHA256 564c827237e123709eb8f30ec4e2ff981752fe7b1ea0798fdf1a68c66dc99165 SHA512 c8edd92fdf9f5cc45a10a31722ee498aefb5d999b9d9c0d3ce977ffc4b2f8883246ec7b64fdcfb00e480fb0044763a9b8cde5e5eb1248a05752a7983b0ebca8e WHIRLPOOL 1b02825e7f4d87b1502a472bffeacf72dd449a9bad014cce6c79d9b77541988281aa6ba913a33dbbc3f423bd6d7742005c4defb36080b1e81ddc07585c44bd75
+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 nginx-1.4.1.tar.gz 767107 SHA256 bca5d1e89751ba29406185e1736c390412603a7e6b604f5b4575281f6565d119 SHA512 174902d24a60b609688600761374e4ba42e0444439ead84c79ff2e82d0233f8759b57a0b76b82a1f571e38ecce0d7059dc2f057672a7004b6f0060968b4b981e WHIRLPOOL d8a95b32fa5af256b5d0f41bdbcbc381d68fc72a4db2dd0cc3dbe1cc298495a08129a279939aad4da0bcfb5867c5538551e5f6e8332c0bc328d17f490f5e7525
+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_cache_purge-2.0.tar.gz 10358 SHA256 404c6af7b2300afe0598a48f80aa1942f340e5024f52f9d60723047c29d703d6 SHA512 40a71976d3c61cb4bee8c1918632f34ade261deca2c1ddfddda374f91c991841fcbe3450a8dd7766d693b976f56db1e20031f207a25137aec1c88b0d432090f0 WHIRLPOOL 70259c895ec29c03d5bb11891aafc97d1bfedffc03988fb95fd610909da328bed05dabe21bfad27d72855d534496a5161da5732e8166f485764be01382b14e23
 DIST ngx_http_cache_purge-2.1.tar.gz 10535 SHA256 424005af0c04e59ffa65a65e446081d4f95ee76a801a7555e001c67810bcb3b9 SHA512 1b70b2c35601949edd53d55922e81425aef0b2c486b071c2bcf53db7c5278e55966ffd2c9e32f599ee63e147a395e708d442515fe414f39b323d26722324db8b WHIRLPOOL f020841139988ae516969ffcd5bf7b2c264749fef5c20a5c8f0cca70f5eddcd3efcb3676bbe9a4550535de7b53fcd7326294fcae2a14dc6bf66d1ab77205b83f
 DIST ngx_http_fancyindex-0.3.1.1.tar.gz 13146 SHA256 227896f7d69866f7432c1b19a03dd47ae3463fc4afda117951da7a497a97cfd0 SHA512 25bf420964bf9489face93ac415d531e0b52f281b8f993b85eca75b159099f269af183a63b895ea0ba855bb08f23d4b5e5dd6aefd96b63b4e7e478bba0d2e145 WHIRLPOOL 971c9e9899ac4552c0d7ef0068f740fec431e89be3b666a4e01db882dc36b6d55ee2eb3459c9e8e5173bc303bc24c4ec99569949bde557506f2b63959959568d
-DIST ngx_http_headers_more-0.19-r1.tar.gz 23973 SHA256 08744b64020f245e3bf12083f1a0ccfb2d64ad971ef0a2972171a6f87cdb24af SHA512 928caaefa49031b87a875e3f78fc0ebc50099054c7fbd51da16954691eff3b39e2ddbeec0b61e482df3bcd533b6354aa9cd36718d3c5ab3b750591e25594a6b1 WHIRLPOOL dc561e4f035291bb94755174d575e352f7a58006bf06c84060c2d290612b1c50c239fa497c03c1fdd3e40052eac5c798ba38ed1413269200c58c8a7bc39057c7
-DIST ngx_http_lua-0.7.11.tar.gz 440269 SHA256 d200679d48fdbaf6674564aa5e0ae891df065b5a3ba6a2a4350827e16117c897 SHA512 2818efe9e7b045fd417809dc74c4cfc8fa17f82ab6c63b291f1b0691d408730cf943c958ad790b44c2c77bd1246d40f6fa4142638800e77bbb3e8ec1cf94b51e WHIRLPOOL 518106bce8006f0734540a79638e68c9bafd7612550ff649ee189275a54617da906b531e8fa0819620de5175070939b6a0babf7e401656b457a0dec4a5a6b4dd
+DIST ngx_http_headers_more-0.20-r1.tar.gz 26769 SHA256 0e7c5e9dc9daade8b508a9f0cd0cd887329d1ae19d80294bc588939afed9e9d9 SHA512 c31be114943f5831ad9cbac8ac0c9c1995c513205e7d3d87761788e7fdd9ea7d60992dbd51cccf26777e96658091ef091e98c2e384b1041f9bce0dacdfa81c3e WHIRLPOOL 94ae99aa9c682c6406db39f4552fd6e33c735644c930f30617b6b32efd116962b630fb1a36ff37671d1c5c8de480045e426e3779e6b9c5991cbd7d93568d6d2d
+DIST ngx_http_lua-0.8.1.tar.gz 478976 SHA256 1b4fbdcf55765fa7214d00d3d70f9c02d6922970b005649622612476e65e994f SHA512 a0eb7f839bc332ff658fd2885072591c0719bba93e7490420821daee23b6b6d26b6395222635c0841d3a322a9b77aa76411a52f137b7da356c90ed64b8f9602a WHIRLPOOL 3d5262fd97fef6d2e6ad090c9c105ac5a9659fd58eed16a2a555273dbce66d67dd0143531571897e013d45a595a3cc806bcaf7a445f56ad42f0cde8f82e8b01b
 DIST ngx_http_push-0.692.tar.gz 29119 SHA256 64868708071aa21dbc4c7a07d149dd6ec9108fb7eaf2aad5ad069406151f17fe SHA512 79821cacf5db4b1309e3f1c8d6980f83b1093dd3f291db5298bfdeb0d889fc0629625dcf3135d1cf7554b43308ef7172a4f40596928ab3069426801177ed3c1c WHIRLPOOL f1c846a4aa2d4491ee3063266d27b9854d860bbba44ef6e2ea33ebe1f570177e836c593a84cc2c7e22357bd43411f9d5b55852ee96a98dccdc18e7edf6768c95
-DIST ngx_http_slowfs_cache-1.9.tar.gz 11527 SHA256 7a2e07033550f3b594949a4392ac9a34e5583025ffea4e33e39a7f0d9fdc8b42 SHA512 4151ecd9272de332720de8b838fded1e7b192b2426683c3d7e49f67307603154076625b87a218b34609afd0d0fb0827f8a831b38c95cdc0f2a369aade663d25e WHIRLPOOL 24a4f5bb03563557ab1bc32bf82915c36017af3abe4e1ae2a92f1b688f189a3712bced7484d9786598dce0fc1ae7d80bceb184fc23ce9c2a130bc135b6e61a9b
-DIST ngx_http_upload-2.2.0.tar.gz 25796 SHA256 b1c26abe0427180602e257627b4ed21848c93cc20cefc33af084983767d65805 SHA512 8192cedb2ac6911e8529e1dc63f02ac781cd54a293ab87571866bed11520b01ed5786be6daf79b4a1c34792926548b2fa8404daa0bf31d9fd17c59a64e90b3fe WHIRLPOOL db3ad2790c4beb735d51422d2a8d556385576c4f769addeaa1dd00cae55ee2ab97be9efe420743c87b2f794f816eae7f001e7622648b4f63fbbc60898840f9e8
+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_syslog-0.24.tar.gz 90026 SHA256 a87d2863e1fa61cf5050ccb0d6140fa5b8bbd4ce0b0507fee3fb56a2edd70baa SHA512 dcb3f674b8e2a995a65806cb38cb8a6f8262c5cdd158956a55ab9b2fe2738dffd2831390341b1eb736150d6ecb6c0ad136823a4b2ba9eda4170b56f61a68601d WHIRLPOOL f8a6978ebb5989237816449e79dc9273597765802f01318d9583e4e0fcb20742b04970af7fa5249558a53df777786f0ece5051678ecb4854f1e846775e5e7b0e
+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_syslog-0.25.tar.gz 91070 SHA256 8bafa901d2f9af0b54f1a014fdfaa07140bd4584cfada3189eddd2a7ff5b0195 SHA512 c869dc5c26484477cd9663bc860235a39813a41ac8be4b8f8f3c062c723aa431247d3b5915c962c7fcff36889d5541e8c844eaf6ece88c2c61d2f180f643f8b5 WHIRLPOOL 1829f60f9ab26c131d8fce56b2ff15276a2e99e2f6f96749ebf417e6e3d438249c79de8e6210d702acac8a1309fca417b12894428b53f280c76564a6839b4a2d
 DIST ngx_xsltproc-0.14.tar.gz 532723 SHA256 dc9b29fb7a1ad75486404677c0d8df792475eb469f96824486f19198fadbf96c SHA512 88f4df26438bd2f525b9554a2b94fa61c212f46bf476754ddfa30ebe70187fda59a1017a69f82c1542568454d5e9f122068bd616b9bc7b26b408aaf0a7de0ca9 WHIRLPOOL 6cfb8bddacd2a0e3ae05b88a435a216d52ce5205bcc4797b08b8c0712038eea9699859e11a5663cd6761255162a8e305ba6565f60095990611683777063a02b4
-EBUILD nginx-1.2.6-r2.ebuild 15374 SHA256 e36f870df8f71796905d5da8c7b4be6e351c4642f0ed357d30142a430f4bf8c4 SHA512 75110d0d141cf1dd7df5dfea5d47e43fbab52ec316dc2bbdf50389c721d59157699a013def3834bc4e73f7527ce3a4fb1e2f408ba95cc000ca2ef738d2051bf3 WHIRLPOOL 397b65e95ed77899b03a934f2b23c78011eaf70bb2dcd68a67a9f2467f37e9ea34be547cb2f449d7b506e477fddae5dec556b2d13acb75aed1c07cb6f94d8afe
-EBUILD nginx-1.3.11-r1.ebuild 15375 SHA256 1496cda91162d9f829fc54a26e8aabcd8f8a8e36879e6aba4ef3292d5c1b6202 SHA512 1524ea6351084f76b6d913e9b6ad9ecab9947ee8c9a5895d6cbebfa47d0502142113c24c28ca5f8e27296305e0969e6a5602e5ef22cb134728bda1f1a36a6768 WHIRLPOOL 9fd32bd64afd3b7d9ea3550c3d780e45e4e1560f4222cf033044f15a217822503634fab866b1cddc16f06e9a8ed7096eb2e2bcbe3b054117036683dae225f278
-EBUILD nginx-1.3.15-r1.ebuild 15431 SHA256 71cae928597802973357bc3d150a3edee983b1727f1e03c34d7450ae1312ce63 SHA512 c91c68db12cc327221884318d2680d5f24cd4ee4f553b45559bd6506cef54865a4b35d34694b0d14e95d477afdd7449f99ca19294de1f30a5c0b199913e57172 WHIRLPOOL ef3eb8efba67847698521b32011869d6529fd1e17ea4f9afdbd7f00940f0822e0f79fcb86bde9ef8936e0791d15723e3f4f52d7ac528ea6dc83c52b9b6ffbb75
-MISC ChangeLog 56291 SHA256 5ede6b11aadc183ca42ef6b898e6b8fa4622673b76313021dbb8bf368ce7d9b6 SHA512 ccec3968ba6bb31e6b40dd99e37ea2bd2757669575d32c0e9dc0db5ed938638d78070a8c6d7607db10e25d0dc5446ef02c95a1ca92f49452484cb14219177f60 WHIRLPOOL 3be791a139b30fb40b6858da186dba7f16517875a974815a405e9fb2759149fe9404b37c72c328148feb27c99439c182b38b3b9bc1b6d3c1308ff7477554f804
+EBUILD nginx-1.4.1-r102.ebuild 18213 SHA256 00f9ac7eba8de3b5ae2442a20a13f65ea9841b372e0c9a353f0df65033d1e305 SHA512 367f9dd866753a42e45d20cdba3b8b77c55ca946ba880dfa6127800cae62aa474dbaf3ae029758a258e60b99359ec02070ba02e5701dc151ad2c4c9fb0c67a24 WHIRLPOOL a441b944dff94113fb1078c0f5f6517c3e3d44680653fb725f151b65273cae300f4cbf865b651ae156d179fb7c7371f8e6ea281311d77def4e3ef897ead11e5a
+EBUILD nginx-1.4.1-r103.ebuild 18238 SHA256 d5437adc2458888b738282c88023a52df535de7050edf4d27d602261ffdda864 SHA512 71f959adc3af98911069891859be20aec90c208c2dacd67b7170570c9915f989a75dfab263615ca6a89616bd44f2c2ad1abf4733c2ded48bef076c22ec3c405d WHIRLPOOL 16b17532a6123ed1e63c4cac1e8bb3bc9fc01d666788dc7e5f9a1e9a33996fafd0c7232684396ef0baa5e9c661dcace88aab96c29d70f32738c096dc229f1dae
+MISC ChangeLog 59078 SHA256 ae4ff04df88ef04099afa60032007583dd595e23515e3f93293b1866a818f1cb SHA512 24746d1660858e8dfa8513c5cb4fc752d5f2934bfdcff5e48427f48e6e6ec276aeb895be7e958afe3ddc8efdacad7984f512ab5923081f3b271d4e4554ec205f WHIRLPOOL 8050f4980104e84ba9389a910c30306f5e01fa06c8da706c338298002ece9680ab4769f37ab1389131b3e4f755e9e6c8f206833e033fe6a3f0a42b9acc312210
 MISC metadata.xml 827 SHA256 750fe1d3ad8a43f2772ba296a0bfd35259d32a1746847dfe4119a18d49c01397 SHA512 5248aaf2524123b68d6fd6b82bc58426d419801763d8dcb87b5a5b15475936daf0160f9e878db06307ede0ab215ba0b571a9ff39873f7a77c18780f31c92b0d0 WHIRLPOOL 70c74c2b920dc049b01038e89d7046d188cad9a8a60cbd52dd11db32fe34ca9b55e62ec0bf3ad32c7fb8b26e519a97dc38175f1be3ef5e24c3d55d76f6ed8d10
diff --git a/www-servers/nginx/files/nginx-1.4.1-fix-perl-install-path.patch b/www-servers/nginx/files/nginx-1.4.1-fix-perl-install-path.patch
new file mode 100644
index 0000000..601a79b
--- /dev/null
+++ b/www-servers/nginx/files/nginx-1.4.1-fix-perl-install-path.patch
@@ -0,0 +1,13 @@
+diff --git a/auto/lib/perl/make b/auto/lib/perl/make
+index 260bd95..857ece6 100644
+--- a/auto/lib/perl/make
++++ b/auto/lib/perl/make
+@@ -35,6 +35,8 @@ $NGX_OBJS/src/http/modules/perl/Makefile: \\
+ 			NGX_DEPS="\$(CORE_DEPS) \$(HTTP_DEPS)" \\
+ 		$NGX_PERL Makefile.PL \\
+ 			LIB=$NGX_PERL_MODULES \\
++			PREFIX=$NGX_PREFIX \\
++			INSTALLDIRS=vendor \\
+ 			INSTALLSITEMAN3DIR=$NGX_PERL_MODULES_MAN
+ 
+ END
diff --git a/www-servers/nginx/files/nginx.initd b/www-servers/nginx/files/nginx.initd-r2
index 5e2012a..9036709 100644
--- a/www-servers/nginx/files/nginx.initd
+++ b/www-servers/nginx/files/nginx.initd-r2
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/files/nginx.initd,v 1.7 2013/03/31 01:55:20 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/files/nginx.initd-r2,v 1.1 2013/05/13 12:18:11 dev-zero Exp $
 
 extra_commands="configtest"
 extra_started_commands="upgrade reload"
@@ -78,10 +78,6 @@ upgrade() {
 }
 
 configtest() {
-	checkpath -q -d -m 0755 -o root:root /var/log/nginx
-	checkpath -q -d -m 0755 -o ${user}:${group} /var/tmp/nginx
-	checkpath -q -d -m 0755 -o ${user}:${group} /var/tmp/nginx/{client,proxy,fastcgi,scgi,uwsgi}
-
 	ebegin "Checking nginx' configuration"
 	${command} -c ${nginx_config} -t -q
 
diff --git a/www-servers/nginx/files/nginx.logrotate b/www-servers/nginx/files/nginx.logrotate
index c9d4c5a..0ae86c8 100644
--- a/www-servers/nginx/files/nginx.logrotate
+++ b/www-servers/nginx/files/nginx.logrotate
@@ -1,11 +1,11 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/files/nginx.logrotate,v 1.2 2011/04/08 08:32:20 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/files/nginx.logrotate,v 1.3 2013/05/02 20:14:31 hollow Exp $
 
 /var/log/nginx/*_log {
 	missingok
 	sharedscripts
 	postrotate
-		test -r /var/run/nginx.pid && kill -USR1 `cat /var/run/nginx.pid`
+		test -r /run/nginx.pid && kill -USR1 `cat /run/nginx.pid`
 	endscript
 }
diff --git a/www-servers/nginx/files/nginx.service b/www-servers/nginx/files/nginx.service
new file mode 100644
index 0000000..b7b81dd
--- /dev/null
+++ b/www-servers/nginx/files/nginx.service
@@ -0,0 +1,15 @@
+[Unit]
+Description=The nginx HTTP and reverse proxy server
+After=network.target remote-fs.target nss-lookup.target
+
+[Service]
+Type=forking
+PIDFile=/run/nginx.pid
+ExecStartPre=/usr/bin/systemd-tmpfiles --create nginx.conf
+ExecStartPre=/usr/sbin/nginx -t
+ExecStart=/usr/sbin/nginx
+ExecReload=/bin/kill -HUP $MAINPID
+ExecStop=/bin/kill -QUIT $MAINPID
+
+[Install]
+WantedBy=multi-user.target
diff --git a/www-servers/nginx/files/nginx.service-r1 b/www-servers/nginx/files/nginx.service-r1
new file mode 100644
index 0000000..797c7ed
--- /dev/null
+++ b/www-servers/nginx/files/nginx.service-r1
@@ -0,0 +1,14 @@
+[Unit]
+Description=The nginx HTTP and reverse proxy server
+After=network.target remote-fs.target nss-lookup.target
+
+[Service]
+Type=forking
+PIDFile=/run/nginx.pid
+ExecStartPre=/usr/sbin/nginx -t
+ExecStart=/usr/sbin/nginx
+ExecReload=/bin/kill -HUP $MAINPID
+ExecStop=/bin/kill -QUIT $MAINPID
+
+[Install]
+WantedBy=multi-user.target
diff --git a/www-servers/nginx/nginx-1.3.11-r1.ebuild b/www-servers/nginx/nginx-1.3.11-r1.ebuild
deleted file mode 100644
index ee53ea3..0000000
--- a/www-servers/nginx/nginx-1.3.11-r1.ebuild
+++ /dev/null
@@ -1,430 +0,0 @@
-# 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.3.11.ebuild,v 1.2 2013/02/18 14:30:19 aballier Exp $
-
-EAPI="4"
-
-# 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.24"
-SYSLOG_MODULE_NGINX_PV="1.3.11"
-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.17"
-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.19"
-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.0"
-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 (http://www.grid.net.ru/nginx/upload.en.html, BSD license)
-HTTP_UPLOAD_MODULE_PV="2.2.0"
-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.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 (http://wiki.nginx.org/NgxFancyIndex, BSD license)
-HTTP_FANCYINDEX_MODULE_PV="0.3.1.1"
-HTTP_FANCYINDEX_MODULE_P="ngx_http_fancyindex-${HTTP_FANCYINDEX_MODULE_PV}"
-HTTP_FANCYINDEX_MODULE_URI="http://gitorious.org/ngx-fancyindex/ngx-fancyindex/archive-tarball/2034d0ad"
-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.7.11"
-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/, unknown license)
-HTTP_AUTH_PAM_MODULE_PV="1.2"
-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}.tar.gz"
-HTTP_AUTH_PAM_MODULE_WD="${WORKDIR}/ngx_http_auth_pam_module-${HTTP_AUTH_PAM_MODULE_PV}"
-
-# http_xsltproc (http://github.com/yoreek/nginx-xsltproc-module/, BSD license)
-HTTP_XSLTPROC_MODULE_PV="0.14"
-HTTP_XSLTPROC_MODULE_P="ngx_xsltproc-${HTTP_XSLTPROC_MODULE_PV}"
-HTTP_XSLTPROC_MODULE_SHA1="9bb572d"
-HTTP_XSLTPROC_MODULE_URI="https://github.com/yoreek/nginx-xsltproc-module/tarball/v${HTTP_XSLTPROC_MODULE_PV}"
-
-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
-	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_upload? ( ${HTTP_UPLOAD_MODULE_URI} -> ${HTTP_UPLOAD_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_xsltproc? ( ${HTTP_XSLTPROC_MODULE_URI} -> ${HTTP_XSLTPROC_MODULE_P}.tar.gz )"
-
-LICENSE="BSD-2 BSD SSLeay MIT GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~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 gzip_static image_filter
-mp4 perl random_index realip secure_link stub_status sub"
-NGINX_MODULES_MAIL="imap pop3 smtp"
-NGINX_MODULES_3RD="
-	http_upload_progress
-	http_headers_more
-	http_push
-	http_cache_purge
-	http_upload
-	http_slowfs_cache
-	http_fancyindex
-	http_lua
-	http_auth_pam
-	http_xsltproc"
-
-IUSE="aio debug +http +http-cache ipv6 libatomic +pcre pcre-jit selinux ssl
-syslog vim-syntax +nginx_modules_http_xsltproc"
-
-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_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[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_xsltproc? ( dev-libs/libxml2 dev-libs/libxslt dev-libs/icu dev-libs/libmemcached )
-	nginx_modules_http_lua? ( || ( dev-lang/lua dev-lang/luajit ) )
-	nginx_modules_http_auth_pam? ( virtual/pam )"
-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 )"
-
-pkg_setup() {
-	ebegin "Creating nginx user and group"
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 -1 ${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() {
-	use syslog && epatch "${SYSLOG_MODULE_WD}"/syslog_${SYSLOG_MODULE_NGINX_PV}.patch
-
-	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
-}
-
-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_upload; then
-		http_enabled=1
-		myconf+=" --add-module=${HTTP_UPLOAD_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_xsltproc; then
-		http_enabled=1
-		myconf+=" --add-module=${WORKDIR}/yoreek-nginx-xsltproc-module-${HTTP_XSLTPROC_MODULE_SHA1}"
-	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}"/var/run/${PN}.pid \
-		--lock-path="${EPREFIX}"/var/lock/nginx.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}"/var/tmp/${PN}/client \
-		--http-proxy-temp-path="${EPREFIX}"/var/tmp/${PN}/proxy \
-		--http-fastcgi-temp-path="${EPREFIX}"/var/tmp/${PN}/fastcgi \
-		--http-scgi-temp-path="${EPREFIX}"/var/tmp/${PN}/scgi \
-		--http-uwsgi-temp-path="${EPREFIX}"/var/tmp/${PN}/uwsgi \
-		${myconf} || die "configure failed"
-}
-
-src_compile() {
-	# 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 nginx
-
-	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
-
-	# 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_upload; then
-		docinto ${HTTP_UPLOAD_MODULE_P}
-		dodoc "${HTTP_UPLOAD_MODULE_WD}"/{Changelog,README}
-	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
-}
-
-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
-}
diff --git a/www-servers/nginx/nginx-1.3.15-r1.ebuild b/www-servers/nginx/nginx-1.4.1-r102.ebuild
index dc9ab20..3caad14 100644
--- a/www-servers/nginx/nginx-1.3.15-r1.ebuild
+++ b/www-servers/nginx/nginx-1.4.1-r102.ebuild
@@ -1,6 +1,6 @@
 # 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.3.15.ebuild,v 1.1 2013/03/31 01:55:20 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/nginx-1.4.1-r2.ebuild,v 1.4 2013/05/13 19:52:36 ago Exp $
 
 EAPI="5"
 
@@ -25,7 +25,7 @@ SYSLOG_MODULE_URI="https://github.com/yaoweibin/nginx_syslog_patch/archive/v${SY
 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.17"
+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}"
@@ -37,7 +37,7 @@ HTTP_UPLOAD_PROGRESS_MODULE_URI="https://github.com/masterzen/nginx-upload-progr
 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.19"
+HTTP_HEADERS_MORE_MODULE_PV="0.20"
 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}"
@@ -54,14 +54,8 @@ 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 (http://www.grid.net.ru/nginx/upload.en.html, BSD license)
-HTTP_UPLOAD_MODULE_PV="2.2.0"
-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.9"
+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}"
@@ -73,7 +67,7 @@ HTTP_FANCYINDEX_MODULE_URI="http://gitorious.org/ngx-fancyindex/ngx-fancyindex/a
 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.7.11"
+HTTP_LUA_MODULE_PV="0.8.1"
 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}"
@@ -84,13 +78,25 @@ 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}.tar.gz"
 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="99f39394f387211641a1668d61faf2d5186ea1f5"
+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/${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}"
+
 # http_xsltproc (http://github.com/yoreek/nginx-xsltproc-module/, BSD license)
 HTTP_XSLTPROC_MODULE_PV="0.14"
 HTTP_XSLTPROC_MODULE_P="ngx_xsltproc-${HTTP_XSLTPROC_MODULE_PV}"
 HTTP_XSLTPROC_MODULE_SHA1="9bb572d"
 HTTP_XSLTPROC_MODULE_URI="https://github.com/yoreek/nginx-xsltproc-module/tarball/v${HTTP_XSLTPROC_MODULE_PV}"
 
-inherit eutils ssl-cert toolchain-funcs perl-module flag-o-matic user
+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"
@@ -101,21 +107,22 @@ SRC_URI="http://nginx.org/download/${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_upload? ( ${HTTP_UPLOAD_MODULE_URI} -> ${HTTP_UPLOAD_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_xsltproc? ( ${HTTP_XSLTPROC_MODULE_URI} -> ${HTTP_XSLTPROC_MODULE_P}.tar.gz )"
 
 LICENSE="BSD-2 BSD SSLeay MIT GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+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 gzip_static image_filter
+NGINX_MODULES_OPT="addition dav degradation flv geoip gunzip gzip_static image_filter
 mp4 perl random_index realip secure_link spdy stub_status sub"
 NGINX_MODULES_MAIL="imap pop3 smtp"
 NGINX_MODULES_3RD="
@@ -123,15 +130,16 @@ NGINX_MODULES_3RD="
 	http_headers_more
 	http_push
 	http_cache_purge
-	http_upload
 	http_slowfs_cache
 	http_fancyindex
 	http_lua
 	http_auth_pam
+	http_upstream_check
+	http_metrics
 	http_xsltproc"
 
 IUSE="aio debug +http +http-cache ipv6 libatomic +pcre pcre-jit selinux ssl
-syslog vim-syntax +nginx_modules_http_xsltproc"
+syslog userland_GNU vim-syntax +nginx_modules_http_xsltproc"
 
 for mod in $NGINX_MODULES_STD; do
 	IUSE="${IUSE} +nginx_modules_http_${mod}"
@@ -156,6 +164,7 @@ CDEPEND="
 	ssl? ( dev-libs/openssl )
 	http-cache? ( userland_GNU? ( dev-libs/openssl ) )
 	nginx_modules_http_geo? ( 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] )
@@ -165,18 +174,24 @@ CDEPEND="
 	nginx_modules_http_spdy? ( >=dev-libs/openssl-1.0.1c )
 	nginx_modules_http_xsltproc? ( dev-libs/libxml2 dev-libs/libxslt dev-libs/icu dev-libs/libmemcached )
 	nginx_modules_http_lua? ( || ( dev-lang/lua dev-lang/luajit ) )
-	nginx_modules_http_auth_pam? ( virtual/pam )"
+	nginx_modules_http_auth_pam? ( virtual/pam )
+	nginx_modules_http_metrics? ( dev-libs/yajl )"
 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 )
+	nginx_modules_http_lua? ( nginx_modules_http_rewrite )"
 
 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 -1 ${PN}
+	enewuser ${PN} -1 -1 "${NGINX_HOME}" ${PN}
 	eend $?
 
 	if use libatomic; then
@@ -199,13 +214,23 @@ pkg_setup() {
 }
 
 src_prepare() {
-	use syslog && epatch "${SYSLOG_MODULE_WD}"/syslog_${SYSLOG_MODULE_NGINX_PV}.patch
+	epatch "${FILESDIR}/${P}-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
 
 	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() {
@@ -264,11 +289,6 @@ src_configure() {
 		myconf+=" --add-module=${HTTP_CACHE_PURGE_MODULE_WD}"
 	fi
 
-	if use nginx_modules_http_upload; then
-		http_enabled=1
-		myconf+=" --add-module=${HTTP_UPLOAD_MODULE_WD}"
-	fi
-
 	if use nginx_modules_http_slowfs_cache; then
 		http_enabled=1
 		myconf+=" --add-module=${HTTP_SLOWFS_CACHE_MODULE_WD}"
@@ -290,6 +310,16 @@ src_configure() {
 		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_xsltproc; then
 		http_enabled=1
 		myconf+=" --add-module=${WORKDIR}/yoreek-nginx-xsltproc-module-${HTTP_XSLTPROC_MODULE_SHA1}"
@@ -338,15 +368,15 @@ src_configure() {
 		--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}"/var/lock/${PN}.lock \
+		--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}"/var/tmp/${PN}/client \
-		--http-proxy-temp-path="${EPREFIX}"/var/tmp/${PN}/proxy \
-		--http-fastcgi-temp-path="${EPREFIX}"/var/tmp/${PN}/fastcgi \
-		--http-scgi-temp-path="${EPREFIX}"/var/tmp/${PN}/scgi \
-		--http-uwsgi-temp-path="${EPREFIX}"/var/tmp/${PN}/uwsgi \
+		--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"
 }
 
@@ -361,7 +391,9 @@ src_install() {
 
 	cp "${FILESDIR}"/nginx.conf "${ED}"/etc/nginx/nginx.conf || die
 
-	newinitd "${FILESDIR}"/nginx.initd nginx
+	newinitd "${FILESDIR}"/nginx.initd-r2 nginx
+
+	systemd_dounit "${FILESDIR}"/nginx.service
 
 	doman man/nginx.8
 	dodoc CHANGES* README
@@ -370,6 +402,10 @@ src_install() {
 	keepdir /var/www/localhost
 	rm -rf "${D}"/usr/html || die
 
+	keepdir /var/log/nginx "${NGINX_HOME_TMP}"/{,client,proxy,fastcgi,scgi,uwsgi}
+	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
@@ -395,11 +431,6 @@ src_install() {
 		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 "${HTTP_UPLOAD_MODULE_WD}"/{Changelog,README}
-	fi
-
 	if use nginx_modules_http_slowfs_cache; then
 		docinto ${HTTP_SLOWFS_CACHE_MODULE_P}
 		dodoc "${HTTP_SLOWFS_CACHE_MODULE_WD}"/{CHANGES,README.md}
@@ -419,6 +450,16 @@ src_install() {
 		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
+
+	if use nginx_modules_http_metrics; then
+		docinto ${HTTP_METRICS_MODULE_P}
+		dodoc "${HTTP_METRICS_MODULE_WD}"/README.md
+	fi
 }
 
 pkg_postinst() {
@@ -428,4 +469,29 @@ pkg_postinst() {
 			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
 }
diff --git a/www-servers/nginx/nginx-1.2.6-r2.ebuild b/www-servers/nginx/nginx-1.4.1-r103.ebuild
index 6c66881..c57bd70 100644
--- a/www-servers/nginx/nginx-1.2.6-r2.ebuild
+++ b/www-servers/nginx/nginx-1.4.1-r103.ebuild
@@ -1,8 +1,8 @@
 # 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.2.6-r1.ebuild,v 1.4 2013/02/18 14:30:20 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/nginx-1.4.1-r3.ebuild,v 1.1 2013/05/14 06:59:27 dev-zero Exp $
 
-EAPI="4"
+EAPI="5"
 
 # Maintainer notes:
 # - http_rewrite-independent pcre-support makes sense for matching locations without an actual rewrite
@@ -18,14 +18,14 @@ EAPI="4"
 GENTOO_DEPEND_ON_PERL="no"
 
 # syslog
-SYSLOG_MODULE_PV="0.24"
-SYSLOG_MODULE_NGINX_PV="1.2.0"
+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.17"
+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}"
@@ -37,7 +37,7 @@ HTTP_UPLOAD_PROGRESS_MODULE_URI="https://github.com/masterzen/nginx-upload-progr
 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.19"
+HTTP_HEADERS_MORE_MODULE_PV="0.20"
 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}"
@@ -49,19 +49,13 @@ HTTP_PUSH_MODULE_URI="http://pushmodule.slact.net/downloads/nginx_http_push_modu
 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.0"
+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_upload (http://www.grid.net.ru/nginx/upload.en.html, BSD license)
-HTTP_UPLOAD_MODULE_PV="2.2.0"
-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.9"
+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}"
@@ -73,7 +67,7 @@ HTTP_FANCYINDEX_MODULE_URI="http://gitorious.org/ngx-fancyindex/ngx-fancyindex/a
 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.7.11"
+HTTP_LUA_MODULE_PV="0.8.1"
 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}"
@@ -84,13 +78,25 @@ 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}.tar.gz"
 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="99f39394f387211641a1668d61faf2d5186ea1f5"
+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/${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}"
+
 # http_xsltproc (http://github.com/yoreek/nginx-xsltproc-module/, BSD license)
 HTTP_XSLTPROC_MODULE_PV="0.14"
 HTTP_XSLTPROC_MODULE_P="ngx_xsltproc-${HTTP_XSLTPROC_MODULE_PV}"
 HTTP_XSLTPROC_MODULE_SHA1="9bb572d"
 HTTP_XSLTPROC_MODULE_URI="https://github.com/yoreek/nginx-xsltproc-module/tarball/v${HTTP_XSLTPROC_MODULE_PV}"
 
-inherit eutils ssl-cert toolchain-funcs perl-module flag-o-matic user
+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"
@@ -101,37 +107,39 @@ SRC_URI="http://nginx.org/download/${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_upload? ( ${HTTP_UPLOAD_MODULE_URI} -> ${HTTP_UPLOAD_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_xsltproc? ( ${HTTP_XSLTPROC_MODULE_URI} -> ${HTTP_XSLTPROC_MODULE_P}.tar.gz )"
 
 LICENSE="BSD-2 BSD SSLeay MIT GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+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 gzip_static image_filter
-mp4 perl random_index realip secure_link stub_status sub"
+NGINX_MODULES_OPT="addition dav degradation flv geoip gunzip gzip_static image_filter
+mp4 perl random_index realip secure_link spdy stub_status sub"
 NGINX_MODULES_MAIL="imap pop3 smtp"
 NGINX_MODULES_3RD="
 	http_upload_progress
 	http_headers_more
 	http_push
 	http_cache_purge
-	http_upload
 	http_slowfs_cache
 	http_fancyindex
 	http_lua
 	http_auth_pam
+	http_upstream_check
+	http_metrics
 	http_xsltproc"
 
 IUSE="aio debug +http +http-cache ipv6 libatomic +pcre pcre-jit selinux ssl
-syslog vim-syntax +nginx_modules_http_xsltproc"
+syslog userland_GNU vim-syntax +nginx_modules_http_xsltproc"
 
 for mod in $NGINX_MODULES_STD; do
 	IUSE="${IUSE} +nginx_modules_http_${mod}"
@@ -156,26 +164,34 @@ CDEPEND="
 	ssl? ( dev-libs/openssl )
 	http-cache? ( userland_GNU? ( dev-libs/openssl ) )
 	nginx_modules_http_geo? ( 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_xsltproc? ( dev-libs/libxml2 dev-libs/libxslt dev-libs/icu dev-libs/libmemcached )
 	nginx_modules_http_lua? ( || ( dev-lang/lua dev-lang/luajit ) )
-	nginx_modules_http_auth_pam? ( virtual/pam )"
+	nginx_modules_http_auth_pam? ( virtual/pam )
+	nginx_modules_http_metrics? ( dev-libs/yajl )"
 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 )
+	nginx_modules_http_lua? ( nginx_modules_http_rewrite )"
 
 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 -1 ${PN}
+	enewuser ${PN} -1 -1 "${NGINX_HOME}" ${PN}
 	eend $?
 
 	if use libatomic; then
@@ -198,13 +214,23 @@ pkg_setup() {
 }
 
 src_prepare() {
-	use syslog && epatch "${SYSLOG_MODULE_WD}"/syslog_${SYSLOG_MODULE_NGINX_PV}.patch
+	epatch "${FILESDIR}/${P}-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
 
 	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() {
@@ -263,11 +289,6 @@ src_configure() {
 		myconf+=" --add-module=${HTTP_CACHE_PURGE_MODULE_WD}"
 	fi
 
-	if use nginx_modules_http_upload; then
-		http_enabled=1
-		myconf+=" --add-module=${HTTP_UPLOAD_MODULE_WD}"
-	fi
-
 	if use nginx_modules_http_slowfs_cache; then
 		http_enabled=1
 		myconf+=" --add-module=${HTTP_SLOWFS_CACHE_MODULE_WD}"
@@ -289,6 +310,16 @@ src_configure() {
 		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_xsltproc; then
 		http_enabled=1
 		myconf+=" --add-module=${WORKDIR}/yoreek-nginx-xsltproc-module-${HTTP_XSLTPROC_MODULE_SHA1}"
@@ -336,16 +367,16 @@ src_configure() {
 		--prefix="${EPREFIX}"/usr \
 		--conf-path="${EPREFIX}"/etc/${PN}/${PN}.conf \
 		--error-log-path="${EPREFIX}"/var/log/${PN}/error_log \
-		--pid-path="${EPREFIX}"/var/run/${PN}.pid \
-		--lock-path="${EPREFIX}"/var/lock/nginx.lock \
+		--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}"/var/tmp/${PN}/client \
-		--http-proxy-temp-path="${EPREFIX}"/var/tmp/${PN}/proxy \
-		--http-fastcgi-temp-path="${EPREFIX}"/var/tmp/${PN}/fastcgi \
-		--http-scgi-temp-path="${EPREFIX}"/var/tmp/${PN}/scgi \
-		--http-uwsgi-temp-path="${EPREFIX}"/var/tmp/${PN}/uwsgi \
+		--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"
 }
 
@@ -360,7 +391,9 @@ src_install() {
 
 	cp "${FILESDIR}"/nginx.conf "${ED}"/etc/nginx/nginx.conf || die
 
-	newinitd "${FILESDIR}"/nginx.initd nginx
+	newinitd "${FILESDIR}"/nginx.initd-r2 nginx
+
+	systemd_newunit "${FILESDIR}"/nginx.service-r1 nginx.service
 
 	doman man/nginx.8
 	dodoc CHANGES* README
@@ -369,6 +402,10 @@ src_install() {
 	keepdir /var/www/localhost
 	rm -rf "${D}"/usr/html || die
 
+	keepdir /var/log/nginx "${NGINX_HOME_TMP}"/{,client,proxy,fastcgi,scgi,uwsgi}
+	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
@@ -394,11 +431,6 @@ src_install() {
 		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 "${HTTP_UPLOAD_MODULE_WD}"/{Changelog,README}
-	fi
-
 	if use nginx_modules_http_slowfs_cache; then
 		docinto ${HTTP_SLOWFS_CACHE_MODULE_P}
 		dodoc "${HTTP_SLOWFS_CACHE_MODULE_WD}"/{CHANGES,README.md}
@@ -418,6 +450,16 @@ src_install() {
 		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
+
+	if use nginx_modules_http_metrics; then
+		docinto ${HTTP_METRICS_MODULE_P}
+		dodoc "${HTTP_METRICS_MODULE_WD}"/README.md
+	fi
 }
 
 pkg_postinst() {
@@ -427,4 +469,29 @@ pkg_postinst() {
 			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
 }
author	Yuriy Ustushenko <yoreek@yahoo.com>	2013-05-14 22:51:28 +0300
committer	Yuriy Ustushenko <yoreek@yahoo.com>	2013-05-14 22:51:28 +0300
commit	3ca7a0ce568c4f89c342952cb9e131b36224dc5f (patch)
tree	afdbe4cbbfc13cc68fb1d2833c35bd3bb9f65ae6 /www-servers
parent	new version (diff)
download	yoreek-3ca7a0ce568c4f89c342952cb9e131b36224dc5f.tar.gz yoreek-3ca7a0ce568c4f89c342952cb9e131b36224dc5f.tar.bz2 yoreek-3ca7a0ce568c4f89c342952cb9e131b36224dc5f.zip