Skip to contentSkip to conversation

thunar: 4.16.6 -> 4.16.8

PATCH New kai 1 participant 1 message Jun 1, 2021

lore
Share & tools
lore

kai

author
#0 lore raw

PATCH 1/1 thunar: 4.16.6 -> 4.16.8

From: Kai Kang <[email protected]>

The commits to fix CVE-2021-32563 have been merged in 4.16.8.

4.16.8
======
- Activating Desktop Icon does not Use Default Application (Issue #575)
- Translation Updates: Spanish

---
 .../thunar/thunar/CVE-2021-32563-1.patch      |  97 --------
 .../thunar/thunar/CVE-2021-32563-2.patch      | 208 ------------------
 .../{thunar_4.16.6.bb => thunar_4.16.8.bb}    |   6 +-
 3 files changed, 1 insertion(+), 310 deletions(-)
 delete mode 100644 meta-xfce/recipes-xfce/thunar/thunar/CVE-2021-32563-1.patch
 delete mode 100644 meta-xfce/recipes-xfce/thunar/thunar/CVE-2021-32563-2.patch
 rename meta-xfce/recipes-xfce/thunar/{thunar_4.16.6.bb => thunar_4.16.8.bb} (80%)
meta-xfce/recipes-xfce/thunar/thunar/CVE-2021-32563-1.patch deleted +0 -97
deleted file mode 100644
index f942f990b..000000000
@@ -1,97 +0,0 @@
-From 9165a61f95e43cc0b5abf9b98eee2818a0191e0b Mon Sep 17 00:00:00 2001
-From: Alexander Schwinn <[email protected]>
-Date: Sat, 1 May 2021 00:40:44 +0200
-Subject: [PATCH 1/2] Dont execute files, passed via command line due to
- security risks
-
-Instead open the containing folder and select the file.
-
-Fixes #121
-
-Upstream-Status: Backport
-CVE: CVE-2021-32563
-
-Reference to upstream patch:
-[https://gitlab.xfce.org/xfce/thunar/-/commit/9165a61f95e43cc0b5abf9b98eee2818a0191e0b]
-
-Signed-off-by: Stefan Ghinea <[email protected]>
----
- thunar/thunar-application.c | 25 +++++++++++++++++++++++--
- thunar/thunar-window.c      |  4 +---
- thunar/thunar-window.h      |  2 ++
- 3 files changed, 26 insertions(+), 5 deletions(-)
-
-diff --git a/thunar/thunar-application.c b/thunar/thunar-application.c
-index df862fd..1243940 100644
---- a/thunar/thunar-application.c
-+++ b/thunar/thunar-application.c
-@@ -1512,8 +1512,29 @@ thunar_application_process_files_finish (ThunarBrowser *browser,
-     }
-   else
-     {
--      /* try to open the file or directory */
--      thunar_file_launch (target_file, screen, startup_id, &error);
-+      if (thunar_file_is_directory (file))
-+        {
-+          thunar_application_open_window (application, file, screen, startup_id, FALSE);
-+        }
-+      else
-+        {
-+          /* Note that for security reasons we do not execute files passed via command line */
-+          /* Lets rather open the containing directory and select the file */
-+          ThunarFile *parent = thunar_file_get_parent (file, NULL);
-+
-+          if (G_LIKELY (parent != NULL))
-+            {
-+              GList* files = NULL;
-+              GtkWidget *window;
-+
-+              window = thunar_application_open_window (application, parent, screen, startup_id, FALSE);
-+              g_object_unref (parent);
-+
-+              files = g_list_append (files, thunar_file_get_file (file));
-+              thunar_window_select_files (THUNAR_WINDOW (window), files);
-+              g_list_free (files);
-+            }
-+        }
- 
-       /* remove the file from the list */
-       application->files_to_launch = g_list_delete_link (application->files_to_launch,
-diff --git a/thunar/thunar-window.c b/thunar/thunar-window.c
-index b330a87..b234fd3 100644
---- a/thunar/thunar-window.c
-+++ b/thunar/thunar-window.c
-@@ -243,8 +243,6 @@ static void      thunar_window_update_go_menu             (ThunarWindow
-                                                            GtkWidget              *menu);
- static void      thunar_window_update_help_menu           (ThunarWindow           *window,
-                                                            GtkWidget              *menu);
--static void      thunar_window_select_files               (ThunarWindow           *window,
--                                                           GList                  *path_list);
- static void      thunar_window_binding_create             (ThunarWindow           *window,
-                                                            gpointer                src_object,
-                                                            const gchar            *src_prop,
-@@ -891,7 +889,7 @@ thunar_window_screen_changed (GtkWidget *widget,
-  *
-  * Visually selects the files, given by the list
-  **/
--static void
-+void
- thunar_window_select_files (ThunarWindow *window,
-                             GList        *files_to_selected)
- {
-diff --git a/thunar/thunar-window.h b/thunar/thunar-window.h
-index 9cbcc85..3c1aad2 100644
---- a/thunar/thunar-window.h
-+++ b/thunar/thunar-window.h
-@@ -126,6 +126,8 @@ void                      thunar_window_redirect_menu_tooltips_to_statusbar (Thu
-                                                                              GtkMenu             *menu);
- const XfceGtkActionEntry* thunar_window_get_action_entry                    (ThunarWindow        *window,
-                                                                              ThunarWindowAction   action);
-+ void                     thunar_window_select_files                        (ThunarWindow         *window,
-+                                                                             GList                *path_list);
- G_END_DECLS;
- 
- #endif /* !__THUNAR_WINDOW_H__ */
--- 
-2.17.1
-
meta-xfce/recipes-xfce/thunar/thunar/CVE-2021-32563-2.patch deleted +0 -208

208 lines not on this page · raw message

meta-xfce/recipes-xfce/thunar/thunar_4.16.8.bb renamed from meta-xfce/recipes-xfce/thunar/thunar_4.16.6.bb +1 -5
similarity index 80%
rename from meta-xfce/recipes-xfce/thunar/thunar_4.16.6.bb
rename to meta-xfce/recipes-xfce/thunar/thunar_4.16.8.bb
index 7bef08ed9..bdc357f76 100644
@@ -8,11 +8,7 @@ inherit xfce gobject-introspection features_check mime-xdg
 
 REQUIRED_DISTRO_FEATURES = "x11"
 
-SRC_URI += "file://CVE-2021-32563-1.patch \
-            file://CVE-2021-32563-2.patch \
-           "
-
-SRC_URI[sha256sum] = "cb531d3fe67196a43ca04979ef271ece7858bbc80c15b0ee4323c1252a1a02b7"
+SRC_URI[sha256sum] = "038ca228d220cd0ba1b7b76465d8a51f2433ad1f74648d1d291daa0a24cb3195"
 
 PACKAGECONFIG ??= ""
 PACKAGECONFIG[pcre] = "--enable-pcre,--disable-pcre,libpcre"
Signature · 1 line
2.17.1