diff --git a/fix_CVE-2022-45062.patch b/fix_CVE-2022-45062.patch deleted file mode 100644 index 8ca3444d11f6fe898e8d55c1c5dea159319a2487..0000000000000000000000000000000000000000 --- a/fix_CVE-2022-45062.patch +++ /dev/null @@ -1,71 +0,0 @@ -diff -up xfce4-settings-4.16.0/dialogs/mime-settings/xfce-mime-helper.c.BAK xfce4-settings-4.16.0/dialogs/mime-settings/xfce-mime-helper.c ---- xfce4-settings-4.16.0/dialogs/mime-settings/xfce-mime-helper.c.BAK 2022-11-10 14:46:34.496823705 +0800 -+++ xfce4-settings-4.16.0/dialogs/mime-settings/xfce-mime-helper.c 2022-11-10 14:51:50.390633576 +0800 -@@ -375,7 +375,7 @@ xfce_mime_helper_execute (XfceMimeHelper - gint status; - gint result; - gint pid; -- const gchar *real_parameter = parameter; -+ gchar *real_parameter = NULL; - - // FIXME: startup-notification - -@@ -387,23 +387,44 @@ xfce_mime_helper_execute (XfceMimeHelper - if (G_UNLIKELY (screen == NULL)) - screen = gdk_screen_get_default (); - -- /* strip the mailto part if needed */ -- if (real_parameter != NULL && g_str_has_prefix (real_parameter, "mailto:")) -- real_parameter = parameter + 7; -+ if (parameter != NULL) -+ { -+ if (helper->category == XFCE_MIME_HELPER_WEBBROWSER || helper->category == XFCE_MIME_HELPER_FILEMANAGER) -+ { -+ /* escape characters which do not belong into an URI/URL */ -+ real_parameter = g_uri_escape_string (parameter, ":/?#[]@!$&'()*+,;=%", TRUE); -+ } -+ else if (g_str_has_prefix (real_parameter, "mailto:")) -+ { -+ /* strip the mailto part if needed */ -+ real_parameter = g_strdup (parameter + 7); -+ } -+ else -+ { -+ real_parameter = g_strdup (parameter); -+ } -+ } - - /* determine the command set to use */ -- if (exo_str_is_flag (real_parameter)) { -+ if (exo_str_is_flag (real_parameter)) -+ { - commands = helper->commands_with_flag; -- } else if (exo_str_is_empty (real_parameter)) { -+ } -+ else if (exo_str_is_empty (real_parameter)) -+ { - commands = helper->commands; -- } else { -+ } -+ else -+ { - commands = helper->commands_with_parameter; - } - -+ - /* verify that we have atleast one command */ - if (G_UNLIKELY (*commands == NULL)) - { - g_set_error (error, G_SPAWN_ERROR, G_SPAWN_ERROR_INVAL, _("No command specified")); -+ g_free (real_parameter); - return FALSE; - } - -@@ -493,6 +514,7 @@ xfce_mime_helper_execute (XfceMimeHelper - if (G_UNLIKELY (!succeed)) - g_propagate_error (error, err); - -+ g_free (real_parameter); - return succeed; - } - diff --git a/xfce4-settings-4.14.patch b/xfce4-settings-4.14.patch deleted file mode 100644 index 7cda3b7dd67f243de5e1720a05003afcf4433403..0000000000000000000000000000000000000000 --- a/xfce4-settings-4.14.patch +++ /dev/null @@ -1,25 +0,0 @@ ---- xfsettingsd/xsettings.xml.orig 2015-02-23 19:33:11.000000000 -0600 -+++ xfsettingsd/xsettings.xml 2015-02-28 18:30:51.863719465 -0600 -@@ -6,8 +6,8 @@ - - - -- -- -+ -+ - - - -@@ -19,9 +19,9 @@ - - - -- -+ - -- -+ - - - diff --git a/xfce4-settings-4.16.2.tar.bz2 b/xfce4-settings-4.16.2.tar.bz2 deleted file mode 100644 index c95a5b9a1fdef796eae87a1d8e2e56974725a0f2..0000000000000000000000000000000000000000 Binary files a/xfce4-settings-4.16.2.tar.bz2 and /dev/null differ diff --git a/xfce4-settings-4.18.1.tar.bz2 b/xfce4-settings-4.18.1.tar.bz2 new file mode 100644 index 0000000000000000000000000000000000000000..83623602e21d95b41744c4671d7e10ef16e8d0a3 Binary files /dev/null and b/xfce4-settings-4.18.1.tar.bz2 differ diff --git a/xfce4-settings.spec b/xfce4-settings.spec index c1dc0b31b7d85527ccbe30f143432d340f8bd0a8..61b651b00d5efb36e7c90c990063b09d3ba05ed9 100644 --- a/xfce4-settings.spec +++ b/xfce4-settings.spec @@ -1,15 +1,13 @@ -%global xfceversion 4.16 +%global xfceversion 4.18 Name: xfce4-settings -Version: 4.16.2 -Release: 2 +Version: 4.18.1 +Release: 1 Summary: Settings Manager for Xfce License: GPLv2+ URL: http://www.xfce.org/ Source0: http://archive.xfce.org/src/xfce/%{name}/%{xfceversion}/%{name}-%{version}.tar.bz2 # theme and font settings -Patch10: xfce4-settings-4.14.patch -Patch11: fix_CVE-2022-45062.patch BuildRequires: make BuildRequires: gcc-c++ @@ -34,8 +32,6 @@ This package includes the settings manager applications for the Xfce desktop. %prep %setup -q -%patch10 -%patch11 -p1 %build %configure --enable-sound-settings --enable-pluggable-dialogs --enable-maintainer-mode --enable-xorg-libinput @@ -74,6 +70,9 @@ done %{_datadir}/xfce4/helpers/*.desktop %changelog +* Wed Jan 4 2023 Dillon Chen - 4.18.1-1 +- Update to 4.18.1 + * Thu Nov 10 2022 Wenlong Ding - 4.16.2-2 - Fix CVE-2022-45062