app-pda/gtkpod: Fid for buffer overflow, #434220

Package-Manager: portage-2.2.0_alpha142/cvs/Linux x86_64
Manifest-Sign-Key: 0x8009D6F070EB7916

5 files changed, 137 insertions, 16 deletions

diff --git a/app-pda/gtkpod/ChangeLog b/app-pda/gtkpod/ChangeLog
index 732437d6b084..f7e8f21ea7b4 100644
--- a/app-pda/gtkpod/ChangeLog
+++ b/app-pda/gtkpod/ChangeLog
@@ -1,6 +1,12 @@
 # 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.114 2012/09/23 12:06:55 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-pda/gtkpod/ChangeLog,v 1.115 2012/11/02 11:37:11 jlec Exp $
+
+*gtkpod-2.1.2-r1 (02 Nov 2012)
+
+  02 Nov 2012; Justin Lecher <jlec@gentoo.org> +gtkpod-2.1.2-r1.ebuild,
+  +files/gtkpod-2.1.2-bffr-overflow.patch, metadata.xml:
+  Fid for buffer overflow, #434220
 
   23 Sep 2012; Samuli Suominen <ssuominen@gentoo.org> -gtkpod-2.1.1-r3.ebuild,
   -files/gtkpod-2.1.1-segfault_with_directory_creation.patch:
diff --git a/app-pda/gtkpod/Manifest b/app-pda/gtkpod/Manifest
index 17da61ed95ab..653a039eb0d5 100644
--- a/app-pda/gtkpod/Manifest
+++ b/app-pda/gtkpod/Manifest
@@ -1,18 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
+AUX gtkpod-2.1.2-bffr-overflow.patch 820 SHA256 8ddf32cca5e705bb6a752d304c253ceaa04644a212df16ce342b311fc200310f SHA512 0a8587d31f47673952fbfca7441b1c60dfc95e5fb266faa9e7197e9ae46c41d4c7bb928d630cd8b90a5dfd090e4ae6f6eaaca27a0267fdc761501dcd7f081533 WHIRLPOOL 9c952ba7e45aa8f023f919906d46290035441ae089d6ae3f956529647998faabf9980c2cbc267fbc6f084331a6f62d89cce2a095ecc4fb428b8ed1db830b7a3f
 DIST gtkpod-2.1.2.tar.gz 3673800 SHA256 c3d054235bae80aa8563a441c902fa32528c2b00ba05a98066671fa3036dc1e6 SHA512 01b5b0c370451c717d7a04b592b2b986a692615d1624a267238268e19dd3baeab2f79604e700573fecce5e3822ee37a1d485965c648e2d7b1cb2ab3602742470 WHIRLPOOL f8b6b4304c07eb3e51b10c15288ba6813b6ea715ffa227fd0909acff5742548a49a2ecc999cabd67c0eca918dc4993339903bce0a8e0767298dd2b5eda48baf7
+EBUILD gtkpod-2.1.2-r1.ebuild 2613 SHA256 843c54f7c2110b3519813961d5eb752ba17b803c2ff7f9baaca83a578977fd02 SHA512 83a38f7eb8e68f7987e36127ee4895665aeffd44611b181f04f34340879712e1e19b08c62b813978c1ed22d636d5fb4ae2284294cd72dcf0f68ff456699b47e5 WHIRLPOOL 5bf04ab8fd0005cf631efa53035bb7c413fd6670ab145c86f5c3e1f68ba6c99be2d220f4c001eb5221bfbb959c4c4f9959657e45b9b0b41a36528d74d64f58e3
 EBUILD gtkpod-2.1.2.ebuild 2566 SHA256 117c0b6ecee6f393d4211502d4173838e2f4b2e60519a2cc235967100a961a09 SHA512 4676b0001a61fa9488ea639f70b217846ff307e7839882e4c9c36df72f0c2e09ab4c4b6a4d7c752bd7f9121011c03059938aa15c1153a623dc54d11df3c56447 WHIRLPOOL 1896d49d64d1d0dffdd655617064d998ed42a54740a76ffd6ce369cb39ce24f4be08bfa3bfcf1f915830cb59a1fd25438652aef2a68018c3b5bda53025a765ef
