From a225c63b21a7fd92e99d5d89ad7df525ce4aeeeb Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 2 Feb 2026 07:30:26 +0000 Subject: [PATCH] net-misc/wget: Sync with Gentoo It's from Gentoo commit 2d25fad95cbaa525c8945d8e582c749d49524f49. Signed-off-by: Flatcar Buildbot --- .../files/wget-1.24.5-libproxy-no-debug.patch | 50 ------------------- .../net-misc/wget/wget-1.25.0-r1.ebuild | 2 +- 2 files changed, 1 insertion(+), 51 deletions(-) delete mode 100644 sdk_container/src/third_party/portage-stable/net-misc/wget/files/wget-1.24.5-libproxy-no-debug.patch diff --git a/sdk_container/src/third_party/portage-stable/net-misc/wget/files/wget-1.24.5-libproxy-no-debug.patch b/sdk_container/src/third_party/portage-stable/net-misc/wget/files/wget-1.24.5-libproxy-no-debug.patch deleted file mode 100644 index 9f75dc471a..0000000000 --- a/sdk_container/src/third_party/portage-stable/net-misc/wget/files/wget-1.24.5-libproxy-no-debug.patch +++ /dev/null @@ -1,50 +0,0 @@ -https://bugs.gentoo.org/930060 -https://gitlab.com/gnuwget/wget/-/issues/19 -https://gitlab.com/gnuwget/wget/-/merge_requests/39 - -From 5f0aa59239c36fc945b94d8ab91562d56e5bf776 Mon Sep 17 00:00:00 2001 -From: Sam James -Date: Tue, 16 Apr 2024 03:18:40 +0100 -Subject: [PATCH] Fix libproxy build with --disable-debug - -The definition of debug_logprintf in src/log.c is guarded by ENABLE_DEBUG -(although its prototype is unconditionally available in src/log.h). - -The uses of debug_logprintf in src/retr.c aren't guarded by ENABLE_DEBUG. - -Use the DEBUGP macro which is designed for this purpose. - -* src/retr.c (getproxy): Use DEBUGP macro. - -Fixes: https://gitlab.com/gnuwget/wget/-/issues/19 -Copyright-paperwork-exempt: Yes ---- a/src/retr.c -+++ b/src/retr.c -@@ -1498,21 +1498,21 @@ getproxy (struct url *u) - pxProxyFactory *pf = px_proxy_factory_new (); - if (!pf) - { -- debug_logprintf ("Allocating memory for libproxy failed"); -+ DEBUGP (("Allocating memory for libproxy failed")); - return NULL; - } - -- debug_logprintf ("asking libproxy about url '%s'\n", u->url); -+ DEBUGP (("asking libproxy about url '%s'\n", u->url)); - char **proxies = px_proxy_factory_get_proxies (pf, u->url); - if (proxies) - { - if (proxies[0]) - { -- debug_logprintf ("libproxy suggest to use '%s'\n", proxies[0]); -+ DEBUGP (("libproxy suggest to use '%s'\n", proxies[0])); - if (strcmp (proxies[0], "direct://") != 0) - { - proxy = xstrdup (proxies[0]); -- debug_logprintf ("libproxy setting to use '%s'\n", proxy); -+ DEBUGP (("libproxy setting to use '%s'\n", proxy)); - } - } - --- -GitLab diff --git a/sdk_container/src/third_party/portage-stable/net-misc/wget/wget-1.25.0-r1.ebuild b/sdk_container/src/third_party/portage-stable/net-misc/wget/wget-1.25.0-r1.ebuild index 5944871e53..feeac90da9 100644 --- a/sdk_container/src/third_party/portage-stable/net-misc/wget/wget-1.25.0-r1.ebuild +++ b/sdk_container/src/third_party/portage-stable/net-misc/wget/wget-1.25.0-r1.ebuild @@ -14,7 +14,7 @@ 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 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" +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 )" RESTRICT="!test? ( test )"