Include upstream patch for double free segmentation fault occuring with, for example, directory creation wrt #414753 by "Flavio"

Package-Manager: portage-2.2.0_alpha102/cvs/Linux x86_64

4 files changed, 147 insertions, 9 deletions

diff --git a/app-pda/gtkpod/ChangeLog b/app-pda/gtkpod/ChangeLog
index 0560fe3e666e..73ac292604e1 100644
--- a/app-pda/gtkpod/ChangeLog
+++ b/app-pda/gtkpod/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-pda/gtkpod
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-pda/gtkpod/ChangeLog,v 1.101 2012/05/10 05:20:00 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-pda/gtkpod/ChangeLog,v 1.102 2012/05/10 07:22:58 ssuominen Exp $
+
+*gtkpod-2.1.1-r3 (10 May 2012)
+
+  10 May 2012; Samuli Suominen <ssuominen@gentoo.org> +gtkpod-2.1.1-r3.ebuild,
+  +files/gtkpod-2.1.1-segfault_with_directory_creation.patch:
+  Include upstream patch for double free segmentation fault occuring with, for
+  example, directory creation wrt #414753 by "Flavio"
 
   09 May 2012; Samuli Suominen <ssuominen@gentoo.org> -gtkpod-2.1.1-r1.ebuild,
   -files/gtkpod-2.1.1-libmp4v2_so_2.patch:
diff --git a/app-pda/gtkpod/Manifest b/app-pda/gtkpod/Manifest
index de72622eb50c..83ed78d9aab0 100644
--- a/app-pda/gtkpod/Manifest
+++ b/app-pda/gtkpod/Manifest
@@ -1,20 +1,22 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX gtkpod-2.1.1-segfault_with_directory_creation.patch 1477 RMD160 518bed7b227d5fa7fb199aab5c2de1287db7978b SHA1 a78cdf6ae367dd746b32bf57c99d904a1cf0e70a SHA256 f6154d9c2516b018712d9ff3b2fc2a2a1cd6855f48307834ec9ace3a66219883
 DIST gtkpod-2.0.2.tar.gz 2982482 RMD160 0810947c013c137f57599a999f63d07d6710b6c7 SHA1 d93e7618653d00a8bc845fd070305c5b38eea1e8 SHA256 2c5dd3d193cd73ba107ccb158e48198768f1dd26724834f8f5ab804281ea4648
 DIST gtkpod-2.1.1.tar.gz 3120542 RMD160 5f30795cf7cda5744181f56875c7648d430d76fc SHA1 aa0bd06395f878bdf9578f8e4350536216fcd2b6 SHA256 a474bb44ed42df554b02c2bd592485ee4fbe91cb9d0fe43576a63bb8b174c37a
 EBUILD gtkpod-2.0.2.ebuild 2188 RMD160 c563c20f4111a5640032adcb5744e4cc8a8f01cb SHA1 e233553f8cfff24840c4d8be77dff306616c41e4 SHA256 f68a21f682e84783f044289313b414fca8c9c4251fff95f1f56c713e7aeb56c5
 EBUILD gtkpod-2.1.1-r2.ebuild 2189 RMD160 6d52b3a75cd705a22cc299c447c0cca1307f27c8 SHA1 420a262ad01721ac25430517b7e7384103f52dee SHA256 4fcfa2f0474078a3fcfd882b00bfd4a1bb3cc938b179c45b5ed163f856e2971e
