Apply ssp fix thanks to Richard Grenville <pyxlcy@gmail.com>. Bug #409939

(Portage version: 2.1.11.9/cvs/Linux x86_64)

3 files changed, 101 insertions, 1 deletions

diff --git a/x11-libs/libfm/ChangeLog b/x11-libs/libfm/ChangeLog
index 1f19e4027fc7..e66b7fefc8c3 100644
--- a/x11-libs/libfm/ChangeLog
+++ b/x11-libs/libfm/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-libs/libfm
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libfm/ChangeLog,v 1.70 2012/07/21 11:07:26 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libfm/ChangeLog,v 1.71 2012/08/05 18:33:29 hwoarang Exp $
+
+*libfm-0.1.17-r1 (05 Aug 2012)
+
+  05 Aug 2012; Markos Chandras <hwoarang@gentoo.org>
+  +files/libfm-0.1.17-ssp-fix.patch, +libfm-0.1.17-r1.ebuild:
+  Apply ssp fix thanks to Richard Grenville <pyxlcy@gmail.com>. Bug #409939
 
   21 Jul 2012; Markos Chandras <hwoarang@gentoo.org> libfm-1.0_rc1.ebuild,
   libfm-9999.ebuild:
diff --git a/x11-libs/libfm/files/libfm-0.1.17-ssp-fix.patch b/x11-libs/libfm/files/libfm-0.1.17-ssp-fix.patch
new file mode 100644
index 000000000000..25e500d53a0a
--- /dev/null
+++ b/x11-libs/libfm/files/libfm-0.1.17-ssp-fix.patch
@@ -0,0 +1,27 @@
+From 8972eaaef0bb43491b7578dd3e8c9f14455d1d6a Mon Sep 17 00:00:00 2001
+From: Richard Grenville <richardgv@users.sourceforge.net>
+Date: Wed, 9 May 2012 07:47:24 +0800
+Subject: [PATCH] Fix #3512666 - fm-archiver.c: Stack buffer overflow.
+
+---
+ src/base/fm-archiver.c |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/base/fm-archiver.c b/src/base/fm-archiver.c
+index 2852058..edbc62b 100644
+--- a/src/base/fm-archiver.c
++++ b/src/base/fm-archiver.c
+@@ -203,8 +203,8 @@ void _fm_archiver_init()
+     GKeyFile *kf = g_key_file_new();
+     if(g_key_file_load_from_file(kf, PACKAGE_DATA_DIR "/archivers.list", 0, NULL))
+     {
+-        int n_archivers;
+-        char** programs = g_key_file_get_groups(kf, &n_archivers);
++        gsize n_archivers;
++        gchar** programs = g_key_file_get_groups(kf, &n_archivers);
+         if(programs)
+         {
+             int i;
+-- 
+1.7.4.1
+
diff --git a/x11-libs/libfm/libfm-0.1.17-r1.ebuild b/x11-libs/libfm/libfm-0.1.17-r1.ebuild
new file mode 100644
index 000000000000..e6703d02293c
--- /dev/null
+++ b/x11-libs/libfm/libfm-0.1.17-r1.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libfm/libfm-0.1.17-r1.ebuild,v 1.1 2012/08/05 18:33:29 hwoarang Exp $
+
+EAPI=4
+
+inherit autotools eutils fdo-mime
+
+DESCRIPTION="A library for file management"
+HOMEPAGE="http://pcmanfm.sourceforge.net/"
+SRC_URI="http://dev.gentoo.org/~hwoarang/distfiles/${P}.tar.gz"
+
+KEYWORDS="~alpha ~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux"
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="debug examples udev"
+
+COMMON_DEPEND=">=dev-libs/glib-2.18:2
+	>=x11-libs/gtk+-2.16:2
+	udev? ( dev-libs/dbus-glib )
+	>=lxde-base/menu-cache-0.3.2"
+RDEPEND="${COMMON_DEPEND}
+	x11-misc/shared-mime-info
+	udev? ( sys-fs/udisks:0 )"
+DEPEND="${COMMON_DEPEND}
+	dev-util/gtk-doc-am
+	>=dev-util/intltool-0.40
+	virtual/pkgconfig
+	sys-devel/gettext"
+
+src_prepare() {
+	sed -ie '/SUBDIRS=/s#docs##' "${S}"/Makefile.am || die "sed failed"
+	sed -i -e '/^[[:space:]]*docs/d' -e "s:-O0::" -e "/-DG_ENABLE_DEBUG/s: -g::" \
+		configure.ac || die "sed failed"
+	#Remove -Werror for automake-1.12. Bug #421101
+	sed -i "s:-Werror::" configure.ac || die
+	# Bug 409939
+	epatch "${FILESDIR}"/${P}-ssp-fix.patch
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--sysconfdir="${EPREFIX}/etc" \
+		--disable-dependency-tracking \
+		--disable-static \
+		$(use_enable udev udisks) \
+		$(use_enable examples demo) \
+		$(use_enable debug) \
+		# Documentation fails to build at the moment
+		# $(use_enable doc gtk-doc) \
+		# $(use_enable doc gtk-doc-html) \
+		--with-html-dir=/usr/share/doc/${PF}/html
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -exec rm -f '{}' +
+}
+
+pkg_postinst() {
+	fdo-mime_mime_database_update
+}
+
+pkg_postrm() {
+	fdo-mime_mime_database_update
+}