--- Begin Message ---
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock
Please unblock package menu-cache
Package update which contains fix for #851748 of severity "important" (although
it can be considered "serious" since it affects usability of Desktop Environment)
is already in sid. I would like to take the fix into testing as well. Change is
pretty small, see it below. Thank you.
diff -Nru menu-cache-1.0.2/debian/changelog menu-cache-1.0.2/debian/changelog
--- menu-cache-1.0.2/debian/changelog 2016-11-06 19:21:38.000000000 +0200
+++ menu-cache-1.0.2/debian/changelog 2017-04-24 23:05:22.000000000 +0300
@@ -1,3 +1,12 @@
+menu-cache (1.0.2-2) unstable; urgency=medium
+
+ * Removing override_dh_builddeb target from debian/rules, it fails on 32-bit
+ archs.
+ * Adding 01-Fix-crash-with-invalid-Name-tag-in-a-menu.patch from upstream
+ (Closes: #849356, #851748, LP #1558407).
+
+ -- Andriy Grytsenko <andrej@rep.kiev.ua> Mon, 24 Apr 2017 23:02:01 +0300
+
menu-cache (1.0.2-1) unstable; urgency=medium
* Merging upstream version 1.0.2 (LP: #1635438).
diff -Nru menu-cache-1.0.2/debian/patches/01-Fix-crash-with-invalid-Name-tag-in-a-menu.patch menu-cache-1.0.2/debian/patches/01-Fix-crash-with-invalid-Name-tag-in-a-menu.patch
--- menu-cache-1.0.2/debian/patches/01-Fix-crash-with-invalid-Name-tag-in-a-menu.patch 1970-01-01 03:00:00.000000000 +0300
+++ menu-cache-1.0.2/debian/patches/01-Fix-crash-with-invalid-Name-tag-in-a-menu.patch 2017-04-24 22:59:44.000000000 +0300
@@ -0,0 +1,32 @@
+Author: Andriy Grytsenko <andrej@rep.kiev.ua>
+Description: Fix crash with invalid <Name> tag in a menu. (Closes: #849356, #851748)
+Bug: https://sourceforge.net/p/lxde/bugs/863
+Applied-Upstream: 54ab9e45764435634cdf5de360b295ee3a22817a
+
+--- a/menu-cache-gen/menu-merge.c
++++ b/menu-cache-gen/menu-merge.c
+@@ -1,7 +1,7 @@
+ /*
+ * menu-file.c : parses <name>.menu file and merges all XML tags.
+ *
+- * Copyright 2013-2016 Andriy Grytsenko (LStranger) <andrej@rep.kiev.ua>
++ * Copyright 2013-2017 Andriy Grytsenko (LStranger) <andrej@rep.kiev.ua>
+ *
+ * This file is a part of libmenu-cache package and created program
+ * should be not used without the library.
+@@ -138,11 +138,13 @@ static gboolean _menu_xml_handler_Name(FmXmlFileItem *item, GList *children,
+ guint n_attributes, gint line, gint pos,
+ GError **error, gpointer user_data)
+ {
++ FmXmlFileItem *name_item;
+ const char *name;
+
+ RETURN_IF_IN_LAYOUT(item, error);
+- item = fm_xml_file_item_find_child(item, FM_XML_FILE_TEXT);
+- if (item == NULL || (name = fm_xml_file_item_get_data(item, NULL)) == NULL ||
++ name_item = fm_xml_file_item_find_child(item, FM_XML_FILE_TEXT);
++ if (name_item == NULL ||
++ (name = fm_xml_file_item_get_data(name_item, NULL)) == NULL ||
+ strchr(name, '/') != NULL) /* empty or invalid tag */
+ {
+ RETURN_TRUE_AND_DESTROY_IF_QUIET(item);
diff -Nru menu-cache-1.0.2/debian/patches/series menu-cache-1.0.2/debian/patches/series
--- menu-cache-1.0.2/debian/patches/series 1970-01-01 03:00:00.000000000 +0300
+++ menu-cache-1.0.2/debian/patches/series 2017-04-24 22:54:01.000000000 +0300
@@ -0,0 +1 @@
+01-Fix-crash-with-invalid-Name-tag-in-a-menu.patch
diff -Nru menu-cache-1.0.2/debian/rules menu-cache-1.0.2/debian/rules
--- menu-cache-1.0.2/debian/rules 2016-11-06 19:07:30.000000000 +0200
+++ menu-cache-1.0.2/debian/rules 2016-12-11 01:08:44.000000000 +0200
@@ -10,12 +10,8 @@
override_dh_auto_install:
dh_auto_install
-
rm -f debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/*.la
-override_dh_builddeb:
- dh_builddeb -- -Zxz -z9
-
override_dh_install:
dh_install --fail-missing
--- End Message ---