Patch to prevent (double free) crash wrt #392413 by "nzqr"

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

4 files changed, 86 insertions, 11 deletions

diff --git a/media-sound/shell-fm/ChangeLog b/media-sound/shell-fm/ChangeLog
index e02892781ec0..cfd8bd2438d9 100644
--- a/media-sound/shell-fm/ChangeLog
+++ b/media-sound/shell-fm/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-sound/shell-fm
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/shell-fm/ChangeLog,v 1.15 2011/05/24 21:12:43 radhermit Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/shell-fm/ChangeLog,v 1.16 2012/01/23 16:04:21 ssuominen Exp $
+
+*shell-fm-0.8-r1 (23 Jan 2012)
+
+  23 Jan 2012; Samuli Suominen <ssuominen@gentoo.org> +shell-fm-0.8-r1.ebuild,
+  +files/shell-fm-0.8-doublefree.patch:
+  Patch to prevent (double free) crash wrt #392413 by "nzqr"
 
 *shell-fm-0.8 (24 May 2011)
 
diff --git a/media-sound/shell-fm/Manifest b/media-sound/shell-fm/Manifest
index 45dfd0f556e8..321fa450146a 100644
--- a/media-sound/shell-fm/Manifest
+++ b/media-sound/shell-fm/Manifest
@@ -2,20 +2,22 @@
 Hash: SHA1
 
 AUX shell-fm-0.7-asneeded.patch 1159 RMD160 f2d43a2d86584ec38452972fff4a064a0c91b66e SHA1 eb4cb688ea6695533879542c6363230547f31ba2 SHA256 16d9ba2df34afdc2431617248fbb073f152c97c7f8b96b09c041c8cb076898b1
+AUX shell-fm-0.8-doublefree.patch 445 RMD160 ec7a5065afc26a94f4fd3e4beb1e2c63d05aeb8b SHA1 e1af2daf5efef61d2dcb3ff824ef0a1ca73dcd17 SHA256 480161710223145b1d3dbd0a791a55110f96877ba64be3831a3f242a06b15902
 DIST shell-fm-0.7.tar.bz2 41729 RMD160 f5339703525fcfbefb85b7b9863bb0702ae2328e SHA1 f5630f082e8b2bf810ffd5aa1ce5f91d5a8b9a84 SHA256 a29084322d42712b345c09107b80986d98cb456320567e04123e6cbccdfe63d3
 DIST shell-fm-0.8.tar.gz 54303 RMD160 f1d25719d5cd6ea7a8a37dd61df0f425e9ea336c SHA1 b267eb820e2c3c3eefba5e3fc6e45d366149427f SHA256 b6d5b754c6ea0285c060f4989de730101dd6a172bb075a2a04b4649be33a06a3
 EBUILD shell-fm-0.7.ebuild 1127 RMD160 7ad0d752821f997400ca0c8de11ab02a299e3ccc SHA1 e1885185892cd3d9609daecee882dc41dbf559b0 SHA256 fd0e5e450816302beb26948cce18e64902becbf608479c50c01a23373b8c7841
+EBUILD shell-fm-0.8-r1.ebuild 1031 RMD160 355dce33a884266cb274c60163817d6a71eb2a6f SHA1 593cada11ed0dd96432bbdba08465c880c209a03 SHA256 cfb37c1507c75e63c95852ca619e31c449046fdbae3be45e9eea6e8cd0063a21
 EBUILD shell-fm-0.8.ebuild 1000 RMD160 48b0e36488d71f71f801758411f4cff4eb86c60f SHA1 de2ce28cba3751ad2b37bd7f580ae378bb717091 SHA256 82ca1abd0fb78e66ca85dd19be2ffd978549b02e3412ecd10ac4ec4dbc0d758b
