| 1 |
commit: af97063e8d0c5a2530d0a3e834383985d461b8e1 |
| 2 |
Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun May 2 09:54:19 2021 +0000 |
| 4 |
Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun May 2 09:54:41 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=af97063e |
| 7 |
|
| 8 |
www-servers/nginx: remove libressl support |
| 9 |
|
| 10 |
Package-Manager: Portage-3.0.18, Repoman-3.0.2 |
| 11 |
Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org> |
| 12 |
|
| 13 |
www-servers/nginx/nginx-1.18.0-r2.ebuild | 14 +++++--------- |
| 14 |
www-servers/nginx/nginx-1.19.10.ebuild | 14 +++++--------- |
| 15 |
www-servers/nginx/nginx-1.19.9.ebuild | 14 +++++--------- |
| 16 |
3 files changed, 15 insertions(+), 27 deletions(-) |
| 17 |
|
| 18 |
diff --git a/www-servers/nginx/nginx-1.18.0-r2.ebuild b/www-servers/nginx/nginx-1.18.0-r2.ebuild |
| 19 |
index b8b349e004f..e96a7738bc6 100644 |
| 20 |
--- a/www-servers/nginx/nginx-1.18.0-r2.ebuild |
| 21 |
+++ b/www-servers/nginx/nginx-1.18.0-r2.ebuild |
| 22 |
@@ -246,7 +246,7 @@ NGINX_MODULES_3RD=" |
| 23 |
stream_javascript |
| 24 |
" |
| 25 |
|
| 26 |
-IUSE="aio debug +http +http2 +http-cache +ipv6 libatomic libressl luajit +pcre |
| 27 |
+IUSE="aio debug +http +http2 +http-cache +ipv6 libatomic luajit +pcre |
| 28 |
pcre-jit rtmp selinux ssl threads userland_GNU vim-syntax" |
| 29 |
|
| 30 |
for mod in $NGINX_MODULES_STD; do |
| 31 |
@@ -281,17 +281,14 @@ CDEPEND=" |
| 32 |
pcre? ( dev-libs/libpcre:= ) |
| 33 |
pcre-jit? ( dev-libs/libpcre:=[jit] ) |
| 34 |
ssl? ( |
| 35 |
- !libressl? ( dev-libs/openssl:0= ) |
| 36 |
- libressl? ( dev-libs/libressl:= ) |
| 37 |
+ dev-libs/openssl:0= |
| 38 |
) |
| 39 |
http2? ( |
| 40 |
- !libressl? ( >=dev-libs/openssl-1.0.1c:0= ) |
| 41 |
- libressl? ( dev-libs/libressl:= ) |
| 42 |
+ >=dev-libs/openssl-1.0.1c:0= |
| 43 |
) |
| 44 |
http-cache? ( |
| 45 |
userland_GNU? ( |
| 46 |
- !libressl? ( dev-libs/openssl:0= ) |
| 47 |
- libressl? ( dev-libs/libressl:= ) |
| 48 |
+ dev-libs/openssl:0= |
| 49 |
) |
| 50 |
) |
| 51 |
nginx_modules_http_brotli? ( app-arch/brotli:= ) |
| 52 |
@@ -305,8 +302,7 @@ CDEPEND=" |
| 53 |
nginx_modules_http_rewrite? ( dev-libs/libpcre:= ) |
| 54 |
nginx_modules_http_secure_link? ( |
| 55 |
userland_GNU? ( |
| 56 |
- !libressl? ( dev-libs/openssl:0= ) |
| 57 |
- libressl? ( dev-libs/libressl:= ) |
| 58 |
+ dev-libs/openssl:0= |
| 59 |
) |
| 60 |
) |
| 61 |
nginx_modules_http_xslt? ( dev-libs/libxml2:= dev-libs/libxslt ) |
| 62 |
|
| 63 |
diff --git a/www-servers/nginx/nginx-1.19.10.ebuild b/www-servers/nginx/nginx-1.19.10.ebuild |
| 64 |
index 11e748bc8c2..1cdf07062df 100644 |
| 65 |
--- a/www-servers/nginx/nginx-1.19.10.ebuild |
| 66 |
+++ b/www-servers/nginx/nginx-1.19.10.ebuild |
| 67 |
@@ -247,7 +247,7 @@ NGINX_MODULES_3RD=" |
| 68 |
stream_javascript |
| 69 |
" |
| 70 |
|
| 71 |
-IUSE="aio debug +http +http2 +http-cache +ipv6 libatomic libressl +pcre |
| 72 |
+IUSE="aio debug +http +http2 +http-cache +ipv6 libatomic +pcre |
| 73 |
pcre-jit rtmp selinux ssl threads userland_GNU vim-syntax" |
| 74 |
|
| 75 |
for mod in $NGINX_MODULES_STD; do |
| 76 |
@@ -282,17 +282,14 @@ CDEPEND=" |
| 77 |
pcre? ( dev-libs/libpcre:= ) |
| 78 |
pcre-jit? ( dev-libs/libpcre:=[jit] ) |
| 79 |
ssl? ( |
| 80 |
- !libressl? ( dev-libs/openssl:0= ) |
| 81 |
- libressl? ( dev-libs/libressl:= ) |
| 82 |
+ dev-libs/openssl:0= |
| 83 |
) |
| 84 |
http2? ( |
| 85 |
- !libressl? ( >=dev-libs/openssl-1.0.1c:0= ) |
| 86 |
- libressl? ( dev-libs/libressl:= ) |
| 87 |
+ >=dev-libs/openssl-1.0.1c:0= |
| 88 |
) |
| 89 |
http-cache? ( |
| 90 |
userland_GNU? ( |
| 91 |
- !libressl? ( dev-libs/openssl:0= ) |
| 92 |
- libressl? ( dev-libs/libressl:= ) |
| 93 |
+ dev-libs/openssl:0= |
| 94 |
) |
| 95 |
) |
| 96 |
nginx_modules_http_brotli? ( app-arch/brotli:= ) |
| 97 |
@@ -306,8 +303,7 @@ CDEPEND=" |
| 98 |
nginx_modules_http_rewrite? ( dev-libs/libpcre:= ) |
| 99 |
nginx_modules_http_secure_link? ( |
| 100 |
userland_GNU? ( |
| 101 |
- !libressl? ( dev-libs/openssl:0= ) |
| 102 |
- libressl? ( dev-libs/libressl:= ) |
| 103 |
+ dev-libs/openssl:0= |
| 104 |
) |
| 105 |
) |
| 106 |
nginx_modules_http_xslt? ( dev-libs/libxml2:= dev-libs/libxslt ) |
| 107 |
|
| 108 |
diff --git a/www-servers/nginx/nginx-1.19.9.ebuild b/www-servers/nginx/nginx-1.19.9.ebuild |
| 109 |
index 11e748bc8c2..1cdf07062df 100644 |
| 110 |
--- a/www-servers/nginx/nginx-1.19.9.ebuild |
| 111 |
+++ b/www-servers/nginx/nginx-1.19.9.ebuild |
| 112 |
@@ -247,7 +247,7 @@ NGINX_MODULES_3RD=" |
| 113 |
stream_javascript |
| 114 |
" |
| 115 |
|
| 116 |
-IUSE="aio debug +http +http2 +http-cache +ipv6 libatomic libressl +pcre |
| 117 |
+IUSE="aio debug +http +http2 +http-cache +ipv6 libatomic +pcre |
| 118 |
pcre-jit rtmp selinux ssl threads userland_GNU vim-syntax" |
| 119 |
|
| 120 |
for mod in $NGINX_MODULES_STD; do |
| 121 |
@@ -282,17 +282,14 @@ CDEPEND=" |
| 122 |
pcre? ( dev-libs/libpcre:= ) |
| 123 |
pcre-jit? ( dev-libs/libpcre:=[jit] ) |
| 124 |
ssl? ( |
| 125 |
- !libressl? ( dev-libs/openssl:0= ) |
| 126 |
- libressl? ( dev-libs/libressl:= ) |
| 127 |
+ dev-libs/openssl:0= |
| 128 |
) |
| 129 |
http2? ( |
| 130 |
- !libressl? ( >=dev-libs/openssl-1.0.1c:0= ) |
| 131 |
- libressl? ( dev-libs/libressl:= ) |
| 132 |
+ >=dev-libs/openssl-1.0.1c:0= |
| 133 |
) |
| 134 |
http-cache? ( |
| 135 |
userland_GNU? ( |
| 136 |
- !libressl? ( dev-libs/openssl:0= ) |
| 137 |
- libressl? ( dev-libs/libressl:= ) |
| 138 |
+ dev-libs/openssl:0= |
| 139 |
) |
| 140 |
) |
| 141 |
nginx_modules_http_brotli? ( app-arch/brotli:= ) |
| 142 |
@@ -306,8 +303,7 @@ CDEPEND=" |
| 143 |
nginx_modules_http_rewrite? ( dev-libs/libpcre:= ) |
| 144 |
nginx_modules_http_secure_link? ( |
| 145 |
userland_GNU? ( |
| 146 |
- !libressl? ( dev-libs/openssl:0= ) |
| 147 |
- libressl? ( dev-libs/libressl:= ) |
| 148 |
+ dev-libs/openssl:0= |
| 149 |
) |
| 150 |
) |
| 151 |
nginx_modules_http_xslt? ( dev-libs/libxml2:= dev-libs/libxslt ) |
Archives