gentoo resync : 09.03.2018

4 files changed, 172 insertions, 0 deletions

diff --git a/lxde-base/menu-cache/Manifest b/lxde-base/menu-cache/Manifest
index ca1ca9566659..b4bd81305e55 100644
--- a/lxde-base/menu-cache/Manifest
+++ b/lxde-base/menu-cache/Manifest
@@ -1,11 +1,15 @@
+AUX menu-cache-1.0.2-CVE-2017-8933.patch 4631 BLAKE2B 86c7a0b99ed3e85f3793e7eabca1c56fd0dad8719d4384218e746913a94359c4f16e1c239cf64622e8583a860c457d3b50f9f2f5182cefb4f2ad08ebe71a3813 SHA512 54dcc28b9c2188e921096d22be9729c8bcc366bc78b8a2dae0146aecdf88e6ee3455d2ddeaafd760e6ba0e22e48fba3c6c11edf8e5edd40fd4650ca671baf6a2
 DIST menu-cache-0.3.3.tar.gz 392291 BLAKE2B baf9eb9013a1a208ca69d388cdf902ccb8303a3c44fd92ba475acd6ebf36a1fd802b50e74889c618ea37074f4834ce4167e497ff3fcfab6ffffe146f3d8a3e6e SHA512 1966b94989cdae0a1a3a48f19d337471a28acadecf7f03dac8c27d515324b8eb4d15102e2aa293c251e020f521f6e586aa13c8eca7ae7909b9ce5e67ef3ebafe
 DIST menu-cache-0.5.1.tar.gz 406329 BLAKE2B 14851fb55b15d2e5262e8ca6de55a4fb14bdc56741ad00979dcb5f8b4e57d9db71543700658ab8aeecd0a40d4eef91f18c9a854352c7c10816ec35cd0d34f9bb SHA512 44d55a01f5452804e77518c4a2ba400a5b65edbf4061e346a6c02356195867eaa0bb9eaa057fbf603ddf79759acb16632bf3b7ae543eebc1544e28517cd23066
 DIST menu-cache-1.0.0.tar.xz 261988 BLAKE2B 126aca354efff42ea51336b4cb0c8cb42240b1c95ba3de0862fb2a2ee31da04c85c5b4c0b442bf00c7a96311b8b6c5cf45a6299bad4c638559b8d8e69ac53a48 SHA512 b336cddb9c3d993aa605e6adf9ac3c40fe631eccfa06d1835897f6cb5ae82bed93bc323c12b7dff44b8785dfb646058d77cb697f3c275998a5483b2582926e22
 DIST menu-cache-1.0.1.tar.xz 262508 BLAKE2B 82019f7a6b596cb0f4da641cdd70c5b96fd75d2e63192391b556c6f1d40fdfb90047a7febef44f10fe9357c0682d8c0fa931b0ff45462ba1b6578e5c9c44656f SHA512 5de4bf99ab5a511da6781d54b03349cc0232b379a73f9f9c328fb9aed6ec03558a9adda85be1fbbe53d94669d07a5196929ab67cd3291de7aae59f587afda3a3
 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-0.3.3.ebuild 478 BLAKE2B 6cc6cab53da51047e81d04e58a740a43c0517c428607a9994967301aec89f30ec74e0c7cd3d826845a54512fc01c135b3e6ac6d80d4250bc47fc4c0dbeae3107 SHA512 7dc179652dd996b711d5a8d1b893214861332b9877125e8319506a3f7cf8c9901e826de9a4d58ac39b933c117d40bad11eb0cb5213c533b04418c03e48d41693
 EBUILD menu-cache-0.5.1.ebuild 522 BLAKE2B 02da03184da61002d1e4fe4464a80d465419f825bd6605c6302f1d2cf923a19ec2805f1b20f53b3b3e812539db3e87deb03dec070c29101ad2c62cea3a8d6a93 SHA512 6f16123ff84c97f8efedde35611d4d6606672f722952189aa55c73bb0de06a6707c249de76a089664e32d33754e3de73082fb9f10c2ef35faf9f182704067972
 EBUILD menu-cache-1.0.0-r1.ebuild 544 BLAKE2B e39886c3cec6f5bc6e684dcb0976c5504062f7369ab60288463202256ad367eb30003aa5b120410c64f39cd46db593b204f864c261b0b6e6d73a95dffdd7eb88 SHA512 695a5c00b7641cbc0e4fc4276ed6d0e245c0a2e1ef396cf90429984100cd651bf7ff72757ae3802dba46f32eaa2f6e8c4a116f0815b92a286fc74240a5796606
 EBUILD menu-cache-1.0.1.ebuild 542 BLAKE2B 4db007b54508279e1cf8bed97a226d45b0ebee3e51d594798107b15d7b7a8e6143b6120a8819e79efddc415664db3341e5fef0385922866b940c2975c0ee08d2 SHA512 1811f33ea471c5a48b3db71a16900d56746e232654fc349280190ea767ecd5f2249c205287157fb15ced4ca9e2ec69182ba265ed0d165a3c877a8ee1aac5709f
+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
 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
new file mode 100644
index 000000000000..89ce5c501b0b
--- /dev/null
+++ b/lxde-base/menu-cache/files/menu-cache-1.0.2-CVE-2017-8933.patch
@@ -0,0 +1,122 @@
+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
new file mode 100644
index 000000000000..736a786ebeac
--- /dev/null
+++ b/lxde-base/menu-cache/menu-cache-1.0.2-r1.ebuild
@@ -0,0 +1,22 @@
+# 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.1.0.ebuild b/lxde-base/menu-cache/menu-cache-1.1.0.ebuild
new file mode 100644
index 000000000000..5592bfbcbd34
--- /dev/null
+++ b/lxde-base/menu-cache/menu-cache-1.1.0.ebuild
@@ -0,0 +1,24 @@
+# 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=""
+
+RDEPEND="dev-libs/glib:2
+	x11-libs/libfm-extra"
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+src_configure() {
+	econf "--disable-static"
+}