diff options
| author | Ghiunhan Mamut <V3n3RiX@users.noreply.github.com> | 2018-04-22 23:14:49 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-22 23:14:49 +0100 |
| commit | 3ce68add3aa3245f0bdaa225802ce8aaea071fae (patch) | |
| tree | 4c6fed681ef216c4043b29cfff30d389e463cc82 /x11-misc | |
| parent | 5058d152d6717b56e5838c859d7590fd74d87e38 (diff) | |
| parent | bed9fb923f6cc27b39b2277bbc7832126e761b1c (diff) | |
Merge pull request #1 from stratact/master
Update pcmanfm, libfm.Import and update libfm-extra
Diffstat (limited to 'x11-misc')
| -rw-r--r-- | x11-misc/pcmanfm/Manifest | 2 | ||||
| -rw-r--r-- | x11-misc/pcmanfm/files/pcmanfm-1.2.5-CVE-2017-8934.patch | 40 | ||||
| -rw-r--r-- | x11-misc/pcmanfm/pcmanfm-1.3.0.ebuild (renamed from x11-misc/pcmanfm/pcmanfm-1.2.5-r1.ebuild) | 2 |
3 files changed, 1 insertions, 43 deletions
diff --git a/x11-misc/pcmanfm/Manifest b/x11-misc/pcmanfm/Manifest index 8762b0d0..b100111f 100644 --- a/x11-misc/pcmanfm/Manifest +++ b/x11-misc/pcmanfm/Manifest @@ -1 +1 @@ -DIST pcmanfm-1.2.5.tar.xz 417808 BLAKE2B 1bc4ff7879baa1b62c5acf0b48977f5a81b5bac2d449064ed3ae74740f8e6981ae129cdfe123b63e57e2a22769273348df1a48def61eeb6a72a5918fdad2847c SHA512 ce53315483f58361c5a7797bdca355dbbedc2cf3907d319c7c65be844ea74ed297497dc3183c903e06b8294f6301d19347f6b9871e34bf773c04ff4fb8ab32f3 +DIST pcmanfm-1.3.0.tar.xz 422836 BLAKE2B 22e99847adf827336ea167632317c91fc2e6057aebf4bc4559396e6e3efb0ccc7cd2c3477acda99a686d7c265931882def886d27f15607ccb0e50cb89c1ed1c9 SHA512 022e6e203a6cbba6531eb3dd21e0dd96687c42992015225f979a8df4539ddb0071f70d8619a7d804c0399424833af20181b8473a35a14b0fa1653e6fdbdfa367 diff --git a/x11-misc/pcmanfm/files/pcmanfm-1.2.5-CVE-2017-8934.patch b/x11-misc/pcmanfm/files/pcmanfm-1.2.5-CVE-2017-8934.patch deleted file mode 100644 index 2acd91bf..00000000 --- a/x11-misc/pcmanfm/files/pcmanfm-1.2.5-CVE-2017-8934.patch +++ /dev/null @@ -1,40 +0,0 @@ -# index 8c2049a..876f7f3 100644 (file) -# --- a/NEWS -# +++ b/NEWS -# @@ -1,3 +1,7 @@ -# +* Fixed potential access violation, use runtime user dir instead of tmp dir -# + for single instance socket. -# + -# + -# Changes on 1.2.5 since 1.2.4: - - * Removed options to Cut, Remove and Rename from context menu on mounted -diff --git a/src/single-inst.c b/src/single-inst.c -index 62c37b3..aaf84ab 100644 (file) ---- a/src/single-inst.c -+++ b/src/single-inst.c -@@ -2,7 +2,7 @@ - * single-inst.c: simple IPC mechanism for single instance app - * - * Copyright 2010 Hong Jen Yee (PCMan) <pcman.tw@gmail.com> -- * Copyright 2012 Andriy Grytsenko (LStranger) <andrej@rep.kiev.ua> -+ * Copyright 2012-2017 Andriy Grytsenko (LStranger) <andrej@rep.kiev.ua> - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by -@@ -404,11 +404,16 @@ static void get_socket_name(SingleInstData* data, char* buf, int len) - } - else - dpynum = 0; -+#if GLIB_CHECK_VERSION(2, 28, 0) -+ g_snprintf(buf, len, "%s/%s-socket-%s-%d", g_get_user_runtime_dir(), -+ data->prog_name, host ? host : "", dpynum); -+#else - g_snprintf(buf, len, "%s/.%s-socket-%s-%d-%s", - g_get_tmp_dir(), - data->prog_name, - host ? host : "", - dpynum, - g_get_user_name()); -+#endif - } diff --git a/x11-misc/pcmanfm/pcmanfm-1.2.5-r1.ebuild b/x11-misc/pcmanfm/pcmanfm-1.3.0.ebuild index ab1432e7..81eb4e89 100644 --- a/x11-misc/pcmanfm/pcmanfm-1.2.5-r1.ebuild +++ b/x11-misc/pcmanfm/pcmanfm-1.3.0.ebuild @@ -39,8 +39,6 @@ S="${WORKDIR}"/${MY_P} REQUIRED_USE="gtk3? ( gtk )" -PATCHES=( "${FILESDIR}"/${PN}-1.2.5-CVE-2017-8934.patch ) - src_prepare() { default |