Drop vulnerable versions, fix bug #458726 again for /var/tmp/nginx and stricter default permissions for /var/log/nginx.

Package-Manager: portage-2.1.11.58/cvs/Linux x86_64
RepoMan-Options: --force
Manifest-Sign-Key: 0x1E0CA85F!

6 files changed, 136 insertions, 423 deletions

diff --git a/www-servers/nginx/ChangeLog b/www-servers/nginx/ChangeLog
index a61e993333d0..22186fb2d14e 100644
--- a/www-servers/nginx/ChangeLog
+++ b/www-servers/nginx/ChangeLog
@@ -1,6 +1,14 @@
 # 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.350 2013/05/08 08:34:43 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/ChangeLog,v 1.351 2013/05/08 13:52:19 dev-zero Exp $
+
+*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)
 
diff --git a/www-servers/nginx/Manifest b/www-servers/nginx/Manifest
index 1b167471f543..299390468c50 100644
--- a/www-servers/nginx/Manifest
+++ b/www-servers/nginx/Manifest
@@ -3,12 +3,13 @@ Hash: SHA256
 
 AUX nginx.conf 1358 SHA256 6ff6c9301ea2a4d74a335b9119d7f9dba87d4e83793cf22d837d49f061763096 SHA512 1873c9e54ea5020160c86da3f300e3eac589c0d30cdbe3446476b5b3f5bd388da95224cfb1a020b41720c9ce55ab6bb945dcc41612d5850da0e2ae0ceeeaa587 WHIRLPOOL 7672245bd11d6ed987e13d6bfe4dbc2140cc3d2e22616c49ab7ed5f42135c96b5779e4dfd16ba9e2d82aa59d98cd56a4872d18c3774e357ef79385fc874387d2
 AUX nginx.initd 2264 SHA256 80223d27e5bdbcd6bcb9c3830b00f7aa04f4777bc26dfe4bd1f07afd640319c5 SHA512 1f0069815f6609440ccad040f2f13931f3821452a6ad2d8a88c8e2b5f5fcec08e08305c7d3c74855c7350c60b4cd7ea578fb30afd18d89b8f867b4de961919cd WHIRLPOOL 4c4e86d57f3ebe0a40ab8328fc892b9954b26671137cf6528b316030d83fd306bbff29ecd7bb492aaad23de9cb613d78d5e546a0772f7d36409534a2bb92b2ec
+AUX nginx.initd-r1 2269 SHA256 e3287a164045fc3e916107d20a49eda0d91963265ffaac68b41ae0a9cb7cf2e2 SHA512 f65839a6bf8718c323c6a2081646eb322e53937c3f8a1aee7fadecf58dd4cee4ea3119012c6db1af3eabb6c6d7c1c5ef0d2f19fdce9c3766fbcdf3fdbfc3af48 WHIRLPOOL 02c94aa982000dd987ba71859e74cdb4bbc324b954b8f6b556ac66e10a02f236ddbb90ac0108465d2ecf78fbe9a1edaf6efd8424bbbd1bb679ef15cbf3492381
 AUX nginx.logrotate 356 SHA256 4d3c038104eaeb4cb012bd8547f9d3eb578df205ccd43884fbf72945accc6bd0 SHA512 c66f8307c24ed98e3135069b3ce6aaf7bbca864747cbf909eae65726ac71fd5f7f56d7ed963a6aedfcdb8a05a91d3988030281f4cad28735de90ae28a85bc245 WHIRLPOOL 95001d0b76a350ce9ce96bfb342a93c8110fbd174484489ac2a64c2f6c496a53d967d303a6cbbefa820ff4e93dcd2d5d968cee5b7d33a83445578b458b5d3c51
 AUX nginx.service 386 SHA256 e4e2bcb41f66f0a7e618f254d47b8fb0f6258efa77a83a1259293e4566f24d87 SHA512 3be27f2520df3633efc78f0b5af0a4d71b7e1f33d71c5e7f87f8dd42ddcb6cd692f51a7133c02a09441be813ac67670c0cd6f0781327d3c65c7bfd57cba59dc7 WHIRLPOOL e63bbcae119a69fa31b1c246baaf4c224608a5d368b0695c7208d42e215b95d56dff4a6fcfa66ea82bb9b1f7b3b26d15c7ba14772eb4620d951c57e869a97a20
 AUX nginx.tmpfiles 340 SHA256 514af4e5049fa6052f1a804e84c0eba6b48b05afea35e2ba085765d45d7e0a4b SHA512 8a5fec593efc943aaa8b5737dc4f61d3200fc1a875777be1f275445e32afe01d82028fc2c0b568cadb9d8353fb88dd9630042085d8da95faae854b8d05494997 WHIRLPOOL 508e189b7a2bdb4a44c8f03d3fb90c4bfcdbfe159939cbdd679ce565ae0dd55f1a15c9b9caee11716340349591c1239ec0cdbb1004d800dff1a5736be1360345
