Added a patch to fix an invalid free thanks to Mark Aikens <marka@desert.cx>. Fixes Bug #91618.

(Portage version: 2.0.54)

5 files changed, 93 insertions, 21 deletions

diff --git a/media-sound/soundtracker/ChangeLog b/media-sound/soundtracker/ChangeLog
index cc3c0f2e8caf..a8a2ce342089 100644
--- a/media-sound/soundtracker/ChangeLog
+++ b/media-sound/soundtracker/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-sound/soundtracker
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/soundtracker/ChangeLog,v 1.18 2006/02/16 08:58:40 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/soundtracker/ChangeLog,v 1.19 2006/04/02 17:56:54 tcort Exp $
+
+*soundtracker-0.6.7-r1 (02 Apr 2006)
+
+  02 Apr 2006; Thomas Cort <tcort@gentoo.org>
+  +files/soundtracker-0.6.7-invalid-free.patch,
+  +soundtracker-0.6.7-r1.ebuild:
+  Added a patch to fix an invalid free thanks to Mark Aikens
+  <marka@desert.cx>. Fixes Bug #91618.
 
   16 Feb 2006; Diego Pettenò <flameeyes@gentoo.org>
   -soundtracker-0.6.6.ebuild, soundtracker-0.6.7.ebuild:
diff --git a/media-sound/soundtracker/Manifest b/media-sound/soundtracker/Manifest
index fbc9c74ae5fd..e1847fa50863 100644
--- a/media-sound/soundtracker/Manifest
+++ b/media-sound/soundtracker/Manifest
@@ -1,25 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 2304c5fbf00b22c8251571efa8d668e0 ChangeLog 2911
-RMD160 2fa409613d044094c4957ca0427c0f3e489e8ac9 ChangeLog 2911
-SHA256 c4fd65e3076f778b5514059bd1c0c239386e833ff2d570e6b5c6efc62a61788b ChangeLog 2911
 MD5 5cbb33544d36f65f595aa8b229e9b515 files/digest-soundtracker-0.6.7 70
-RMD160 abf1cd65f2dabd3e3e3470f9bde26fc2b3f50b42 files/digest-soundtracker-0.6.7 70
-SHA256 a61f395cb7a7246f7ccf5edbb38370bacdc5288ee4f3e441e7458d3bddc5abae files/digest-soundtracker-0.6.7 70
+MD5 5cbb33544d36f65f595aa8b229e9b515 files/digest-soundtracker-0.6.7-r1 70
 MD5 369a16c17d2850a6ed6d6fee6c9f72fc files/soundtracker-0.6.7-alsa1.patch 951
-RMD160 267a1e993051db9cacd8e5a6138efcbd3e11496b files/soundtracker-0.6.7-alsa1.patch 951
-SHA256 65383f3a2283b89270431349ae58ce9e61a8472079c4b4f8b9a649a9fa4f1d8e files/soundtracker-0.6.7-alsa1.patch 951
+MD5 f7a9d1e0f686f846d8009aa3d06cde89 files/soundtracker-0.6.7-invalid-free.patch 539
 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
-RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e metadata.xml 158
-SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b metadata.xml 158
+MD5 79e45b4eb83a985b4e83b724023d2078 soundtracker-0.6.7-r1.ebuild 1753
 MD5 414dab02bbcd9dabb51866538731101f soundtracker-0.6.7.ebuild 1706
