up to 1.30.2

diff --git a/NetworkManager.spec b/NetworkManager.spec
index 19db36325a064e0ac0b2166538ee74f3e9fe5737..6fe64cc8c49e0b7592f24f815f80091c33c7b1c0 100644 (file)
--- a/NetworkManager.spec
+++ b/NetworkManager.spec
@@ -8,19 +8,18 @@
 Summary:       Network Manager for GNOME
 Summary(pl.UTF-8):     Zarządca sieci dla GNOME
 Name:          NetworkManager
 Summary:       Network Manager for GNOME
 Summary(pl.UTF-8):     Zarządca sieci dla GNOME
 Name:          NetworkManager

-Version:       1.30.0
+Version:       1.30.2

 Release:       1
 Epoch:         2
 License:       GPL v2+
 Group:         Networking/Admin
 Source0:       https://download.gnome.org/sources/NetworkManager/1.30/%{name}-%{version}.tar.xz
 Release:       1
 Epoch:         2
 License:       GPL v2+
 Group:         Networking/Admin
 Source0:       https://download.gnome.org/sources/NetworkManager/1.30/%{name}-%{version}.tar.xz

-# Source0-md5: dce168235c2b86ebc598d0e13e078ee3
+# Source0-md5: a6bd86438c5448cc8cec6771f9a92a40

 Source1:       %{name}.conf
 Source3:       %{name}.tmpfiles
 Source4:       %{name}.init
 Patch0:                ifcfg-path.patch
 Patch1:                systemd-fallback.patch
 Source1:       %{name}.conf
 Source3:       %{name}.tmpfiles
 Source4:       %{name}.init
 Patch0:                ifcfg-path.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
 URL:           https://wiki.gnome.org/Projects/NetworkManager
 BuildRequires: ModemManager-devel >= 1.0.0
 BuildRequires: audit-libs-devel


@@ -188,7 +187,6 @@ Bashowe uzupełnianie nazw dla polecenia NetworkManagera (nmcli).
 %setup -q
 %patch0 -p1
 %{?with_systemd:%patch1 -p1}
 %setup -q
 %patch0 -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,
 
 grep -rl /usr/bin/env examples | xargs sed -i -e '1{
        s,^#!.*bin/env gjs,#!/usr/bin/gjs,

diff --git a/iwd-segfault.patch b/iwd-segfault.patch
deleted file mode 100644 (file)
index 39703c5..0000000
--- a/iwd-segfault.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-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
-