+AUX nginx.tmpfiles-r1 340 SHA256 05e159d05ef1b4bd4886ca49305ac0bdcb5ce4f4de398be958635a6eb99c2d50 SHA512 24a62a8173a169a2164bba5759d8e6d745d9907acf2391267ae2f009f460134ddd664a43f7b0b874e1604bc5b394395ed242f06b807c68d8caa8eb429e0b6bf2 WHIRLPOOL c20433ca980d6f38da1d21776cd5ee77f06f718e819eddc3b2b1f9096292789fc8628e1c18fab6f5fcb1bea869ba0ea5d63fb88e4051268ce271c5c215fd2c12
 DIST nginx-1.2.6.tar.gz 726025 SHA256 0510af71adac4b90484ac8caf3b8bd519a0f7126250c2799554d7a751a2db388 SHA512 659f01b0349292f7176f9bf6981bb0b270d724c5bd621556a0f1521d220995393789f6aea42ad3d1044207b9b2fb0aa40f81a069dbcb8eec4b3503b1e0826d64 WHIRLPOOL 48b0f715c43c27ad6aafc70e93f38e95b75dba27b4f010d002c4a0eb85faec0a68e2c7e9f7cc6e76253938c17df3ab528b29f727676a0ade9ed3cc46097ef66f
 DIST nginx-1.2.8.tar.gz 730589 SHA256 d2947c98c5bed311b1e6c04e35a730af92e40e2e6bfe9201fa7f404987457137 SHA512 f3e609d01f65eecaaa11ff995e208f5b93e28e28271c13fb65c361ab142bf24464d7d9daa8f697f6fda09ca94b277814346adfcbd889c9018f8fdcb1b9d68d02 WHIRLPOOL a7096e6efcf354e8b4a5649edb5e8aa1bf63e3e6381273b94271b280ee31869b88a9d757f268e3b1d2bc72452828ddabb5c8773bb2e44b0843de7b75e67cdfdb
-DIST nginx-1.4.0.tar.gz 773451 SHA256 84aeb7a131fccff036dc80283dd98c989d2844eb84359cfe7c4863475de923a9 SHA512 c9a219f0e845a13116d0a425acba99fd39fc0c46ea9e656aee1a9cebb41d580796f1564d7eebd407525938fe3e8324f7bd19d7fd6df1013ad54039301d44f136 WHIRLPOOL 4ec3ec60d899da7913849b9ef63266f77f4bd808d6a2020911d694ba77643edc5f7da5494cad402004b679e7f3f9591c47f58c3501649e07454fd0246b3cff92
 DIST nginx-1.4.1.tar.gz 767107 SHA256 bca5d1e89751ba29406185e1736c390412603a7e6b604f5b4575281f6565d119 SHA512 174902d24a60b609688600761374e4ba42e0444439ead84c79ff2e82d0233f8759b57a0b76b82a1f571e38ecce0d7059dc2f057672a7004b6f0060968b4b981e WHIRLPOOL d8a95b32fa5af256b5d0f41bdbcbc381d68fc72a4db2dd0cc3dbe1cc298495a08129a279939aad4da0bcfb5867c5538551e5f6e8332c0bc328d17f490f5e7525
 DIST ngx_devel_kit-0.2.17-r1.tar.gz 64960 SHA256 564c827237e123709eb8f30ec4e2ff981752fe7b1ea0798fdf1a68c66dc99165 SHA512 c8edd92fdf9f5cc45a10a31722ee498aefb5d999b9d9c0d3ce977ffc4b2f8883246ec7b64fdcfb00e480fb0044763a9b8cde5e5eb1248a05752a7983b0ebca8e WHIRLPOOL 1b02825e7f4d87b1502a472bffeacf72dd449a9bad014cce6c79d9b77541988281aa6ba913a33dbbc3f423bd6d7742005c4defb36080b1e81ddc07585c44bd75
 DIST ngx_devel_kit-0.2.18-r1.tar.gz 64972 SHA256 c9c9f0a1b068d38c6c45b15d9605f1b2344dbcd45abf0764cd8e2ba92d6a3d2c SHA512 949a4c090272d8a112770dd47fb0dd55b1ebc9991f93b5ffe18ffa03f24fecba9a2e80bd32b8d2103ee4d26cf95a8ba68793a3bd2d33e8dc3c12b6dc9bf781ff WHIRLPOOL 80fe1c70c7c836afe2a52faaa58f72588ad2e6c79c1454d8808774fe3a2bfed71481aaa1c7255a467c8e6cd77243af232538fff26453ee761778f3162983bff1
