diff options
Diffstat (limited to 'lxde-base/menu-cache')
| -rw-r--r-- | lxde-base/menu-cache/Manifest | 6 | ||||
| -rw-r--r-- | lxde-base/menu-cache/files/menu-cache-1.0.2-CVE-2017-8933.patch | 122 | ||||
| -rw-r--r-- | lxde-base/menu-cache/menu-cache-1.0.2-r1.ebuild | 22 | ||||
| -rw-r--r-- | lxde-base/menu-cache/menu-cache-1.0.2.ebuild | 4 | ||||
| -rw-r--r-- | lxde-base/menu-cache/menu-cache-1.1.0.ebuild | 2 |
5 files changed, 5 insertions, 151 deletions
diff --git a/lxde-base/menu-cache/Manifest b/lxde-base/menu-cache/Manifest index 82c931219835..917f297e4da4 100644 --- a/lxde-base/menu-cache/Manifest +++ b/lxde-base/menu-cache/Manifest @@ -1,7 +1,5 @@ -AUX menu-cache-1.0.2-CVE-2017-8933.patch 4631 BLAKE2B 86c7a0b99ed3e85f3793e7eabca1c56fd0dad8719d4384218e746913a94359c4f16e1c239cf64622e8583a860c457d3b50f9f2f5182cefb4f2ad08ebe71a3813 SHA512 54dcc28b9c2188e921096d22be9729c8bcc366bc78b8a2dae0146aecdf88e6ee3455d2ddeaafd760e6ba0e22e48fba3c6c11edf8e5edd40fd4650ca671baf6a2 DIST menu-cache-1.0.2.tar.xz 264540 BLAKE2B 500dd761cf2c5771a89fd0f1ed58f5f736be816a75af5209041dcabab0fe5d3cd04b14749ff1cde88bf0a536a6c13f3a32ecf1a55663c52ab379c65951dce3e1 SHA512 4a74d464778160052ca7c2abda8c899ce4a3bdf8ddf5fe9ca4cd7297a62340ad1b065162fc5ecb55c0af206175e50dacd4ad0c01a8ffac5690012e534dc3b4b7 DIST menu-cache-1.1.0.tar.xz 265524 BLAKE2B af7caea53a30be53836ccb7d75b0817aef610815009f22dc56fb6d412508ce27a6a5625c25f92faaafe8123dd73ddb2b3f83484e48c1b5deb635c9d630cc868c SHA512 e4c6619ade7b9a1b97c1366bb94dffb9975be5664b193cf0c69cf9470ef7ae19bda3390d04d98ee9a5b1658ec48aa5c83508c26c347af689161ee67c076b3c9e -EBUILD menu-cache-1.0.2-r1.ebuild 609 BLAKE2B 172c61fb66b0782b1f567549b85beec1299a96cfa0c34bfc1ac460420428db698d0dee02ea7ffd50c6e3a81d1adcbceb682ace432f64403f362a5fb38cee587b SHA512 6f4b81e829b66f9b66e3a4e8038ea7f7b560b322ea4b941fd85fe04d1abb4eaf2efff09ea9dc62716505b9980d8c9c35350ef41bb7c6f6a517d2537c2cfeacc5 -EBUILD menu-cache-1.0.2.ebuild 542 BLAKE2B 62a7f01f87e8f1c6ef5742253ee1759e2669e0beab3639a77d89ff3ecde534492d4ad2b6c8334ad1731a58ae2bd449f2a13da9dd73056dddbc02ac4e0fe6bc51 SHA512 10902ab7ae5f3c133ba3f8383751e888751aeda4d0d2342ef25959c8031db146f7c80c668ae9457c46212612ddd49786c7547c8d0dd16198349def69905f3346 -EBUILD menu-cache-1.1.0.ebuild 597 BLAKE2B 2ba1294bdb1bbc301ff66a9c401269d7d9b69a25235d85199c284c1c3ba1efbcb84b20008f6e0c3e8b84aced15e03a6dcc19971fa6dce86e49b5c7a0e61cc589 SHA512 932f67b3f0f44d8e56746bc356b023da9050671ac420c68d7341bc86e22a70a4c34a866dfc2577493d41e9a0f8706a5a8942e487ae6ae46da01a631a940f06e3 +EBUILD menu-cache-1.0.2.ebuild 531 BLAKE2B 4e350b67a295f40b8214098f7fae703d2306e70e234a2baf0b9b0681a5ecef87eb0dbb37e722daae55385898b4d4fc19f28647d78ca4e253dc3d6cb7eba5aca7 SHA512 b0bde63c2d94f8d75ecb65f20e9c09e46cb8d45c61e96c7443259852f4110ce52b76fa0c2a867f7cf803a1acbc9406c6658c1bc409cc20e9d324c29d0033e844 +EBUILD menu-cache-1.1.0.ebuild 586 BLAKE2B aaf785c19ef982f717f4f0fc1ca8f8bbe1270c78d64e18ab1a0b7c116ef1353c89adf8cb97057a29a7fcf65cc225aa314815617c9b28545caca5824a58fe380d SHA512 1293fdee85e0455e78c263eb7bef700f3d553e0820b303fa2572f3b7bd3b5e98f0fce58609f82037c84c41f3580df9da57f7dbe28836d038913b4b8e6c41f5f1 MISC metadata.xml 438 BLAKE2B 22ac961e4ca76cf28e725a25d16767e5ec9c8d56cde16f3e613f5c1f56bce4eee38583f524796cb868301d2400cc3242fb466061edc140e28043a132bbb26b9d SHA512 406a5d2489fe96131ecbdcdb8570daa229a4360f393037b76b2d3bd4a7eaccb5dfae9b0d4c6915d0a09d2ef04d879c01b16bdf5c7af648eed87c53a09aa82bfc 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 89ce5c501b0b..000000000000 --- 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 <Name> 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 <pcman.tw@gmail.com> - * Copyright 2009 Jürgen Hötzel <juergen@archlinux.org> -- * Copyright 2012-2015 Andriy Grytsenko (LStranger) <andrej@rep.kiev.ua> -+ * Copyright 2012-2017 Andriy Grytsenko (LStranger) <andrej@rep.kiev.ua> - * - * 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 <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 --git a/lxde-base/menu-cache/menu-cache-1.0.2-r1.ebuild b/lxde-base/menu-cache/menu-cache-1.0.2-r1.ebuild deleted file mode 100644 index 736a786ebeac..000000000000 --- a/lxde-base/menu-cache/menu-cache-1.0.2-r1.ebuild +++ /dev/null @@ -1,22 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -DESCRIPTION="Library to create and utilize caches to speed up freedesktop application menus" -HOMEPAGE="http://lxde.sourceforge.net/" -SRC_URI="mirror://sourceforge/lxde/${P}.tar.xz" - -LICENSE="LGPL-2.1+" -# ABI is v2. See Makefile.am -SLOT="0/2" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~x86 ~amd64-linux ~x86-linux" -IUSE="" - -PATCHES=( "${FILESDIR}"/${PN}-1.0.2-CVE-2017-8933.patch ) - -RDEPEND="dev-libs/glib:2 - x11-libs/libfm-extra" -DEPEND="${RDEPEND} - sys-devel/gettext - virtual/pkgconfig" diff --git a/lxde-base/menu-cache/menu-cache-1.0.2.ebuild b/lxde-base/menu-cache/menu-cache-1.0.2.ebuild index f0098916fae4..6b1f6065594b 100644 --- a/lxde-base/menu-cache/menu-cache-1.0.2.ebuild +++ b/lxde-base/menu-cache/menu-cache-1.0.2.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 DESCRIPTION="Library to create and utilize caches to speed up freedesktop application menus" -HOMEPAGE="http://lxde.sourceforge.net/" +HOMEPAGE="https://lxde.org/" SRC_URI="mirror://sourceforge/lxde/${P}.tar.xz" LICENSE="GPL-2" 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 5592bfbcbd34..86f598a23b09 100644 --- a/lxde-base/menu-cache/menu-cache-1.1.0.ebuild +++ b/lxde-base/menu-cache/menu-cache-1.1.0.ebuild @@ -4,7 +4,7 @@ EAPI=6 DESCRIPTION="Library to create and utilize caches to speed up freedesktop application menus" -HOMEPAGE="http://lxde.sourceforge.net/" +HOMEPAGE="https://lxde.org/" SRC_URI="mirror://sourceforge/lxde/${P}.tar.xz" LICENSE="LGPL-2.1+" |