Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: William Hubbs <williamh@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/s6-networking/
Date: Tue, 29 Dec 2020 01:21:53
Message-Id: 1609204902.8033736e722a25c4efbb83de5f69a984f08f3428.williamh@gentoo
1 commit: 8033736e722a25c4efbb83de5f69a984f08f3428
2 Author: William Hubbs <williamh <AT> gentoo <DOT> org>
3 AuthorDate: Tue Dec 29 01:14:10 2020 +0000
4 Commit: William Hubbs <williamh <AT> gentoo <DOT> org>
5 CommitDate: Tue Dec 29 01:21:42 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8033736e
7
8 net-misc/s6-networking: remove libressl dependency
9
10 The ssl use flag for s6-networking requires libressl which is not being
11 used by most users since it is incompatible with OpenSSL.
12 After discussions with the qa team, the best option is to disable ssl support.
13
14 Closes: https://bugs.gentoo.org/762313
15 Signed-off-by: William Hubbs <williamh <AT> gentoo.org>
16
17 net-misc/s6-networking/metadata.xml | 3 +--
18 net-misc/s6-networking/s6-networking-2.3.0.2.ebuild | 7 ++-----
19 net-misc/s6-networking/s6-networking-2.3.0.3.ebuild | 6 ++----
20 net-misc/s6-networking/s6-networking-2.3.0.4.ebuild | 6 ++----
21 net-misc/s6-networking/s6-networking-2.3.1.1.ebuild | 6 ++----
22 net-misc/s6-networking/s6-networking-2.3.2.0.ebuild | 6 ++----
23 6 files changed, 11 insertions(+), 23 deletions(-)
24
25 diff --git a/net-misc/s6-networking/metadata.xml b/net-misc/s6-networking/metadata.xml
26 index 97feaaf4d36..6ecd43a97a7 100644
27 --- a/net-misc/s6-networking/metadata.xml
28 +++ b/net-misc/s6-networking/metadata.xml
29 @@ -9,7 +9,6 @@
30 s6-networking is a suite of small networking utilities for Unix systems.
31 It includes command-line client and server management, TCP access
32 control, privilege escalation across UNIX domain sockets, IDENT protocol
33 - management and clock synchronization. Optionally, it also includes
34 - command-line TLS/SSL tools for secure communications.
35 + management and clock synchronization.
36 </longdescription>
37 </pkgmetadata>
38
39 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
40 index c8544a93760..6aa894cbc45 100644
41 --- a/net-misc/s6-networking/s6-networking-2.3.0.2.ebuild
42 +++ b/net-misc/s6-networking/s6-networking-2.3.0.2.ebuild
43 @@ -12,7 +12,7 @@ SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz"
44 LICENSE="ISC"
45 SLOT="0/$(get_version_component_range 1-2)"
46 KEYWORDS="~amd64 ~x86"
47 -IUSE="ssl static static-libs"
48 +IUSE="static static-libs"
49
50 DEPEND=">=sys-devel/make-3.81
51 static? (
52 @@ -20,14 +20,12 @@ DEPEND=">=sys-devel/make-3.81
53 >=dev-libs/skalibs-2.6.0.0[static-libs]
54 >=net-dns/s6-dns-2.2.0.1[static-libs]
55 >=sys-apps/s6-2.6.1.0[static-libs]
56 - ssl? ( >=dev-libs/libressl-2.4.5[static-libs] )
57 )
58 !static? (
59 >=dev-lang/execline-2.3.0.2[static=]
60 >=dev-libs/skalibs-2.6.0.0
61 >=net-dns/s6-dns-2.2.0.1[static=]
62 >=sys-apps/s6-2.6.1.0[static=]
63 - ssl? ( >=dev-libs/libressl-2.4.5 )
64 )
65 "
66 RDEPEND="
67 @@ -36,7 +34,6 @@ RDEPEND="
68 !static? (
69 >=dev-libs/skalibs-2.6.0.0:=
70 >=net-dns/s6-dns-2.2.0.1:=
71 - ssl? ( >=dev-libs/libressl-2.4.5:= )
72 )
73 "
74
75 @@ -62,7 +59,7 @@ src_configure() {
76 --with-lib=/usr/$(get_libdir)/s6-dns \
77 --with-lib=/usr/$(get_libdir)/skalibs \
78 --with-sysdeps=/usr/$(get_libdir)/skalibs \
79 - $(use_enable ssl ssl libressl) \
80 + --disable-ssl \
81 $(use_enable !static shared) \
82 $(use_enable static allstatic) \
83 $(use_enable static static-libc) \
84
85 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
86 index 337a4b582c3..f800a625df7 100644
87 --- a/net-misc/s6-networking/s6-networking-2.3.0.3.ebuild
88 +++ b/net-misc/s6-networking/s6-networking-2.3.0.3.ebuild
89 @@ -10,7 +10,7 @@ SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz"
90 LICENSE="ISC"
91 SLOT="0/$(ver_cut 1-2)"
92 KEYWORDS="~amd64 ~x86"
93 -IUSE="ssl static static-libs"
94 +IUSE="static static-libs"
95
96 REQUIRED_USE="static? ( static-libs )"
97
98 @@ -18,14 +18,12 @@ DEPEND=">=dev-lang/execline-2.5.0.1[static-libs?]
99 >=sys-apps/s6-2.7.2.0[static-libs?]
100 >=net-dns/s6-dns-2.3.0.1[static-libs?]
101 >=dev-libs/skalibs-2.7.0.0[static-libs?]
102 - ssl? ( >=dev-libs/libressl-2.6.5[static-libs?] )
103 "
104 RDEPEND=">=dev-lang/execline-2.5.0.1:=
105 >=sys-apps/s6-2.7.2.0:=
106 !static? (
107 >=net-dns/s6-dns-2.3.0.1:=
108 >=dev-libs/skalibs-2.7.0.0:=
109 - ssl? ( >=dev-libs/libressl-2.6.5:= )
110 )
111 "
112
113 @@ -52,7 +50,7 @@ src_configure() {
114 --with-lib=/usr/$(get_libdir)/skalibs \
115 --with-sysdeps=/usr/$(get_libdir)/skalibs \
116 --enable-shared \
117 - $(use_enable ssl ssl libressl) \
118 + --disable-ssl \
119 $(use_enable static allstatic) \
120 $(use_enable static static-libc) \
121 $(use_enable static-libs static)
122
123 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
124 index ebf8b078727..7b2f39aa2ae 100644
125 --- a/net-misc/s6-networking/s6-networking-2.3.0.4.ebuild
126 +++ b/net-misc/s6-networking/s6-networking-2.3.0.4.ebuild
127 @@ -10,7 +10,7 @@ SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz"
128 LICENSE="ISC"
129 SLOT="0/$(ver_cut 1-2)"
130 KEYWORDS="~amd64 ~x86"
131 -IUSE="ssl static static-libs"
132 +IUSE="static static-libs"
133
134 REQUIRED_USE="static? ( static-libs )"
135
136 @@ -19,12 +19,10 @@ RDEPEND=">=dev-lang/execline-2.5.1.0:=[static-libs?]
137 >=sys-apps/s6-2.8.0.0:=[static-libs?]
138 !static? (
139 >=net-dns/s6-dns-2.3.0.2:=
140 - ssl? ( >=dev-libs/libressl-2.7.4:= )
141 )
142 "
143 DEPEND="${RDEPEND}
144 >=net-dns/s6-dns-2.3.0.2[static-libs?]
145 - ssl? ( >=dev-libs/libressl-2.7.4[static-libs?] )
146 "
147
148 HTML_DOCS=( doc/. )
149 @@ -48,7 +46,7 @@ src_configure() {
150 --with-lib=/usr/$(get_libdir)/skalibs \
151 --with-sysdeps=/usr/$(get_libdir)/skalibs \
152 --enable-shared \
153 - $(use_enable ssl ssl libressl) \
154 + --disable-ssl \
155 $(use_enable static allstatic) \
156 $(use_enable static static-libc) \
157 $(use_enable static-libs static)
158
159 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
160 index a6ab1df980c..bd50b35c8b3 100644
161 --- a/net-misc/s6-networking/s6-networking-2.3.1.1.ebuild
162 +++ b/net-misc/s6-networking/s6-networking-2.3.1.1.ebuild
163 @@ -10,7 +10,7 @@ SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz"
164 LICENSE="ISC"
165 SLOT="0/$(ver_cut 1-2)"
166 KEYWORDS="~amd64 ~x86"
167 -IUSE="ssl static static-libs"
168 +IUSE="static static-libs"
169
170 REQUIRED_USE="static? ( static-libs )"
171
172 @@ -19,12 +19,10 @@ RDEPEND=">=dev-lang/execline-2.5.3.0:=[static-libs?]
173 >=sys-apps/s6-2.9.0.1:=[static-libs?]
174 !static? (
175 >=net-dns/s6-dns-2.3.1.1:=
176 - ssl? ( >=dev-libs/libressl-2.9.2:= )
177 )
178 "
179 DEPEND="${RDEPEND}
180 >=net-dns/s6-dns-2.3.1.1[static-libs?]
181 - ssl? ( >=dev-libs/libressl-2.9.2[static-libs?] )
182 "
183
184 HTML_DOCS=( doc/. )
185 @@ -48,7 +46,7 @@ src_configure() {
186 --with-lib=/usr/$(get_libdir)/skalibs \
187 --with-sysdeps=/usr/$(get_libdir)/skalibs \
188 --enable-shared \
189 - $(use_enable ssl ssl libressl) \
190 + --disable-ssl \
191 $(use_enable static allstatic) \
192 $(use_enable static static-libc) \
193 $(use_enable static-libs static)
194
195 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
196 index a33079fa4a7..356302cf9f8 100644
197 --- a/net-misc/s6-networking/s6-networking-2.3.2.0.ebuild
198 +++ b/net-misc/s6-networking/s6-networking-2.3.2.0.ebuild
199 @@ -10,7 +10,7 @@ SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz"
200 LICENSE="ISC"
201 SLOT="0/$(ver_cut 1-2)"
202 KEYWORDS="~amd64 ~x86"
203 -IUSE="ssl static static-libs"
204 +IUSE="static static-libs"
205
206 REQUIRED_USE="static? ( static-libs )"
207
208 @@ -19,12 +19,10 @@ RDEPEND=">=dev-lang/execline-2.6.1.1:=[static-libs?]
209 >=sys-apps/s6-2.9.2.0:=[execline,static-libs?]
210 !static? (
211 >=net-dns/s6-dns-2.3.3.0:=
212 - ssl? ( >=dev-libs/libressl-3.1.4:= )
213 )
214 "
215 DEPEND="${RDEPEND}
216 >=net-dns/s6-dns-2.3.3.0[static-libs?]
217 - ssl? ( >=dev-libs/libressl-3.1.4[static-libs?] )
218 "
219
220 HTML_DOCS=( doc/. )
221 @@ -48,7 +46,7 @@ src_configure() {
222 --with-lib=/usr/$(get_libdir)/skalibs \
223 --with-sysdeps=/usr/$(get_libdir)/skalibs \
224 --enable-shared \
225 - $(use_enable ssl ssl libressl) \
226 + --disable-ssl \
227 $(use_enable static allstatic) \
228 $(use_enable static static-libc) \
229 $(use_enable static-libs static)
Report Message
Find on MARC Find on Google Groups