@@ -31,21 +32,20 @@ DIST ngx_syslog-0.24.tar.gz 90026 SHA256 a87d2863e1fa61cf5050ccb0d6140fa5b8bbd4c
 DIST ngx_syslog-0.25.tar.gz 91070 SHA256 8bafa901d2f9af0b54f1a014fdfaa07140bd4584cfada3189eddd2a7ff5b0195 SHA512 c869dc5c26484477cd9663bc860235a39813a41ac8be4b8f8f3c062c723aa431247d3b5915c962c7fcff36889d5541e8c844eaf6ece88c2c61d2f180f643f8b5 WHIRLPOOL 1829f60f9ab26c131d8fce56b2ff15276a2e99e2f6f96749ebf417e6e3d438249c79de8e6210d702acac8a1309fca417b12894428b53f280c76564a6839b4a2d
 EBUILD nginx-1.2.6-r1.ebuild 14716 SHA256 13be5c2d7e89245ff490fde964771ff9a4d83e29f498f4e9c447bcc103e66d61 SHA512 bee6a7e12efcabbc8a1f77f9d48b0dccbfb5530e8d66eb669cc84569f38d681540fe483a1ae84aa2e795c1405aaadbfdfc58e4103de9d68ea0070caf4366b498 WHIRLPOOL 11afcfa387c35042b880c147214955b78a3760b1320a3181c120e3fcd13693b85533ccaef73a2906d36199a138f0c0885ca4e4d8a71ebe8130518d8b8daa5ce9
 EBUILD nginx-1.2.8.ebuild 14824 SHA256 82ce9257e5b6e6395635ea37569e58249d4e357b5494dc0d37af13ff689f9c82 SHA512 76129ce3ecd48659aae97e2b6c56baa758736c0e3a779c08d73d76c4e7a53d0acc9685a2c87586b63f5a5d07487819ad2d8d003fbdbad841fbdaf5dbd2dfb28b WHIRLPOOL 78bf7511def810f56603a4da1e9ed1f9cdfdce7f0d3c440d73276c1f081e5eadd91a7d3a7c171d6385c923e6f283178609ca07f7355f6b8e684c4c6ace452a4d
