diff --git a/.gitignore b/.gitignore index 004f411..30cf69e 100644 --- a/.gitignore +++ b/.gitignore @@ -52,3 +52,4 @@ /network-manager-applet-1.20.0.tar.xz /network-manager-applet-1.22.0.tar.xz /network-manager-applet-1.24.0.tar.xz +/network-manager-applet-1.26.0.tar.xz diff --git a/0001-Wi-Fi-OWE-Fix-Enhanced-Open-OWE-not-being-saved-prop.patch b/0001-Wi-Fi-OWE-Fix-Enhanced-Open-OWE-not-being-saved-prop.patch deleted file mode 100644 index a85ebea..0000000 --- a/0001-Wi-Fi-OWE-Fix-Enhanced-Open-OWE-not-being-saved-prop.patch +++ /dev/null @@ -1,61 +0,0 @@ -From 38731695f7b38d867e51b3d5cee2d0281c315a71 Mon Sep 17 00:00:00 2001 -From: Ana Cabral -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 -(cherry picked from commit 38731695f7b38d867e51b3d5cee2d0281c315a71) ---- - 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/network-manager-applet.spec b/network-manager-applet.spec index a5b0d0e..b2558cd 100644 --- a/network-manager-applet.spec +++ b/network-manager-applet.spec @@ -5,9 +5,9 @@ %global libnma_version 1.8.27 %global obsoletes_ver 1:0.9.7 -%global rpm_version 1.24.0 -%global real_version 1.24.0 -%global release_version 2 +%global rpm_version 1.26.0 +%global real_version 1.26.0 +%global release_version 1 %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') @@ -32,7 +32,7 @@ URL: http://www.gnome.org/projects/NetworkManager/ Obsoletes: NetworkManager-gnome < %{obsoletes_ver} Source: https://download.gnome.org/sources/network-manager-applet/%{real_version_major}/%{name}-%{real_version}.tar.xz -Patch1: 0001-Wi-Fi-OWE-Fix-Enhanced-Open-OWE-not-being-saved-prop.patch +# Patch1: 0001-sample-name.patch Requires: NetworkManager >= %{nm_version} Requires: libnotify >= 0.4.3 @@ -136,6 +136,7 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/nm-connection-edit %{_datadir}/icons/hicolor/22x22/apps/nm-vpn-connecting*.png %{_datadir}/icons/hicolor/22x22/apps/nm-wwan-tower.png %{_datadir}/icons/hicolor/scalable/apps/*.svg +%{_datadir}/icons/hicolor/22x22/apps/nm-insecure-warn.png %{_datadir}/GConf/gsettings/nm-applet.convert %{_sysconfdir}/xdg/autostart/nm-applet.desktop %{_mandir}/man1/nm-applet* @@ -159,6 +160,9 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/nm-connection-edit %changelog +* Tue Mar 22 2022 Ana Cabral - 1.26.0-1 +- Update to 1.26.0 release (rh #2066750) + * Tue Feb 22 2022 Ana Cabral - 1.24.0-2 - Fix OWE settings disappearing on nm-connection-editor (rh #2057004) diff --git a/sources b/sources index 7fdb25f..4d69924 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (network-manager-applet-1.24.0.tar.xz) = 7b91bd54d53b1b485bc5e401f83c683804175900557a7a4bc40a3f759fa9d4ca1c42b193bcd56a39a8cb79ec5b0c6f7cbeccfc08200099c08d933650c92faecb +SHA512 (network-manager-applet-1.26.0.tar.xz) = ae3c4f8e55a2cd13093161e1e28873d3cda1c531168ee18115f3f710816f1bdfcf669cd2f796bd38f226d3f6be76407fccbcb19cf9c994b99969b688397b2c71