diff options
-rw-r--r-- | meta/recipes-gnome/gtk+/gtk+/0001-Do-not-look-into-HOME-when-looking-for-gtk-modules.patch | 29 | ||||
-rw-r--r-- | meta/recipes-gnome/gtk+/gtk+_2.24.32.bb | 3 |
2 files changed, 31 insertions, 1 deletions
diff --git a/meta/recipes-gnome/gtk+/gtk+/0001-Do-not-look-into-HOME-when-looking-for-gtk-modules.patch b/meta/recipes-gnome/gtk+/gtk+/0001-Do-not-look-into-HOME-when-looking-for-gtk-modules.patch new file mode 100644 index 0000000000..9201e45c39 --- /dev/null +++ b/meta/recipes-gnome/gtk+/gtk+/0001-Do-not-look-into-HOME-when-looking-for-gtk-modules.patch | |||
@@ -0,0 +1,29 @@ | |||
1 | From 34ce93e1c50bfb88f92a687d4f82de55584f3f6a Mon Sep 17 00:00:00 2001 | ||
2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | ||
3 | Date: Wed, 11 Apr 2018 14:20:39 +0300 | ||
4 | Subject: [PATCH] Do not look into $HOME when looking for gtk modules | ||
5 | |||
6 | On the host it causes host contamination, on the target it's a | ||
7 | potential security issue. Gtk+3 has already removed this. | ||
8 | |||
9 | Upstream-Status: Inapproriate [gtk2 is in maintenance mode] | ||
10 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | ||
11 | --- | ||
12 | gtk/gtkmodules.c | 4 ---- | ||
13 | 1 file changed, 4 deletions(-) | ||
14 | |||
15 | diff --git a/gtk/gtkmodules.c b/gtk/gtkmodules.c | ||
16 | index 50729b6..e09b583 100644 | ||
17 | --- a/gtk/gtkmodules.c | ||
18 | +++ b/gtk/gtkmodules.c | ||
19 | @@ -65,10 +65,6 @@ get_module_path (void) | ||
20 | if (result) | ||
21 | return result; | ||
22 | |||
23 | - home_dir = g_get_home_dir(); | ||
24 | - if (home_dir) | ||
25 | - home_gtk_dir = g_build_filename (home_dir, ".gtk-2.0", NULL); | ||
26 | - | ||
27 | module_path_env = g_getenv ("GTK_PATH"); | ||
28 | exe_prefix = g_getenv ("GTK_EXE_PREFIX"); | ||
29 | |||
diff --git a/meta/recipes-gnome/gtk+/gtk+_2.24.32.bb b/meta/recipes-gnome/gtk+/gtk+_2.24.32.bb index 20703588c3..89fca736b2 100644 --- a/meta/recipes-gnome/gtk+/gtk+_2.24.32.bb +++ b/meta/recipes-gnome/gtk+/gtk+_2.24.32.bb | |||
@@ -10,7 +10,8 @@ SRC_URI = "http://ftp.gnome.org/pub/gnome/sources/gtk+/2.24/gtk+-${PV}.tar.xz \ | |||
10 | file://toggle-font.diff;striplevel=0 \ | 10 | file://toggle-font.diff;striplevel=0 \ |
11 | file://doc-fixes.patch \ | 11 | file://doc-fixes.patch \ |
12 | file://strict-prototypes.patch \ | 12 | file://strict-prototypes.patch \ |
13 | " | 13 | file://0001-Do-not-look-into-HOME-when-looking-for-gtk-modules.patch \ |
14 | " | ||
14 | 15 | ||
15 | SRC_URI[md5sum] = "d5742aa42275203a499b59b4c382a784" | 16 | SRC_URI[md5sum] = "d5742aa42275203a499b59b4c382a784" |
16 | SRC_URI[sha256sum] = "b6c8a93ddda5eabe3bfee1eb39636c9a03d2a56c7b62828b359bf197943c582e" | 17 | SRC_URI[sha256sum] = "b6c8a93ddda5eabe3bfee1eb39636c9a03d2a56c7b62828b359bf197943c582e" |