| 1 |
commit: 0f7e1a5302f8c412f1017cf7d9ba678c2f7fa0cc |
| 2 |
Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun May 2 09:05:40 2021 +0000 |
| 4 |
Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun May 2 09:05:40 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0f7e1a53 |
| 7 |
|
| 8 |
app-admin/rsyslog: 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 |
app-admin/rsyslog/metadata.xml | 3 +-- |
| 14 |
app-admin/rsyslog/rsyslog-8.2008.0.ebuild | 8 +++----- |
| 15 |
app-admin/rsyslog/rsyslog-8.2010.0.ebuild | 8 +++----- |
| 16 |
app-admin/rsyslog/rsyslog-8.2012.0-r1.ebuild | 8 +++----- |
| 17 |
app-admin/rsyslog/rsyslog-8.2012.0.ebuild | 8 +++----- |
| 18 |
app-admin/rsyslog/rsyslog-8.2102.0.ebuild | 8 +++----- |
| 19 |
app-admin/rsyslog/rsyslog-8.2104.0.ebuild | 8 +++----- |
| 20 |
7 files changed, 19 insertions(+), 32 deletions(-) |
| 21 |
|
| 22 |
diff --git a/app-admin/rsyslog/metadata.xml b/app-admin/rsyslog/metadata.xml |
| 23 |
index 8edddd33ee5..a5c7f6b9d28 100644 |
| 24 |
--- a/app-admin/rsyslog/metadata.xml |
| 25 |
+++ b/app-admin/rsyslog/metadata.xml |
| 26 |
@@ -17,7 +17,6 @@ |
| 27 |
<flag name="kafka">Build the Apache Kafka input/output module (requires <pkg>dev-libs/librdkafka</pkg>)</flag> |
| 28 |
<flag name="kerberos">Build the GSSAPI input and output module (requires <pkg>virtual/krb5</pkg>)</flag> |
| 29 |
<flag name="kubernetes">Build the kubernetes modify plugin (requires <pkg>net-misc/curl</pkg>)</flag> |
| 30 |
- <flag name="libressl">Use <pkg>dev-libs/libressl</pkg> instead of <pkg>dev-libs/openssl</pkg> (you still need to enable functionality which requires OpenSSL)</flag> |
| 31 |
<flag name="mdblookup">Build the MaxMind DB lookup message modify plugin using <pkg>dev-libs/libmaxminddb</pkg></flag> |
| 32 |
<flag name="mongodb">Build the MongoDB output module (requires <pkg>dev-libs/mongo-c-driver</pkg>)</flag> |
| 33 |
<flag name="mysql">Build the MySQL database output module (requires <pkg>virtual/mysql</pkg>)</flag> |
| 34 |
@@ -31,7 +30,7 @@ |
| 35 |
<flag name="redis">Build the Redis output module using (requires <pkg>dev-libs/hiredis</pkg>)</flag> |
| 36 |
<flag name="relp">Build the Reliable Event Logging Protocol (RELP) output module (requires <pkg>dev-libs/librelp</pkg>)</flag> |
| 37 |
<flag name="rfc3195">Build the rfc3195 input module (requires <pkg>dev-libs/liblogging</pkg>)</flag> |
| 38 |
- <flag name="rfc5424hmac">Build the rfc5424hmac modify module (requires <pkg>dev-libs/openssl</pkg> or <pkg>dev-libs/libressl</pkg>)</flag> |
| 39 |
+ <flag name="rfc5424hmac">Build the rfc5424hmac modify module (requires <pkg>dev-libs/openssl</pkg>)</flag> |
| 40 |
<flag name="snmp">Build the snmp modify and output module (requires <pkg>net-analyzer/net-snmp</pkg>)</flag> |
| 41 |
<flag name="ssl">Add support for encrypted client/server communication (requires <pkg>net-libs/gnutls</pkg>)</flag> |
| 42 |
<flag name="systemd">Build the journal input and output module (requires <pkg>sys-apps/systemd</pkg>)</flag> |
| 43 |
|
| 44 |
diff --git a/app-admin/rsyslog/rsyslog-8.2008.0.ebuild b/app-admin/rsyslog/rsyslog-8.2008.0.ebuild |
| 45 |
index 102b62ab875..b27254f4889 100644 |
| 46 |
--- a/app-admin/rsyslog/rsyslog-8.2008.0.ebuild |
| 47 |
+++ b/app-admin/rsyslog/rsyslog-8.2008.0.ebuild |
| 48 |
@@ -26,7 +26,7 @@ fi |
| 49 |
|
| 50 |
LICENSE="GPL-3 LGPL-3 Apache-2.0" |
| 51 |
SLOT="0" |
| 52 |
-IUSE="curl dbi debug doc elasticsearch +gcrypt gnutls jemalloc kafka kerberos kubernetes libressl mdblookup" |
| 53 |
+IUSE="curl dbi debug doc elasticsearch +gcrypt gnutls jemalloc kafka kerberos kubernetes mdblookup" |
| 54 |
IUSE+=" mongodb mysql normalize clickhouse omhttp omhttpfs omudpspoof openssl postgres" |
| 55 |
IUSE+=" rabbitmq redis relp rfc3195 rfc5424hmac snmp ssl systemd test usertools +uuid xxhash zeromq" |
| 56 |
RESTRICT="!test? ( test )" |
| 57 |
@@ -58,15 +58,13 @@ RDEPEND=" |
| 58 |
relp? ( >=dev-libs/librelp-1.2.17:= ) |
| 59 |
rfc3195? ( >=dev-libs/liblogging-1.0.1:=[rfc3195] ) |
| 60 |
rfc5424hmac? ( |
| 61 |
- !libressl? ( >=dev-libs/openssl-0.9.8y:0= ) |
| 62 |
- libressl? ( dev-libs/libressl:= ) |
| 63 |
+ >=dev-libs/openssl-0.9.8y:0= |
| 64 |
) |
| 65 |
snmp? ( >=net-analyzer/net-snmp-5.7.2 ) |
| 66 |
ssl? ( |
| 67 |
gnutls? ( >=net-libs/gnutls-2.12.23:0= ) |
| 68 |
openssl? ( |
| 69 |
- !libressl? ( dev-libs/openssl:0= ) |
| 70 |
- libressl? ( dev-libs/libressl:0= ) |
| 71 |
+ dev-libs/openssl:0= |
| 72 |
) |
| 73 |
) |
| 74 |
systemd? ( >=sys-apps/systemd-234 ) |
| 75 |
|
| 76 |
diff --git a/app-admin/rsyslog/rsyslog-8.2010.0.ebuild b/app-admin/rsyslog/rsyslog-8.2010.0.ebuild |
| 77 |
index 5302087c872..82437e2752e 100644 |
| 78 |
--- a/app-admin/rsyslog/rsyslog-8.2010.0.ebuild |
| 79 |
+++ b/app-admin/rsyslog/rsyslog-8.2010.0.ebuild |
| 80 |
@@ -28,7 +28,7 @@ LICENSE="GPL-3 LGPL-3 Apache-2.0" |
| 81 |
SLOT="0" |
| 82 |
|
| 83 |
IUSE="clickhouse curl dbi debug doc elasticsearch +gcrypt gnutls imhttp" |
| 84 |
-IUSE+=" impcap jemalloc kafka kerberos kubernetes libressl mdblookup" |
| 85 |
+IUSE+=" impcap jemalloc kafka kerberos kubernetes mdblookup" |
| 86 |
IUSE+=" mongodb mysql normalize omhttp omhttpfs omudpspoof +openssl" |
| 87 |
IUSE+=" postgres rabbitmq redis relp rfc3195 rfc5424hmac snmp +ssl" |
| 88 |
IUSE+=" systemd test usertools +uuid xxhash zeromq" |
| 89 |
@@ -78,15 +78,13 @@ RDEPEND=" |
| 90 |
relp? ( >=dev-libs/librelp-1.2.17:= ) |
| 91 |
rfc3195? ( >=dev-libs/liblogging-1.0.1:=[rfc3195] ) |
| 92 |
rfc5424hmac? ( |
| 93 |
- !libressl? ( >=dev-libs/openssl-0.9.8y:0= ) |
| 94 |
- libressl? ( dev-libs/libressl:= ) |
| 95 |
+ >=dev-libs/openssl-0.9.8y:0= |
| 96 |
) |
| 97 |
snmp? ( >=net-analyzer/net-snmp-5.7.2 ) |
| 98 |
ssl? ( |
| 99 |
gnutls? ( >=net-libs/gnutls-2.12.23:0= ) |
| 100 |
openssl? ( |
| 101 |
- !libressl? ( dev-libs/openssl:0= ) |
| 102 |
- libressl? ( dev-libs/libressl:0= ) |
| 103 |
+ dev-libs/openssl:0= |
| 104 |
) |
| 105 |
) |
| 106 |
systemd? ( >=sys-apps/systemd-234 ) |
| 107 |
|
| 108 |
diff --git a/app-admin/rsyslog/rsyslog-8.2012.0-r1.ebuild b/app-admin/rsyslog/rsyslog-8.2012.0-r1.ebuild |
| 109 |
index cd133449943..e2470ad673f 100644 |
| 110 |
--- a/app-admin/rsyslog/rsyslog-8.2012.0-r1.ebuild |
| 111 |
+++ b/app-admin/rsyslog/rsyslog-8.2012.0-r1.ebuild |
| 112 |
@@ -28,7 +28,7 @@ LICENSE="GPL-3 LGPL-3 Apache-2.0" |
| 113 |
SLOT="0" |
| 114 |
|
| 115 |
IUSE="clickhouse curl dbi debug doc elasticsearch +gcrypt gnutls imhttp" |
| 116 |
-IUSE+=" impcap jemalloc kafka kerberos kubernetes libressl mdblookup" |
| 117 |
+IUSE+=" impcap jemalloc kafka kerberos kubernetes mdblookup" |
| 118 |
IUSE+=" mongodb mysql normalize omhttp omhttpfs omudpspoof +openssl" |
| 119 |
IUSE+=" postgres rabbitmq redis relp rfc3195 rfc5424hmac snmp +ssl" |
| 120 |
IUSE+=" systemd test usertools +uuid xxhash zeromq" |
| 121 |
@@ -78,15 +78,13 @@ RDEPEND=" |
| 122 |
relp? ( >=dev-libs/librelp-1.2.17:= ) |
| 123 |
rfc3195? ( >=dev-libs/liblogging-1.0.1:=[rfc3195] ) |
| 124 |
rfc5424hmac? ( |
| 125 |
- !libressl? ( >=dev-libs/openssl-0.9.8y:0= ) |
| 126 |
- libressl? ( dev-libs/libressl:= ) |
| 127 |
+ >=dev-libs/openssl-0.9.8y:0= |
| 128 |
) |
| 129 |
snmp? ( >=net-analyzer/net-snmp-5.7.2 ) |
| 130 |
ssl? ( |
| 131 |
gnutls? ( >=net-libs/gnutls-2.12.23:0= ) |
| 132 |
openssl? ( |
| 133 |
- !libressl? ( dev-libs/openssl:0= ) |
| 134 |
- libressl? ( dev-libs/libressl:0= ) |
| 135 |
+ dev-libs/openssl:0= |
| 136 |
) |
| 137 |
) |
| 138 |
systemd? ( >=sys-apps/systemd-234 ) |
| 139 |
|
| 140 |
diff --git a/app-admin/rsyslog/rsyslog-8.2012.0.ebuild b/app-admin/rsyslog/rsyslog-8.2012.0.ebuild |
| 141 |
index 5302087c872..82437e2752e 100644 |
| 142 |
--- a/app-admin/rsyslog/rsyslog-8.2012.0.ebuild |
| 143 |
+++ b/app-admin/rsyslog/rsyslog-8.2012.0.ebuild |
| 144 |
@@ -28,7 +28,7 @@ LICENSE="GPL-3 LGPL-3 Apache-2.0" |
| 145 |
SLOT="0" |
| 146 |
|
| 147 |
IUSE="clickhouse curl dbi debug doc elasticsearch +gcrypt gnutls imhttp" |
| 148 |
-IUSE+=" impcap jemalloc kafka kerberos kubernetes libressl mdblookup" |
| 149 |
+IUSE+=" impcap jemalloc kafka kerberos kubernetes mdblookup" |
| 150 |
IUSE+=" mongodb mysql normalize omhttp omhttpfs omudpspoof +openssl" |
| 151 |
IUSE+=" postgres rabbitmq redis relp rfc3195 rfc5424hmac snmp +ssl" |
| 152 |
IUSE+=" systemd test usertools +uuid xxhash zeromq" |
| 153 |
@@ -78,15 +78,13 @@ RDEPEND=" |
| 154 |
relp? ( >=dev-libs/librelp-1.2.17:= ) |
| 155 |
rfc3195? ( >=dev-libs/liblogging-1.0.1:=[rfc3195] ) |
| 156 |
rfc5424hmac? ( |
| 157 |
- !libressl? ( >=dev-libs/openssl-0.9.8y:0= ) |
| 158 |
- libressl? ( dev-libs/libressl:= ) |
| 159 |
+ >=dev-libs/openssl-0.9.8y:0= |
| 160 |
) |
| 161 |
snmp? ( >=net-analyzer/net-snmp-5.7.2 ) |
| 162 |
ssl? ( |
| 163 |
gnutls? ( >=net-libs/gnutls-2.12.23:0= ) |
| 164 |
openssl? ( |
| 165 |
- !libressl? ( dev-libs/openssl:0= ) |
| 166 |
- libressl? ( dev-libs/libressl:0= ) |
| 167 |
+ dev-libs/openssl:0= |
| 168 |
) |
| 169 |
) |
| 170 |
systemd? ( >=sys-apps/systemd-234 ) |
| 171 |
|
| 172 |
diff --git a/app-admin/rsyslog/rsyslog-8.2102.0.ebuild b/app-admin/rsyslog/rsyslog-8.2102.0.ebuild |
| 173 |
index 657d9410a1c..02784fa9908 100644 |
| 174 |
--- a/app-admin/rsyslog/rsyslog-8.2102.0.ebuild |
| 175 |
+++ b/app-admin/rsyslog/rsyslog-8.2102.0.ebuild |
| 176 |
@@ -28,7 +28,7 @@ LICENSE="GPL-3 LGPL-3 Apache-2.0" |
| 177 |
SLOT="0" |
| 178 |
|
| 179 |
IUSE="clickhouse curl dbi debug doc elasticsearch +gcrypt gnutls imhttp" |
| 180 |
-IUSE+=" impcap jemalloc kafka kerberos kubernetes libressl mdblookup" |
| 181 |
+IUSE+=" impcap jemalloc kafka kerberos kubernetes mdblookup" |
| 182 |
IUSE+=" mongodb mysql normalize omhttp omhttpfs omudpspoof +openssl" |
| 183 |
IUSE+=" postgres rabbitmq redis relp rfc3195 rfc5424hmac snmp +ssl" |
| 184 |
IUSE+=" systemd test usertools +uuid xxhash zeromq" |
| 185 |
@@ -78,15 +78,13 @@ RDEPEND=" |
| 186 |
relp? ( >=dev-libs/librelp-1.2.17:= ) |
| 187 |
rfc3195? ( >=dev-libs/liblogging-1.0.1:=[rfc3195] ) |
| 188 |
rfc5424hmac? ( |
| 189 |
- !libressl? ( >=dev-libs/openssl-0.9.8y:0= ) |
| 190 |
- libressl? ( dev-libs/libressl:= ) |
| 191 |
+ >=dev-libs/openssl-0.9.8y:0= |
| 192 |
) |
| 193 |
snmp? ( >=net-analyzer/net-snmp-5.7.2 ) |
| 194 |
ssl? ( |
| 195 |
gnutls? ( >=net-libs/gnutls-2.12.23:0= ) |
| 196 |
openssl? ( |
| 197 |
- !libressl? ( dev-libs/openssl:0= ) |
| 198 |
- libressl? ( dev-libs/libressl:0= ) |
| 199 |
+ dev-libs/openssl:0= |
| 200 |
) |
| 201 |
) |
| 202 |
systemd? ( >=sys-apps/systemd-234 ) |
| 203 |
|
| 204 |
diff --git a/app-admin/rsyslog/rsyslog-8.2104.0.ebuild b/app-admin/rsyslog/rsyslog-8.2104.0.ebuild |
| 205 |
index 4fd8716916c..731eb7f499c 100644 |
| 206 |
--- a/app-admin/rsyslog/rsyslog-8.2104.0.ebuild |
| 207 |
+++ b/app-admin/rsyslog/rsyslog-8.2104.0.ebuild |
| 208 |
@@ -28,7 +28,7 @@ LICENSE="GPL-3 LGPL-3 Apache-2.0" |
| 209 |
SLOT="0" |
| 210 |
|
| 211 |
IUSE="clickhouse curl dbi debug doc elasticsearch +gcrypt gnutls imhttp" |
| 212 |
-IUSE+=" impcap jemalloc kafka kerberos kubernetes libressl mdblookup" |
| 213 |
+IUSE+=" impcap jemalloc kafka kerberos kubernetes mdblookup" |
| 214 |
IUSE+=" mongodb mysql normalize omhttp omhttpfs omudpspoof +openssl" |
| 215 |
IUSE+=" postgres rabbitmq redis relp rfc3195 rfc5424hmac snmp +ssl" |
| 216 |
IUSE+=" systemd test usertools +uuid xxhash zeromq" |
| 217 |
@@ -78,15 +78,13 @@ RDEPEND=" |
| 218 |
relp? ( >=dev-libs/librelp-1.2.17:= ) |
| 219 |
rfc3195? ( >=dev-libs/liblogging-1.0.1:=[rfc3195] ) |
| 220 |
rfc5424hmac? ( |
| 221 |
- !libressl? ( >=dev-libs/openssl-0.9.8y:0= ) |
| 222 |
- libressl? ( dev-libs/libressl:= ) |
| 223 |
+ >=dev-libs/openssl-0.9.8y:0= |
| 224 |
) |
| 225 |
snmp? ( >=net-analyzer/net-snmp-5.7.2 ) |
| 226 |
ssl? ( |
| 227 |
gnutls? ( >=net-libs/gnutls-2.12.23:0= ) |
| 228 |
openssl? ( |
| 229 |
- !libressl? ( dev-libs/openssl:0= ) |
| 230 |
- libressl? ( dev-libs/libressl:0= ) |
| 231 |
+ dev-libs/openssl:0= |
| 232 |
) |
| 233 |
) |
| 234 |
systemd? ( >=sys-apps/systemd-234 ) |
Archives