-MISC ChangeLog 12718 RMD160 2427ca5e2e57345e5f8fc2658d2b6bf5f383ed88 SHA1 11c1e5cabbca511229003d2ebaf856ee940254e8 SHA256 32d1d8e996dd8f0d59722a24d2c64f2c7f4beb9e7cbb613b701c0c45bc445c15
+EBUILD gtkpod-2.1.1-r3.ebuild 2289 RMD160 4747e6c68b59361e09f18aee8f0c81797e944016 SHA1 d163f800c5b5a0ea5ef007958f942e1c96d25e16 SHA256 42e0d55e791501bdc5924a99cf592c766cd187cb17c069b5c1fc429d464d6e01
+MISC ChangeLog 13025 RMD160 7b1fccfa5ea4800a9f0ffc2cb44a295263106c00 SHA1 e28bbee6ed3ecbf7d635c6f93f908814668eba54 SHA256 04e8164c2ca29777ec756436fdf97059317847992159db1078bfe03d7730ade7
 MISC metadata.xml 428 RMD160 c40c3a378f712e2d05f3e9115c1f3c451bbfa361 SHA1 1c1bf125d989ce79c5cb34851bb164251c40ac9c SHA256 b181f09ad8688911dbcccc8a25e2043db62c7c5697d6ac70645f9c3d639f52d5
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBAgAGBQJPq09TAAoJEEdUh39IaPFN2scH/3IHHK2RMaFaOvSMbZq1SoYM
-KxaHGQxffR+bLFK+DrcCdNVRWAoSxCWUpQsFjjgNR+DXU1frE+4/ly1GsdVf/DLb
-kL3mgs+qA/OG4YPytObKqdsldFVKBe8LPDU9Xh9tICgzU+OVzOBdFFj0kHN058UG
-yeUrg7GeFImQFmtbZuWJ6KL9LtbuoyB52LqQMtmI1sZqqcP+aIhIVps3dk9Rd2FD
-BrN9fMuiZmYJ5+5e1AoNAKHPd6lRRMQ1kx3thykiFPHHz6X3AOmTE3PPMZSEv2b1
-bQ9Tw2pliy9y6a117hP3FmTQqQ9knJ3dgLNVs3spASzf9NDiwzqtJtQIdtZCx8g=
-=/9SF
+iQEcBAEBAgAGBQJPq2wkAAoJEEdUh39IaPFNjtwH/3WNg/zbTTsjtJmNO0CkQGuh
+gz99w8ME8RmslJFZLfU9+fzh5Kd7/r6Gkt2f508u6L1kS5yJGXyRkOwGzPzJ4DBN
+hsQrqzMKldpOjr7jtHhHztKJEPQEDy0Db219Rduu7u5Sxpp/Nhj1zD0hZ0Bsz9qc
+4VPsX/pNm6pVmBa9JlMlKWA7Q1tf97D5dTXY3zAsa9QwcBOw3zCLy1OHC4AwxMEj
+a7a7stmlGDVJNC+um7vUyJgjJnqgWVIVDcT4Tj3ekFB36DCI/wkSetAPyRoqkmDR
+k9lxqbmCKWtYrEb4mDUjFSsSYjr/KUMKh5bmO83y5sMMPbo+BrS5xBxwiKigOMk=
+=rzri
 -----END PGP SIGNATURE-----
