Bläddra i källkod

package/network-manager: bump to version 1.46.0

Drop patch which is now upstream.

CONTRIBUTING.md hash changed due to details added:
https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/commit/5481ba156804f979cb2d585df3dc012ff3002755

Signed-off-by: James Hilliard <james.hilliard1@gmail.com>
Reviewed-By: Marcus Hoffmann <buildroot@bubu1.eu>
Tested-by: Marcus Hoffmann <buildroot@bubu1.eu>
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
James Hilliard 1 år sedan
förälder
incheckning
409b76aea4

+ 0 - 44
package/network-manager/0001-connectivity-make-curl-timeout-callback-non-repeating.patch

@@ -1,44 +0,0 @@
-From abc6e1cf258ab332bed161036a358bbe9c2d1e90 Mon Sep 17 00:00:00 2001
-From: Tatsuyuki Ishi <ishitatsuyuki@gmail.com>
-Date: Fri, 13 Oct 2023 16:46:09 +0000
-Subject: [PATCH] connectivity: Make curl timeout callback non-repeating.
-
-This reverts commit 05c31da4d9.
-
-In the linked commit the callback was made repeating on the assumption
-that forward progress would result in the callback getting canceled in
-cb_data_complete. However, this assumption does not hold since a timeout
-callback does not guarantee completion (or error out) of a request.
-
-curl tweaked some internals in v8.4.0 and started giving 0 timeouts, and
-a repeating callback is firing back-to-back without making any progress
-in doing so.
-
-Revert the change and make the callback non-repeating again.
-
-Fixes: 05c31da4d9cb ('connectivity: don't cancel curl timerfunction from timeout')
-Upstream: https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/commit/abc6e1cf258ab332bed161036a358bbe9c2d1e90
-Signed-off-by: Christian Hitz <christian.hitz@bbv.ch>
----
- src/core/nm-connectivity.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/src/core/nm-connectivity.c b/src/core/nm-connectivity.c
-index 92de44f17d..d8b0004c38 100644
---- a/src/core/nm-connectivity.c
-+++ b/src/core/nm-connectivity.c
-@@ -406,9 +406,10 @@ _con_curl_timeout_cb(gpointer user_data)
- {
-     NMConnectivityCheckHandle *cb_data = user_data;
- 
-+    cb_data->concheck.curl_timer = 0;
-     _con_curl_check_connectivity(cb_data->concheck.curl_mhandle, CURL_SOCKET_TIMEOUT, 0);
-     _complete_queued(cb_data->self);
--    return G_SOURCE_CONTINUE;
-+    return G_SOURCE_REMOVE;
- }
- 
- static int
--- 
-GitLab
-

+ 3 - 3
package/network-manager/network-manager.hash

@@ -1,6 +1,6 @@
-# From https://download.gnome.org/sources/NetworkManager/1.44/NetworkManager-1.44.2.sha256sum
-sha256  4b58bf3ac57e2cefb5652efd0945eb0b4bc36a63d92a61ab471d8bb2c9a420e1  NetworkManager-1.44.2.tar.xz
+# From https://download.gnome.org/sources/NetworkManager/1.46/NetworkManager-1.46.0.sha256sum
+sha256  722649e25362693b334371473802a729b0ec9ee283375096905f868808e74068  NetworkManager-1.46.0.tar.xz
 # Locally computed
 sha256  8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643  COPYING
 sha256  dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551  COPYING.LGPL
-sha256  e7cf3d92bda8e5365eaf4514d572146a19e93336f7a966493778d0d0c4476fae  CONTRIBUTING.md
+sha256  9f7f0d40116e5a0f1566b9da71e9c95738c99364e4b5437d8115aa614490372b  CONTRIBUTING.md

+ 2 - 2
package/network-manager/network-manager.mk

@@ -4,8 +4,8 @@
 #
 ################################################################################
 
-NETWORK_MANAGER_VERSION_MAJOR = 1.44
-NETWORK_MANAGER_VERSION = $(NETWORK_MANAGER_VERSION_MAJOR).2
+NETWORK_MANAGER_VERSION_MAJOR = 1.46
+NETWORK_MANAGER_VERSION = $(NETWORK_MANAGER_VERSION_MAJOR).0
 NETWORK_MANAGER_SOURCE = NetworkManager-$(NETWORK_MANAGER_VERSION).tar.xz
 NETWORK_MANAGER_SITE = https://download.gnome.org/sources/NetworkManager/$(NETWORK_MANAGER_VERSION_MAJOR)
 NETWORK_MANAGER_INSTALL_STAGING = YES