From f23e3eca4717a17b6378fb1625a5251ef620730e Mon Sep 17 00:00:00 2001 From: Tim Biermann Date: Mon, 26 Aug 2024 23:18:40 +0200 Subject: [PATCH] networkmanager: 1.48.8 -> 1.48.10 --- networkmanager/.footprint | 10 +++++----- networkmanager/.signature | 9 ++++----- networkmanager/2012.patch | 33 --------------------------------- networkmanager/Pkgfile | 4 +--- 4 files changed, 10 insertions(+), 46 deletions(-) delete mode 100644 networkmanager/2012.patch diff --git a/networkmanager/.footprint b/networkmanager/.footprint index 6f126dc2a..13dab1b7e 100644 --- a/networkmanager/.footprint +++ b/networkmanager/.footprint @@ -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.48.8/ --rwxr-xr-x root/root usr/lib/NetworkManager/1.48.8/libnm-device-plugin-adsl.so --rwxr-xr-x root/root usr/lib/NetworkManager/1.48.8/libnm-device-plugin-ovs.so --rwxr-xr-x root/root usr/lib/NetworkManager/1.48.8/libnm-device-plugin-wifi.so --rwxr-xr-x root/root usr/lib/NetworkManager/1.48.8/libnm-settings-plugin-ifupdown.so +drwxr-xr-x root/root usr/lib/NetworkManager/1.48.10/ +-rwxr-xr-x root/root usr/lib/NetworkManager/1.48.10/libnm-device-plugin-adsl.so +-rwxr-xr-x root/root usr/lib/NetworkManager/1.48.10/libnm-device-plugin-ovs.so +-rwxr-xr-x root/root usr/lib/NetworkManager/1.48.10/libnm-device-plugin-wifi.so +-rwxr-xr-x root/root usr/lib/NetworkManager/1.48.10/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/ diff --git a/networkmanager/.signature b/networkmanager/.signature index ecbe6531f..f591a6c0a 100644 --- a/networkmanager/.signature +++ b/networkmanager/.signature @@ -1,12 +1,11 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF3xUWDGtHGaB7g2XNeH+P93TR+FPyQkyO8zMgzphfz/t40OODyZ3v0ZCjAr/K1bv1ajihGood7SpMeoX83+7S2QM= -SHA256 (Pkgfile) = 3c2c4de1293fa27e7feddad84ff727e1972fb1570292c30146e14e99e40b569f -SHA256 (.footprint) = 308fefbfe97cdfd7be8f4bcad259f78eb1ca26a247025123c60a8c0033640999 -SHA256 (NetworkManager-1.48.8.tar.xz) = 6200eac8f1d3fe6a3ea1f2c4158b3c95b3b9f91e74cd704e97b0b051b5a54878 +RWSagIOpLGJF359lKKY0edtqtpzrujDC9H8cqlIzV8ckvqPHj9GHB6TyGMQQoiBqrkqJyNvtG1qpDzL+ab34hCHkplShx0S/sA0= +SHA256 (Pkgfile) = 760d491dd7dbadfe7dd9eac0f8dfc006820a234f489512978d35acb75ed83939 +SHA256 (.footprint) = eca74930aa615ad029c0742d65ffe59773a71ff4dee22e31cd54787605b27a3a +SHA256 (NetworkManager-1.48.10.tar.xz) = 5dc188fdffcf2d23c89d34b1e6319a6b20203e12eaec24b30037b7ea8ac8c613 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) = a5ebbbd77360eff6f818617f68c4b025d1d12403ea990e0c1211b52904cce301 -SHA256 (2012.patch) = feacbe1f446660461e1705a1fd3a29d01257bb31ac56b695e4d49f8e121c88cb diff --git a/networkmanager/2012.patch b/networkmanager/2012.patch deleted file mode 100644 index df78d6c0f..000000000 --- a/networkmanager/2012.patch +++ /dev/null @@ -1,33 +0,0 @@ -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/networkmanager/Pkgfile b/networkmanager/Pkgfile index 35b504be5..34c280025 100644 --- a/networkmanager/Pkgfile +++ b/networkmanager/Pkgfile @@ -5,7 +5,7 @@ # Optional: bash-completion dnsmasq iwd jansson libpsl libteam mobile-broadband-provider-info modemmanager ppp vala wireguard-tools name=networkmanager -version=1.48.8 +version=1.48.10 release=1 source=(https://download.gnome.org/sources/NetworkManager/${version::4}/NetworkManager-$version.tar.xz networkmanager.rc @@ -14,7 +14,6 @@ source=(https://download.gnome.org/sources/NetworkManager/${version::4}/NetworkM dhcp.conf org.freedesktop.NetworkManager.rules 1966.patch - 2012.patch ) build() { @@ -27,7 +26,6 @@ build() { /usr/bin/grep -rl '^#!.*python$' | xargs sed -i '1s/python/&3/' patch -Np1 -d NetworkManager-$version -i $SRC/1966.patch - patch -Np1 -d NetworkManager-$version -i $SRC/2012.patch meson setup NetworkManager-$version build $PKGMK_NM \ --prefix /usr \