diff --git a/app-pda/gtkpod/files/gtkpod-2.1.1-segfault_with_directory_creation.patch b/app-pda/gtkpod/files/gtkpod-2.1.1-segfault_with_directory_creation.patch
new file mode 100644
index 000000000000..342f900cabb9
--- /dev/null
+++ b/app-pda/gtkpod/files/gtkpod-2.1.1-segfault_with_directory_creation.patch
@@ -0,0 +1,38 @@
+From d6ae5a468eba1b3b2aaf40ffa5ede6fce4ea7c3a Mon Sep 17 00:00:00 2001
+From: phantomjinx <p.g.richardson@phantomjinx.co.uk>
+Date: Mon, 23 Apr 2012 20:38:15 +0100
+Subject: [PATCH] Fix for double free segfault
+
+* Occurs when adding a directory
+
+* Directory names inserted into hash table, added as both key and value then
+  being freed as key and then freed as value. Second free causing the
+  segfault
+
+Fixes 3477268 (sf.net)
+Fixes FS#92
+---
+ libgtkpod/file.c |    7 +++++--
+ 1 files changed, 5 insertions(+), 2 deletions(-)
+
+diff --git a/libgtkpod/file.c b/libgtkpod/file.c
+index 323df96..9ffe885 100644
+--- a/libgtkpod/file.c
++++ b/libgtkpod/file.c
+@@ -422,8 +422,11 @@ static void recurse_directories_internal(gchar *name, GSList **trknames, gboolea
+ 
+                     if (g_hash_table_lookup(*directories_seen, nextfull))
+                         continue;
+-                    else
+-                        g_hash_table_insert(*directories_seen, nextfull, nextfull);
++                    else {
++                        // Avoid double freeing when directories_seen is destroyed
++                        // by duplicating the nextfull string
++                        g_hash_table_insert(*directories_seen, g_strdup(nextfull), g_strdup(nextfull));
++                    }
+ 
+                     if (descend || !g_file_test(nextfull, G_FILE_TEST_IS_DIR)) {
+                         recurse_directories_internal(nextfull, trknames, descend, directories_seen);
+-- 
+1.7.4.1
+
diff --git a/app-pda/gtkpod/gtkpod-2.1.1-r3.ebuild b/app-pda/gtkpod/gtkpod-2.1.1-r3.ebuild
new file mode 100644
index 000000000000..93dd273c8fde
--- /dev/null
+++ b/app-pda/gtkpod/gtkpod-2.1.1-r3.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-pda/gtkpod/gtkpod-2.1.1-r3.ebuild,v 1.1 2012/05/10 07:22:58 ssuominen Exp $
+
+EAPI=4
+inherit eutils gnome2-utils
+
+DESCRIPTION="A graphical user interface to the Apple productline"
+HOMEPAGE="http://gtkpod.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2 FDL-1.2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="aac clutter curl flac gstreamer mp3 vorbis webkit"
+
+# libmp4v2.so.1 from SLOT=1 is dlopened but gtkpod has switched to
+# AtomicParsley in git for the upcoming 2.1.2 release
+COMMON_DEPEND="dev-libs/gdl:3
+	>=dev-libs/glib-2.28.5
+	>=dev-libs/libxml2-2.7.7
+	>=dev-util/anjuta-2.91
+	>=media-libs/libgpod-0.7.0
+	>=media-libs/libid3tag-0.15
+	>=x11-libs/gtk+-3.0.8:3
+	aac? (
+		media-libs/faad2
+		|| ( media-libs/libmp4v2:1 <=media-libs/libmp4v2-1.9.1:0 )
+		)
+	clutter? ( media-libs/clutter-gtk:1.0 )
+	curl? ( >=net-misc/curl-7.10 )
+	flac? ( media-libs/flac )
+	gstreamer? ( >=media-libs/gst-plugins-base-0.10.25:0.10 )
+	mp3? ( media-sound/lame )
+	vorbis? (
+		media-libs/libvorbis
+		media-sound/vorbis-tools
+		)
+	webkit? ( >=net-libs/webkit-gtk-1.3:3 )"
+RDEPEND="${COMMON_DEPEND}
+	gstreamer? ( media-plugins/gst-plugins-meta:0.10 )"
+DEPEND="${COMMON_DEPEND}
+	dev-util/intltool
+	virtual/pkgconfig
+	sys-devel/flex
+	sys-devel/gettext
+	virtual/os-headers"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-segfault_with_directory_creation.patch #414753
+}
+
+src_configure() {
+	econf \
+		--disable-static \
+		$(use_enable webkit plugin-coverweb) \
+		$(use_enable clutter plugin-clarity) \
+		$(use_enable gstreamer plugin-media-player) \
+		$(use_with curl) \
+		$(use_with vorbis ogg) \
+		$(use_with flac) \
+		$(use_with aac faad)
+}
+
+src_install() {
+	emake \
+		DESTDIR="${D}" \
+		docdir=/usr/share/doc/${PF}/html \
+		figuresdir=/usr/share/doc/${PF}/html/figures \
+		install
+
+	dodoc AUTHORS ChangeLog NEWS README TODO TROUBLESHOOTING
+
+	find "${D}" -name '*.la' -exec rm -f {} +
+	rm -f "${D}"/usr/share/gtkpod/data/{AUTHORS,COPYING}
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+	gnome2_schemas_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	gnome2_schemas_update
+}