[gentoo-commits] repo/gentoo:master commit in: net-misc/s6-networking/

["William Hubbs" <williamh@gentoo.org>]

commit:     8033736e722a25c4efbb83de5f69a984f08f3428
Author:     William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 29 01:14:10 2020 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Tue Dec 29 01:21:42 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8033736e

net-misc/s6-networking: remove libressl dependency

The ssl use flag for s6-networking requires libressl which is not being
used by most users since it is incompatible with OpenSSL.
After discussions with the qa team, the best option is to disable ssl support.

Closes: https://bugs.gentoo.org/762313
Signed-off-by: William Hubbs <williamh <AT> gentoo.org>

 net-misc/s6-networking/metadata.xml                 | 3 +--
 net-misc/s6-networking/s6-networking-2.3.0.2.ebuild | 7 ++-----
 net-misc/s6-networking/s6-networking-2.3.0.3.ebuild | 6 ++----
 net-misc/s6-networking/s6-networking-2.3.0.4.ebuild | 6 ++----
 net-misc/s6-networking/s6-networking-2.3.1.1.ebuild | 6 ++----
 net-misc/s6-networking/s6-networking-2.3.2.0.ebuild | 6 ++----
 6 files changed, 11 insertions(+), 23 deletions(-)

diff --git a/net-misc/s6-networking/metadata.xml b/net-misc/s6-networking/metadata.xml
index 97feaaf4d36..6ecd43a97a7 100644
--- a/net-misc/s6-networking/metadata.xml
+++ b/net-misc/s6-networking/metadata.xml
@@ -9,7 +9,6 @@
 		s6-networking is a suite of small networking utilities for Unix systems.
 		It includes command-line client and server management, TCP access
 		control, privilege escalation across UNIX domain sockets, IDENT protocol
-		management and clock synchronization. Optionally, it also includes
-		command-line TLS/SSL tools for secure communications.
+		management and clock synchronization.
 	</longdescription>
 </pkgmetadata>

diff --git a/net-misc/s6-networking/s6-networking-2.3.0.2.ebuild b/net-misc/s6-networking/s6-networking-2.3.0.2.ebuild
index c8544a93760..6aa894cbc45 100644
--- a/net-misc/s6-networking/s6-networking-2.3.0.2.ebuild
+++ b/net-misc/s6-networking/s6-networking-2.3.0.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz"
 LICENSE="ISC"
 SLOT="0/$(get_version_component_range 1-2)"
 KEYWORDS="~amd64 ~x86"
-IUSE="ssl static static-libs"
+IUSE="static static-libs"
 
 DEPEND=">=sys-devel/make-3.81
 	static? (
@@ -20,14 +20,12 @@ DEPEND=">=sys-devel/make-3.81
 		>=dev-libs/skalibs-2.6.0.0[static-libs]
 		>=net-dns/s6-dns-2.2.0.1[static-libs]
 		>=sys-apps/s6-2.6.1.0[static-libs]
-		ssl? ( >=dev-libs/libressl-2.4.5[static-libs] )
 	)
 	!static? (
 		>=dev-lang/execline-2.3.0.2[static=]
 		>=dev-libs/skalibs-2.6.0.0
 		>=net-dns/s6-dns-2.2.0.1[static=]
 		>=sys-apps/s6-2.6.1.0[static=]
-		ssl? ( >=dev-libs/libressl-2.4.5 )
 	)
 "
 RDEPEND="
@@ -36,7 +34,6 @@ RDEPEND="
 	!static? (
 		>=dev-libs/skalibs-2.6.0.0:=
 		>=net-dns/s6-dns-2.2.0.1:=
-		ssl? ( >=dev-libs/libressl-2.4.5:= )
 	)
 "
 
