networkmanager: 1.46.0 -> 1.48.2
This commit is contained in:
parent
8f9334a7f2
commit
79b9e36a01
GPG Key ID:
42F8B4E30B673606
@ -154,11 +154,11 @@ drwxr-xr-x root/root usr/include/libnm/
|
||||
-rw-r--r-- root/root usr/include/libnm/nm-wimax-nsp.h
|
||||
drwxr-xr-x root/root usr/lib/
|
||||
drwxr-xr-x root/root usr/lib/NetworkManager/
|
||||
drwxr-xr-x root/root usr/lib/NetworkManager/1.46.0/
|
||||
-rwxr-xr-x root/root usr/lib/NetworkManager/1.46.0/libnm-device-plugin-adsl.so
|
||||
-rwxr-xr-x root/root usr/lib/NetworkManager/1.46.0/libnm-device-plugin-ovs.so
|
||||
-rwxr-xr-x root/root usr/lib/NetworkManager/1.46.0/libnm-device-plugin-wifi.so
|
||||
-rwxr-xr-x root/root usr/lib/NetworkManager/1.46.0/libnm-settings-plugin-ifupdown.so
|
||||
drwxr-xr-x root/root usr/lib/NetworkManager/1.48.2/
|
||||
-rwxr-xr-x root/root usr/lib/NetworkManager/1.48.2/libnm-device-plugin-adsl.so
|
||||
-rwxr-xr-x root/root usr/lib/NetworkManager/1.48.2/libnm-device-plugin-ovs.so
|
||||
-rwxr-xr-x root/root usr/lib/NetworkManager/1.48.2/libnm-device-plugin-wifi.so
|
||||
-rwxr-xr-x root/root usr/lib/NetworkManager/1.48.2/libnm-settings-plugin-ifupdown.so
|
||||
drwxr-xr-x root/root usr/lib/NetworkManager/VPN/
|
||||
drwxr-xr-x root/root usr/lib/NetworkManager/conf.d/
|
||||
drwxr-xr-x root/root usr/lib/NetworkManager/dispatcher.d/
|
||||
|
||||
@ -1,10 +1,11 @@
|
||||
untrusted comment: verify with /etc/ports/contrib.pub
|
||||
RWSagIOpLGJF30KnpOkT9bs200gWgBbL9qg37TAqaO8k7ab8tvQxDnAxPuUeUnY5TVpfldWefZJOnONzwVpTfFbYl8kONB+7GQw=
|
||||
SHA256 (Pkgfile) = 3dc52db284ce41ab98550a0485b5e2069a00e8ab4c434b5db5c68a8026e4919d
|
||||
SHA256 (.footprint) = 221d58cc3bb56360c1655aa07e01779b6ccb1663a9bd9458c0c7317bfcdb6f24
|
||||
SHA256 (NetworkManager-1.46.0.tar.xz) = 722649e25362693b334371473802a729b0ec9ee283375096905f868808e74068
|
||||
RWSagIOpLGJF3z76pzCbyshInKBLfBA2ALWbV0UaKftCCQ9E1ok6Af3Uc45tRd1cvFMr8JzjNaIpGqkaGJ5feMtH1yNhQN3JMwc=
|
||||
SHA256 (Pkgfile) = b6be29177e856910e6d1f8f6e1fc0198d3f935745246847a756b30eaf64515d8
|
||||
SHA256 (.footprint) = a1e74697c53b83615702d443f12c56af79a3118d2a695815a779df4d190138ef
|
||||
SHA256 (NetworkManager-1.48.2.tar.xz) = 3d9071cc62964ddf0e31f5d06f0603e17568b8c95114ae277703581add5a86a1
|
||||
SHA256 (networkmanager.rc) = dc0b743685214c0402d392a6a9b2632b19714795a04c0f42ba10026250d9f3fc
|
||||
SHA256 (NetworkManager.conf) = 44b048804c7c0b8b3b0c29b8632b6ad613c397d0a1635ec918e10c0fbcdadf21
|
||||
SHA256 (polkit.conf) = 7410be567871e4dc8ef1e8204f80b7cfd0dd08abfa514408b7d549bdc70dbaba
|
||||
SHA256 (dhcp.conf) = cd2a4b0079c0726973c1cf226c4e1cb4f2d27d02c16e0e08af7e4d6b8770423c
|
||||
SHA256 (org.freedesktop.NetworkManager.rules) = 7708da5de800684eb7036f29534ac6f3004115695428484e09b712da5bb1e8a5
|
||||
SHA256 (1966.patch) = 4d715bf0293051e50fe74402330ac99c966a6c4ffb53582b5039c96ccb1a2a4d
|
||||
|
||||
67
networkmanager/1966.patch
Normal file
67
networkmanager/1966.patch
Normal file
@ -0,0 +1,67 @@
|
||||
From 70d1c34b94baadc3305745cf159ea55f312beacc 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>
|
||||
---
|
||||
src/libnm-systemd-core/src/libsystemd-network/sd-dhcp-duid.c | 2 ++
|
||||
.../src/libsystemd-network/sd-dhcp6-client.c | 3 ++-
|
||||
2 files changed, 4 insertions(+), 1 deletion(-)
|
||||
|
||||
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 e664a4a720..7ba502086f 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
|
||||
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
|
||||
|
||||
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 7c20116409..08c1e96b3c 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
|
||||
int sd_dhcp6_client_set_duid_uuid(sd_dhcp6_client *client) {
|
||||
int r;
|
||||
|
||||
@@ -256,7 +257,7 @@ int sd_dhcp6_client_set_duid_uuid(sd_dhcp6_client *client) {
|
||||
|
||||
return 0;
|
||||
}
|
||||
-
|
||||
+#endif
|
||||
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
|
||||
|
||||
@ -5,14 +5,15 @@
|
||||
# Optional: bash-completion dnsmasq iwd jansson libpsl libteam mobile-broadband-provider-info modemmanager ppp vala wireguard-tools
|
||||
|
||||
name=networkmanager
|
||||
version=1.46.0
|
||||
version=1.48.2
|
||||
release=1
|
||||
source=(https://download.gnome.org/sources/NetworkManager/${version::4}/NetworkManager-$version.tar.xz
|
||||
networkmanager.rc
|
||||
NetworkManager.conf
|
||||
polkit.conf
|
||||
dhcp.conf
|
||||
org.freedesktop.NetworkManager.rules)
|
||||
org.freedesktop.NetworkManager.rules
|
||||
1966.patch)
|
||||
|
||||
build() {
|
||||
prt-get isinst iwd && PKGMK_NM+=' -D iwd=true'
|
||||
@ -23,6 +24,7 @@ build() {
|
||||
prt-get isinst vala && PKGMK_NM+=' -D vapi=false'
|
||||
|
||||
/usr/bin/grep -rl '^#!.*python$' | xargs sed -i '1s/python/&3/'
|
||||
patch -Np1 -d NetworkManager-$version -i $SRC/1966.patch
|
||||
|
||||
meson setup NetworkManager-$version build $PKGMK_NM \
|
||||
--prefix /usr \
|
||||
|
||||
0
networkmanager/networkmanager.rc
Normal file → Executable file
0
networkmanager/networkmanager.rc
Normal file → Executable file
Loading…
Reference in New Issue
Block a user