Gentoo Archives: gentoo-commits

From: Sam James <sam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/curl/
Date: Wed, 15 Mar 2023 05:05:06
Message-Id: 1678856682.c6b3f26466c6770b5f0db1218e014f9c8dbb3444.sam@gentoo
1 commit: c6b3f26466c6770b5f0db1218e014f9c8dbb3444
2 Author: Matt Jolly <Matt.Jolly <AT> footclan <DOT> ninja>
3 AuthorDate: Thu Mar 9 13:45:20 2023 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Wed Mar 15 05:04:42 2023 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c6b3f264
7
8 net-misc/curl: drop 7.88.1
9
10 Signed-off-by: Matt Jolly <Matt.Jolly <AT> footclan.ninja>
11 Closes: https://github.com/gentoo/gentoo/pull/30020
12 Signed-off-by: Sam James <sam <AT> gentoo.org>
13
14 net-misc/curl/curl-7.88.1.ebuild | 302 ---------------------------------------
15 1 file changed, 302 deletions(-)
16
17 diff --git a/net-misc/curl/curl-7.88.1.ebuild b/net-misc/curl/curl-7.88.1.ebuild
18 deleted file mode 100644
19 index 74340e55cd1f..000000000000
20 --- a/net-misc/curl/curl-7.88.1.ebuild
21 +++ /dev/null
22 @@ -1,302 +0,0 @@
23 -# Copyright 1999-2023 Gentoo Authors
24 -# Distributed under the terms of the GNU General Public License v2
25 -
26 -EAPI="8"
27 -
28 -inherit autotools multilib-minimal prefix verify-sig
29 -
30 -DESCRIPTION="A Client that groks URLs"
31 -HOMEPAGE="https://curl.se/"
32 -SRC_URI="https://curl.se/download/${P}.tar.xz
33 - verify-sig? ( https://curl.se/download/${P}.tar.xz.asc )"
34 -
35 -LICENSE="curl"
36 -SLOT="0"
37 -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
38 -IUSE="+adns alt-svc brotli +ftp gnutls gopher hsts +http2 idn +imap kerberos ldap mbedtls nss +openssl +pop3 +progress-meter rtmp rustls samba +smtp ssh ssl sslv3 static-libs test telnet +tftp websockets zstd"
39 -IUSE+=" curl_ssl_gnutls curl_ssl_mbedtls curl_ssl_nss +curl_ssl_openssl curl_ssl_rustls"
40 -IUSE+=" nghttp3"
41 -VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/danielstenberg.asc
42 -
43 -#Only one default ssl provider can be enabled
44 -REQUIRED_USE="
45 - ssl? (
46 - ^^ (
47 - curl_ssl_gnutls
48 - curl_ssl_mbedtls
49 - curl_ssl_nss
50 - curl_ssl_openssl
51 - curl_ssl_rustls
52 - )
53 - )"
54 -
55 -# lead to lots of false negatives, bug #285669
56 -RESTRICT="!test? ( test )"
57 -
58 -RDEPEND="ldap? ( net-nds/openldap:=[${MULTILIB_USEDEP}] )
59 - brotli? ( app-arch/brotli:=[${MULTILIB_USEDEP}] )
60 - ssl? (
61 - gnutls? (
62 - net-libs/gnutls:=[static-libs?,${MULTILIB_USEDEP}]
63 - dev-libs/nettle:=[${MULTILIB_USEDEP}]
64 - app-misc/ca-certificates
65 - )
66 - mbedtls? (
67 - net-libs/mbedtls:=[${MULTILIB_USEDEP}]
68 - app-misc/ca-certificates
69 - )
70 - openssl? (
71 - dev-libs/openssl:=[sslv3(-)=,static-libs?,${MULTILIB_USEDEP}]
72 - )
73 - nss? (
74 - dev-libs/nss:0[${MULTILIB_USEDEP}]
75 - dev-libs/nss-pem
76 - app-misc/ca-certificates
77 - )
78 - rustls? (
79 - net-libs/rustls-ffi:=[${MULTILIB_USEDEP}]
80 - )
81 - )
82 - http2? ( net-libs/nghttp2:=[${MULTILIB_USEDEP}] )
83 - nghttp3? (
84 - net-libs/nghttp3[${MULTILIB_USEDEP}]
85 - net-libs/ngtcp2[ssl,${MULTILIB_USEDEP}]
86 - )
87 - idn? ( net-dns/libidn2:=[static-libs?,${MULTILIB_USEDEP}] )
88 - adns? ( net-dns/c-ares:=[${MULTILIB_USEDEP}] )
89 - kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
90 - rtmp? ( media-video/rtmpdump[${MULTILIB_USEDEP}] )
91 - ssh? ( net-libs/libssh2[${MULTILIB_USEDEP}] )
92 - sys-libs/zlib[${MULTILIB_USEDEP}]
93 - zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] )"
94 -
95 -DEPEND="${RDEPEND}"
96 -BDEPEND="dev-lang/perl
97 - virtual/pkgconfig
98 - test? (
99 - sys-apps/diffutils
100 - http2? ( net-libs/nghttp2:=[utils,${MULTILIB_USEDEP}] )
101 - nghttp3? ( net-libs/nghttp2:=[utils,${MULTILIB_USEDEP}] )
102 - )
103 - verify-sig? ( sec-keys/openpgp-keys-danielstenberg )"
104 -
105 -DOCS=( CHANGES README docs/{FEATURES.md,INTERNALS.md,FAQ,BUGS.md,CONTRIBUTE.md} )
106 -
107 -MULTILIB_WRAPPED_HEADERS=(
108 - /usr/include/curl/curlbuild.h
109 -)
110 -
111 -MULTILIB_CHOST_TOOLS=(
112 - /usr/bin/curl-config
113 -)
114 -
115 -PATCHES=(
116 - "${FILESDIR}"/${PN}-7.30.0-prefix.patch
117 - "${FILESDIR}"/${PN}-respect-cflags-3.patch
118 -)
119 -
120 -src_prepare() {
121 - default
122 -
123 - # Some tests (HTTP/#) rely on ssl certificates that are stored VCS which breaks
124 - # with out-of-tree builds.
125 - sed -i "s:my \$path = getcwd():my \$path = \"${S}/tests\":" tests/http*-server.pl \
126 - || die "Unable to update test locations"
127 - eprefixify curl-config.in
128 - eautoreconf
129 -}
130 -
131 -multilib_src_configure() {
132 - # We make use of the fact that later flags override earlier ones
133 - # So start with all ssl providers off until proven otherwise
134 - # TODO: in the future, we may want to add wolfssl (https://www.wolfssl.com/)
135 - local myconf=()
136 -
137 - myconf+=( --without-ca-fallback --with-ca-bundle="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt )
138 - #myconf+=( --without-default-ssl-backend )
139 - if use ssl ; then
140 - myconf+=( --without-gnutls --without-mbedtls --without-nss --without-rustls )
141 -
142 - if use gnutls || use curl_ssl_gnutls; then
143 - einfo "SSL provided by gnutls"
144 - myconf+=( --with-gnutls )
145 - fi
146 - if use mbedtls || use curl_ssl_mbedtls; then
147 - einfo "SSL provided by mbedtls"
148 - myconf+=( --with-mbedtls )
149 - fi
150 - if use nss || use curl_ssl_nss; then
151 - einfo "SSL provided by nss"
152 - myconf+=( --with-nss --with-nss-deprecated )
153 - fi
154 - if use openssl || use curl_ssl_openssl; then
155 - einfo "SSL provided by openssl"
156 - myconf+=( --with-ssl --with-ca-path="${EPREFIX}"/etc/ssl/certs )
157 - fi
158 - if use rustls || use curl_ssl_rustls; then
159 - einfo "SSL provided by rustls"
160 - myconf+=( --with-rustls )
161 - fi
162 - if use curl_ssl_gnutls; then
163 - einfo "Default SSL provided by gnutls"
164 - myconf+=( --with-default-ssl-backend=gnutls )
165 - elif use curl_ssl_mbedtls; then
166 - einfo "Default SSL provided by mbedtls"
167 - myconf+=( --with-default-ssl-backend=mbedtls )
168 - elif use curl_ssl_nss; then
169 - einfo "Default SSL provided by nss"
170 - myconf+=( --with-default-ssl-backend=nss )
171 - elif use curl_ssl_openssl; then
172 - einfo "Default SSL provided by openssl"
173 - myconf+=( --with-default-ssl-backend=openssl )
174 - elif use curl_ssl_rustls; then
175 - einfo "Default SSL provided by rustls"
176 - myconf+=( --with-default-ssl-backend=rustls )
177 - else
178 - eerror "We can't be here because of REQUIRED_USE."
179 - fi
180 -
181 - else
182 - myconf+=( --without-ssl )
183 - einfo "SSL disabled"
184 - fi
185 -
186 - # These configuration options are organized alphabetically
187 - # within each category. This should make it easier if we
188 - # ever decide to make any of them contingent on USE flags:
189 - # 1) protocols first. To see them all do
190 - # 'grep SUPPORT_PROTOCOLS configure.ac'
191 - # 2) --enable/disable options second.
192 - # 'grep -- --enable configure | grep Check | awk '{ print $4 }' | sort
193 - # 3) --with/without options third.
194 - # grep -- --with configure | grep Check | awk '{ print $4 }' | sort
195 -
196 - myconf+=(
197 - $(use_enable alt-svc)
198 - --enable-crypto-auth
199 - --enable-dict
200 - --disable-ech
201 - --enable-file
202 - $(use_enable ftp)
203 - $(use_enable gopher)
204 - $(use_enable hsts)
205 - --enable-http
206 - $(use_enable imap)
207 - $(use_enable ldap)
208 - $(use_enable ldap ldaps)
209 - --enable-ntlm
210 - --disable-ntlm-wb
211 - $(use_enable pop3)
212 - --enable-rt
213 - --enable-rtsp
214 - $(use_enable samba smb)
215 - $(use_with ssh libssh2)
216 - $(use_enable smtp)
217 - $(use_enable telnet)
218 - $(use_enable tftp)
219 - --enable-tls-srp
220 - $(use_enable adns ares)
221 - --enable-cookies
222 - --enable-dateparse
223 - --enable-dnsshuffle
224 - --enable-doh
225 - --enable-symbol-hiding
226 - --enable-http-auth
227 - --enable-ipv6
228 - --enable-largefile
229 - --enable-manual
230 - --enable-mime
231 - --enable-netrc
232 - $(use_enable progress-meter)
233 - --enable-proxy
234 - --enable-socketpair
235 - --disable-sspi
236 - $(use_enable static-libs static)
237 - --enable-pthreads
238 - --enable-threaded-resolver
239 - --disable-versioned-symbols
240 - --without-amissl
241 - --without-bearssl
242 - $(use_with brotli)
243 - --without-fish-functions-dir
244 - $(use_with http2 nghttp2)
245 - --without-hyper
246 - $(use_with idn libidn2)
247 - $(use_with kerberos gssapi "${EPREFIX}"/usr)
248 - --without-libgsasl
249 - --without-libpsl
250 - --without-msh3
251 - $(use_with nghttp3)
252 - $(use_with nghttp3 ngtcp2)
253 - --without-quiche
254 - $(use_with rtmp librtmp)
255 - --without-schannel
256 - --without-secure-transport
257 - --without-test-caddy
258 - --without-test-httpd
259 - --without-test-nghttpx
260 - $(use_enable websockets)
261 - --without-winidn
262 - --without-wolfssl
263 - --with-zlib
264 - $(use_with zstd)
265 - )
266 -
267 - if use test && multilib_is_native_abi && ( use http2 || use nghttp3 ); then
268 - myconf+=(
269 - --with-test-nghttpx="${BROOT}/usr/bin/nghttpx"
270 - )
271 - fi
272 -
273 - ECONF_SOURCE="${S}" econf "${myconf[@]}"
274 -
275 - if ! multilib_is_native_abi; then
276 - # avoid building the client
277 - sed -i -e '/SUBDIRS/s:src::' Makefile || die
278 - sed -i -e '/SUBDIRS/s:scripts::' Makefile || die
279 - fi
280 -
281 - # Fix up the pkg-config file to be more robust.
282 - # https://github.com/curl/curl/issues/864
283 - local priv=() libs=()
284 - # We always enable zlib.
285 - libs+=( "-lz" )
286 - priv+=( "zlib" )
287 - if use http2; then
288 - libs+=( "-lnghttp2" )
289 - priv+=( "libnghttp2" )
290 - fi
291 - if use nghttp3; then
292 - libs+=( "-lnghttp3" "-lngtcp2" )
293 - priv+=( "libnghttp3" "libngtcp2" )
294 - fi
295 - if use ssl && use curl_ssl_openssl; then
296 - libs+=( "-lssl" "-lcrypto" )
297 - priv+=( "openssl" )
298 - fi
299 - grep -q Requires.private libcurl.pc && die "need to update ebuild"
300 - libs=$(printf '|%s' "${libs[@]}")
301 - sed -i -r \
302 - -e "/^Libs.private/s:(${libs#|})( |$)::g" \
303 - libcurl.pc || die
304 - echo "Requires.private: ${priv[*]}" >> libcurl.pc || die
305 -}
306 -
307 -multilib_src_test() {
308 - # See https://github.com/curl/curl/blob/master/tests/runtests.pl#L5721
309 - # -n: no valgrind (unreliable in sandbox and doesn't work correctly on all arches)
310 - # -v: verbose
311 - # -a: keep going on failure (so we see everything which breaks, not just 1st test)
312 - # -k: keep test files after completion
313 - # -am: automake style TAP output
314 - # -p: print logs if test fails
315 - # Note: if needed, we can disable tests. See e.g. Fedora's packaging
316 - # or just read https://github.com/curl/curl/tree/master/tests#run.
317 - multilib_is_native_abi && emake test TFLAGS="-n -v -a -k -am -p"
318 -}
319 -
320 -multilib_src_install_all() {
321 - einstalldocs
322 - find "${ED}" -type f -name '*.la' -delete || die
323 - rm -rf "${ED}"/etc/ || die
324 -}