libnm-32: 1.46.0 -> 1.48.2
This commit is contained in:
parent
d5e10c1eb4
commit
2a586042ed
GPG Key ID:
42F8B4E30B673606
@ -1,9 +1,9 @@
|
||||
drwxr-xr-x root/root usr/
|
||||
drwxr-xr-x root/root usr/lib32/
|
||||
drwxr-xr-x root/root usr/lib32/NetworkManager/
|
||||
drwxr-xr-x root/root usr/lib32/NetworkManager/1.46.0/
|
||||
-rwxr-xr-x root/root usr/lib32/NetworkManager/1.46.0/libnm-device-plugin-adsl.so
|
||||
-rwxr-xr-x root/root usr/lib32/NetworkManager/1.46.0/libnm-device-plugin-wifi.so
|
||||
drwxr-xr-x root/root usr/lib32/NetworkManager/1.48.2/
|
||||
-rwxr-xr-x root/root usr/lib32/NetworkManager/1.48.2/libnm-device-plugin-adsl.so
|
||||
-rwxr-xr-x root/root usr/lib32/NetworkManager/1.48.2/libnm-device-plugin-wifi.so
|
||||
lrwxrwxrwx root/root usr/lib32/libnm.so -> libnm.so.0
|
||||
lrwxrwxrwx root/root usr/lib32/libnm.so.0 -> libnm.so.0.1.0
|
||||
-rwxr-xr-x root/root usr/lib32/libnm.so.0.1.0
|
||||
|
||||
@ -1,5 +1,6 @@
|
||||
untrusted comment: verify with /etc/ports/compat-32.pub
|
||||
RWSwxGo/zH7eXaKA3rISa7CbwoM6haqFFBBZQ+6/H3y6P2+C6JXjGHeQrFJ7wIlGyRFpRKKqtc0V9RVTQC9NlTQlrD/7kLtw3wA=
|
||||
SHA256 (Pkgfile) = 10863734dd2b428caa70cf00621f7cfcbe004c2aaaed963b00a2ac7cc5270904
|
||||
SHA256 (.footprint) = fe2e948794773fd3d42a6f7687ae8cf70ffba30891a4cdf9ea8c936b4762b96d
|
||||
SHA256 (NetworkManager-1.46.0.tar.xz) = 722649e25362693b334371473802a729b0ec9ee283375096905f868808e74068
|
||||
RWSwxGo/zH7eXdySFwWqKe5rtQswp9CfhX9u5Ol4ccRD/m/xb2F56Zcb8y+AxXBjsE68j/xRIEqMEfK3SX+OZjccdaxu79ryBgo=
|
||||
SHA256 (Pkgfile) = 4e9e3615382e388fb2e4c4477beba1f338db166cef00cd795c2f6618e25462fa
|
||||
SHA256 (.footprint) = b6f8cb0cd22f8253dab22b32e1a9500bc7cee6d4bb9d45af1495bcab7dec333c
|
||||
SHA256 (NetworkManager-1.48.2.tar.xz) = 3d9071cc62964ddf0e31f5d06f0603e17568b8c95114ae277703581add5a86a1
|
||||
SHA256 (1966.patch) = 4d715bf0293051e50fe74402330ac99c966a6c4ffb53582b5039c96ccb1a2a4d
|
||||
|
||||
67
libnm-32/1966.patch
Normal file
67
libnm-32/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
|
||||
|
||||
@ -4,11 +4,14 @@
|
||||
# Depends on: curl-32 dbus-glib-32 jansson-32 libndp-32 libpsl-32 networkmanager nss-32
|
||||
|
||||
name=libnm-32
|
||||
version=1.46.0
|
||||
version=1.48.2
|
||||
release=1
|
||||
source=(https://download.gnome.org/sources/NetworkManager/${version::4}/NetworkManager-$version.tar.xz)
|
||||
source=(https://download.gnome.org/sources/NetworkManager/${version::4}/NetworkManager-$version.tar.xz
|
||||
1966.patch)
|
||||
|
||||
build() {
|
||||
patch -Np1 -d $SRC/NetworkManager-$version -i $SRC/1966.patch
|
||||
|
||||
meson setup NetworkManager-$version build $PKGMK_NM \
|
||||
--prefix /usr \
|
||||
--libdir /usr/lib32 \
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user