-RMD160 d6d7074b9da48e8435ff57f1cfef9897910529cd soundtracker-0.6.7.ebuild 1706
-SHA256 177dd063f5fa238c88035887fa85e9da9bf27f3bed2a68ac04f2c2616f20c57d soundtracker-0.6.7.ebuild 1706
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.1 (GNU/Linux)
-
-iD8DBQFD9D63AiZjviIA2XgRAvgVAJ9DSNHJtXuDqIW6ttjKq0wc51505gCeIpxg
-HgtcpgWUOcJKl842sr3zdzg=
-=Yg9r
------END PGP SIGNATURE-----
diff --git a/media-sound/soundtracker/files/digest-soundtracker-0.6.7-r1 b/media-sound/soundtracker/files/digest-soundtracker-0.6.7-r1
new file mode 100644
index 000000000000..f315c0a2912d
--- /dev/null
+++ b/media-sound/soundtracker/files/digest-soundtracker-0.6.7-r1
@@ -0,0 +1 @@
+MD5 9a5685e0a79fb10066d29baed652d324 soundtracker-0.6.7.tar.gz 875235
diff --git a/media-sound/soundtracker/files/soundtracker-0.6.7-invalid-free.patch b/media-sound/soundtracker/files/soundtracker-0.6.7-invalid-free.patch
new file mode 100644
index 000000000000..3b120203c43b
--- /dev/null
+++ b/media-sound/soundtracker/files/soundtracker-0.6.7-invalid-free.patch
@@ -0,0 +1,11 @@
+diff -ruN -X /home/marka/diff-ignore.txt soundtracker-0.6.7.orig/app/midi-09x.c soundtracker-0.6.7/app/midi-09x.c
+--- soundtracker-0.6.7.orig/app/midi-09x.c	2003-05-17 07:33:13.000000000 -0400
++++ soundtracker-0.6.7/app/midi-09x.c	2005-09-04 10:49:38.000000000 -0400
+@@ -307,7 +307,6 @@
+ 
+       rc = snd_seq_subscribe_port( midi_handle, port_sub);
+       if (rc < 0) {
+-	snd_seq_port_subscribe_free(port_sub);
+ 	close_handle( midi_handle);
+ 	midi_handle = NULL;
+ 	g_warning( "error subscribing sequencer port (%s)\n",  snd_strerror(rc));
diff --git a/media-sound/soundtracker/soundtracker-0.6.7-r1.ebuild b/media-sound/soundtracker/soundtracker-0.6.7-r1.ebuild
new file mode 100644
index 000000000000..77008531e63e
--- /dev/null
+++ b/media-sound/soundtracker/soundtracker-0.6.7-r1.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/soundtracker/soundtracker-0.6.7-r1.ebuild,v 1.1 2006/04/02 17:56:54 tcort Exp $
+
+IUSE="nls esd gnome oss alsa jack"
+
+inherit eutils flag-o-matic
+
+S=${WORKDIR}/${P/_/-}
+
+DESCRIPTION="SoundTracker is a music tracking tool for UNIX/X11 (MOD tracker)"
+SRC_URI="http://www.soundtracker.org/dl/v0.6/${P/_/-}.tar.gz"
+HOMEPAGE="http://www.soundtracker.org"
+
+RDEPEND="sys-libs/zlib
+	=x11-libs/gtk+-1.2*
+	>=media-libs/audiofile-0.2.1
+	media-libs/libsndfile
+	alsa? ( media-libs/alsa-lib )
+	esd? ( media-sound/esound )
+	gnome? ( >=gnome-base/gnome-libs-1.4.1.7 )
+	jack? ( media-sound/jack-audio-connection-kit )
+	nls? ( virtual/libintl )"
+
+DEPEND="${RDEPEND}
+	nls? ( sys-devel/gettext )
+	dev-util/pkgconfig
+	app-arch/bzip2
+	app-arch/gzip
+	app-arch/unzip"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+
+src_unpack() {
+	unpack ${A}
+	epatch ${FILESDIR}/${P}-alsa1.patch
+	epatch ${FILESDIR}/${P}-invalid-free.patch
+}
+
+src_compile() {
+	replace-flags "-O3" "-O2"
+
+	local myconf
+
+	use oss || myconf="--disable-oss"
+	use esd || myconf="${myconf} --disable-esd"
+	use nls || myconf="${myconf} --disable-nls"
+	use alsa || myconf="${myconf} --disable-alsa"
+	use gnome || myconf="${myconf} --disable-gnome"
+	use x86 || myconf="${myconf} --disable-asm"
+
+	econf ${myconf} || die "configure failed"
+	emake || die "make failed"
+}
+
+src_install () {
+	einstall || die "make install failed"
+	#borks make DESTDIR=${D} install || die "make install failed"
+
+	# strip suid from binary
+	chmod -s ${D}/usr/bin/soundtracker
+
+	# documentation
+	dodoc AUTHORS ChangeLog FAQ NEWS README TODO
+	dodoc doc/*.txt
+	dohtml -r doc
+}