mirror of
https://github.com/flatcar/scripts.git
synced 2026-05-12 15:46:14 +02:00
net-misc/wget: Sync with Gentoo
It's from Gentoo commit 99d430fc553caf25a65c5cd55ef1fb9dc347bc6b. Signed-off-by: Flatcar Buildbot <buildbot@flatcar-linux.org>
This commit is contained in:
Flatcar Buildbot
parent
4f43c65b43
commit
5d358d831d
14
sdk_container/src/third_party/portage-stable/net-misc/wget/files/wget-1.25.0-openssl-4.patch
vendored
Normal file
14
sdk_container/src/third_party/portage-stable/net-misc/wget/files/wget-1.25.0-openssl-4.patch
vendored
Normal file
@ -0,0 +1,14 @@
|
||||
https://bugs.gentoo.org/973056
|
||||
https://savannah.gnu.org/bugs/index.php?68265
|
||||
--- a/src/openssl.c
|
||||
+++ b/src/openssl.c
|
||||
@@ -226,7 +226,7 @@
|
||||
break;
|
||||
|
||||
case secure_protocol_sslv3:
|
||||
-#ifndef OPENSSL_NO_SSL3_METHOD
|
||||
+#if !defined OPENSSL_NO_SSL3_METHOD && OPENSSL_VERSION_NUMBER < 0x40000000L
|
||||
meth = SSLv3_client_method ();
|
||||
#endif
|
||||
break;
|
||||
|
||||
@ -15,5 +15,6 @@
|
||||
<upstream>
|
||||
<remote-id type="cpe">cpe:/a:gnu:wget</remote-id>
|
||||
<remote-id type="gitlab">gnuwget/wget</remote-id>
|
||||
<remote-id type="savannah">wget</remote-id>
|
||||
</upstream>
|
||||
</pkgmetadata>
|
||||
|
||||
@ -1,9 +1,9 @@
|
||||
# Copyright 1999-2025 Gentoo Authors
|
||||
# Copyright 1999-2026 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
|
||||
PYTHON_COMPAT=( python3_{11..13} )
|
||||
PYTHON_COMPAT=( python3_{11..14} )
|
||||
VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/wget.asc
|
||||
inherit flag-o-matic python-any-r1 toolchain-funcs unpacker verify-sig
|
||||
|
||||
@ -16,29 +16,33 @@ LICENSE="GPL-3+"
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
|
||||
IUSE="cookie-check debug gnutls idn libproxy metalink nls ntlm pcre +ssl static test uuid zlib"
|
||||
REQUIRED_USE="ntlm? ( !gnutls ssl ) gnutls? ( ssl )"
|
||||
REQUIRED_USE="
|
||||
ntlm? ( !gnutls ssl )
|
||||
gnutls? ( ssl )
|
||||
static? ( !libproxy )
|
||||
"
|
||||
RESTRICT="!test? ( test )"
|
||||
|
||||
# * Force a newer libidn2 to avoid libunistring deps. #bug #612498
|
||||
# * Metalink can use gpgme automagically (so let's always depend on it)
|
||||
# for signed metalink resources.
|
||||
LIB_DEPEND="
|
||||
cookie-check? ( net-libs/libpsl )
|
||||
idn? ( >=net-dns/libidn2-0.14:=[static-libs(+)] )
|
||||
cookie-check? ( net-libs/libpsl[static-libs(-)] )
|
||||
idn? ( >=net-dns/libidn2-0.14:=[static-libs(-)] )
|
||||
libproxy? ( net-libs/libproxy )
|
||||
metalink? (
|
||||
app-crypt/gpgme:=
|
||||
media-libs/libmetalink
|
||||
app-crypt/gpgme:=[static-libs(-)]
|
||||
media-libs/libmetalink[static-libs(-)]
|
||||
)
|
||||
pcre? ( dev-libs/libpcre2[static-libs(+)] )
|
||||
pcre? ( dev-libs/libpcre2[static-libs(-)] )
|
||||
ssl? (
|
||||
gnutls? ( net-libs/gnutls:=[static-libs(+)] )
|
||||
!gnutls? ( dev-libs/openssl:=[static-libs(+)] )
|
||||
gnutls? ( net-libs/gnutls:=[static-libs(-)] )
|
||||
!gnutls? ( dev-libs/openssl:=[static-libs(-)] )
|
||||
)
|
||||
uuid? ( sys-apps/util-linux[static-libs(+)] )
|
||||
zlib? ( virtual/zlib:=[static-libs(+)] )
|
||||
uuid? ( sys-apps/util-linux[static-libs(-)] )
|
||||
zlib? ( virtual/zlib:=[static-libs(-)] )
|
||||
"
|
||||
RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )"
|
||||
RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(-)]} )"
|
||||
DEPEND="
|
||||
${RDEPEND}
|
||||
static? ( ${LIB_DEPEND} )
|
||||
|
||||
129
sdk_container/src/third_party/portage-stable/net-misc/wget/wget-1.25.0-r2.ebuild
vendored
Normal file
129
sdk_container/src/third_party/portage-stable/net-misc/wget/wget-1.25.0-r2.ebuild
vendored
Normal file
@ -0,0 +1,129 @@
|
||||
# Copyright 1999-2026 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
|
||||
PYTHON_COMPAT=( python3_{11..14} )
|
||||
VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/wget.asc
|
||||
inherit flag-o-matic python-any-r1 toolchain-funcs unpacker verify-sig
|
||||
|
||||
DESCRIPTION="Network utility to retrieve files from the WWW"
|
||||
HOMEPAGE="https://www.gnu.org/software/wget/"
|
||||
SRC_URI="mirror://gnu/wget/${P}.tar.lz"
|
||||
SRC_URI+=" verify-sig? ( mirror://gnu/wget/${P}.tar.lz.sig )"
|
||||
|
||||
LICENSE="GPL-3+"
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
|
||||
IUSE="cookie-check debug gnutls idn libproxy metalink nls ntlm pcre +ssl static test uuid zlib"
|
||||
REQUIRED_USE="
|
||||
ntlm? ( !gnutls ssl )
|
||||
gnutls? ( ssl )
|
||||
static? ( !libproxy )
|
||||
"
|
||||
RESTRICT="!test? ( test )"
|
||||
|
||||
# * Force a newer libidn2 to avoid libunistring deps. #bug #612498
|
||||
# * Metalink can use gpgme automagically (so let's always depend on it)
|
||||
# for signed metalink resources.
|
||||
LIB_DEPEND="
|
||||
cookie-check? ( net-libs/libpsl[static-libs(-)] )
|
||||
idn? ( >=net-dns/libidn2-0.14:=[static-libs(-)] )
|
||||
libproxy? ( net-libs/libproxy )
|
||||
metalink? (
|
||||
app-crypt/gpgme:=[static-libs(-)]
|
||||
media-libs/libmetalink[static-libs(-)]
|
||||
)
|
||||
pcre? ( dev-libs/libpcre2[static-libs(-)] )
|
||||
ssl? (
|
||||
gnutls? ( net-libs/gnutls:=[static-libs(-)] )
|
||||
!gnutls? ( dev-libs/openssl:=[static-libs(-)] )
|
||||
)
|
||||
uuid? ( sys-apps/util-linux[static-libs(-)] )
|
||||
zlib? ( virtual/zlib:=[static-libs(-)] )
|
||||
"
|
||||
RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(-)]} )"
|
||||
DEPEND="
|
||||
${RDEPEND}
|
||||
static? ( ${LIB_DEPEND} )
|
||||
"
|
||||
BDEPEND="
|
||||
$(unpacker_src_uri_depends)
|
||||
app-arch/xz-utils
|
||||
dev-lang/perl
|
||||
sys-apps/texinfo
|
||||
virtual/pkgconfig
|
||||
nls? ( sys-devel/gettext )
|
||||
test? (
|
||||
${PYTHON_DEPS}
|
||||
>=dev-perl/HTTP-Daemon-6.60.0
|
||||
dev-perl/HTTP-Message
|
||||
dev-perl/IO-Socket-SSL
|
||||
)
|
||||
verify-sig? ( >=sec-keys/openpgp-keys-wget-20241111 )
|
||||
"
|
||||
|
||||
DOCS=( AUTHORS MAILING-LIST NEWS README )
|
||||
|
||||
# gnulib FPs
|
||||
QA_CONFIG_IMPL_DECL_SKIP=( unreachable MIN alignof static_assert fpurge )
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}"/${PN}-1.25.0-openssl-4.patch
|
||||
)
|
||||
|
||||
pkg_setup() {
|
||||
use test && python-any-r1_pkg_setup
|
||||
}
|
||||
|
||||
src_unpack() {
|
||||
use verify-sig && verify-sig_verify_detached "${DISTDIR}"/${P}.tar.lz{,.sig}
|
||||
unpacker ${P}.tar.lz
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
sed -i -e "s:/usr/local/etc:${EPREFIX}/etc:g" doc/{sample.wgetrc,wget.texi} || die
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
# fix compilation on Solaris, we need filio.h for FIONBIO as used in
|
||||
# the included gnutls -- force ioctl.h to include this header
|
||||
[[ ${CHOST} == *-solaris* ]] && append-cppflags -DBSD_COMP=1
|
||||
|
||||
if use static ; then
|
||||
append-ldflags -static
|
||||
tc-export PKG_CONFIG
|
||||
PKG_CONFIG+=" --static"
|
||||
fi
|
||||
|
||||
# There is no flag that controls this. libunistring-prefix only
|
||||
# controls the search path (which is why we turn it off below).
|
||||
# Further, libunistring is only needed w/older libidn2 installs,
|
||||
# and since we force the latest, we can force off libunistring. # bug #612498
|
||||
local myeconfargs=(
|
||||
ac_cv_libunistring=no
|
||||
--disable-assert
|
||||
--disable-pcre
|
||||
--disable-rpath
|
||||
--without-included-libunistring
|
||||
--without-libunistring-prefix
|
||||
--enable-ipv6
|
||||
$(use_enable debug)
|
||||
$(use_enable idn iri)
|
||||
$(use_enable nls)
|
||||
$(use_enable ntlm)
|
||||
$(use_enable pcre pcre2)
|
||||
$(use_enable ssl digest)
|
||||
$(use_enable ssl opie)
|
||||
$(use_with cookie-check libpsl)
|
||||
$(use_enable idn iri)
|
||||
$(use_enable libproxy)
|
||||
$(use_with metalink)
|
||||
$(use_with ssl ssl $(usex gnutls gnutls openssl))
|
||||
$(use_with uuid libuuid)
|
||||
$(use_with zlib)
|
||||
)
|
||||
|
||||
econf "${myeconfargs[@]}"
|
||||
}
|
||||
Loading…
x
Reference in New Issue
Block a user