From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id DA6BE138DB0 for ; Sat, 15 Oct 2016 19:04:13 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9AC60E0941; Sat, 15 Oct 2016 19:04:09 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 6DC8FE0941 for ; Sat, 15 Oct 2016 19:04:09 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E7195341026 for ; Sat, 15 Oct 2016 19:04:07 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B6FDA2EE for ; Sat, 15 Oct 2016 19:04:05 +0000 (UTC) From: "Thomas Deutschmann" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Thomas Deutschmann" Message-ID: <1476558238.c7f5fede92086cd68a6a0e52015c0af3442b4737.whissi@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: www-servers/nginx/ X-VCS-Repository: repo/gentoo X-VCS-Files: www-servers/nginx/nginx-1.10.1-r3.ebuild www-servers/nginx/nginx-1.10.1-r4.ebuild www-servers/nginx/nginx-1.10.1.ebuild www-servers/nginx/nginx-1.11.4.ebuild www-servers/nginx/nginx-1.11.5.ebuild X-VCS-Directories: www-servers/nginx/ X-VCS-Committer: whissi X-VCS-Committer-Name: Thomas Deutschmann X-VCS-Revision: c7f5fede92086cd68a6a0e52015c0af3442b4737 X-VCS-Branch: master Date: Sat, 15 Oct 2016 19:04:05 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: b1d5bc5f-7976-4557-8d73-7688e67454dd X-Archives-Hash: 589b63ce5372dac999b895b6c66b0575 commit: c7f5fede92086cd68a6a0e52015c0af3442b4737 Author: Thomas Deutschmann gentoo org> AuthorDate: Sat Oct 15 19:03:26 2016 +0000 Commit: Thomas Deutschmann gentoo org> CommitDate: Sat Oct 15 19:03:58 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c7f5fede www-servers/nginx: Adjust dependencies/slot operators Package-Manager: portage-2.3.2 www-servers/nginx/nginx-1.10.1-r3.ebuild | 24 ++++++++++++++++-------- www-servers/nginx/nginx-1.10.1-r4.ebuild | 24 ++++++++++++++++-------- www-servers/nginx/nginx-1.10.1.ebuild | 24 ++++++++++++++++-------- www-servers/nginx/nginx-1.11.4.ebuild | 24 ++++++++++++++++-------- www-servers/nginx/nginx-1.11.5.ebuild | 24 ++++++++++++++++-------- 5 files changed, 80 insertions(+), 40 deletions(-) diff --git a/www-servers/nginx/nginx-1.10.1-r3.ebuild b/www-servers/nginx/nginx-1.10.1-r3.ebuild index fe9f071..8716c66 100644 --- a/www-servers/nginx/nginx-1.10.1-r3.ebuild +++ b/www-servers/nginx/nginx-1.10.1-r3.ebuild @@ -230,8 +230,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:= ) @@ -250,21 +250,27 @@ CDEPEND=" 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_xslt? ( dev-libs/libxml2 dev-libs/libxslt ) + nginx_modules_http_xslt? ( dev-libs/libxml2:= dev-libs/libxslt ) nginx_modules_http_lua? ( !luajit? ( dev-lang/lua:0= ) luajit? ( dev-lang/luajit:2= ) ) nginx_modules_http_auth_pam? ( virtual/pam ) - nginx_modules_http_metrics? ( dev-libs/yajl ) + nginx_modules_http_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_security? ( + dev-libs/apr:= + dev-libs/apr-util:= + dev-libs/libxml2:= + net-misc/curl + www-servers/apache + ) nginx_modules_http_auth_ldap? ( net-nds/openldap[ssl?] )" RDEPEND="${CDEPEND} selinux? ( sec-policy/selinux-nginx ) @@ -356,6 +362,8 @@ src_configure() { 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 diff --git a/www-servers/nginx/nginx-1.10.1-r4.ebuild b/www-servers/nginx/nginx-1.10.1-r4.ebuild index 4e28658..f5a4f5e 100644 --- a/www-servers/nginx/nginx-1.10.1-r4.ebuild +++ b/www-servers/nginx/nginx-1.10.1-r4.ebuild @@ -230,8 +230,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:= ) @@ -250,21 +250,27 @@ CDEPEND=" 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_xslt? ( dev-libs/libxml2 dev-libs/libxslt ) + nginx_modules_http_xslt? ( dev-libs/libxml2:= dev-libs/libxslt ) nginx_modules_http_lua? ( !luajit? ( dev-lang/lua:0= ) luajit? ( dev-lang/luajit:2= ) ) nginx_modules_http_auth_pam? ( virtual/pam ) - nginx_modules_http_metrics? ( dev-libs/yajl ) + nginx_modules_http_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_security? ( + dev-libs/apr:= + dev-libs/apr-util:= + dev-libs/libxml2:= + net-misc/curl + www-servers/apache + ) nginx_modules_http_auth_ldap? ( net-nds/openldap[ssl?] )" RDEPEND="${CDEPEND} selinux? ( sec-policy/selinux-nginx ) @@ -356,6 +362,8 @@ src_configure() { 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 diff --git a/www-servers/nginx/nginx-1.10.1.ebuild b/www-servers/nginx/nginx-1.10.1.ebuild index 630624b..6365eb4 100644 --- a/www-servers/nginx/nginx-1.10.1.ebuild +++ b/www-servers/nginx/nginx-1.10.1.ebuild @@ -231,8 +231,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:= ) @@ -251,21 +251,27 @@ CDEPEND=" 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_xslt? ( dev-libs/libxml2 dev-libs/libxslt ) + nginx_modules_http_xslt? ( dev-libs/libxml2:= dev-libs/libxslt ) nginx_modules_http_lua? ( !luajit? ( dev-lang/lua:0= ) luajit? ( dev-lang/luajit:2= ) ) nginx_modules_http_auth_pam? ( virtual/pam ) - nginx_modules_http_metrics? ( dev-libs/yajl ) + nginx_modules_http_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_security? ( + dev-libs/apr:= + dev-libs/apr-util:= + dev-libs/libxml2:= + net-misc/curl + www-servers/apache + ) nginx_modules_http_auth_ldap? ( net-nds/openldap[ssl?] )" RDEPEND="${CDEPEND} selinux? ( sec-policy/selinux-nginx ) @@ -356,6 +362,8 @@ src_configure() { 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 diff --git a/www-servers/nginx/nginx-1.11.4.ebuild b/www-servers/nginx/nginx-1.11.4.ebuild index a94f39d..228aa6f 100644 --- a/www-servers/nginx/nginx-1.11.4.ebuild +++ b/www-servers/nginx/nginx-1.11.4.ebuild @@ -237,8 +237,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:= ) @@ -257,21 +257,27 @@ CDEPEND=" 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_xslt? ( dev-libs/libxml2 dev-libs/libxslt ) + nginx_modules_http_xslt? ( dev-libs/libxml2:= dev-libs/libxslt ) nginx_modules_http_lua? ( !luajit? ( dev-lang/lua:0= ) luajit? ( dev-lang/luajit:2= ) ) nginx_modules_http_auth_pam? ( virtual/pam ) - nginx_modules_http_metrics? ( dev-libs/yajl ) + nginx_modules_http_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_security? ( + dev-libs/apr:= + dev-libs/apr-util:= + dev-libs/libxml2:= + net-misc/curl + www-servers/apache + ) nginx_modules_http_auth_ldap? ( net-nds/openldap[ssl?] )" RDEPEND="${CDEPEND} selinux? ( sec-policy/selinux-nginx ) @@ -369,6 +375,8 @@ src_configure() { 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 diff --git a/www-servers/nginx/nginx-1.11.5.ebuild b/www-servers/nginx/nginx-1.11.5.ebuild index 3f951db..c5ed9be 100644 --- a/www-servers/nginx/nginx-1.11.5.ebuild +++ b/www-servers/nginx/nginx-1.11.5.ebuild @@ -237,8 +237,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:= ) @@ -257,21 +257,27 @@ CDEPEND=" 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_xslt? ( dev-libs/libxml2 dev-libs/libxslt ) + nginx_modules_http_xslt? ( dev-libs/libxml2:= dev-libs/libxslt ) nginx_modules_http_lua? ( !luajit? ( dev-lang/lua:0= ) luajit? ( dev-lang/luajit:2= ) ) nginx_modules_http_auth_pam? ( virtual/pam ) - nginx_modules_http_metrics? ( dev-libs/yajl ) + nginx_modules_http_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_security? ( + dev-libs/apr:= + dev-libs/apr-util:= + dev-libs/libxml2:= + net-misc/curl + www-servers/apache + ) nginx_modules_http_auth_ldap? ( net-nds/openldap[ssl?] )" RDEPEND="${CDEPEND} selinux? ( sec-policy/selinux-nginx ) @@ -364,6 +370,8 @@ src_configure() { 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