-EBUILD nginx-1.4.0-r1.ebuild 16250 SHA256 43110df5fba254df0f3df51fb0f9b83e01e3a1d1639f241b2d626fa019e4da4f SHA512 6f28c0524793003bf1feb03f5b361181ab3dde837b65cbb06e100dc280890264ca7a15aa363641fafe12721456837911baf05dad1c1522465bab704fab1baae4 WHIRLPOOL c4433eec64b5856f6d7facf4b16cd9f3d47d596752f522247893a2fe55d4c933849d6ffcd748e6b59f18fca46e986bc35fb3cc68a0db3f0e7ea4f8f5b4a6eaae
-EBUILD nginx-1.4.0.ebuild 14172 SHA256 dba0766eb87fc07a214bd9f6e99de08dc7de9f0679db6baefea4ff3130702f0e SHA512 2d15de18b3c326e2bbb69925655ca6a0bf7c5d1988b8f7b14029398f92ced71255c29cfe3b6343ea5b69f1b5287c8c937dcd320e1e32db944c9c7c538e4f6191 WHIRLPOOL 7da90c9524b3ef111f18776b0e090f71d05de2fbd14b6aaf368bfdd09cbdbc93ba0de4b39cfafc34548cd648ac0f3ae23156b97225af407fc89348ac3626e32e
+EBUILD nginx-1.4.1-r1.ebuild 16312 SHA256 96b469a5f04987af71b40bc712440cd945e0d7e8b29560dcb4730263fc3f53f0 SHA512 0d614c8517b32920d0a980222204358a072d83b9b75aa22c955146511c54292b65fb297187b476aa63c0cdf8254e0f2d2b9460e648e98a643616bd17d0881878 WHIRLPOOL 2731e2a803da7b62dafb85b5d2fcb8b5c5b8dc99d2a2453197723adc575d7c8d982040f4fc7f611818d65c6fb6f9bb67f6075baf3e12a1d0f54a4a5bb5115d11
 EBUILD nginx-1.4.1.ebuild 16303 SHA256 8b1bc9eca3ef1408d242ccf43d51067b471e43436733182c763582e4c1338daf SHA512 dfc6bd8b93ffd6dafe4ec799500be728b623816626d7751873f1726987698b86e5c7980643b02f0d24b0ea52d3ec29bcbc12a43d13d4db10579c95187666c319 WHIRLPOOL bfff2ecc8eab6d7a6dd877902d6e1cbea3a11fce2d053640d766a08cf8ce7004e5ab3313298fcecee544de40ca98d98bd6ca5ad88535d7bb56e86f8f44c5862d
-MISC ChangeLog 57302 SHA256 65492ee7d88b8390d3ba07ef039fdf10c90dd4984040bae706ec33df7a0d8f3d SHA512 db7da6920c4c865c199c44d95528f1dabfe92566ec26385b9a83f53ea32a0a3d80dd2a59b28b6ccbc0204939dd02c046f7fd465cf05b5fe4e8a52b0fb82f17f6 WHIRLPOOL d6ec36f467c61613fa259ad2356069161dce9437ba68bb7417f61a5d70c884870df0a907f220f800e3b5e18f8e526bc1f4a84e30e80959cefa9ed806ddb76eae
+MISC ChangeLog 57633 SHA256 14ad5cdcc866bf6fbae43eb0b61eb33e37c0ac7405b0bb07efee265f52cd0ab1 SHA512 9670ba39fa7062270863946ae4d414617c0858f375c0feb6e424b2606a78112b10cb72b84d6f51a6c819fed26db5654f7588eb5111298433651fd99e94bb7447 WHIRLPOOL 7b54195243a29ec0cc62a37d592cb1107ce069249a8a4c4b68873bcf4714a5b63024336d19d8b29a47199bac0e66caefb3ff5923c4e27ebae0a6acd97ce52264
 MISC metadata.xml 827 SHA256 750fe1d3ad8a43f2772ba296a0bfd35259d32a1746847dfe4119a18d49c01397 SHA512 5248aaf2524123b68d6fd6b82bc58426d419801763d8dcb87b5a5b15475936daf0160f9e878db06307ede0ab215ba0b571a9ff39873f7a77c18780f31c92b0d0 WHIRLPOOL 70c74c2b920dc049b01038e89d7046d188cad9a8a60cbd52dd11db32fe34ca9b55e62ec0bf3ad32c7fb8b26e519a97dc38175f1be3ef5e24c3d55d76f6ed8d10
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQF8BAEBCABmBQJRig4nXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQF8BAEBCABmBQJRiliUXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ1RjI0QTQ0MjI1OURBNzI4MEIyREExRkQx
-RTdDRkM3NzFFMENBODVGAAoJEB58/HceDKhfqQkH+weB/FWt7dUx9mkCqcEz9okC
-EC0VaGNsZif3+4S6wbq9W9tL/Bzxl2qK7fpCpoGzrm7StTLpCMhgwGFmbI+LMB4R
-UXSUeLZjhE0MX/BJem2xVMUYji1CCTG/o1lC5zCBT438Taz3bC9Aa8+n8i++5qc8
-szNVwVdwQIuO+S6k5Y0i23mm5lu2jxCiysr0VEo9fhffgCFR1D/jUjzS7b0v6TAd
-aHeAt5tWczJKXe5Yaa+33fFmV6w0ekkxCm3QvOV3/xnwQAFmoMhYlCQ0LRjQzob7
-+CAJqdAq87RmSH4B/awL2n/JCtOaaxTKLQX7vgSboOh2f1wq0Q4c4/5gwMgcn3w=
-=Am0h
+RTdDRkM3NzFFMENBODVGAAoJEB58/HceDKhfrh8IAILnvz5T/6uKZTkmJe0nLUoV
+Gzy2RU/nrEgTLvmu8YgOJecYbOjERtDiOXYsP0Fro1AK/uotMhydNVzgIMpWHmQ0
+1vTQOF90WYDBM7zPUf7MaZDbR/Kj/j4K4PcAKuQuPCcnZneKgR/QMonpMG2+MBeX
+fzOG8HevvUX+ZwAZgXJu1G3RXWfp6WSRtMhEJjwH86QdfLRtUXD3/0P/+kSFg0zh
+QqiWLf+6Yy4L2fKyRH+5Lz1E85ZvideVd3GOzOYWAdtaYfjrgE+DYKVfNBaXU5Oj
+jyOVuFdVVs1YfmddTjH7yyYNgcMOnv+YZm5MRZI2b9nUfTtnsu3mNYFcGVbXOoQ=
+=YKTL
 -----END PGP SIGNATURE-----
