diff --git a/.gitignore b/.gitignore index d5e9520..a5156b5 100644 --- a/.gitignore +++ b/.gitignore @@ -52,3 +52,4 @@ /gnome-control-center-43.beta.tar.xz /gnome-control-center-43.rc.tar.xz /gnome-control-center-43.0.tar.xz +/gnome-control-center-43.1.tar.xz diff --git a/1478.patch b/1478.patch deleted file mode 100644 index a519f55..0000000 --- a/1478.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 478e9eb3ca32ec3e4cc9611a0af7744fd6a958f3 Mon Sep 17 00:00:00 2001 -From: Michael Catanzaro -Date: Fri, 21 Oct 2022 10:23:01 -0500 -Subject: [PATCH] network: fix crashes in eap-method-simple - -When the stored password is missing, we will crash passing NULL to a -non-nullable GTK API function. - -Fixes #1905 ---- - panels/network/wireless-security/eap-method-simple.c | 6 ++++-- - 1 file changed, 4 insertions(+), 2 deletions(-) - -diff --git a/panels/network/wireless-security/eap-method-simple.c b/panels/network/wireless-security/eap-method-simple.c -index 3dda8df28..7bb29ec9c 100644 ---- a/panels/network/wireless-security/eap-method-simple.c -+++ b/panels/network/wireless-security/eap-method-simple.c -@@ -200,7 +200,8 @@ static void - set_username (EAPMethod *method, const gchar *username) - { - EAPMethodSimple *self = EAP_METHOD_SIMPLE (method); -- gtk_editable_set_text (GTK_EDITABLE (self->username_entry), username); -+ if (username) -+ gtk_editable_set_text (GTK_EDITABLE (self->username_entry), username); - } - - static const gchar * -@@ -214,7 +215,8 @@ static void - set_password (EAPMethod *method, const gchar *password) - { - EAPMethodSimple *self = EAP_METHOD_SIMPLE (method); -- gtk_editable_set_text (GTK_EDITABLE (self->password_entry), password); -+ if (password) -+ gtk_editable_set_text (GTK_EDITABLE (self->password_entry), password); - } - - static gboolean --- -GitLab - diff --git a/gnome-control-center.spec b/gnome-control-center.spec index e83789c..d800286 100644 --- a/gnome-control-center.spec +++ b/gnome-control-center.spec @@ -12,18 +12,13 @@ %global tarball_version %%(echo %{version} | tr '~' '.') Name: gnome-control-center -Version: 43.0 +Version: 43.1 Release: %autorelease Summary: Utilities to configure the GNOME desktop License: GPLv2+ and CC-BY-SA URL: https://gitlab.gnome.org/GNOME/gnome-control-center/ Source0: https://download.gnome.org/sources/%{name}/43/%{name}-%{tarball_version}.tar.xz -# Fix crash when editing EAP connections with empty password -# https://gitlab.gnome.org/GNOME/gnome-control-center/-/merge_requests/1478 -# https://gitlab.gnome.org/GNOME/gnome-control-center/-/issues/1905 -# https://bugzilla.redhat.com/show_bug.cgi?id=2136471 -Patch0: 1478.patch BuildRequires: desktop-file-utils BuildRequires: docbook-style-xsl libxslt diff --git a/sources b/sources index a676d8a..7885af1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gnome-control-center-43.0.tar.xz) = 3fbb9252fedf44ceed6b7d6f1fed5263a110adce432effe4966f793a1f1443e92e39ff11595a6a2b3179297cc17979c310a33e3e2ac9d23dae0087ee227375a7 +SHA512 (gnome-control-center-43.1.tar.xz) = aea5d137dbe25b8da13521ebfdff8858aebb210e849e2d93105df5a1d80b41f7221de493c7c343bb4bdcec29a48b9c6ddfbafc24f3ca90a44c6c63e80e5b25e5