diff options
18 files changed, 3577 insertions, 3190 deletions
diff --git a/www-servers/nginx/ChangeLog b/www-servers/nginx/ChangeLog deleted file mode 100644 index f84aa4d..0000000 --- a/www-servers/nginx/ChangeLog +++ /dev/null @@ -1,520 +0,0 @@ -# ChangeLog for www-servers/nginx -# Copyright 1999-2016 Gentoo Foundation; Distributed under the GPL v2 -# (auto-generated from git log) - -*nginx-1.9.3 (09 Aug 2015) -*nginx-1.9.2 (09 Aug 2015) -*nginx-1.8.0 (09 Aug 2015) -*nginx-1.7.12 (09 Aug 2015) -*nginx-1.7.6 (09 Aug 2015) - - 09 Aug 2015; Robin H. Johnson <robbat2@gentoo.org> - +files/AJP-nginx-1.7.9+.patch, +files/check-1.9.2.patch, - +files/check_1.7.2+.patch, +files/lua-nginx-1.7.6.patch, - +files/nginx-1.4.1-fix-perl-install-path.patch, +files/nginx.conf, - +files/nginx.initd-r2, +files/nginx.logrotate-r1, +files/nginx.service-r1, - +files/rtmp-nginx-1.7.6.patch, +metadata.xml, +nginx-1.7.6.ebuild, - +nginx-1.7.12.ebuild, +nginx-1.8.0.ebuild, +nginx-1.9.2.ebuild, - +nginx-1.9.3.ebuild: - proj/gentoo: Initial commit - - This commit represents a new era for Gentoo: - Storing the gentoo-x86 tree in Git, as converted from CVS. - - This commit is the start of the NEW history. - Any historical data is intended to be grafted onto this point. - - Creation process: - 1. Take final CVS checkout snapshot - 2. Remove ALL ChangeLog* files - 3. Transform all Manifests to thin - 4. Remove empty Manifests - 5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$ - 5.1. Do not touch files with -kb/-ko keyword flags. - - Signed-off-by: Robin H. Johnson <robbat2@gentoo.org> - X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration - tests - X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this - project - X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo - developer, wrote Git features for the migration - X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve - cvs2svn - X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts - X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 - work in migration - X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging - X-Thanks: All of other Gentoo developers - many ideas and lots of paint on - the bikeshed - - 24 Aug 2015; Justin Lecher <jlec@gentoo.org> nginx-1.7.6.ebuild, - nginx-1.7.12.ebuild, nginx-1.8.0.ebuild, nginx-1.9.2.ebuild, - nginx-1.9.3.ebuild: - Use https by default - - Signed-off-by: Justin Lecher <jlec@gentoo.org> - - 24 Aug 2015; Justin Lecher <jlec@gentoo.org> metadata.xml: - Use https by default - - Convert all URLs for sites supporting encrypted connections from http to - https - - Signed-off-by: Justin Lecher <jlec@gentoo.org> - - 24 Aug 2015; Mike Gilbert <floppym@gentoo.org> metadata.xml: - Revert DOCTYPE SYSTEM https changes in metadata.xml - - repoman does not yet accept the https version. - This partially reverts eaaface92ee81f30a6ac66fe7acbcc42c00dc450. - - Bug: https://bugs.gentoo.org/552720 - -*nginx-1.9.4 (31 Aug 2015) - - 31 Aug 2015; Manuel Rüger <mrueg@gentoo.org> +nginx-1.9.4.ebuild: - Version bump. - - Gentoo-Bug: 558688 - - Package-Manager: portage-2.2.20.1 - - 31 Aug 2015; Manuel Rüger <mrueg@gentoo.org> -nginx-1.7.6.ebuild, - -nginx-1.7.12.ebuild: - Remove old - - Package-Manager: portage-2.2.20.1 - -*nginx-1.9.5 (15 Oct 2015) - - 15 Oct 2015; Manuel Rüger <mrueg@gentoo.org> metadata.xml, - +nginx-1.9.5.ebuild: - Version bump - - Package-Manager: portage-2.2.23 - - 15 Oct 2015; Manuel Rüger <mrueg@gentoo.org> -nginx-1.9.2.ebuild, - -nginx-1.9.3.ebuild: - Remove old - - Package-Manager: portage-2.2.23 - - 16 Oct 2015; Justin Lecher <jlec@gentoo.org> metadata.xml: - Update remote-ids - - Signed-off-by: Justin Lecher <jlec@gentoo.org> - -*nginx-1.9.6 (27 Oct 2015) - - 27 Oct 2015; Manuel Rüger <mrueg@gentoo.org> +nginx-1.9.6.ebuild: - Version bump - - Package-Manager: portage-2.2.23 - - 07 Nov 2015; Manuel Rüger <mrueg@gentoo.org> -nginx-1.9.4.ebuild, - -nginx-1.9.5.ebuild: - Remove old - - Package-Manager: portage-2.2.24 - -*nginx-1.9.7 (19 Nov 2015) - - 19 Nov 2015; Manuel Rüger <mrueg@gentoo.org> +nginx-1.9.7.ebuild: - Version bump - - Package-Manager: portage-2.2.25 - - 24 Jan 2016; Michał Górny <mgorny@gentoo.org> metadata.xml: - Unify quoting in metadata.xml files for machine processing - - Force unified quoting in all metadata.xml files since lxml does not - preserve original use of single and double quotes. Ensuring unified - quoting before the process allows distinguishing the GLEP 67-related - metadata.xml changes from unrelated quoting changes. - - 24 Jan 2016; Michał Górny <mgorny@gentoo.org> metadata.xml: - Replace all herds with appropriate projects (GLEP 67) - - Replace all uses of herd with appropriate project maintainers, or no - maintainers in case of herds requested to be disbanded. - - 24 Jan 2016; Michał Górny <mgorny@gentoo.org> metadata.xml: - Set appropriate maintainer types in metadata.xml (GLEP 67) - -*nginx-1.8.1 (02 Feb 2016) - - 02 Feb 2016; Manuel Rüger <mrueg@gentoo.org> +nginx-1.8.1.ebuild: - Version bump - - Gentoo-Bug: 573046 - - Package-Manager: portage-2.2.27 - - 02 Feb 2016; Manuel Rüger <mrueg@gentoo.org> -nginx-1.9.6.ebuild: - Remove old - - Package-Manager: portage-2.2.27 - - 03 Feb 2016; Agostino Sarubbo <ago@gentoo.org> nginx-1.8.1.ebuild: - amd64 stable wrt bug #573046 - - Package-Manager: portage-2.2.26 - RepoMan-Options: --include-arches="amd64" - Signed-off-by: Agostino Sarubbo <ago@gentoo.org> - - 03 Feb 2016; Agostino Sarubbo <ago@gentoo.org> nginx-1.8.1.ebuild: - x86 stable wrt bug #573046 - - Package-Manager: portage-2.2.26 - RepoMan-Options: --include-arches="x86" - Signed-off-by: Agostino Sarubbo <ago@gentoo.org> - - 03 Feb 2016; Manuel Rüger <mrueg@gentoo.org> -nginx-1.8.0.ebuild: - Remove old - - Package-Manager: portage-2.2.27 - -*nginx-1.9.10 (03 Feb 2016) - - 03 Feb 2016; Manuel Rüger <mrueg@gentoo.org> +nginx-1.9.10.ebuild: - Version bump - - Package-Manager: portage-2.2.27 - - 03 Feb 2016; Manuel Rüger <mrueg@gentoo.org> -nginx-1.9.7.ebuild: - Remove vulnerable - - Gentoo-Bugs: 573046 - - Package-Manager: portage-2.2.27 - -*nginx-1.9.10-r1 (06 Feb 2016) - - 06 Feb 2016; Manuel Rüger <mrueg@gentoo.org> +files/nginx.conf-r2, - +nginx-1.9.10-r1.ebuild: - Add auth_ldap, stream, slice modules - - This commit adds http_slice, stream, auth_ldap modules and support for - libressl. It also updates 3rd party modules, enables http2 by default - and disables gzip by default. - -*nginx-1.9.10-r2 (06 Feb 2016) - - 06 Feb 2016; Manuel Rüger <mrueg@gentoo.org> +nginx-1.9.10-r2.ebuild: - Fix typo in configure option - - Package-Manager: portage-2.2.27 - - 06 Feb 2016; Manuel Rüger <mrueg@gentoo.org> -nginx-1.9.10-r1.ebuild: - Remove old - - Package-Manager: portage-2.2.27 - -*nginx-1.9.10-r3 (07 Feb 2016) - - 07 Feb 2016; Manuel Rüger <mrueg@gentoo.org> +nginx-1.9.10-r3.ebuild: - Fix build without slice module - - Gentoo-Bug: 574020 - - Thanks to: Thomas D. <whissi@whissi.de> - - Package-Manager: portage-2.2.27 - - 07 Feb 2016; Manuel Rüger <mrueg@gentoo.org> -nginx-1.9.10-r2.ebuild: - Remove old - - Package-Manager: portage-2.2.27 - - 21 Feb 2016; Jason A. Donenfeld <zx2c4@gentoo.org> files/nginx.logrotate-r1: - use the nginx utility command for log reopening - -*nginx-1.9.12 (02 Mar 2016) - - 02 Mar 2016; Thomas D <whissi@whissi.de> +nginx-1.9.12.ebuild: - Bump to v1.9.12 (#574342) - - Changes: - - Bumped to EAPI=6 - - - nginx_modules_http_fancyindex bumped to v0.3.6 - - - nginx_modules_http_lua bumped to v0.10.1rc1 - - - nginx_modules_http_auth_ldap bumped to - 8517bb05ecc896b54429ca5e95137b0a386bd41a - - Bug: https://bugs.gentoo.org/show_bug.cgi?id=574342 - - Package-Manager: portage-2.2.27 - - 02 Mar 2016; Jason A. Donenfeld <zx2c4@gentoo.org> nginx-1.9.10-r3.ebuild: - work with libressl - - 03 Mar 2016; Jason A. Donenfeld <zx2c4@gentoo.org> nginx-1.9.12.ebuild: - Support libressl - - Package-Manager: portage-2.2.27 - - 06 Mar 2016; Manuel Rüger <mrueg@gentoo.org> -nginx-1.9.10.ebuild, - -nginx-1.9.10-r3.ebuild: - Remove old - - Package-Manager: portage-2.2.27 - -*nginx-1.9.13 (31 Mar 2016) - - 31 Mar 2016; Ian Delaney <idella4@gentoo.org> +nginx-1.9.13.ebuild: - version bump to 1.9.13 - - Update 3rd party modules: - - lua - - modsecurity - - Upstream changes: http://nginx.org/en/CHANGES - Closes: https://github.com/gentoo/gentoo/pull/1169 - - Signed-off-by: Ian Delaney <idella4@gentoo.org> - - 10 Apr 2016; Manuel Rüger <mrueg@gentoo.org> files/nginx.logrotate-r1: - Revert "www-servers/nginx: use the nginx utility command for log reopening" - - Gentoo Bug: #576558 - - This reverts commit 3e8c33b631035683ce988e0988a06661524164f5. - -*nginx-1.9.14 (10 Apr 2016) - - 10 Apr 2016; Manuel Rüger <mrueg@gentoo.org> +nginx-1.9.14.ebuild: - Version bump to 1.9.14 - - Package-Manager: portage-2.2.28 - - 21 Apr 2016; Zac Medico <zmedico@gentoo.org> -files/check_1.7.2+.patch, - nginx-1.8.1.ebuild: - fix nginx_modules_upstream_check for 1.8.1 (bug 580764) - - Package-Manager: portage-2.2.28 - -*nginx-1.9.15 (24 Apr 2016) - - 24 Apr 2016; Manuel Rüger <mrueg@gentoo.org> +nginx-1.9.15.ebuild: - Version bump to 1.9.15 - - Package-Manager: portage-2.2.28 - - 24 Apr 2016; Manuel Rüger <mrueg@gentoo.org> -nginx-1.9.12.ebuild, - -nginx-1.9.13.ebuild: - Remove old - - Package-Manager: portage-2.2.28 - -*nginx-1.10.0 (04 May 2016) - - 04 May 2016; Manuel Rüger <mrueg@gentoo.org> +files/nginx.initd-r3, - +nginx-1.10.0.ebuild: - Version bump to 1.10.0, use openrc-run - - Gentoo-Bug: #581862 - Gentoo-Bug: #581944 - - Package-Manager: portage-2.2.28 - - 04 May 2016; Manuel Rüger <mrueg@gentoo.org> nginx-1.10.0.ebuild: - Fix blocker - - Package-Manager: portage-2.2.28 - - 04 May 2016; Manuel Rüger <mrueg@gentoo.org> -nginx-1.9.14.ebuild: - Remove old - - Package-Manager: portage-2.2.28 - - 07 May 2016; Zac Medico <zmedico@gentoo.org> - +files/check-0.3.0-segfault-on-reload.patch, nginx-1.10.0.ebuild: - add segfault fix to 1.10.0 for http_upstream_check (bug 582316) - - Package-Manager: portage-2.2.28 - - 07 May 2016; Patrice Clement <monsieurp@gentoo.org> nginx-1.10.0.ebuild: - Fix typo for using stream upstream module - - Closes: https://github.com/gentoo/gentoo/pull/1421 - - Signed-off-by: Patrice Clement <monsieurp@gentoo.org> - - 14 May 2016; Zac Medico <zmedico@gentoo.org> - -files/check-0.3.0-segfault-on-reload.patch, nginx-1.10.0.ebuild: - fix upstream check module segfault for bug 582992 - - * update module snapshot to fix upstream issue 49, a segfault which - occurs in the ngx_http_upstream_check_find_shm_peer function - - * remove check-0.3.0-segfault-on-reload.patch which is included in - the new snapshot - - Package-Manager: portage-2.2.28 - - 18 May 2016; Austin English <wizardedit@gentoo.org> files/nginx.initd-r2: - use #!/sbin/openrc-run instead of #!/sbin/runscript - -*nginx-1.11.1 (11 Jun 2016) -*nginx-1.10.1 (11 Jun 2016) - - 11 Jun 2016; Kristian Fiskerstrand <k_f@gentoo.org> +nginx-1.10.1.ebuild, - +nginx-1.11.1.ebuild: - Version bump - - Gentoo-Bug: 584212 - Gentoo-Bug: 584744 - - Package-Manager: portage-2.3.0_rc1 - - 11 Jun 2016; Kristian Fiskerstrand <k_f@gentoo.org> -nginx-1.9.15.ebuild, - -nginx-1.10.0.ebuild: - Security cleanup - - Gentoo-Bug: 584744 - - Package-Manager: portage-2.3.0_rc1 - - 13 Jun 2016; Agostino Sarubbo <ago@gentoo.org> nginx-1.10.1.ebuild: - amd64 stable wrt bug #584744 - - Package-Manager: portage-2.2.28 - RepoMan-Options: --include-arches="amd64" - Signed-off-by: Agostino Sarubbo <ago@gentoo.org> - - 13 Jun 2016; Agostino Sarubbo <ago@gentoo.org> nginx-1.10.1.ebuild: - x86 stable wrt bug #584744 - - Package-Manager: portage-2.2.28 - RepoMan-Options: --include-arches="x86" - Signed-off-by: Agostino Sarubbo <ago@gentoo.org> - - 13 Jun 2016; Kristian Fiskerstrand <k_f@gentoo.org> - -files/AJP-nginx-1.7.9+.patch, -files/check-1.9.2.patch, - -files/lua-nginx-1.7.6.patch, -files/rtmp-nginx-1.7.6.patch, - -nginx-1.8.1.ebuild: - Security cleanup - - Dropping nginx-1.8.1 which is vulnerable to CVE-2016-4450 and was replaced - by nginx-1.10.1 via commit 9d8b4adb72f5912b8c121bdda6ffee72e08926d7. - - Gentoo-Bug: 584744 - - Package-Manager: portage-2.3.0_rc1 - - 16 Jun 2016; Patrice Clement <monsieurp@gentoo.org> - +files/rtmp-nginx-1.11.0.patch, nginx-1.10.1.ebuild, nginx-1.11.1.ebuild: - Patch for rtmp module. Fixes bug 585804. - - Proposed patch for upstream bug 820 added to fix building of - nginx's 3rd party module "rtmp" against nginx-1.11.0+. - - Bug: https://github.com/arut/nginx-rtmp-module/issues/820 - Gentoo-Bug: https://bugs.gentoo.org/585804 - - Package-Manager: portage-2.3.0_rc1 - Closes: https://github.com/gentoo/gentoo/pull/1669 - - Signed-off-by: Patrice Clement <monsieurp@gentoo.org> - -*nginx-1.11.2 (26 Jul 2016) - - 26 Jul 2016; Lars Wendler <polynomial-c@gentoo.org> - +files/http-sticky-nginx-1.11.2.patch, +nginx-1.11.2.ebuild: - Bump to v1.11.2 (bug #588816) - - Bug: https://bugs.gentoo.org/588816 - Package-Manager: portage-2.3.0 - Signed-off-by: Lars Wendler <polynomial-c@gentoo.org> - - 26 Jul 2016; Lars Wendler <polynomial-c@gentoo.org> -files/nginx.conf, - -files/nginx.initd-r2, -files/rtmp-nginx-1.11.0.patch, -nginx-1.11.1.ebuild: - Cleanup - - Package-Manager: portage-2.3.0 - Signed-off-by: Lars Wendler <polynomial-c@gentoo.org> - -*nginx-1.10.1-r1 (26 Jul 2016) - - 26 Jul 2016; Lars Wendler <polynomial-c@gentoo.org> - +files/nginx-httpoxy-mitigation.patch, +nginx-1.10.1-r1.ebuild, - nginx-1.11.2.ebuild: - HTTPoxy mitigation added - - Package-Manager: portage-2.3.0 - Signed-off-by: Lars Wendler <polynomial-c@gentoo.org> - - 26 Jul 2016; Lars Wendler <polynomial-c@gentoo.org> nginx-1.10.1-r1.ebuild, - nginx-1.11.2.ebuild: - Fix user/group configure argument (bug #588000) - - Bug: https://bugs.gentoo.org/588000 - - Package-Manager: portage-2.3.0 - Signed-off-by: Lars Wendler <polynomial-c@gentoo.org> - - 26 Jul 2016; Lars Wendler <polynomial-c@gentoo.org> nginx-1.10.1-r1.ebuild, - nginx-1.11.2.ebuild: - Drop AJP HTTP module leftovers - - Bug: https://bugs.gentoo.org/587844 - - Package-Manager: portage-2.3.0 - Signed-off-by: Lars Wendler <polynomial-c@gentoo.org> - -*nginx-1.11.3 (09 Aug 2016) - - 09 Aug 2016; Patrice Clement <monsieurp@gentoo.org> - +files/nginx-1.11.3-fix-build-without-stream_ssl_module.patch, - +nginx-1.11.3.ebuild: - version bump to v1.11.3. - - * Upstream added 3 new STREAM modules: - - geo - - geoip - - split_clients - - * Each HTTP/STREAM upstream module can now be enabled/disabled using a - dedicated USE flag - - Package-Manager: portage-2.3.0 - Closes: https://github.com/gentoo/gentoo/pull/1999 - - Signed-off-by: Patrice Clement <monsieurp@gentoo.org> - - 10 Aug 2016; Thomas Deutschmann <whissi@gentoo.org> metadata.xml: - Add myself as maintainer - - Package-Manager: portage-2.3.0 - -*nginx-1.11.3-r1 (10 Aug 2016) -*nginx-1.10.1-r2 (10 Aug 2016) - - 10 Aug 2016; Thomas Deutschmann <whissi@gentoo.org> - +files/nginx-httpoxy-mitigation-r1.patch, +nginx-1.10.1-r2.ebuild, - +nginx-1.11.3-r1.ebuild: - Revision bump to update HTTPoxy mitigation - - Commit c4b897dc39a9 ("www-servers/nginx: HTTPoxy mitigation added") only - added HTTPoxy mitigation for fastcgi protocol. - - This commit will add mitigation for similar protocols like scgi and uwsgi - as well. - - Reported-by: Valentin V. Bartenev <vbart@nginx.com> - - Package-Manager: portage-2.3.0 - - 10 Aug 2016; Thomas Deutschmann <whissi@gentoo.org> - -files/nginx-httpoxy-mitigation.patch, -nginx-1.10.1-r1.ebuild, - -nginx-1.11.2.ebuild, -nginx-1.11.3.ebuild: - Cleanup - - Removing previous ebuilds with incomplete HTTPoxy mitigation. - - Package-Manager: portage-2.3.0 - diff --git a/www-servers/nginx/ChangeLog-2015 b/www-servers/nginx/ChangeLog-2015 deleted file mode 100644 index 2bb5fd0..0000000 --- a/www-servers/nginx/ChangeLog-2015 +++ /dev/null @@ -1,2244 +0,0 @@ -# ChangeLog for www-servers/nginx -# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/ChangeLog,v 1.412 2015/08/05 11:22:18 zlogene Exp $ - - 05 Aug 2015; Mikle Kolyada <zlogene@gentoo.org> nginx-1.8.0.ebuild: - x86 stable wrt bug #556580 - - 03 Aug 2015; Mikle Kolyada <zlogene@gentoo.org> nginx-1.8.0.ebuild: - amd64 stable wrt bug #556580 - -*nginx-1.9.3 (15 Jul 2015) - - 15 Jul 2015; Manuel Rüger <mrueg@gentoo.org> +nginx-1.9.3.ebuild: - Version bump. Proxy commit for Johan Bergström. - -*nginx-1.9.2 (13 Jul 2015) - - 13 Jul 2015; Michał Górny <mgorny@gentoo.org> +files/check-1.9.2.patch, - +nginx-1.9.2.ebuild: - Version bump for mainline series. Introduce USE=threads. Add memc module. - https://github.com/gentoo/gentoo-portage-rsync-mirror/pull/156 by jbergstroem. - -*nginx-1.8.0 (25 Jun 2015) - - 25 Jun 2015; Manuel Rüger <mrueg@gentoo.org> +nginx-1.8.0.ebuild: - Version bump. Temporarily disable the ajp module. Proxy commit for Johan - Bergström. See bug #548186. - - 08 May 2015; Manuel Rüger <mrueg@gentoo.org> -nginx-1.7.10.ebuild, - -nginx-1.7.11.ebuild, -nginx-1.7.7.ebuild, -nginx-1.7.8.ebuild: - Remove old. - -*nginx-1.7.12 (16 Apr 2015) - - 16 Apr 2015; Michał Górny <mgorny@gentoo.org> +nginx-1.7.12.ebuild: - Version bump along with http_headers_more module update. - https://github.com/gentoo/gentoo-portage-rsync-mirror/pull/97 by jbergstroem. - -*nginx-1.7.11 (28 Mar 2015) - - 28 Mar 2015; Manuel Rüger <mrueg@gentoo.org> +nginx-1.7.11.ebuild: - Proxy commit for Johan Bergström. Version bump. - - 10 Mar 2015; Justin Lecher <jlec@gentoo.org> nginx-1.7.10.ebuild: - Import changes from proxy maintainer Johan Bergstroem, - https://github.com/gentoo/proxy-maintainers/pull/22 - -*nginx-1.7.10 (10 Mar 2015) - - 10 Mar 2015; Justin Lecher <jlec@gentoo.org> +files/AJP-nginx-1.7.9+.patch, - +nginx-1.7.10.ebuild, metadata.xml, nginx-1.7.6.ebuild, nginx-1.7.7.ebuild, - nginx-1.7.8.ebuild: - Version Bump, #531542; fix for musl, #533570; drop suspecious einstall, - #521662; fix SLOT operators - - 03 Mar 2015; Yixun Lan <dlan@gentoo.org> nginx-1.7.8.ebuild: - add arm64 support, tested on A53 board - -*nginx-1.7.8 (05 Jan 2015) - - 05 Jan 2015; Manuel Rüger <mrueg@gentoo.org> +nginx-1.7.8.ebuild: - Proxy commit for Johan Bergström. Version bump. - - 17 Nov 2014; Andreas K. Huettel <dilfridge@gentoo.org> nginx-1.7.6.ebuild, - nginx-1.7.7.ebuild: - Replace fixlocalpod with perl_delete_localpod - -*nginx-1.7.7 (03 Nov 2014) - - 03 Nov 2014; Maxim Koltsov <maksbotan@gentoo.org> +nginx-1.7.7.ebuild, - nginx-1.7.6.ebuild: - Update version of nginx-rtmp-module, bug #525836. Bump to 1.7.7. Thanks to - Johan Bergström. - - 02 Nov 2014; Sven Vermeulen <swift@gentoo.org> nginx-1.7.6.ebuild: - Remove sec-policy/selinux-* dependency from DEPEND but keep in RDEPEND (bug - #527698) - - 17 Oct 2014; Tiziano Müller <dev-zero@gentoo.org> -nginx-1.7.4.ebuild: - Drop old & vulnerable version. - - 15 Oct 2014; Agostino Sarubbo <ago@gentoo.org> nginx-1.7.6.ebuild: - Stable for x86, wrt bug #522994 - - 15 Oct 2014; Agostino Sarubbo <ago@gentoo.org> nginx-1.7.6.ebuild: - Stable for amd64, wrt bug #522994 - - 15 Oct 2014; Tiziano Müller <dev-zero@gentoo.org> nginx-1.7.6.ebuild: - Re-add keywords (accidentally dropped when merging from proxy-maintained - overlay). - -*nginx-1.7.6 (15 Oct 2014) - - 15 Oct 2014; Tiziano Müller <dev-zero@gentoo.org> - +files/lua-nginx-1.7.6.patch, +files/rtmp-nginx-1.7.6.patch, - +nginx-1.7.6.ebuild: - Version bump for security bug #522994, thanks to jbergstroem for the bump and - testing. - - 10 Aug 2014; Agostino Sarubbo <ago@gentoo.org> - -files/modsecurity-2.7.5-include-paths.patch, -files/nginx.logrotate, - -files/upstream-check-1.5.13.patch, -files/upstream-check-1.5.8.patch, - -nginx-1.4.7-r1.ebuild, -nginx-1.4.7.ebuild, -nginx-1.5.13.ebuild, - -nginx-1.7.2.ebuild: - Remove old - - 10 Aug 2014; Agostino Sarubbo <ago@gentoo.org> nginx-1.7.4.ebuild: - Stable for x86, wrt bug #519174 - - 10 Aug 2014; Agostino Sarubbo <ago@gentoo.org> nginx-1.7.4.ebuild: - Stable for amd64, wrt bug #519174 - - 10 Aug 2014; Agostino Sarubbo <ago@gentoo.org> nginx-1.7.4.ebuild: - Add ~ppc, wrt bug #517842 - -*nginx-1.7.4 (08 Aug 2014) - - 08 Aug 2014; Tiziano Müller <dev-zero@gentoo.org> +nginx-1.7.4.ebuild, - -nginx-1.7.3.ebuild: - Version bump for security bug #519174/CVE-2014-3556, thanks to Johan - Bergström. - - 23 Jul 2014; Tiziano Müller <dev-zero@gentoo.org> nginx-1.7.3.ebuild: - Restore keywords. - -*nginx-1.7.3 (22 Jul 2014) - - 22 Jul 2014; Tiziano Müller <dev-zero@gentoo.org> +nginx-1.7.3.ebuild, - metadata.xml: - Version bump (including updates to sticky, lua and echo), add mogilefs support - (bug #433107), simplify `nginx -V` output, all thanks to jbergstroem and - reintroduce the luajit USE flag (bug #509338). - - 13 Jul 2014; Jeroen Roovers <jer@gentoo.org> metadata.xml: - Add proxy-maint. - - 06 Jul 2014; Michał Górny <mgorny@gentoo.org> nginx-1.7.2.ebuild: - Replace obsolete mirror://bitbucket with the real URI. - -*nginx-1.7.2 (19 Jun 2014) - - 19 Jun 2014; Tiziano Müller <dev-zero@gentoo.org> +files/check_1.7.2+.patch, - +files/nginx.logrotate-r1, +nginx-1.7.2.ebuild: - Version bump (bug #508810), including fixes for bugs #508650 (delaycompress - for logrotate) and #510040 (use /usr/$(get_libdir)). Thanks to jbergstroem for - providing the bump, testing and patching. - -*nginx-1.5.13 (15 Apr 2014) -*nginx-1.4.7-r1 (15 Apr 2014) - - 15 Apr 2014; Tiziano Müller <dev-zero@gentoo.org> - +files/upstream-check-1.5.13.patch, +nginx-1.4.7-r1.ebuild, - +nginx-1.5.13.ebuild, -nginx-1.5.10.ebuild, -nginx-1.5.7-r1.ebuild: - Version bump for mainline (1.5.13, bug #503414), drop syslog-patch (no version - available for nginx-1.5) and old push-module (use push_stream instead) and add - ajp, sticky modules. Drop old/vulnerable mainline versions. Add rev-bump for - stable series (1.4.7-r1) to fix compilation problems with - USE=nginx_modules_http_security (bugs #506690, #506804). Thanks to jbergstroem - for providing the initial bump including the new modules and a lot of testing. - - 29 Mar 2014; Agostino Sarubbo <ago@gentoo.org> -nginx-1.4.4.ebuild: - Remove old - - 29 Mar 2014; Agostino Sarubbo <ago@gentoo.org> nginx-1.4.7.ebuild: - Stable for x86, wrt bug #505018 - - 29 Mar 2014; Agostino Sarubbo <ago@gentoo.org> nginx-1.4.7.ebuild: - Stable for amd64, wrt bug #505018 - -*nginx-1.4.7 (28 Mar 2014) - - 28 Mar 2014; Tiziano Müller <dev-zero@gentoo.org> +nginx-1.4.7.ebuild: - Version bump (bug #503414 and security bug #505018). Thanks to jbergstroem for - providing the initial bump and testing. - -*nginx-1.5.10 (10 Feb 2014) - - 10 Feb 2014; Jason A. Donenfeld <zx2c4@gentoo.org> - +files/upstream-check-1.5.8.patch, +nginx-1.5.10.ebuild: - Provisonal version bump. - -*nginx-1.5.7-r1 (21 Nov 2013) - - 21 Nov 2013; Tiziano Müller <dev-zero@gentoo.org> +nginx-1.5.7-r1.ebuild, - -files/nginx.service, -nginx-1.5.7.ebuild: - Drop unused service unit. Bump modules: headers_more 0.22->0.23, fancyindex - 0.3.2->0.3.3, lua 0.9.0->0.9.2, naxsi 0.52-1->0.53.1, rtmp 1.0.5->1.0.6, echo - 0.48->0.49, push_stream 0.3.5->0.4.0. Thanks to jbergstroem for putting the - list together and testing. - - 20 Nov 2013; Tiziano Müller <dev-zero@gentoo.org> -nginx-1.4.1-r5.ebuild, - -nginx-1.4.3.ebuild, -nginx-1.5.6.ebuild: - Remove vulnerable version. - - 20 Nov 2013; Agostino Sarubbo <ago@gentoo.org> nginx-1.4.4.ebuild: - Stable for x86, wrt bug #491684 - - 20 Nov 2013; Agostino Sarubbo <ago@gentoo.org> nginx-1.4.4.ebuild: - Stable for amd64, wrt bug #491684 - -*nginx-1.5.7 (19 Nov 2013) -*nginx-1.4.4 (19 Nov 2013) - - 19 Nov 2013; Tiziano Müller <dev-zero@gentoo.org> +nginx-1.4.4.ebuild, - +nginx-1.5.7.ebuild: - Version bump for security bug #490558 (CVE-2013-4547), also fix bug #490558 by - passing pcre-jit and lua USE flags as options to the mod_security standalone - build script. - -*nginx-1.5.6 (24 Oct 2013) - - 24 Oct 2013; Tiziano Müller <dev-zero@gentoo.org> +nginx-1.5.6.ebuild, - -nginx-1.4.1-r2.ebuild, -nginx-1.4.1-r3.ebuild, -nginx-1.4.1-r4.ebuild, - nginx-1.4.3.ebuild: - Version bump for nginx mainline/development version branch (bug #472524, - thanks to jbergstroem for the havily lifting). Drop syslog patch for now since - it fails to apply to nginx-1.5.x. Drop the http_push module completely since - upstream is dead, use http_push_stream instead. Drop obsolete verisons. - -*nginx-1.4.3 (17 Oct 2013) - - 17 Oct 2013; Tiziano Müller <dev-zero@gentoo.org> +nginx-1.4.3.ebuild, - -nginx-1.4.2-r1.ebuild, -nginx-1.4.2.ebuild, metadata.xml: - Version bump (bug #472524), also updated the following modules (thanks to - jbergstroem): syslog-module (0.25), devel-kit (0.2.19), lua (0.9.0), rtmp - (1.0.5). Added jbergstroem as co-maintainer. - -*nginx-1.4.2-r1 (01 Oct 2013) - - 01 Oct 2013; Tiziano Müller <dev-zero@gentoo.org> +nginx-1.4.2-r1.ebuild: - Add push_stream module (bug #471754), warn only about permissions if the nginx - user can not access it (refinement for bug #473036), do not install config - files/keepdir for unused modules (bug #473864, thanks to jbergstroem). - -*nginx-1.4.2 (27 Sep 2013) - - 27 Sep 2013; Tiziano Müller <dev-zero@gentoo.org> - +files/modsecurity-2.7.5-include-paths.patch, +nginx-1.4.2.ebuild: - Version bump for stable nginx branch (bug #472524), also update the following - modules to latest: headers_more, fancyindex (fixes bug #478402), auth_pam, - upstream_check, naxsi, rtmp. Add new modules: echo (bug #471314), modsecurity - (bug #484370). Building metrics requires stub_status (bug #480952). Warn the - user to check the ownership on the log directory (bug #473036, may be improved - by checking the permissions explicitly). - - 14 Sep 2013; Agostino Sarubbo <ago@gentoo.org> nginx-1.4.1-r5.ebuild: - Stable for x86, wrt bug #476688 - - 05 Sep 2013; Agostino Sarubbo <ago@gentoo.org> nginx-1.4.1-r5.ebuild: - Stable for amd64, wrt bug #476688 - - 20 Jun 2013; Benedikt Böhm <hollow@gentoo.org> metadata.xml: - remove myself from maintainers - - 02 Jun 2013; Naohiro Aota <naota@gentoo.org> nginx-1.4.1-r5.ebuild: - Use group id 0 instead of group name root, which is not portable. #462214 - -*nginx-1.4.1-r5 (23 May 2013) - - 23 May 2013; Tiziano Müller <dev-zero@gentoo.org> +nginx-1.4.1-r5.ebuild, - metadata.xml: - Set permissions for /var/lib/nginx/tmp to 0750 instead of 0700 to avoid a - problem with SELinux. Add 3rd-party modules rtmp (bug #427194), dav-ext (bug - #442610). Bump fancyindex (bug #470824, usptream moved to Github). - - 14 May 2013; Tiziano Müller <dev-zero@gentoo.org> nginx-1.4.1-r4.ebuild: - Fix pcre dependency for naxsi by using a REQUIRED_USE. - -*nginx-1.4.1-r4 (14 May 2013) - - 14 May 2013; Tiziano Müller <dev-zero@gentoo.org> +nginx-1.4.1-r4.ebuild: - Add support for naxsi (bug #397587). - -*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) - - 31 Mar 2013; Robin H. Johnson <robbat2@gentoo.org> +nginx-1.3.15.ebuild, - files/nginx.initd: - Version bump per bug #456224, as requested by actown@osuosl.org. - - 18 Feb 2013; Alexis Ballier <aballier@gentoo.org> nginx-1.2.6-r1.ebuild, - nginx-1.3.11.ebuild: - keyword ~amd64-fbsd - - 20 Jan 2013; Agostino Sarubbo <ago@gentoo.org> -nginx-1.2.5.ebuild, - -nginx-1.2.6.ebuild: - Remove old - - 20 Jan 2013; Agostino Sarubbo <ago@gentoo.org> nginx-1.2.6-r1.ebuild: - Stable for amd64, wrt bug #453218 - - 20 Jan 2013; Agostino Sarubbo <ago@gentoo.org> nginx-1.2.6-r1.ebuild: - Stable for x86, wrt bug #453218 - -*nginx-1.3.11 (13 Jan 2013) -*nginx-1.2.6-r1 (13 Jan 2013) - - 13 Jan 2013; Benedikt Böhm <hollow@gentoo.org> +nginx-1.2.6-r1.ebuild, - -nginx-1.3.9.ebuild, +nginx-1.3.11.ebuild: - version bump (fixes #449054, #445806 & #449136) - - 27 Dec 2012; Benedikt Böhm <hollow@gentoo.org> files/nginx.initd: - fix #448712 - -*nginx-1.3.9 (24 Dec 2012) -*nginx-1.2.6 (24 Dec 2012) - - 24 Dec 2012; Benedikt Böhm <hollow@gentoo.org> nginx-1.2.5.ebuild, - +nginx-1.2.6.ebuild, -nginx-1.3.8.ebuild, +nginx-1.3.9.ebuild: - version bump; fixes #448000 - - 20 Dec 2012; Benedikt Böhm <hollow@gentoo.org> nginx-1.2.5.ebuild, - nginx-1.3.8.ebuild, files/nginx.initd: - fix #446734 - - 10 Dec 2012; Benedikt Böhm <hollow@gentoo.org> -nginx-1.0.15.ebuild, - -nginx-1.2.1.ebuild, nginx-1.2.5.ebuild, nginx-1.3.8.ebuild, - files/nginx.initd: - fix #444726, #445930, #446668 - - 26 Nov 2012; Agostino Sarubbo <ago@gentoo.org> nginx-1.2.5.ebuild: - Stable for x86, wrt bug #434324 - - 26 Nov 2012; Agostino Sarubbo <ago@gentoo.org> nginx-1.2.5.ebuild: - Stable for amd64, wrt bug #434324 - - 26 Nov 2012; Benedikt Böhm <hollow@gentoo.org> -nginx-1.2.2.ebuild, - -nginx-1.2.4.ebuild, -nginx-1.3.3.ebuild, -nginx-1.3.7.ebuild, - files/nginx.initd: - remove old versions and add some path checks to init script - -*nginx-1.2.5 (16 Nov 2012) -*nginx-1.3.8 (16 Nov 2012) - - 16 Nov 2012; Patrick Lauer <patrick@gentoo.org> +nginx-1.2.5.ebuild, - +nginx-1.3.8.ebuild: - Bump - -*nginx-1.3.7 (26 Oct 2012) -*nginx-1.2.4 (26 Oct 2012) - - 26 Oct 2012; Patrick Lauer <patrick@gentoo.org> +nginx-1.2.4.ebuild, - +nginx-1.3.7.ebuild: - Bump - - 30 Jul 2012; Benedikt Böhm <hollow@gentoo.org> nginx-1.2.2.ebuild, - nginx-1.3.3.ebuild: - add lua module + cleanup - - 30 Jul 2012; Benedikt Böhm <hollow@gentoo.org> nginx-1.2.1.ebuild, - nginx-1.2.2.ebuild, -nginx-1.3.1.ebuild, nginx-1.3.3.ebuild: - fix #427464 - - 23 Jul 2012; Jeremy Olexa <darkside@gentoo.org> metadata.xml: - remove myself from maintainer, stopped using - -*nginx-1.3.3 (18 Jul 2012) -*nginx-1.2.2 (18 Jul 2012) - - 18 Jul 2012; Benedikt Böhm <hollow@gentoo.org> +nginx-1.2.2.ebuild, - +nginx-1.3.3.ebuild, files/nginx.initd: - version bump. fixes #403921, #404239 and #421059 - - 12 Jun 2012; Agostino Sarubbo <ago@gentoo.org> -nginx-1.1.19.ebuild, - -nginx-1.2.0.ebuild: - Remove old - - 12 Jun 2012; Agostino Sarubbo <ago@gentoo.org> nginx-1.2.1.ebuild: - Stable for amd64, per darkside request on irc - - 11 Jun 2012; Andreas Schuerch <nativemad@gentoo.org> nginx-1.2.1.ebuild: - x86 stable, see bug 419863 - -*nginx-1.3.1 (06 Jun 2012) - - 06 Jun 2012; Patrick Lauer <patrick@gentoo.org> +nginx-1.3.1.ebuild: - Bump for #411937, temporarily masked - - 06 Jun 2012; Patrick Lauer <patrick@gentoo.org> nginx-1.0.15.ebuild, - nginx-1.1.19.ebuild, nginx-1.2.0.ebuild, nginx-1.2.1.ebuild: - Adding user.eclass inherit - -*nginx-1.2.1 (06 Jun 2012) - - 06 Jun 2012; Patrick Lauer <patrick@gentoo.org> +nginx-1.2.1.ebuild: - Bump - -*nginx-1.2.0 (18 May 2012) - - 18 May 2012; Jeremy Olexa <darkside@gentoo.org> +nginx-1.2.0.ebuild: - Version bump from upstream, new stable candidate. bug 414167 with selinux - mods from bug 416307 - - 18 Apr 2012; Jeremy Olexa <darkside@gentoo.org> nginx-1.1.19.ebuild: - Cosmetic changes to align with upstream better. Use Makefile to install. No - revbump needed - - 18 Apr 2012; Jeremy Olexa <darkside@gentoo.org> -nginx-1.0.14.ebuild, - metadata.xml: - Remove vulnerable version. Document local ssl USE flag - - 15 Apr 2012; Markus Meier <maekke@gentoo.org> nginx-1.0.15.ebuild: - x86 stable, bug #411751 - - 14 Apr 2012; Agostino Sarubbo <ago@gentoo.org> nginx-1.0.15.ebuild: - Stable for amd64, wrt bug #411751 - -*nginx-1.0.15 (14 Apr 2012) - - 14 Apr 2012; Benedikt Böhm <hollow@gentoo.org> +nginx-1.0.15.ebuild, - nginx-1.1.19.ebuild: - version bump wrt #411751 - - 13 Apr 2012; Jeremy Olexa <darkside@gentoo.org> -nginx-1.0.10.ebuild, - -nginx-1.1.17.ebuild, -nginx-1.1.18.ebuild, +nginx-1.1.19.ebuild, - metadata.xml: - Version bump from upstream (security bug 411751), addition of fancyindex - third party module (bug 411663). Cleanup metadata.xml - -*nginx-1.1.19 (13 Apr 2012) - - 13 Apr 2012; Jeremy Olexa <darkside@gentoo.org> -nginx-1.1.17.ebuild, - -nginx-1.1.18.ebuild, +nginx-1.1.19.ebuild, metadata.xml: - Version bump from upstream (security bug 411751), addition of fancyindex - third party module (bug 411663). Cleanup metadata.xml - -*nginx-1.1.18 (10 Apr 2012) - - 10 Apr 2012; Patrick Lauer <patrick@gentoo.org> +nginx-1.1.18.ebuild: - Bump - - 30 Mar 2012; Patrick Lauer <patrick@gentoo.org> nginx-1.1.17.ebuild: - Bump upload_progress module #409099 - - 15 Mar 2012; Agostino Sarubbo <ago@gentoo.org> nginx-1.0.14.ebuild: - Stable for AMD64/X86, wrt security bug #408367 - - 15 Mar 2012; Patrick Lauer <patrick@gentoo.org> -nginx-1.0.11.ebuild, - -nginx-1.0.12.ebuild, -nginx-1.1.14.ebuild, -nginx-1.1.16.ebuild: - Removing old versions - -*nginx-1.1.17 (15 Mar 2012) -*nginx-1.0.14 (15 Mar 2012) - - 15 Mar 2012; Patrick Lauer <patrick@gentoo.org> +nginx-1.0.14.ebuild, - +nginx-1.1.17.ebuild: - Bump for #408367 - - 02 Mar 2012; Patrick Lauer <patrick@gentoo.org> nginx-1.1.16.ebuild: - Fixing headers_more URI madness #406555 - -*nginx-1.1.16 (02 Mar 2012) - - 02 Mar 2012; Patrick Lauer <patrick@gentoo.org> +nginx-1.1.16.ebuild, - -nginx-1.1.13.ebuild: - Bump, closes #403329 - -*nginx-1.1.14 (11 Feb 2012) -*nginx-1.0.12 (11 Feb 2012) - - 11 Feb 2012; Benedikt Böhm <hollow@gentoo.org> nginx-1.0.10.ebuild, - nginx-1.0.11.ebuild, +nginx-1.0.12.ebuild, -nginx-1.1.12-r1.ebuild, - nginx-1.1.13.ebuild, +nginx-1.1.14.ebuild, +files/nginx.conf, - +files/nginx.initd, -files/nginx.conf-r4, -files/nginx.init-r2: - version bump wrt #402957 - -*nginx-1.1.13 (29 Jan 2012) -*nginx-1.0.11 (29 Jan 2012) - - 29 Jan 2012; Benedikt Böhm <hollow@gentoo.org> +nginx-1.0.11.ebuild, - -nginx-1.1.8.ebuild, +nginx-1.1.13.ebuild: - version bump wrt #401163 - - 28 Dec 2011; Patrick Lauer <patrick@gentoo.org> -nginx-1.1.11.ebuild, - -nginx-1.1.12.ebuild: - Removing old - -*nginx-1.1.12-r1 (28 Dec 2011) - - 28 Dec 2011; Patrick Lauer <patrick@gentoo.org> +nginx-1.1.12-r1.ebuild, - metadata.xml, nginx-1.1.12.ebuild: - Add pcre-jit support - -*nginx-1.1.12 (27 Dec 2011) - - 27 Dec 2011; Patrick Lauer <patrick@gentoo.org> +nginx-1.1.12.ebuild: - Bump - -*nginx-1.1.11 (25 Dec 2011) - - 25 Dec 2011; Patrick Lauer <patrick@gentoo.org> +nginx-1.1.11.ebuild: - Bump for #393119, including bump of http_cache_purge to 1.5 - - 06 Dec 2011; Sven Wegener <swegener@gentoo.org> files/nginx.init-r2: - Switch from opts to extra_started_commands. - - 24 Nov 2011; Benedikt Böhm <hollow@gentoo.org> -nginx-1.0.6.ebuild, - -nginx-1.0.8.ebuild, nginx-1.0.10.ebuild, -nginx-1.1.4.ebuild, - -nginx-1.1.6.ebuild: - add mp4 module wrt #363573; remove old ebuilds - - 22 Nov 2011; Tony Vroon <chainsaw@gentoo.org> nginx-1.0.10.ebuild: - Marked stable on AMD64 based on arch testing by Agostino "ago" Sarubbo & - Michael "n0idx80" Harrison in security bug #389319. - - 22 Nov 2011; Pawel Hajdan jr <phajdan.jr@gentoo.org> nginx-1.0.10.ebuild: - x86 stable wrt bug #389319 - -*nginx-1.1.8 (20 Nov 2011) -*nginx-1.0.10 (20 Nov 2011) - - 20 Nov 2011; Benedikt Böhm <hollow@gentoo.org> +nginx-1.0.10.ebuild, - +nginx-1.1.8.ebuild: - version bump wrt #389319 - - 31 Oct 2011; Benedikt Böhm <hollow@gentoo.org> nginx-1.0.8.ebuild, - nginx-1.1.6.ebuild: - fix location of README for cache purge module - - 28 Oct 2011; Benedikt Böhm <hollow@gentoo.org> nginx-1.0.8.ebuild, - nginx-1.1.6.ebuild: - fix commit SHAs from github - -*nginx-1.1.6 (28 Oct 2011) -*nginx-1.0.8 (28 Oct 2011) - - 28 Oct 2011; Benedikt Böhm <hollow@gentoo.org> - -files/nginx-0.8.32-ey-balancer.patch, -nginx-1.0.4.ebuild, - +nginx-1.0.8.ebuild, -nginx-1.1.2.ebuild, +nginx-1.1.6.ebuild, metadata.xml: - version bump wrt #385965 - - 04 Oct 2011; Pawel Hajdan jr <phajdan.jr@gentoo.org> nginx-1.0.6.ebuild: - x86 stable wrt bug #385035 - - 30 Sep 2011; Steve Dibb <beandog@gentoo.org> nginx-1.0.6.ebuild: - amd64 stable, bug 385035 - -*nginx-1.1.4 (30 Sep 2011) - - 30 Sep 2011; Benedikt Böhm <hollow@gentoo.org> -nginx-1.0.5.ebuild, - +nginx-1.1.4.ebuild, metadata.xml: - version bump wrt #383079 - - 09 Sep 2011; Benedikt Böhm <hollow@gentoo.org> nginx-1.0.4.ebuild, - nginx-1.0.5.ebuild, nginx-1.0.6.ebuild, nginx-1.1.2.ebuild: - remove ipv6 warning wrt #382393 - -*nginx-1.1.2 (07 Sep 2011) -*nginx-1.0.6 (07 Sep 2011) - - 07 Sep 2011; Benedikt Böhm <hollow@gentoo.org> +nginx-1.0.6.ebuild, - +nginx-1.1.2.ebuild, files/nginx.init-r2, metadata.xml: - version bump wrt #381153. also fixes bugs #379477, #377713 and #373677. - -*nginx-1.0.5 (25 Jul 2011) - - 25 Jul 2011; Benedikt Böhm <hollow@gentoo.org> -nginx-0.8.53.ebuild, - -nginx-0.8.53-r1.ebuild, -nginx-1.0.0.ebuild, -nginx-1.0.0-r1.ebuild, - -nginx-1.0.2.ebuild, +nginx-1.0.5.ebuild, - -files/passenger-3.0.1-cflags.patch, - -files/passenger-3.0.1-missing-auto-feature.patch, - -files/passenger-3.0.1-missing-include.patch, -files/passenger-CFLAGS.patch: - version bump wrt #375781. cleanup wrt #348501 and #349276. - - 15 Jul 2011; Markus Meier <maekke@gentoo.org> nginx-1.0.4.ebuild: - x86 stable, bug #373633 - - 02 Jul 2011; Markos Chandras <hwoarang@gentoo.org> nginx-1.0.4.ebuild: - Stable on amd64 wrt bug #373633 - -*nginx-1.0.4 (02 Jun 2011) - - 02 Jun 2011; Benedikt Böhm <hollow@gentoo.org> nginx-1.0.2.ebuild, - +nginx-1.0.4.ebuild: - version bump wrt #369631. also fixes #369617 - - 24 May 2011; Markus Meier <maekke@gentoo.org> nginx-1.0.0-r1.ebuild: - x86 stable, bug #368219 - - 24 May 2011; Markos Chandras <hwoarang@gentoo.org> nginx-1.0.0-r1.ebuild: - Stable on amd64 wrt bug #368219 - - 24 May 2011; Benedikt Böhm <hollow@gentoo.org> nginx-0.8.53.ebuild, - nginx-0.8.53-r1.ebuild, nginx-1.0.0.ebuild, nginx-1.0.0-r1.ebuild, - nginx-1.0.2.ebuild: - fix USE dependencies for media-libs/gd wrt #368443 - - 19 May 2011; Benedikt Böhm <hollow@gentoo.org> nginx-1.0.2.ebuild: - bump cache_purge module to fix build after nginx-1.0.1 - -*nginx-1.0.2 (18 May 2011) - - 18 May 2011; Benedikt Böhm <hollow@gentoo.org> -nginx-0.9.7.ebuild, - +nginx-1.0.2.ebuild: - version bump wrt #367207 - - 19 Apr 2011; Benedikt Böhm <hollow@gentoo.org> - files/nginx-0.8.32-ey-balancer.patch, nginx-1.0.0-r1.ebuild: - fix QA warnings and wrong README paths - -*nginx-1.0.0-r1 (18 Apr 2011) - - 18 Apr 2011; Benedikt Böhm <hollow@gentoo.org> - +files/nginx-0.8.32-ey-balancer.patch, +nginx-1.0.0-r1.ebuild, - metadata.xml: - add slowfs_cache and ey-balancer modules - -*nginx-1.0.0 (12 Apr 2011) - - 12 Apr 2011; Benedikt Böhm <hollow@gentoo.org> +nginx-1.0.0.ebuild: - version bump - -*nginx-0.9.7 (08 Apr 2011) - - 08 Apr 2011; Benedikt Böhm <hollow@gentoo.org> -nginx-0.7.65.ebuild, - -nginx-0.7.65-r1.ebuild, -nginx-0.8.52.ebuild, +nginx-0.9.7.ebuild, - files/nginx.logrotate, metadata.xml: - remove old 0.7 series, version bump to 0.9.7: drops passenger support, - adds http_upload module, fixes logrotate when not running - - 05 Mar 2011; Brent Baude <ranger@gentoo.org> nginx-0.8.53.ebuild: - stable ppc, bug 349223 - - 02 Jan 2011; Markos Chandras <hwoarang@gentoo.org> nginx-0.8.53.ebuild: - Stable on amd64 wrt bug #349223 - - 21 Dec 2010; Pawel Hajdan jr <phajdan.jr@gentoo.org> nginx-0.8.53.ebuild: - x86 stable wrt bug #349223 - -*nginx-0.8.53-r1 (13 Dec 2010) - - 13 Dec 2010; Tiziano Müller <dev-zero@gentoo.org> -nginx-0.8.46.ebuild, - -nginx-0.8.47.ebuild, -nginx-0.8.48.ebuild, -nginx-0.8.49.ebuild, - +nginx-0.8.53-r1.ebuild, +files/passenger-3.0.1-cflags.patch, - +files/passenger-3.0.1-missing-auto-feature.patch, - +files/passenger-3.0.1-missing-include.patch: - Revision bump to bump passenger to 3.0.1 (currently p.masked for testing). - Removed old versions. - -*nginx-0.8.53 (28 Nov 2010) - - 28 Nov 2010; Benedikt Böhm <hollow@gentoo.org> +nginx-0.8.53.ebuild: - version bump wrt #342979 - -*nginx-0.8.52 (30 Sep 2010) - - 30 Sep 2010; Tiziano Müller <dev-zero@gentoo.org> +nginx-0.8.52.ebuild: - Version bump (thanks to Johan Bergström). - - 19 Sep 2010; Benedikt Böhm <hollow@gentoo.org> files/nginx.conf-r4: - default to 1024 worker connections (see #337639) - -*nginx-0.8.49 (10 Aug 2010) - - 10 Aug 2010; Tiziano Müller <dev-zero@gentoo.org> +nginx-0.8.49.ebuild: - Version bump, bail out if cache_purge is used without fastcgi or uwsgi - (upstream is working on a real solution, thanks to jbergstroem). - -*nginx-0.8.48 (06 Aug 2010) - - 06 Aug 2010; Tiziano Müller <dev-zero@gentoo.org> +nginx-0.8.48.ebuild: - Version bump, added cache_purge-module (bug #322061). - -*nginx-0.8.47 (29 Jul 2010) - - 29 Jul 2010; Tiziano Müller <dev-zero@gentoo.org> - -nginx-0.8.36-r1.ebuild, -nginx-0.8.38.ebuild, -nginx-0.8.38-r1.ebuild, - -nginx-0.8.42.ebuild, +nginx-0.8.47.ebuild: - Version bump. Dropped old. - -*nginx-0.8.46 (20 Jul 2010) - - 20 Jul 2010; Tiziano Müller <dev-zero@gentoo.org> +nginx-0.8.46.ebuild: - Version bump (bug #327951, thanks to George), also bumped passenger to - 2.2.15 and headers_more to 0.13. - -*nginx-0.8.42 (02 Jul 2010) - - 02 Jul 2010; Tiziano Müller <dev-zero@gentoo.org> +nginx-0.8.42.ebuild: - Version bump (bug #323151, thanks to Johan Bergström). - -*nginx-0.8.38-r1 (04 Jun 2010) - - 04 Jun 2010; Tiziano Müller <dev-zero@gentoo.org> - +nginx-0.8.38-r1.ebuild: - Bumped uwsgi-module. - - 04 Jun 2010; Benedikt Böhm <hollow@gentoo.org> nginx-0.8.38.ebuild: - bump passenger wrt #322105 - - 30 May 2010; Benedikt Böhm <hollow@gentoo.org> nginx-0.8.38.ebuild: - add split_clients module support - -*nginx-0.8.38 (30 May 2010) - - 30 May 2010; Benedikt Böhm <hollow@gentoo.org> +nginx-0.8.38.ebuild: - version bump wrt #321681 - - 29 May 2010; Benedikt Böhm <hollow@gentoo.org> nginx-0.7.65-r1.ebuild, - -nginx-0.8.34-r1.ebuild, -nginx-0.8.35.ebuild, -nginx-0.8.36.ebuild, - nginx-0.8.36-r1.ebuild: - add vim-syntax support wrt #289926 - -*nginx-0.8.36-r1 (03 May 2010) - - 03 May 2010; Benedikt Böhm <hollow@gentoo.org> +nginx-0.8.36-r1.ebuild: - add uWSGI module wrt bug #314931 - -*nginx-0.8.36 (26 Apr 2010) - - 26 Apr 2010; Tiziano Müller <dev-zero@gentoo.org> +nginx-0.8.36.ebuild: - Version bump. Make sure we don't depend on perl unconditionally. - -*nginx-0.8.35 (11 Apr 2010) - - 11 Apr 2010; Tiziano Müller <dev-zero@gentoo.org> +nginx-0.8.35.ebuild, - metadata.xml: - Version bump. Added the http_push module. Moved libatomic_ops dep to - DEPEND. Added myself as maintainer. Added upstream changelog URL. - - 26 Mar 2010; Benedikt Böhm <hollow@gentoo.org> nginx-0.7.65-r1.ebuild, - nginx-0.8.34-r1.ebuild: - fix pcre use flag for real - - 25 Mar 2010; Benedikt Böhm <hollow@gentoo.org> nginx-0.7.65-r1.ebuild, - nginx-0.8.34-r1.ebuild: - fix pcre USE flag - -*nginx-0.7.65-r1 (25 Mar 2010) - - 25 Mar 2010; Benedikt Böhm <hollow@gentoo.org> -nginx-0.7.64.ebuild, - -nginx-0.7.64-r3.ebuild, nginx-0.7.65.ebuild, +nginx-0.7.65-r1.ebuild, - -nginx-0.8.33.ebuild, -nginx-0.8.34.ebuild, nginx-0.8.34-r1.ebuild, - -files/nginx-r1, metadata.xml: - fix #308175, #308195, #308481 and #311277 - - 21 Mar 2010; Pawel Hajdan jr <phajdan.jr@gentoo.org> nginx-0.7.65.ebuild: - x86 stable, arch-tested by Andreas Schurch, bug #308175 - - 15 Mar 2010; nixnut <nixnut@gentoo.org> nginx-0.7.65.ebuild: - ppc stable #308175 - - 07 Mar 2010; Benedikt Böhm <hollow@gentoo.org> nginx-0.8.34-r1.ebuild: - fix USE flag typos - -*nginx-0.8.34-r1 (07 Mar 2010) - - 07 Mar 2010; Benedikt Böhm <hollow@gentoo.org> +nginx-0.8.34-r1.ebuild, - files/nginx.conf-r4, +files/passenger-CFLAGS.patch, metadata.xml: - rewrite ebuild for USE_EXPAND goodies. fixes #286772, #301513, #303205 and - #305691 - - 04 Mar 2010; Benedikt Böhm <hollow@gentoo.org> metadata.xml: - take over maintainance wrt #303205 - - 04 Mar 2010; Dirkjan Ochtman <djc@gentoo.org> -nginx-0.5.38.ebuild, - -nginx-0.6.39.ebuild, -nginx-0.7.62.ebuild, -nginx-0.8.31.ebuild, - -nginx-0.8.32.ebuild: - Clean up old versions. - -*nginx-0.8.34 (04 Mar 2010) - - 04 Mar 2010; Dirkjan Ochtman <djc@gentoo.org> +nginx-0.8.34.ebuild: - Version bump to 0.8.34. - -*nginx-0.8.33 (02 Feb 2010) -*nginx-0.7.65 (02 Feb 2010) - - 02 Feb 2010; Dirkjan Ochtman <djc@gentoo.org> +nginx-0.7.65.ebuild, - +nginx-0.8.33.ebuild: - Version bump 0.7.x and 0.8.x branches. - - 01 Feb 2010; Markus Meier <maekke@gentoo.org> nginx-0.7.64.ebuild: - amd64 stable, bug #293785 - -*nginx-0.8.32 (24 Jan 2010) - - 24 Jan 2010; Dirkjan Ochtman <djc@gentoo.org> -nginx-0.8.29.ebuild, - +nginx-0.8.32.ebuild: - Simple version bump to 0.8.32, clean out 0.8.29 while we're at it. - - 03 Jan 2010; Dirkjan Ochtman <djc@gentoo.org> -nginx-0.7.64-r2.ebuild: - Remove superseded 0.7.64-r2. - -*nginx-0.8.31 (03 Jan 2010) - - 03 Jan 2010; Dirkjan Ochtman <djc@gentoo.org> +nginx-0.8.31.ebuild, - metadata.xml: - Bump to 0.8.31, adding the aio use flag. - -*nginx-0.7.64-r3 (03 Jan 2010) - - 03 Jan 2010; Dirkjan Ochtman <djc@gentoo.org> +nginx-0.7.64-r3.ebuild, - +files/nginx.logrotate, metadata.xml: - Fix bug 296168 (logrotate) and 247474 (realip use flag). - - 03 Jan 2010; Dirkjan Ochtman <djc@gentoo.org> -nginx-0.7.64-r1.ebuild, - -nginx-0.8.17.ebuild, -files/nginx, -files/nginx.conf, - -files/nginx.conf-r1, -files/nginx.conf-r2, -files/nginx.conf-r3, - -files/nginx-secure-link-timeout.patch: - Clean up all kinds of old, unused cruft. - -*nginx-0.7.64-r2 (03 Jan 2010) - - 03 Jan 2010; Dirkjan Ochtman <djc@gentoo.org> +nginx-0.7.64-r2.ebuild, - +files/nginx.init-r2, metadata.xml: - Fix bug 272964 and bug 272964 in nginx-0.7.64-r2. - -*nginx-0.7.64-r1 (03 Jan 2010) - - 03 Jan 2010; Dirkjan Ochtman <djc@gentoo.org> +nginx-0.7.64-r1.ebuild, - metadata.xml: - Fix bugs 241756 (perllocal.pod) and 210086 (mail flags). - - 03 Jan 2010; Christian Faulhammer <fauli@gentoo.org> nginx-0.8.29.ebuild: - revert to testing for x86 - - 02 Jan 2010; Christian Faulhammer <fauli@gentoo.org> nginx-0.8.29.ebuild: - stable x86, security bug 293785 - - 02 Jan 2010; Christian Faulhammer <fauli@gentoo.org> nginx-0.7.64.ebuild: - stable x86, security bug 293785 - - 01 Jan 2010; Dirkjan Ochtman <djc@gentoo.org> nginx-0.7.64.ebuild, - nginx-0.8.29.ebuild: - Fix problems with ssl requirements (see bug 293785 for discussion). - -*nginx-0.8.29 (08 Dec 2009) -*nginx-0.7.64 (08 Dec 2009) - - 08 Dec 2009; Dirkjan Ochtman <djc@gentoo.org> +nginx-0.7.64.ebuild, - +nginx-0.8.29.ebuild: - Bump nginx 0.7 and 0.8 to 0.7.64 and 0.8.29. - -*nginx-0.8.17 (28 Sep 2009) - - 28 Sep 2009; Konstantin V. Arkhipov <voxus@gentoo.org> - -nginx-0.8.16.ebuild, +nginx-0.8.17.ebuild: - Version bump. - -*nginx-0.8.16 (25 Sep 2009) - - 25 Sep 2009; Konstantin V. Arkhipov <voxus@gentoo.org> - -nginx-0.8.15.ebuild, +nginx-0.8.16.ebuild: - Version bump. - - 21 Sep 2009; Konstantin V. Arkhipov <voxus@gentoo.org> - -nginx-0.5.37.ebuild, -nginx-0.6.38.ebuild, -nginx-0.7.61.ebuild, - -nginx-0.8.4.ebuild, -nginx-0.8.4-r1.ebuild, -nginx-0.8.13.ebuild: - Cleanup. - - 18 Sep 2009; Tobias Heinlein <keytoaster@gentoo.org> nginx-0.5.38.ebuild, - nginx-0.6.39.ebuild, nginx-0.7.62.ebuild: - amd64 stable, security bug #285162 - - 16 Sep 2009; Christian Faulhammer <fauli@gentoo.org> nginx-0.5.38.ebuild, - nginx-0.6.39.ebuild, nginx-0.7.62.ebuild: - stable x86 - -*nginx-0.8.15 (14 Sep 2009) -*nginx-0.7.62 (14 Sep 2009) -*nginx-0.6.39 (14 Sep 2009) -*nginx-0.5.38 (14 Sep 2009) - - 14 Sep 2009; Konstantin V. Arkhipov <voxus@gentoo.org> - -nginx-0.1.45.ebuild, -nginx-0.2.6.ebuild, -nginx-0.3.61.ebuild, - -nginx-0.4.14.ebuild, +nginx-0.5.38.ebuild, +nginx-0.6.39.ebuild, - +nginx-0.7.62.ebuild, +nginx-0.8.15.ebuild: - Version bump, wrt bug #283802. Unsupported versions are dropped. - -*nginx-0.8.13 (06 Sep 2009) - - 06 Sep 2009; Konstantin V. Arkhipov <voxus@gentoo.org> - -nginx-0.8.10.ebuild, +nginx-0.8.13.ebuild: - Version bump. - -*nginx-0.8.10 (24 Aug 2009) - - 24 Aug 2009; Konstantin V. Arkhipov <voxus@gentoo.org> - -nginx-0.8.9.ebuild, +nginx-0.8.10.ebuild: - Version bump. - -*nginx-0.8.9 (23 Aug 2009) - - 23 Aug 2009; Konstantin V. Arkhipov <voxus@gentoo.org> - -nginx-0.8.8.ebuild, +nginx-0.8.9.ebuild: - Version bump. - -*nginx-0.8.8 (10 Aug 2009) - - 10 Aug 2009; Konstantin V. Arkhipov <voxus@gentoo.org> - +nginx-0.8.8.ebuild: - Version bump. - -*nginx-0.8.4-r1 (19 Jul 2009) - - 19 Jul 2009; Dawid Węgliński <cla@gentoo.org> - +files/nginx-secure-link-timeout.patch, metadata.xml, - +nginx-0.8.4-r1.ebuild: - Enable NginxHttpSecureLinkModule (bug #269810) - Enable ipv6 support in nginx (bug #274614). - Bug me for problems with those changes. - - 09 Jul 2009; Konstantin V. Arkhipov <voxus@gentoo.org> - -nginx-0.6.32.ebuild, nginx-0.6.38.ebuild, nginx-0.7.61.ebuild: - Stabilization. - -*nginx-0.6.38 (23 Jun 2009) - - 23 Jun 2009; Konstantin V. Arkhipov <voxus@gentoo.org> - -nginx-0.6.37.ebuild, +nginx-0.6.38.ebuild: - Version bump. - -*nginx-0.8.4 (22 Jun 2009) -*nginx-0.7.61 (22 Jun 2009) - - 22 Jun 2009; Konstantin V. Arkhipov <voxus@gentoo.org> - -nginx-0.7.60.ebuild, +nginx-0.7.61.ebuild, -nginx-0.8.2.ebuild, - +nginx-0.8.4.ebuild: - Version bump. - -*nginx-0.8.2 (16 Jun 2009) -*nginx-0.7.60 (16 Jun 2009) - - 16 Jun 2009; Konstantin V. Arkhipov <voxus@gentoo.org> - -nginx-0.7.59.ebuild, +nginx-0.7.60.ebuild, +nginx-0.8.2.ebuild: - Version bump. - -*nginx-0.7.59 (25 May 2009) - - 25 May 2009; Konstantin V. Arkhipov <voxus@gentoo.org> - -nginx-0.7.55.ebuild, +nginx-0.7.59.ebuild: - Version bump. - -*nginx-0.6.37 (18 May 2009) - - 18 May 2009; Konstantin V. Arkhipov <voxus@gentoo.org> - -nginx-0.6.35.ebuild, +nginx-0.6.37.ebuild: - Version bump. - -*nginx-0.7.55 (11 May 2009) - - 11 May 2009; Konstantin V. Arkhipov <voxus@gentoo.org> - -nginx-0.7.54.ebuild, +nginx-0.7.55.ebuild: - Version bump. - -*nginx-0.7.54 (03 May 2009) - - 03 May 2009; Konstantin V. Arkhipov <voxus@gentoo.org> - -nginx-0.7.50.ebuild, +nginx-0.7.54.ebuild: - Version bump. - -*nginx-0.7.50 (12 Apr 2009) - - 12 Apr 2009; Konstantin V. Arkhipov <voxus@gentoo.org> - -nginx-0.7.43.ebuild, +nginx-0.7.50.ebuild: - Version bump. - -*nginx-0.7.43 (22 Mar 2009) - - 22 Mar 2009; Konstantin V. Arkhipov <voxus@gentoo.org> - -nginx-0.7.42.ebuild, +nginx-0.7.43.ebuild: - Version bump. - -*nginx-0.7.42 (17 Mar 2009) - - 17 Mar 2009; Konstantin V. Arkhipov <voxus@gentoo.org> - -nginx-0.7.39.ebuild, +nginx-0.7.42.ebuild: - Version bump. - - 17 Mar 2009; Timothy Redaelli <drizzt@gentoo.org> nginx-0.7.39.ebuild: - Use ${ROOT} when it's needed (thanks to tove@g.o for reporting) Respect CC - and LDFLAGS (Maintainer is in devaway status) - - 17 Mar 2009; Timothy Redaelli <drizzt@gentoo.org> nginx-0.7.39.ebuild: - QA: Don't abuse ROOT wrt #232969, #258118. Add ~x86-fbsd keyword (with - small patch) wrt #155623, #236429. (Maintainer is in devaway status) - -*nginx-0.7.39 (04 Mar 2009) - - 04 Mar 2009; Konstantin V. Arkhipov <voxus@gentoo.org> - -nginx-0.7.38.ebuild, +nginx-0.7.39.ebuild: - Version bump. - -*nginx-0.7.38 (26 Feb 2009) - - 26 Feb 2009; Konstantin V. Arkhipov <voxus@gentoo.org> - -nginx-0.7.34.ebuild, +nginx-0.7.38.ebuild: - Version bump. Added use flag for optional enabling of random index http - module. - -*nginx-0.7.34 (12 Feb 2009) - - 12 Feb 2009; Konstantin V. Arkhipov <voxus@gentoo.org> - -nginx-0.7.33.ebuild, +nginx-0.7.34.ebuild: - Version bump. - -*nginx-0.7.33 (03 Feb 2009) - - 03 Feb 2009; Konstantin V. Arkhipov <voxus@gentoo.org> - -nginx-0.7.32.ebuild, +nginx-0.7.33.ebuild: - Version bump. - -*nginx-0.7.32 (31 Jan 2009) -*nginx-0.6.35 (31 Jan 2009) - - 31 Jan 2009; Konstantin V. Arkhipov <voxus@gentoo.org> - -nginx-0.6.34.ebuild, +nginx-0.6.35.ebuild, -nginx-0.7.31.ebuild, - +nginx-0.7.32.ebuild: - Version bump. - -*nginx-0.7.31 (21 Jan 2009) - - 21 Jan 2009; Konstantin V. Arkhipov <voxus@gentoo.org> - -nginx-0.7.30.ebuild, +nginx-0.7.31.ebuild: - Version bump. - -*nginx-0.6.34 (12 Jan 2009) - - 12 Jan 2009; Konstantin V. Arkhipov <voxus@gentoo.org> - -nginx-0.6.33.ebuild, +nginx-0.6.34.ebuild: - Version bump. - -*nginx-0.7.30 (25 Dec 2008) - - 25 Dec 2008; Konstantin V. Arkhipov <voxus@gentoo.org> - -nginx-0.7.26.ebuild, +nginx-0.7.30.ebuild: - Version bump. - -*nginx-0.7.26 (11 Dec 2008) - - 11 Dec 2008; Konstantin V. Arkhipov <voxus@gentoo.org> - -nginx-0.7.24.ebuild, +nginx-0.7.26.ebuild: - Version bump. - -*nginx-0.7.24 (02 Dec 2008) - - 02 Dec 2008; Konstantin V. Arkhipov <voxus@gentoo.org> - -nginx-0.7.21.ebuild, -nginx-0.7.22.ebuild, +nginx-0.7.24.ebuild: - Version bump. - -*nginx-0.7.22 (24 Nov 2008) -*nginx-0.6.33 (24 Nov 2008) - - 24 Nov 2008; Konstantin V. Arkhipov <voxus@gentoo.org> - +nginx-0.6.33.ebuild, +nginx-0.7.22.ebuild: - Version bump. - -*nginx-0.7.21 (13 Nov 2008) - - 13 Nov 2008; Konstantin V. Arkhipov <voxus@gentoo.org> - -nginx-0.7.20.ebuild, +nginx-0.7.21.ebuild: - Version bump. - -*nginx-0.7.20 (11 Nov 2008) - - 11 Nov 2008; Konstantin V. Arkhipov <voxus@gentoo.org> - -nginx-0.7.19.ebuild, +nginx-0.7.20.ebuild: - Version bump. - -*nginx-0.7.19 (25 Oct 2008) - - 25 Oct 2008; Konstantin V. Arkhipov <voxus@gentoo.org> - -nginx-0.5.35.ebuild, nginx-0.5.37.ebuild, -nginx-0.6.29.ebuild, - nginx-0.6.32.ebuild, -nginx-0.7.16.ebuild, -nginx-0.7.17.ebuild, - +nginx-0.7.19.ebuild: - Version bump, stabilization. - -*nginx-0.7.17 (16 Sep 2008) - - 16 Sep 2008; Konstantin V. Arkhipov <voxus@gentoo.org> - +nginx-0.7.17.ebuild: - Version bump. - -*nginx-0.7.16 (08 Sep 2008) - - 08 Sep 2008; Konstantin V. Arkhipov <voxus@gentoo.org> - -nginx-0.7.14.ebuild, +nginx-0.7.16.ebuild: - Version bump. - -*nginx-0.7.14 (02 Sep 2008) - - 02 Sep 2008; Konstantin V. Arkhipov <voxus@gentoo.org> - -nginx-0.7.13.ebuild, +nginx-0.7.14.ebuild: - Version bump. - -*nginx-0.7.13 (28 Aug 2008) - - 28 Aug 2008; Konstantin V. Arkhipov <voxus@gentoo.org> - -nginx-0.7.11.ebuild, +nginx-0.7.13.ebuild: - Version bump. - -*nginx-0.7.11 (25 Aug 2008) - - 25 Aug 2008; Konstantin V. Arkhipov <voxus@gentoo.org> - -nginx-0.7.8.ebuild, +nginx-0.7.11.ebuild: - Version bump. - - 22 Aug 2008; Doug Goldstein <cardoe@gentoo.org> metadata.xml: - add GLEP 56 USE flag desc from use.local.desc - -*nginx-0.7.8 (05 Aug 2008) - - 05 Aug 2008; Konstantin V. Arkhipov <voxus@gentoo.org> - -nginx-0.7.7.ebuild, +nginx-0.7.8.ebuild: - Version bump. - -*nginx-0.7.7 (03 Aug 2008) - - 03 Aug 2008; Konstantin V. Arkhipov <voxus@gentoo.org> - -nginx-0.7.6.ebuild, +nginx-0.7.7.ebuild: - Version bump. - -*nginx-0.5.37 (29 Jul 2008) - - 29 Jul 2008; Konstantin V. Arkhipov <voxus@gentoo.org> - +nginx-0.5.37.ebuild: - Version bump. - -*nginx-0.6.32 (14 Jul 2008) - - 14 Jul 2008; Konstantin V. Arkhipov <voxus@gentoo.org> - -nginx-0.6.31.ebuild, +nginx-0.6.32.ebuild: - Version bump. - -*nginx-0.7.6 (10 Jul 2008) - - 10 Jul 2008; Konstantin V. Arkhipov <voxus@gentoo.org> - -nginx-0.7.5.ebuild, +nginx-0.7.6.ebuild: - Version bump. - -*nginx-0.7.5 (06 Jul 2008) - - 06 Jul 2008; Konstantin V. Arkhipov <voxus@gentoo.org> - -nginx-0.7.4.ebuild, +nginx-0.7.5.ebuild: - Version bump. - -*nginx-0.7.4 (30 Jun 2008) - - 30 Jun 2008; Konstantin V. Arkhipov <voxus@gentoo.org> - -nginx-0.7.2.ebuild, +nginx-0.7.4.ebuild: - Version bump. - -*nginx-0.7.2 (22 Jun 2008) - - 22 Jun 2008; Konstantin V. Arkhipov <voxus@gentoo.org> - -nginx-0.7.1.ebuild, +nginx-0.7.2.ebuild: - Version bump. - -*nginx-0.7.1 (27 May 2008) -*nginx-0.6.31 (27 May 2008) - - 27 May 2008; Konstantin V. Arkhipov <voxus@gentoo.org> - -nginx-0.6.30.ebuild, +nginx-0.6.31.ebuild, +nginx-0.7.1.ebuild: - Version bumps. - -*nginx-0.6.30 (02 May 2008) - - 02 May 2008; Konstantin V. Arkhipov <voxus@gentoo.org> - +nginx-0.6.30.ebuild: - Version bump. - - 11 Apr 2008; Konstantin V. Arkhipov <voxus@gentoo.org> - -nginx-0.5.34.ebuild, nginx-0.5.35.ebuild, -nginx-0.6.24.ebuild, - nginx-0.6.29.ebuild: - Stabilization. - -*nginx-0.6.29 (24 Mar 2008) - - 24 Mar 2008; Konstantin V. Arkhipov <voxus@gentoo.org> - -nginx-0.6.28.ebuild, +nginx-0.6.29.ebuild: - Version bump. - -*nginx-0.6.28 (13 Mar 2008) - - 13 Mar 2008; Konstantin V. Arkhipov <voxus@gentoo.org> - -nginx-0.6.26.ebuild, +nginx-0.6.28.ebuild: - Version bump. - -*nginx-0.6.26 (13 Feb 2008) - - 13 Feb 2008; Konstantin V. Arkhipov <voxus@gentoo.org> - -nginx-0.6.25.ebuild, +nginx-0.6.26.ebuild: - Version bump. - -*nginx-0.6.25 (10 Jan 2008) -*nginx-0.5.35 (10 Jan 2008) - - 10 Jan 2008; Konstantin V. Arkhipov <voxus@gentoo.org> - +nginx-0.5.35.ebuild, +nginx-0.6.25.ebuild: - Version bumps. - - 03 Jan 2008; Ulrich Mueller <ulm@gentoo.org> -nginx-0.5.26.ebuild: - Remove vulnerable version wrt security bugs #174759 and #201691. - - 31 Dec 2007; Konstantin V. Arkhipov <voxus@gentoo.org> - nginx-0.5.34.ebuild, nginx-0.6.24.ebuild: - Stabilization wrt bug #201691. - -*nginx-0.6.24 (30 Dec 2007) - - 30 Dec 2007; Konstantin V. Arkhipov <voxus@gentoo.org> - -nginx-0.6.21.ebuild, +nginx-0.6.24.ebuild: - Version bump. - -*nginx-0.5.34 (14 Dec 2007) - - 14 Dec 2007; Konstantin V. Arkhipov <voxus@gentoo.org> - -nginx-0.5.33.ebuild, +nginx-0.5.34.ebuild: - Version bump. - -*nginx-0.6.21 (09 Dec 2007) - - 09 Dec 2007; Konstantin V. Arkhipov <voxus@gentoo.org> - nginx-0.5.33.ebuild, -nginx-0.6.20.ebuild, +nginx-0.6.21.ebuild: - Version bump, also closes bugs #199375, #200240 and #201691. - -*nginx-0.6.20 (29 Nov 2007) - - 29 Nov 2007; Konstantin V. Arkhipov <voxus@gentoo.org> - -nginx-0.6.16.ebuild, +nginx-0.6.20.ebuild: - Version bump. - -*nginx-0.5.33 (08 Nov 2007) - - 08 Nov 2007; Konstantin V. Arkhipov <voxus@gentoo.org> - -nginx-0.5.32.ebuild, +nginx-0.5.33.ebuild: - Version bump. - -*nginx-0.6.16 (30 Oct 2007) - - 30 Oct 2007; Konstantin V. Arkhipov <voxus@gentoo.org> - -nginx-0.6.15.ebuild, +nginx-0.6.16.ebuild: - Version bump. - -*nginx-0.6.15 (27 Oct 2007) - - 27 Oct 2007; Konstantin V. Arkhipov <voxus@gentoo.org> - -nginx-0.6.13.ebuild, +nginx-0.6.15.ebuild: - Version bump. - -*nginx-0.5.32 (01 Oct 2007) - - 01 Oct 2007; Konstantin V. Arkhipov <voxus@gentoo.org> - -nginx-0.5.31.ebuild, +nginx-0.5.32.ebuild: - Version bump. sub useflag added. Certificate generation moved to - pkg_postinst(). - -*nginx-0.6.13 (25 Sep 2007) - - 25 Sep 2007; Konstantin V. Arkhipov <voxus@gentoo.org> - -nginx-0.6.12.ebuild, +nginx-0.6.13.ebuild: - Version bump. - -*nginx-0.6.12 (22 Sep 2007) - - 22 Sep 2007; Konstantin V. Arkhipov <voxus@gentoo.org> - -nginx-0.6.11.ebuild, +nginx-0.6.12.ebuild: - Version bump. - -*nginx-0.6.11 (13 Sep 2007) - - 13 Sep 2007; Konstantin V. Arkhipov <voxus@gentoo.org> - -nginx-0.6.10.ebuild, +nginx-0.6.11.ebuild: - Version bump. - -*nginx-0.6.10 (04 Sep 2007) - - 04 Sep 2007; Konstantin V. Arkhipov <voxus@gentoo.org> - -nginx-0.6.9.ebuild, +nginx-0.6.10.ebuild: - Version bump. - -*nginx-0.6.9 (01 Sep 2007) - - 01 Sep 2007; Konstantin V. Arkhipov <voxus@gentoo.org> - -nginx-0.6.8.ebuild, +nginx-0.6.9.ebuild: - Version bump. - -*nginx-0.6.8 (20 Aug 2007) -*nginx-0.5.31 (20 Aug 2007) - - 20 Aug 2007; Konstantin V. Arkhipov <voxus@gentoo.org> - -nginx-0.5.30.ebuild, +nginx-0.5.31.ebuild, -nginx-0.6.6.ebuild, - +nginx-0.6.8.ebuild: - Version bump. - -*nginx-0.6.6 (30 Jul 2007) -*nginx-0.5.30 (30 Jul 2007) - - 30 Jul 2007; Konstantin V. Arkhipov <voxus@gentoo.org> - -nginx-0.5.29.ebuild, +nginx-0.5.30.ebuild, -nginx-0.6.5.ebuild, - +nginx-0.6.6.ebuild: - Version bump. - -*nginx-0.6.5 (26 Jul 2007) -*nginx-0.5.29 (26 Jul 2007) - - 26 Jul 2007; Konstantin V. Arkhipov <voxus@gentoo.org> - -nginx-0.5.28.ebuild, +nginx-0.5.29.ebuild, -nginx-0.6.4.ebuild, - +nginx-0.6.5.ebuild: - Version bump. - -*nginx-0.6.4 (17 Jul 2007) -*nginx-0.5.28 (17 Jul 2007) - - 17 Jul 2007; Konstantin V. Arkhipov <voxus@gentoo.org> - -nginx-0.5.27.ebuild, +nginx-0.5.28.ebuild, -nginx-0.6.3.ebuild, - +nginx-0.6.4.ebuild: - Version bump, flv use flag added. - -*nginx-0.6.3 (12 Jul 2007) - - 12 Jul 2007; Konstantin V. Arkhipov <voxus@gentoo.org> - -nginx-0.6.2.ebuild, +nginx-0.6.3.ebuild: - Version bump. - -*nginx-0.6.2 (09 Jul 2007) -*nginx-0.5.27 (09 Jul 2007) - - 09 Jul 2007; Konstantin V. Arkhipov <voxus@gentoo.org> - -nginx-0.5.5.ebuild, nginx-0.5.26.ebuild, +nginx-0.5.27.ebuild, - -nginx-0.6.1.ebuild, +nginx-0.6.2.ebuild: - Version bump. - -*nginx-0.6.1 (17 Jun 2007) -*nginx-0.5.26 (17 Jun 2007) - - 17 Jun 2007; Konstantin V. Arkhipov <voxus@gentoo.org> - -nginx-0.5.25.ebuild, +nginx-0.5.26.ebuild, -nginx-0.6.0.ebuild, - +nginx-0.6.1.ebuild: - Double bump. - -*nginx-0.6.0 (14 Jun 2007) - - 14 Jun 2007; Konstantin V. Arkhipov <voxus@gentoo.org> - +nginx-0.6.0.ebuild: - Version bump. - -*nginx-0.5.25 (11 Jun 2007) - - 11 Jun 2007; Konstantin V. Arkhipov <voxus@gentoo.org> - -nginx-0.5.24.ebuild, +nginx-0.5.25.ebuild: - Version bump. - -*nginx-0.5.24 (06 Jun 2007) - - 06 Jun 2007; Konstantin V. Arkhipov <voxus@gentoo.org> - -nginx-0.5.23.ebuild, +nginx-0.5.24.ebuild: - Version bump. - -*nginx-0.5.23 (04 Jun 2007) - - 04 Jun 2007; Konstantin V. Arkhipov <voxus@gentoo.org> - -nginx-0.5.22.ebuild, +nginx-0.5.23.ebuild: - Version bump. - -*nginx-0.5.22 (29 May 2007) - - 29 May 2007; Konstantin V. Arkhipov <voxus@gentoo.org> - -nginx-0.5.20.ebuild, +nginx-0.5.22.ebuild: - Version bump. - - 09 May 2007; Timothy Redaelli <drizzt@gentoo.org> nginx-0.5.20.ebuild: - Add ~x86-fbsd keyword. - -*nginx-0.5.20 (07 May 2007) - - 07 May 2007; Konstantin V. Arkhipov <voxus@gentoo.org> - -nginx-0.5.19.ebuild, +nginx-0.5.20.ebuild: - Version bump. - -*nginx-0.5.19 (24 Apr 2007) - - 24 Apr 2007; Konstantin V. Arkhipov <voxus@gentoo.org> - -nginx-0.5.18-r1.ebuild, +nginx-0.5.19.ebuild: - Version bump. - -*nginx-0.5.18-r1 (21 Apr 2007) - - 21 Apr 2007; Konstantin V. Arkhipov <voxus@gentoo.org> - +files/nginx.conf-r4, -nginx-0.5.18.ebuild, +nginx-0.5.18-r1.ebuild: - Closing bug #173209. - -*nginx-0.5.18 (20 Apr 2007) - - 20 Apr 2007; Konstantin V. Arkhipov <voxus@gentoo.org> - -nginx-0.5.17.ebuild, +nginx-0.5.18.ebuild: - Version bump. - -*nginx-0.5.17 (02 Apr 2007) - - 02 Apr 2007; Konstantin V. Arkhipov <voxus@gentoo.org> - -nginx-0.5.16.ebuild, +nginx-0.5.17.ebuild: - Version bump. - - 26 Mar 2007; Konstantin V. Arkhipov <voxus@gentoo.org> - ,nginx-0.5.15.ebuild, +nginx-0.5.16.ebuild: - Version bump, closing bug #169763. - -*nginx-0.5.15 (19 Mar 2007) - - 19 Mar 2007; Konstantin V. Arkhipov <voxus@gentoo.org> - -nginx-0.5.14.ebuild, +nginx-0.5.15.ebuild: - Version bump. - -*nginx-0.5.14 (26 Feb 2007) - - 26 Feb 2007; Konstantin V. Arkhipov <voxus@gentoo.org> - -nginx-0.5.13.ebuild, +nginx-0.5.14.ebuild: - Version bump, webdav added to use flags. - -*nginx-0.5.13 (19 Feb 2007) - - 19 Feb 2007; Konstantin V. Arkhipov <voxus@gentoo.org> - -nginx-0.5.12.ebuild, +nginx-0.5.13.ebuild: - Version bump. - -*nginx-0.5.12 (13 Feb 2007) - - 13 Feb 2007; Konstantin V. Arkhipov <voxus@gentoo.org> - nginx-0.4.14.ebuild, nginx-0.5.5.ebuild, -nginx-0.5.11.ebuild, - +nginx-0.5.12.ebuild: - Version bump, stabilization. - -*nginx-0.5.11 (05 Feb 2007) - - 05 Feb 2007; Konstantin V. Arkhipov <voxus@gentoo.org> - -nginx-0.5.10.ebuild, +nginx-0.5.11.ebuild: - Version bump. - -*nginx-0.5.10 (26 Jan 2007) - - 26 Jan 2007; Konstantin V. Arkhipov <voxus@gentoo.org> - -nginx-0.5.9.ebuild, +nginx-0.5.10.ebuild: - Version bump. - -*nginx-0.5.9 (25 Jan 2007) - - 25 Jan 2007; Konstantin V. Arkhipov <voxus@gentoo.org> - -nginx-0.5.8.ebuild, +nginx-0.5.9.ebuild: - Version bump. - -*nginx-0.5.8 (20 Jan 2007) - - 20 Jan 2007; Konstantin V. Arkhipov <voxus@gentoo.org> - -nginx-0.5.7.ebuild, +nginx-0.5.8.ebuild: - Version bump. - -*nginx-0.5.7 (16 Jan 2007) - - 16 Jan 2007; Konstantin V. Arkhipov <voxus@gentoo.org> - -nginx-0.5.6.ebuild, +nginx-0.5.7.ebuild: - Version bump. - -*nginx-0.5.6 (11 Jan 2007) - - 11 Jan 2007; Konstantin V. Arkhipov <voxus@gentoo.org> - +nginx-0.5.6.ebuild: - Version bump. - -*nginx-0.5.5 (25 Dec 2006) - - 25 Dec 2006; Konstantin V. Arkhipov <voxus@gentoo.org> - -nginx-0.5.4.ebuild, -nginx-0.5.4-r1.ebuild, +nginx-0.5.5.ebuild: - Version bump. - -*nginx-0.5.4-r1 (17 Dec 2006) - - 17 Dec 2006; Konstantin V. Arkhipov <voxus@gentoo.org> - +files/nginx.conf-r3, +nginx-0.5.4-r1.ebuild: - Closing bugs #156126 and #156426. - -*nginx-0.5.4 (17 Dec 2006) - - 17 Dec 2006; Konstantin V. Arkhipov <voxus@gentoo.org> - -nginx-0.5.2.ebuild, +nginx-0.5.4.ebuild: - Version bump. - -*nginx-0.5.2 (11 Dec 2006) - - 11 Dec 2006; Konstantin V. Arkhipov <voxus@gentoo.org> - -nginx-0.5.1.ebuild, +nginx-0.5.2.ebuild: - One more bump. - -*nginx-0.5.1 (11 Dec 2006) - - 11 Dec 2006; Konstantin V. Arkhipov <voxus@gentoo.org> - -nginx-0.5.0.ebuild, +nginx-0.5.1.ebuild: - Version bump. - -*nginx-0.5.0 (04 Dec 2006) - - 04 Dec 2006; Konstantin V. Arkhipov <voxus@gentoo.org> - +nginx-0.5.0.ebuild: - Version bump. - -*nginx-0.4.14 (30 Nov 2006) - - 30 Nov 2006; Konstantin V. Arkhipov <voxus@gentoo.org> - -nginx-0.4.13.ebuild, +nginx-0.4.14.ebuild: - Version bump. - -*nginx-0.4.13 (15 Nov 2006) - - 15 Nov 2006; Konstantin V. Arkhipov <voxus@gentoo.org> - -nginx-0.4.12.ebuild, +nginx-0.4.13.ebuild: - Version bump. - -*nginx-0.4.12 (31 Oct 2006) - - 31 Oct 2006; Konstantin V. Arkhipov <voxus@gentoo.org> - -nginx-0.3.54.ebuild, -nginx-0.3.57.ebuild, nginx-0.3.61.ebuild, - -nginx-0.4.11.ebuild, +nginx-0.4.12.ebuild: - Version bump, 0.3.61 goes stable on amd64/x86. - -*nginx-0.4.11 (25 Oct 2006) - - 25 Oct 2006; Konstantin V. Arkhipov <voxus@gentoo.org> - -nginx-0.4.10.ebuild, +nginx-0.4.11.ebuild: - Version bump. - -*nginx-0.4.10 (23 Oct 2006) - - 23 Oct 2006; Konstantin V. Arkhipov <voxus@gentoo.org> - -nginx-0.4.9.ebuild, +nginx-0.4.10.ebuild: - Bump. - -*nginx-0.4.9 (18 Oct 2006) - - 18 Oct 2006; Konstantin V. Arkhipov <voxus@gentoo.org> - -nginx-0.4.8.ebuild, +nginx-0.4.9.ebuild: - One more bump. - -*nginx-0.4.8 (18 Oct 2006) - - 18 Oct 2006; Konstantin V. Arkhipov <voxus@gentoo.org> - -nginx-0.4.6.ebuild, +nginx-0.4.8.ebuild: - Version bump. - -*nginx-0.4.6 (06 Oct 2006) - - 06 Oct 2006; Konstantin Arkhipov <voxus@gentoo.org> +nginx-0.4.6.ebuild, - -nginx-0.4.5.ebuild: - Bump. - -*nginx-0.4.5 (02 Oct 2006) - - 02 Oct 2006; Konstantin Arkhipov <voxus@gentoo.org> +nginx-0.4.5.ebuild, - -nginx-0.4.3.ebuild: - Bump. - -*nginx-0.4.3 (28 Sep 2006) - - 28 Sep 2006; Konstantin Arkhipov <voxus@gentoo.org> +nginx-0.4.3.ebuild, - -nginx-0.4.2.ebuild: - Bump. - -*nginx-0.4.2 (14 Sep 2006) - - 14 Sep 2006; Konstantin Arkhipov <voxus@gentoo.org> +nginx-0.4.2.ebuild, - -nginx-0.4.1.ebuild: - Bump. - -*nginx-0.4.1 (14 Sep 2006) - - 14 Sep 2006; Konstantin Arkhipov <voxus@gentoo.org> +nginx-0.4.1.ebuild, - -nginx-0.4.0.ebuild: - Bump. - -*nginx-0.4.0 (09 Sep 2006) -*nginx-0.3.61 (09 Sep 2006) - - 09 Sep 2006; Konstantin Arkhipov <voxus@gentoo.org> +nginx-0.3.61.ebuild, - +nginx-0.4.0.ebuild: - Double bump. - -*nginx-0.3.60 (18 Aug 2006) - - 18 Aug 2006; Konstantin Arkhipov <voxus@gentoo.org> +nginx-0.3.60.ebuild, - -nginx-0.3.59.ebuild: - Bump. - -*nginx-0.3.59 (16 Aug 2006) - - 16 Aug 2006; Konstantin Arkhipov <voxus@gentoo.org> +nginx-0.3.59.ebuild, - -nginx-0.3.58.ebuild, -nginx-0.3.49.ebuid, nginx-0.3.54.ebuild: - Version bump, 0.3.54 goes stable on amd64 and x86. - -*nginx-0.3.58 (15 Aug 2006) - - 15 Aug 2006; Konstantin Arkhipov <voxus@gentoo.org> +nginx-0.3.58.ebuild, - -nginx-0.3.57.ebuild: - Version bump. - -*nginx-0.3.57 (10 Aug 2006) - - 10 Aug 2006; Konstantin Arkhipov <voxus@gentoo.org> +nginx-0.3.57.ebuild, - -nginx-0.3.56.ebuild: - Version bump. - -*nginx-0.3.56 (04 Aug 2006) - - 04 Aug 2006; Konstantin Arkhipov <voxus@gentoo.org> +nginx-0.3.56.ebuild, - -nginx-0.3.55.ebuild: - Version bump. - -*nginx-0.3.55 (28 Jul 2006) - - 28 Jul 2006; Konstantin Arkhipov <voxus@gentoo.org> +nginx-0.3.55.ebuild: - Version bump. - -*nginx-0.3.54 (11 Jul 2006) - - 11 Jul 2006; Konstantin Arkhipov <voxus@gentoo.org> +nginx-0.3.54.ebuild, - -nginx-0.3.53-r1.ebuild: - Bump. - -*nginx-0.3.53-r1 (08 Jul 2006) - - 08 Jul 2006; Konstantin Arkhipov <voxus@gentoo.org> +nginx-0.3.53-r1.ebuild, - -nginx-0.3.53.ebuild: - Added patch for amd64 from author. - -*nginx-0.3.53 (07 Jul 2006) - - 07 Jul 2006; Konstantin Arkhipov <voxus@gentoo.org> +nginx-0.3.53.ebuild, - -nginx-0.3.52.ebuild: - Bump, http_realip_module now build automatically with fastcgi enabled. - -*nginx-0.3.52 (04 Jul 2006) - - 04 Jul 2006; Konstantin Arkhipov <voxus@gentoo.org> +nginx-0.3.52.ebuild, - +files/nginx-r1, -nginx-0.3.51.ebuild: - Version bump, perl installation fixed (as reported by AlexeyK), upgrade - routine added to init-script. - -*nginx-0.3.51 (01 Jul 2006) - - 01 Jul 2006; Konstantin Arkhipov <voxus@gentoo.org> +nginx-0.3.51.ebuild, - -nginx-0.3.50.ebuild: - Bump. - -*nginx-0.3.50 (30 Jun 2006) - - 30 Jun 2006; Konstantin Arkhipov <voxus@gentoo.org> +nginx-0.3.50.ebuild, - -nginx-0.3.35.ebuild, -nginx-0.3.44.ebuild, -nginx-0.3.46.ebuild, - nginx-0.3.49.ebuild: - Bump, 0.3.49 goes stable on both amd64 and x86. - -*nginx-0.3.49 (01 Jun 2006) - - 01 Jun 2006; Konstantin Arkhipov <voxus@gentoo.org> +nginx-0.3.49.ebuild, - -nginx-0.3.47.ebuild: - Bump. - -*nginx-0.3.47 (24 May 2006) - - 24 May 2006; Konstantin Arkhipov <voxus@gentoo.org> +nginx-0.3.47.ebuild: - Bump. - -*nginx-0.3.46 (11 May 2006) - - 11 May 2006; Konstantin Arkhipov <voxus@gentoo.org> +nginx-0.3.46.ebuild, - -nginx-0.3.45.ebuild: - Bump. - -*nginx-0.3.45 (06 May 2006) - - 06 May 2006; Konstantin Arkhipov <voxus@gentoo.org> +nginx-0.3.45.ebuild, - -nginx-0.3.44.ebuild: - Version bump. - -*nginx-0.3.44 (03 May 2006) - - 03 May 2006; Konstantin Arkhipov <voxus@gentoo.org> +nginx-0.3.44.ebuild, - -nginx-0.3.43.ebuild: - Version bump. - -*nginx-0.3.43 (26 Apr 2006) - - 26 Apr 2006; Konstantin Arkhipov <voxus@gentoo.org> +nginx-0.3.43.ebuild, - -nginx-0.3.42.ebuild: - One more time. - -*nginx-0.3.42 (26 Apr 2006) - - 26 Apr 2006; Konstantin Arkhipov <voxus@gentoo.org> +nginx-0.3.42.ebuild, - -nginx-0.3.41.ebuild: - Bump. - -*nginx-0.3.41 (22 Apr 2006) - - 22 Apr 2006; Konstantin Arkhipov <voxus@gentoo.org> +nginx-0.3.41.ebuild, - -nginx-0.3.40.ebuild: - Bump. - -*nginx-0.3.40 (20 Apr 2006) - - 20 Apr 2006; Konstantin Arkhipov <voxus@gentoo.org> +nginx-0.3.40.ebuild, - -nginx-0.3.39.ebuild: - Bump. - -*nginx-0.3.39 (17 Apr 2006) - - 17 Apr 2006; Konstantin Arkhipov <voxus@gentoo.org> -nginx-0.3.38.ebuild, - +nginx-0.3.39.ebuild: - Bump. - -*nginx-0.3.38 (14 Apr 2006) - - 14 Apr 2006; Konstantin Arkhipov <voxus@gentoo.org> -nginx-0.3.37.ebuild, - +nginx-0.3.38.ebuild: - Bump. - - 13 Apr 2006; Konstantin Arkhipov <voxus@gentoo.org> -nginx-0.3.12.ebuild, - nginx-0.3.35.ebuild: - Goes stable on amd64 and x86. - -*nginx-0.3.37 (08 Apr 2006) - - 08 Apr 2006; Konstantin Arkhipov <voxus@gentoo.org> +nginx-0.3.37.ebuild, - -nginx-0.3.36.ebuild: - Version bump. - -*nginx-0.3.36 (05 Apr 2006) - - 05 Apr 2006; Konstantin Arkhipov <voxus@gentoo.org> +nginx-0.3.36.ebuild: - Version bump. - -*nginx-0.3.35 (23 Mar 2006) - - 23 Mar 2006; Konstantin Arkhipov <voxus@gentoo.org> +nginx-0.3.35.ebuild, - -nginx-0.3.34.ebuild: - Bump. - -*nginx-0.3.34 (22 Mar 2006) - - 22 Mar 2006; Konstantin Arkhipov <voxus@gentoo.org> +nginx-0.3.34.ebuild, - +filles/nginx.conf-r2, -nginx-0.3.33.ebuild, -nginx-0.3.30.ebuild: - Version bump. Default nginx.conf polished a bit. - -*nginx-0.3.33 (16 Mar 2006) - - 16 Mar 2006; Konstantin Arkhipov <voxus@gentoo.org> +nginx-0.3.33.ebuild, - -nginx-0.3.32.ebuild: - Version bump. - -*nginx-0.3.32 (11 Mar 2006) - - 11 Mar 2006; Konstantin Arkhipov <voxus@gentoo.org> +nginx-0.3.32.ebuild, - -nginx-0.3.31.ebuild: - Version bump. - -*nginx-0.3.31 (10 Mar 2006) - - 10 Mar 2006; Konstantin Arkhipov <voxus@gentoo.org> +nginx-0.3.31.ebuild: - Version bump. - -*nginx-0.3.30 (22 Feb 2006) - - 22 Feb 2006; Konstantin Arkhipov <voxus@gentoo.org> +nginx-0.3.30.ebuild, - -nginx-0.3.29.ebuild, -nginx-0.3.29-r1.ebuild, - -files/nginx-0.3.29-hardened.patch: - Version bump. - -*nginx-0.3.29-r1 (22 Feb 2006) - - 22 Feb 2006; Konstantin Arkhipov <voxus@gentoo.org> +nginx-0.3.29-r1.ebuild, - +files/nginx-0.3.29-hardened.patch: - Closing bug #123680, patch provided by author. - -*nginx-0.3.29 (20 Feb 2006) - - 20 Feb 2006; Konstantin Arkhipov <voxus@gentoo.org> +nginx-0.3.29.ebuild, - -nginx-0.3.28.ebuild: - Bump. - -*nginx-0.3.28 (16 Feb 2006) - - 16 Feb 2006; Konstantin Arkhipov <voxus@gentoo.org> +nginx-0.3.28.ebuild, - -nginx-0.3.27.ebuild: - Version bump. - -*nginx-0.3.27 (08 Feb 2006) - - 08 Feb 2006; Konstantin Arkhipov <voxus@gentoo.org> +nginx-0.3.27.ebuild, - -nginx-0.3.26.ebuild: - Bump. - -*nginx-0.3.26 (03 Feb 2006) - - 03 Feb 2006; Konstantin Arkhipov <voxus@gentoo.org> +nginx-0.3.26.eubild, - -nginx-0.3.25.ebuild: - Version bump. - -*nginx-0.3.25 (01 Feb 2006) - - 01 Feb 2006; Konstantin Arkhipov <voxus@gentoo.org> +nginx-0.3.25.ebuild, - -nginx-0.3.24.ebuild: - One more bump with minor bugfix. - -*nginx-0.3.24 (01 Feb 2006) - - 01 Feb 2006; Konstantin Arkhipov <voxus@gentoo.org> +nginx-0.3.24.ebuild, - -nginx-0.3.15.ebuild, -nginx-0.3.22.ebuild, -nginx-0.3.24.ebuild: - Bump. - -*nginx-0.3.23 (24 Jan 2006) - - 24 Jan 2006; Konstantin Arkhipov <voxus@gentoo.org> +nginx-0.3.23.ebuild: - Version bump. - -*nginx-0.3.22 (18 Jan 2006) - - 18 Jan 2006; Konstantin Arkhipov <voxus@gentoo.org> +nginx-0.3.22.ebuild, - +files/nginx.conf-r1, -nginx-0.3.20.ebuild, -nginx-0.3.21.ebuild: - Version bump, new use flag for perl, default configuration updated. - -*nginx-0.3.21 (16 Jan 2006) - - 16 Jan 2006; Konstantin Arkhipov <voxus@gentoo.org> +nginx-0.3.21.ebuild: - Bump. - -*nginx-0.3.20 (12 Jan 2006) - - 12 Jan 2006; Konstantin Arkhipov <voxus@gentoo.org> +nginx-0.3.20.ebuild, - -nginx-0.3.19.ebuild: - Version bump. - -*nginx-0.3.19 (28 Dec 2005) - - 28 Dec 2005; Konstantin Arkhipov <voxus@gentoo.org> +nginx-0.3.19.ebuild, - -nginx-0.3.18.ebuild: - One more bump. - -*nginx-0.3.18 (28 Dec 2005) - - 28 Dec 2005; Konstantin Arkhipov <voxus@gentoo.org> +nginx-0.3.18.ebuild: - Bump, closing bug #116270. - -*nginx-0.3.14 (07 Dec 2005) - - 07 Dec 2005; Konstantin Arkhipov <voxus@gentoo.org> +nginx-0.1.15.ebuild, - -nginx-0.3.14.ebuild: - Bump. - -*nginx-0.3.14 (05 Dec 2005) - - 05 Dec 2005; Konstantin Arkhipov <voxus@gentoo.org> +nginx-0.3.14.ebuild, - -nginx-0.3.13.ebuild: - Yet another bump. - -*nginx-0.3.13 (05 Dec 2005) - - 05 Dec 2005; Konstantin Arkhipov <voxus@gentoo.org> +nginx-0.3.13.ebuild, - nginx-0.3.12.ebuild, -nginx-0.3.9.ebuild: - Bump and 0.3.12 stabilization. - -*nginx-0.3.12 (26 Nov 2005) - - 26 Nov 2005; Konstantin Arkhipov <voxus@gentoo.org> +nginx-0.3.12.ebuild, - -nginx-0.3.11.ebuild: - Version bump, security fix. - -*nginx-0.3.11 (16 Nov 2005) - - 16 Nov 2005; Konstantin Arkhipov <voxus@gentoo.org> +nginx-0.3.11.ebuild, - nginx-0.3.9.ebuild, -nginx-0.3.7.ebuild: - Veresion bump, 0.3.9 goes stable on amd64 and x86. - -*nginx-0.3.9 (11 Nov 2005) - - 11 Nov 2005; Konstantin Arkhipov <voxus@gentoo.org> +nginx-0.3.9.ebuild: - Version bump. - - 05 Oct 2005; Konstantin Arkhipov <voxus@gentoo.org> nginx-0.3.7.ebuild: - Stable on x86 and amd64. - -*nginx-0.3.7 (27 Oct 2005) - - 27 Oct 2005; Konstantin Arkhipov <voxus@gentoo.org> -nginx-0.3.6.ebuild, - +nginx-0.3.7.ebuild: - Version bump. Primary candidate for stabilization within this week. - -*nginx-0.3.6 (25 Oct 2005) - - 25 Oct 2005; Konstantin Arkhipov <voxus@gentoo.org> -nginx-0.3.5.ebuild, - +nginx-0.3.6.ebuild: - Version bump. - - 23 Oct 2005; Konstantin Arkhipov <voxus@gentoo.org> nginx-0.2.6.ebuild: - Goes stable on amd64 and x86. - -*nginx-0.3.5 (21 Oct 2005) - - 21 Oct 2005; Konstantin Arkhipov <voxus@gentoo.org> -nginx-0.3.4.ebuild, - +nginx-0.3.5.ebuild: - One more bump today. - -*nginx-0.3.4 (21 Oct 2005) - - 21 Oct 2005; Konstantin Arkhipov <voxus@gentoo.org> -nginx-0.3.2.ebuild, - +nginx-0.3.4.ebuild: - Bump. - -*nginx-0.3.2 (13 Oct 2005) - - 13 Oct 2005; Konstantin Arkhipov <voxus@gentoo.org> +nginx-0.3.2.ebuild, - -nginx-0.2.1.ebuild, -nginx-0.2.3.ebuild, -nginx-0.2.4.ebuild, - -nginx-0.2.5.ebuild, -nginx-0.3.1.ebuild: - Version bump, cleanups. - -*nginx-0.3.1 (10 Oct 2005) - - 10 Oct 2005; Konstantin Arkhipov <voxus@gentoo.org> -nginx-0.3.0.ebuild, - +nginx-0.3.1.ebuild: - Bump. - -*nginx-0.2.6 (08 Oct 2005) -*nginx-0.3.0 (08 Oct 2005) - - 08 Oct 2005; Konstantin Arkhipov <voxus@gentoo.org> +nginx-0.2.6.ebuild, - +nginx-0.3.0.ebuild: - Double bump. - -*nginx-0.2.5 (05 Oct 2005) - - 05 Oct 2005; Konstantin Arkhipov <voxus@gentoo.org> +nginx-0.2.5.ebuild: - Version bump. - -*nginx-0.2.4 (03 Oct 2005) - - 03 Oct 2005; Konstantin Arkhipov <voxus@gentoo.org> +nginx-0.2.4.ebuild: - Version bump. - -*nginx-0.2.3 (30 Sep 2005) - - 30 Sep 2005; Konstantin Arkhipov <voxus@gentoo.org> -nginx-0.2.2.ebuild, - -files/nginx-0.2.2-compile_fix.patch, +nginx-0.2.3.ebuild: - Bump again, the only difference between 0.2.2 and 0.2.3 is the minor compile - fix. - -*nginx-0.2.2 (30 Sep 2005) - - 30 Sep 2005; Konstantin Arkhipov <voxus@gentoo.org> +nginx-0.2.2.ebuild, - +files/nginx-0.2.2-compile_fix.patch: - Version bump. - -*nginx-0.2.1 (23 Sep 2005) - - 23 Sep 2005; Konstantin Arkhipov <voxus@gentoo.org> -nginx-0.1.41.ebuild, - -nginx-0.1.44.ebuild, nginx-0.1.45.ebuild, +nginx-0.2.1.ebuild: - Version bump with stabilization of 0.1.45 on amd64 and x86. - -*nginx-0.1.45 (09 Sep 2005) - - 09 Sep 2005; Konstantin Arkhipov <voxus@gentoo.org> +nginx-0.1.45.ebuild: - Version bump. - -*nginx-0.1.44 (06 Sep 2005) - - 06 Sep 2005; Konstantin Arkhipov <voxus@gentoo.org> +nginx-0.1.44.ebuild, - -nginx-0.1.42.ebuild, -nginx-0.1.43.ebuild, -nginx-0.1.43-r1.ebuild: - Version bump. - -*nginx-0.1.43-r1 (02 Sep 2005) - - 02 Sep 2005; Konstantin Arkhipov <voxus@gentoo.org> +nginx-0.1.43-r1.ebuild: - Now disables build of rewrite module when pcre use flag is turned off. - Problem reported by Alexey Mahotkin <squadette@gmail.com>. - -*nginx-0.1.43 (30 Aug 2005) - - 30 Aug 2005; Konstantin Arkhipov <voxus@gentoo.org> +nginx-0.1.43.ebuild: - Version bump. - -*nginx-0.1.42 (24 Aug 2005) - - 24 Aug 2005; Konstantin Arkhipov <voxus@gentoo.org> +nginx-0.1.42.ebuild: - Version bump. - - 09 Aug 2005; Konstantin Arkhipov <voxus@gentoo.org> -nginx-0.1.37.ebuild, - -nginx-0.1.38.ebuild, -nginx-0.1.39.ebuild, -nginx-0.1.40.ebuild, - ebuild-0.1.41.ebuild: - Dropped old ebuilds, .41 goes stable on amd64 and x86. - -*nginx-0.1.41 (26 Jul 2005) - - 26 Jul 2005; Konstantin Arkhipov <voxus@gentoo.org> +nginx-0.1.41.ebuild: - Version bump. - -*nginx-0.1.40 (22 Jul 2005) - - 22 Jul 2005; Konstantin Arkhipov <voxus@gentoo.org> +nginx-0.1.40.ebuild: - Version bump. - -*nginx-0.1.39 (14 Jul 2005) - - 14 Jul 2005; Konstantin Arkhipov <voxus@gentoo.org> +nginx-0.1.39.ebuild: - Version bump. - -*nginx-0.1.38 (11 Jul 2005) - - 11 Jul 2005; Konstantin Arkhipov <voxus@gentoo.org> +nginx-0.1.38.ebuild, - nginx-0.1.37.ebuild, -nginx-0.1.34.ebuild, -nginx-0.1.35.ebuild, - -nginx-0.1.36.ebuild, -nginx-0.1.35-ppc.patch: - Version bump, 0.1.37 goes stable on amd64 and x86, cleaned out old ebuilds. - -*nginx-0.1.37 (23 Jun 2005) - - 23 Jun 2005; Konstantin Arkhipov <voxus@gentoo.org> +nginx-0.1.37.ebuild: - Version bump. David's ppc patch is now merged by author. - -*nginx-0.1.36 (16 Jun 2005) - - 16 Jun 2005; Konstantin Arkhipov <voxus@gentoo.org> +nginx-0.1.36.ebuild: - Version bump. - - 08 Jun 2005; David Holm <dholm@gentoo.org> +files/nginx-0.1.35-ppc.patch, - nginx-0.1.35.ebuild: - Added to ~ppc. - -*nginx-0.1.35 (07 Jun 2005) - - 07 Jun 2005; Konstantin Arkhipov <voxus@gentoo.org> +nginx-0.1.35.ebuild: - Version bump. - - 29 May 2005; Konstantin Arkhipov <voxus@gentoo.org> -nginx-0.1.28-r2.ebuild, - -nginx-0.1.33-r1.ebuild, files/nginx, files/nginx.conf, nginx-0.1.34.ebuild: - Forcing 0.1.34 stable on x86 and amd64. Added checkconf to start/stop/reload - in init-script. Fixed default configuration. - -*nginx-0.1.34 (27 May 2005) - - 27 May 2005; Konstantin Arkhipov <voxus@gentoo.org> +nginx-0.1.34.ebuild: - Version bump, should go stable within next week. - -*nginx-0.1.33-r1 (26 May 2005) - - 26 May 2005; Konstantin Arkhipov <voxus@gentoo.org> +nginx-0.1.33-r1.ebuild, - +files/nginx-0.1.33-large_ssi_includes.patch, - +files/nginx-0.1.33-set_header_range.patch, -nginx-0.1.33.ebuild: - Fix against infinitive cycle in large ssi includes and ability to set Range - header. Patches provided by author. - - 24 May 2005; Konstantin Arkhipov <voxus@gentoo.org> -nginx-0.1.29-r2.ebuild, - -nginx-0.1.30-r1.ebuild, -nginx-0.1.31.ebuild, -nginx-0.1.32.ebuild, - -files/nginx-0.1.30-slashless_path.patch: - Cleaned out old ebuilds. - -*nginx-0.1.33 (23 May 2005) - - 23 May 2005; Konstantin Arkhipov <voxus@gentoo.org> +nginx-0.1.33.ebuild: - Version bump. - -*nginx-0.1.32 (19 May 2005) - - 19 May 2005; Konstantin Arkhipov <voxus@gentoo.org> +nginx-0.1.32.ebuild: - Version bump. - -*nginx-0.1.31 (16 May 2005) - - 16 May 2005; Konstantin Arkhipov <voxus@gentoo.org> +nginx-0.1.31.ebuild: - Version bump. Added pcre use flag. - -*nginx-0.1.30-r1 (15 May 2005) - - 15 May 2005; Konstantin Arkhipov <voxus@gentoo.org> -nginx-0.1.30.ebuild, - +files/nginx-0.1.30-slashless_path.patch, +nginx-0.1.30-r1.ebuild: - Added slashless path patch from author. - -*nginx-0.1.30 (15 May 2005) - - 15 May 2005; Konstantin Arkhipov <voxus@gentoo.org> +nginx-0.1.30.ebuild: - Version bump. - -*nginx-0.1.29-r2 (14 May 2005) - - 14 May 2005; Konstantin Arkhipov <voxus@gentoo.org> -nginx-0.1.29.ebuild, - -nginx-0.1.29-r1.ebuild, +files/nginx-0.1.29-500_bytes_long.patch: - Fixed 500 http response, when lenght of backend response 500 bytes long. - Patch from author. - -*nginx-0.1.29-r1 (13 May 2005) - - 13 May 2005; Konstantin Arkhipov <voxus@gentoo.org> +nginx-0.1.29.ebuild, - +files/nginx-0.1.29-ignore_invalid_headers.patch: - Ability to control invalid headers ignoring. Patch from author. - -*nginx-0.1.29 (13 May 2005) - - 13 May 2005; Konstantin Arkhipov <voxus@gentoo.org> +nginx-0.1.29.ebuild, - -nginx-0.1.28-r1.ebuild, nginx-0.1.28-r2.ebuild: - Version bump and .28-r2 goes stable on both amd64 and x86. - -*nginx-0.1.28-r2 (03 May 2005) - - 03 May 2005; Konstantin Arkhipov <voxus@gentoo.org> +nginx-0.1.28-r1.ebuild: - Added debug and fastcgi use flags. - - 28 Apr 2005; Konstantin Arkhipov <voxus@gentoo.org> -nginx-0.1.28.ebuild, - nginx-0.1.28-r1.ebuild: - 28-r1 goes stable on x86 and amd64. - -*nginx-0.1.28-r1 (19 Apr 2005) - - 19 Apr 2005; Konstantin Arkhipov <voxus@gentoo.org> +nginx-0.1.28-r1.ebuild, - +files/nginx-0.1.28-bad_backend_header.patch: - Patch from author to avoid crash when backend sends b0rked headers. - -*nginx-0.1.28 (11 Apr 2005) - - 11 Apr 2005; Konstantin Arkhipov <voxus@gentoo.org> -nginx-0.1.26.ebuild, - nginx-0.1.27.ebuild, +nginx-0.1.28.ebuild: - Version bump and 0.1.27 goes stable on both amd64 and x86. - - 02 Apr 2005; Konstantin Arkhipov <voxus@gentoo.org> -nginx-0.1.25.ebuild, - -nginx-0.1.24-r2.ebuild, -files/nginx-0.1.24-upstream_status.patch, - nginx-0.1.26.ebuild: - Cleanups and 0.1.26 now stable on x86 and amd64. - -*nginx-0.1.27 (28 Mar 2005) - - 28 Mar 2005; Konstantin Arkhipov <voxus@gentoo.org> +nginx-0.1.27.ebuild: - Version bump. - -*nginx-0.1.26 (22 Mar 2005) - - 22 Mar 2005; Konstantin Arkhipov <voxus@gentoo.org> +nginx-0.1.26.ebuild: - Version bump. - - 20 Mar 2005; Konstantin Arkhipov <voxus@gentoo.org> nginx-0.1.24-r2.ebuild, - nginx-0.1.25.ebuild: - Forcing 0.1.24-r2 stable on both x86 and amd64. Cleaned out commented - modules handling. - -*nginx-0.1.25 (19 Mar 2005) - - 19 Mar 2005; Konstantin Arkhipov <voxus@gentoo.org> +nginx-0.1.25.ebuild: - Version bump. - - 13 Mar 2005; Konstantin Arkhipov <voxus@gentoo.org> -nginx-0.1.24-r1-ebuild: - Clean up a bit. - -*nginx-0.1.24-r2 (10 Mar 2005) - - 10 Mar 2005; Konstantin Arkhipov <voxus@gentoo.org> -nginx-0.1.24.ebuild, - +nginx-0.1.24-r2.ebuild, - +files/nginx-0.1.24-upstream_status.patch: - "upstream sent too long status line" fix from author. - -*nginx-0.1.24-r1 (04 Mar 2005) - - 04 Mar 2005; Konstantin Arkhipov <voxus@gentoo.org> +nginx-0.1.24-r1.ebuild: - Misc conf files now installs into main conf dir. Added dir keeping for logs. - -*nginx-0.1.24 (04 Mar 2005) - - 04 Mar 2005; Konstantin Arkhipov <voxus@gentoo.org> -nginx-0.1.23-r1.ebuild, - +nginx-0.1.24.ebuild: - Version bump. Added warning about threads support. - -*nginx-0.1.23-r1 (02 Mar 2005) - - 02 Mar 2005; Konstantin Arkhipov <voxus@gentoo.org> -nginx-0.1.23.ebuild, - +nginx-0.1.23-r1.ebuild: - Now with docs, dir keeping and configuration checking thru init script. - -*nginx-0.1.23 (02 Mar 2005) - - 02 Mar 2005; Konstantin Arkhipov <voxus@gentoo.org> +nginx-0.1.23.ebuild: - Initial revision. diff --git a/www-servers/nginx/Manifest b/www-servers/nginx/Manifest index 15bd5c5..fd61e5e 100644 --- a/www-servers/nginx/Manifest +++ b/www-servers/nginx/Manifest @@ -1,37 +1,47 @@ -AUX http-sticky-nginx-1.11.2.patch 2317 SHA256 d4e36a3c5aab20883fadf72e2e7b58a5f18bfb4cf84d550b7d345e74c41d79f8 SHA512 c62584debfaf6df4b2ace0373394e893cb97a8f940927fb86c0cd61512b47b660d90fe17f936490602624346ade46708cd6a6fe6bdbe5a46cd2a428314ac8f6e WHIRLPOOL e739bd36ffa6d5ff9c7f0e4dfd26aea0c4e8c4ee1a2903e3bbb199de7e16189973819409954b9eda3443dada3aa656ac73ac31731cec3e54e347a97bdf272987 -AUX nginx-1.11.3-fix-build-without-stream_ssl_module.patch 873 SHA256 ca4fd3498613cef8440b98e27dc2709a6db9ddc3ba7263087f7955b599c11110 SHA512 bcbaf3773ee269757da942e21209017feab6316fd32aefbdfa8d606e9dc434366d88816e0e939df88f18771bcd44347d369833c3e48e9b9019635487f63ea031 WHIRLPOOL 1bec1886815bf2491e81d25920a3946ae5145088d893926dc6fb74c241c638954399be3175daeef551278ec7cd432fc624d250d6b8eb18c03de983bcc75c5565 -AUX nginx-1.4.1-fix-perl-install-path.patch 403 SHA256 0f10cf594208d99942cd07b13799bdd62ad9dc62479b302c0390de381c7fdf28 SHA512 b8f6876831e1149b1421fff4919f8d4893e5fc46aad8a91d4cf2e0b21767b59820b8e227e3b722b80060832844ef191f30aa5dc056daeb49e55a05702d72858f WHIRLPOOL a29dc1b707695ad29b5e967c545b6059120ce9d1a95b828062f6507d8ccd730c95fc82843564baa51d644e138d40fc93b0a84c916a4d77a51c1495625a103809 -AUX nginx-httpoxy-mitigation-r1.patch 2023 SHA256 f2e1365bc16f2e038e33631b1c6b9823f73b8e57c20a1ec5d29aedd1007158c5 SHA512 bfc480c34cea525b0eb3753622eb371198e2252aba3299fca4f1c7b29848da162b93757b05eb11a3839618ed895f7b73534dcd7861f4b924997ec422939222a3 WHIRLPOOL 7a97d8a0d25c97708cd2bf35db26d01f43676ffda58fcb0f94162e692af1bbb6c46cadab09ae974f498087914bf6a3e8ce04c115fbf509877d849400e9279415 -AUX nginx.conf-r2 1292 SHA256 5386dfa5a9d3ecd724f59b77f5bf67aa195cb9ea2c16b71f97ce54c19e336577 SHA512 de9ffb84d7de468fa7aebfb205529edb1c372f3ff6990b0cac9d1f3012be9ced65db4d260fd852c91cc033805c023a02790770cca43c6ad6335fb58a9c694c95 WHIRLPOOL 70dacd19de8c56f1072f254185b97620fa7928815a94058468fb822e2696f0cd9ee9032af046b281f0ac3d52ed5f00fcb25da6b11b31c0b80001591bfb961f94 -AUX nginx.initd-r3 1898 SHA256 e3c43e96291e7479497670465df7f6b85ce4fbaec999694bb23eacde9002713e SHA512 df69ddc6f7e42d7c8254d71b0c97cc6dcdca1c44d56b17680101714b5f61514de04246381c5bde8b562e5d8f4af512f0cba7d7f88e7e281d03284ebfd0204725 WHIRLPOOL a97a3bb48a02f3cec40da7e8c26061dce5175c62190829874a90d4f936c1b4d87d52e0ce5ab70aec0cf6ba78e87e2f27b51e818b172a665500a2401f3ed784f8 -AUX nginx.logrotate-r1 264 SHA256 6db8b0bb0df76766e713ff3cfeb186647c19db89d07ebeefc899f4d8e74f563b SHA512 833b4b14756970cf7902d5ef239ff212cccf54a88f95bc2d50b83d08afaa9bbc5fe538d64fa87e440077d289d12894bd053a37bba8d8ded4bec5a994d4c81550 WHIRLPOOL ed3d4389a973433715ca7e00c9eae4f1747ba8b3e6f8f2744c82f6aed8c799713beaa1ad83edef96256954ba412e59199ef84eee6181a3bfa6bb4f3bc05bcf4d -AUX nginx.service-r1 327 SHA256 17c404c5130115e3ebadb09e25cff0103b48ae7dbff2284fa690161fda7888ae SHA512 9b6bcf74df2f74ae6a2c255ebf2d826ea92ed9921b9995da6c9a0c5656e2863a2fe5293ef8a656fbd36298602cc88ffc5d7acfbbf143c23a78c9689d61b05df9 WHIRLPOOL 126c56732b8bd9948595727aa8c056c44df05f4c8e708b00c9de715a7260e4e120fd9e076672312b55c889ff4a3ca100ce696165a4eaf93d89e808e1e28653fa -DIST modsecurity-2.9.1.tar.gz 4261212 SHA256 958cc5a7a7430f93fac0fd6f8b9aa92fc1801efce0cda797d6029d44080a9b24 SHA512 374733cbfc26e53d95b78c8f268a4e465d838163e9893fc24e33a9d272b114f1b287147bab6d0289575074cbbd94f48983e23fa59832cbcb32950046cea59269 WHIRLPOOL 5f41bebf032f8a269412d104b7632a06af4d4c495658c9cd1ebf69b82c10ce1bbcb34b9dd159a7b00e57348714a5e93ad3db19701dda51479accd3a9dc79a9cb -DIST nginx-1.10.1.tar.gz 909077 SHA256 1fd35846566485e03c0e318989561c135c598323ff349c503a6c14826487a801 SHA512 fa1329d40e83340380332dd5e2ed66f08dd59cc7f7582dd0e0193c493353ba550e80dc80e5165c225d70532d4197abc49cc8c760e8ab72e48f630cb57c2803e1 WHIRLPOOL 6942f70c3279a28bd8d664d085dee68bf0d0526c8dcb636f3258c9de598268efc984af72e527efd86889bd13911b38b0bdb2de1e92eef69cabd02f7080f64eb6 -DIST nginx-1.11.3.tar.gz 938045 SHA256 4a667f40f9f3917069db1dea1f2d5baa612f1fa19378aadf71502e846a424610 SHA512 b983aca61335facf5778675b80fc28341ec9cfee2190319ed130b9c5d5ceff8133677f4609ecafd5a782daa5962e41bb6cb6a857380bbbe9cee67cd0ab2026d4 WHIRLPOOL f197bc4f5e1ed234b26d625db5bf665a24c09da316e3cae3c0f394f0b4db116acad5db15add7fd92b5fe1428f95449538584f57272f8bad89b912fb38fbb2c7d -DIST nginx-auth-ldap-dbcef31bebb2d54b6120422d0b178bbf78bc48f7.tar.gz 16998 SHA256 35c8f29581823be0f8bdbcf237d7fa5518c45eabe0ab9a695b131d32c8f1c264 SHA512 f47a9a6c5f93daa9260825261d2069bca5fc528221f94fc8ec98462f61774a36bce0238d931f8d0690544fd0144a83f942b6673c8376fe03f7834f8da9666671 WHIRLPOOL 26a2f67e715d13f785932f00e642c0864b5b7059d120f7fe7458017dbe02203f4873d1cfc4f0dd262834465438ad2b00ef4b49295e18a8e246abda6f7694ac70 -DIST nginx_http_sticky_module_ng-1.2.6.tar.bz2 124089 SHA256 e47b9fd435d7a5a3200f945a9745aaa7b9446495bda76df48f211129f88d6b26 SHA512 2632b04c94f523aa7c9726db182cba11d83e642c2db5798274e67fbef30de95d02e4e95cbfb98bc429d4244d630b5d9617405b43f728ae0117a5c134940c0ded WHIRLPOOL 1b754c02f834c6b4d4930e9c46b8c5accb6c9663718fb9296c92d79bc33206e66e49e4234ca4db9a5afcd42fa23273bdf0e675aa7b38927c4e46a85318c189eb -DIST ngx_devel_kit-0.3.0-r1.tar.gz 66455 SHA256 88e05a99a8a7419066f5ae75966fb1efc409bad4522d14986da074554ae61619 SHA512 558764c9be913a4f61d0e277d07bf3c272e1ce086b3fadb85b693a7e92805cd9fca4da7a8d29c96e53fc0d23b331327d3b2561ff61f19d2330e7d5d35ac7d614 WHIRLPOOL 5f6ed4e6850d2ce7e8c65e0570a7e2c74a1fe360e167644ed405fff682ab178b09c722c99c1df9af552fb816219b9fc04dcdf638b3e4af68c688434cdb33aa59 -DIST ngx_http_auth_pam-1.5.1.tar.gz 6863 SHA256 77676842919134af88a7b4bfca4470223e3a00d287d17c0dbdc9a114a685b6e7 SHA512 973b94874d8a58c0df0ac2d31571eafc1e80b11179cba33ec88421a826207fbf7e99b0387e135a1ca48d82daacb78f19a4c21d3a27b49b16dc86b4748bb72261 WHIRLPOOL 4fcaadee859f325c734aa16763702ee40284d1debcfbf5df1cb9aadf2bfc72c1e8d0e5b9d1495f34fc719f4d7fa3e653797fa7917f8fd0437fa2023a1930f667 -DIST ngx_http_cache_purge-2.3.tar.gz 12248 SHA256 279e0d8a46d3b1521fd43b3f78bc1c08b263899142a7cc5058c1c0361a92c89c SHA512 50a31dbf2216a6fae74a186af56dec4600cf55777e76a10ac0075f609e7737135aab063a64f2590dddcd0369ebebd4a523027f3d9ebcca74f7b4355be1c5dcc0 WHIRLPOOL 5451ef3e33044210453995ea916acec679599c0ded5471d464db5003a07e7a06e9690812091148c2af7b50384e52b32e49136eac02e0330724ba2408d893f96c -DIST ngx_http_dav_ext-0.0.3.tar.gz 6260 SHA256 d428a0236c933779cb40ac8c91afb19d5c25a376dc3caab825bfd543e1ee530d SHA512 4763b1c5e417248d80acfacf20bfc5ba3e06675ff08e37703867daef99a400980b536941e4955c259432905bd11ab998bc2e2489a50350413c7bf37e18eafb74 WHIRLPOOL 5adbcea768fbb179249a03fe69304505ec09a1dafac848dd5e3cde96693c6fbcf6cf6c128ca116d02b36c1be0008807d9e86fee5b411e137b18b15a60291f29b -DIST ngx_http_echo-0.59.tar.gz 52703 SHA256 9b319ad7836202883128d2b9c24ed818082541df57ef7f2065b7557085c603cd SHA512 803c431da00160f62ee98e126d244fb97b2d9dca08137daabf55504f012598f8e2c689841c2e8bfced5f07ce24c46933c49b3feffc09ca0b5f07dc10e34546ee WHIRLPOOL a709ded0dd1af2b6c1c5da6f065834ab7715eb736f36018acf06c2c10389bf896dc4459acbbb479340b9da6f287143cd25fca7df503acea457cf0933ba67e9a1 -DIST ngx_http_fancyindex-0.4.0.tar.gz 18419 SHA256 152cc2cf082c23cbc7b0fc76f14af4015d3988783016dc9145edebec17c7e230 SHA512 47fd9f405475f96958eb255f9051a9bde1ad8b515356bbaff8f8034ee34ecc17e3574c1d104496c5069c8986e047ca0de386f1b7d2f7317f15be98d69e74b624 WHIRLPOOL 4972eea9f6b8373b4bbcf73c66fe3dc635bc6326f264febc9a5a0fc620d44f1a3d1f98c91c1d2acb6779729a1e188c1f4a8750972266d1e463658529d37fa596 -DIST ngx_http_headers_more-0.30.tar.gz 27793 SHA256 2aad309a9313c21c7c06ee4e71a39c99d4d829e31c8b3e7d76f8c964ea8047f5 SHA512 378f2c4b4fbf580e59c8ad3ef5fcb617e4669b7b506a0ae87e4e0bc920d34e16fe55565e48dd57e7b6c37ae8b407646ca64f5d84a2fbbe2d41d719c7643c1a82 WHIRLPOOL f50bb5c2e23fb63d98904163a873edf947f65e57dc0f73489024243c1d5b04e0677015a075d315585e535e226b8dad659bada563778b8ddf4d060e918fc37ace -DIST ngx_http_lua-0.10.5.tar.gz 579793 SHA256 4f0292c37ab3d7cb980c994825040be1bda2c769cbd800e79c43eb37458347d4 SHA512 a02b8614fdcd063b1087a3114f05402c707343ff3bceabaca1fb98531ba30edea1a525fc45e2f5a49ff155de8d6f9e1155e8870e463476da5703acfd5f8fc3fc WHIRLPOOL 9c72353bc58a98fd3bae68bd9b13228d202167422a429aa4b455f7e280cb617b5c083131e4f372708e602342b24b150437ed8ebae9647a397bae8a88a13b385c -DIST ngx_http_naxsi-0.54.tar.gz 163809 SHA256 9cc2c09405bc71f78ef26a8b6d70afcea3fccbe8125df70cb0cfc480133daba5 SHA512 91934bfd41495715269cc6e549d17f6da66f2bdd0c9a6821fa9096b694dd3927109c4aad2f8b327620ae7c34f76a0839ac16669cd8c65081bc01fa7f829c1d43 WHIRLPOOL ef68cfecc9849086527c3590744d3c0d73cec830c6cf1ebca63566a7444438757a85d0c79fa552c4763e0416a615f4cf8d99622e2f36d3713b7072138a82f5a8 -DIST ngx_http_push_stream-0.5.2.tar.gz 182008 SHA256 1d07f38acdb8194bd49344b0ba21de101070de9b8731d27a8d22e928850bc199 SHA512 ee8bf9ece652da6aa5a39879298bba70d1842696545259f3f5e302cc61397b35f016364805805f9ab1914fc39ed2f07c015e042155789073e3d1fdc02a0783de WHIRLPOOL d309cecbb1bb5b6c4f64712d44889e3ecca59140d845a31a3f605dc3cc2aa01622b0deadb8f6852baea3c211bebbe6ed7d7868399447ac1249c1b1b740fa3c27 -DIST ngx_http_slowfs_cache-1.10.tar.gz 11809 SHA256 1e81453942e5b0877de1f1f06c56ae82918ea9818255cb935bcb673c95a758a1 SHA512 fbc9609a8d6913aeefe535f206b9e53477503f131934ead2ae5a6169e395af2f5fb54778704824d5eeb22a4ef40a11ebbcde580db62a631f70edcc2cfc06b15d WHIRLPOOL a02ed77422c47d9e476f8746186d19d632ddb953635d8d9dd51ff076225a78044286ee7e114478bc02e4b2a422e4fdc207154fc287629dd2cd7c3f9a634dad18 -DIST ngx_http_upload_progress-0.9.1-r1.tar.gz 17166 SHA256 99ec072cca35cd7791e77c40a8ded41a7a8c1111e057be26e55fba2fdf105f43 SHA512 6c1e3776402b6e2cda50d9c48c4b578a85feffe15891c075443f6d9c7b9e2414e0614b50a8f417ddda9faf5f719957c77ade519c88b48caec970fc51fe12f0d1 WHIRLPOOL 12970d0f75ee3f0d8a97c4948b97fca2bd707a93e4e578c0e2ac0d18991986e620dd6b15c2ab5680ff726c0490671e3bc5e1ee6109baf81877d8baa6a5357825 -DIST ngx_http_upstream_check-0.3.0-10-g10782ea.tar.gz 128297 SHA256 a5003e86908086f8607e76cfc01a56d56654982ab02cec918278c261ff1e8363 SHA512 2407d4375d8b94a808eb9e423615af700537b28fc88d37e790fb2a5ecdb02da94e7d1e271a6a81e8a55f8ce11e7db80fdd6de7feca08469dfaa26d717a1075a3 WHIRLPOOL 6b428940a07a7c18ba19cba07f43f1661484905a025f80fcb44908aeaeab9c8e854d3e104fe0339087a2e9029ad4722366c7d0a0fca7c73d92ece6ff2e494206 -DIST ngx_memc_module-0.17.tar.gz 36369 SHA256 25cbe3ff4931283a681260607bc91ae4a922075345d5770b293c6cd7f1e3bdcc SHA512 e6fdecb4bb629f0882868b78f4b3a2549fce4471efcc4f2c6fdc414435799be6ce41cf056a3170952f8a1f401ee1ca372c97f2d7f79fba79239599755ade8949 WHIRLPOOL 766d84e7a2dfb2a6f069fd846e19d635f4dbd36f78014e97bbd159312d0b38d671b4db989584ca2b5b449046483b5b90d09edbe1c4531b266d8592ad7bad3c3a -DIST ngx_metrics-0.1.1.tar.gz 2964 SHA256 1c62ebb31e3caafad91720962770b0e7a4287f195520cf12471c262ac19b154e SHA512 d36a8fb0104c83b6b564e03b351aa750cab08650264c74d6f786af357bfb7006b531a93270dd961896ea8dafe27e5db8548ede714c5f52c4742876bc73af4b5e WHIRLPOOL 2796f5a97e76dfcc91133240e8e90ba493f0356f781a173d8cacdd09eba64b75ef531db398c0566fda395124700de8c991b771433e376ca0d5898c2ea6f82868 -DIST ngx_mogilefs_module-1.0.4.tar.gz 11208 SHA256 7ac230d30907f013dff8d435a118619ea6168aa3714dba62c6962d350c6295ae SHA512 b8cb7eaf6274f4e2247dbcb39db05072d2b2d4361256a325fafab5533d7ce0c4ae9e2905b954dfcfa4789c9cab5cccf2ac1c3a1f02f6a327ed95b562d7773ed1 WHIRLPOOL 64c9b11ad938e6dbe5ba31298f1cd46f6e6bb4ba039c96b1e43bd85919d1606326f74b677f789ecabe0b0f4e0f08ac5aaf8148bf820de65aaa1e9966a28b9f61 -DIST ngx_rtmp-1.1.7.tar.gz 519735 SHA256 7922b0e3d5f3d9c4b275e4908cfb8f5fb1bfb3ac2df77f4c262cda56df21aab3 SHA512 9883462a04683f1e7af175da04b86d259ff6d677864667588fb073143f7130969eb2a5a5a48ddceda7a555b908580f179bdcacb7f0111413d51db5bfe43b396e WHIRLPOOL e9c1fc9c3c965ae7047657f76e0997d5da107aff7dd9e5cf3ddb5a2d8f388efd8439b82923e199dc36def449567b8529e06c80f69c36f42128236ac0be5719d5 -DIST ngx_rtmp-1.1.8.tar.gz 519647 SHA256 de5866111a5b18c9dfb1c10f3a0e84b56af77f7005a41807368f7769b8a50965 SHA512 554249b1b8bb70952a0585dcc5c55c70daa63f2eba5ef35f8b1a4932fdfd6c95b0a48739857ba8dcab08ff1e91d048f3dc43bf65250890fd7a679cdabfed880a WHIRLPOOL a8cd4361419fbae97f199d788078c62ffc442158d0338aa677e5d6d21fb27a336da85e901ee6463ff6b33201092575237d5b6f20a1d80d924ac6591cbb75c9d7 -DIST ngx_xsltproc-0.16.tar.gz 535696 SHA256 9003d5aa7bff157577d1f8fb5ee070ee52544fc53c48bb9aa0bdd092e5f39bcf SHA512 6f3c83f69ffa356d9fd32130e6a49b5948047de15c11272223bbdd4eaeb8404422e1e02bf688c86a19fd8f8bb6e3727f8247ec697fa54c364395daa64ed0f971 WHIRLPOOL 4f93fcd7cb89531ba186258e6a93d655d064334c3b9956a15d72fdb8ab360bb967ad1353597f966529ec0ea66a3da0575d13fab2cca7f3d468c5f54fcea17a60 -EBUILD nginx-1.10.1-r100.ebuild 28555 SHA256 9530a05be61e4fb652be29019d42c2d479d333a0bbe1e01dbb81e10a203563b7 SHA512 dabc890d9f94fa7acc4de35e23bc679ec43efde5b6a84215c7cd276b034f44846d7f22ccaa81006c5a50d6f50e692a277e12c1ddb106a8bff701689f41b7739a WHIRLPOOL 5d3dcf7969297bceacfc42f354db31e749756bf9092ee1a77212328ad0703e674e7203837d55f7eeb30bf24be74bbb1b72852c982dc11a55fa32f29d55549ba5 -EBUILD nginx-1.11.3-r100.ebuild 29655 SHA256 21a5d4cb110eedd0e18ddd09d292ee5fe1b42ddb3bccd3a9a40f1cf39302be50 SHA512 4d597e7e36d0d03be536bb5d439d2454fe7711d18d41ed140a2cfe107af120c5dbf5b191b7c7fa4eabded5a56ff7d717f918707b256ca63e1dfc767ffc281440 WHIRLPOOL e6f3ea61e6d3e9c97ef7d4a91e61e7bdff3a0f716cb232b96fec7a600c9c3c8b48d9e5b987802aaf10ca596f7e5d3602de70fd684637feb75bfab55290a1b2c5 -MISC ChangeLog 15315 SHA256 56144c672e39c2df92980d5940ebf9b0ba7080dce6d924567084579ddcef4b74 SHA512 3aca8e5f529edd65179fd90c3c7c94c94a24922948428816820dcc7576d69a6a9bc5fcc39bac1ae0a1df7db1163d6bfd8ab2891668ac26784fd734baf80708e5 WHIRLPOOL 5964e7b62ac959f8b4718876901c47e9c6d3f776d13059108fc8f2ccb4b1bf7316589825e4b14280ca5b6e110d3a33e4d2d2d78443d76a09701941b85d0e9dec -MISC ChangeLog-2015 69680 SHA256 10720899590f9065076fca43d949a1fc45b04562b93ca1b47f8bce211bc26a50 SHA512 2c149e4a9a2d37127b9520aa09fe789216a1498d73351b0563c45d8838abdc7788ad3d34ccddfd8b27d7eb386a1344e1726f2ee93a29c886e018057d0ade5546 WHIRLPOOL fcb612cb6854cd2644344220c0fabd8cffeb548008327920eb535986af33c7ad3ae4c31ac57497d9f35bfeabb10cbca1e9897d42009dcfd8a8a7b1dfc0fb9d30 -MISC metadata.xml 1607 SHA256 656ff824cd142f5ffd6786504f7dcff6c44d40414768e1030b3d180b195d80b5 SHA512 490c6b107add44e3ee959e82ff023e85b1aef667441abe3725a94b9b269d26bd85fcc7476e62512ff721164346d87ccf2d48be390045c9fc35106a6f940c68f1 WHIRLPOOL b7c2c728ba0b344ec6eaec8db1ae8c517d028bc4b3cad93a37a807f9661cc0f8052f7511ae1be9131dda1d72ce21f60817a70ee56e9c23736ceb1c8c71426796 +AUX http_auth_pam-1.5.1-adjust-loglevel-for-authentication-failures.patch 1166 BLAKE2B 180c0b509ef32afd9cffaa6c922e925101d750ad2b5c93dbad4e16e4d0ccd866efeb3ded3ffff3bf5a4566bbea9e9910dd92ab8f40ec66b2011a6396e472aef1 SHA512 8e9c192e504e6a7e93384104dee544530442c3d7a67f6da81cb79a3cba43f64bbf2a4cba9115c48626b1f6faa3d170da915cfe2a7dceaff453300b400141192d +AUX http_brotli-detect-brotli-r2.patch 763 BLAKE2B 63e1a86dc6c9607159ef4466dfcfc692fe53ec4019385297dfc92672271e3679b9013c83423b5d9aa79bc912b6d9dda0b099899f3020a8e01872087aad5a64f1 SHA512 ba6794ea39a775a61dd8a30ad183bfb7fae0feeb0a3f5c2cdbfc4d1f4891c11f3da44d31e9470bf443feaca7621a27c8483cce19f8bed00b811f78ccc1188a4e +AUX http_cache_purge-1.11.6+.patch 615 BLAKE2B 520a437290dbed718f392bedecdb66c9eae3440c2e5977bede5829f8420905e60c74fac3dad7b22c12d2070ce47430795482d270222ba8d4640af415e4974210 SHA512 a3f45d8121d89a5c41783306577e146990404ff0e3691454e99cd6270ab02dfc7fd8718b3781666373ea6784ed2c06cec0b40315486a6a138185ca1548c04b60 +AUX http_uploadprogress-issue_50-r1.patch 1098 BLAKE2B f8191fdfa85c7aa016555a636b5c291d6d0ed54fea0714b361ce500deb7431f16c77a2f5675c5dc2f6e8ed278f7c24efd45eba3ddab27a2fa7d4e6d1391cfe8d SHA512 bdc3a129059b1af9c317d1e8b74ec98a14bf1e55b59ae867b963304541457e1676acb775ac2cec730ee2036feedf75d636eeb36700b0913e417045a52a00eec9 +AUX http_upstream_check-nginx-1.11.5+.patch 8557 BLAKE2B b1f21fa56e94d92b30d4b84353066039728b0935e2a243367e4e883afead2d4c728c9b7e7b5b5e8714b80a3af72059a36f8207af3641c22a43324c0e7f2b2f9b SHA512 9b377defaa9ddb78fee3f37e054c7b16258fd380b4093d6d61bc45fdc42cb45ee5246901cddd230dc1765838fabbd71d558b5b1d12d9829615b3501da4f3824a +AUX nginx-1.4.1-fix-perl-install-path.patch 403 BLAKE2B af7c0d3845f4e971ff6470cac11722a54339832518a1f48eef6343908676e352d869df7e65e1072e41dc67dbac4e0f006694bba2ba66ab06ae500c7e00664023 SHA512 b8f6876831e1149b1421fff4919f8d4893e5fc46aad8a91d4cf2e0b21767b59820b8e227e3b722b80060832844ef191f30aa5dc056daeb49e55a05702d72858f +AUX nginx-httpoxy-mitigation-r1.patch 2023 BLAKE2B 82e6cb6c1d38b9e4cd619abfe60eeaa968ded8975277e60afb94456b59e311817eef04db2b207e85308ef480c442e8acd68cba8f455b4cfc872829e522cb1ea4 SHA512 bfc480c34cea525b0eb3753622eb371198e2252aba3299fca4f1c7b29848da162b93757b05eb11a3839618ed895f7b73534dcd7861f4b924997ec422939222a3 +AUX nginx.conf-r2 1292 BLAKE2B ad941577401ee99e7904871a20cdf94e946f608747c14e7ceb589ea0a6254cf16fe27f712d2db252db027bc72742d1818c3874b762fcc38054a69e4363cd5e39 SHA512 de9ffb84d7de468fa7aebfb205529edb1c372f3ff6990b0cac9d1f3012be9ced65db4d260fd852c91cc033805c023a02790770cca43c6ad6335fb58a9c694c95 +AUX nginx.confd 1131 BLAKE2B fd9c9e620a0b8c630a609c3f38f91f62babfed12d4d8035f8c54609a9360b28a919cf2020c577575bdab70cdd9c34e5996852d6d35dc9f2f52a2096c9facccfd SHA512 9023b33b6e03de4fa4df8459118a34a24a52ec167eb0aa1d220fd5ba8555aa454ca3451cad4eecc87a445b74cae5132fd717286aec3f1fea390eb96547e4ae85 +AUX nginx.initd-r4 2192 BLAKE2B b482b9cc473a1df06764d60c7ce5c99a3f680778028bf440a2612b86273936ac4dbb350b81ecbe646dfa67d375492259b1609f3953f1b456c7427a02dd282d37 SHA512 e641829466e54093ad01e9f6c57acd2f0505e489a32e67dfee9279d5da57b216052a92eb05eb0c9c122c12f8b7bf8274b520b6e02fda161cc03187ce7c0660f1 +AUX nginx.logrotate-r1 257 BLAKE2B d62c57377efd5259b6c776861d921b6e4ea026387157d618abd9e578f2e432ac0cf653a0f3842a0620d405759216bdc17afd50b33aaec3ad0c6757dfac3e34d8 SHA512 4892fc1700817c9a459a531df0320fe606a51be7f8b4e3ddf5852fe33def70dbff36fcefd2fce247c6846d6315ea92f3421eb21299a162d082b85fa27572cd95 +AUX nginx.service-r1 327 BLAKE2B 081c72f7f7b98e30b2b45aeb8b1e4ead935c5b9a558fcfc7c18c20a2c0f18711272e91f4688c04c7f0eb833be8f7daff2f7d01bd1a04981f03ed54a07fe1148c SHA512 9b6bcf74df2f74ae6a2c255ebf2d826ea92ed9921b9995da6c9a0c5656e2863a2fe5293ef8a656fbd36298602cc88ffc5d7acfbbf143c23a78c9689d61b05df9 +DIST modsecurity-2.9.3.tar.gz 4307670 BLAKE2B 337ea15cc8805af7ab43aed8aecf4c72ccc586d0d7e9d9b91f036a61baa70d1ac8b4ad8045a2bb7a13515912a15fba7d3cdb9670ae6730de43b1e44ee90ded6d SHA512 4e1ea5dd8edadf8f630e4fe92a200d3a8e78963fce3128b5975a1e1ecd0e8bf9ceecd9905c95f8c508932ccd837f1d8ae8bb2ba423307718c3c6a4ae9b783ddd +DIST nginx-1.16.1.tar.gz 1032630 BLAKE2B 838c5f08b56378dd3ef3940a979eb1449c4ed7ef5b4b112da2531c0996d121ae32ae4e94d3b4ba198fefcdc1b06683e4b0cfa0087db82fcab13bffb5f67f8aa4 SHA512 17e95b43fa47d4fef5e652dea587518e16ab5ec562c9c94355c356440166d4b6a6a41ee520d406e5a34791a327d2e3c46b3f9b105ac9ce07afdd495c49eca437 +DIST nginx-1.17.3.tar.gz 1034586 BLAKE2B 48d1c34cf345794bc345bedb96a6a194f175695b93ee5114095742d67384e81fe87cc1ec10553566a33dbabc2a784158bc1461e2001d67dda71af4a1f540a88d SHA512 b81e75c4c8c03ca2f0b40b9c2a1812cf168cb2319d7246b9b0cce838ef7dba81f3cd57a213ec8d58e457a0fa6b912adff2e5597e5ada7258cfe27f55b05205e2 +DIST nginx-1.17.4.tar.gz 1034845 BLAKE2B 59e32fc4a625ec91696d3c18beb270ab2980f3a33a2952e8f43ce24e5a6a7fecff774ee20b1377dbfc0cee58651c78bb6d2cd2505f32a96966a200dce9569267 SHA512 fb7275c47d2416b597415f736771f8f4f3cdbba33728d9ca8ddb56b8266076a5ec5e63c735215a8d022f685b67d663fdaaac0c95db465a82f79f01d502feaa82 +DIST nginx-1.17.5.tar.gz 1036056 BLAKE2B 7f5c804651011a28d0d6e166a13e082f74173c0e447a88f013fa505e32994f65c159d755c473fa50eb7dc293c554961da23e61b1d59a429985ca6fc82fe69145 SHA512 b6799ddce7135646aa1f0b4405bcdab41d5065fbadcdeeb875f6fae4953159aa57b9104afe815748b0aab0e4d532e7771ccce487d7c4519e423d110f3715da7c +DIST nginx-auth-ldap-42d195d7a7575ebab1c369ad3fc5d78dc2c2669c.tar.gz 18457 BLAKE2B 22225ca9e5299b20ab5a93a001cac48e446bd86b3a24ac49e716bc975b128890bdb4b0dbbf5730fbaaeadfd958160093c7a6af798dd0e6de27062f149a760333 SHA512 ec59637fda5acac053e815cb1d04b545fc6b765e5ec63d8c2c9c301abad87afaa2698145acac08e9e14c91e1423ebff7aff0cca2b940b19ccccbf4cf53973269 +DIST nginx_http_sticky_module_ng-1.2.6-10-g08a395c66e42.tar.bz2 124047 BLAKE2B d37ef9a15c91abe3c6258e420d1f99fa452f9d9966a0e13102174973314a3bac5413957a5fe632a9dcb1163b3be5df8116e05cc053ee061e19319ec25f341570 SHA512 6c1bfdcf89884b2855d51ae7da0f6e53a4ca3629e1aaf58433b70c07dcb2af797ba6e87d9b3eb4fe2fb6d4d697e862f2b4c2f8d8b3fdaea201740c97ec936529 +DIST ngx_brotli-8104036af9cff4b1d34f22d00ba857e2a93a243c.tar.gz 12672 BLAKE2B fa2febfa63b98303f8890c6774de6ccb09475ccd639d3b74493a4ffd97c90febdc22755c5928018bdac24a537bd13cde165f97e5d2b50bebf598c3fb22ec0206 SHA512 169566b8764bb2b82e029f954a99063a9c61e2cbf982861c5f6818b389a5f37bf5389afb1b5627de9bd3f7af7b3c404be0230f943d47ab621c2a2bd825cc8203 +DIST ngx_devel_kit-0.3.1.tar.gz 66542 BLAKE2B 8242d884464d99a131a48f599f9d0c2b546610f73f646e7eb0dcfdb98220810d949189cffa721360ddbe3b7b8adc8b678a848b9d1a56db6c62fd4439ecb63d24 SHA512 de1e3349d8dd08e5982279b2219dc8a8006739f0409b8e0f5c50d93434beff1fbafba43e9c5ac85a5fab90afc5c0a7244a340610339c36f82f2cba7233e72de9 +DIST ngx_http_auth_pam-1.5.1.tar.gz 6863 BLAKE2B 00807cc3db8f6c007c968b8a30d7f6094b7d9db4eaa60d211fcb3ac60aeb28c5f8193578a7e1ca67acbbf57a319c8442fe44efc1e193927c3bce5961539f9c16 SHA512 973b94874d8a58c0df0ac2d31571eafc1e80b11179cba33ec88421a826207fbf7e99b0387e135a1ca48d82daacb78f19a4c21d3a27b49b16dc86b4748bb72261 +DIST ngx_http_cache_purge-2.3.tar.gz 12248 BLAKE2B f83b267f4c19a9d4af5964522695814c164d200ecd4108bf8f6b5c21388eba8af989bdda646dee18a03174211e8c090a04736bbeb44043cb0e19fbccdc66278e SHA512 50a31dbf2216a6fae74a186af56dec4600cf55777e76a10ac0075f609e7737135aab063a64f2590dddcd0369ebebd4a523027f3d9ebcca74f7b4355be1c5dcc0 +DIST ngx_http_dav_ext-3.0.0.tar.gz 14558 BLAKE2B 0d370bfe34600d43a540dd19a386aa52ce135b2eae14e4e108a359d5ff3405939130d1c802062c7523057ec35d38322d3fbed8c13deb58ce7a08ebf9e3f106d4 SHA512 d0193ba90f1ef46c4e470630c4394bdf99d94fd2e3bd8be6cb2ba1655ec59944b1269025f032b79dc2c6dad366e54389ef6a6da2ddeb91d535a4027f2162fbde +DIST ngx_http_echo-0.61.tar.gz 53155 BLAKE2B 72565b5d79598b5dcd1c10fa0f718e749894ca5f1232d5aae60c61e268b5904af35fdcd35afcf72de93852af9e0ca58805d77cbc37919fba9012158b5545baab SHA512 c90b81a4e85a8e9beeb5ff591dc91adb25fa4e0b6cb47086b577e5fa36db2368442dd011187675e358781956c364b949bc4d920ca2b534481b21c9987d2a9a3b +DIST ngx_http_fancyindex-0.4.3.tar.gz 25274 BLAKE2B 5ce3102326f6b8cc2b333ed08f7a66476842d2c70089175e577a3ba958317ed702f24ece002506007eb45e9e50b8f6ecb137cde222566308986cba2682b70f7d SHA512 fe5f6afc29c99f66151c1a06e27b5749b0a16227638583d9c961adc94b2942b981184382f95e70d927f00b09b43f597b963a85a41bde5903b10e42f86bc321f1 +DIST ngx_http_geoip2_module-3.2.tar.gz 8465 BLAKE2B 93d1fb9573e9dbd932670a595d2c0341571eaa2e079ed98e85e282712dc0cdfb798d59ccc2ae7466dab23e093c2eec17d1694f2748d80683928ad135b70b0bfc SHA512 84b26955234e29dbfbf2431b652fcc453c5e86b95f837296df4f3d6c730e3e0773223dae890eebfc9b5763f46082bde6f38d6505b8bf78133b89e7297016cc5d +DIST ngx_http_headers_more-0.33.tar.gz 28130 BLAKE2B fe3097a7700ce5da087058f7bb44c95164b75137031187400473f6833bf0e33e5c4920807225a6ff94174fe7dbd6186cca176a33a629ca0911faab6804bdd12a SHA512 13165b1b8d4be281b8bd2404fa48d456013d560bace094c81da08a35dc6a4f025a809a3ae3a42be6bbf67abbcbe41e0730aba06f905220f3baeb01e1192a7d37 +DIST ngx_http_lua-0.10.15.tar.gz 655110 BLAKE2B 73bf8e2f157c93f3d4e54b5aa63deb266731a10e3e48b2257756efee8d752e86440ca9c27bd27bc1d90075a5ffb58772eecb7c445db44cd055d2b9e0b4bac082 SHA512 1feea538464275e6e571860592628ad639b2259c8aab7f38575b81c0b355f1ade32a91643267bc9ec16519e3bcf3d132511513dc8c949f74a3bff975c85d8ff7 +DIST ngx_http_naxsi-0.56.tar.gz 192120 BLAKE2B cdbfc278f346ccdc0d5407d70ddd4740816d9fe786d3d65189d47e6f3b030c02352a30ed86bf1650139a21a8408e74c1ec7d7aa3512df1428870279ab384dd15 SHA512 4660751849bce303af6010b7257532404710106a94817e78d4bc4b566f8019620f24f30207f1d4366b88132a5124e34b164dc67ed80b6710f4bad66115564cbd +DIST ngx_http_push_stream-0.5.4.tar.gz 183493 BLAKE2B ccae3113071cee38fa6a7accd580922dc2fc9fa22af737f400c2c5f59352d93ca6cceb47f2aee70dfc111afdf98d27aeb64ddc5a4dbf617359ea4da09486ac7f SHA512 467ae49409adb675979ff591f98df8c96d71ab5ebc2ef9b3c9430e38e7e84d311b4a98c2b1cb1886d895735223dd2a43370aab61b57b34adb1427c184e6b8c86 +DIST ngx_http_slowfs_cache-1.10.tar.gz 11809 BLAKE2B 54ec1bd0d1cc43cdaafc93ebd46b33374c57351c7f022eae0351d6961680abb03d896e7f058e67c43c4fee300253354feccb92d00e62bf91250e251e1860ec03 SHA512 fbc9609a8d6913aeefe535f206b9e53477503f131934ead2ae5a6169e395af2f5fb54778704824d5eeb22a4ef40a11ebbcde580db62a631f70edcc2cfc06b15d +DIST ngx_http_upload_progress-0.9.2-r1.tar.gz 17268 BLAKE2B 7bbbf52e326c64a008339d2f80f123630fd314f705224c8f1c7d0c90bb4d31a24aaa95df55c9022838179114a031731a894992960aecc727635e0e2a0761d2c4 SHA512 c31c46344d49704389722325a041b9cd170fa290acefe92cfc572c07f711cd3039de78f28df48ca7dcb79b2e4bbe442580aaaf4d92883fd3a14bf41d66dd9d8c +DIST ngx_http_upstream_check-9aecf15ec379fe98f62355c57b60c0bc83296f04.tar.gz 130073 BLAKE2B 3c93cef79425a46e22ae39adf13d5ebb0e5d36f5d6be8555ec068dd0017918f5355d82fbbe90ba934e58c52e89c2096e24012f75390c7159d1ebacfaaa112308 SHA512 fad2a0d3ac332b6e67c52e3525f6df8a432df3e92bc173190b8107fba7f24476ab9dae4824630299af68c15e856409bd47a3a79fb5b65e03a5133eb90142b8fc +DIST ngx_http_vhost_traffic_status-46d85558e344dfe2b078ce757fd36c69a1ec2dd3.tar.gz 380721 BLAKE2B 8a63d9663aa896869345b97e4bb2a9ac93585d6d7ee16891c98f6445b90002ab90989d195399bf90c5a8ad32c4c908794b7cc33fa45183f9069c51906abb1606 SHA512 46451b3c9b7a3c57145fc8e1de9d8ee984286acff2fc3f4e6c4a39589eb42dd686844410312701d167eb369ab5943184b4fde1ef319359e272dad6fcdb8cad25 +DIST ngx_memc_module-0.19.tar.gz 34654 BLAKE2B 536384c264d88535179634d459d3a47b1d9b11885fbce46fbe9fa4df3dce365320b5963c56aecde3b0039d4f9954943d95f25c5f4fada6256861257f82ebbb12 SHA512 a64ec8dffcd011db2cd12b501271bf5c408f2f31fd2bf477b8db4e88adc5bb5732c4c2181ed8378cab6a937869d8f747ef52b22fe256c90df8440b91890edbe7 +DIST ngx_metrics-0.1.1.tar.gz 2964 BLAKE2B 95d71ea26c949c345b83e353bd66a20df18cc8b2b93f692615a1b39c1f327393647f80e7a27e6929799a6e7e3469b61e1cd72f7821f7a820da4dd7cd9a96d85c SHA512 d36a8fb0104c83b6b564e03b351aa750cab08650264c74d6f786af357bfb7006b531a93270dd961896ea8dafe27e5db8548ede714c5f52c4742876bc73af4b5e +DIST ngx_mogilefs_module-1.0.4.tar.gz 11208 BLAKE2B e0729b66554c8890727190a624d4c9aef6499dfc2e301541a9bfc15690caf6d3155c8a4b8f7a1555a7655b47aa0cd1b797aeb8ba82efa92ab80808218a0bdcff SHA512 b8cb7eaf6274f4e2247dbcb39db05072d2b2d4361256a325fafab5533d7ce0c4ae9e2905b954dfcfa4789c9cab5cccf2ac1c3a1f02f6a327ed95b562d7773ed1 +DIST ngx_rtmp-1.2.1.tar.gz 519919 BLAKE2B 744ccb8031eb9653f158f9eceba64fc9c8af7b9a42e64ef996ab3bbbe1402e5ffd3efcc8e4aaca437eb5e208e4b6f2d8643fcca953b32f32543eaa1ae4d9505c SHA512 4a0af5e9afa4deb0b53de8de7ddb2cfa6430d372e1ef9e421f01b509548bd134d427345442ac1ce667338cc2a1484dc2ab732e316e878ac7d3537dc527d5f922 +DIST ngx_xsltproc-0.16.tar.gz 535696 BLAKE2B e692c866dd1e7e3a1ea99c51ccaf74d04b86e003857ec0a81e4f9c9b2c66ef7a8942b38aaf0839a6fa8a9dbe5b57490b836dd9e2c37773e76da9a24c1cb3b250 SHA512 6f3c83f69ffa356d9fd32130e6a49b5948047de15c11272223bbdd4eaeb8404422e1e02bf688c86a19fd8f8bb6e3727f8247ec697fa54c364395daa64ed0f971 +DIST njs-0.3.5.tar.gz 339177 BLAKE2B 6327be0b7c8077870408722376782bca579a6cfdf1fe2a4950fc0d289311ad21f671bc2b47d06f70d95d4f68d99e8c70fd4598dcc167b79c57704d99a098d284 SHA512 236e0284f251856f74eb51d8251bb5be725d2ca90056f2feef7677eb636a4e97e203f3bba81fb6b677158d615dc2d6ffcb0dc1059fb678ab12b7d14cc4ea7241 +DIST njs-0.3.6.tar.gz 354475 BLAKE2B a2f3be7c83dd46bb8a7300460b580e053eaa78f2bcc835dd7b586457f045ea63eaa591873041648e3aa3aefce1d47a999b52667adfccadf0439066bfbff73673 SHA512 1973824bb434e9640626c132dac932da7615b534486ab76081a075be4f4e9fdf75a9a400c0d504750a5da341cebb20e6357710149e6de66ac8df8ee4cb1576bb +EBUILD nginx-1.16.1-r100.ebuild 41440 BLAKE2B fa49fb782cca968cc0b4b58092cb49214344fcdc80059d2fee2296e6541443af94ff1c2b61a59f673af6317d1bf58ca11bbb369cd1e9e6631cd8cb3d2b38e3ff SHA512 95365ab2f45944d19c875421494adab3708ca5b18b8290f8187d1d4f319408ead11ab7abf4086afd963daee7ebc04fa293c198b36d5eab060b7518dd0fca71da +EBUILD nginx-1.17.3-r100.ebuild 41442 BLAKE2B 6eef782a638951d80c8d0a204326543f45af8e641a7a1c4a2057b1d794c8458e14116de0d4a51d02b0ff79460cc0fd3a8a7b5f43791a327700a185f78f56a8f6 SHA512 e3534d38f13635c3f63886a25395b3ae0fc7b69426626e00708d0287afd67cc948012c01c9482d534fb0a016f55050ab665cbb5cca000d34e89ee199865d3794 +EBUILD nginx-1.17.4-r100.ebuild 41442 BLAKE2B 6eef782a638951d80c8d0a204326543f45af8e641a7a1c4a2057b1d794c8458e14116de0d4a51d02b0ff79460cc0fd3a8a7b5f43791a327700a185f78f56a8f6 SHA512 e3534d38f13635c3f63886a25395b3ae0fc7b69426626e00708d0287afd67cc948012c01c9482d534fb0a016f55050ab665cbb5cca000d34e89ee199865d3794 +EBUILD nginx-1.17.5-r100.ebuild 41442 BLAKE2B fc330b4f55ad401bd0bef3a54dfd895546d961de8177c9d88d4ec5a92cbfe715099026ed7b5f80addff8731cf5d3f8097b5adfdfaa6410706c41a820e60a66dc SHA512 45939f26f65332d3e10a47cd5970f567176adf144026333e44e83675e69c92217d9040b25a1e148f9d2bd365542d0196eb3f4a0154402382d6849c974c8e0524 +MISC metadata.xml 1310 BLAKE2B 6f40252a833a188f4b62cb2f2a126f93e68cdcd0e3575febdc371106c82d7ebdc6931b162a5ef8070fb6fe1f18e969191f67d3ccdd5e55712dc4d209c16c34c9 SHA512 10403ec29eaa83eb45b7b0b78340103b226145b52b3795e18b1e8bf272efa83586bc190e6e66061f33544434e3c2f94d2229be988733713578e9bb495ce7219c diff --git a/www-servers/nginx/files/http-sticky-nginx-1.11.2.patch b/www-servers/nginx/files/http-sticky-nginx-1.11.2.patch deleted file mode 100644 index 498bf22..0000000 --- a/www-servers/nginx/files/http-sticky-nginx-1.11.2.patch +++ /dev/null @@ -1,64 +0,0 @@ -Fix compilation issue with nginx-1.11.2 - -https://bitbucket.org/nginx-goodies/nginx-sticky-module-ng/issues/26/not-compile-nginx-1112 - -diff --git a/ngx_http_sticky_misc.c b/ngx_http_sticky_misc.c -index 4aadd4b..0a3548c 100644 ---- a/ngx_http_sticky_misc.c -+++ b/ngx_http_sticky_misc.c -@@ -16,10 +16,15 @@ - #define ngx_str_set(str, text) (str)->len = sizeof(text) - 1; (str)->data = (u_char *) text - #endif - -+/* - fix for 1.11.2 removes include <openssl/md5.h> in ngx_md5.h */ -+#define MD5_CBLOCK 64 -+#define MD5_LBLOCK (MD5_CBLOCK/4) -+#define MD5_DIGEST_LENGTH 16 -+ - // /* - bugfix for compiling on sles11 - needs gcc4.6 or later*/ --// #pragma GCC diagnostic ignored "-Wuninitialized" -+// #pragma GCC diagnostic ignored "-Wuninitialized" - --static ngx_int_t cookie_expires(char *str, size_t size, time_t t) -+static ngx_int_t cookie_expires(char *str, size_t size, time_t t) - { - char *months[] = {"Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"}; - char *wdays[] = {"Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"}; -@@ -75,7 +80,7 @@ ngx_int_t ngx_http_sticky_misc_set_cookie(ngx_http_request_t *r, ngx_str_t *name - len += sizeof("; HttpOnly") - 1; - } - -- cookie = ngx_pnalloc(r->pool, len); -+ cookie = ngx_pnalloc(r->pool, len); - if (cookie == NULL) { - return NGX_ERROR; - } -@@ -85,7 +90,7 @@ ngx_int_t ngx_http_sticky_misc_set_cookie(ngx_http_request_t *r, ngx_str_t *name - p = ngx_copy(p, value->data, value->len); - - if (domain->len > 0) { -- p = ngx_copy(p, "; Domain=", sizeof("; Domain=") - 1); -+ p = ngx_copy(p, "; Domain=", sizeof("; Domain=") - 1); - p = ngx_copy(p, domain->data, domain->len); - } - -@@ -95,16 +100,16 @@ ngx_int_t ngx_http_sticky_misc_set_cookie(ngx_http_request_t *r, ngx_str_t *name - } - - if (path->len > 0) { -- p = ngx_copy(p, "; Path=", sizeof("; Path=") - 1); -+ p = ngx_copy(p, "; Path=", sizeof("; Path=") - 1); - p = ngx_copy(p, path->data, path->len); - } - - if (secure) { -- p = ngx_copy(p, "; Secure", sizeof("; Secure") - 1); -+ p = ngx_copy(p, "; Secure", sizeof("; Secure") - 1); - } - - if (httponly) { -- p = ngx_copy(p, "; HttpOnly", sizeof("; HttpOnly") - 1); -+ p = ngx_copy(p, "; HttpOnly", sizeof("; HttpOnly") - 1); - } - - part = &r->headers_out.headers.part; diff --git a/www-servers/nginx/files/http_auth_pam-1.5.1-adjust-loglevel-for-authentication-failures.patch b/www-servers/nginx/files/http_auth_pam-1.5.1-adjust-loglevel-for-authentication-failures.patch new file mode 100644 index 0000000..632dcde --- /dev/null +++ b/www-servers/nginx/files/http_auth_pam-1.5.1-adjust-loglevel-for-authentication-failures.patch @@ -0,0 +1,22 @@ +https://github.com/sto/ngx_http_auth_pam_module/pull/18 + +--- a/ngx_http_auth_pam_module.c ++++ b/ngx_http_auth_pam_module.c +@@ -348,7 +348,7 @@ ngx_http_auth_pam_authenticate(ngx_http_request_t *r, + /* try to authenticate user, log error on failure */ + if ((rc = pam_authenticate(pamh, + PAM_DISALLOW_NULL_AUTHTOK)) != PAM_SUCCESS) { +- ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, ++ ngx_log_error(NGX_LOG_ERR, r->connection->log, 0, + "PAM: user '%s' - not authenticated: %s", + ainfo.username.data, pam_strerror(pamh, rc)); + pam_end(pamh, PAM_SUCCESS); +@@ -357,7 +357,7 @@ ngx_http_auth_pam_authenticate(ngx_http_request_t *r, + + /* check that the account is healthy */ + if ((rc = pam_acct_mgmt(pamh, PAM_DISALLOW_NULL_AUTHTOK)) != PAM_SUCCESS) { +- ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, ++ ngx_log_error(NGX_LOG_ERR, r->connection->log, 0, + "PAM: user '%s' - invalid account: %s", + ainfo.username.data, pam_strerror(pamh, rc)); + pam_end(pamh, PAM_SUCCESS); diff --git a/www-servers/nginx/files/http_brotli-detect-brotli-r2.patch b/www-servers/nginx/files/http_brotli-detect-brotli-r2.patch new file mode 100644 index 0000000..8774fa6 --- /dev/null +++ b/www-servers/nginx/files/http_brotli-detect-brotli-r2.patch @@ -0,0 +1,30 @@ +--- a/config ++++ b/config +@@ -59,13 +59,7 @@ have=NGX_HTTP_BROTLI_STATIC_MODULE . auto/have # deprecated + ngx_module_type=HTTP_FILTER + ngx_module_name=ngx_http_brotli_filter_module + +-brotli="/usr/local" +- +-if [ -f "/usr/include/brotli/encode.h" ]; then +- +-brotli="/usr" +- +-fi ++brotli=$(pkg-config --variable=prefix libbrotlienc) + + if [ ! -f "$brotli/include/brotli/encode.h" ]; then + +@@ -75,11 +69,7 @@ if [ ! -f "$brotli/include/brotli/encode.h" ]; then + cat << END + + $0: error: \ +-Brotli library is missing from the $brotli directory. +- +-Please make sure that the git submodule has been checked out: +- +- cd $ngx_addon_dir && git submodule update --init && cd $PWD ++Brotli library not found. Don't you have app-arch/brotli installed? + + END + exit 1 diff --git a/www-servers/nginx/files/http_cache_purge-1.11.6+.patch b/www-servers/nginx/files/http_cache_purge-1.11.6+.patch new file mode 100644 index 0000000..c4596bf --- /dev/null +++ b/www-servers/nginx/files/http_cache_purge-1.11.6+.patch @@ -0,0 +1,22 @@ +Fix compatibility with nginx-1.11.6+ + +https://github.com/FRiCKLE/ngx_cache_purge/pull/51 + +--- + ngx_cache_purge_module.c | 4 ++++ + 1 file changed, 4 insertions(+) + +--- a/ngx_cache_purge_module.c ++++ b/ngx_cache_purge_module.c +@@ -492,7 +492,11 @@ typedef struct { + ngx_str_t body_source; + # endif /* nginx_version < 1007008 */ + ++# if (nginx_version >= 1011006) ++ ngx_http_complex_value_t *method; ++# else + ngx_str_t method; ++# endif /* nginx_version >= 1011006 */ + ngx_str_t location; + ngx_str_t url; + diff --git a/www-servers/nginx/files/http_uploadprogress-issue_50-r1.patch b/www-servers/nginx/files/http_uploadprogress-issue_50-r1.patch new file mode 100644 index 0000000..42cbd77 --- /dev/null +++ b/www-servers/nginx/files/http_uploadprogress-issue_50-r1.patch @@ -0,0 +1,31 @@ +From dd138546b16a01e9c09613d02211373baf1cac02 Mon Sep 17 00:00:00 2001 +From: Thomas Deutschmann <whissi@whissi.de> +Date: Thu, 20 Oct 2016 03:09:37 +0200 +Subject: [PATCH] config: Fix ngx_module_type + +Since commit 37182ce2f3b6 the module was not present in static builds +because due to an invalid "ngx_module_type" the module was not added to +objs/ngx_modules.c. + +This commit will fix the problem by setting the correct module type +"HTTP_FILTER" [Link 1]. + +Link 1: https://www.nginx.com/resources/wiki/extending/new_config/#key-ngx_module_type +Gentoo-Bug: https://bugs.gentoo.org/593450 +Fixes: https://github.com/masterzen/nginx-upload-progress-module/issues/50 +--- + config | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/config b/config +index 364af8c..5f4ade1 100644 +--- a/config ++++ b/config +@@ -1,6 +1,6 @@ + ngx_addon_name=ngx_http_uploadprogress_module + if test -n "$ngx_module_link"; then +- ngx_module_type=FILTER ++ ngx_module_type=HTTP_FILTER + ngx_module_name=ngx_http_uploadprogress_module + ngx_module_srcs="$ngx_addon_dir/ngx_http_uploadprogress_module.c" + diff --git a/www-servers/nginx/files/http_upstream_check-nginx-1.11.5+.patch b/www-servers/nginx/files/http_upstream_check-nginx-1.11.5+.patch new file mode 100644 index 0000000..a894bde --- /dev/null +++ b/www-servers/nginx/files/http_upstream_check-nginx-1.11.5+.patch @@ -0,0 +1,246 @@ +Upstream: https://github.com/yaoweibin/nginx_upstream_check_module/pull/119 + +diff --git src/http/modules/ngx_http_upstream_hash_module.c src/http/modules/ngx_http_upstream_hash_module.c +index 6c28c64..a187887 100644 +--- src/http/modules/ngx_http_upstream_hash_module.c ++++ src/http/modules/ngx_http_upstream_hash_module.c +@@ -9,6 +9,9 @@ + #include <ngx_core.h> + #include <ngx_http.h> + ++#if (NGX_HTTP_UPSTREAM_CHECK) ++#include "ngx_http_upstream_check_module.h" ++#endif + + typedef struct { + uint32_t hash; +@@ -235,6 +238,16 @@ ngx_http_upstream_get_hash_peer(ngx_peer_connection_t *pc, void *data) + goto next; + } + ++#if (NGX_HTTP_UPSTREAM_CHECK) ++ ngx_log_debug1(NGX_LOG_DEBUG_HTTP, pc->log, 0, ++ "get hash peer, check_index: %ui", ++ peer->check_index); ++ if (ngx_http_upstream_check_peer_down(peer->check_index)) { ++ goto next; ++ } ++#endif ++ ++ + if (peer->max_fails + && peer->fails >= peer->max_fails + && now - peer->checked <= peer->fail_timeout) +@@ -538,6 +551,15 @@ ngx_http_upstream_get_chash_peer(ngx_peer_connection_t *pc, void *data) + continue; + } + ++#if (NGX_HTTP_UPSTREAM_CHECK) ++ ngx_log_debug1(NGX_LOG_DEBUG_HTTP, pc->log, 0, ++ "get consistent_hash peer, check_index: %ui", ++ peer->check_index); ++ if (ngx_http_upstream_check_peer_down(peer->check_index)) { ++ continue; ++ } ++#endif ++ + if (peer->server.len != server->len + || ngx_strncmp(peer->server.data, server->data, server->len) + != 0) +diff --git src/http/modules/ngx_http_upstream_ip_hash_module.c src/http/modules/ngx_http_upstream_ip_hash_module.c +index 296108f..135ce5d 100644 +--- src/http/modules/ngx_http_upstream_ip_hash_module.c ++++ src/http/modules/ngx_http_upstream_ip_hash_module.c +@@ -9,6 +9,9 @@ + #include <ngx_core.h> + #include <ngx_http.h> + ++#if (NGX_HTTP_UPSTREAM_CHECK) ++#include "ngx_http_upstream_check_module.h" ++#endif + + typedef struct { + /* the round robin data must be first */ +@@ -205,6 +208,15 @@ ngx_http_upstream_get_ip_hash_peer(ngx_peer_connection_t *pc, void *data) + goto next; + } + ++#if (NGX_HTTP_UPSTREAM_CHECK) ++ ngx_log_debug1(NGX_LOG_DEBUG_HTTP, pc->log, 0, ++ "get ip_hash peer, check_index: %ui", ++ peer->check_index); ++ if (ngx_http_upstream_check_peer_down(peer->check_index)) { ++ goto next; ++ } ++#endif ++ + if (peer->max_fails + && peer->fails >= peer->max_fails + && now - peer->checked <= peer->fail_timeout) +diff --git src/http/modules/ngx_http_upstream_least_conn_module.c src/http/modules/ngx_http_upstream_least_conn_module.c +index ebe0627..94f1883 100644 +--- src/http/modules/ngx_http_upstream_least_conn_module.c ++++ src/http/modules/ngx_http_upstream_least_conn_module.c +@@ -9,6 +9,10 @@ + #include <ngx_core.h> + #include <ngx_http.h> + ++#if (NGX_HTTP_UPSTREAM_CHECK) ++#include "ngx_http_upstream_check_module.h" ++#endif ++ + + static ngx_int_t ngx_http_upstream_init_least_conn_peer(ngx_http_request_t *r, + ngx_http_upstream_srv_conf_t *us); +@@ -147,6 +151,16 @@ ngx_http_upstream_get_least_conn_peer(ngx_peer_connection_t *pc, void *data) + continue; + } + ++#if (NGX_HTTP_UPSTREAM_CHECK) ++ ngx_log_debug1(NGX_LOG_DEBUG_HTTP, pc->log, 0, ++ "get least_conn peer, check_index: %ui", ++ peer->check_index); ++ ++ if (ngx_http_upstream_check_peer_down(peer->check_index)) { ++ continue; ++ } ++#endif ++ + if (peer->max_fails + && peer->fails >= peer->max_fails + && now - peer->checked <= peer->fail_timeout) +@@ -202,6 +216,16 @@ ngx_http_upstream_get_least_conn_peer(ngx_peer_connection_t *pc, void *data) + continue; + } + ++#if (NGX_HTTP_UPSTREAM_CHECK) ++ ngx_log_debug1(NGX_LOG_DEBUG_HTTP, pc->log, 0, ++ "get least_conn peer, check_index: %ui", ++ peer->check_index); ++ ++ if (ngx_http_upstream_check_peer_down(peer->check_index)) { ++ continue; ++ } ++#endif ++ + if (peer->conns * best->weight != best->conns * peer->weight) { + continue; + } +diff --git src/http/ngx_http_upstream_round_robin.c src/http/ngx_http_upstream_round_robin.c +index 0137bf6..99f0923 100644 +--- src/http/ngx_http_upstream_round_robin.c ++++ src/http/ngx_http_upstream_round_robin.c +@@ -9,6 +9,9 @@ + #include <ngx_core.h> + #include <ngx_http.h> + ++#if (NGX_HTTP_UPSTREAM_CHECK) ++#include "ngx_http_upstream_check_module.h" ++#endif + + #define ngx_http_upstream_tries(p) ((p)->number \ + + ((p)->next ? (p)->next->number : 0)) +@@ -97,7 +100,14 @@ ngx_http_upstream_init_round_robin(ngx_conf_t *cf, + peer[n].fail_timeout = server[i].fail_timeout; + peer[n].down = server[i].down; + peer[n].server = server[i].name; +- ++#if (NGX_HTTP_UPSTREAM_CHECK) ++ if (!server[i].down) { ++ peer[n].check_index = ++ ngx_http_upstream_check_add_peer(cf, us, &server[i].addrs[j]); ++ } else { ++ peer[n].check_index = (ngx_uint_t) NGX_ERROR; ++ } ++#endif + *peerp = &peer[n]; + peerp = &peer[n].next; + n++; +@@ -161,7 +171,15 @@ ngx_http_upstream_init_round_robin(ngx_conf_t *cf, + peer[n].fail_timeout = server[i].fail_timeout; + peer[n].down = server[i].down; + peer[n].server = server[i].name; +- ++#if (NGX_HTTP_UPSTREAM_CHECK) ++ if (!server[i].down) { ++ peer[n].check_index = ++ ngx_http_upstream_check_add_peer(cf, us, &server[i].addrs[j]); ++ } ++ else { ++ peer[n].check_index = (ngx_uint_t) NGX_ERROR; ++ } ++#endif + *peerp = &peer[n]; + peerp = &peer[n].next; + n++; +@@ -228,6 +246,9 @@ ngx_http_upstream_init_round_robin(ngx_conf_t *cf, + peer[i].max_conns = 0; + peer[i].max_fails = 1; + peer[i].fail_timeout = 10; ++#if (NGX_HTTP_UPSTREAM_CHECK) ++ peer[i].check_index = (ngx_uint_t) NGX_ERROR; ++#endif + *peerp = &peer[i]; + peerp = &peer[i].next; + } +@@ -344,6 +365,9 @@ ngx_http_upstream_create_round_robin_peer(ngx_http_request_t *r, + peer[0].max_conns = 0; + peer[0].max_fails = 1; + peer[0].fail_timeout = 10; ++#if (NGX_HTTP_UPSTREAM_CHECK) ++ peer[0].check_index = (ngx_uint_t) NGX_ERROR; ++#endif + peers->peer = peer; + + } else { +@@ -378,6 +402,9 @@ ngx_http_upstream_create_round_robin_peer(ngx_http_request_t *r, + peer[i].max_conns = 0; + peer[i].max_fails = 1; + peer[i].fail_timeout = 10; ++#if (NGX_HTTP_UPSTREAM_CHECK) ++ peer[i].check_index = (ngx_uint_t) NGX_ERROR; ++#endif + *peerp = &peer[i]; + peerp = &peer[i].next; + } +@@ -443,6 +470,12 @@ ngx_http_upstream_get_round_robin_peer(ngx_peer_connection_t *pc, void *data) + goto failed; + } + ++#if (NGX_HTTP_UPSTREAM_CHECK) ++ if (ngx_http_upstream_check_peer_down(peer->check_index)) { ++ goto failed; ++ } ++#endif ++ + rrp->current = peer; + + } else { +@@ -537,6 +570,12 @@ ngx_http_upstream_get_peer(ngx_http_upstream_rr_peer_data_t *rrp) + continue; + } + ++#if (NGX_HTTP_UPSTREAM_CHECK) ++ if (ngx_http_upstream_check_peer_down(peer->check_index)) { ++ continue; ++ } ++#endif ++ + if (peer->max_fails + && peer->fails >= peer->max_fails + && now - peer->checked <= peer->fail_timeout) +diff --git src/http/ngx_http_upstream_round_robin.h src/http/ngx_http_upstream_round_robin.h +index 45f258d..dee91d0 100644 +--- src/http/ngx_http_upstream_round_robin.h ++++ src/http/ngx_http_upstream_round_robin.h +@@ -38,6 +38,10 @@ struct ngx_http_upstream_rr_peer_s { + ngx_msec_t slow_start; + ngx_msec_t start_time; + ++#if (NGX_HTTP_UPSTREAM_CHECK) ++ ngx_uint_t check_index; ++#endif ++ + ngx_uint_t down; + + #if (NGX_HTTP_SSL || NGX_COMPAT) diff --git a/www-servers/nginx/files/nginx-1.11.3-fix-build-without-stream_ssl_module.patch b/www-servers/nginx/files/nginx-1.11.3-fix-build-without-stream_ssl_module.patch deleted file mode 100644 index 6163730..0000000 --- a/www-servers/nginx/files/nginx-1.11.3-fix-build-without-stream_ssl_module.patch +++ /dev/null @@ -1,30 +0,0 @@ - -# HG changeset patch -# User Vladimir Homutov <vl@nginx.com> -# Date 1469550852 -10800 -# Node ID d43ee392e825186545d81e683b88cc58ef8479bc -# Parent 0b4249f975eba48c17b69c5e225fd12b470c0184 -Stream: fixed build without stream_ssl_module (ticket #1032). - -diff -r 0b4249f975eb -r d43ee392e825 src/stream/ngx_stream_proxy_module.c ---- a/src/stream/ngx_stream_proxy_module.c Tue Jul 26 19:07:18 2016 +0300 -+++ b/src/stream/ngx_stream_proxy_module.c Tue Jul 26 19:34:12 2016 +0300 -@@ -538,7 +538,7 @@ - return; - } - --#if (NGX_HTTP_SSL) -+#if (NGX_STREAM_SSL) - u->ssl_name = uscf->host; - #endif - -@@ -1157,7 +1157,7 @@ - u = s->upstream; - ur = u->resolved; - -- ngx_log_debug0(NGX_LOG_DEBUG_HTTP, s->connection->log, 0, -+ ngx_log_debug0(NGX_LOG_DEBUG_STREAM, s->connection->log, 0, - "stream upstream resolve"); - - if (ctx->state) { - diff --git a/www-servers/nginx/files/nginx.confd b/www-servers/nginx/files/nginx.confd new file mode 100644 index 0000000..f4b8043 --- /dev/null +++ b/www-servers/nginx/files/nginx.confd @@ -0,0 +1,32 @@ +# /etc/conf.d/nginx + +# Configuration file +#NGINX_CONFIGFILE="/etc/nginx/nginx.conf" + +# PID file +# If you should ever change this, remember to update +# "/etc/logrotate.d/nginx", too. +#NGINX_PIDFILE="/run/nginx.pid" + +# User to run nginx as +# If you should ever change this, make sure this user has +# execution permission on any of your log directories +# (/var/log/nginx per default) but do NOT forget other log directories +# one of your vhost(s) maybe using or logging after logrotation will +# be broken). +#NGINX_USER="nginx" + +# Group to run nginx as +# See the note above regarding NGINX_USER. +#NGINX_GROUP="nginx" + +# You can use this configuration option to pass additional options to the +# start-stop-daemon, see start-stop-daemon(8) for more details. +# Per default we wait 1000ms after we have started the service to ensure +# that the daemon is really up and running. +#NGINX_SSDARGS="--wait 1000" + +# The termination timeout (start-stop-daemon parameter "retry") ensures +# that the service will be terminated within a given time (60 + 5 seconds +# per default) when you are stopping the service. +#NGINX_TERMTIMEOUT="TERM/60/KILL/5" diff --git a/www-servers/nginx/files/nginx.initd-r3 b/www-servers/nginx/files/nginx.initd-r4 index 6e3a824..31f79ba 100644 --- a/www-servers/nginx/files/nginx.initd-r3 +++ b/www-servers/nginx/files/nginx.initd-r4 @@ -1,7 +1,6 @@ #!/sbin/openrc-run -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Id$ extra_commands="configtest" extra_started_commands="upgrade reload" @@ -11,13 +10,15 @@ 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} +NGINX_CONFIGFILE=${NGINX_CONFIGFILE:-/etc/nginx/nginx.conf} command="/usr/sbin/nginx" -command_args="-c ${nginx_config}" -pidfile=${pidfile:-/run/nginx.pid} -user=${user:-nginx} -group=${group:-nginx} +command_args="-c \"${NGINX_CONFIGFILE}\"" +start_stop_daemon_args=${NGINX_SSDARGS:-"--wait 1000"} +pidfile=${NGINX_PIDFILE:-/run/nginx.pid} +user=${NGINX_USER:-nginx} +group=${NGINX_GROUP:-nginx} +retry=${NGINX_TERMTIMEOUT:-"TERM/60/KILL/5"} depend() { need net @@ -43,7 +44,7 @@ stop_post() { reload() { configtest || return 1 ebegin "Refreshing nginx' configuration" - kill -HUP `cat ${pidfile}` &>/dev/null + start-stop-daemon --signal SIGHUP --pidfile "${pidfile}" eend $? "Failed to reload nginx" } @@ -52,26 +53,28 @@ upgrade() { ebegin "Upgrading nginx" einfo "Sending USR2 to old binary" - kill -USR2 `cat ${pidfile}` &>/dev/null + start-stop-daemon --signal SIGUSR2 --pidfile "${pidfile}" einfo "Sleeping 3 seconds before pid-files checking" sleep 3 - if [ ! -f ${pidfile}.oldbin ]; then + if [ ! -f "${pidfile}.oldbin" ]; then eerror "File with old pid not found" return 1 fi - if [ ! -f ${pidfile} ]; then + 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` + sleep 3 + # Cannot send "WINCH" using start-stop-daemon yet, https://bugs.gentoo.org/604986 + kill -WINCH $(cat "${pidfile}.oldbin") einfo "Sending QUIT to old binary" - kill -QUIT `cat ${pidfile}.oldbin` + start-stop-daemon --signal SIGQUIT --pidfile "${pidfile}.oldbin" einfo "Upgrade completed" eend $? "Upgrade failed" @@ -79,10 +82,10 @@ upgrade() { configtest() { ebegin "Checking nginx' configuration" - ${command} -c ${nginx_config} -t -q + ${command} -c "${NGINX_CONFIGFILE}" -t -q if [ $? -ne 0 ]; then - ${command} -c ${nginx_config} -t + ${command} -c "${NGINX_CONFIGFILE}" -t fi eend $? "failed, please correct errors above" diff --git a/www-servers/nginx/files/nginx.logrotate-r1 b/www-servers/nginx/files/nginx.logrotate-r1 index a78ed7a..bc9d87a 100644 --- a/www-servers/nginx/files/nginx.logrotate-r1 +++ b/www-servers/nginx/files/nginx.logrotate-r1 @@ -1,6 +1,5 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Id$ /var/log/nginx/*_log { missingok diff --git a/www-servers/nginx/metadata.xml b/www-servers/nginx/metadata.xml index 150cf04..3eb0471 100644 --- a/www-servers/nginx/metadata.xml +++ b/www-servers/nginx/metadata.xml @@ -2,21 +2,12 @@ <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> - <email>dev-zero@gentoo.org</email> - <name>Tiziano Müller</name> - </maintainer> - <maintainer type="person"> <email>whissi@gentoo.org</email> <name>Thomas Deutschmann</name> </maintainer> <maintainer type="person"> - <email>bugs@bergstroem.nu</email> - <name>Johan Bergström</name> - <description>Co-maintainer, CC on bugs.</description> - </maintainer> - <maintainer type="project"> - <email>proxy-maint@gentoo.org</email> - <name>Proxy Maintainers</name> + <email>dev-zero@gentoo.org</email> + <name>Tiziano Müller</name> </maintainer> <use> <flag name="aio">Enables file AIO support</flag> @@ -30,7 +21,7 @@ <flag name="rtmp">NGINX-based Media Streaming Server</flag> </use> <upstream> - <changelog>http://nginx.org/en/CHANGES</changelog> + <changelog>https://nginx.org/en/CHANGES</changelog> <remote-id type="github">openresty/memc-nginx-module</remote-id> <remote-id type="bitbucket">nginx-goodies/nginx-sticky-module-ng</remote-id> </upstream> diff --git a/www-servers/nginx/nginx-1.10.1-r100.ebuild b/www-servers/nginx/nginx-1.16.1-r100.ebuild index c990f8a..97ac446 100644 --- a/www-servers/nginx/nginx-1.10.1-r100.ebuild +++ b/www-servers/nginx/nginx-1.16.1-r100.ebuild @@ -1,8 +1,7 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -# $Id$ -EAPI=6 +EAPI="6" # Maintainer notes: # - http_rewrite-independent pcre-support makes sense for matching locations without an actual rewrite @@ -18,24 +17,30 @@ EAPI=6 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_PV="0.3.1" +DEVEL_KIT_MODULE_P="ngx_devel_kit-${DEVEL_KIT_MODULE_PV}" 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}" +# ngx_brotli (https://github.com/eustas/ngx_brotli, BSD-2) +HTTP_BROTLI_MODULE_PV="8104036af9cff4b1d34f22d00ba857e2a93a243c" +HTTP_BROTLI_MODULE_P="ngx_brotli-${HTTP_BROTLI_MODULE_PV}" +HTTP_BROTLI_MODULE_URI="https://github.com/eustas/ngx_brotli/archive/${HTTP_BROTLI_MODULE_PV}.tar.gz" +HTTP_BROTLI_MODULE_WD="${WORKDIR}/ngx_brotli-${HTTP_BROTLI_MODULE_PV}" + # http_uploadprogress (https://github.com/masterzen/nginx-upload-progress-module, BSD-2 license) -HTTP_UPLOAD_PROGRESS_MODULE_PV="0.9.1" +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.30" +HTTP_HEADERS_MORE_MODULE_PV="0.33" 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/, BSD-2 license) +# 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" @@ -48,13 +53,13 @@ HTTP_SLOWFS_CACHE_MODULE_URI="http://labs.frickle.com/files/ngx_slowfs_cache-${H 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.0" +HTTP_FANCYINDEX_MODULE_PV="0.4.3" 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.5" +HTTP_LUA_MODULE_PV="0.10.15" 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}" @@ -66,10 +71,10 @@ HTTP_AUTH_PAM_MODULE_URI="https://github.com/stogh/ngx_http_auth_pam_module/arch 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-g10782ea" +HTTP_UPSTREAM_CHECK_MODULE_PV="9aecf15ec379fe98f62355c57b60c0bc83296f04" 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-10782eaff51872a8f44e65eed89bbe286004bcb1" +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/zenops/ngx_metrics, BSD license) HTTP_METRICS_MODULE_PV="0.1.1" @@ -77,48 +82,54 @@ 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_vhost_traffic_status (https://github.com/vozlt/nginx-module-vts, BSD license) +HTTP_VHOST_TRAFFIC_STATUS_MODULE_PV="46d85558e344dfe2b078ce757fd36c69a1ec2dd3" +HTTP_VHOST_TRAFFIC_STATUS_MODULE_P="ngx_http_vhost_traffic_status-${HTTP_VHOST_TRAFFIC_STATUS_MODULE_PV}" +HTTP_VHOST_TRAFFIC_STATUS_MODULE_URI="https://github.com/vozlt/nginx-module-vts/archive/${HTTP_VHOST_TRAFFIC_STATUS_MODULE_PV}.tar.gz" +HTTP_VHOST_TRAFFIC_STATUS_MODULE_WD="${WORKDIR}/nginx-module-vts-${HTTP_VHOST_TRAFFIC_STATUS_MODULE_PV}" + # naxsi-core (https://github.com/nbs-system/naxsi, GPLv2+) -HTTP_NAXSI_MODULE_PV="0.54" +HTTP_NAXSI_MODULE_PV="0.56" 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.7" +RTMP_MODULE_PV="1.2.1" 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_PV="3.0.0" 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.59" +HTTP_ECHO_MODULE_PV="0.61" 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_PV="2.9.3" 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_PV="0.5.4" 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" +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-c78b7dd79d0d" +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" @@ -127,17 +138,29 @@ HTTP_MOGILEFS_MODULE_URI="https://github.com/vkholodkov/nginx-mogilefs-module/ar 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_PV="0.19" 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="dbcef31bebb2d54b6120422d0b178bbf78bc48f7" +HTTP_LDAP_MODULE_PV="42d195d7a7575ebab1c369ad3fc5d78dc2c2669c" 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}" +# geoip2 (https://github.com/leev/ngx_http_geoip2_module, BSD-2) +GEOIP2_MODULE_PV="3.2" +GEOIP2_MODULE_P="ngx_http_geoip2_module-${GEOIP2_MODULE_PV}" +GEOIP2_MODULE_URI="https://github.com/leev/ngx_http_geoip2_module/archive/${GEOIP2_MODULE_PV}.tar.gz" +GEOIP2_MODULE_WD="${WORKDIR}/ngx_http_geoip2_module-${GEOIP2_MODULE_PV}" + +# njs-module (https://github.com/nginx/njs, as-is) +NJS_MODULE_PV="0.3.5" +NJS_MODULE_P="njs-${NJS_MODULE_PV}" +NJS_MODULE_URI="https://github.com/nginx/njs/archive/${NJS_MODULE_PV}.tar.gz" +NJS_MODULE_WD="${WORKDIR}/njs-${NJS_MODULE_PV}" + HTTP_XSLTPROC_MODULE_PV="0.16" HTTP_XSLTPROC_MODULE_P="ngx_xsltproc-${HTTP_XSLTPROC_MODULE_PV}" HTTP_XSLTPROC_MODULE_URI="https://github.com/yoreek/nginx-xsltproc-module/archive/v${HTTP_XSLTPROC_MODULE_PV}.tar.gz" @@ -145,32 +168,39 @@ HTTP_XSLTPROC_MODULE_WD="${WORKDIR}/nginx-xsltproc-module-${HTTP_XSLTPROC_MODULE # We handle deps below ourselves SSL_DEPS_SKIP=1 +AUTOTOOLS_AUTO_DEPEND="no" -inherit ssl-cert toolchain-funcs perl-module flag-o-matic user systemd versionator multilib +inherit autotools ssl-cert toolchain-funcs perl-module flag-o-matic user systemd versionator multilib pax-utils DESCRIPTION="Robust, small and high performance http and reverse proxy server" -HOMEPAGE="http://nginx.org" -SRC_URI="http://nginx.org/download/${P}.tar.gz +HOMEPAGE="https://nginx.org" +SRC_URI="https://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_auth_ldap? ( ${HTTP_LDAP_MODULE_URI} -> ${HTTP_LDAP_MODULE_P}.tar.gz ) + nginx_modules_http_auth_pam? ( ${HTTP_AUTH_PAM_MODULE_URI} -> ${HTTP_AUTH_PAM_MODULE_P}.tar.gz ) + nginx_modules_http_brotli? ( ${HTTP_BROTLI_MODULE_URI} -> ${HTTP_BROTLI_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_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_fancyindex? ( ${HTTP_FANCYINDEX_MODULE_URI} -> ${HTTP_FANCYINDEX_MODULE_P}.tar.gz ) + nginx_modules_http_geoip2? ( ${GEOIP2_MODULE_URI} -> ${GEOIP2_MODULE_P}.tar.gz ) + nginx_modules_http_headers_more? ( ${HTTP_HEADERS_MORE_MODULE_URI} -> ${HTTP_HEADERS_MORE_MODULE_P}.tar.gz ) + nginx_modules_http_javascript? ( ${NJS_MODULE_URI} -> ${NJS_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_memc? ( ${HTTP_MEMC_MODULE_URI} -> ${HTTP_MEMC_MODULE_P}.tar.gz ) nginx_modules_http_metrics? ( ${HTTP_METRICS_MODULE_URI} -> ${HTTP_METRICS_MODULE_P}.tar.gz ) + nginx_modules_http_mogilefs? ( ${HTTP_MOGILEFS_MODULE_URI} -> ${HTTP_MOGILEFS_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_security? ( ${HTTP_SECURITY_MODULE_URI} -> ${HTTP_SECURITY_MODULE_P}.tar.gz ) + nginx_modules_http_slowfs_cache? ( ${HTTP_SLOWFS_CACHE_MODULE_URI} -> ${HTTP_SLOWFS_CACHE_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 ) + nginx_modules_http_upload_progress? ( ${HTTP_UPLOAD_PROGRESS_MODULE_URI} -> ${HTTP_UPLOAD_PROGRESS_MODULE_P}.tar.gz ) + nginx_modules_http_upstream_check? ( ${HTTP_UPSTREAM_CHECK_MODULE_URI} -> ${HTTP_UPSTREAM_CHECK_MODULE_P}.tar.gz ) + nginx_modules_http_vhost_traffic_status? ( ${HTTP_VHOST_TRAFFIC_STATUS_MODULE_URI} -> ${HTTP_VHOST_TRAFFIC_STATUS_MODULE_P}.tar.gz ) + nginx_modules_stream_geoip2? ( ${GEOIP2_MODULE_URI} -> ${GEOIP2_MODULE_P}.tar.gz ) + nginx_modules_stream_javascript? ( ${NJS_MODULE_URI} -> ${NJS_MODULE_P}.tar.gz ) + rtmp? ( ${RTMP_MODULE_URI} -> ${RTMP_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 GPL-2+ @@ -178,39 +208,52 @@ LICENSE="BSD-2 BSD SSLeay MIT GPL-2 GPL-2+ nginx_modules_http_push_stream? ( GPL-3 )" SLOT="0" -KEYWORDS="amd64 ~arm ~arm64 ~ppc x86 ~x86-fbsd ~amd64-linux ~x86-linux" +KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux" + +# Package doesn't provide a real test suite +RESTRICT="test" 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" + fastcgi geo grpc gzip limit_req limit_conn map memcached mirror + 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" -NGINX_MODULES_STREAM="access limit_conn upstream" + 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_auth_ldap + http_auth_pam + http_brotli http_cache_purge - http_slowfs_cache + http_dav_ext + http_echo http_fancyindex + http_geoip2 + http_headers_more + http_javascript http_lua - http_auth_pam - http_upstream_check + http_memc http_metrics + http_mogilefs http_naxsi - http_dav_ext - http_echo - http_security http_push_stream + http_security + http_slowfs_cache http_sticky - http_ajp - http_mogilefs - http_memc - http_auth_ldap - http_xsltproc" + http_upload_progress + http_upstream_check + http_vhost_traffic_status + stream_geoip2 + stream_javascript + http_xsltproc +" -IUSE="aio debug +http +http2 +http-cache ipv6 libatomic libressl luajit +pcre +IUSE="aio debug +http +http2 +http-cache +ipv6 libatomic libressl luajit +pcre pcre-jit rtmp selinux ssl threads userland_GNU vim-syntax +nginx_modules_http_xsltproc xsltproc-memcached" for mod in $NGINX_MODULES_STD; do @@ -221,7 +264,11 @@ for mod in $NGINX_MODULES_OPT; do IUSE="${IUSE} nginx_modules_http_${mod}" done -for mod in $NGINX_MODULES_STREAM; do +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 @@ -238,8 +285,8 @@ done IUSE="${IUSE} nginx_modules_http_spdy" CDEPEND=" - pcre? ( >=dev-libs/libpcre-4.2 ) - pcre-jit? ( >=dev-libs/libpcre-8.20[jit] ) + pcre? ( dev-libs/libpcre:= ) + pcre-jit? ( dev-libs/libpcre:=[jit] ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) @@ -254,37 +301,54 @@ CDEPEND=" libressl? ( dev-libs/libressl:= ) ) ) + nginx_modules_http_brotli? ( app-arch/brotli:= ) nginx_modules_http_geoip? ( dev-libs/geoip ) + nginx_modules_http_geoip2? ( dev-libs/libmaxminddb:= ) 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_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_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/libxml2-2.7.8 dev-libs/apr-util www-servers/apache ) + nginx_modules_http_xslt? ( dev-libs/libxml2:= dev-libs/libxslt ) + nginx_modules_http_lua? ( dev-lang/luajit:2= ) + nginx_modules_http_auth_pam? ( sys-libs/pam ) + nginx_modules_http_metrics? ( dev-libs/yajl:= ) + nginx_modules_http_dav_ext? ( dev-libs/libxml2 ) + 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?] ) + nginx_modules_stream_geoip? ( dev-libs/geoip ) + nginx_modules_stream_geoip2? ( dev-libs/libmaxminddb:= ) nginx_modules_http_xsltproc? ( dev-libs/libxml2 dev-libs/libxslt dev-libs/icu ) xsltproc-memcached? ( dev-libs/libmemcached )" RDEPEND="${CDEPEND} selinux? ( sec-policy/selinux-nginx ) !www-servers/nginx:mainline" DEPEND="${CDEPEND} + nginx_modules_http_brotli? ( virtual/pkgconfig ) + 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_grpc? ( http2 ) + nginx_modules_http_lua? ( + luajit + 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 ) @@ -328,13 +392,48 @@ pkg_setup() { 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_auth_pam; then + cd "${HTTP_AUTH_PAM_MODULE_WD}" || die + eapply "${FILESDIR}"/http_auth_pam-1.5.1-adjust-loglevel-for-authentication-failures.patch + cd "${S}" || die + fi + + if use nginx_modules_http_brotli; then + cd "${HTTP_BROTLI_MODULE_WD}" || die + eapply "${FILESDIR}"/http_brotli-detect-brotli-r2.patch + cd "${S}" || die + fi if use nginx_modules_http_upstream_check; then - eapply -p0 "${HTTP_UPSTREAM_CHECK_MODULE_WD}/check_1.9.2+".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 + if use nginx_modules_http_cache_purge; then + cd "${HTTP_CACHE_PURGE_MODULE_WD}" || die + eapply "${FILESDIR}"/http_cache_purge-1.11.6+.patch + cd "${S}" || die + fi + + if use nginx_modules_http_security; then + cd "${HTTP_SECURITY_MODULE_WD}" || die + + 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 find auto/ -type f -print0 | xargs -0 sed -i 's:\&\& make:\&\& \\$(MAKE):' || die @@ -362,25 +461,22 @@ 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 - if use luajit ; then - sed -i \ - -e 's|^\(LUA_PKGNAMES\)=.*|\1="luajit"|' \ - configure || die - fi + ./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" - fi - cd "${S}" || die + 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 ipv6 && myconf+=( --with-ipv6 ) use libatomic && myconf+=( --with-libatomic ) use pcre && myconf+=( --with-pcre ) use pcre-jit && myconf+=( --with-pcre-jit ) @@ -434,13 +530,8 @@ src_configure() { 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 + export LUAJIT_LIB=$(pkg-config --variable libdir luajit) + export LUAJIT_INC=$(pkg-config --variable includedir luajit) myconf+=( --add-module=${DEVEL_KIT_MODULE_WD} ) myconf+=( --add-module=${HTTP_LUA_MODULE_WD} ) fi @@ -510,12 +601,30 @@ src_configure() { myconf+=( --add-module=${HTTP_LDAP_MODULE_WD} ) fi + if use nginx_modules_http_vhost_traffic_status; then + http_enabled=1 + myconf+=( --add-module=${HTTP_VHOST_TRAFFIC_STATUS_MODULE_WD} ) + fi + + if use nginx_modules_http_geoip2 || use nginx_modules_stream_geoip2; then + myconf+=( --add-module=${GEOIP2_MODULE_WD} ) + fi + + if use nginx_modules_http_javascript || use nginx_modules_stream_javascript; then + myconf+=( --add-module="${NJS_MODULE_WD}/nginx" ) + fi + + if use nginx_modules_http_brotli; then + http_enabled=1 + myconf+=( --add-module=${HTTP_BROTLI_MODULE_WD} ) + fi + if use nginx_modules_http_xsltproc; then http_enabled=1 myconf+=( --add-module=${HTTP_XSLTPROC_MODULE_WD} ) fi - if use http || use http-cache || use http2; then + if use http || use http-cache || use http2 || use nginx_modules_http_javascript; then http_enabled=1 fi @@ -527,21 +636,25 @@ src_configure() { fi # Stream modules - for mod in $NGINX_MODULES_STREAM; do + for mod in $NGINX_MODULES_STREAM_STD; do if use nginx_modules_stream_${mod}; then stream_enabled=1 else - # Treat stream upstream slightly differently - if ! use nginx_modules_stream_upstream; then - myconf+=( --without-stream_upstream_hash_module ) - myconf+=( --without-stream_upstream_least_conn_module ) - myconf+=( --without-stream_upstream_zone_module ) - else - myconf+=( --without-stream_${mod}_module ) - fi + 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 use nginx_modules_stream_geoip2 || use nginx_modules_stream_javascript; then + stream_enabled=1 + fi + if [ $stream_enabled ]; then myconf+=( --with-stream ) use ssl && myconf+=( --with-stream_ssl_module ) @@ -571,7 +684,18 @@ src_configure() { tc-export CC if ! use prefix; then - myconf+=( --user=${PN}" "--group=${PN} ) + myconf+=( --user=${PN} ) + myconf+=( --group=${PN} ) + fi + + local WITHOUT_IPV6= + if ! use ipv6; then + WITHOUT_IPV6=" -DNGX_HAVE_INET6=0" + fi + + if [[ -n "${EXTRA_ECONF}" ]]; then + myconf+=( ${EXTRA_ECONF} ) + ewarn "EXTRA_ECONF applied. Now you are on your own, good luck!" fi ./configure \ @@ -580,7 +704,7 @@ src_configure() { --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-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 \ @@ -588,6 +712,7 @@ src_configure() { --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 @@ -609,7 +734,8 @@ src_install() { cp "${FILESDIR}"/nginx.conf-r2 "${ED}"etc/nginx/nginx.conf || die - newinitd "${FILESDIR}"/nginx.initd-r3 nginx + newinitd "${FILESDIR}"/nginx.initd-r4 nginx + newconfd "${FILESDIR}"/nginx.confd nginx systemd_newunit "${FILESDIR}"/nginx.service-r1 nginx.service @@ -634,13 +760,20 @@ src_install() { 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} + fperms 0700 ${keepdir_list} + fowners ${PN}:${PN} ${keepdir_list} + + fperms 0710 /var/log/nginx + fowners 0:${PN} /var/log/nginx # logrotate insinto /etc/logrotate.d newins "${FILESDIR}"/nginx.logrotate-r1 nginx + if use luajit; then + pax-mark m "${ED%/}/usr/sbin/nginx" + fi + if use nginx_modules_http_perl; then cd "${S}"/objs/src/http/modules/perl/ || die emake DESTDIR="${D}" INSTALLDIRS=vendor @@ -665,7 +798,7 @@ src_install() { if use nginx_modules_http_lua; then docinto ${HTTP_LUA_MODULE_P} - dodoc "${HTTP_LUA_MODULE_WD}"/{Changes,README.markdown} + dodoc "${HTTP_LUA_MODULE_WD}"/README.markdown fi if use nginx_modules_http_auth_pam; then @@ -690,7 +823,7 @@ src_install() { if use nginx_modules_http_dav_ext; then docinto ${HTTP_DAV_EXT_MODULE_P} - dodoc "${HTTP_DAV_EXT_MODULE_WD}"/README + dodoc "${HTTP_DAV_EXT_MODULE_WD}"/README.rst fi if use nginx_modules_http_echo; then @@ -700,7 +833,7 @@ src_install() { if use nginx_modules_http_security; then docinto ${HTTP_SECURITY_MODULE_P} - dodoc "${HTTP_SECURITY_MODULE_WD}"/{CHANGES,README.TXT,authors.txt} + dodoc "${HTTP_SECURITY_MODULE_WD}"/{CHANGES,README.md,authors.txt} fi if use nginx_modules_http_push_stream; then @@ -726,48 +859,250 @@ src_install() { pkg_postinst() { if use ssl; then - if [ ! -f "${EROOT}"etc/ssl/${PN}/${PN}.key ]; 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 "" 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; then + ewarn "" + ewarn "While you can build lua 3rd party module against ${P}" + ewarn "the author warns that >=${PN}-1.11.11 is still not an" + ewarn "officially supported target yet. You are on your own." + ewarn "Expect runtime failures, memory leaks and other problems!" + fi + if use nginx_modules_http_lua && use http2; then + ewarn "" 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" + ewarn "NGINX_MODULES_HTTP=\"lua http2\". For more info, see https://git.io/OldLsg" fi - # This is the proper fix for bug #458726/#469094, resp. CVE-2013-0337 for - # existing installations - local fix_perms=0 + local _n_permission_layout_checks=0 + local _has_to_adjust_permissions=0 + local _has_to_show_permission_warning=0 + + # Defaults to 1 to inform people doing a fresh installation + # that we ship modified {scgi,uwsgi,fastcgi}_params files + local _has_to_show_httpoxy_mitigation_notice=1 + + local _replacing_version= + for _replacing_version in ${REPLACING_VERSIONS}; do + _n_permission_layout_checks=$((${_n_permission_layout_checks}+1)) + + if [[ ${_n_permission_layout_checks} -gt 1 ]]; then + # Should never happen: + # Package is abusing slots but doesn't allow multiple parallel installations. + # If we run into this situation it is unsafe to automatically adjust any + # permission... + _has_to_show_permission_warning=1 + + ewarn "Replacing multiple ${PN}' versions is unsupported! " \ + "You will have to adjust permissions on your own." + + break + fi + + local _replacing_version_branch=$(get_version_component_range 1-2 "${_replacing_version}") + debug-print "Updating an existing installation (v${_replacing_version}; branch '${_replacing_version_branch}') ..." + + # Do we need to adjust permissions to fix CVE-2013-0337 (bug #458726, #469094)? + # This was before we introduced multiple nginx versions so we + # do not need to distinguish between stable and mainline + local _need_to_fix_CVE2013_0337=1 + + if version_is_at_least "1.4.1-r2" "${_replacing_version}"; then + # We are updating an installation which should already be fixed + _need_to_fix_CVE2013_0337=0 + debug-print "Skipping CVE-2013-0337 ... existing installation should not be affected!" + else + _has_to_adjust_permissions=1 + debug-print "Need to adjust permissions to fix CVE-2013-0337!" + fi + + # Do we need to inform about HTTPoxy mitigation? + # In repository since commit 8be44f76d4ac02cebcd1e0e6e6284bb72d054b0f + if ! version_is_at_least "1.10" "${_replacing_version_branch}"; then + # Updating from <1.10 + _has_to_show_httpoxy_mitigation_notice=1 + debug-print "Need to inform about HTTPoxy mitigation!" + else + # Updating from >=1.10 + local _fixed_in_pvr= + case "${_replacing_version_branch}" in + "1.10") + _fixed_in_pvr="1.10.1-r2" + ;; + "1.11") + _fixed_in_pvr="1.11.3-r1" + ;; + *) + # This should be any future branch. + # If we run this code it is safe to assume that the user has + # already seen the HTTPoxy mitigation notice because he/she is doing + # an update from previous version where we have already shown + # the warning. Otherwise, we wouldn't hit this code path ... + _fixed_in_pvr= + esac + + if [[ -z "${_fixed_in_pvr}" ]] || version_is_at_least "${_fixed_in_pvr}" "${_replacing_version}"; then + # We are updating an installation where we already informed + # that we are mitigating HTTPoxy per default + _has_to_show_httpoxy_mitigation_notice=0 + debug-print "No need to inform about HTTPoxy mitigation ... information was already shown for existing installation!" + else + _has_to_show_httpoxy_mitigation_notice=1 + debug-print "Need to inform about HTTPoxy mitigation!" + fi + fi + + # Do we need to adjust permissions to fix CVE-2016-1247 (bug #605008)? + # All branches up to 1.11 are affected + local _need_to_fix_CVE2016_1247=1 - for rv in ${REPLACING_VERSIONS} ; do - version_compare ${rv} 1.4.1-r2 - [[ $? -eq 1 ]] && fix_perms=1 + if ! version_is_at_least "1.10" "${_replacing_version_branch}"; then + # Updating from <1.10 + _has_to_adjust_permissions=1 + debug-print "Need to adjust permissions to fix CVE-2016-1247!" + else + # Updating from >=1.10 + local _fixed_in_pvr= + case "${_replacing_version_branch}" in + "1.10") + _fixed_in_pvr="1.10.2-r3" + ;; + "1.11") + _fixed_in_pvr="1.11.6-r1" + ;; + *) + # This should be any future branch. + # If we run this code it is safe to assume that we have already + # adjusted permissions or were never affected because user is + # doing an update from previous version which was safe or did + # the adjustments. Otherwise, we wouldn't hit this code path ... + _fixed_in_pvr= + esac + + if [[ -z "${_fixed_in_pvr}" ]] || version_is_at_least "${_fixed_in_pvr}" "${_replacing_version}"; then + # We are updating an installation which should already be adjusted + # or which was never affected + _need_to_fix_CVE2016_1247=0 + debug-print "Skipping CVE-2016-1247 ... existing installation should not be affected!" + else + _has_to_adjust_permissions=1 + debug-print "Need to adjust permissions to fix CVE-2016-1247!" + fi + fi 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." + if [[ ${_has_to_adjust_permissions} -eq 1 ]]; then + # We do not DIE when chmod/chown commands are failing because + # package is already merged on user's system at this stage + # and we cannot retry without losing the information that + # the existing installation needs to adjust permissions. + # Instead we are going to a show a big warning ... + + if [[ ${_has_to_show_permission_warning} -eq 0 ]] && [[ ${_need_to_fix_CVE2013_0337} -eq 1 ]]; then + ewarn "" + ewarn "The world-readable bit (if set) has been removed from the" + ewarn "following directories to mitigate a security bug" + ewarn "(CVE-2013-0337, bug #458726):" + ewarn "" + ewarn " ${EPREFIX%/}/var/log/nginx" + ewarn " ${EPREFIX%/}${NGINX_HOME_TMP}/{,client,proxy,fastcgi,scgi,uwsgi}" + ewarn "" + 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 '${EPREFIX%/}${NGINX_HOME_TMP}'" + chmod o-rwx \ + "${EPREFIX%/}"/var/log/nginx \ + "${EPREFIX%/}"${NGINX_HOME_TMP}/{,client,proxy,fastcgi,scgi,uwsgi} || \ + _has_to_show_permission_warning=1 + fi + + if [[ ${_has_to_show_permission_warning} -eq 0 ]] && [[ ${_need_to_fix_CVE2016_1247} -eq 1 ]]; then + ewarn "" + ewarn "The permissions on the following directory have been reset in" + ewarn "order to mitigate a security bug (CVE-2016-1247, bug #605008):" + ewarn "" + ewarn " ${EPREFIX%/}/var/log/nginx" + ewarn "" + ewarn "Check if this is correct for your setup before restarting nginx!" + ewarn "Also ensure that no other log directory used by any of your" + ewarn "vhost(s) is not writeable for nginx user. Any of your log files" + ewarn "used by nginx can be abused to escalate privileges!" + ewarn "This is a one-time change and will not happen on subsequent updates." + chown 0:nginx "${EPREFIX%/}"/var/log/nginx || _has_to_show_permission_warning=1 + chmod 710 "${EPREFIX%/}"/var/log/nginx || _has_to_show_permission_warning=1 + fi + + if [[ ${_has_to_show_permission_warning} -eq 1 ]]; then + # Should never happen ... + ewarn "" + ewarn "*************************************************************" + ewarn "*************** W A R N I N G ***************" + ewarn "*************************************************************" + ewarn "The one-time only attempt to adjust permissions of the" + ewarn "existing nginx installation failed. Be aware that we will not" + ewarn "try to adjust the same permissions again because now you are" + ewarn "using a nginx version where we expect that the permissions" + ewarn "are already adjusted or that you know what you are doing and" + ewarn "want to keep custom permissions." + ewarn "" + fi + fi + + # Sanity check for CVE-2016-1247 + # Required to warn users who received the warning above and thought + # they could fix it by unmerging and re-merging the package or have + # unmerged a affected installation on purpose in the past leaving + # /var/log/nginx on their system due to keepdir/non-empty folder + # and are now installing the package again. + local _sanity_check_testfile=$(mktemp --dry-run "${EPREFIX%/}"/var/log/nginx/.CVE-2016-1247.XXXXXXXXX) + su -s /bin/sh -c "touch ${_sanity_check_testfile}" nginx >&/dev/null + if [ $? -eq 0 ] ; then + # Cleanup -- no reason to die here! + rm -f "${_sanity_check_testfile}" + + ewarn "" + ewarn "*************************************************************" + ewarn "*************** W A R N I N G ***************" + ewarn "*************************************************************" + ewarn "Looks like your installation is vulnerable to CVE-2016-1247" + ewarn "(bug #605008) because nginx user is able to create files in" + ewarn "" + ewarn " ${EPREFIX%/}/var/log/nginx" + ewarn "" + ewarn "Also ensure that no other log directory used by any of your" + ewarn "vhost(s) is not writeable for nginx user. Any of your log files" + ewarn "used by nginx can be abused to escalate privileges!" + fi + + if [[ ${_has_to_show_httpoxy_mitigation_notice} -eq 1 ]]; then + # HTTPoxy mitigation + ewarn "" + ewarn "This nginx installation comes with a mitigation for the HTTPoxy" + ewarn "vulnerability for FastCGI, SCGI and uWSGI applications by setting" + ewarn "the HTTP_PROXY parameter to an empty string per default when you" + ewarn "are sourcing one of the default" + ewarn "" + ewarn " - 'fastcgi_params' or 'fastcgi.conf'" + ewarn " - 'scgi_params'" + ewarn " - 'uwsgi_params'" + ewarn "" + ewarn "files 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 the file(s) mentioned above." + ewarn "" fi } diff --git a/www-servers/nginx/nginx-1.11.3-r100.ebuild b/www-servers/nginx/nginx-1.17.3-r100.ebuild index 351a943..a742359 100644 --- a/www-servers/nginx/nginx-1.11.3-r100.ebuild +++ b/www-servers/nginx/nginx-1.17.3-r100.ebuild @@ -1,8 +1,7 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -# $Id$ -EAPI=6 +EAPI="6" # Maintainer notes: # - http_rewrite-independent pcre-support makes sense for matching locations without an actual rewrite @@ -18,24 +17,30 @@ EAPI=6 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_PV="0.3.1" +DEVEL_KIT_MODULE_P="ngx_devel_kit-${DEVEL_KIT_MODULE_PV}" 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}" +# ngx_brotli (https://github.com/eustas/ngx_brotli, BSD-2) +HTTP_BROTLI_MODULE_PV="8104036af9cff4b1d34f22d00ba857e2a93a243c" +HTTP_BROTLI_MODULE_P="ngx_brotli-${HTTP_BROTLI_MODULE_PV}" +HTTP_BROTLI_MODULE_URI="https://github.com/eustas/ngx_brotli/archive/${HTTP_BROTLI_MODULE_PV}.tar.gz" +HTTP_BROTLI_MODULE_WD="${WORKDIR}/ngx_brotli-${HTTP_BROTLI_MODULE_PV}" + # http_uploadprogress (https://github.com/masterzen/nginx-upload-progress-module, BSD-2 license) -HTTP_UPLOAD_PROGRESS_MODULE_PV="0.9.1" +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.30" +HTTP_HEADERS_MORE_MODULE_PV="0.33" 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/, BSD-2 license) +# 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" @@ -48,13 +53,13 @@ HTTP_SLOWFS_CACHE_MODULE_URI="http://labs.frickle.com/files/ngx_slowfs_cache-${H 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.0" +HTTP_FANCYINDEX_MODULE_PV="0.4.3" 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.5" +HTTP_LUA_MODULE_PV="0.10.15" 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}" @@ -66,10 +71,10 @@ HTTP_AUTH_PAM_MODULE_URI="https://github.com/stogh/ngx_http_auth_pam_module/arch 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-g10782ea" +HTTP_UPSTREAM_CHECK_MODULE_PV="9aecf15ec379fe98f62355c57b60c0bc83296f04" 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-10782eaff51872a8f44e65eed89bbe286004bcb1" +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/zenops/ngx_metrics, BSD license) HTTP_METRICS_MODULE_PV="0.1.1" @@ -77,48 +82,54 @@ 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_vhost_traffic_status (https://github.com/vozlt/nginx-module-vts, BSD license) +HTTP_VHOST_TRAFFIC_STATUS_MODULE_PV="46d85558e344dfe2b078ce757fd36c69a1ec2dd3" +HTTP_VHOST_TRAFFIC_STATUS_MODULE_P="ngx_http_vhost_traffic_status-${HTTP_VHOST_TRAFFIC_STATUS_MODULE_PV}" +HTTP_VHOST_TRAFFIC_STATUS_MODULE_URI="https://github.com/vozlt/nginx-module-vts/archive/${HTTP_VHOST_TRAFFIC_STATUS_MODULE_PV}.tar.gz" +HTTP_VHOST_TRAFFIC_STATUS_MODULE_WD="${WORKDIR}/nginx-module-vts-${HTTP_VHOST_TRAFFIC_STATUS_MODULE_PV}" + # naxsi-core (https://github.com/nbs-system/naxsi, GPLv2+) -HTTP_NAXSI_MODULE_PV="0.54" +HTTP_NAXSI_MODULE_PV="0.56" 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.8" +RTMP_MODULE_PV="1.2.1" 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_PV="3.0.0" 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.59" +HTTP_ECHO_MODULE_PV="0.61" 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_PV="2.9.3" 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_PV="0.5.4" 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" +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-c78b7dd79d0d" +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" @@ -127,17 +138,29 @@ HTTP_MOGILEFS_MODULE_URI="https://github.com/vkholodkov/nginx-mogilefs-module/ar 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_PV="0.19" 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="dbcef31bebb2d54b6120422d0b178bbf78bc48f7" +HTTP_LDAP_MODULE_PV="42d195d7a7575ebab1c369ad3fc5d78dc2c2669c" 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}" +# geoip2 (https://github.com/leev/ngx_http_geoip2_module, BSD-2) +GEOIP2_MODULE_PV="3.2" +GEOIP2_MODULE_P="ngx_http_geoip2_module-${GEOIP2_MODULE_PV}" +GEOIP2_MODULE_URI="https://github.com/leev/ngx_http_geoip2_module/archive/${GEOIP2_MODULE_PV}.tar.gz" +GEOIP2_MODULE_WD="${WORKDIR}/ngx_http_geoip2_module-${GEOIP2_MODULE_PV}" + +# njs-module (https://github.com/nginx/njs, as-is) +NJS_MODULE_PV="0.3.5" +NJS_MODULE_P="njs-${NJS_MODULE_PV}" +NJS_MODULE_URI="https://github.com/nginx/njs/archive/${NJS_MODULE_PV}.tar.gz" +NJS_MODULE_WD="${WORKDIR}/njs-${NJS_MODULE_PV}" + HTTP_XSLTPROC_MODULE_PV="0.16" HTTP_XSLTPROC_MODULE_P="ngx_xsltproc-${HTTP_XSLTPROC_MODULE_PV}" HTTP_XSLTPROC_MODULE_URI="https://github.com/yoreek/nginx-xsltproc-module/archive/v${HTTP_XSLTPROC_MODULE_PV}.tar.gz" @@ -145,32 +168,39 @@ HTTP_XSLTPROC_MODULE_WD="${WORKDIR}/nginx-xsltproc-module-${HTTP_XSLTPROC_MODULE # We handle deps below ourselves SSL_DEPS_SKIP=1 +AUTOTOOLS_AUTO_DEPEND="no" -inherit ssl-cert toolchain-funcs perl-module flag-o-matic user systemd versionator multilib +inherit autotools ssl-cert toolchain-funcs perl-module flag-o-matic user systemd versionator multilib pax-utils DESCRIPTION="Robust, small and high performance http and reverse proxy server" -HOMEPAGE="http://nginx.org" -SRC_URI="http://nginx.org/download/${P}.tar.gz +HOMEPAGE="https://nginx.org" +SRC_URI="https://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_auth_ldap? ( ${HTTP_LDAP_MODULE_URI} -> ${HTTP_LDAP_MODULE_P}.tar.gz ) + nginx_modules_http_auth_pam? ( ${HTTP_AUTH_PAM_MODULE_URI} -> ${HTTP_AUTH_PAM_MODULE_P}.tar.gz ) + nginx_modules_http_brotli? ( ${HTTP_BROTLI_MODULE_URI} -> ${HTTP_BROTLI_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_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_fancyindex? ( ${HTTP_FANCYINDEX_MODULE_URI} -> ${HTTP_FANCYINDEX_MODULE_P}.tar.gz ) + nginx_modules_http_geoip2? ( ${GEOIP2_MODULE_URI} -> ${GEOIP2_MODULE_P}.tar.gz ) + nginx_modules_http_headers_more? ( ${HTTP_HEADERS_MORE_MODULE_URI} -> ${HTTP_HEADERS_MORE_MODULE_P}.tar.gz ) + nginx_modules_http_javascript? ( ${NJS_MODULE_URI} -> ${NJS_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_memc? ( ${HTTP_MEMC_MODULE_URI} -> ${HTTP_MEMC_MODULE_P}.tar.gz ) nginx_modules_http_metrics? ( ${HTTP_METRICS_MODULE_URI} -> ${HTTP_METRICS_MODULE_P}.tar.gz ) + nginx_modules_http_mogilefs? ( ${HTTP_MOGILEFS_MODULE_URI} -> ${HTTP_MOGILEFS_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_security? ( ${HTTP_SECURITY_MODULE_URI} -> ${HTTP_SECURITY_MODULE_P}.tar.gz ) + nginx_modules_http_slowfs_cache? ( ${HTTP_SLOWFS_CACHE_MODULE_URI} -> ${HTTP_SLOWFS_CACHE_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 ) + nginx_modules_http_upload_progress? ( ${HTTP_UPLOAD_PROGRESS_MODULE_URI} -> ${HTTP_UPLOAD_PROGRESS_MODULE_P}.tar.gz ) + nginx_modules_http_upstream_check? ( ${HTTP_UPSTREAM_CHECK_MODULE_URI} -> ${HTTP_UPSTREAM_CHECK_MODULE_P}.tar.gz ) + nginx_modules_http_vhost_traffic_status? ( ${HTTP_VHOST_TRAFFIC_STATUS_MODULE_URI} -> ${HTTP_VHOST_TRAFFIC_STATUS_MODULE_P}.tar.gz ) + nginx_modules_stream_geoip2? ( ${GEOIP2_MODULE_URI} -> ${GEOIP2_MODULE_P}.tar.gz ) + nginx_modules_stream_javascript? ( ${NJS_MODULE_URI} -> ${NJS_MODULE_P}.tar.gz ) + rtmp? ( ${RTMP_MODULE_URI} -> ${RTMP_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 GPL-2+ @@ -178,41 +208,52 @@ LICENSE="BSD-2 BSD SSLeay MIT GPL-2 GPL-2+ nginx_modules_http_push_stream? ( GPL-3 )" SLOT="mainline" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux" + +# Package doesn't provide a real test suite +RESTRICT="test" 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" + fastcgi geo grpc gzip limit_req limit_conn map memcached mirror + 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" + 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" +NGINX_MODULES_STREAM_OPT="geoip realip ssl_preread" NGINX_MODULES_MAIL="imap pop3 smtp" NGINX_MODULES_3RD=" - http_upload_progress - http_headers_more + http_auth_ldap + http_auth_pam + http_brotli http_cache_purge - http_slowfs_cache + http_dav_ext + http_echo http_fancyindex + http_geoip2 + http_headers_more + http_javascript http_lua - http_auth_pam - http_upstream_check + http_memc http_metrics + http_mogilefs http_naxsi - http_dav_ext - http_echo - http_security http_push_stream + http_security + http_slowfs_cache http_sticky - http_mogilefs - http_memc - http_auth_ldap - http_xsltproc" + http_upload_progress + http_upstream_check + http_vhost_traffic_status + stream_geoip2 + stream_javascript + http_xsltproc +" -IUSE="aio debug +http +http2 +http-cache ipv6 libatomic libressl luajit +pcre +IUSE="aio debug +http +http2 +http-cache +ipv6 libatomic libressl luajit +pcre pcre-jit rtmp selinux ssl threads userland_GNU vim-syntax +nginx_modules_http_xsltproc xsltproc-memcached" for mod in $NGINX_MODULES_STD; do @@ -244,8 +285,8 @@ done IUSE="${IUSE} nginx_modules_http_spdy" CDEPEND=" - pcre? ( >=dev-libs/libpcre-4.2 ) - pcre-jit? ( >=dev-libs/libpcre-8.20[jit] ) + pcre? ( dev-libs/libpcre:= ) + pcre-jit? ( dev-libs/libpcre:=[jit] ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) @@ -260,37 +301,54 @@ CDEPEND=" libressl? ( dev-libs/libressl:= ) ) ) + nginx_modules_http_brotli? ( app-arch/brotli:= ) nginx_modules_http_geoip? ( dev-libs/geoip ) + nginx_modules_http_geoip2? ( dev-libs/libmaxminddb:= ) 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_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_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/libxml2-2.7.8 dev-libs/apr-util www-servers/apache ) + nginx_modules_http_xslt? ( dev-libs/libxml2:= dev-libs/libxslt ) + nginx_modules_http_lua? ( dev-lang/luajit:2= ) + nginx_modules_http_auth_pam? ( sys-libs/pam ) + nginx_modules_http_metrics? ( dev-libs/yajl:= ) + nginx_modules_http_dav_ext? ( dev-libs/libxml2 ) + 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?] ) + nginx_modules_stream_geoip? ( dev-libs/geoip ) + nginx_modules_stream_geoip2? ( dev-libs/libmaxminddb:= ) nginx_modules_http_xsltproc? ( dev-libs/libxml2 dev-libs/libxslt dev-libs/icu ) xsltproc-memcached? ( dev-libs/libmemcached )" RDEPEND="${CDEPEND} selinux? ( sec-policy/selinux-nginx ) !www-servers/nginx:0" DEPEND="${CDEPEND} + nginx_modules_http_brotli? ( virtual/pkgconfig ) + 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_grpc? ( http2 ) + nginx_modules_http_lua? ( + luajit + 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 ) @@ -335,20 +393,47 @@ pkg_setup() { src_prepare() { eapply "${FILESDIR}/${PN}-1.4.1-fix-perl-install-path.patch" eapply "${FILESDIR}/${PN}-httpoxy-mitigation-r1.patch" - eapply "${FILESDIR}/${PN}-1.11.3-fix-build-without-stream_ssl_module.patch" - if use nginx_modules_http_sticky; then - cd "${HTTP_STICKY_MODULE_WD}" || die - eapply "${FILESDIR}"/http-sticky-nginx-1.11.2.patch + if use nginx_modules_http_auth_pam; then + cd "${HTTP_AUTH_PAM_MODULE_WD}" || die + eapply "${FILESDIR}"/http_auth_pam-1.5.1-adjust-loglevel-for-authentication-failures.patch + cd "${S}" || die + fi + + if use nginx_modules_http_brotli; then + cd "${HTTP_BROTLI_MODULE_WD}" || die + eapply "${FILESDIR}"/http_brotli-detect-brotli-r2.patch cd "${S}" || die fi if use nginx_modules_http_upstream_check; then - eapply -p0 "${HTTP_UPSTREAM_CHECK_MODULE_WD}/check_1.9.2+".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 + if use nginx_modules_http_cache_purge; then + cd "${HTTP_CACHE_PURGE_MODULE_WD}" || die + eapply "${FILESDIR}"/http_cache_purge-1.11.6+.patch + cd "${S}" || die + fi + + if use nginx_modules_http_security; then + cd "${HTTP_SECURITY_MODULE_WD}" || die + + 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 find auto/ -type f -print0 | xargs -0 sed -i 's:\&\& make:\&\& \\$(MAKE):' || die @@ -376,25 +461,22 @@ 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 - if use luajit ; then - sed -i \ - -e 's|^\(LUA_PKGNAMES\)=.*|\1="luajit"|' \ - configure || die - fi + ./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" - fi - cd "${S}" || die + 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 ipv6 && myconf+=( --with-ipv6 ) use libatomic && myconf+=( --with-libatomic ) use pcre && myconf+=( --with-pcre ) use pcre-jit && myconf+=( --with-pcre-jit ) @@ -448,13 +530,8 @@ src_configure() { 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 + export LUAJIT_LIB=$(pkg-config --variable libdir luajit) + export LUAJIT_INC=$(pkg-config --variable includedir luajit) myconf+=( --add-module=${DEVEL_KIT_MODULE_WD} ) myconf+=( --add-module=${HTTP_LUA_MODULE_WD} ) fi @@ -524,12 +601,30 @@ src_configure() { myconf+=( --add-module=${HTTP_LDAP_MODULE_WD} ) fi + if use nginx_modules_http_vhost_traffic_status; then + http_enabled=1 + myconf+=( --add-module=${HTTP_VHOST_TRAFFIC_STATUS_MODULE_WD} ) + fi + + if use nginx_modules_http_geoip2 || use nginx_modules_stream_geoip2; then + myconf+=( --add-module=${GEOIP2_MODULE_WD} ) + fi + + if use nginx_modules_http_javascript || use nginx_modules_stream_javascript; then + myconf+=( --add-module="${NJS_MODULE_WD}/nginx" ) + fi + + if use nginx_modules_http_brotli; then + http_enabled=1 + myconf+=( --add-module=${HTTP_BROTLI_MODULE_WD} ) + fi + if use nginx_modules_http_xsltproc; then http_enabled=1 myconf+=( --add-module=${HTTP_XSLTPROC_MODULE_WD} ) fi - if use http || use http-cache || use http2; then + if use http || use http-cache || use http2 || use nginx_modules_http_javascript; then http_enabled=1 fi @@ -556,6 +651,10 @@ src_configure() { fi done + if use nginx_modules_stream_geoip2 || use nginx_modules_stream_javascript; then + stream_enabled=1 + fi + if [ $stream_enabled ]; then myconf+=( --with-stream ) use ssl && myconf+=( --with-stream_ssl_module ) @@ -589,13 +688,23 @@ src_configure() { myconf+=( --group=${PN} ) fi + local WITHOUT_IPV6= + if ! use ipv6; then + WITHOUT_IPV6=" -DNGX_HAVE_INET6=0" + fi + + if [[ -n "${EXTRA_ECONF}" ]]; then + myconf+=( ${EXTRA_ECONF} ) + ewarn "EXTRA_ECONF applied. Now you are on your own, good luck!" + 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-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 \ @@ -603,6 +712,7 @@ src_configure() { --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 @@ -624,7 +734,8 @@ src_install() { cp "${FILESDIR}"/nginx.conf-r2 "${ED}"etc/nginx/nginx.conf || die - newinitd "${FILESDIR}"/nginx.initd-r3 nginx + newinitd "${FILESDIR}"/nginx.initd-r4 nginx + newconfd "${FILESDIR}"/nginx.confd nginx systemd_newunit "${FILESDIR}"/nginx.service-r1 nginx.service @@ -649,13 +760,20 @@ src_install() { 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} + fperms 0700 ${keepdir_list} + fowners ${PN}:${PN} ${keepdir_list} + + fperms 0710 /var/log/nginx + fowners 0:${PN} /var/log/nginx # logrotate insinto /etc/logrotate.d newins "${FILESDIR}"/nginx.logrotate-r1 nginx + if use luajit; then + pax-mark m "${ED%/}/usr/sbin/nginx" + fi + if use nginx_modules_http_perl; then cd "${S}"/objs/src/http/modules/perl/ || die emake DESTDIR="${D}" INSTALLDIRS=vendor @@ -680,7 +798,7 @@ src_install() { if use nginx_modules_http_lua; then docinto ${HTTP_LUA_MODULE_P} - dodoc "${HTTP_LUA_MODULE_WD}"/{Changes,README.markdown} + dodoc "${HTTP_LUA_MODULE_WD}"/README.markdown fi if use nginx_modules_http_auth_pam; then @@ -705,7 +823,7 @@ src_install() { if use nginx_modules_http_dav_ext; then docinto ${HTTP_DAV_EXT_MODULE_P} - dodoc "${HTTP_DAV_EXT_MODULE_WD}"/README + dodoc "${HTTP_DAV_EXT_MODULE_WD}"/README.rst fi if use nginx_modules_http_echo; then @@ -715,7 +833,7 @@ src_install() { if use nginx_modules_http_security; then docinto ${HTTP_SECURITY_MODULE_P} - dodoc "${HTTP_SECURITY_MODULE_WD}"/{CHANGES,README.TXT,authors.txt} + dodoc "${HTTP_SECURITY_MODULE_WD}"/{CHANGES,README.md,authors.txt} fi if use nginx_modules_http_push_stream; then @@ -748,53 +866,243 @@ pkg_postinst() { fi if use nginx_modules_http_spdy; then + ewarn "" 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; then + ewarn "" + ewarn "While you can build lua 3rd party module against ${P}" + ewarn "the author warns that >=${PN}-1.11.11 is still not an" + ewarn "officially supported target yet. You are on your own." + ewarn "Expect runtime failures, memory leaks and other problems!" + fi + if use nginx_modules_http_lua && use http2; then + ewarn "" 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" + ewarn "NGINX_MODULES_HTTP=\"lua http2\". For more info, see https://git.io/OldLsg" fi - # This is the proper fix for bug #458726/#469094, resp. CVE-2013-0337 for - # existing installations - local fix_perms=0 + local _n_permission_layout_checks=0 + local _has_to_adjust_permissions=0 + local _has_to_show_permission_warning=0 + + # Defaults to 1 to inform people doing a fresh installation + # that we ship modified {scgi,uwsgi,fastcgi}_params files + local _has_to_show_httpoxy_mitigation_notice=1 + + local _replacing_version= + for _replacing_version in ${REPLACING_VERSIONS}; do + _n_permission_layout_checks=$((${_n_permission_layout_checks}+1)) + + if [[ ${_n_permission_layout_checks} -gt 1 ]]; then + # Should never happen: + # Package is abusing slots but doesn't allow multiple parallel installations. + # If we run into this situation it is unsafe to automatically adjust any + # permission... + _has_to_show_permission_warning=1 + + ewarn "Replacing multiple ${PN}' versions is unsupported! " \ + "You will have to adjust permissions on your own." + + break + fi + + local _replacing_version_branch=$(get_version_component_range 1-2 "${_replacing_version}") + debug-print "Updating an existing installation (v${_replacing_version}; branch '${_replacing_version_branch}') ..." + + # Do we need to adjust permissions to fix CVE-2013-0337 (bug #458726, #469094)? + # This was before we introduced multiple nginx versions so we + # do not need to distinguish between stable and mainline + local _need_to_fix_CVE2013_0337=1 + + if version_is_at_least "1.4.1-r2" "${_replacing_version}"; then + # We are updating an installation which should already be fixed + _need_to_fix_CVE2013_0337=0 + debug-print "Skipping CVE-2013-0337 ... existing installation should not be affected!" + else + _has_to_adjust_permissions=1 + debug-print "Need to adjust permissions to fix CVE-2013-0337!" + fi + + # Do we need to inform about HTTPoxy mitigation? + # In repository since commit 8be44f76d4ac02cebcd1e0e6e6284bb72d054b0f + if ! version_is_at_least "1.10" "${_replacing_version_branch}"; then + # Updating from <1.10 + _has_to_show_httpoxy_mitigation_notice=1 + debug-print "Need to inform about HTTPoxy mitigation!" + else + # Updating from >=1.10 + local _fixed_in_pvr= + case "${_replacing_version_branch}" in + "1.10") + _fixed_in_pvr="1.10.1-r2" + ;; + "1.11") + _fixed_in_pvr="1.11.3-r1" + ;; + *) + # This should be any future branch. + # If we run this code it is safe to assume that the user has + # already seen the HTTPoxy mitigation notice because he/she is doing + # an update from previous version where we have already shown + # the warning. Otherwise, we wouldn't hit this code path ... + _fixed_in_pvr= + esac + + if [[ -z "${_fixed_in_pvr}" ]] || version_is_at_least "${_fixed_in_pvr}" "${_replacing_version}"; then + # We are updating an installation where we already informed + # that we are mitigating HTTPoxy per default + _has_to_show_httpoxy_mitigation_notice=0 + debug-print "No need to inform about HTTPoxy mitigation ... information was already shown for existing installation!" + else + _has_to_show_httpoxy_mitigation_notice=1 + debug-print "Need to inform about HTTPoxy mitigation!" + fi + fi + + # Do we need to adjust permissions to fix CVE-2016-1247 (bug #605008)? + # All branches up to 1.11 are affected + local _need_to_fix_CVE2016_1247=1 - for rv in ${REPLACING_VERSIONS}; do - version_compare ${rv} 1.4.1-r2 - [[ $? -eq 1 ]] && fix_perms=1 + if ! version_is_at_least "1.10" "${_replacing_version_branch}"; then + # Updating from <1.10 + _has_to_adjust_permissions=1 + debug-print "Need to adjust permissions to fix CVE-2016-1247!" + else + # Updating from >=1.10 + local _fixed_in_pvr= + case "${_replacing_version_branch}" in + "1.10") + _fixed_in_pvr="1.10.2-r3" + ;; + "1.11") + _fixed_in_pvr="1.11.6-r1" + ;; + *) + # This should be any future branch. + # If we run this code it is safe to assume that we have already + # adjusted permissions or were never affected because user is + # doing an update from previous version which was safe or did + # the adjustments. Otherwise, we wouldn't hit this code path ... + _fixed_in_pvr= + esac + + if [[ -z "${_fixed_in_pvr}" ]] || version_is_at_least "${_fixed_in_pvr}" "${_replacing_version}"; then + # We are updating an installation which should already be adjusted + # or which was never affected + _need_to_fix_CVE2016_1247=0 + debug-print "Skipping CVE-2016-1247 ... existing installation should not be affected!" + else + _has_to_adjust_permissions=1 + debug-print "Need to adjust permissions to fix CVE-2016-1247!" + fi + fi 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'." + if [[ ${_has_to_adjust_permissions} -eq 1 ]]; then + # We do not DIE when chmod/chown commands are failing because + # package is already merged on user's system at this stage + # and we cannot retry without losing the information that + # the existing installation needs to adjust permissions. + # Instead we are going to a show a big warning ... + + if [[ ${_has_to_show_permission_warning} -eq 0 ]] && [[ ${_need_to_fix_CVE2013_0337} -eq 1 ]]; then + ewarn "" + ewarn "The world-readable bit (if set) has been removed from the" + ewarn "following directories to mitigate a security bug" + ewarn "(CVE-2013-0337, bug #458726):" + ewarn "" + ewarn " ${EPREFIX%/}/var/log/nginx" + ewarn " ${EPREFIX%/}${NGINX_HOME_TMP}/{,client,proxy,fastcgi,scgi,uwsgi}" + ewarn "" + 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 '${EPREFIX%/}${NGINX_HOME_TMP}'" + chmod o-rwx \ + "${EPREFIX%/}"/var/log/nginx \ + "${EPREFIX%/}"${NGINX_HOME_TMP}/{,client,proxy,fastcgi,scgi,uwsgi} || \ + _has_to_show_permission_warning=1 + fi + + if [[ ${_has_to_show_permission_warning} -eq 0 ]] && [[ ${_need_to_fix_CVE2016_1247} -eq 1 ]]; then + ewarn "" + ewarn "The permissions on the following directory have been reset in" + ewarn "order to mitigate a security bug (CVE-2016-1247, bug #605008):" + ewarn "" + ewarn " ${EPREFIX%/}/var/log/nginx" + ewarn "" + ewarn "Check if this is correct for your setup before restarting nginx!" + ewarn "Also ensure that no other log directory used by any of your" + ewarn "vhost(s) is not writeable for nginx user. Any of your log files" + ewarn "used by nginx can be abused to escalate privileges!" + ewarn "This is a one-time change and will not happen on subsequent updates." + chown 0:nginx "${EPREFIX%/}"/var/log/nginx || _has_to_show_permission_warning=1 + chmod 710 "${EPREFIX%/}"/var/log/nginx || _has_to_show_permission_warning=1 + fi + + if [[ ${_has_to_show_permission_warning} -eq 1 ]]; then + # Should never happen ... + ewarn "" + ewarn "*************************************************************" + ewarn "*************** W A R N I N G ***************" + ewarn "*************************************************************" + ewarn "The one-time only attempt to adjust permissions of the" + ewarn "existing nginx installation failed. Be aware that we will not" + ewarn "try to adjust the same permissions again because now you are" + ewarn "using a nginx version where we expect that the permissions" + ewarn "are already adjusted or that you know what you are doing and" + ewarn "want to keep custom permissions." + ewarn "" + fi + fi + + # Sanity check for CVE-2016-1247 + # Required to warn users who received the warning above and thought + # they could fix it by unmerging and re-merging the package or have + # unmerged a affected installation on purpose in the past leaving + # /var/log/nginx on their system due to keepdir/non-empty folder + # and are now installing the package again. + local _sanity_check_testfile=$(mktemp --dry-run "${EPREFIX%/}"/var/log/nginx/.CVE-2016-1247.XXXXXXXXX) + su -s /bin/sh -c "touch ${_sanity_check_testfile}" nginx >&/dev/null + if [ $? -eq 0 ] ; then + # Cleanup -- no reason to die here! + rm -f "${_sanity_check_testfile}" + + ewarn "" + ewarn "*************************************************************" + ewarn "*************** W A R N I N G ***************" + ewarn "*************************************************************" + ewarn "Looks like your installation is vulnerable to CVE-2016-1247" + ewarn "(bug #605008) because nginx user is able to create files in" + ewarn "" + ewarn " ${EPREFIX%/}/var/log/nginx" + ewarn "" + ewarn "Also ensure that no other log directory used by any of your" + ewarn "vhost(s) is not writeable for nginx user. Any of your log files" + ewarn "used by nginx can be abused to escalate privileges!" + fi + + if [[ ${_has_to_show_httpoxy_mitigation_notice} -eq 1 ]]; then + # HTTPoxy mitigation + ewarn "" + ewarn "This nginx installation comes with a mitigation for the HTTPoxy" + ewarn "vulnerability for FastCGI, SCGI and uWSGI applications by setting" + ewarn "the HTTP_PROXY parameter to an empty string per default when you" + ewarn "are sourcing one of the default" + ewarn "" + ewarn " - 'fastcgi_params' or 'fastcgi.conf'" + ewarn " - 'scgi_params'" + ewarn " - 'uwsgi_params'" + ewarn "" + ewarn "files 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 the file(s) mentioned above." + ewarn "" + fi } diff --git a/www-servers/nginx/nginx-1.17.4-r100.ebuild b/www-servers/nginx/nginx-1.17.4-r100.ebuild new file mode 100644 index 0000000..a742359 --- /dev/null +++ b/www-servers/nginx/nginx-1.17.4-r100.ebuild @@ -0,0 +1,1108 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +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.1" +DEVEL_KIT_MODULE_P="ngx_devel_kit-${DEVEL_KIT_MODULE_PV}" +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}" + +# ngx_brotli (https://github.com/eustas/ngx_brotli, BSD-2) +HTTP_BROTLI_MODULE_PV="8104036af9cff4b1d34f22d00ba857e2a93a243c" +HTTP_BROTLI_MODULE_P="ngx_brotli-${HTTP_BROTLI_MODULE_PV}" +HTTP_BROTLI_MODULE_URI="https://github.com/eustas/ngx_brotli/archive/${HTTP_BROTLI_MODULE_PV}.tar.gz" +HTTP_BROTLI_MODULE_WD="${WORKDIR}/ngx_brotli-${HTTP_BROTLI_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.33" +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.3" +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.15" +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="9aecf15ec379fe98f62355c57b60c0bc83296f04" +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/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}" + +# http_vhost_traffic_status (https://github.com/vozlt/nginx-module-vts, BSD license) +HTTP_VHOST_TRAFFIC_STATUS_MODULE_PV="46d85558e344dfe2b078ce757fd36c69a1ec2dd3" +HTTP_VHOST_TRAFFIC_STATUS_MODULE_P="ngx_http_vhost_traffic_status-${HTTP_VHOST_TRAFFIC_STATUS_MODULE_PV}" +HTTP_VHOST_TRAFFIC_STATUS_MODULE_URI="https://github.com/vozlt/nginx-module-vts/archive/${HTTP_VHOST_TRAFFIC_STATUS_MODULE_PV}.tar.gz" +HTTP_VHOST_TRAFFIC_STATUS_MODULE_WD="${WORKDIR}/nginx-module-vts-${HTTP_VHOST_TRAFFIC_STATUS_MODULE_PV}" + +# naxsi-core (https://github.com/nbs-system/naxsi, GPLv2+) +HTTP_NAXSI_MODULE_PV="0.56" +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.2.1" +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="3.0.0" +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.61" +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.3" +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.4" +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.19" +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="42d195d7a7575ebab1c369ad3fc5d78dc2c2669c" +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}" + +# geoip2 (https://github.com/leev/ngx_http_geoip2_module, BSD-2) +GEOIP2_MODULE_PV="3.2" +GEOIP2_MODULE_P="ngx_http_geoip2_module-${GEOIP2_MODULE_PV}" +GEOIP2_MODULE_URI="https://github.com/leev/ngx_http_geoip2_module/archive/${GEOIP2_MODULE_PV}.tar.gz" +GEOIP2_MODULE_WD="${WORKDIR}/ngx_http_geoip2_module-${GEOIP2_MODULE_PV}" + +# njs-module (https://github.com/nginx/njs, as-is) +NJS_MODULE_PV="0.3.5" +NJS_MODULE_P="njs-${NJS_MODULE_PV}" +NJS_MODULE_URI="https://github.com/nginx/njs/archive/${NJS_MODULE_PV}.tar.gz" +NJS_MODULE_WD="${WORKDIR}/njs-${NJS_MODULE_PV}" + +HTTP_XSLTPROC_MODULE_PV="0.16" +HTTP_XSLTPROC_MODULE_P="ngx_xsltproc-${HTTP_XSLTPROC_MODULE_PV}" +HTTP_XSLTPROC_MODULE_URI="https://github.com/yoreek/nginx-xsltproc-module/archive/v${HTTP_XSLTPROC_MODULE_PV}.tar.gz" +HTTP_XSLTPROC_MODULE_WD="${WORKDIR}/nginx-xsltproc-module-${HTTP_XSLTPROC_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 pax-utils + +DESCRIPTION="Robust, small and high performance http and reverse proxy server" +HOMEPAGE="https://nginx.org" +SRC_URI="https://nginx.org/download/${P}.tar.gz + ${DEVEL_KIT_MODULE_URI} -> ${DEVEL_KIT_MODULE_P}.tar.gz + nginx_modules_http_auth_ldap? ( ${HTTP_LDAP_MODULE_URI} -> ${HTTP_LDAP_MODULE_P}.tar.gz ) + nginx_modules_http_auth_pam? ( ${HTTP_AUTH_PAM_MODULE_URI} -> ${HTTP_AUTH_PAM_MODULE_P}.tar.gz ) + nginx_modules_http_brotli? ( ${HTTP_BROTLI_MODULE_URI} -> ${HTTP_BROTLI_MODULE_P}.tar.gz ) + nginx_modules_http_cache_purge? ( ${HTTP_CACHE_PURGE_MODULE_URI} -> ${HTTP_CACHE_PURGE_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_fancyindex? ( ${HTTP_FANCYINDEX_MODULE_URI} -> ${HTTP_FANCYINDEX_MODULE_P}.tar.gz ) + nginx_modules_http_geoip2? ( ${GEOIP2_MODULE_URI} -> ${GEOIP2_MODULE_P}.tar.gz ) + nginx_modules_http_headers_more? ( ${HTTP_HEADERS_MORE_MODULE_URI} -> ${HTTP_HEADERS_MORE_MODULE_P}.tar.gz ) + nginx_modules_http_javascript? ( ${NJS_MODULE_URI} -> ${NJS_MODULE_P}.tar.gz ) + nginx_modules_http_lua? ( ${HTTP_LUA_MODULE_URI} -> ${HTTP_LUA_MODULE_P}.tar.gz ) + nginx_modules_http_memc? ( ${HTTP_MEMC_MODULE_URI} -> ${HTTP_MEMC_MODULE_P}.tar.gz ) + nginx_modules_http_metrics? ( ${HTTP_METRICS_MODULE_URI} -> ${HTTP_METRICS_MODULE_P}.tar.gz ) + nginx_modules_http_mogilefs? ( ${HTTP_MOGILEFS_MODULE_URI} -> ${HTTP_MOGILEFS_MODULE_P}.tar.gz ) + nginx_modules_http_naxsi? ( ${HTTP_NAXSI_MODULE_URI} -> ${HTTP_NAXSI_MODULE_P}.tar.gz ) + nginx_modules_http_push_stream? ( ${HTTP_PUSH_STREAM_MODULE_URI} -> ${HTTP_PUSH_STREAM_MODULE_P}.tar.gz ) + nginx_modules_http_security? ( ${HTTP_SECURITY_MODULE_URI} -> ${HTTP_SECURITY_MODULE_P}.tar.gz ) + nginx_modules_http_slowfs_cache? ( ${HTTP_SLOWFS_CACHE_MODULE_URI} -> ${HTTP_SLOWFS_CACHE_MODULE_P}.tar.gz ) + nginx_modules_http_sticky? ( ${HTTP_STICKY_MODULE_URI} -> ${HTTP_STICKY_MODULE_P}.tar.bz2 ) + nginx_modules_http_upload_progress? ( ${HTTP_UPLOAD_PROGRESS_MODULE_URI} -> ${HTTP_UPLOAD_PROGRESS_MODULE_P}.tar.gz ) + nginx_modules_http_upstream_check? ( ${HTTP_UPSTREAM_CHECK_MODULE_URI} -> ${HTTP_UPSTREAM_CHECK_MODULE_P}.tar.gz ) + nginx_modules_http_vhost_traffic_status? ( ${HTTP_VHOST_TRAFFIC_STATUS_MODULE_URI} -> ${HTTP_VHOST_TRAFFIC_STATUS_MODULE_P}.tar.gz ) + nginx_modules_stream_geoip2? ( ${GEOIP2_MODULE_URI} -> ${GEOIP2_MODULE_P}.tar.gz ) + nginx_modules_stream_javascript? ( ${NJS_MODULE_URI} -> ${NJS_MODULE_P}.tar.gz ) + rtmp? ( ${RTMP_MODULE_URI} -> ${RTMP_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 GPL-2+ + nginx_modules_http_security? ( Apache-2.0 ) + nginx_modules_http_push_stream? ( GPL-3 )" + +SLOT="mainline" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux" + +# Package doesn't provide a real test suite +RESTRICT="test" + +NGINX_MODULES_STD="access auth_basic autoindex browser charset empty_gif + fastcgi geo grpc gzip limit_req limit_conn map memcached mirror + 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_auth_ldap + http_auth_pam + http_brotli + http_cache_purge + http_dav_ext + http_echo + http_fancyindex + http_geoip2 + http_headers_more + http_javascript + http_lua + http_memc + http_metrics + http_mogilefs + http_naxsi + http_push_stream + http_security + http_slowfs_cache + http_sticky + http_upload_progress + http_upstream_check + http_vhost_traffic_status + stream_geoip2 + stream_javascript + http_xsltproc +" + +IUSE="aio debug +http +http2 +http-cache +ipv6 libatomic libressl luajit +pcre + pcre-jit rtmp selinux ssl threads userland_GNU vim-syntax +nginx_modules_http_xsltproc xsltproc-memcached" + +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_brotli? ( app-arch/brotli:= ) + nginx_modules_http_geoip? ( dev-libs/geoip ) + nginx_modules_http_geoip2? ( dev-libs/libmaxminddb:= ) + 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? ( dev-lang/luajit:2= ) + nginx_modules_http_auth_pam? ( sys-libs/pam ) + nginx_modules_http_metrics? ( dev-libs/yajl:= ) + nginx_modules_http_dav_ext? ( dev-libs/libxml2 ) + 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?] ) + nginx_modules_stream_geoip? ( dev-libs/geoip ) + nginx_modules_stream_geoip2? ( dev-libs/libmaxminddb:= ) + nginx_modules_http_xsltproc? ( dev-libs/libxml2 dev-libs/libxslt dev-libs/icu ) + xsltproc-memcached? ( dev-libs/libmemcached )" +RDEPEND="${CDEPEND} + selinux? ( sec-policy/selinux-nginx ) + !www-servers/nginx:0" +DEPEND="${CDEPEND} + nginx_modules_http_brotli? ( virtual/pkgconfig ) + 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_grpc? ( http2 ) + nginx_modules_http_lua? ( + luajit + 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 ) + xsltproc-memcached? ( nginx_modules_http_xsltproc )" + +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_auth_pam; then + cd "${HTTP_AUTH_PAM_MODULE_WD}" || die + eapply "${FILESDIR}"/http_auth_pam-1.5.1-adjust-loglevel-for-authentication-failures.patch + cd "${S}" || die + fi + + if use nginx_modules_http_brotli; then + cd "${HTTP_BROTLI_MODULE_WD}" || die + eapply "${FILESDIR}"/http_brotli-detect-brotli-r2.patch + cd "${S}" || die + fi + + if use nginx_modules_http_upstream_check; then + eapply -p0 "${FILESDIR}"/http_upstream_check-nginx-1.11.5+.patch + fi + + if use nginx_modules_http_cache_purge; then + cd "${HTTP_CACHE_PURGE_MODULE_WD}" || die + eapply "${FILESDIR}"/http_cache_purge-1.11.6+.patch + cd "${S}" || die + fi + + if use nginx_modules_http_security; then + cd "${HTTP_SECURITY_MODULE_WD}" || die + + 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 + + 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 + + if use xsltproc-memcached; then + sed -i -e 's/LIBMEMCACHED_ENABLED=no/LIBMEMCACHED_ENABLED=yes/' "${HTTP_XSLTPROC_MODULE_WD}/config" || die + fi + + 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 + export LUAJIT_LIB=$(pkg-config --variable libdir luajit) + export LUAJIT_INC=$(pkg-config --variable includedir luajit) + 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 nginx_modules_http_vhost_traffic_status; then + http_enabled=1 + myconf+=( --add-module=${HTTP_VHOST_TRAFFIC_STATUS_MODULE_WD} ) + fi + + if use nginx_modules_http_geoip2 || use nginx_modules_stream_geoip2; then + myconf+=( --add-module=${GEOIP2_MODULE_WD} ) + fi + + if use nginx_modules_http_javascript || use nginx_modules_stream_javascript; then + myconf+=( --add-module="${NJS_MODULE_WD}/nginx" ) + fi + + if use nginx_modules_http_brotli; then + http_enabled=1 + myconf+=( --add-module=${HTTP_BROTLI_MODULE_WD} ) + fi + + if use nginx_modules_http_xsltproc; then + http_enabled=1 + myconf+=( --add-module=${HTTP_XSLTPROC_MODULE_WD} ) + fi + + if use http || use http-cache || use http2 || use nginx_modules_http_javascript; 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 use nginx_modules_stream_geoip2 || use nginx_modules_stream_javascript; then + stream_enabled=1 + fi + + 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 + + if [[ -n "${EXTRA_ECONF}" ]]; then + myconf+=( ${EXTRA_ECONF} ) + ewarn "EXTRA_ECONF applied. Now you are on your own, good luck!" + 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-r4 nginx + newconfd "${FILESDIR}"/nginx.confd 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 ${keepdir_list} + fowners ${PN}:${PN} ${keepdir_list} + + fperms 0710 /var/log/nginx + fowners 0:${PN} /var/log/nginx + + # logrotate + insinto /etc/logrotate.d + newins "${FILESDIR}"/nginx.logrotate-r1 nginx + + if use luajit; then + pax-mark m "${ED%/}/usr/sbin/nginx" + fi + + 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.rst + 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.md,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 "" + 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; then + ewarn "" + ewarn "While you can build lua 3rd party module against ${P}" + ewarn "the author warns that >=${PN}-1.11.11 is still not an" + ewarn "officially supported target yet. You are on your own." + ewarn "Expect runtime failures, memory leaks and other problems!" + fi + + if use nginx_modules_http_lua && use http2; then + ewarn "" + ewarn "Lua 3rd party module author warns against using ${P} with" + ewarn "NGINX_MODULES_HTTP=\"lua http2\". For more info, see https://git.io/OldLsg" + fi + + local _n_permission_layout_checks=0 + local _has_to_adjust_permissions=0 + local _has_to_show_permission_warning=0 + + # Defaults to 1 to inform people doing a fresh installation + # that we ship modified {scgi,uwsgi,fastcgi}_params files + local _has_to_show_httpoxy_mitigation_notice=1 + + local _replacing_version= + for _replacing_version in ${REPLACING_VERSIONS}; do + _n_permission_layout_checks=$((${_n_permission_layout_checks}+1)) + + if [[ ${_n_permission_layout_checks} -gt 1 ]]; then + # Should never happen: + # Package is abusing slots but doesn't allow multiple parallel installations. + # If we run into this situation it is unsafe to automatically adjust any + # permission... + _has_to_show_permission_warning=1 + + ewarn "Replacing multiple ${PN}' versions is unsupported! " \ + "You will have to adjust permissions on your own." + + break + fi + + local _replacing_version_branch=$(get_version_component_range 1-2 "${_replacing_version}") + debug-print "Updating an existing installation (v${_replacing_version}; branch '${_replacing_version_branch}') ..." + + # Do we need to adjust permissions to fix CVE-2013-0337 (bug #458726, #469094)? + # This was before we introduced multiple nginx versions so we + # do not need to distinguish between stable and mainline + local _need_to_fix_CVE2013_0337=1 + + if version_is_at_least "1.4.1-r2" "${_replacing_version}"; then + # We are updating an installation which should already be fixed + _need_to_fix_CVE2013_0337=0 + debug-print "Skipping CVE-2013-0337 ... existing installation should not be affected!" + else + _has_to_adjust_permissions=1 + debug-print "Need to adjust permissions to fix CVE-2013-0337!" + fi + + # Do we need to inform about HTTPoxy mitigation? + # In repository since commit 8be44f76d4ac02cebcd1e0e6e6284bb72d054b0f + if ! version_is_at_least "1.10" "${_replacing_version_branch}"; then + # Updating from <1.10 + _has_to_show_httpoxy_mitigation_notice=1 + debug-print "Need to inform about HTTPoxy mitigation!" + else + # Updating from >=1.10 + local _fixed_in_pvr= + case "${_replacing_version_branch}" in + "1.10") + _fixed_in_pvr="1.10.1-r2" + ;; + "1.11") + _fixed_in_pvr="1.11.3-r1" + ;; + *) + # This should be any future branch. + # If we run this code it is safe to assume that the user has + # already seen the HTTPoxy mitigation notice because he/she is doing + # an update from previous version where we have already shown + # the warning. Otherwise, we wouldn't hit this code path ... + _fixed_in_pvr= + esac + + if [[ -z "${_fixed_in_pvr}" ]] || version_is_at_least "${_fixed_in_pvr}" "${_replacing_version}"; then + # We are updating an installation where we already informed + # that we are mitigating HTTPoxy per default + _has_to_show_httpoxy_mitigation_notice=0 + debug-print "No need to inform about HTTPoxy mitigation ... information was already shown for existing installation!" + else + _has_to_show_httpoxy_mitigation_notice=1 + debug-print "Need to inform about HTTPoxy mitigation!" + fi + fi + + # Do we need to adjust permissions to fix CVE-2016-1247 (bug #605008)? + # All branches up to 1.11 are affected + local _need_to_fix_CVE2016_1247=1 + + if ! version_is_at_least "1.10" "${_replacing_version_branch}"; then + # Updating from <1.10 + _has_to_adjust_permissions=1 + debug-print "Need to adjust permissions to fix CVE-2016-1247!" + else + # Updating from >=1.10 + local _fixed_in_pvr= + case "${_replacing_version_branch}" in + "1.10") + _fixed_in_pvr="1.10.2-r3" + ;; + "1.11") + _fixed_in_pvr="1.11.6-r1" + ;; + *) + # This should be any future branch. + # If we run this code it is safe to assume that we have already + # adjusted permissions or were never affected because user is + # doing an update from previous version which was safe or did + # the adjustments. Otherwise, we wouldn't hit this code path ... + _fixed_in_pvr= + esac + + if [[ -z "${_fixed_in_pvr}" ]] || version_is_at_least "${_fixed_in_pvr}" "${_replacing_version}"; then + # We are updating an installation which should already be adjusted + # or which was never affected + _need_to_fix_CVE2016_1247=0 + debug-print "Skipping CVE-2016-1247 ... existing installation should not be affected!" + else + _has_to_adjust_permissions=1 + debug-print "Need to adjust permissions to fix CVE-2016-1247!" + fi + fi + done + + if [[ ${_has_to_adjust_permissions} -eq 1 ]]; then + # We do not DIE when chmod/chown commands are failing because + # package is already merged on user's system at this stage + # and we cannot retry without losing the information that + # the existing installation needs to adjust permissions. + # Instead we are going to a show a big warning ... + + if [[ ${_has_to_show_permission_warning} -eq 0 ]] && [[ ${_need_to_fix_CVE2013_0337} -eq 1 ]]; then + ewarn "" + ewarn "The world-readable bit (if set) has been removed from the" + ewarn "following directories to mitigate a security bug" + ewarn "(CVE-2013-0337, bug #458726):" + ewarn "" + ewarn " ${EPREFIX%/}/var/log/nginx" + ewarn " ${EPREFIX%/}${NGINX_HOME_TMP}/{,client,proxy,fastcgi,scgi,uwsgi}" + ewarn "" + 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 '${EPREFIX%/}${NGINX_HOME_TMP}'" + chmod o-rwx \ + "${EPREFIX%/}"/var/log/nginx \ + "${EPREFIX%/}"${NGINX_HOME_TMP}/{,client,proxy,fastcgi,scgi,uwsgi} || \ + _has_to_show_permission_warning=1 + fi + + if [[ ${_has_to_show_permission_warning} -eq 0 ]] && [[ ${_need_to_fix_CVE2016_1247} -eq 1 ]]; then + ewarn "" + ewarn "The permissions on the following directory have been reset in" + ewarn "order to mitigate a security bug (CVE-2016-1247, bug #605008):" + ewarn "" + ewarn " ${EPREFIX%/}/var/log/nginx" + ewarn "" + ewarn "Check if this is correct for your setup before restarting nginx!" + ewarn "Also ensure that no other log directory used by any of your" + ewarn "vhost(s) is not writeable for nginx user. Any of your log files" + ewarn "used by nginx can be abused to escalate privileges!" + ewarn "This is a one-time change and will not happen on subsequent updates." + chown 0:nginx "${EPREFIX%/}"/var/log/nginx || _has_to_show_permission_warning=1 + chmod 710 "${EPREFIX%/}"/var/log/nginx || _has_to_show_permission_warning=1 + fi + + if [[ ${_has_to_show_permission_warning} -eq 1 ]]; then + # Should never happen ... + ewarn "" + ewarn "*************************************************************" + ewarn "*************** W A R N I N G ***************" + ewarn "*************************************************************" + ewarn "The one-time only attempt to adjust permissions of the" + ewarn "existing nginx installation failed. Be aware that we will not" + ewarn "try to adjust the same permissions again because now you are" + ewarn "using a nginx version where we expect that the permissions" + ewarn "are already adjusted or that you know what you are doing and" + ewarn "want to keep custom permissions." + ewarn "" + fi + fi + + # Sanity check for CVE-2016-1247 + # Required to warn users who received the warning above and thought + # they could fix it by unmerging and re-merging the package or have + # unmerged a affected installation on purpose in the past leaving + # /var/log/nginx on their system due to keepdir/non-empty folder + # and are now installing the package again. + local _sanity_check_testfile=$(mktemp --dry-run "${EPREFIX%/}"/var/log/nginx/.CVE-2016-1247.XXXXXXXXX) + su -s /bin/sh -c "touch ${_sanity_check_testfile}" nginx >&/dev/null + if [ $? -eq 0 ] ; then + # Cleanup -- no reason to die here! + rm -f "${_sanity_check_testfile}" + + ewarn "" + ewarn "*************************************************************" + ewarn "*************** W A R N I N G ***************" + ewarn "*************************************************************" + ewarn "Looks like your installation is vulnerable to CVE-2016-1247" + ewarn "(bug #605008) because nginx user is able to create files in" + ewarn "" + ewarn " ${EPREFIX%/}/var/log/nginx" + ewarn "" + ewarn "Also ensure that no other log directory used by any of your" + ewarn "vhost(s) is not writeable for nginx user. Any of your log files" + ewarn "used by nginx can be abused to escalate privileges!" + fi + + if [[ ${_has_to_show_httpoxy_mitigation_notice} -eq 1 ]]; then + # HTTPoxy mitigation + ewarn "" + ewarn "This nginx installation comes with a mitigation for the HTTPoxy" + ewarn "vulnerability for FastCGI, SCGI and uWSGI applications by setting" + ewarn "the HTTP_PROXY parameter to an empty string per default when you" + ewarn "are sourcing one of the default" + ewarn "" + ewarn " - 'fastcgi_params' or 'fastcgi.conf'" + ewarn " - 'scgi_params'" + ewarn " - 'uwsgi_params'" + ewarn "" + ewarn "files 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 the file(s) mentioned above." + ewarn "" + fi +} diff --git a/www-servers/nginx/nginx-1.17.5-r100.ebuild b/www-servers/nginx/nginx-1.17.5-r100.ebuild new file mode 100644 index 0000000..8e7032e --- /dev/null +++ b/www-servers/nginx/nginx-1.17.5-r100.ebuild @@ -0,0 +1,1108 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +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.1" +DEVEL_KIT_MODULE_P="ngx_devel_kit-${DEVEL_KIT_MODULE_PV}" +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}" + +# ngx_brotli (https://github.com/eustas/ngx_brotli, BSD-2) +HTTP_BROTLI_MODULE_PV="8104036af9cff4b1d34f22d00ba857e2a93a243c" +HTTP_BROTLI_MODULE_P="ngx_brotli-${HTTP_BROTLI_MODULE_PV}" +HTTP_BROTLI_MODULE_URI="https://github.com/eustas/ngx_brotli/archive/${HTTP_BROTLI_MODULE_PV}.tar.gz" +HTTP_BROTLI_MODULE_WD="${WORKDIR}/ngx_brotli-${HTTP_BROTLI_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.33" +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.3" +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.15" +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="9aecf15ec379fe98f62355c57b60c0bc83296f04" +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/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}" + +# http_vhost_traffic_status (https://github.com/vozlt/nginx-module-vts, BSD license) +HTTP_VHOST_TRAFFIC_STATUS_MODULE_PV="46d85558e344dfe2b078ce757fd36c69a1ec2dd3" +HTTP_VHOST_TRAFFIC_STATUS_MODULE_P="ngx_http_vhost_traffic_status-${HTTP_VHOST_TRAFFIC_STATUS_MODULE_PV}" +HTTP_VHOST_TRAFFIC_STATUS_MODULE_URI="https://github.com/vozlt/nginx-module-vts/archive/${HTTP_VHOST_TRAFFIC_STATUS_MODULE_PV}.tar.gz" +HTTP_VHOST_TRAFFIC_STATUS_MODULE_WD="${WORKDIR}/nginx-module-vts-${HTTP_VHOST_TRAFFIC_STATUS_MODULE_PV}" + +# naxsi-core (https://github.com/nbs-system/naxsi, GPLv2+) +HTTP_NAXSI_MODULE_PV="0.56" +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.2.1" +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="3.0.0" +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.61" +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.3" +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.4" +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.19" +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="42d195d7a7575ebab1c369ad3fc5d78dc2c2669c" +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}" + +# geoip2 (https://github.com/leev/ngx_http_geoip2_module, BSD-2) +GEOIP2_MODULE_PV="3.2" +GEOIP2_MODULE_P="ngx_http_geoip2_module-${GEOIP2_MODULE_PV}" +GEOIP2_MODULE_URI="https://github.com/leev/ngx_http_geoip2_module/archive/${GEOIP2_MODULE_PV}.tar.gz" +GEOIP2_MODULE_WD="${WORKDIR}/ngx_http_geoip2_module-${GEOIP2_MODULE_PV}" + +# njs-module (https://github.com/nginx/njs, as-is) +NJS_MODULE_PV="0.3.6" +NJS_MODULE_P="njs-${NJS_MODULE_PV}" +NJS_MODULE_URI="https://github.com/nginx/njs/archive/${NJS_MODULE_PV}.tar.gz" +NJS_MODULE_WD="${WORKDIR}/njs-${NJS_MODULE_PV}" + +HTTP_XSLTPROC_MODULE_PV="0.16" +HTTP_XSLTPROC_MODULE_P="ngx_xsltproc-${HTTP_XSLTPROC_MODULE_PV}" +HTTP_XSLTPROC_MODULE_URI="https://github.com/yoreek/nginx-xsltproc-module/archive/v${HTTP_XSLTPROC_MODULE_PV}.tar.gz" +HTTP_XSLTPROC_MODULE_WD="${WORKDIR}/nginx-xsltproc-module-${HTTP_XSLTPROC_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 pax-utils + +DESCRIPTION="Robust, small and high performance http and reverse proxy server" +HOMEPAGE="https://nginx.org" +SRC_URI="https://nginx.org/download/${P}.tar.gz + ${DEVEL_KIT_MODULE_URI} -> ${DEVEL_KIT_MODULE_P}.tar.gz + nginx_modules_http_auth_ldap? ( ${HTTP_LDAP_MODULE_URI} -> ${HTTP_LDAP_MODULE_P}.tar.gz ) + nginx_modules_http_auth_pam? ( ${HTTP_AUTH_PAM_MODULE_URI} -> ${HTTP_AUTH_PAM_MODULE_P}.tar.gz ) + nginx_modules_http_brotli? ( ${HTTP_BROTLI_MODULE_URI} -> ${HTTP_BROTLI_MODULE_P}.tar.gz ) + nginx_modules_http_cache_purge? ( ${HTTP_CACHE_PURGE_MODULE_URI} -> ${HTTP_CACHE_PURGE_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_fancyindex? ( ${HTTP_FANCYINDEX_MODULE_URI} -> ${HTTP_FANCYINDEX_MODULE_P}.tar.gz ) + nginx_modules_http_geoip2? ( ${GEOIP2_MODULE_URI} -> ${GEOIP2_MODULE_P}.tar.gz ) + nginx_modules_http_headers_more? ( ${HTTP_HEADERS_MORE_MODULE_URI} -> ${HTTP_HEADERS_MORE_MODULE_P}.tar.gz ) + nginx_modules_http_javascript? ( ${NJS_MODULE_URI} -> ${NJS_MODULE_P}.tar.gz ) + nginx_modules_http_lua? ( ${HTTP_LUA_MODULE_URI} -> ${HTTP_LUA_MODULE_P}.tar.gz ) + nginx_modules_http_memc? ( ${HTTP_MEMC_MODULE_URI} -> ${HTTP_MEMC_MODULE_P}.tar.gz ) + nginx_modules_http_metrics? ( ${HTTP_METRICS_MODULE_URI} -> ${HTTP_METRICS_MODULE_P}.tar.gz ) + nginx_modules_http_mogilefs? ( ${HTTP_MOGILEFS_MODULE_URI} -> ${HTTP_MOGILEFS_MODULE_P}.tar.gz ) + nginx_modules_http_naxsi? ( ${HTTP_NAXSI_MODULE_URI} -> ${HTTP_NAXSI_MODULE_P}.tar.gz ) + nginx_modules_http_push_stream? ( ${HTTP_PUSH_STREAM_MODULE_URI} -> ${HTTP_PUSH_STREAM_MODULE_P}.tar.gz ) + nginx_modules_http_security? ( ${HTTP_SECURITY_MODULE_URI} -> ${HTTP_SECURITY_MODULE_P}.tar.gz ) + nginx_modules_http_slowfs_cache? ( ${HTTP_SLOWFS_CACHE_MODULE_URI} -> ${HTTP_SLOWFS_CACHE_MODULE_P}.tar.gz ) + nginx_modules_http_sticky? ( ${HTTP_STICKY_MODULE_URI} -> ${HTTP_STICKY_MODULE_P}.tar.bz2 ) + nginx_modules_http_upload_progress? ( ${HTTP_UPLOAD_PROGRESS_MODULE_URI} -> ${HTTP_UPLOAD_PROGRESS_MODULE_P}.tar.gz ) + nginx_modules_http_upstream_check? ( ${HTTP_UPSTREAM_CHECK_MODULE_URI} -> ${HTTP_UPSTREAM_CHECK_MODULE_P}.tar.gz ) + nginx_modules_http_vhost_traffic_status? ( ${HTTP_VHOST_TRAFFIC_STATUS_MODULE_URI} -> ${HTTP_VHOST_TRAFFIC_STATUS_MODULE_P}.tar.gz ) + nginx_modules_stream_geoip2? ( ${GEOIP2_MODULE_URI} -> ${GEOIP2_MODULE_P}.tar.gz ) + nginx_modules_stream_javascript? ( ${NJS_MODULE_URI} -> ${NJS_MODULE_P}.tar.gz ) + rtmp? ( ${RTMP_MODULE_URI} -> ${RTMP_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 GPL-2+ + nginx_modules_http_security? ( Apache-2.0 ) + nginx_modules_http_push_stream? ( GPL-3 )" + +SLOT="mainline" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux" + +# Package doesn't provide a real test suite +RESTRICT="test" + +NGINX_MODULES_STD="access auth_basic autoindex browser charset empty_gif + fastcgi geo grpc gzip limit_req limit_conn map memcached mirror + 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_auth_ldap + http_auth_pam + http_brotli + http_cache_purge + http_dav_ext + http_echo + http_fancyindex + http_geoip2 + http_headers_more + http_javascript + http_lua + http_memc + http_metrics + http_mogilefs + http_naxsi + http_push_stream + http_security + http_slowfs_cache + http_sticky + http_upload_progress + http_upstream_check + http_vhost_traffic_status + stream_geoip2 + stream_javascript + http_xsltproc +" + +IUSE="aio debug +http +http2 +http-cache +ipv6 libatomic libressl luajit +pcre + pcre-jit rtmp selinux ssl threads userland_GNU vim-syntax +nginx_modules_http_xsltproc xsltproc-memcached" + +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_brotli? ( app-arch/brotli:= ) + nginx_modules_http_geoip? ( dev-libs/geoip ) + nginx_modules_http_geoip2? ( dev-libs/libmaxminddb:= ) + 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? ( dev-lang/luajit:2= ) + nginx_modules_http_auth_pam? ( sys-libs/pam ) + nginx_modules_http_metrics? ( dev-libs/yajl:= ) + nginx_modules_http_dav_ext? ( dev-libs/libxml2 ) + 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?] ) + nginx_modules_stream_geoip? ( dev-libs/geoip ) + nginx_modules_stream_geoip2? ( dev-libs/libmaxminddb:= ) + nginx_modules_http_xsltproc? ( dev-libs/libxml2 dev-libs/libxslt dev-libs/icu ) + xsltproc-memcached? ( dev-libs/libmemcached )" +RDEPEND="${CDEPEND} + selinux? ( sec-policy/selinux-nginx ) + !www-servers/nginx:0" +DEPEND="${CDEPEND} + nginx_modules_http_brotli? ( virtual/pkgconfig ) + 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_grpc? ( http2 ) + nginx_modules_http_lua? ( + luajit + 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 ) + xsltproc-memcached? ( nginx_modules_http_xsltproc )" + +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_auth_pam; then + cd "${HTTP_AUTH_PAM_MODULE_WD}" || die + eapply "${FILESDIR}"/http_auth_pam-1.5.1-adjust-loglevel-for-authentication-failures.patch + cd "${S}" || die + fi + + if use nginx_modules_http_brotli; then + cd "${HTTP_BROTLI_MODULE_WD}" || die + eapply "${FILESDIR}"/http_brotli-detect-brotli-r2.patch + cd "${S}" || die + fi + + if use nginx_modules_http_upstream_check; then + eapply -p0 "${FILESDIR}"/http_upstream_check-nginx-1.11.5+.patch + fi + + if use nginx_modules_http_cache_purge; then + cd "${HTTP_CACHE_PURGE_MODULE_WD}" || die + eapply "${FILESDIR}"/http_cache_purge-1.11.6+.patch + cd "${S}" || die + fi + + if use nginx_modules_http_security; then + cd "${HTTP_SECURITY_MODULE_WD}" || die + + 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 + + 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 + + if use xsltproc-memcached; then + sed -i -e 's/LIBMEMCACHED_ENABLED=no/LIBMEMCACHED_ENABLED=yes/' "${HTTP_XSLTPROC_MODULE_WD}/config" || die + fi + + 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 + export LUAJIT_LIB=$(pkg-config --variable libdir luajit) + export LUAJIT_INC=$(pkg-config --variable includedir luajit) + 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 nginx_modules_http_vhost_traffic_status; then + http_enabled=1 + myconf+=( --add-module=${HTTP_VHOST_TRAFFIC_STATUS_MODULE_WD} ) + fi + + if use nginx_modules_http_geoip2 || use nginx_modules_stream_geoip2; then + myconf+=( --add-module=${GEOIP2_MODULE_WD} ) + fi + + if use nginx_modules_http_javascript || use nginx_modules_stream_javascript; then + myconf+=( --add-module="${NJS_MODULE_WD}/nginx" ) + fi + + if use nginx_modules_http_brotli; then + http_enabled=1 + myconf+=( --add-module=${HTTP_BROTLI_MODULE_WD} ) + fi + + if use nginx_modules_http_xsltproc; then + http_enabled=1 + myconf+=( --add-module=${HTTP_XSLTPROC_MODULE_WD} ) + fi + + if use http || use http-cache || use http2 || use nginx_modules_http_javascript; 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 use nginx_modules_stream_geoip2 || use nginx_modules_stream_javascript; then + stream_enabled=1 + fi + + 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 + + if [[ -n "${EXTRA_ECONF}" ]]; then + myconf+=( ${EXTRA_ECONF} ) + ewarn "EXTRA_ECONF applied. Now you are on your own, good luck!" + 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-r4 nginx + newconfd "${FILESDIR}"/nginx.confd 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 ${keepdir_list} + fowners ${PN}:${PN} ${keepdir_list} + + fperms 0710 /var/log/nginx + fowners 0:${PN} /var/log/nginx + + # logrotate + insinto /etc/logrotate.d + newins "${FILESDIR}"/nginx.logrotate-r1 nginx + + if use luajit; then + pax-mark m "${ED%/}/usr/sbin/nginx" + fi + + 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.rst + 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.md,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 "" + 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; then + ewarn "" + ewarn "While you can build lua 3rd party module against ${P}" + ewarn "the author warns that >=${PN}-1.11.11 is still not an" + ewarn "officially supported target yet. You are on your own." + ewarn "Expect runtime failures, memory leaks and other problems!" + fi + + if use nginx_modules_http_lua && use http2; then + ewarn "" + ewarn "Lua 3rd party module author warns against using ${P} with" + ewarn "NGINX_MODULES_HTTP=\"lua http2\". For more info, see https://git.io/OldLsg" + fi + + local _n_permission_layout_checks=0 + local _has_to_adjust_permissions=0 + local _has_to_show_permission_warning=0 + + # Defaults to 1 to inform people doing a fresh installation + # that we ship modified {scgi,uwsgi,fastcgi}_params files + local _has_to_show_httpoxy_mitigation_notice=1 + + local _replacing_version= + for _replacing_version in ${REPLACING_VERSIONS}; do + _n_permission_layout_checks=$((${_n_permission_layout_checks}+1)) + + if [[ ${_n_permission_layout_checks} -gt 1 ]]; then + # Should never happen: + # Package is abusing slots but doesn't allow multiple parallel installations. + # If we run into this situation it is unsafe to automatically adjust any + # permission... + _has_to_show_permission_warning=1 + + ewarn "Replacing multiple ${PN}' versions is unsupported! " \ + "You will have to adjust permissions on your own." + + break + fi + + local _replacing_version_branch=$(get_version_component_range 1-2 "${_replacing_version}") + debug-print "Updating an existing installation (v${_replacing_version}; branch '${_replacing_version_branch}') ..." + + # Do we need to adjust permissions to fix CVE-2013-0337 (bug #458726, #469094)? + # This was before we introduced multiple nginx versions so we + # do not need to distinguish between stable and mainline + local _need_to_fix_CVE2013_0337=1 + + if version_is_at_least "1.4.1-r2" "${_replacing_version}"; then + # We are updating an installation which should already be fixed + _need_to_fix_CVE2013_0337=0 + debug-print "Skipping CVE-2013-0337 ... existing installation should not be affected!" + else + _has_to_adjust_permissions=1 + debug-print "Need to adjust permissions to fix CVE-2013-0337!" + fi + + # Do we need to inform about HTTPoxy mitigation? + # In repository since commit 8be44f76d4ac02cebcd1e0e6e6284bb72d054b0f + if ! version_is_at_least "1.10" "${_replacing_version_branch}"; then + # Updating from <1.10 + _has_to_show_httpoxy_mitigation_notice=1 + debug-print "Need to inform about HTTPoxy mitigation!" + else + # Updating from >=1.10 + local _fixed_in_pvr= + case "${_replacing_version_branch}" in + "1.10") + _fixed_in_pvr="1.10.1-r2" + ;; + "1.11") + _fixed_in_pvr="1.11.3-r1" + ;; + *) + # This should be any future branch. + # If we run this code it is safe to assume that the user has + # already seen the HTTPoxy mitigation notice because he/she is doing + # an update from previous version where we have already shown + # the warning. Otherwise, we wouldn't hit this code path ... + _fixed_in_pvr= + esac + + if [[ -z "${_fixed_in_pvr}" ]] || version_is_at_least "${_fixed_in_pvr}" "${_replacing_version}"; then + # We are updating an installation where we already informed + # that we are mitigating HTTPoxy per default + _has_to_show_httpoxy_mitigation_notice=0 + debug-print "No need to inform about HTTPoxy mitigation ... information was already shown for existing installation!" + else + _has_to_show_httpoxy_mitigation_notice=1 + debug-print "Need to inform about HTTPoxy mitigation!" + fi + fi + + # Do we need to adjust permissions to fix CVE-2016-1247 (bug #605008)? + # All branches up to 1.11 are affected + local _need_to_fix_CVE2016_1247=1 + + if ! version_is_at_least "1.10" "${_replacing_version_branch}"; then + # Updating from <1.10 + _has_to_adjust_permissions=1 + debug-print "Need to adjust permissions to fix CVE-2016-1247!" + else + # Updating from >=1.10 + local _fixed_in_pvr= + case "${_replacing_version_branch}" in + "1.10") + _fixed_in_pvr="1.10.2-r3" + ;; + "1.11") + _fixed_in_pvr="1.11.6-r1" + ;; + *) + # This should be any future branch. + # If we run this code it is safe to assume that we have already + # adjusted permissions or were never affected because user is + # doing an update from previous version which was safe or did + # the adjustments. Otherwise, we wouldn't hit this code path ... + _fixed_in_pvr= + esac + + if [[ -z "${_fixed_in_pvr}" ]] || version_is_at_least "${_fixed_in_pvr}" "${_replacing_version}"; then + # We are updating an installation which should already be adjusted + # or which was never affected + _need_to_fix_CVE2016_1247=0 + debug-print "Skipping CVE-2016-1247 ... existing installation should not be affected!" + else + _has_to_adjust_permissions=1 + debug-print "Need to adjust permissions to fix CVE-2016-1247!" + fi + fi + done + + if [[ ${_has_to_adjust_permissions} -eq 1 ]]; then + # We do not DIE when chmod/chown commands are failing because + # package is already merged on user's system at this stage + # and we cannot retry without losing the information that + # the existing installation needs to adjust permissions. + # Instead we are going to a show a big warning ... + + if [[ ${_has_to_show_permission_warning} -eq 0 ]] && [[ ${_need_to_fix_CVE2013_0337} -eq 1 ]]; then + ewarn "" + ewarn "The world-readable bit (if set) has been removed from the" + ewarn "following directories to mitigate a security bug" + ewarn "(CVE-2013-0337, bug #458726):" + ewarn "" + ewarn " ${EPREFIX%/}/var/log/nginx" + ewarn " ${EPREFIX%/}${NGINX_HOME_TMP}/{,client,proxy,fastcgi,scgi,uwsgi}" + ewarn "" + 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 '${EPREFIX%/}${NGINX_HOME_TMP}'" + chmod o-rwx \ + "${EPREFIX%/}"/var/log/nginx \ + "${EPREFIX%/}"${NGINX_HOME_TMP}/{,client,proxy,fastcgi,scgi,uwsgi} || \ + _has_to_show_permission_warning=1 + fi + + if [[ ${_has_to_show_permission_warning} -eq 0 ]] && [[ ${_need_to_fix_CVE2016_1247} -eq 1 ]]; then + ewarn "" + ewarn "The permissions on the following directory have been reset in" + ewarn "order to mitigate a security bug (CVE-2016-1247, bug #605008):" + ewarn "" + ewarn " ${EPREFIX%/}/var/log/nginx" + ewarn "" + ewarn "Check if this is correct for your setup before restarting nginx!" + ewarn "Also ensure that no other log directory used by any of your" + ewarn "vhost(s) is not writeable for nginx user. Any of your log files" + ewarn "used by nginx can be abused to escalate privileges!" + ewarn "This is a one-time change and will not happen on subsequent updates." + chown 0:nginx "${EPREFIX%/}"/var/log/nginx || _has_to_show_permission_warning=1 + chmod 710 "${EPREFIX%/}"/var/log/nginx || _has_to_show_permission_warning=1 + fi + + if [[ ${_has_to_show_permission_warning} -eq 1 ]]; then + # Should never happen ... + ewarn "" + ewarn "*************************************************************" + ewarn "*************** W A R N I N G ***************" + ewarn "*************************************************************" + ewarn "The one-time only attempt to adjust permissions of the" + ewarn "existing nginx installation failed. Be aware that we will not" + ewarn "try to adjust the same permissions again because now you are" + ewarn "using a nginx version where we expect that the permissions" + ewarn "are already adjusted or that you know what you are doing and" + ewarn "want to keep custom permissions." + ewarn "" + fi + fi + + # Sanity check for CVE-2016-1247 + # Required to warn users who received the warning above and thought + # they could fix it by unmerging and re-merging the package or have + # unmerged a affected installation on purpose in the past leaving + # /var/log/nginx on their system due to keepdir/non-empty folder + # and are now installing the package again. + local _sanity_check_testfile=$(mktemp --dry-run "${EPREFIX%/}"/var/log/nginx/.CVE-2016-1247.XXXXXXXXX) + su -s /bin/sh -c "touch ${_sanity_check_testfile}" nginx >&/dev/null + if [ $? -eq 0 ] ; then + # Cleanup -- no reason to die here! + rm -f "${_sanity_check_testfile}" + + ewarn "" + ewarn "*************************************************************" + ewarn "*************** W A R N I N G ***************" + ewarn "*************************************************************" + ewarn "Looks like your installation is vulnerable to CVE-2016-1247" + ewarn "(bug #605008) because nginx user is able to create files in" + ewarn "" + ewarn " ${EPREFIX%/}/var/log/nginx" + ewarn "" + ewarn "Also ensure that no other log directory used by any of your" + ewarn "vhost(s) is not writeable for nginx user. Any of your log files" + ewarn "used by nginx can be abused to escalate privileges!" + fi + + if [[ ${_has_to_show_httpoxy_mitigation_notice} -eq 1 ]]; then + # HTTPoxy mitigation + ewarn "" + ewarn "This nginx installation comes with a mitigation for the HTTPoxy" + ewarn "vulnerability for FastCGI, SCGI and uWSGI applications by setting" + ewarn "the HTTP_PROXY parameter to an empty string per default when you" + ewarn "are sourcing one of the default" + ewarn "" + ewarn " - 'fastcgi_params' or 'fastcgi.conf'" + ewarn " - 'scgi_params'" + ewarn " - 'uwsgi_params'" + ewarn "" + ewarn "files 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 the file(s) mentioned above." + ewarn "" + fi +} |