diff --git a/www-servers/nginx/files/nginx.initd-r1 b/www-servers/nginx/files/nginx.initd-r1
new file mode 100644
index 000000000000..d98ddb098734
--- /dev/null
+++ b/www-servers/nginx/files/nginx.initd-r1
@@ -0,0 +1,97 @@
+#!/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-r1,v 1.1 2013/05/08 13:52:19 dev-zero Exp $
+
+extra_commands="configtest"
+extra_started_commands="upgrade reload"
+
+description="Robust, small and high performance http and reverse proxy server"
+description_configtest="Run nginx' internal config check."
+description_upgrade="Upgrade the nginx binary without losing connections."
+description_reload="Reload the nginx configuration without losing connections."
+
+nginx_config=${nginx_config:-/etc/nginx/nginx.conf}
+
+command="/usr/sbin/nginx"
+command_args="-c ${nginx_config}"
+pidfile=${pidfile:-/run/nginx.pid}
+user=${user:-nginx}
+group=${group:-nginx}
+
+depend() {
+	need net
+	use dns logger netmount
+}
+
+start_pre() {
+	if [ "${RC_CMD}" != "restart" ]; then
+		configtest || return 1
+	fi
+}
+
+stop_pre() {
+	if [ "${RC_CMD}" = "restart" ]; then
+		configtest || return 1
+	fi
+}
+
+stop_post() {
+	rm -f ${pidfile}
+}
+
+reload() {
+	configtest || return 1
+	ebegin "Refreshing nginx' configuration"
+	kill -HUP `cat ${pidfile}` &>/dev/null
+	eend $? "Failed to reload nginx"
+}
+
+upgrade() {
+	configtest || return 1
+	ebegin "Upgrading nginx"
+
+	einfo "Sending USR2 to old binary"
+	kill -USR2 `cat ${pidfile}` &>/dev/null
+
+	einfo "Sleeping 3 seconds before pid-files checking"
+	sleep 3
+
+	if [ ! -f ${pidfile}.oldbin ]; then
+		eerror "File with old pid not found"
+		return 1
+	fi
+
+	if [ ! -f ${pidfile} ]; then
+		eerror "New binary failed to start"
+		return 1
+	fi
+
+	einfo "Sleeping 3 seconds before WINCH"
+	sleep 3 ; kill -WINCH `cat ${pidfile}.oldbin`
+
+	einfo "Sending QUIT to old binary"
+	kill -QUIT `cat ${pidfile}.oldbin`
+
+	einfo "Upgrade completed"
+	eend $? "Upgrade failed"
+}
+
+configtest() {
+	# see bug #446734
+	if [ ! -d /var/log/nginx ]; then
+		checkpath -q -d -m 0750 -o root:0 /var/log/nginx
+	fi
+
+	checkpath -q -d -m 0750 -o ${user}:${group} /var/tmp/nginx
+	checkpath -q -d -m 0750 -o ${user}:${group} /var/tmp/nginx/{client,proxy,fastcgi,scgi,uwsgi}
+
+	ebegin "Checking nginx' configuration"
+	${command} -c ${nginx_config} -t -q
+
+	if [ $? -ne 0 ]; then
+		${command} -c ${nginx_config} -t
+	fi
+
+	eend $? "failed, please correct errors above"
+}
diff --git a/www-servers/nginx/files/nginx.tmpfiles-r1 b/www-servers/nginx/files/nginx.tmpfiles-r1
new file mode 100644
index 000000000000..1551c877259f
--- /dev/null
+++ b/www-servers/nginx/files/nginx.tmpfiles-r1
@@ -0,0 +1,10 @@
+# systemd tmpfile settings for nginx
+# See tmpfiles.d(5) for details
+
+d /var/log/nginx 0750 root root -
+d /var/tmp/nginx 0750 nginx nginx
+d /var/tmp/nginx/client 0750 nginx nginx
+d /var/tmp/nginx/proxy 0750 nginx nginx
+d /var/tmp/nginx/fastcgi 0750 nginx nginx
+d /var/tmp/nginx/scgi 0750 nginx nginx
+d /var/tmp/nginx/uwsgi 0750 nginx nginx
diff --git a/www-servers/nginx/nginx-1.4.0.ebuild b/www-servers/nginx/nginx-1.4.0.ebuild
deleted file mode 100644
index 0872f65d7399..000000000000
--- a/www-servers/nginx/nginx-1.4.0.ebuild
+++ /dev/null
@@ -1,403 +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.4.0.ebuild,v 1.1 2013/04/25 06:45:08 hollow 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.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.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.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}"
-
-inherit eutils ssl-cert toolchain-funcs perl-module flag-o-matic user systemd
-
-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 )"
-
-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 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"
-
-IUSE="aio debug +http +http-cache ipv6 libatomic +pcre pcre-jit selinux ssl
-syslog 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_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_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 )"
-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_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 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}"/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
-
-	systemd_newtmpfilesd "${FILESDIR}"/nginx.tmpfiles nginx.conf
-	systemd_dounit "${FILESDIR}"/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
-
-	# 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
-}
-
-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.4.0-r1.ebuild b/www-servers/nginx/nginx-1.4.1-r1.ebuild
index 1e1eee70478b..9c7945519477 100644
--- a/www-servers/nginx/nginx-1.4.0-r1.ebuild
+++ b/www-servers/nginx/nginx-1.4.1-r1.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.4.0-r1.ebuild,v 1.1 2013/05/02 20:14:31 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/nginx-1.4.1-r1.ebuild,v 1.1 2013/05/08 13:52:19 dev-zero 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}"
@@ -55,7 +55,7 @@ HTTP_CACHE_PURGE_MODULE_URI="http://labs.frickle.com/files/ngx_cache_purge-${HTT
 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.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}"
@@ -115,7 +115,7 @@ 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
+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="
@@ -156,6 +156,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] )
@@ -370,9 +371,9 @@ src_install() {
 
 	cp "${FILESDIR}"/nginx.conf "${ED}"/etc/nginx/nginx.conf || die
 
-	newinitd "${FILESDIR}"/nginx.initd nginx
+	newinitd "${FILESDIR}"/nginx.initd-r1 nginx
 
-	systemd_newtmpfilesd "${FILESDIR}"/nginx.tmpfiles nginx.conf
+	systemd_newtmpfilesd "${FILESDIR}"/nginx.tmpfiles-r1 nginx.conf
 	systemd_dounit "${FILESDIR}"/nginx.service
 
 	doman man/nginx.8