From 17a4173b3a8a09b1e4ef5bc13b5dccb453761297 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Feb 25 2022 05:25:47 +0000
Subject: import network-manager-applet-1.24.0-4.el8


---

diff --git a/SOURCES/0001-Wi-Fi-OWE-Fix-Enhanced-Open-OWE-not-being-saved-prop.patch b/SOURCES/0001-Wi-Fi-OWE-Fix-Enhanced-Open-OWE-not-being-saved-prop.patch
new file mode 100644
index 0000000..31c259b
--- /dev/null
+++ b/SOURCES/0001-Wi-Fi-OWE-Fix-Enhanced-Open-OWE-not-being-saved-prop.patch
@@ -0,0 +1,60 @@
+From 38731695f7b38d867e51b3d5cee2d0281c315a71 Mon Sep 17 00:00:00 2001
+From: Ana Cabral <acabral@redhat.com>
+Date: Mon, 21 Feb 2022 16:32:27 +0100
+Subject: [PATCH] Wi-Fi/OWE: Fix Enhanced Open (OWE) not being saved properly
+ from nm-connection-editor
+
+When we create a Wi-Fi connection using Enhanced Open (OWE) Security
+from nm-connection-editor and save it, it was not being saved and the
+security was being set as "None", with Wireless Security Setting
+being discarded. This was fixed.
+
+This fix is temporary fix. It should (and will) be done from libnma,
+OWE should be implemented in libnma. Meanwhile this gets done,
+this solution handles this issue.
+
+https://bugzilla.redhat.com/show_bug.cgi?id=2023156
+
+Fixes: b85ed300781ce9f26df9cf8e659d1bc0bc173201
+
+https://gitlab.gnome.org/GNOME/network-manager-applet/-/merge_requests/108
+---
+ src/connection-editor/page-wifi-security.c | 22 ++++++++++++++++++----
+ 1 file changed, 18 insertions(+), 4 deletions(-)
+
+diff --git a/src/connection-editor/page-wifi-security.c b/src/connection-editor/page-wifi-security.c
+index e8c9d7e2..e8086452 100644
+--- a/src/connection-editor/page-wifi-security.c
++++ b/src/connection-editor/page-wifi-security.c
+@@ -580,10 +580,24 @@ ce_page_validate_v (CEPage *page, NMConnection *connection, GError **error)
+ 
+ 		g_object_unref (ws);
+ 	} else {
+-		/* No security, unencrypted */
+-		nm_connection_remove_setting (connection, NM_TYPE_SETTING_WIRELESS_SECURITY);
+-		nm_connection_remove_setting (connection, NM_TYPE_SETTING_802_1X);
+-		valid = TRUE;
++
++		if (gtk_combo_box_get_active (priv->security_combo) == 0) {
++			/* No security, unencrypted */
++			nm_connection_remove_setting (connection, NM_TYPE_SETTING_WIRELESS_SECURITY);
++			nm_connection_remove_setting (connection, NM_TYPE_SETTING_802_1X);
++			valid = TRUE;
++		} else {
++			/* owe case:
++			 * fill the connection manually until libnma implements OWE wireless security
++			 */
++			NMSetting *s_wireless_sec;
++
++			s_wireless_sec = nm_setting_wireless_security_new ();
++			g_object_set (s_wireless_sec, NM_SETTING_WIRELESS_SECURITY_KEY_MGMT, "owe", NULL);
++			nm_connection_add_setting (connection, s_wireless_sec);
++			nm_connection_remove_setting (connection, NM_TYPE_SETTING_802_1X);
++			valid = TRUE;
++		}
+ 	}
+ 
+ 	return valid;
+-- 
+2.35.1
+
diff --git a/SPECS/network-manager-applet.spec b/SPECS/network-manager-applet.spec
index 86f0d3d..6718026 100644
--- a/SPECS/network-manager-applet.spec
+++ b/SPECS/network-manager-applet.spec
@@ -7,7 +7,7 @@
 
 %global rpm_version 1.24.0
 %global real_version 1.24.0
-%global release_version 3
+%global release_version 4
 
 %global real_version_major %(printf '%s' '%{real_version}' | sed -n 's/^\\([1-9][0-9]*\\.[1-9][0-9]*\\)\\.[1-9][0-9]*$/\\1/p')
 
@@ -33,6 +33,7 @@ Obsoletes: NetworkManager-gnome < %{obsoletes_ver}
 
 Source: https://download.gnome.org/sources/network-manager-applet/%{real_version_major}/%{name}-%{real_version}.tar.xz
 # Patch1: 0001-Patch.patch
+Patch1: 0001-Wi-Fi-OWE-Fix-Enhanced-Open-OWE-not-being-saved-prop.patch
 
 Requires: NetworkManager >= %{nm_version}
 Requires: libnotify >= 0.4.3
@@ -146,6 +147,9 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/nm-connection-edit
 
 
 %changelog
+* Tue Feb 22 2022 Ana Cabral <acabral@redhat.com> - 1.24.0-4
+- Fix OWE settings disappearing on nm-connection-editor (rh #2023162)
+
 * Mon Nov 22 2021 Ana Cabral <acabral@redhat.com> - 1.24.0-3
 - Update the spec file