From 6131402b823e1291a29b46598c6264461ac15a84 Mon Sep 17 00:00:00 2001
From: Tim Biermann <tbier@posteo.de>
Date: Mon, 26 Aug 2024 23:26:09 +0200
Subject: [PATCH] libnm-32: 1.48.8 -> 1.48.10

---
 libnm-32/.footprint |  6 +++---
 libnm-32/.signature |  9 ++++-----
 libnm-32/2012.patch | 33 ---------------------------------
 libnm-32/Pkgfile    |  6 ++----
 4 files changed, 9 insertions(+), 45 deletions(-)
 delete mode 100644 libnm-32/2012.patch

diff --git a/libnm-32/.footprint b/libnm-32/.footprint
index 0f558366..182158ed 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.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
+drwxr-xr-x	root/root	usr/lib32/NetworkManager/1.48.10/
+-rwxr-xr-x	root/root	usr/lib32/NetworkManager/1.48.10/libnm-device-plugin-adsl.so
+-rwxr-xr-x	root/root	usr/lib32/NetworkManager/1.48.10/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 6c03fe2e..e98f320a 100644
--- a/libnm-32/.signature
+++ b/libnm-32/.signature
@@ -1,7 +1,6 @@
 untrusted comment: verify with /etc/ports/compat-32.pub
-RWSwxGo/zH7eXfLIG8pwQoOEpoKRfLjrR77gc34H5WjAiDUV3rQCseyA3p4TAfKAWlyTOemniugnPk8hSYS5qL8sNyDC8BcKIwM=
-SHA256 (Pkgfile) = 7284ba1bd5e787516831279a869fab7312edf79cc855692e66bcda3148212614
-SHA256 (.footprint) = c0c41ff6186197406115b56d61f22ae8e39386108fb222e27f1617a15399f5a1
-SHA256 (NetworkManager-1.48.8.tar.xz) = 6200eac8f1d3fe6a3ea1f2c4158b3c95b3b9f91e74cd704e97b0b051b5a54878
+RWSwxGo/zH7eXQs3KXaS+fkFfAAfxT556CMw7ynprLn6JLqo2AG4sp6HnOt3bdsdquTLz3Q9Jjxeh+WwC4dFKgBJc1rwxYDWMwc=
+SHA256 (Pkgfile) = 472c532d94ad361a3521c4822748d8ca3107f9a8ad9c11d24bb73acb3c04efc5
+SHA256 (.footprint) = 95097df4ecf980342424901cf995ccf7ed37f839761226b4b8033f42e4dee043
+SHA256 (NetworkManager-1.48.10.tar.xz) = 5dc188fdffcf2d23c89d34b1e6319a6b20203e12eaec24b30037b7ea8ac8c613
 SHA256 (1966.patch) = a5ebbbd77360eff6f818617f68c4b025d1d12403ea990e0c1211b52904cce301
-SHA256 (2012.patch) = feacbe1f446660461e1705a1fd3a29d01257bb31ac56b695e4d49f8e121c88cb
diff --git a/libnm-32/2012.patch b/libnm-32/2012.patch
deleted file mode 100644
index df78d6c0..00000000
--- a/libnm-32/2012.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 7d3bfb101f69e68ec2b886c176e09eb65e72839f Mon Sep 17 00:00:00 2001
-From: Beniamino Galvani <bgalvani@redhat.com>
-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 de66db8a..0b80abff 100644
--- a/libnm-32/Pkgfile
+++ b/libnm-32/Pkgfile
@@ -4,15 +4,13 @@
 # Depends on: curl-32 dbus-glib-32 jansson-32 libndp-32 libpsl-32 networkmanager nss-32
 
 name=libnm-32
-version=1.48.8
+version=1.48.10
 release=1
 source=(https://download.gnome.org/sources/NetworkManager/${version::4}/NetworkManager-$version.tar.xz
-	1966.patch
-	2012.patch)
+	1966.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 \