summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--x11-libs/libfm-extra/Manifest1
-rw-r--r--x11-libs/libfm-extra/libfm-extra-1.3.0.ebuild91
-rw-r--r--x11-libs/libfm/Manifest2
-rw-r--r--x11-libs/libfm/files/libfm-fix-use-after-free.diff23
-rw-r--r--x11-libs/libfm/libfm-1.3.0.ebuild (renamed from x11-libs/libfm/libfm-1.2.5-r1.ebuild)10
-rw-r--r--x11-misc/pcmanfm/Manifest2
-rw-r--r--x11-misc/pcmanfm/files/pcmanfm-1.2.5-CVE-2017-8934.patch40
-rw-r--r--x11-misc/pcmanfm/pcmanfm-1.3.0.ebuild (renamed from x11-misc/pcmanfm/pcmanfm-1.2.5-r1.ebuild)2
8 files changed, 97 insertions, 74 deletions
diff --git a/x11-libs/libfm-extra/Manifest b/x11-libs/libfm-extra/Manifest
new file mode 100644
index 00000000..d6a5093d
--- /dev/null
+++ b/x11-libs/libfm-extra/Manifest
@@ -0,0 +1 @@
+DIST libfm-1.3.0.tar.gz 1288574 BLAKE2B 24a7ee923f5d51fddd934e85930533408dfd0c7c099e12b55e18820aa20b47605b1c0a005b5519c35dd8f8dc6042cf01d140602ef53609d1e86ce78c8540091a SHA512 1bac0779c6dad52ef722998dc3859a5868eaacfd2ec41e8966d92ec4c57c2e060c8811bf8fe172e6305707e3f018b412379cdb336a29de29d081d3f7cceeec0e
diff --git a/x11-libs/libfm-extra/libfm-extra-1.3.0.ebuild b/x11-libs/libfm-extra/libfm-extra-1.3.0.ebuild
new file mode 100644
index 00000000..b962866e
--- /dev/null
+++ b/x11-libs/libfm-extra/libfm-extra-1.3.0.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit autotools xdg-utils
+
+MY_PV=${PV/_/}
+MY_PN="libfm"
+MY_P="${MY_PN}-${MY_PV}"
+DESCRIPTION="A library for file management"
+HOMEPAGE="http://pcmanfm.sourceforge.net/"
+SRC_URI="https://github.com/lxde/libfm/archive/${PV}.tar.gz -> ${MY_P}.tar.gz"
+
+KEYWORDS="~alpha amd64 arm ~arm64 ~mips ppc x86 ~amd64-linux ~x86-linux"
+LICENSE="GPL-2"
+SLOT="0/5.0.1" #copy ABI_VERSION because it seems upstream change it randomly
+IUSE=""
+
+RDEPEND=">=dev-libs/glib-2.18:2"
+DEPEND="${RDEPEND}
+ app-arch/xz-utils
+ >=dev-util/intltool-0.40
+ virtual/pkgconfig
+ sys-devel/gettext
+ !!<=x11-libs/libfm-1.2.3"
+
+S="${WORKDIR}"/${MY_P}
+
+src_prepare() {
+ sed -ie '/^SUBDIR.*=/s#docs##' "${S}"/Makefile.am || die "sed failed"
+ sed -ie '/^[[:space:]]*docs/d' configure.ac || die "sed failed"
+ sed -i -e "s:-O0::" -e "/-DG_ENABLE_DEBUG/s: -g::" \
+ configure.ac || die "sed failed"
+
+ #disable unused translations. Bug #356029
+ for trans in app-chooser ask-rename exec-file file-prop preferred-apps \
+ progress;do
+ echo "data/ui/"${trans}.ui >> po/POTFILES.in
+ done
+ #Remove -Werror for automake-1.12. Bug #421101
+ sed -i "s:-Werror::" configure.ac || die
+
+ # subslot sanity check
+ local sub_slot=${SLOT#*/}
+ local libfm_major_abi=$(sed -rne '/ABI_VERSION/s:.*=::p' src/Makefile.am | tr ':' '.')
+
+ if [[ ${sub_slot} != ${libfm_major_abi} ]]; then
+ eerror "Ebuild sub-slot (${sub_slot}) does not match ABI_VERSION(${libfm_major_abi})"
+ eerror "Please update SLOT variable as follows:"
+ eerror " SLOT=\"${SLOT%%/*}/${libfm_major_abi}\""
+ eerror
+ die "sub-slot sanity check failed"
+ fi
+
+ eautoreconf
+ rm -r autom4te.cache || die
+}
+
+src_configure() {
+ econf --sysconfdir="${EPREFIX}/etc" --disable-dependency-tracking \
+ --disable-static --with-extra-only
+}
+
+src_install() {
+ default
+ find "${D}" -name '*.la' -exec rm -f '{}' +
+ # Sometimes a directory is created instead of a symlink. No idea why...
+ # It is wrong anyway. We expect a libfm-1.0 directory and then a libfm
+ # symlink to it.
+ if [[ -h ${D}/usr/include/${MY_PN} || -d ${D}/usr/include/${MY_PN} ]]; then
+ rm -r "${D}"/usr/include/${MY_PN}
+ fi
+}
+
+pkg_preinst() {
+ # Resolve the symlink mess. Bug #439570
+ [[ -d "${ROOT}"/usr/include/${MY_PN} ]] && \
+ rm -rf "${ROOT}"/usr/include/${MY_PN}
+ if [[ -d "${D}"/usr/include/${MY_PN}-1.0 ]]; then
+ cd "${D}"/usr/include
+ ln -s --force ${MY_PN}-1.0 ${MY_PN}
+ fi
+}
+
+pkg_postinst() {
+ xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+ xdg_mimeinfo_database_update
+}
diff --git a/x11-libs/libfm/Manifest b/x11-libs/libfm/Manifest
index 7be34662..d6a5093d 100644
--- a/x11-libs/libfm/Manifest
+++ b/x11-libs/libfm/Manifest
@@ -1 +1 @@
-DIST libfm-1.2.5.tar.gz 1261152 BLAKE2B 30da6771ad4ab31be675a3af2ce7c9dd04e80be9f33b25300bf386f45f9fd652654e211c312d1e283a63cdbde4f5c8e3673a36fc0075e3b1981d9f5995683057 SHA512 0bc7910081cadc4c8c4648f3483fb5791e9480700400ded452dd5985e7fb0d8524f2c676f0171a5cd283422a13f240f40cfe5ccc8d10dce02dd784d62250b7cc
+DIST libfm-1.3.0.tar.gz 1288574 BLAKE2B 24a7ee923f5d51fddd934e85930533408dfd0c7c099e12b55e18820aa20b47605b1c0a005b5519c35dd8f8dc6042cf01d140602ef53609d1e86ce78c8540091a SHA512 1bac0779c6dad52ef722998dc3859a5868eaacfd2ec41e8966d92ec4c57c2e060c8811bf8fe172e6305707e3f018b412379cdb336a29de29d081d3f7cceeec0e
diff --git a/x11-libs/libfm/files/libfm-fix-use-after-free.diff b/x11-libs/libfm/files/libfm-fix-use-after-free.diff
deleted file mode 100644
index 4a0ae61c..00000000
--- a/x11-libs/libfm/files/libfm-fix-use-after-free.diff
+++ /dev/null
@@ -1,23 +0,0 @@
-diff -Naur libfm-1.2.3/src/base/fm-config.c libfm-1.2.3-fix-uaf-new2/src/base/fm-config.c
---- libfm-1.2.3/src/base/fm-config.c 2014-10-14 18:29:21.000000000 +0200
-+++ libfm-1.2.3-fix-uaf-new2/src/base/fm-config.c 2016-06-18 18:23:35.721837971 +0200
-@@ -346,7 +346,8 @@
- cfg->modules_blacklist = NULL;
- cfg->system_modules_blacklist = NULL;
- _cfg_monitor_free(cfg);
-- g_free(cfg->_cfg_name);
-+ if(name != cfg->_cfg_name)
-+ g_free(cfg->_cfg_name);
- if(G_LIKELY(!name))
- name = "libfm/libfm.conf";
- else
-@@ -363,7 +364,8 @@
- }
- }
-
-- cfg->_cfg_name = g_strdup(name);
-+ if(name != cfg->_cfg_name)
-+ cfg->_cfg_name = g_strdup(name);
- dirs = g_get_system_config_dirs();
- /* bug SF #887: first dir in XDG_CONFIG_DIRS is the most relevant
- so we shoult process the list in reverse order */
diff --git a/x11-libs/libfm/libfm-1.2.5-r1.ebuild b/x11-libs/libfm/libfm-1.3.0.ebuild
index ffa37fbe..a42fb37e 100644
--- a/x11-libs/libfm/libfm-1.2.5-r1.ebuild
+++ b/x11-libs/libfm/libfm-1.3.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/lxde/libfm/archive/${PV}.tar.gz -> ${MY_P}.tar.gz"
KEYWORDS="~alpha amd64 arm ~arm64 ~mips ppc x86 ~amd64-linux ~x86-linux"
LICENSE="GPL-2"
-SLOT="0/4.5.0" #copy ABI_VERSION because it seems upstream change it randomly
+SLOT="0/5.0.1" #copy ABI_VERSION because it seems upstream change it randomly
IUSE="+automount debug doc examples exif gtk gtk3 udisks vala"
COMMON_DEPEND=">=dev-libs/glib-2.18:2
@@ -45,10 +45,6 @@ S="${WORKDIR}"/${MY_P}
REQUIRED_USE="udisks? ( automount ) doc? ( gtk ) gtk3? ( gtk )"
src_prepare() {
- # Fix use after free bug, see
- # https://github.com/lxde/libfm/pull/11/commits/9e3a809c6a8a5079f05e04edac9457d317822321
- epatch "${FILESDIR}"/libfm-fix-use-after-free.diff
-
if ! use doc; then
sed -ie '/^SUBDIR.*=/s#docs##' "${S}"/Makefile.am || die "sed failed"
sed -ie '/^[[:space:]]*docs/d' configure.ac || die "sed failed"
@@ -91,7 +87,7 @@ src_configure() {
$(use_enable examples demo) \
$(use_enable debug) \
$(use_enable udisks) \
- $(use_enable vala actions) \
+ $(use_enable vala old-actions) \
$(use_enable doc gtk-doc) \
--with-html-dir=/usr/share/doc/${PF}/html
else
@@ -103,7 +99,7 @@ src_configure() {
$(use_enable exif) \
$(use_enable debug) \
$(use_enable udisks) \
- $(use_enable vala actions) \
+ $(use_enable vala old-actions) \
$(use_with gtk) \
$(use_enable doc gtk-doc) \
--with-html-dir=/usr/share/doc/${PF}/html
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