-MISC ChangeLog 14731 SHA256 ceef4a97b4976417d9c9c60de4fdec7f9d7df5659230e6ba0e71cda4d9fefcc1 SHA512 18be746ab5857b9f3a8a358bbf107bea87fc0aa084c8bc1944d0472493eedbe2790569a7ef546a9270a1525a6515b1ebe9c7b87fd74018d437865051b43a202a WHIRLPOOL a05db1bde834ae458af4743e211d967356e87f76158e0f702a03c27d45be029b1cf86acf1fae1c41fddf25a90e3505ae379db8522264882bfd7145845c71923f
-MISC metadata.xml 328 SHA256 0288ef4f77dee4547f748900456ff0079dece3ca0dd50e11e6d3d3d1ff9d6bf7 SHA512 5af320980dc3dc9570303c837be3758fb47d0ef3d2faa7358b68e1b9486a23d426bc4f60f323b8273f9538ca2fe3e3e29c6c4079809b413d2654856e5feaea4d WHIRLPOOL 08d7a8491935637bf7d2f510a13b8b1a1fb90700f1e5d326e6e063817652437232f5d6dc01fb29c4b7b5c5c85f4ee55d1ee27ad1b4379fb36798bdb0f59407e5
+MISC ChangeLog 14923 SHA256 6ad526dcd7efdb440835db226e2829dce9d8e39e9d69c9e298beff6371eb657d SHA512 e6878a25e868c37673d4f70791f0ef2845223da75e167bdcdc7efa86298bd4e19efdb7fe37047facad37ef7140ed69a6ec02229d5537a8b5d8b054723e66a8ba WHIRLPOOL 946308cbe81d0bb3e081a3b0539aed44c8a920d99d6af9ea4f0776f86ddf248c954549732eb347a7db4268c3d395185db000bfba17a3834c7962038daa48d75d
+MISC metadata.xml 321 SHA256 13be2558f865dce045c0f52f0931340d61cee6ed1fa412681a0c8f25999e329f SHA512 16cf83df70f3517a9cfe41eb3cd3287c503eea8d0909aa8bacdecead62dd5075733f6d5808897a96ec47a36a14c129cadf0859ef7f3467b9e06725f1d70d6dfc WHIRLPOOL e8eca08f9c70e1a94c440c912a50d067588984f79a6aa69ab5f7fc23d953c9028e94d55b30dfd57135358b0593af0a39b17801a998840c96f5e7db50e2c09177
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQXvrMAAoJEEdUh39IaPFNKR8H/j+noU/qZXmlW3dbHfp+2Hyy
-Og26l6YcAGB5A3WO1zIAeKzadYQPDmh76Nr/c85Mnbg5XDA3GnB/5Wko16w5E1aR
-Espp5vOtJa5IErlEHJ6Z4sNOUkNjtQVnPoMvGlRuyCYa0iRsQjgtfSuINRR2FLCC
-1dzeJDsfYZ1TXKlbOL1tgdd2k+RXjFIcG2Rklzxu+qwlrmGt/14Ip3jZrQsUtNVN
-fQblEh9a8WNR1Wk2CR9tQyCH35gTArR4lOFxG2JSs4um8So8AWLSejM4RWhMbDMC
-Lq57PT3ScZQD/HjmehmOJTMldVwrQ0Yg+9VsdbKC2dBn4Nwhenh5nSlBti9O3fg=
-=gxys
+iEYEAREKAAYFAlCTsG8ACgkQgAnW8HDreRbtMgCgyjy3YzpIn11nbtAFdR6/iXUN
+/IAAniVFTl70mytrb6AW2TVR+BllmqmK
+=d6hg
 -----END PGP SIGNATURE-----
