summaryrefslogtreecommitdiffstats
path: root/source/xfce/garcon
diff options
context:
space:
mode:
Diffstat (limited to 'source/xfce/garcon')
-rw-r--r--source/xfce/garcon/0001-Fix-use-after-free-crash-Bug-15679.patch25
-rwxr-xr-xsource/xfce/garcon/garcon.SlackBuild4
-rw-r--r--source/xfce/garcon/garcon.url2
3 files changed, 29 insertions, 2 deletions
diff --git a/source/xfce/garcon/0001-Fix-use-after-free-crash-Bug-15679.patch b/source/xfce/garcon/0001-Fix-use-after-free-crash-Bug-15679.patch
new file mode 100644
index 000000000..92ba106b3
--- /dev/null
+++ b/source/xfce/garcon/0001-Fix-use-after-free-crash-Bug-15679.patch
@@ -0,0 +1,25 @@
+From 6f452937366bb1599fb0ae986958786d52946f15 Mon Sep 17 00:00:00 2001
+From: Andre Miranda <andreldm@xfce.org>
+Date: Sat, 6 Jul 2019 13:42:20 -0300
+Subject: [PATCH] Fix use after free crash (Bug #15679)
+
+---
+ garcon/garcon-menu-item.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/garcon/garcon-menu-item.c b/garcon/garcon-menu-item.c
+index 35f6bed..5f23467 100644
+--- a/garcon/garcon-menu-item.c
++++ b/garcon/garcon-menu-item.c
+@@ -1154,6 +1154,8 @@ garcon_menu_item_reload_from_file (GarconMenuItem *item,
+
+ /* Update application actions */
+ _garcon_g_list_free_full (item->priv->actions, garcon_menu_item_action_unref);
++ item->priv->actions = NULL;
++
+ str_list = xfce_rc_read_list_entry (rc, G_KEY_FILE_DESKTOP_KEY_ACTIONS, ";");
+ if (G_LIKELY (str_list != NULL))
+ {
+--
+2.22.0
+
diff --git a/source/xfce/garcon/garcon.SlackBuild b/source/xfce/garcon/garcon.SlackBuild
index 3954dc4e9..405d00aac 100755
--- a/source/xfce/garcon/garcon.SlackBuild
+++ b/source/xfce/garcon/garcon.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=garcon
VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
# Automatically determine the architecture we're building on:
MARCH=$( uname -m )
@@ -80,6 +80,8 @@ find . \
\( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-exec chmod 644 {} \;
+zcat $CWD/0001-Fix-use-after-free-crash-Bug-15679.patch.gz | patch -p1 --verbose || exit 1
+
if [ ! -r configure ]; then
NOCONFIGURE=1 ./autogen.sh
fi
diff --git a/source/xfce/garcon/garcon.url b/source/xfce/garcon/garcon.url
index 9980ede87..2c03b35ca 100644
--- a/source/xfce/garcon/garcon.url
+++ b/source/xfce/garcon/garcon.url
@@ -1 +1 @@
-https://github.com/xfce-mirror/garcon/releases
+http://archive.xfce.org/src/xfce/garcon/0.6/garcon-0.6.3.tar.bz2