up to 1.30.0

- x32 patch does not appear to be necessary anymore (arch bias applied
  automatically now)
- added patch to fix segfault with iwd backend

diff --git a/NetworkManager-x32.patch b/NetworkManager-x32.patch
deleted file mode 100644 (file)
index 8401bbd..0000000
--- a/NetworkManager-x32.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- NetworkManager-1.28.0/shared/systemd/src/basic/missing_syscall.h.orig      2020-11-17 22:24:23.000000000 +0100
-+++ NetworkManager-1.28.0/shared/systemd/src/basic/missing_syscall.h   2020-12-09 21:56:58.994594968 +0100
-@@ -646,6 +646,8 @@
- #  endif
- #elif defined __ia64__
- #  define systemd_NR_pidfd_send_signal (424 + 1024)
-+#elif defined(__x86_64__) && defined(__ILP32__)
-+#  define systemd_NR_pidfd_send_signal (424 + 0x40000000)
- #else
- #  define systemd_NR_pidfd_send_signal 424
- #endif
-@@ -690,7 +692,9 @@
- #  endif
- #elif defined __ia64__
- #  define systemd_NR_pidfd_open (434 + 1024)
--#else
-+#elif defined(__x86_64__) && defined(__ILP32__)
-+#  define systemd_NR_pidfd_open (434 + 0x40000000)
-+#else 
- #  define systemd_NR_pidfd_open 434
- #endif
- 

diff --git a/NetworkManager.spec b/NetworkManager.spec
index 7a4660ce3b15b6afeb5882c8701e3bf4862514d8..c1481a8608e28f61ec3cfdc929c09d122765f43a 100644 (file)
--- a/NetworkManager.spec
+++ b/NetworkManager.spec
@@ -8,19 +8,19 @@
 Summary:       Network Manager for GNOME
 Summary(pl.UTF-8):     Zarządca sieci dla GNOME
 Name:          NetworkManager
-Version:       1.28.0
-Release:       2
+Version:       1.30.0
+Release:       1
 Epoch:         2
 License:       GPL v2+
 Group:         Networking/Admin
-Source0:       https://download.gnome.org/sources/NetworkManager/1.28/%{name}-%{version}.tar.xz
-# Source0-md5: 3c4a70764ec3418a796b2c3f2a1f83e0
+Source0:       https://download.gnome.org/sources/NetworkManager/1.30/%{name}-%{version}.tar.xz
+# Source0-md5: dce168235c2b86ebc598d0e13e078ee3
 Source1:       %{name}.conf
 Source3:       %{name}.tmpfiles
 Source4:       %{name}.init
 Patch0:                ifcfg-path.patch
-Patch1:                %{name}-x32.patch
-Patch2:                systemd-fallback.patch
+Patch1:                systemd-fallback.patch
+Patch2:                iwd-segfault.patch
 URL:           https://wiki.gnome.org/Projects/NetworkManager
 BuildRequires: ModemManager-devel >= 1.0.0
 BuildRequires: audit-libs-devel
@@ -52,7 +52,7 @@ BuildRequires:        perl-base
 BuildRequires: pkgconfig
 BuildRequires: polkit-devel >= 0.97
 BuildRequires: ppp-plugin-devel >= 3:2.4.6
-BuildRequires: python3 >= 3
+BuildRequires: python3 >= 1:3
 BuildRequires: python3-pygobject3
 BuildRequires: readline-devel
 BuildRequires: rpmbuild(macros) >= 1.752
@@ -187,8 +187,8 @@ Bashowe uzupełnianie nazw dla polecenia NetworkManagera (nmcli).
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
-%{?with_systemd:%patch2 -p1}
+%{?with_systemd:%patch1 -p1}
+%patch2 -p1
 
 grep -rl /usr/bin/env examples | xargs sed -i -e '1{
        s,^#!.*bin/env gjs,#!/usr/bin/gjs,
@@ -379,6 +379,7 @@ exit 0
 %{_mandir}/man7/nm-openvswitch.7*
 %{_mandir}/man7/nmcli-examples.7*
 %{_mandir}/man8/NetworkManager.8*
+%{_mandir}/man8/nm-cloud-setup.8*
 %{_mandir}/man8/nm-initrd-generator.8*
 %{_examplesdir}/%{name}-%{version}
 

