gentoo auto-resync : 16:04:2024 - 12:04:26

3 files changed, 56 insertions, 1 deletions

diff --git a/net-misc/wget/Manifest b/net-misc/wget/Manifest
index e492823a5481..15a521993dfe 100644
--- a/net-misc/wget/Manifest
+++ b/net-misc/wget/Manifest
@@ -1,7 +1,8 @@
+AUX wget-1.24.5-libproxy-no-debug.patch 1807 BLAKE2B c22091c440c64ca242748d9e688ecca1b6e0d08bb1ec3dc49dcf37e36042a5559bf49f1e68e884b10b268db61c0b3496a9e387febb859036b4de7f2a5bf03748 SHA512 376556fdd3d85ce7a346c8cfb01c9878c7ba060297afd65dd1eb2013c3f4ce5629214b587583ed6ddd8a7f31a28f36150e32be970edc5f5c20240c28cd3ceec1
 DIST wget-1.21.4.tar.gz 5059591 BLAKE2B ced6fb9a20343d41e4d8e0c8f171c60535847504fa4c32abc81d104a1594dc7b7c97b5b301836e31dacc7a0f2155c0a2e70e42ff60dc3fa471deb1dad33ba736 SHA512 7a1539045174f6b97ab6980811c2ac1799edc20db72987b5ba9b1710cffb19669a7736813d15c8da3aa2d4a384246ff946b77ecb0baeb6fd3e12ae591f1bf6a3
 DIST wget-1.21.4.tar.gz.sig 854 BLAKE2B 162c4f358e781bbfb0fa73910191c29dd411f48c9b2c8e8fe00a12741153e624955393d769aa7311b03115d04b6b946a84b636f643d7cdc8c8cd81387b9cf143 SHA512 72603493c2d799dca08700175a2010d8736fd6d3cb9bea3987db8814e9f133ab0fbd1477892115f7fbbd1a7d4d416ec370bdbff6dbe8f00d1eea84f0c4f8d84b
 DIST wget-1.24.5.tar.gz 5182521 BLAKE2B d33274d599f91384c2a7db0b145ec6b315cf87cbbd02026d686a79220e3f15ca9ad0f9d8b507895f6c8486b7ac2ae5fa5c9ea010e883b6eec68d3aba038b02de SHA512 572aa54717e51a9eb9959e127c7afb696645088f32ff7df2cfe9d243957e34ee235e98988fa94649df023d2e3d62b6973e8c9f2eb92beba820dd96d5de2a950d
 DIST wget-1.24.5.tar.gz.sig 854 BLAKE2B 67c084cb8dcbe6184c58203afe11c7426be1f190a6073a68aa658f8480f7046786eb70e47fed4c45b86ea1fda0812a401f530dafd9be816d33d46d54b90223d2 SHA512 f819dc43a466682ace38e8537698e3c7c3919203f77373bdaea1b63ead40c4d3663590209dfeb6187d98edd00e30848a3abd5735795fb47878924f1d9b2ee10d
 EBUILD wget-1.21.4.ebuild 3171 BLAKE2B 3bd335a9f22114d225645bd158d57f8452554dca84bd716827e26066cefda1ba8a3b846630cbaff77bc7f33a1c5651a436da693d582f984680c5583e7d135ad8 SHA512 87ac0d94dec8cd39a2357b87986a28623b49107026584b22f655c31485e13dcf71a8600a283bf8661eb9dad44e6de554cdd58e520e35370d11d71a812db9121b
-EBUILD wget-1.24.5.ebuild 3327 BLAKE2B f373e71a737b147143fc0c21f2cd358416e86aee8d2120ea7bdb4f13c2dcdf668a3e99181ebf7c7158400fe0d0d6b9a756c7e3478ad7f848388ea3a7fe2f23c0 SHA512 512744a4c3fc7d227416fd7f4cf82c8d5c6752f6200856b68b07a076420c805ef0d7dbf210312da3ebe532e68489f47acf722f5f3e70e7620de668e1ca6fbd97
+EBUILD wget-1.24.5.ebuild 3392 BLAKE2B fd9bf019ebe7d175cd2d1c1ae9553b73ede286fabefa1721a51a16dc956f5f2d5469fa3ee861b9e773f8572c9c75c90a86ca3ab98422b70bb09edb4b5ea6bf41 SHA512 dac769a21405f54750e430771532b26a1851ff4d190456d620e865055f39c0e0c245d44240fdb3ab3da4ad245fcef2948428ef5c9f7be392564b2446f24095c6
 MISC metadata.xml 925 BLAKE2B 6a009c4883a765ab687cb5a77339e20bf314e2edc6eb7ca4a2e95296bc2457de9523877df6bc4cd57bd32fdeee182dd356123d49626cb0b321939d37f15c3ace SHA512 cb256297bf62ead8c3841a9186813b0b7230a4078150fc644eb09e94bc7e5588003369a0e03a8530ed5dff893bbac06b2d6d6feec8a20fd9871e4661400e030a
diff --git a/net-misc/wget/files/wget-1.24.5-libproxy-no-debug.patch b/net-misc/wget/files/wget-1.24.5-libproxy-no-debug.patch
new file mode 100644
index 000000000000..9f75dc471a16
--- /dev/null
+++ b/net-misc/wget/files/wget-1.24.5-libproxy-no-debug.patch
@@ -0,0 +1,50 @@
+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 <sam@gentoo.org>
+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/net-misc/wget/wget-1.24.5.ebuild b/net-misc/wget/wget-1.24.5.ebuild
index 81f8f939140c..6626e1328e7d 100644
--- a/net-misc/wget/wget-1.24.5.ebuild
+++ b/net-misc/wget/wget-1.24.5.ebuild
@@ -63,6 +63,10 @@ DOCS=( AUTHORS MAILING-LIST NEWS README )
 # gnulib FPs
 QA_CONFIG_IMPL_DECL_SKIP=( unreachable MIN alignof static_assert )
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.24.5-libproxy-no-debug.patch
+)
+
 pkg_setup() {
 	use test && python-any-r1_pkg_setup
 }