@@ -62,7 +59,7 @@ src_configure() {
 		--with-lib=/usr/$(get_libdir)/s6-dns \
 		--with-lib=/usr/$(get_libdir)/skalibs \
 		--with-sysdeps=/usr/$(get_libdir)/skalibs \
-		$(use_enable ssl ssl libressl) \
+		--disable-ssl \
 		$(use_enable !static shared) \
 		$(use_enable static allstatic) \
 		$(use_enable static static-libc) \

diff --git a/net-misc/s6-networking/s6-networking-2.3.0.3.ebuild b/net-misc/s6-networking/s6-networking-2.3.0.3.ebuild
index 337a4b582c3..f800a625df7 100644
--- a/net-misc/s6-networking/s6-networking-2.3.0.3.ebuild
+++ b/net-misc/s6-networking/s6-networking-2.3.0.3.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz"
 LICENSE="ISC"
 SLOT="0/$(ver_cut 1-2)"
 KEYWORDS="~amd64 ~x86"
-IUSE="ssl static static-libs"
+IUSE="static static-libs"
 
 REQUIRED_USE="static? ( static-libs )"
 
@@ -18,14 +18,12 @@ DEPEND=">=dev-lang/execline-2.5.0.1[static-libs?]
 	>=sys-apps/s6-2.7.2.0[static-libs?]
 	>=net-dns/s6-dns-2.3.0.1[static-libs?]
 	>=dev-libs/skalibs-2.7.0.0[static-libs?]
-	ssl? ( >=dev-libs/libressl-2.6.5[static-libs?] )
 "
 RDEPEND=">=dev-lang/execline-2.5.0.1:=
 	>=sys-apps/s6-2.7.2.0:=
 	!static? (
 		>=net-dns/s6-dns-2.3.0.1:=
 		>=dev-libs/skalibs-2.7.0.0:=
-		ssl? ( >=dev-libs/libressl-2.6.5:= )
 	)
 "
 
@@ -52,7 +50,7 @@ src_configure() {
 		--with-lib=/usr/$(get_libdir)/skalibs \
 		--with-sysdeps=/usr/$(get_libdir)/skalibs \
 		--enable-shared \
-		$(use_enable ssl ssl libressl) \
+		--disable-ssl \
 		$(use_enable static allstatic) \
 		$(use_enable static static-libc) \
 		$(use_enable static-libs static)

diff --git a/net-misc/s6-networking/s6-networking-2.3.0.4.ebuild b/net-misc/s6-networking/s6-networking-2.3.0.4.ebuild
index ebf8b078727..7b2f39aa2ae 100644
--- a/net-misc/s6-networking/s6-networking-2.3.0.4.ebuild
+++ b/net-misc/s6-networking/s6-networking-2.3.0.4.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz"
 LICENSE="ISC"
 SLOT="0/$(ver_cut 1-2)"
 KEYWORDS="~amd64 ~x86"
-IUSE="ssl static static-libs"
+IUSE="static static-libs"
 
 REQUIRED_USE="static? ( static-libs )"
 
@@ -19,12 +19,10 @@ RDEPEND=">=dev-lang/execline-2.5.1.0:=[static-libs?]
 	>=sys-apps/s6-2.8.0.0:=[static-libs?]
 	!static? (
 		>=net-dns/s6-dns-2.3.0.2:=
-		ssl? ( >=dev-libs/libressl-2.7.4:= )
 	)
 "
 DEPEND="${RDEPEND}
 	>=net-dns/s6-dns-2.3.0.2[static-libs?]
-	ssl? ( >=dev-libs/libressl-2.7.4[static-libs?] )
 "
 
 HTML_DOCS=( doc/. )
@@ -48,7 +46,7 @@ src_configure() {
 		--with-lib=/usr/$(get_libdir)/skalibs \
 		--with-sysdeps=/usr/$(get_libdir)/skalibs \
 		--enable-shared \
-		$(use_enable ssl ssl libressl) \
+		--disable-ssl \
 		$(use_enable static allstatic) \
 		$(use_enable static static-libc) \
 		$(use_enable static-libs static)

diff --git a/net-misc/s6-networking/s6-networking-2.3.1.1.ebuild b/net-misc/s6-networking/s6-networking-2.3.1.1.ebuild
index a6ab1df980c..bd50b35c8b3 100644
--- a/net-misc/s6-networking/s6-networking-2.3.1.1.ebuild
+++ b/net-misc/s6-networking/s6-networking-2.3.1.1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz"
 LICENSE="ISC"
 SLOT="0/$(ver_cut 1-2)"
 KEYWORDS="~amd64 ~x86"
-IUSE="ssl static static-libs"
+IUSE="static static-libs"
 
 REQUIRED_USE="static? ( static-libs )"
 
@@ -19,12 +19,10 @@ RDEPEND=">=dev-lang/execline-2.5.3.0:=[static-libs?]
 	>=sys-apps/s6-2.9.0.1:=[static-libs?]
 	!static? (
 		>=net-dns/s6-dns-2.3.1.1:=
-		ssl? ( >=dev-libs/libressl-2.9.2:= )
 	)
 "
 DEPEND="${RDEPEND}
 	>=net-dns/s6-dns-2.3.1.1[static-libs?]
-	ssl? ( >=dev-libs/libressl-2.9.2[static-libs?] )
 "
 
 HTML_DOCS=( doc/. )
@@ -48,7 +46,7 @@ src_configure() {
 		--with-lib=/usr/$(get_libdir)/skalibs \
 		--with-sysdeps=/usr/$(get_libdir)/skalibs \
 		--enable-shared \
-		$(use_enable ssl ssl libressl) \
+		--disable-ssl \
 		$(use_enable static allstatic) \
 		$(use_enable static static-libc) \
 		$(use_enable static-libs static)

diff --git a/net-misc/s6-networking/s6-networking-2.3.2.0.ebuild b/net-misc/s6-networking/s6-networking-2.3.2.0.ebuild
index a33079fa4a7..356302cf9f8 100644
--- a/net-misc/s6-networking/s6-networking-2.3.2.0.ebuild
+++ b/net-misc/s6-networking/s6-networking-2.3.2.0.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz"
 LICENSE="ISC"
 SLOT="0/$(ver_cut 1-2)"
 KEYWORDS="~amd64 ~x86"
-IUSE="ssl static static-libs"
+IUSE="static static-libs"
 
 REQUIRED_USE="static? ( static-libs )"
 
@@ -19,12 +19,10 @@ RDEPEND=">=dev-lang/execline-2.6.1.1:=[static-libs?]
 	>=sys-apps/s6-2.9.2.0:=[execline,static-libs?]
 	!static? (
 		>=net-dns/s6-dns-2.3.3.0:=
-		ssl? ( >=dev-libs/libressl-3.1.4:= )
 	)
 "
 DEPEND="${RDEPEND}
 	>=net-dns/s6-dns-2.3.3.0[static-libs?]
-	ssl? ( >=dev-libs/libressl-3.1.4[static-libs?] )
 "
 
 HTML_DOCS=( doc/. )
@@ -48,7 +46,7 @@ src_configure() {
 		--with-lib=/usr/$(get_libdir)/skalibs \
 		--with-sysdeps=/usr/$(get_libdir)/skalibs \
 		--enable-shared \
-		$(use_enable ssl ssl libressl) \
+		--disable-ssl \
 		$(use_enable static allstatic) \
 		$(use_enable static static-libc) \
 		$(use_enable static-libs static)