[gentoo-commits] repo/gentoo:master commit in: lxde-base/menu-cache/files/, lxde-base/menu-cache/
commit: 791a51020454b44770aa60144e26669e88012a50
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sun Mar 14 01:18:20 2021 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sun Mar 14 23:01:53 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=791a5102
lxde-base/menu-cache: EAPI-7 bump, fix memleak, cleanup .la
Package-Manager: Portage-3.0.17, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner gentoo.org>
.../files/menu-cache-1.1.0-memleak.patch | 37 ++
lxde-base/menu-cache/menu-cache-1.1.0-r1.ebuild| 37 ++
2 files changed, 74 insertions(+)
diff --git a/lxde-base/menu-cache/files/menu-cache-1.1.0-memleak.patch
b/lxde-base/menu-cache/files/menu-cache-1.1.0-memleak.patch
new file mode 100644
index 000..faa91fff3e9
--- /dev/null
+++ b/lxde-base/menu-cache/files/menu-cache-1.1.0-memleak.patch
@@ -0,0 +1,37 @@
+From 97e5de8682c0c44fe4e6a2df864c5fdf76cd77cc Mon Sep 17 00:00:00 2001
+From: Palo Kisa
+Date: Thu, 30 Nov 2017 11:36:18 +0100
+Subject: [PATCH] libmenu-cache: Fix memory leaks
+
+---
+ libmenu-cache/menu-cache.c | 5 +
+ 1 file changed, 5 insertions(+)
+
+diff --git a/libmenu-cache/menu-cache.c b/libmenu-cache/menu-cache.c
+index 5025d72..273b503 100644
+--- a/libmenu-cache/menu-cache.c
b/libmenu-cache/menu-cache.c
+@@ -379,11 +379,15 @@ static MenuCacheItem* read_item(GDataInputStream* f,
MenuCache* cache,
+ else /* separator */
+ {
+ item->type = MENU_CACHE_TYPE_SEP;
++g_free(line);
+ return item;
+ }
+ }
+ else
++{
++g_free(line);
+ return NULL;
++}
+
+ item->id = g_strndup( line + 1, len - 1 );
+ g_free(line);
+@@ -923,6 +927,7 @@ gboolean menu_cache_item_unref(MenuCacheItem* item)
+ else
+ {
+ MenuCacheApp* app = MENU_CACHE_APP(item);
++g_free(app->generic_name);
+ g_free( app->exec );
+ g_free(app->try_exec);
+ g_free(app->working_dir);
diff --git a/lxde-base/menu-cache/menu-cache-1.1.0-r1.ebuild
b/lxde-base/menu-cache/menu-cache-1.1.0-r1.ebuild
new file mode 100644
index 000..a7684ccc41d
--- /dev/null
+++ b/lxde-base/menu-cache/menu-cache-1.1.0-r1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Library to create and utilize caches to speed up freedesktop
application menus"
+HOMEPAGE="https://lxde.org/";
+SRC_URI="mirror://sourceforge/lxde/${P}.tar.xz"
+
+LICENSE="LGPL-2.1+"
+SLOT="0/2" # ABI is v2. See Makefile.am
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux
~x86-linux"
+IUSE=""
+
+RDEPEND="
+ dev-libs/glib:2
+ x11-libs/libfm-extra
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+ sys-devel/gettext
+ virtual/pkgconfig
+"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-fno-common.diff # upstream PR#19
+ "${FILESDIR}"/${P}-memleak.patch # git master
+)
+
+src_configure() {
+ econf --disable-static
+}
+
+src_install() {
+ default
+ find "${ED}" -name '*.la' -delete || die
+}
[gentoo-commits] repo/gentoo:master commit in: lxde-base/menu-cache/files/, lxde-base/menu-cache/
commit: a74fcbfb42c449c92d8cf451b915b0dfe7252318
Author: Hanno Böck gentoo org>
AuthorDate: Tue Jan 28 18:48:28 2020 +
Commit: Hanno Böck gentoo org>
CommitDate: Tue Jan 28 18:48:28 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a74fcbfb
lxde-base/menu-cache: Fix -fno-common compilation.
Patch from upstream pull request.
Closes: https://bugs.gentoo.org/706884
Signed-off-by: Hanno Böck gentoo.org>
Package-Manager: Portage-2.3.86, Repoman-2.3.20
.../files/menu-cache-1.1.0-fno-common.diff | 88 ++
lxde-base/menu-cache/menu-cache-1.1.0.ebuild | 6 +-
2 files changed, 93 insertions(+), 1 deletion(-)
diff --git a/lxde-base/menu-cache/files/menu-cache-1.1.0-fno-common.diff
b/lxde-base/menu-cache/files/menu-cache-1.1.0-fno-common.diff
new file mode 100644
index 000..aa12997026c
--- /dev/null
+++ b/lxde-base/menu-cache/files/menu-cache-1.1.0-fno-common.diff
@@ -0,0 +1,88 @@
+diff --git a/menu-cache-gen/menu-tags.h b/menu-cache-gen/menu-tags.h
+index f3fd7d3..f71c0bc 100644
+--- a/menu-cache-gen/menu-tags.h
b/menu-cache-gen/menu-tags.h
+@@ -22,38 +22,17 @@
+ #include
+ #include
+
+-FmXmlFileTag menuTag_Menu;
+-FmXmlFileTag menuTag_AppDir;
+-FmXmlFileTag menuTag_DefaultAppDirs;
+-FmXmlFileTag menuTag_DirectoryDir;
+-FmXmlFileTag menuTag_DefaultDirectoryDirs;
+-FmXmlFileTag menuTag_Include;
+-FmXmlFileTag menuTag_Exclude;
+-FmXmlFileTag menuTag_Filename;
+-FmXmlFileTag menuTag_Or;
+-FmXmlFileTag menuTag_And;
+-FmXmlFileTag menuTag_Not;
+-FmXmlFileTag menuTag_Category;
+-FmXmlFileTag menuTag_MergeFile;
+-FmXmlFileTag menuTag_MergeDir;
+-FmXmlFileTag menuTag_DefaultMergeDirs;
+-FmXmlFileTag menuTag_Directory;
+-FmXmlFileTag menuTag_Name;
+-FmXmlFileTag menuTag_Deleted;
+-FmXmlFileTag menuTag_NotDeleted;
+-FmXmlFileTag menuTag_OnlyUnallocated;
+-FmXmlFileTag menuTag_NotOnlyUnallocated;
+-FmXmlFileTag menuTag_All;
+-FmXmlFileTag menuTag_LegacyDir;
+-FmXmlFileTag menuTag_KDELegacyDirs;
+-FmXmlFileTag menuTag_Move;
+-FmXmlFileTag menuTag_Old;
+-FmXmlFileTag menuTag_New;
+-FmXmlFileTag menuTag_Layout;
+-FmXmlFileTag menuTag_DefaultLayout;
+-FmXmlFileTag menuTag_Menuname;
+-FmXmlFileTag menuTag_Separator;
+-FmXmlFileTag menuTag_Merge;
++extern FmXmlFileTag menuTag_AppDir;
++extern FmXmlFileTag menuTag_DirectoryDir;
++extern FmXmlFileTag menuTag_Include;
++extern FmXmlFileTag menuTag_Exclude;
++extern FmXmlFileTag menuTag_Filename;
++extern FmXmlFileTag menuTag_Or;
++extern FmXmlFileTag menuTag_And;
++extern FmXmlFileTag menuTag_Not;
++extern FmXmlFileTag menuTag_Category;
++extern FmXmlFileTag menuTag_All;
++extern FmXmlFileTag menuTag_LegacyDir;
+
+ typedef enum {
+ MERGE_NONE, /* starting value */
+@@ -152,19 +131,19 @@ typedef struct {
+ } MenuRule;
+
+ /* requested language(s) */
+-char **languages;
++extern char **languages;
+
+ /* list of menu files to monitor */
+-GSList *MenuFiles;
++extern GSList *MenuFiles;
+
+ /* list of menu dirs to monitor */
+-GSList *MenuDirs;
++extern GSList *MenuDirs;
+
+ /* list of available app dirs */
+-GSList *AppDirs;
++extern GSList *AppDirs;
+
+ /* list of available dir dirs */
+-GSList *DirDirs;
++extern GSList *DirDirs;
+
+ /* parse and merge menu files */
+ MenuMenu *get_merged_menu(const char *file, FmXmlFile **xmlfile, GError
**error);
+@@ -177,7 +156,7 @@ gboolean save_menu_cache(MenuMenu *layout, const char
*menuname, const char *fil
+ void _free_layout_items(GList *data);
+
+ /* verbosity level */
+-gint verbose;
++extern gint verbose;
+
+ #define DBG if (verbose) g_debug
+ #define VDBG if (verbose > 1) g_debug
diff --git a/lxde-base/menu-cache/menu-cache-1.1.0.ebuild
b/lxde-base/menu-cache/menu-cache-1.1.0.ebuild
index 2c03125682e..17e172fb352 100644
--- a/lxde-base/menu-cache/menu-cache-1.1.0.ebuild
+++ b/lxde-base/menu-cache/menu-cache-1.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -19,6 +19,10 @@ DEPEND="${RDEPEND}
sys-devel/gettext
virtual/pkgconfig"
+# Fix for gcc 10 / -fno-common
+# https://github.com/lxde/menu-cache/pull/19
+PATCHES="${FILESDIR}/${P}-fno-common.diff"
+
src_configure() {
econf "--disable-static"
}
[gentoo-commits] repo/gentoo:master commit in: lxde-base/menu-cache/files/, lxde-base/menu-cache/
commit: f3fa85eb2b74e9b20f8fe42e4f320543339adb59
Author: charIes17 arcor de>
AuthorDate: Sat Apr 7 06:43:58 2018 +
Commit: Aaron Bauman gentoo org>
CommitDate: Mon Apr 9 00:11:10 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f3fa85eb
lxde-base/menu-cache: Remove old
Version 1.1.0 is in the tree since over a month
Removing 1.0.2-r1 whiich never got stabilized
Package-Manager: Portage-2.3.24, Repoman-2.3.6
.../files/menu-cache-1.0.2-CVE-2017-8933.patch | 122 -
lxde-base/menu-cache/menu-cache-1.0.2-r1.ebuild| 22
2 files changed, 144 deletions(-)
diff --git a/lxde-base/menu-cache/files/menu-cache-1.0.2-CVE-2017-8933.patch
b/lxde-base/menu-cache/files/menu-cache-1.0.2-CVE-2017-8933.patch
deleted file mode 100644
index 89ce5c501b0..000
--- a/lxde-base/menu-cache/files/menu-cache-1.0.2-CVE-2017-8933.patch
+++ /dev/null
@@ -1,122 +0,0 @@
-diff --git a/NEWS b/NEWS
-index dcc572a..6177e9d 100644
a/NEWS
-+++ b/NEWS
-@@ -1,3 +1,12 @@
-+* Fixed crash with invalid tag in a menu.
-+
-+* Added new API menu_cache_app_get_generic_name() to get generic
-+name for application.
-+
-+* Fixed potential access violation, use runtime user dir instead of tmp dir.
-+It limits libmenu-cache compatibility to menu-cached >= 0.7.0.
-+
-+
- Changes in 1.0.2 since 1.0.1:
-
- * Fixed crash in menu-cached if cache regeneration fails.
-diff --git a/libmenu-cache/menu-cache.c b/libmenu-cache/menu-cache.c
-index 3bc9cfc..d914127 100644
a/libmenu-cache/menu-cache.c
-+++ b/libmenu-cache/menu-cache.c
-@@ -3,7 +3,7 @@
- *
- * Copyright 2008 PCMan
- * Copyright 2009 Jürgen Hötzel
-- * Copyright 2012-2015 Andriy Grytsenko (LStranger)
-+ * Copyright 2012-2017 Andriy Grytsenko (LStranger)
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
-@@ -1234,6 +1234,22 @@ gboolean menu_cache_dir_is_visible(MenuCacheDir *dir)
- }
-
- /**
-+ * menu_cache_app_get_generic_name
-+ * @app: a menu cache item
-+ *
-+ * Retrieves generic name for @app. Returned data are owned by menu
-+ * cache and should not be freed by caller.
-+ *
-+ * Returns: (transfer none): app's generic name or %NULL.
-+ *
-+ * Since: 1.0.3
-+ */
-+const char* menu_cache_app_get_generic_name( MenuCacheApp* app )
-+{
-+ return app->generic_name;
-+}
-+
-+/**
- * menu_cache_app_get_exec
- * @app: a menu cache item
- *
-@@ -1522,8 +1538,13 @@ static void get_socket_name( char* buf, int len )
- if(*p)
- *p = '\0';
- }
-+#if GLIB_CHECK_VERSION(2, 28, 0)
-+g_snprintf( buf, len, "%s/menu-cached-%s", g_get_user_runtime_dir(),
-+dpy ? dpy : ":0" );
-+#else
- g_snprintf( buf, len, "%s/.menu-cached-%s-%s", g_get_tmp_dir(),
- dpy ? dpy : ":0", g_get_user_name() );
-+#endif
- g_free(dpy);
- }
-
-diff --git a/libmenu-cache/menu-cache.h.in b/libmenu-cache/menu-cache.h.in
-index 76ea7b4..cded59d 100644
a/libmenu-cache/menu-cache.h.in
-+++ b/libmenu-cache/menu-cache.h.in
-@@ -151,6 +151,7 @@ MenuCacheItem *menu_cache_find_child_by_name(MenuCacheDir
*dir, const char *name
-
- char* menu_cache_dir_make_path( MenuCacheDir* dir );
-
-+const char* menu_cache_app_get_generic_name( MenuCacheApp* app );
- const char* menu_cache_app_get_exec( MenuCacheApp* app );
- const char* menu_cache_app_get_working_dir( MenuCacheApp* app );
- const char* const *menu_cache_app_get_categories(MenuCacheApp* app);
-diff --git a/menu-cache-daemon/menu-cached.c b/menu-cache-daemon/menu-cached.c
-index a6895ee..c100484 100644
a/menu-cache-daemon/menu-cached.c
-+++ b/menu-cache-daemon/menu-cached.c
-@@ -473,6 +473,9 @@ static void get_socket_name( char* buf, int len )
- if(*p)
- *p = '\0';
- }
-+/* NOTE: this socket name is incompatible with versions > 1.0.2,
-+although this function is never used since 0.7.0 but
-+libmenu-cache always requests exact socket name instead */
- g_snprintf( buf, len, "%s/.menu-cached-%s-%s", g_get_tmp_dir(),
- dpy ? dpy : ":0", g_get_user_name() );
- g_free(dpy);
-diff --git a/menu-cache-gen/menu-merge.c b/menu-cache-gen/menu-merge.c
-index 816cf96..31f05b0 100644
a/menu-cache-gen/menu-merge.c
-+++ b/menu-cache-gen/menu-merge.c
-@@ -1,7 +1,7 @@
- /*
- * menu-file.c : parses .menu file and merges all XML tags.
- *
-- * Copyright 2013-2016 Andriy Grytsenko (LStranger)
-+ * Copyright 2013-2017 Andriy Grytsenko (LStranger)
- *
- * 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,
