commit: 0f7e1a5302f8c412f1017cf7d9ba678c2f7fa0cc
Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Sun May 2 09:05:40 2021 +0000
Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Sun May 2 09:05:40 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0f7e1a53
app-admin/rsyslog: remove libressl support
Package-Manager: Portage-3.0.18, Repoman-3.0.2
Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>
app-admin/rsyslog/metadata.xml | 3 +--
app-admin/rsyslog/rsyslog-8.2008.0.ebuild | 8 +++-----
app-admin/rsyslog/rsyslog-8.2010.0.ebuild | 8 +++-----
app-admin/rsyslog/rsyslog-8.2012.0-r1.ebuild | 8 +++-----
app-admin/rsyslog/rsyslog-8.2012.0.ebuild | 8 +++-----
app-admin/rsyslog/rsyslog-8.2102.0.ebuild | 8 +++-----
app-admin/rsyslog/rsyslog-8.2104.0.ebuild | 8 +++-----
7 files changed, 19 insertions(+), 32 deletions(-)
diff --git a/app-admin/rsyslog/metadata.xml b/app-admin/rsyslog/metadata.xml
index 8edddd33ee5..a5c7f6b9d28 100644
--- a/app-admin/rsyslog/metadata.xml
+++ b/app-admin/rsyslog/metadata.xml
@@ -17,7 +17,6 @@
<flag name="kafka">Build the Apache Kafka input/output module
(requires <pkg>dev-libs/librdkafka</pkg>)</flag>
<flag name="kerberos">Build the GSSAPI input and output module
(requires <pkg>virtual/krb5</pkg>)</flag>
<flag name="kubernetes">Build the kubernetes modify plugin
(requires <pkg>net-misc/curl</pkg>)</flag>
- <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>
<flag name="mdblookup">Build the MaxMind DB lookup message
modify plugin using <pkg>dev-libs/libmaxminddb</pkg></flag>
<flag name="mongodb">Build the MongoDB output module (requires
<pkg>dev-libs/mongo-c-driver</pkg>)</flag>
<flag name="mysql">Build the MySQL database output module
(requires <pkg>virtual/mysql</pkg>)</flag>
@@ -31,7 +30,7 @@
<flag name="redis">Build the Redis output module using
(requires <pkg>dev-libs/hiredis</pkg>)</flag>
<flag name="relp">Build the Reliable Event Logging Protocol
(RELP) output module (requires <pkg>dev-libs/librelp</pkg>)</flag>
<flag name="rfc3195">Build the rfc3195 input module (requires
<pkg>dev-libs/liblogging</pkg>)</flag>
- <flag name="rfc5424hmac">Build the rfc5424hmac modify module
(requires <pkg>dev-libs/openssl</pkg> or <pkg>dev-libs/libressl</pkg>)</flag>
+ <flag name="rfc5424hmac">Build the rfc5424hmac modify module
(requires <pkg>dev-libs/openssl</pkg>)</flag>
<flag name="snmp">Build the snmp modify and output module
(requires <pkg>net-analyzer/net-snmp</pkg>)</flag>
<flag name="ssl">Add support for encrypted client/server
communication (requires <pkg>net-libs/gnutls</pkg>)</flag>
<flag name="systemd">Build the journal input and output module
(requires <pkg>sys-apps/systemd</pkg>)</flag>
diff --git a/app-admin/rsyslog/rsyslog-8.2008.0.ebuild
b/app-admin/rsyslog/rsyslog-8.2008.0.ebuild
index 102b62ab875..b27254f4889 100644
--- a/app-admin/rsyslog/rsyslog-8.2008.0.ebuild
+++ b/app-admin/rsyslog/rsyslog-8.2008.0.ebuild
@@ -26,7 +26,7 @@ fi
LICENSE="GPL-3 LGPL-3 Apache-2.0"
SLOT="0"
-IUSE="curl dbi debug doc elasticsearch +gcrypt gnutls jemalloc kafka kerberos
kubernetes libressl mdblookup"
+IUSE="curl dbi debug doc elasticsearch +gcrypt gnutls jemalloc kafka kerberos
kubernetes mdblookup"
IUSE+=" mongodb mysql normalize clickhouse omhttp omhttpfs omudpspoof openssl
postgres"
IUSE+=" rabbitmq redis relp rfc3195 rfc5424hmac snmp ssl systemd test
usertools +uuid xxhash zeromq"
RESTRICT="!test? ( test )"
@@ -58,15 +58,13 @@ RDEPEND="
relp? ( >=dev-libs/librelp-1.2.17:= )
rfc3195? ( >=dev-libs/liblogging-1.0.1:=[rfc3195] )
rfc5424hmac? (
- !libressl? ( >=dev-libs/openssl-0.9.8y:0= )
- libressl? ( dev-libs/libressl:= )
+ >=dev-libs/openssl-0.9.8y:0=
)
snmp? ( >=net-analyzer/net-snmp-5.7.2 )
ssl? (
gnutls? ( >=net-libs/gnutls-2.12.23:0= )
openssl? (
- !libressl? ( dev-libs/openssl:0= )
- libressl? ( dev-libs/libressl:0= )
+ dev-libs/openssl:0=
)
)
systemd? ( >=sys-apps/systemd-234 )
diff --git a/app-admin/rsyslog/rsyslog-8.2010.0.ebuild
b/app-admin/rsyslog/rsyslog-8.2010.0.ebuild
index 5302087c872..82437e2752e 100644
--- a/app-admin/rsyslog/rsyslog-8.2010.0.ebuild
+++ b/app-admin/rsyslog/rsyslog-8.2010.0.ebuild
@@ -28,7 +28,7 @@ LICENSE="GPL-3 LGPL-3 Apache-2.0"
SLOT="0"
IUSE="clickhouse curl dbi debug doc elasticsearch +gcrypt gnutls imhttp"
-IUSE+=" impcap jemalloc kafka kerberos kubernetes libressl mdblookup"
+IUSE+=" impcap jemalloc kafka kerberos kubernetes mdblookup"
IUSE+=" mongodb mysql normalize omhttp omhttpfs omudpspoof +openssl"
IUSE+=" postgres rabbitmq redis relp rfc3195 rfc5424hmac snmp +ssl"
IUSE+=" systemd test usertools +uuid xxhash zeromq"
@@ -78,15 +78,13 @@ RDEPEND="
relp? ( >=dev-libs/librelp-1.2.17:= )
rfc3195? ( >=dev-libs/liblogging-1.0.1:=[rfc3195] )
rfc5424hmac? (
- !libressl? ( >=dev-libs/openssl-0.9.8y:0= )
- libressl? ( dev-libs/libressl:= )
+ >=dev-libs/openssl-0.9.8y:0=
)
snmp? ( >=net-analyzer/net-snmp-5.7.2 )
ssl? (
gnutls? ( >=net-libs/gnutls-2.12.23:0= )
openssl? (
- !libressl? ( dev-libs/openssl:0= )
- libressl? ( dev-libs/libressl:0= )
+ dev-libs/openssl:0=
)
)
systemd? ( >=sys-apps/systemd-234 )
diff --git a/app-admin/rsyslog/rsyslog-8.2012.0-r1.ebuild
b/app-admin/rsyslog/rsyslog-8.2012.0-r1.ebuild
index cd133449943..e2470ad673f 100644
--- a/app-admin/rsyslog/rsyslog-8.2012.0-r1.ebuild
+++ b/app-admin/rsyslog/rsyslog-8.2012.0-r1.ebuild
@@ -28,7 +28,7 @@ LICENSE="GPL-3 LGPL-3 Apache-2.0"
SLOT="0"
IUSE="clickhouse curl dbi debug doc elasticsearch +gcrypt gnutls imhttp"
-IUSE+=" impcap jemalloc kafka kerberos kubernetes libressl mdblookup"
+IUSE+=" impcap jemalloc kafka kerberos kubernetes mdblookup"
IUSE+=" mongodb mysql normalize omhttp omhttpfs omudpspoof +openssl"
IUSE+=" postgres rabbitmq redis relp rfc3195 rfc5424hmac snmp +ssl"
IUSE+=" systemd test usertools +uuid xxhash zeromq"
@@ -78,15 +78,13 @@ RDEPEND="
relp? ( >=dev-libs/librelp-1.2.17:= )
rfc3195? ( >=dev-libs/liblogging-1.0.1:=[rfc3195] )
rfc5424hmac? (
- !libressl? ( >=dev-libs/openssl-0.9.8y:0= )
- libressl? ( dev-libs/libressl:= )
+ >=dev-libs/openssl-0.9.8y:0=
)
snmp? ( >=net-analyzer/net-snmp-5.7.2 )
ssl? (
gnutls? ( >=net-libs/gnutls-2.12.23:0= )
openssl? (
- !libressl? ( dev-libs/openssl:0= )
- libressl? ( dev-libs/libressl:0= )
+ dev-libs/openssl:0=
)
)
systemd? ( >=sys-apps/systemd-234 )
diff --git a/app-admin/rsyslog/rsyslog-8.2012.0.ebuild
b/app-admin/rsyslog/rsyslog-8.2012.0.ebuild
index 5302087c872..82437e2752e 100644
--- a/app-admin/rsyslog/rsyslog-8.2012.0.ebuild
+++ b/app-admin/rsyslog/rsyslog-8.2012.0.ebuild
@@ -28,7 +28,7 @@ LICENSE="GPL-3 LGPL-3 Apache-2.0"
SLOT="0"
IUSE="clickhouse curl dbi debug doc elasticsearch +gcrypt gnutls imhttp"
-IUSE+=" impcap jemalloc kafka kerberos kubernetes libressl mdblookup"
+IUSE+=" impcap jemalloc kafka kerberos kubernetes mdblookup"
IUSE+=" mongodb mysql normalize omhttp omhttpfs omudpspoof +openssl"
IUSE+=" postgres rabbitmq redis relp rfc3195 rfc5424hmac snmp +ssl"
IUSE+=" systemd test usertools +uuid xxhash zeromq"
@@ -78,15 +78,13 @@ RDEPEND="
relp? ( >=dev-libs/librelp-1.2.17:= )
rfc3195? ( >=dev-libs/liblogging-1.0.1:=[rfc3195] )
rfc5424hmac? (
- !libressl? ( >=dev-libs/openssl-0.9.8y:0= )
- libressl? ( dev-libs/libressl:= )
+ >=dev-libs/openssl-0.9.8y:0=
)
snmp? ( >=net-analyzer/net-snmp-5.7.2 )
ssl? (
gnutls? ( >=net-libs/gnutls-2.12.23:0= )
openssl? (
- !libressl? ( dev-libs/openssl:0= )
- libressl? ( dev-libs/libressl:0= )
+ dev-libs/openssl:0=
)
)
systemd? ( >=sys-apps/systemd-234 )
diff --git a/app-admin/rsyslog/rsyslog-8.2102.0.ebuild
b/app-admin/rsyslog/rsyslog-8.2102.0.ebuild
index 657d9410a1c..02784fa9908 100644
--- a/app-admin/rsyslog/rsyslog-8.2102.0.ebuild
+++ b/app-admin/rsyslog/rsyslog-8.2102.0.ebuild
@@ -28,7 +28,7 @@ LICENSE="GPL-3 LGPL-3 Apache-2.0"
SLOT="0"
IUSE="clickhouse curl dbi debug doc elasticsearch +gcrypt gnutls imhttp"
-IUSE+=" impcap jemalloc kafka kerberos kubernetes libressl mdblookup"
+IUSE+=" impcap jemalloc kafka kerberos kubernetes mdblookup"
IUSE+=" mongodb mysql normalize omhttp omhttpfs omudpspoof +openssl"
IUSE+=" postgres rabbitmq redis relp rfc3195 rfc5424hmac snmp +ssl"
IUSE+=" systemd test usertools +uuid xxhash zeromq"
@@ -78,15 +78,13 @@ RDEPEND="
relp? ( >=dev-libs/librelp-1.2.17:= )
rfc3195? ( >=dev-libs/liblogging-1.0.1:=[rfc3195] )
rfc5424hmac? (
- !libressl? ( >=dev-libs/openssl-0.9.8y:0= )
- libressl? ( dev-libs/libressl:= )
+ >=dev-libs/openssl-0.9.8y:0=
)
snmp? ( >=net-analyzer/net-snmp-5.7.2 )
ssl? (
gnutls? ( >=net-libs/gnutls-2.12.23:0= )
openssl? (
- !libressl? ( dev-libs/openssl:0= )
- libressl? ( dev-libs/libressl:0= )
+ dev-libs/openssl:0=
)
)
systemd? ( >=sys-apps/systemd-234 )
diff --git a/app-admin/rsyslog/rsyslog-8.2104.0.ebuild
b/app-admin/rsyslog/rsyslog-8.2104.0.ebuild
index 4fd8716916c..731eb7f499c 100644
--- a/app-admin/rsyslog/rsyslog-8.2104.0.ebuild
+++ b/app-admin/rsyslog/rsyslog-8.2104.0.ebuild
@@ -28,7 +28,7 @@ LICENSE="GPL-3 LGPL-3 Apache-2.0"
SLOT="0"
IUSE="clickhouse curl dbi debug doc elasticsearch +gcrypt gnutls imhttp"
-IUSE+=" impcap jemalloc kafka kerberos kubernetes libressl mdblookup"
+IUSE+=" impcap jemalloc kafka kerberos kubernetes mdblookup"
IUSE+=" mongodb mysql normalize omhttp omhttpfs omudpspoof +openssl"
IUSE+=" postgres rabbitmq redis relp rfc3195 rfc5424hmac snmp +ssl"
IUSE+=" systemd test usertools +uuid xxhash zeromq"
@@ -78,15 +78,13 @@ RDEPEND="
relp? ( >=dev-libs/librelp-1.2.17:= )
rfc3195? ( >=dev-libs/liblogging-1.0.1:=[rfc3195] )
rfc5424hmac? (
- !libressl? ( >=dev-libs/openssl-0.9.8y:0= )
- libressl? ( dev-libs/libressl:= )
+ >=dev-libs/openssl-0.9.8y:0=
)
snmp? ( >=net-analyzer/net-snmp-5.7.2 )
ssl? (
gnutls? ( >=net-libs/gnutls-2.12.23:0= )
openssl? (
- !libressl? ( dev-libs/openssl:0= )
- libressl? ( dev-libs/libressl:0= )
+ dev-libs/openssl:0=
)
)
systemd? ( >=sys-apps/systemd-234 )
