mirror of
https://gitlab.com/buildroot.org/buildroot.git
synced 2026-09-29 21:41:43 -09:00
package/network-manager: bump to version 1.50.1
Upstream changelog: https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/blob/1.50.1/NEWS?ref_type=tags Release downloads have moved to gitlab.freedesktop.org, see [1, 2]. Drop patch included upstream. [1] https://lists.freedesktop.org/archives/networkmanager/2024-December/000364.html [2] https://download.gnome.org/sources/NetworkManager/IMPORTANT-NetworkManager-releases-moved.txt Signed-off-by: Fiona Klute (WIWA) <fiona.klute@gmx.de> Signed-off-by: Julien Olivain <ju.o@free.fr>
This commit is contained in:
committed by
Julien Olivain
parent
f06c28d1af
commit
489d1f9249
@@ -1,68 +0,0 @@
|
||||
From 118e3117fe48f18cb2175b3cbc95a6ea3ced28b2 Mon Sep 17 00:00:00 2001
|
||||
From: Khem Raj <raj.khem@gmail.com>
|
||||
Date: Fri, 7 Jun 2024 14:03:15 -0700
|
||||
Subject: [PATCH] libnm-systemd-core: Disable sd_dhcp6_client_set_duid_uuid
|
||||
function
|
||||
|
||||
When building on musl systems ( with out systemd ), and using LLD linker
|
||||
from LLVM project we fail to link with undefined symbols.
|
||||
|
||||
This symbol is in sd_id128.c but its disabled, so let disable the functions
|
||||
which need this function.
|
||||
|
||||
| x86_64-yoe-linux-musl-ld.lld: error: undefined symbol: sd_id128_get_machine_app_specific
|
||||
| >>> referenced by sd-dhcp-duid.c:202 (/usr/src/debug/networkmanager/1.48.0/../NetworkManager-1.48.0/src/libnm-systemd-core/src/libsystemd-network/sd-dhcp-duid.c:202)
|
||||
| >>> libnm-systemd-core.a.p/src_libsystemd-network_sd-dhcp-duid.c.o:(sd_dhcp_duid_set_uuid) in archive src/libnm-systemd-core/libnm-systemd-core.a
|
||||
| x86_64-yoe-linux-musl-clang: error: linker command failed with exit code 1 (use -v to see invocation)
|
||||
|
||||
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||
Upstream: https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/commit/118e3117fe48f18cb2175b3cbc95a6ea3ced28b2
|
||||
Signed-off-by: Fiona Klute (WIWA) <fiona.klute@gmx.de>
|
||||
---
|
||||
src/libnm-systemd-core/src/libsystemd-network/sd-dhcp-duid.c | 2 ++
|
||||
src/libnm-systemd-core/src/libsystemd-network/sd-dhcp6-client.c | 2 ++
|
||||
2 files changed, 4 insertions(+)
|
||||
|
||||
diff --git a/src/libnm-systemd-core/src/libsystemd-network/sd-dhcp-duid.c b/src/libnm-systemd-core/src/libsystemd-network/sd-dhcp-duid.c
|
||||
index e664a4a7207..28abddfbc5e 100644
|
||||
--- a/src/libnm-systemd-core/src/libsystemd-network/sd-dhcp-duid.c
|
||||
+++ b/src/libnm-systemd-core/src/libsystemd-network/sd-dhcp-duid.c
|
||||
@@ -193,6 +193,7 @@ int sd_dhcp_duid_set_en(sd_dhcp_duid *duid) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
+#if 0 /* NM_IGNORED */
|
||||
int sd_dhcp_duid_set_uuid(sd_dhcp_duid *duid) {
|
||||
sd_id128_t machine_id;
|
||||
int r;
|
||||
@@ -209,6 +210,7 @@ int sd_dhcp_duid_set_uuid(sd_dhcp_duid *duid) {
|
||||
duid->size = offsetof(struct duid, uuid.uuid) + sizeof(machine_id);
|
||||
return 0;
|
||||
}
|
||||
+#endif /* NM_IGNORED */
|
||||
|
||||
int dhcp_duid_to_string_internal(uint16_t type, const void *data, size_t data_size, char **ret) {
|
||||
_cleanup_free_ char *p = NULL, *x = NULL;
|
||||
diff --git a/src/libnm-systemd-core/src/libsystemd-network/sd-dhcp6-client.c b/src/libnm-systemd-core/src/libsystemd-network/sd-dhcp6-client.c
|
||||
index 7c20116409e..a6b55d07e0b 100644
|
||||
--- a/src/libnm-systemd-core/src/libsystemd-network/sd-dhcp6-client.c
|
||||
+++ b/src/libnm-systemd-core/src/libsystemd-network/sd-dhcp6-client.c
|
||||
@@ -244,6 +244,7 @@ int sd_dhcp6_client_set_duid_en(sd_dhcp6_client *client) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
+#if 0 /* NM_IGNORED */
|
||||
int sd_dhcp6_client_set_duid_uuid(sd_dhcp6_client *client) {
|
||||
int r;
|
||||
|
||||
@@ -256,6 +257,7 @@ int sd_dhcp6_client_set_duid_uuid(sd_dhcp6_client *client) {
|
||||
|
||||
return 0;
|
||||
}
|
||||
+#endif /* NM_IGNORED */
|
||||
|
||||
int sd_dhcp6_client_set_duid_raw(sd_dhcp6_client *client, uint16_t duid_type, const uint8_t *duid, size_t duid_len) {
|
||||
int r;
|
||||
--
|
||||
GitLab
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
# From https://download.gnome.org/sources/NetworkManager/1.48/NetworkManager-1.48.8.sha256sum
|
||||
sha256 5dc188fdffcf2d23c89d34b1e6319a6b20203e12eaec24b30037b7ea8ac8c613 NetworkManager-1.48.10.tar.xz
|
||||
# From https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/releases/1.50.1/downloads/NetworkManager-1.50.1.tar.xz.sha256sum
|
||||
sha256 5f9b881810e83a9f7c152f9c0051ee0bf922bd23053208f642c8fcaa1bdcdd25 NetworkManager-1.50.1.tar.xz
|
||||
# Locally computed
|
||||
sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING
|
||||
sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LGPL
|
||||
|
||||
@@ -4,10 +4,10 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
NETWORK_MANAGER_VERSION_MAJOR = 1.48
|
||||
NETWORK_MANAGER_VERSION = $(NETWORK_MANAGER_VERSION_MAJOR).10
|
||||
NETWORK_MANAGER_VERSION_MAJOR = 1.50
|
||||
NETWORK_MANAGER_VERSION = $(NETWORK_MANAGER_VERSION_MAJOR).1
|
||||
NETWORK_MANAGER_SOURCE = NetworkManager-$(NETWORK_MANAGER_VERSION).tar.xz
|
||||
NETWORK_MANAGER_SITE = https://download.gnome.org/sources/NetworkManager/$(NETWORK_MANAGER_VERSION_MAJOR)
|
||||
NETWORK_MANAGER_SITE = https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/releases/$(NETWORK_MANAGER_VERSION)/downloads
|
||||
NETWORK_MANAGER_INSTALL_STAGING = YES
|
||||
NETWORK_MANAGER_LICENSE = GPL-2.0+ (app), LGPL-2.1+ (libnm)
|
||||
NETWORK_MANAGER_LICENSE_FILES = COPYING COPYING.LGPL
|
||||
|
||||
Reference in New Issue
Block a user