diff --git a/ifcfg-path.patch b/ifcfg-path.patch
index 4c2ad20a8f9068f97dd4dad4b64614f62299f9a9..ca66fce68de4cee9b571823e43481e4f9fa50db8 100644 (file)
--- a/ifcfg-path.patch
+++ b/ifcfg-path.patch
@@ -1,7 +1,7 @@
 TODO: make it configurable via dist tag in configure.ac
 
---- NetworkManager-1.28.0/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-common.h.orig     2020-12-09 21:18:05.050791134 +0100
-+++ NetworkManager-1.28.0/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-common.h  2020-12-09 21:18:11.494457108 +0100
+--- NetworkManager-1.28.0/src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-common.h.orig        2020-12-09 21:18:05.050791134 +0100
++++ NetworkManager-1.28.0/src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-common.h     2020-12-09 21:18:11.494457108 +0100
 @@ -21,7 +21,7 @@
  #define AUGNEW_TAG ".augnew"
  #define AUGTMP_TAG ".augtmp"

diff --git a/iwd-segfault.patch b/iwd-segfault.patch
new file mode 100644 (file)
index 0000000..39703c5
--- /dev/null
+++ b/iwd-segfault.patch
@@ -0,0 +1,27 @@
+From b5afe5a862fc2854cc7c71db8c07dc80ca663fd9 Mon Sep 17 00:00:00 2001
+From: Jan Palus <jpalus@fastmail.com>
+Date: Sat, 20 Feb 2021 14:32:35 +0100
+Subject: [PATCH] iwd: terminate interface_order array with NULL
+
+fixes segfault with iwd backend after upgrade to NetworkManager 1.30.0
+
+Signed-off-by: Jan Palus <jpalus@fastmail.com>
+---
+ src/core/devices/wifi/nm-iwd-manager.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/core/devices/wifi/nm-iwd-manager.c b/src/core/devices/wifi/nm-iwd-manager.c
+index b0b208ac5..12d9b37d2 100644
+--- a/src/core/devices/wifi/nm-iwd-manager.c
++++ b/src/core/devices/wifi/nm-iwd-manager.c
+@@ -1119,6 +1119,7 @@ object_compare_interfaces(gconstpointer a, gconstpointer b)
+         NM_IWD_KNOWN_NETWORK_INTERFACE,
+         NM_IWD_NETWORK_INTERFACE,
+         NM_IWD_DEVICE_INTERFACE,
++        NULL
+     };
+     int   rank_a = G_N_ELEMENTS(interface_order);
+     int   rank_b = G_N_ELEMENTS(interface_order);
+-- 
+2.30.1
+

diff --git a/systemd-fallback.patch b/systemd-fallback.patch
index 03ea8e435d6fb884eb50fa2c827a25a48524a5f3..1190689112fa13e41cba8854853cf9853b33197c 100644 (file)
--- a/systemd-fallback.patch
+++ b/systemd-fallback.patch
@@ -9,8 +9,8 @@
  else
        have_systemd_logind=no
  fi
---- NetworkManager-1.28.0/src/nm-session-monitor.c.orig        2020-11-17 22:24:23.000000000 +0100
-+++ NetworkManager-1.28.0/src/nm-session-monitor.c     2020-12-07 17:27:16.046393625 +0100
+--- NetworkManager-1.28.0/src/core/nm-session-monitor.c.orig   2020-11-17 22:24:23.000000000 +0100
++++ NetworkManager-1.28.0/src/core/nm-session-monitor.c        2020-12-07 17:27:16.046393625 +0100
 @@ -18,6 +18,7 @@
  #endif
  
@@ -101,8 +101,8 @@
  
      G_OBJECT_CLASS(nm_session_monitor_parent_class)->finalize(object);
  }
---- NetworkManager-1.28.0/src/nm-sleep-monitor.c.orig  2020-11-17 22:24:23.000000000 +0100
-+++ NetworkManager-1.28.0/src/nm-sleep-monitor.c       2020-12-07 21:18:39.301181579 +0100
+--- NetworkManager-1.28.0/src/core/nm-sleep-monitor.c.orig     2020-11-17 22:24:23.000000000 +0100
++++ NetworkManager-1.28.0/src/core/nm-sleep-monitor.c  2020-12-07 21:18:39.301181579 +0100
 @@ -11,6 +11,10 @@
  #include <sys/stat.h>
  #include <gio/gunixfdlist.h>