diff --git a/app-pda/gtkpod/files/gtkpod-2.1.2-bffr-overflow.patch b/app-pda/gtkpod/files/gtkpod-2.1.2-bffr-overflow.patch
new file mode 100644
index 000000000000..2a3854d0ba07
--- /dev/null
+++ b/app-pda/gtkpod/files/gtkpod-2.1.2-bffr-overflow.patch
@@ -0,0 +1,16 @@
+ libs/atomic-parsley/AtomicParsley.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/libs/atomic-parsley/AtomicParsley.cpp b/libs/atomic-parsley/AtomicParsley.cpp
+index 8603885..9190df3 100644
+--- a/libs/atomic-parsley/AtomicParsley.cpp
++++ b/libs/atomic-parsley/AtomicParsley.cpp
+@@ -1887,7 +1887,7 @@ char* APar_ExtractDataAtom(int this_atom_number) {
+ 
+             }
+             else { //purl & egid would end up here too, but Apple switched it to a text string (0x00), so gets taken care above explicitly
+-                char* result = (char*) malloc(sizeof(char) * 6);
++                char* result = (char*) malloc(sizeof(char) * 6 + 1);
+                 sprintf(result, "hex 0x");
+ 
+                 for (int hexx = 1; hexx <= (int) (thisAtom->AtomicLength - atom_header_size); ++hexx) {
diff --git a/app-pda/gtkpod/gtkpod-2.1.2-r1.ebuild b/app-pda/gtkpod/gtkpod-2.1.2-r1.ebuild
new file mode 100644
index 000000000000..e9fee9d68cb2
--- /dev/null
+++ b/app-pda/gtkpod/gtkpod-2.1.2-r1.ebuild
@@ -0,0 +1,101 @@
+# 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.2-r1.ebuild,v 1.1 2012/11/02 11:37:11 jlec 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 cdr flac gstreamer mp3 vorbis webkit"
+
+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 )
+	clutter? ( media-libs/clutter-gtk:1.0 )
+	curl? ( >=net-misc/curl-7.10 )
+	cdr? (
+		>=app-cdr/brasero-3
+		media-libs/musicbrainz:3
+		)
+	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
+	sys-devel/flex
+	sys-devel/gettext
+	virtual/os-headers
+	virtual/pkgconfig"
+
+src_prepare() {
+	# Make sure SLOT="4" is not used. Everyone should move from "3" to "5" directly.
+	sed -i -e '/PKG_CONFIG/s:libmusicbrainz4:&sLoT4iSdEpReCaTeD:' configure || die
+
+	# /path/to/install: '/path/to/app-pda/gtkpod-2.1.2_beta2/image/usr/share/gtkpod/data/rhythmbox.gep’: File exists
+	sed -i -e '/^dist_profiles_DATA/s:=.*:=:' plugins/sjcd/data/Makefile.in || die
+
+	sed -i -e 's:python:python2:' scripts/sync-palm-jppy.py || die
+
+	epatch "${FILESDIR}"/${P}-bffr-overflow.patch
+}
+
+src_configure() {
+	export GST_INSPECT=true #420279
+
+	econf \
+		--disable-static \
+		$(use_enable webkit plugin-coverweb) \
+		$(use_enable clutter plugin-clarity) \
+		$(use_enable gstreamer plugin-media-player) \
+		$(use_enable cdr plugin-sjcd) \
+		$(use_with curl) \
+		$(use_with vorbis ogg) \
+		$(use_with flac) \
+		$(use_with aac mp4)
+}
+
+src_install() {
+	emake \
+		DESTDIR="${D}" \
+		docdir=/usr/share/doc/${PF}/html \
+		figuresdir=/usr/share/doc/${PF}/html/figures \
+		install
+
+	prune_libtool_files --all
+
+	dodoc AUTHORS ChangeLog NEWS README TODO TROUBLESHOOTING
+	rm -f "${ED}"/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
+}
diff --git a/app-pda/gtkpod/metadata.xml b/app-pda/gtkpod/metadata.xml
index db652b96def0..f7753995fa99 100644
--- a/app-pda/gtkpod/metadata.xml
+++ b/app-pda/gtkpod/metadata.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>pda</herd>
-  <use>
-    <flag name='clutter'>Enable clutter support for displaying coverart</flag>
-    <flag name='webkit'>Enable webkit support for finding coverart</flag>
-  </use>
+	<herd>pda</herd>
+	<use>
+		<flag name="clutter">Enable clutter support for displaying coverart</flag>
+		<flag name="webkit">Enable webkit support for finding coverart</flag>
+	</use>
 </pkgmetadata>