-MISC ChangeLog 2292 RMD160 e33359f3a256d63b21f47385485afbab0afa914f SHA1 bffd4cca4ca387410fc6490819c9fb88b359b495 SHA256 82f8a394e4355d5d7d0d3384da11e064b5db481f19a96ade86b9fa062792bac1
+MISC ChangeLog 2505 RMD160 314f103e22d1ecd7916c67f426be33c54435d4d8 SHA1 58de8f561d485445e59996171b594c6c802f1907 SHA256 ae82256996a9ee57f1f2d647f31eacd565a146c237842318e0d3220a6a1cf4ae
 MISC metadata.xml 410 RMD160 95c58ff33fd363206cf30d77766d4ccf4aa2da2a SHA1 769e852f09ecef095830cb19c6ade3ebb10565c1 SHA256 bc07ea5330fddfac0e4ca0799221b99efaa0eaddca09edc5dfdf7f672cb933e3
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBAgAGBQJN3B9RAAoJEEqz6FtPBkyjm7EIAJO4BQYXmw9qMSdqfnOfvpct
-rynNZjy/cBhCOJgvRvptXtsTBICY5gUkNQxZ4IhwCcuTYaDfIwwwGos9xhYRqBOQ
-69+GEB2wi3zbbHSxIlcP+XGwPzAPnWNprprKl1jGqjnwhmeKpe4FDLCCO1f78q+Z
-FhcN4UzAPue7VR7YmD+xZmF2ZnlqYQGNWTdOwyzTF5I1wR9WWmH3qAaHRXZ8xO6X
-Rn5XcC7cYyRK+6BljIM0juCgtoymYKCvKRj3oBEzjZCrugBSZAJGEKXqxrB4KE39
-pfsDQkhKIGyEnG6GP8bpBJlYHEH3hQl6plRqpdEC1BRZozy+Fq2bImHLaT0INs0=
-=zXCg
+iQEcBAEBAgAGBQJPHYR6AAoJEEdUh39IaPFNsaQH/jRdMG7rqoz4mjeCnjMe+Il0
+5slilTPaBn8QdJE0WK0KN3eKRKrO3/tOWlN3+FpM3MlYF2xupxJNtZav6J3DpRzk
+IzIH7XA13lu7IKcwI141+JIzs7oG2qsY8B5qrqZ/1SzUXBGi2Ww2uKMldiCR2YrY
+NKG7ZinU89iGg6frx+JhuShkT4KRUt1ezOxfXl/VxAiEtcg+g4rFwxqlfiGSW7GU
+Ff2+9mRUqNI990J9g94s4NoxWTLzoksUe6ZgrI1gyKq9YpY3cqY/rTVuYmlMUN98
++tMMsdO+1JGBE0bfkPuPyNN2sulS1fbJvpueRRN4EAfYhey30iVVuR6XGZ6+4JQ=
+=fdbi
 -----END PGP SIGNATURE-----
diff --git a/media-sound/shell-fm/files/shell-fm-0.8-doublefree.patch b/media-sound/shell-fm/files/shell-fm-0.8-doublefree.patch
new file mode 100644
index 000000000000..5054ee1ad024
--- /dev/null
+++ b/media-sound/shell-fm/files/shell-fm-0.8-doublefree.patch
@@ -0,0 +1,24 @@
+Fix double free crash: http://bugs.gentoo.org/392413
+
+--- source/sckif.c
++++ source/sckif.c
+@@ -39,6 +39,8 @@
+ 
+ #include "split.h"
+ 
++#include "ropen.h" /* fshutdown */
++
+ struct hash track;
+ 
+ static int stcpsck = -1, sunixsck = -1;
+@@ -191,9 +193,7 @@
+ 
+ 	if(disconnect) {
+ 		debug("removing client\n");
+-		shutdown(SHUT_RDWR, client_socket);
+-		close(client_socket);
+-		fclose(fd);
++		fshutdown(& fd);
+ 
+ 		remove_handle(client_socket);
+ 	}
diff --git a/media-sound/shell-fm/shell-fm-0.8-r1.ebuild b/media-sound/shell-fm/shell-fm-0.8-r1.ebuild
new file mode 100644
index 000000000000..91451cd26491
--- /dev/null
+++ b/media-sound/shell-fm/shell-fm-0.8-r1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/shell-fm/shell-fm-0.8-r1.ebuild,v 1.1 2012/01/23 16:04:21 ssuominen Exp $
+
+EAPI=4
+inherit flag-o-matic toolchain-funcs eutils
+
+DESCRIPTION="A lightweight console based player for Last.FM radio streams"
+HOMEPAGE="http://nex.scrapping.cc/shell-fm/"
+SRC_URI="https://github.com/jkramer/${PN}/tarball/v${PV} -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux"
+IUSE=""
+
+RDEPEND="media-libs/libao
+	media-libs/libmad
+	media-libs/taglib"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	sys-apps/sed"
+
+src_unpack() {
+	unpack ${A}
+	mv *-${PN}-* "${S}"
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-doublefree.patch #392413
+
+	sed -i -e 's:-Os::' source/Makefile || die
+
+	tc-export CC AR
+	use ppc && append-flags -DWORDS_BIGENDIAN=1
+}
+
+src_install() {
+	dobin source/${PN}
+	doman manual/${PN}.1
+	exeinto /usr/share/${PN}/scripts
+	doexe scripts/{*.sh,*.pl,zcontrol}
+}