mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-09-24 04:59:14 -07:00
www-servers/nginx: Bump to v1.11.6 mainline
Ebuild changes: =============== - ngx_headers_more module updated to v0.32 - LUA module updated to v0.10.7 - Patch for ngx_memc added to solve a build issue with latest nginx [Link 1] Link 1: https://github.com/openresty/memc-nginx-module/issues/26 Package-Manager: portage-2.3.2
This commit is contained in:
Thomas Deutschmann
@@ -3,6 +3,7 @@ DIST nginx-1.10.1.tar.gz 909077 SHA256 1fd35846566485e03c0e318989561c135c598323f
|
||||
DIST nginx-1.10.2.tar.gz 910812 SHA256 1045ac4987a396e2fa5d0011daf8987b612dd2f05181b67507da68cbe7d765c2 SHA512 f2d5a4fbabaf9333bae46461bcbe3dbcc5ff7e8f8c7a5dead3063e3d59c9ec15dc85262a23ca7d693db45a50ec98a70fb216b3da9872ee23d57b6bfaf064876e WHIRLPOOL 7e819f43a68de49d3cceb3e5ec81eef6872859df0abca2be00fb73c8779c2716b6997ea5f8cadb93af195d9f4d07a4404f51e0752dd881628de93a0c0289aea7
|
||||
DIST nginx-1.11.4.tar.gz 949793 SHA256 06221c1f43f643bc6bfe5b2c26d19e09f2588d5cde6c65bdb77dfcce7c026b3b SHA512 c6a03c440a274576434aa74932b3fa7cd49174d9e2d8c6e480838637f33f158e31b6f25cac97e158f386bb92f62ff9636c2d3ac1a552e27a860eb9448e2f3f94 WHIRLPOOL 53c371cb34bc55f28d0a0915e08a4fdeffcfcbc8571628db086e0a75627c926693f2faba8608f0c444bc79df244b7f321e6017eda0eb7710d2ccb6f25aac8b75
|
||||
DIST nginx-1.11.5.tar.gz 956517 SHA256 223f8a2345a75f891098cf26ccdf208b293350388f51ce69083674c9432db6f6 SHA512 f41b21b5d8c6b7fe7f8713e96fb6b1c40da49bf64ebb790fb5aa38f036a37b36fcf048ff72c2216552b2f75366b30c5fcdef26312bd4e5515b2476a1cd944b8c WHIRLPOOL fba49ae277ec2114b06eb0fdce87161ac7bd3e0ca90387dc58caf327c5f12056be07eeba677ff37c59e7d759054ec276ce4db647250774c57588619a1803592c
|
||||
DIST nginx-1.11.6.tar.gz 960331 SHA256 3153abbb518e2d9c032e1b127da3dc0028ad36cd4679e5f3be0b8afa33bc85bd SHA512 1969f527d4554a976d14e82c2297c519a0d0d82a9fbd3cc703ab42a23067c7fcf101ddf16f1abff374c71f37969fd7c58d2a344c57566538b821acc32cd3d979 WHIRLPOOL 67ed24c25b20f6d94f3a0602946f750b4efafd79d3a093a35fdf370a20377abcc2a54c00fcd5e7bc54305515da9234fb2f192c744a7fb59c4bbdee2ba0c0f626
|
||||
DIST nginx-auth-ldap-49a8b4d28fc4a518563c82e0b52821e5f37db1fc.tar.gz 17159 SHA256 3c11c32f05da04f1a4647dc4e35dd8d8aeacd5a2e763ba349feba3dba8663132 SHA512 323abd0ca8e90f5afcaf81a8ff1a8abe3dfcbff3d69f0dd4a1c005fe6436acbf3076c4c57a4df877b3d8e388cbea085d46301bb2df9c0752e2567817ff7cca92 WHIRLPOOL ad65e8182b2634db5fa06055ef7d91c7d8aabd0fa986d8402a4845977354d6edb329621b6f9f96c90ce2d158cff20e42ae50fba06a088a84de3e3f414205dbc2
|
||||
DIST nginx-auth-ldap-dbcef31bebb2d54b6120422d0b178bbf78bc48f7.tar.gz 16998 SHA256 35c8f29581823be0f8bdbcf237d7fa5518c45eabe0ab9a695b131d32c8f1c264 SHA512 f47a9a6c5f93daa9260825261d2069bca5fc528221f94fc8ec98462f61774a36bce0238d931f8d0690544fd0144a83f942b6673c8376fe03f7834f8da9666671 WHIRLPOOL 26a2f67e715d13f785932f00e642c0864b5b7059d120f7fe7458017dbe02203f4873d1cfc4f0dd262834465438ad2b00ef4b49295e18a8e246abda6f7694ac70
|
||||
DIST nginx_http_sticky_module_ng-1.2.6-10-g08a395c66e42.tar.bz2 124047 SHA256 6f9102321d8c68df6d67e9bde145a8de3f45f99f6cb47c08735a86f003234d31 SHA512 6c1bfdcf89884b2855d51ae7da0f6e53a4ca3629e1aaf58433b70c07dcb2af797ba6e87d9b3eb4fe2fb6d4d697e862f2b4c2f8d8b3fdaea201740c97ec936529 WHIRLPOOL 38abe56e177e22dad68ac7d6570425ecd763d2e891627a75156a6f39bd7edc54f664c3d2f638e1ea57c743dadc6a8c9889be087abbdb4c98b5641c299f7fbc07
|
||||
@@ -17,8 +18,10 @@ DIST ngx_http_fancyindex-0.4.0.tar.gz 18419 SHA256 152cc2cf082c23cbc7b0fc76f14af
|
||||
DIST ngx_http_fancyindex-0.4.1.tar.gz 21130 SHA256 2b00d8e0ad2a67152a9cee7b7ee67990c742d501412df912baaf1eee9bb6dc71 SHA512 ce0043ad4a2b638c5d99244d6caaa65ad142cea78884084a9aeca5a9593c68dbe508c9e4dd85dc5722eb63ef386612bffc48d4b6fc1487df244fbcb7a73bffe1 WHIRLPOOL 4a885afbadf64bbd25df6580a099472ae48836d9dddfe1dee6ac6a6f97bfb0cf7120ff10dd69fceca7085fab590bec3a4b4b5be5644f2352375316885ddc3cac
|
||||
DIST ngx_http_headers_more-0.30.tar.gz 27793 SHA256 2aad309a9313c21c7c06ee4e71a39c99d4d829e31c8b3e7d76f8c964ea8047f5 SHA512 378f2c4b4fbf580e59c8ad3ef5fcb617e4669b7b506a0ae87e4e0bc920d34e16fe55565e48dd57e7b6c37ae8b407646ca64f5d84a2fbbe2d41d719c7643c1a82 WHIRLPOOL f50bb5c2e23fb63d98904163a873edf947f65e57dc0f73489024243c1d5b04e0677015a075d315585e535e226b8dad659bada563778b8ddf4d060e918fc37ace
|
||||
DIST ngx_http_headers_more-0.31.tar.gz 27941 SHA256 b2e8162cce2d24861b1ed5bbb30fc51d5215e3f4bb9d01f53fc344904d5911e7 SHA512 bc6b936dff9989af9eb97864e5e9499748ea8c73b2f49a24ad00d2a90bf77d1d743e6789f7bf3948a7baaaa44b0cc9f48a1c8a52bce9902a13c88e1f6673c6e1 WHIRLPOOL 79dd5ecb8eaabf6d81380888b687a962339c93d6bff14c88156782d5846d1121d33e0851ab27b44fb1b9f2035484093327fb92559e655dbdc6362faddb76b5e2
|
||||
DIST ngx_http_headers_more-0.32.tar.gz 28033 SHA256 c6d9dab8ea1fc997031007e2e8f47cced01417e203cd88d53a9fe9f6ae138720 SHA512 e42582b45c3111de3940bbeb67ce161aca2d55adcfb00c61c12256fa0e36221d38723013f36edbcf6d1b520f8dfb49d4657df8a956e66d36e68425afad382bd1 WHIRLPOOL 2b95ea8e2933e83082b9dfd7aaa8f57dd38b0ec12fb452a4aa38a215ca76b6572fe35b79c8afe8cf3097bf89ced0e81c33e07ee6913c99966b87b8e610df3121
|
||||
DIST ngx_http_lua-0.10.5.tar.gz 579793 SHA256 4f0292c37ab3d7cb980c994825040be1bda2c769cbd800e79c43eb37458347d4 SHA512 a02b8614fdcd063b1087a3114f05402c707343ff3bceabaca1fb98531ba30edea1a525fc45e2f5a49ff155de8d6f9e1155e8870e463476da5703acfd5f8fc3fc WHIRLPOOL 9c72353bc58a98fd3bae68bd9b13228d202167422a429aa4b455f7e280cb617b5c083131e4f372708e602342b24b150437ed8ebae9647a397bae8a88a13b385c
|
||||
DIST ngx_http_lua-0.10.6.tar.gz 597217 SHA256 b98c4f648589bbf3e2c3d5fd18664e7a7ef89ac083e96c8e984fa919e7a7c073 SHA512 202aaf39381d151d5f456e5cd61c87b65fa20ece997f7e517a3eb3912af3a153747a674ac004dbcc474728567ff58436cfb408accd5e922d805b1d697c34774c WHIRLPOOL c4fd64114d74afbaba02c3e7bb1c5562281636624a581c6535f6aa310886f766b9cf0e63a8921599c617d411d5ec920e4b08b54588bfac7cf4c24e8ffc13d26b
|
||||
DIST ngx_http_lua-0.10.7.tar.gz 605171 SHA256 c21c8937dcdd6fc2b6a955f929e3f4d1388610f47180e60126e6dcab06786f77 SHA512 d060a13de4d01d77e6d6cd1635ecbb405330e4326b71b89341c1c128ee4182978a51d53355bc07c350e3c3a7df15325e3df380d9c3a98b2ff7d7efa18fa09b32 WHIRLPOOL 7b64f75aae2ab74f51b3b2d07a59262a2c8ab2b863698b93b1184c003049641b45eded8fa5cc6301887c80d5fc34e9f22365da7765b3d5594ad838dacfceddd7
|
||||
DIST ngx_http_naxsi-0.54.tar.gz 163809 SHA256 9cc2c09405bc71f78ef26a8b6d70afcea3fccbe8125df70cb0cfc480133daba5 SHA512 91934bfd41495715269cc6e549d17f6da66f2bdd0c9a6821fa9096b694dd3927109c4aad2f8b327620ae7c34f76a0839ac16669cd8c65081bc01fa7f829c1d43 WHIRLPOOL ef68cfecc9849086527c3590744d3c0d73cec830c6cf1ebca63566a7444438757a85d0c79fa552c4763e0416a615f4cf8d99622e2f36d3713b7072138a82f5a8
|
||||
DIST ngx_http_naxsi-0.55.1.tar.gz 185997 SHA256 45dd0df7a6b0b6aa9c64eb8c39a8e294d659d87fb18e192cf58f1402f3cdb0a8 SHA512 aebda20e5b78e9111b7bac1e15829258e6b85b80e4ce333e4dba8caead36287b3f0fcb453c51d7c59f07d637fa62f5c6b23aecd3bf6a3c3da4abebf1a6689f14 WHIRLPOOL 36830d10a35b724b7ea15e3884e96e2e4dd84f2b81fc1c7122d3e2e83a1942227321b1a7141d829423788bc52a3e199a95ca2637369e17f84ea16eb0cb2e5e37
|
||||
DIST ngx_http_push_stream-0.5.2.tar.gz 182008 SHA256 1d07f38acdb8194bd49344b0ba21de101070de9b8731d27a8d22e928850bc199 SHA512 ee8bf9ece652da6aa5a39879298bba70d1842696545259f3f5e302cc61397b35f016364805805f9ab1914fc39ed2f07c015e042155789073e3d1fdc02a0783de WHIRLPOOL d309cecbb1bb5b6c4f64712d44889e3ecca59140d845a31a3f605dc3cc2aa01622b0deadb8f6852baea3c211bebbe6ed7d7868399447ac1249c1b1b740fa3c27
|
||||
|
||||
40
www-servers/nginx/files/http_memc-0.17-issue_26.patch
Normal file
40
www-servers/nginx/files/http_memc-0.17-issue_26.patch
Normal file
@@ -0,0 +1,40 @@
|
||||
From 2fbc95b6ece36e01e6fea8c5691ef1611d948943 Mon Sep 17 00:00:00 2001
|
||||
From: Thomas Deutschmann <whissi@gentoo.org>
|
||||
Date: Tue, 15 Nov 2016 18:56:30 +0100
|
||||
Subject: [PATCH] Upstream: don't consider default_port when matching
|
||||
upstreams.
|
||||
|
||||
Upstream changed API [Link 1] and removed ngx_http_upstream_srv_conf_t.default_port.
|
||||
|
||||
Upstream's own changeset [Link 2] suggests that the check was not needed at
|
||||
all.
|
||||
|
||||
Link 1: http://hg.nginx.org/nginx/rev/4dea01cf49e8
|
||||
Link 2: http://hg.nginx.org/nginx/rev/3fa5983b6b44
|
||||
Bug: https://github.com/openresty/memc-nginx-module/issues/26
|
||||
---
|
||||
src/ngx_http_memc_util.c | 2 ++
|
||||
1 file changed, 2 insertions(+)
|
||||
|
||||
diff --git a/src/ngx_http_memc_util.c b/src/ngx_http_memc_util.c
|
||||
index 090bf43..20cb877 100644
|
||||
--- a/src/ngx_http_memc_util.c
|
||||
+++ b/src/ngx_http_memc_util.c
|
||||
@@ -141,12 +141,14 @@ ngx_http_memc_upstream_add(ngx_http_request_t *r, ngx_url_t *url)
|
||||
continue;
|
||||
}
|
||||
|
||||
+#if defined(nginx_version) && nginx_version < 1011006
|
||||
if (uscfp[i]->default_port && url->default_port
|
||||
&& uscfp[i]->default_port != url->default_port)
|
||||
{
|
||||
dd("upstream_add: default_port not match");
|
||||
continue;
|
||||
}
|
||||
+#endif
|
||||
|
||||
return uscfp[i];
|
||||
}
|
||||
--
|
||||
2.10.2
|
||||
|
||||
815
www-servers/nginx/nginx-1.11.6.ebuild
Normal file
815
www-servers/nginx/nginx-1.11.6.ebuild
Normal file
@@ -0,0 +1,815 @@
|
||||
# Copyright 1999-2016 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI=6
|
||||
|
||||
# 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"
|
||||
|
||||
# devel_kit (https://github.com/simpl/ngx_devel_kit, BSD license)
|
||||
DEVEL_KIT_MODULE_PV="0.3.0"
|
||||
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.2"
|
||||
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 (https://github.com/agentzh/headers-more-nginx-module, BSD license)
|
||||
HTTP_HEADERS_MORE_MODULE_PV="0.32"
|
||||
HTTP_HEADERS_MORE_MODULE_P="ngx_http_headers_more-${HTTP_HEADERS_MORE_MODULE_PV}"
|
||||
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_cache_purge (http://labs.frickle.com/nginx_ngx_cache_purge/, https://github.com/FRiCKLE/ngx_cache_purge, BSD-2 license)
|
||||
HTTP_CACHE_PURGE_MODULE_PV="2.3"
|
||||
HTTP_CACHE_PURGE_MODULE_P="ngx_http_cache_purge-${HTTP_CACHE_PURGE_MODULE_PV}"
|
||||
HTTP_CACHE_PURGE_MODULE_URI="http://labs.frickle.com/files/ngx_cache_purge-${HTTP_CACHE_PURGE_MODULE_PV}.tar.gz"
|
||||
HTTP_CACHE_PURGE_MODULE_WD="${WORKDIR}/ngx_cache_purge-${HTTP_CACHE_PURGE_MODULE_PV}"
|
||||
|
||||
# http_slowfs_cache (http://labs.frickle.com/nginx_ngx_slowfs_cache/, BSD-2 license)
|
||||
HTTP_SLOWFS_CACHE_MODULE_PV="1.10"
|
||||
HTTP_SLOWFS_CACHE_MODULE_P="ngx_http_slowfs_cache-${HTTP_SLOWFS_CACHE_MODULE_PV}"
|
||||
HTTP_SLOWFS_CACHE_MODULE_URI="http://labs.frickle.com/files/ngx_slowfs_cache-${HTTP_SLOWFS_CACHE_MODULE_PV}.tar.gz"
|
||||
HTTP_SLOWFS_CACHE_MODULE_WD="${WORKDIR}/ngx_slowfs_cache-${HTTP_SLOWFS_CACHE_MODULE_PV}"
|
||||
|
||||
# http_fancyindex (https://github.com/aperezdc/ngx-fancyindex, BSD license)
|
||||
HTTP_FANCYINDEX_MODULE_PV="0.4.1"
|
||||
HTTP_FANCYINDEX_MODULE_P="ngx_http_fancyindex-${HTTP_FANCYINDEX_MODULE_PV}"
|
||||
HTTP_FANCYINDEX_MODULE_URI="https://github.com/aperezdc/ngx-fancyindex/archive/v${HTTP_FANCYINDEX_MODULE_PV}.tar.gz"
|
||||
HTTP_FANCYINDEX_MODULE_WD="${WORKDIR}/ngx-fancyindex-${HTTP_FANCYINDEX_MODULE_PV}"
|
||||
|
||||
# http_lua (https://github.com/openresty/lua-nginx-module, BSD license)
|
||||
HTTP_LUA_MODULE_PV="0.10.7"
|
||||
HTTP_LUA_MODULE_P="ngx_http_lua-${HTTP_LUA_MODULE_PV}"
|
||||
HTTP_LUA_MODULE_URI="https://github.com/openresty/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 (https://github.com/stogh/ngx_http_auth_pam_module/, http://web.iti.upv.es/~sto/nginx/, BSD-2 license)
|
||||
HTTP_AUTH_PAM_MODULE_PV="1.5.1"
|
||||
HTTP_AUTH_PAM_MODULE_P="ngx_http_auth_pam-${HTTP_AUTH_PAM_MODULE_PV}"
|
||||
HTTP_AUTH_PAM_MODULE_URI="https://github.com/stogh/ngx_http_auth_pam_module/archive/v${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="0.3.0-10-gf3bdb7b"
|
||||
HTTP_UPSTREAM_CHECK_MODULE_P="ngx_http_upstream_check-${HTTP_UPSTREAM_CHECK_MODULE_PV}"
|
||||
HTTP_UPSTREAM_CHECK_MODULE_URI="https://github.com/yaoweibin/nginx_upstream_check_module/archive/v${HTTP_UPSTREAM_CHECK_MODULE_PV}.tar.gz"
|
||||
HTTP_UPSTREAM_CHECK_MODULE_WD="${WORKDIR}/nginx_upstream_check_module-f3bdb7b85a194e2ad58e3c306c1d021ee76da2f5"
|
||||
|
||||
# http_metrics (https://github.com/zenops/ngx_metrics, BSD license)
|
||||
HTTP_METRICS_MODULE_PV="0.1.1"
|
||||
HTTP_METRICS_MODULE_P="ngx_metrics-${HTTP_METRICS_MODULE_PV}"
|
||||
HTTP_METRICS_MODULE_URI="https://github.com/madvertise/ngx_metrics/archive/v${HTTP_METRICS_MODULE_PV}.tar.gz"
|
||||
HTTP_METRICS_MODULE_WD="${WORKDIR}/ngx_metrics-${HTTP_METRICS_MODULE_PV}"
|
||||
|
||||
# naxsi-core (https://github.com/nbs-system/naxsi, GPLv2+)
|
||||
HTTP_NAXSI_MODULE_PV="0.55.1"
|
||||
HTTP_NAXSI_MODULE_P="ngx_http_naxsi-${HTTP_NAXSI_MODULE_PV}"
|
||||
HTTP_NAXSI_MODULE_URI="https://github.com/nbs-system/naxsi/archive/${HTTP_NAXSI_MODULE_PV}.tar.gz"
|
||||
HTTP_NAXSI_MODULE_WD="${WORKDIR}/naxsi-${HTTP_NAXSI_MODULE_PV}/naxsi_src"
|
||||
|
||||
# nginx-rtmp-module (https://github.com/arut/nginx-rtmp-module, BSD license)
|
||||
RTMP_MODULE_PV="1.1.10"
|
||||
RTMP_MODULE_P="ngx_rtmp-${RTMP_MODULE_PV}"
|
||||
RTMP_MODULE_URI="https://github.com/arut/nginx-rtmp-module/archive/v${RTMP_MODULE_PV}.tar.gz"
|
||||
RTMP_MODULE_WD="${WORKDIR}/nginx-rtmp-module-${RTMP_MODULE_PV}"
|
||||
|
||||
# nginx-dav-ext-module (https://github.com/arut/nginx-dav-ext-module, BSD license)
|
||||
HTTP_DAV_EXT_MODULE_PV="0.0.3"
|
||||
HTTP_DAV_EXT_MODULE_P="ngx_http_dav_ext-${HTTP_DAV_EXT_MODULE_PV}"
|
||||
HTTP_DAV_EXT_MODULE_URI="https://github.com/arut/nginx-dav-ext-module/archive/v${HTTP_DAV_EXT_MODULE_PV}.tar.gz"
|
||||
HTTP_DAV_EXT_MODULE_WD="${WORKDIR}/nginx-dav-ext-module-${HTTP_DAV_EXT_MODULE_PV}"
|
||||
|
||||
# echo-nginx-module (https://github.com/openresty/echo-nginx-module, BSD license)
|
||||
HTTP_ECHO_MODULE_PV="0.60"
|
||||
HTTP_ECHO_MODULE_P="ngx_http_echo-${HTTP_ECHO_MODULE_PV}"
|
||||
HTTP_ECHO_MODULE_URI="https://github.com/openresty/echo-nginx-module/archive/v${HTTP_ECHO_MODULE_PV}.tar.gz"
|
||||
HTTP_ECHO_MODULE_WD="${WORKDIR}/echo-nginx-module-${HTTP_ECHO_MODULE_PV}"
|
||||
|
||||
# mod_security for nginx (https://modsecurity.org/, Apache-2.0)
|
||||
# keep the MODULE_P here consistent with upstream to avoid tarball duplication
|
||||
HTTP_SECURITY_MODULE_PV="2.9.1"
|
||||
HTTP_SECURITY_MODULE_P="modsecurity-${HTTP_SECURITY_MODULE_PV}"
|
||||
HTTP_SECURITY_MODULE_URI="https://www.modsecurity.org/tarball/${HTTP_SECURITY_MODULE_PV}/${HTTP_SECURITY_MODULE_P}.tar.gz"
|
||||
HTTP_SECURITY_MODULE_WD="${WORKDIR}/${HTTP_SECURITY_MODULE_P}"
|
||||
|
||||
# push-stream-module (http://www.nginxpushstream.com, https://github.com/wandenberg/nginx-push-stream-module, GPL-3)
|
||||
HTTP_PUSH_STREAM_MODULE_PV="0.5.2"
|
||||
HTTP_PUSH_STREAM_MODULE_P="ngx_http_push_stream-${HTTP_PUSH_STREAM_MODULE_PV}"
|
||||
HTTP_PUSH_STREAM_MODULE_URI="https://github.com/wandenberg/nginx-push-stream-module/archive/${HTTP_PUSH_STREAM_MODULE_PV}.tar.gz"
|
||||
HTTP_PUSH_STREAM_MODULE_WD="${WORKDIR}/nginx-push-stream-module-${HTTP_PUSH_STREAM_MODULE_PV}"
|
||||
|
||||
# sticky-module (https://bitbucket.org/nginx-goodies/nginx-sticky-module-ng, BSD-2)
|
||||
HTTP_STICKY_MODULE_PV="1.2.6-10-g08a395c66e42"
|
||||
HTTP_STICKY_MODULE_P="nginx_http_sticky_module_ng-${HTTP_STICKY_MODULE_PV}"
|
||||
HTTP_STICKY_MODULE_URI="https://bitbucket.org/nginx-goodies/nginx-sticky-module-ng/get/${HTTP_STICKY_MODULE_PV}.tar.bz2"
|
||||
HTTP_STICKY_MODULE_WD="${WORKDIR}/nginx-goodies-nginx-sticky-module-ng-08a395c66e42"
|
||||
|
||||
# mogilefs-module (https://github.com/vkholodkov/nginx-mogilefs-module, BSD-2)
|
||||
HTTP_MOGILEFS_MODULE_PV="1.0.4"
|
||||
HTTP_MOGILEFS_MODULE_P="ngx_mogilefs_module-${HTTP_MOGILEFS_MODULE_PV}"
|
||||
HTTP_MOGILEFS_MODULE_URI="https://github.com/vkholodkov/nginx-mogilefs-module/archive/${HTTP_MOGILEFS_MODULE_PV}.tar.gz"
|
||||
HTTP_MOGILEFS_MODULE_WD="${WORKDIR}/nginx_mogilefs_module-${HTTP_MOGILEFS_MODULE_PV}"
|
||||
|
||||
# memc-module (https://github.com/openresty/memc-nginx-module, BSD-2)
|
||||
HTTP_MEMC_MODULE_PV="0.17"
|
||||
HTTP_MEMC_MODULE_P="ngx_memc_module-${HTTP_MEMC_MODULE_PV}"
|
||||
HTTP_MEMC_MODULE_URI="https://github.com/openresty/memc-nginx-module/archive/v${HTTP_MEMC_MODULE_PV}.tar.gz"
|
||||
HTTP_MEMC_MODULE_WD="${WORKDIR}/memc-nginx-module-${HTTP_MEMC_MODULE_PV}"
|
||||
|
||||
# nginx-ldap-auth-module (https://github.com/kvspb/nginx-auth-ldap, BSD-2)
|
||||
HTTP_LDAP_MODULE_PV="49a8b4d28fc4a518563c82e0b52821e5f37db1fc"
|
||||
HTTP_LDAP_MODULE_P="nginx-auth-ldap-${HTTP_LDAP_MODULE_PV}"
|
||||
HTTP_LDAP_MODULE_URI="https://github.com/kvspb/nginx-auth-ldap/archive/${HTTP_LDAP_MODULE_PV}.tar.gz"
|
||||
HTTP_LDAP_MODULE_WD="${WORKDIR}/nginx-auth-ldap-${HTTP_LDAP_MODULE_PV}"
|
||||
|
||||
# We handle deps below ourselves
|
||||
SSL_DEPS_SKIP=1
|
||||
AUTOTOOLS_AUTO_DEPEND="no"
|
||||
|
||||
inherit autotools ssl-cert toolchain-funcs perl-module flag-o-matic user systemd versionator multilib
|
||||
|
||||
DESCRIPTION="Robust, small and high performance http and reverse proxy server"
|
||||
HOMEPAGE="http://nginx.org"
|
||||
SRC_URI="http://nginx.org/download/${P}.tar.gz
|
||||
${DEVEL_KIT_MODULE_URI} -> ${DEVEL_KIT_MODULE_P}.tar.gz
|
||||
nginx_modules_http_upload_progress? ( ${HTTP_UPLOAD_PROGRESS_MODULE_URI} -> ${HTTP_UPLOAD_PROGRESS_MODULE_P}.tar.gz )
|
||||
nginx_modules_http_headers_more? ( ${HTTP_HEADERS_MORE_MODULE_URI} -> ${HTTP_HEADERS_MORE_MODULE_P}.tar.gz )
|
||||
nginx_modules_http_cache_purge? ( ${HTTP_CACHE_PURGE_MODULE_URI} -> ${HTTP_CACHE_PURGE_MODULE_P}.tar.gz )
|
||||
nginx_modules_http_slowfs_cache? ( ${HTTP_SLOWFS_CACHE_MODULE_URI} -> ${HTTP_SLOWFS_CACHE_MODULE_P}.tar.gz )
|
||||
nginx_modules_http_fancyindex? ( ${HTTP_FANCYINDEX_MODULE_URI} -> ${HTTP_FANCYINDEX_MODULE_P}.tar.gz )
|
||||
nginx_modules_http_lua? ( ${HTTP_LUA_MODULE_URI} -> ${HTTP_LUA_MODULE_P}.tar.gz )
|
||||
nginx_modules_http_auth_pam? ( ${HTTP_AUTH_PAM_MODULE_URI} -> ${HTTP_AUTH_PAM_MODULE_P}.tar.gz )
|
||||
nginx_modules_http_upstream_check? ( ${HTTP_UPSTREAM_CHECK_MODULE_URI} -> ${HTTP_UPSTREAM_CHECK_MODULE_P}.tar.gz )
|
||||
nginx_modules_http_metrics? ( ${HTTP_METRICS_MODULE_URI} -> ${HTTP_METRICS_MODULE_P}.tar.gz )
|
||||
nginx_modules_http_naxsi? ( ${HTTP_NAXSI_MODULE_URI} -> ${HTTP_NAXSI_MODULE_P}.tar.gz )
|
||||
rtmp? ( ${RTMP_MODULE_URI} -> ${RTMP_MODULE_P}.tar.gz )
|
||||
nginx_modules_http_dav_ext? ( ${HTTP_DAV_EXT_MODULE_URI} -> ${HTTP_DAV_EXT_MODULE_P}.tar.gz )
|
||||
nginx_modules_http_echo? ( ${HTTP_ECHO_MODULE_URI} -> ${HTTP_ECHO_MODULE_P}.tar.gz )
|
||||
nginx_modules_http_security? ( ${HTTP_SECURITY_MODULE_URI} -> ${HTTP_SECURITY_MODULE_P}.tar.gz )
|
||||
nginx_modules_http_push_stream? ( ${HTTP_PUSH_STREAM_MODULE_URI} -> ${HTTP_PUSH_STREAM_MODULE_P}.tar.gz )
|
||||
nginx_modules_http_sticky? ( ${HTTP_STICKY_MODULE_URI} -> ${HTTP_STICKY_MODULE_P}.tar.bz2 )
|
||||
nginx_modules_http_mogilefs? ( ${HTTP_MOGILEFS_MODULE_URI} -> ${HTTP_MOGILEFS_MODULE_P}.tar.gz )
|
||||
nginx_modules_http_memc? ( ${HTTP_MEMC_MODULE_URI} -> ${HTTP_MEMC_MODULE_P}.tar.gz )
|
||||
nginx_modules_http_auth_ldap? ( ${HTTP_LDAP_MODULE_URI} -> ${HTTP_LDAP_MODULE_P}.tar.gz )"
|
||||
|
||||
LICENSE="BSD-2 BSD SSLeay MIT GPL-2 GPL-2+
|
||||
nginx_modules_http_security? ( Apache-2.0 )
|
||||
nginx_modules_http_push_stream? ( GPL-3 )"
|
||||
|
||||
SLOT="mainline"
|
||||
KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
|
||||
|
||||
NGINX_MODULES_STD="access auth_basic autoindex browser charset empty_gif
|
||||
fastcgi geo gzip limit_req limit_conn map memcached proxy referer
|
||||
rewrite scgi ssi split_clients upstream_hash upstream_ip_hash
|
||||
upstream_keepalive upstream_least_conn upstream_zone userid uwsgi"
|
||||
NGINX_MODULES_OPT="addition auth_request dav degradation flv geoip gunzip
|
||||
gzip_static image_filter mp4 perl random_index realip secure_link
|
||||
slice stub_status sub xslt"
|
||||
NGINX_MODULES_STREAM_STD="access geo limit_conn map return split_clients
|
||||
upstream_hash upstream_least_conn upstream_zone"
|
||||
NGINX_MODULES_STREAM_OPT="geoip realip ssl_preread"
|
||||
NGINX_MODULES_MAIL="imap pop3 smtp"
|
||||
NGINX_MODULES_3RD="
|
||||
http_upload_progress
|
||||
http_headers_more
|
||||
http_cache_purge
|
||||
http_slowfs_cache
|
||||
http_fancyindex
|
||||
http_lua
|
||||
http_auth_pam
|
||||
http_upstream_check
|
||||
http_metrics
|
||||
http_naxsi
|
||||
http_dav_ext
|
||||
http_echo
|
||||
http_security
|
||||
http_push_stream
|
||||
http_sticky
|
||||
http_mogilefs
|
||||
http_memc
|
||||
http_auth_ldap"
|
||||
|
||||
IUSE="aio debug +http +http2 +http-cache +ipv6 libatomic libressl luajit +pcre
|
||||
pcre-jit rtmp selinux ssl threads userland_GNU vim-syntax"
|
||||
|
||||
for mod in $NGINX_MODULES_STD; do
|
||||
IUSE="${IUSE} +nginx_modules_http_${mod}"
|
||||
done
|
||||
|
||||
for mod in $NGINX_MODULES_OPT; do
|
||||
IUSE="${IUSE} nginx_modules_http_${mod}"
|
||||
done
|
||||
|
||||
for mod in $NGINX_MODULES_STREAM_STD; do
|
||||
IUSE="${IUSE} nginx_modules_stream_${mod}"
|
||||
done
|
||||
|
||||
for mod in $NGINX_MODULES_STREAM_OPT; do
|
||||
IUSE="${IUSE} nginx_modules_stream_${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
|
||||
|
||||
# Add so we can warn users updating about config changes
|
||||
# @TODO: jbergstroem: remove on next release series
|
||||
IUSE="${IUSE} nginx_modules_http_spdy"
|
||||
|
||||
CDEPEND="
|
||||
pcre? ( dev-libs/libpcre:= )
|
||||
pcre-jit? ( dev-libs/libpcre:=[jit] )
|
||||
ssl? (
|
||||
!libressl? ( dev-libs/openssl:0= )
|
||||
libressl? ( dev-libs/libressl:= )
|
||||
)
|
||||
http2? (
|
||||
!libressl? ( >=dev-libs/openssl-1.0.1c:0= )
|
||||
libressl? ( dev-libs/libressl:= )
|
||||
)
|
||||
http-cache? (
|
||||
userland_GNU? (
|
||||
!libressl? ( dev-libs/openssl:0= )
|
||||
libressl? ( dev-libs/libressl:= )
|
||||
)
|
||||
)
|
||||
nginx_modules_http_geoip? ( dev-libs/geoip )
|
||||
nginx_modules_http_gunzip? ( sys-libs/zlib )
|
||||
nginx_modules_http_gzip? ( sys-libs/zlib )
|
||||
nginx_modules_http_gzip_static? ( sys-libs/zlib )
|
||||
nginx_modules_http_image_filter? ( media-libs/gd:=[jpeg,png] )
|
||||
nginx_modules_http_perl? ( >=dev-lang/perl-5.8:= )
|
||||
nginx_modules_http_rewrite? ( dev-libs/libpcre:= )
|
||||
nginx_modules_http_secure_link? (
|
||||
userland_GNU? (
|
||||
!libressl? ( dev-libs/openssl:0= )
|
||||
libressl? ( dev-libs/libressl:= )
|
||||
)
|
||||
)
|
||||
nginx_modules_http_xslt? ( dev-libs/libxml2:= dev-libs/libxslt )
|
||||
nginx_modules_http_lua? ( !luajit? ( dev-lang/lua:0= ) luajit? ( dev-lang/luajit:2= ) )
|
||||
nginx_modules_http_auth_pam? ( virtual/pam )
|
||||
nginx_modules_http_metrics? ( dev-libs/yajl:= )
|
||||
nginx_modules_http_dav_ext? ( dev-libs/expat )
|
||||
nginx_modules_http_security? (
|
||||
dev-libs/apr:=
|
||||
dev-libs/apr-util:=
|
||||
dev-libs/libxml2:=
|
||||
net-misc/curl
|
||||
www-servers/apache
|
||||
)
|
||||
nginx_modules_http_auth_ldap? ( net-nds/openldap[ssl?] )"
|
||||
RDEPEND="${CDEPEND}
|
||||
selinux? ( sec-policy/selinux-nginx )
|
||||
!www-servers/nginx:0"
|
||||
DEPEND="${CDEPEND}
|
||||
nginx_modules_http_security? ( ${AUTOTOOLS_DEPEND} )
|
||||
arm? ( dev-libs/libatomic_ops )
|
||||
libatomic? ( dev-libs/libatomic_ops )"
|
||||
PDEPEND="vim-syntax? ( app-vim/nginx-syntax )"
|
||||
|
||||
REQUIRED_USE="pcre-jit? ( pcre )
|
||||
nginx_modules_http_lua? ( nginx_modules_http_rewrite )
|
||||
nginx_modules_http_naxsi? ( pcre )
|
||||
nginx_modules_http_dav_ext? ( nginx_modules_http_dav )
|
||||
nginx_modules_http_metrics? ( nginx_modules_http_stub_status )
|
||||
nginx_modules_http_security? ( pcre )
|
||||
nginx_modules_http_push_stream? ( ssl )"
|
||||
|
||||
pkg_setup() {
|
||||
NGINX_HOME="/var/lib/nginx"
|
||||
NGINX_HOME_TMP="${NGINX_HOME}/tmp"
|
||||
|
||||
ebegin "Creating nginx user and group"
|
||||
enewgroup ${PN}
|
||||
enewuser ${PN} -1 -1 "${NGINX_HOME}" ${PN}
|
||||
eend $?
|
||||
|
||||
if use libatomic; then
|
||||
ewarn "GCC 4.1+ features built-in atomic operations."
|
||||
ewarn "Using libatomic_ops is only needed if using"
|
||||
ewarn "a different compiler or a GCC prior to 4.1"
|
||||
fi
|
||||
|
||||
if [[ -n $NGINX_ADD_MODULES ]]; then
|
||||
ewarn "You are building custom modules via \$NGINX_ADD_MODULES!"
|
||||
ewarn "This nginx installation is not supported!"
|
||||
ewarn "Make sure you can reproduce the bug without those modules"
|
||||
ewarn "_before_ reporting bugs."
|
||||
fi
|
||||
|
||||
if use !http; then
|
||||
ewarn "To actually disable all http-functionality you also have to disable"
|
||||
ewarn "all nginx http modules."
|
||||
fi
|
||||
|
||||
if use nginx_modules_http_mogilefs && use threads; then
|
||||
eerror "mogilefs won't compile with threads support."
|
||||
eerror "Please disable either flag and try again."
|
||||
die "Can't compile mogilefs with threads support"
|
||||
fi
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
eapply "${FILESDIR}/${PN}-1.4.1-fix-perl-install-path.patch"
|
||||
eapply "${FILESDIR}/${PN}-httpoxy-mitigation-r1.patch"
|
||||
|
||||
if use nginx_modules_http_upstream_check; then
|
||||
#eapply -p0 "${HTTP_UPSTREAM_CHECK_MODULE_WD}"/check_1.11.1+.patch
|
||||
eapply -p0 "${FILESDIR}"/http_upstream_check-nginx-1.11.5+.patch
|
||||
fi
|
||||
|
||||
if use nginx_modules_http_lua; then
|
||||
sed -i -e 's/-llua5.1/-llua/' "${HTTP_LUA_MODULE_WD}/config" || die
|
||||
fi
|
||||
|
||||
if use nginx_modules_http_security; then
|
||||
cd "${HTTP_SECURITY_MODULE_WD}" || die
|
||||
|
||||
eapply "${FILESDIR}"/http_security-pr_1158.patch
|
||||
|
||||
eautoreconf
|
||||
|
||||
if use luajit ; then
|
||||
sed -i \
|
||||
-e 's|^\(LUA_PKGNAMES\)=.*|\1="luajit"|' \
|
||||
configure || die
|
||||
fi
|
||||
|
||||
cd "${S}" || die
|
||||
fi
|
||||
|
||||
if use nginx_modules_http_upload_progress; then
|
||||
cd "${HTTP_UPLOAD_PROGRESS_MODULE_WD}" || die
|
||||
eapply "${FILESDIR}"/http_uploadprogress-issue_50-r1.patch
|
||||
cd "${S}" || die
|
||||
fi
|
||||
|
||||
if use nginx_modules_http_memc; then
|
||||
cd "${HTTP_MEMC_MODULE_WD}" || die
|
||||
eapply "${FILESDIR}"/http_memc-0.17-issue_26.patch
|
||||
cd "${S}" || die
|
||||
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
|
||||
|
||||
# don't install to /etc/nginx/ if not in use
|
||||
local module
|
||||
for module in fastcgi scgi uwsgi ; do
|
||||
if ! use nginx_modules_http_${module}; then
|
||||
sed -i -e "/${module}/d" auto/install || die
|
||||
fi
|
||||
done
|
||||
|
||||
eapply_user
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
# mod_security needs to generate nginx/modsecurity/config before including it
|
||||
if use nginx_modules_http_security; then
|
||||
cd "${HTTP_SECURITY_MODULE_WD}" || die
|
||||
|
||||
./configure \
|
||||
--enable-standalone-module \
|
||||
--disable-mlogc \
|
||||
--with-ssdeep=no \
|
||||
$(use_enable pcre-jit) \
|
||||
$(use_with nginx_modules_http_lua lua) || die "configure failed for mod_security"
|
||||
|
||||
cd "${S}" || die
|
||||
fi
|
||||
|
||||
local myconf=() http_enabled= mail_enabled= stream_enabled=
|
||||
|
||||
use aio && myconf+=( --with-file-aio )
|
||||
use debug && myconf+=( --with-debug )
|
||||
use http2 && myconf+=( --with-http_v2_module )
|
||||
use libatomic && myconf+=( --with-libatomic )
|
||||
use pcre && myconf+=( --with-pcre )
|
||||
use pcre-jit && myconf+=( --with-pcre-jit )
|
||||
use threads && myconf+=( --with-threads )
|
||||
|
||||
# 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_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
|
||||
if use luajit; then
|
||||
export LUAJIT_LIB=$(pkg-config --variable libdir luajit)
|
||||
export LUAJIT_INC=$(pkg-config --variable includedir luajit)
|
||||
else
|
||||
export LUA_LIB=$(pkg-config --variable libdir lua)
|
||||
export LUA_INC=$(pkg-config --variable includedir lua)
|
||||
fi
|
||||
myconf+=( --add-module=${DEVEL_KIT_MODULE_WD} )
|
||||
myconf+=( --add-module=${HTTP_LUA_MODULE_WD} )
|
||||
fi
|
||||
|
||||
if use nginx_modules_http_auth_pam; then
|
||||
http_enabled=1
|
||||
myconf+=( --add-module=${HTTP_AUTH_PAM_MODULE_WD} )
|
||||
fi
|
||||
|
||||
if use nginx_modules_http_upstream_check; then
|
||||
http_enabled=1
|
||||
myconf+=( --add-module=${HTTP_UPSTREAM_CHECK_MODULE_WD} )
|
||||
fi
|
||||
|
||||
if use nginx_modules_http_metrics; then
|
||||
http_enabled=1
|
||||
myconf+=( --add-module=${HTTP_METRICS_MODULE_WD} )
|
||||
fi
|
||||
|
||||
if use nginx_modules_http_naxsi ; then
|
||||
http_enabled=1
|
||||
myconf+=( --add-module=${HTTP_NAXSI_MODULE_WD} )
|
||||
fi
|
||||
|
||||
if use rtmp ; then
|
||||
http_enabled=1
|
||||
myconf+=( --add-module=${RTMP_MODULE_WD} )
|
||||
fi
|
||||
|
||||
if use nginx_modules_http_dav_ext ; then
|
||||
http_enabled=1
|
||||
myconf+=( --add-module=${HTTP_DAV_EXT_MODULE_WD} )
|
||||
fi
|
||||
|
||||
if use nginx_modules_http_echo ; then
|
||||
http_enabled=1
|
||||
myconf+=( --add-module=${HTTP_ECHO_MODULE_WD} )
|
||||
fi
|
||||
|
||||
if use nginx_modules_http_security ; then
|
||||
http_enabled=1
|
||||
myconf+=( --add-module=${HTTP_SECURITY_MODULE_WD}/nginx/modsecurity )
|
||||
fi
|
||||
|
||||
if use nginx_modules_http_push_stream ; then
|
||||
http_enabled=1
|
||||
myconf+=( --add-module=${HTTP_PUSH_STREAM_MODULE_WD} )
|
||||
fi
|
||||
|
||||
if use nginx_modules_http_sticky ; then
|
||||
http_enabled=1
|
||||
myconf+=( --add-module=${HTTP_STICKY_MODULE_WD} )
|
||||
fi
|
||||
|
||||
if use nginx_modules_http_mogilefs ; then
|
||||
http_enabled=1
|
||||
myconf+=( --add-module=${HTTP_MOGILEFS_MODULE_WD} )
|
||||
fi
|
||||
|
||||
if use nginx_modules_http_memc ; then
|
||||
http_enabled=1
|
||||
myconf+=( --add-module=${HTTP_MEMC_MODULE_WD} )
|
||||
fi
|
||||
|
||||
if use nginx_modules_http_auth_ldap; then
|
||||
http_enabled=1
|
||||
myconf+=( --add-module=${HTTP_LDAP_MODULE_WD} )
|
||||
fi
|
||||
|
||||
if use http || use http-cache || use http2; 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
|
||||
|
||||
# Stream modules
|
||||
for mod in $NGINX_MODULES_STREAM_STD; do
|
||||
if use nginx_modules_stream_${mod}; then
|
||||
stream_enabled=1
|
||||
else
|
||||
myconf+=( --without-stream_${mod}_module )
|
||||
fi
|
||||
done
|
||||
|
||||
for mod in $NGINX_MODULES_STREAM_OPT; do
|
||||
if use nginx_modules_stream_${mod}; then
|
||||
stream_enabled=1
|
||||
myconf+=( --with-stream_${mod}_module )
|
||||
fi
|
||||
done
|
||||
|
||||
if [ $stream_enabled ]; then
|
||||
myconf+=( --with-stream )
|
||||
use ssl && myconf+=( --with-stream_ssl_module )
|
||||
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} )
|
||||
myconf+=( --group=${PN} )
|
||||
fi
|
||||
|
||||
local WITHOUT_IPV6=
|
||||
if ! use ipv6; then
|
||||
WITHOUT_IPV6=" -DNGX_HAVE_INET6=0"
|
||||
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${WITHOUT_IPV6}" \
|
||||
--with-ld-opt="-L${EROOT}usr/$(get_libdir)" \
|
||||
--http-log-path="${EPREFIX}"/var/log/${PN}/access_log \
|
||||
--http-client-body-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/client \
|
||||
--http-proxy-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/proxy \
|
||||
--http-fastcgi-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/fastcgi \
|
||||
--http-scgi-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/scgi \
|
||||
--http-uwsgi-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/uwsgi \
|
||||
--with-compat \
|
||||
"${myconf[@]}" || die "configure failed"
|
||||
|
||||
# A purely cosmetic change that makes nginx -V more readable. This can be
|
||||
# good if people outside the gentoo community would troubleshoot and
|
||||
# question the users setup.
|
||||
sed -i -e "s|${WORKDIR}|external_module|g" objs/ngx_auto_config.h || die
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
use nginx_modules_http_security && emake -C "${HTTP_SECURITY_MODULE_WD}"
|
||||
|
||||
# https://bugs.gentoo.org/286772
|
||||
export LANG=C LC_ALL=C
|
||||
emake LINK="${CC} ${LDFLAGS}" OTHERLDFLAGS="${LDFLAGS}"
|
||||
}
|
||||
|
||||
src_install() {
|
||||
emake DESTDIR="${D%/}" install
|
||||
|
||||
cp "${FILESDIR}"/nginx.conf-r2 "${ED}"etc/nginx/nginx.conf || die
|
||||
|
||||
newinitd "${FILESDIR}"/nginx.initd-r3 nginx
|
||||
|
||||
systemd_newunit "${FILESDIR}"/nginx.service-r1 nginx.service
|
||||
|
||||
doman man/nginx.8
|
||||
dodoc CHANGES* README
|
||||
|
||||
# just keepdir. do not copy the default htdocs files (bug #449136)
|
||||
keepdir /var/www/localhost
|
||||
rm -rf "${D}"usr/html || die
|
||||
|
||||
# set up a list of directories to keep
|
||||
local keepdir_list="${NGINX_HOME_TMP}"/client
|
||||
local module
|
||||
for module in proxy fastcgi scgi uwsgi; do
|
||||
use nginx_modules_http_${module} && keepdir_list+=" ${NGINX_HOME_TMP}/${module}"
|
||||
done
|
||||
|
||||
keepdir /var/log/nginx ${keepdir_list}
|
||||
|
||||
# this solves a problem with SELinux where nginx doesn't see the directories
|
||||
# as root and tries to create them as nginx
|
||||
fperms 0750 "${NGINX_HOME_TMP}"
|
||||
fowners ${PN}:0 "${NGINX_HOME_TMP}"
|
||||
|
||||
fperms 0700 /var/log/nginx ${keepdir_list}
|
||||
fowners ${PN}:${PN} /var/log/nginx ${keepdir_list}
|
||||
|
||||
# logrotate
|
||||
insinto /etc/logrotate.d
|
||||
newins "${FILESDIR}"/nginx.logrotate-r1 nginx
|
||||
|
||||
if use nginx_modules_http_perl; then
|
||||
cd "${S}"/objs/src/http/modules/perl/ || die
|
||||
emake DESTDIR="${D}" INSTALLDIRS=vendor
|
||||
perl_delete_localpod
|
||||
cd "${S}" || die
|
||||
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}"/README.markdown
|
||||
fi
|
||||
|
||||
if use nginx_modules_http_auth_pam; then
|
||||
docinto ${HTTP_AUTH_PAM_MODULE_P}
|
||||
dodoc "${HTTP_AUTH_PAM_MODULE_WD}"/{README.md,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_naxsi; then
|
||||
insinto /etc/nginx
|
||||
doins "${HTTP_NAXSI_MODULE_WD}"/../naxsi_config/naxsi_core.rules
|
||||
fi
|
||||
|
||||
if use rtmp; then
|
||||
docinto ${RTMP_MODULE_P}
|
||||
dodoc "${RTMP_MODULE_WD}"/{AUTHORS,README.md,stat.xsl}
|
||||
fi
|
||||
|
||||
if use nginx_modules_http_dav_ext; then
|
||||
docinto ${HTTP_DAV_EXT_MODULE_P}
|
||||
dodoc "${HTTP_DAV_EXT_MODULE_WD}"/README
|
||||
fi
|
||||
|
||||
if use nginx_modules_http_echo; then
|
||||
docinto ${HTTP_ECHO_MODULE_P}
|
||||
dodoc "${HTTP_ECHO_MODULE_WD}"/README.markdown
|
||||
fi
|
||||
|
||||
if use nginx_modules_http_security; then
|
||||
docinto ${HTTP_SECURITY_MODULE_P}
|
||||
dodoc "${HTTP_SECURITY_MODULE_WD}"/{CHANGES,README.TXT,authors.txt}
|
||||
fi
|
||||
|
||||
if use nginx_modules_http_push_stream; then
|
||||
docinto ${HTTP_PUSH_STREAM_MODULE_P}
|
||||
dodoc "${HTTP_PUSH_STREAM_MODULE_WD}"/{AUTHORS,CHANGELOG.textile,README.textile}
|
||||
fi
|
||||
|
||||
if use nginx_modules_http_sticky; then
|
||||
docinto ${HTTP_STICKY_MODULE_P}
|
||||
dodoc "${HTTP_STICKY_MODULE_WD}"/{README.md,Changelog.txt,docs/sticky.pdf}
|
||||
fi
|
||||
|
||||
if use nginx_modules_http_memc; then
|
||||
docinto ${HTTP_MEMC_MODULE_P}
|
||||
dodoc "${HTTP_MEMC_MODULE_WD}"/README.markdown
|
||||
fi
|
||||
|
||||
if use nginx_modules_http_auth_ldap; then
|
||||
docinto ${HTTP_LDAP_MODULE_P}
|
||||
dodoc "${HTTP_LDAP_MODULE_WD}"/example.conf
|
||||
fi
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
if use ssl; then
|
||||
if [[ ! -f "${EROOT}"etc/ssl/${PN}/${PN}.key ]]; then
|
||||
install_cert /etc/ssl/${PN}/${PN}
|
||||
use prefix || chown ${PN}:${PN} "${EROOT}"etc/ssl/${PN}/${PN}.{crt,csr,key,pem}
|
||||
fi
|
||||
fi
|
||||
|
||||
if use nginx_modules_http_spdy; then
|
||||
ewarn "In nginx 1.9.5 the spdy module was superseded by http2."
|
||||
ewarn "Update your configs and package.use accordingly."
|
||||
fi
|
||||
|
||||
if use nginx_modules_http_lua && use http2; then
|
||||
ewarn "Lua 3rd party module author warns against using ${P} with"
|
||||
ewarn "NGINX_MODULES_HTTP=\"lua http2\". 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 -f o-rwx "${EPREFIX}"/var/log/nginx "${EPREFIX}${NGINX_HOME_TMP}"/{,client,proxy,fastcgi,scgi,uwsgi}
|
||||
fi
|
||||
|
||||
# If the nginx user can't change into or read the dir, display a warning.
|
||||
# If su is not available we display the warning nevertheless since we can't check properly
|
||||
su -s /bin/sh -c 'cd /var/log/nginx/ && ls' nginx >&/dev/null
|
||||
if [ $? -ne 0 ] ; then
|
||||
ewarn "Please make sure that the nginx user or group has at least"
|
||||
ewarn "'rx' permissions on /var/log/nginx (default on a fresh install)"
|
||||
ewarn "Otherwise you end up with empty log files after a logrotate."
|
||||
fi
|
||||
|
||||
# HTTPoxy mitigation
|
||||
ewarn ""
|
||||
ewarn "This nginx installation comes with a mitigation for the HTTPoxy"
|
||||
ewarn "vulnerability for FastCGI applications by setting the HTTP_PROXY FastCGI"
|
||||
ewarn "parameter to an empty string per default when you are sourcing the default"
|
||||
ewarn "'fastcgi_params' or 'fastcgi.conf' in your server block(s)."
|
||||
ewarn ""
|
||||
ewarn "If this is causing any problems for you make sure that you are sourcing the"
|
||||
ewarn "default parameters _before_ you set your own values."
|
||||
ewarn "If you are relying on user-supplied proxy values you have to remove the"
|
||||
ewarn "correlating lines from 'fastcgi_params' and or 'fastcgi.conf'."
|
||||
}
|
||||
Reference in New Issue
Block a user