From 90b79a9df51c1f5513a671b3c2e0bdc5fa4af0e0 Mon Sep 17 00:00:00 2001 From: Tim Biermann Date: Fri, 23 Aug 2024 11:58:49 +0200 Subject: [PATCH] libnm-32: 1.48.6 -> 1.48.8 --- libnm-32/.footprint | 6 +++--- libnm-32/.signature | 11 ++++++----- libnm-32/1966.patch | 25 ++++++++++++------------- libnm-32/2012.patch | 33 +++++++++++++++++++++++++++++++++ libnm-32/Pkgfile | 6 ++++-- 5 files changed, 58 insertions(+), 23 deletions(-) create mode 100644 libnm-32/2012.patch diff --git a/libnm-32/.footprint b/libnm-32/.footprint index 893c773c..0f558366 100644 --- a/libnm-32/.footprint +++ b/libnm-32/.footprint @@ -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.48.6/ --rwxr-xr-x root/root usr/lib32/NetworkManager/1.48.6/libnm-device-plugin-adsl.so --rwxr-xr-x root/root usr/lib32/NetworkManager/1.48.6/libnm-device-plugin-wifi.so +drwxr-xr-x root/root usr/lib32/NetworkManager/1.48.8/ +-rwxr-xr-x root/root usr/lib32/NetworkManager/1.48.8/libnm-device-plugin-adsl.so +-rwxr-xr-x root/root usr/lib32/NetworkManager/1.48.8/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 diff --git a/libnm-32/.signature b/libnm-32/.signature index 690f8c66..6c03fe2e 100644 --- a/libnm-32/.signature +++ b/libnm-32/.signature @@ -1,6 +1,7 @@ untrusted comment: verify with /etc/ports/compat-32.pub -RWSwxGo/zH7eXYXlumpWfynFTmXXJjcz5zf4A+sZNYoNh26MfNOMhoP3mZ9eye5+IslfK34Djhwc8wopjtGYtOajsI/6RLvCbQs= -SHA256 (Pkgfile) = bfd77853a6040eb29bf6d5b176ddb6dbc267ed70cbf0d74bbbe2017e489d4877 -SHA256 (.footprint) = 940126864459ab594b1174f3e87439ad80c7331ae7e31c4779058892ab6586ff -SHA256 (NetworkManager-1.48.6.tar.xz) = e65c496e06631a4977c795c0f248598c39c340e5635d7cf54ec3072acc998995 -SHA256 (1966.patch) = 4d715bf0293051e50fe74402330ac99c966a6c4ffb53582b5039c96ccb1a2a4d +RWSwxGo/zH7eXfLIG8pwQoOEpoKRfLjrR77gc34H5WjAiDUV3rQCseyA3p4TAfKAWlyTOemniugnPk8hSYS5qL8sNyDC8BcKIwM= +SHA256 (Pkgfile) = 7284ba1bd5e787516831279a869fab7312edf79cc855692e66bcda3148212614 +SHA256 (.footprint) = c0c41ff6186197406115b56d61f22ae8e39386108fb222e27f1617a15399f5a1 +SHA256 (NetworkManager-1.48.8.tar.xz) = 6200eac8f1d3fe6a3ea1f2c4158b3c95b3b9f91e74cd704e97b0b051b5a54878 +SHA256 (1966.patch) = a5ebbbd77360eff6f818617f68c4b025d1d12403ea990e0c1211b52904cce301 +SHA256 (2012.patch) = feacbe1f446660461e1705a1fd3a29d01257bb31ac56b695e4d49f8e121c88cb diff --git a/libnm-32/1966.patch b/libnm-32/1966.patch index b48b21da..2529285d 100644 --- a/libnm-32/1966.patch +++ b/libnm-32/1966.patch @@ -1,4 +1,4 @@ -From 70d1c34b94baadc3305745cf159ea55f312beacc Mon Sep 17 00:00:00 2001 +From 118e3117fe48f18cb2175b3cbc95a6ea3ced28b2 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Fri, 7 Jun 2024 14:03:15 -0700 Subject: [PATCH] libnm-systemd-core: Disable sd_dhcp6_client_set_duid_uuid @@ -17,19 +17,19 @@ which need this function. Signed-off-by: Khem Raj --- - 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(-) + 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 e664a4a720..7ba502086f 100644 +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 ++#if 0 /* NM_IGNORED */ int sd_dhcp_duid_set_uuid(sd_dhcp_duid *duid) { sd_id128_t machine_id; int r; @@ -37,31 +37,30 @@ index e664a4a720..7ba502086f 100644 duid->size = offsetof(struct duid, uuid.uuid) + sizeof(machine_id); return 0; } -+#endif ++#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 7c20116409..08c1e96b3c 100644 +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 ++#if 0 /* NM_IGNORED */ 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) { +@@ -256,6 +257,7 @@ int sd_dhcp6_client_set_duid_uuid(sd_dhcp6_client *client) { return 0; } -- -+#endif ++#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 diff --git a/libnm-32/2012.patch b/libnm-32/2012.patch new file mode 100644 index 00000000..df78d6c0 --- /dev/null +++ b/libnm-32/2012.patch @@ -0,0 +1,33 @@ +From 7d3bfb101f69e68ec2b886c176e09eb65e72839f Mon Sep 17 00:00:00 2001 +From: Beniamino Galvani +Date: Mon, 19 Aug 2024 11:22:11 +0200 +Subject: [PATCH] platform: add define for IFLA_BOND_SLAVE_PRIO + +The enum value was added in kernel 5.19; add a define for it so that +the compilation doesn't fail with earlier kernels. + +Fixes: 79221f79a295 ('src: drop most slave references from the code') + +https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/issues/1596 +https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/merge_requests/2012 +--- + src/libnm-platform/nm-linux-platform.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/src/libnm-platform/nm-linux-platform.c b/src/libnm-platform/nm-linux-platform.c +index c8a4c56376d..65f42d8a278 100644 +--- a/src/libnm-platform/nm-linux-platform.c ++++ b/src/libnm-platform/nm-linux-platform.c +@@ -187,6 +187,9 @@ G_STATIC_ASSERT(RTA_MAX == (__RTA_MAX - 1)); + + /*****************************************************************************/ + ++/* Added in kernel 5.19, dated July 31, 2022 */ ++#define IFLA_BOND_SLAVE_PRIO 9 ++ + #define IFLA_BOND_ACTIVE_PORT IFLA_BOND_ACTIVE_SLAVE + #define IFLA_BOND_PORT_PRIO IFLA_BOND_SLAVE_PRIO + #define IFLA_BOND_ALL_PORTS_ACTIVE IFLA_BOND_ALL_SLAVES_ACTIVE +-- +GitLab + diff --git a/libnm-32/Pkgfile b/libnm-32/Pkgfile index 48345366..de66db8a 100644 --- a/libnm-32/Pkgfile +++ b/libnm-32/Pkgfile @@ -4,13 +4,15 @@ # Depends on: curl-32 dbus-glib-32 jansson-32 libndp-32 libpsl-32 networkmanager nss-32 name=libnm-32 -version=1.48.6 +version=1.48.8 release=1 source=(https://download.gnome.org/sources/NetworkManager/${version::4}/NetworkManager-$version.tar.xz - 1966.patch) + 1966.patch + 2012.patch) build() { patch -Np1 -d $SRC/NetworkManager-$version -i $SRC/1966.patch + patch -Np1 -d $SRC/NetworkManager-$version -i $SRC/2012.patch meson setup NetworkManager-$version build $PKGMK_NM \ --prefix /usr \