Security bump w/ patch from bug 238445

Package-Manager: portage-2.2_rc8/cvs/Linux 2.6.25.8 i686

4 files changed, 77 insertions, 2 deletions

diff --git a/media-libs/faad2/ChangeLog b/media-libs/faad2/ChangeLog
index 5bd08e34acae..2669a6df27f6 100644
--- a/media-libs/faad2/ChangeLog
+++ b/media-libs/faad2/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-libs/faad2
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/faad2/ChangeLog,v 1.105 2008/07/16 15:20:05 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/faad2/ChangeLog,v 1.106 2008/09/23 12:37:28 loki_val Exp $
+
+*faad2-2.6.1-r2 (23 Sep 2008)
+
+  23 Sep 2008; Peter Alfredsen <loki_val@gentoo.org>
+  +files/faad2-2.6.1-main-overflow.patch, +faad2-2.6.1-r2.ebuild:
+  Security bump w/ patch from bug 238445
 
   16 Jul 2008; Jeroen Roovers <jer@gentoo.org> faad2-2.6.1-r1.ebuild:
   Stable for HPPA (bug #228647).
diff --git a/media-libs/faad2/Manifest b/media-libs/faad2/Manifest
index 084e9e75bc49..c8a23c0d2973 100644
--- a/media-libs/faad2/Manifest
+++ b/media-libs/faad2/Manifest
@@ -2,10 +2,12 @@ AUX faad2-2.6.1-abi_has_changed.patch 496 RMD160 a5f11c7934f0fd0ebf4c4b361cf78fa
 AUX faad2-2.6.1-broken-pipe.patch 799 RMD160 96f3be97dee17a36a9f2937927b0ad773ee4c9a9 SHA1 0b03728f40d00e552f738900e2f6215177af5417 SHA256 1eff3508caa528c45d99c4f146a0b81ab284f8554d39d24941ada54356da82a8
 AUX faad2-2.6.1-implicitdeclar.patch 335 RMD160 3f2d995eca4bb6d83c03fab62d293abc7afe4458 SHA1 d4ab5d38c9b75ed6417529c4d1a7ca204293c224 SHA256 e8eb2f5369ee359ecf54d3dae605283aa09688cd63270c9c74dcf4ea873abed5
 AUX faad2-2.6.1-libtool22.patch 324 RMD160 e7fa8d2592f7ba65b94a1f1f2d8b12a3ddc901c2 SHA1 ca4ee04aa1757b8f9deeef52b5bf35dc823da844 SHA256 9e9cf179b379fc028c60fd466b3b61e9b1f9c2b4016cbf6a93b15770c2ee1dfd
+AUX faad2-2.6.1-main-overflow.patch 609 RMD160 cd9fce4b343015321ab6c90f673d47f43ffa6acf SHA1 3c1172e62198db30f0d7fbabff41b0b942947dee SHA256 9c309f8b6809c05da5a52b51e9bb391fa22c6e2ef6b9d9755579e15412eb9994
 DIST faad2-2.0.tar.gz 766660 RMD160 e1e4d7c96cbc3db2b9e67385062ccf5decb61f90 SHA1 fc9f8d0812a9f46bbd851880045131e0e4ab08b8 SHA256 a62a4622862252e53e0dd58c3b0307a138f5100304e07bf50c8aee31a68ab861
 DIST faad2-2.6.1.tar.gz 839410 RMD160 ad559933dad6a65576a9947819190f04cb3b1c16 SHA1 b4ad33d3c4dfa6dbf3011a3da34c631926cabfad SHA256 8ad2c2e0c09b787a943e2ef831c1c84534e3a8726cc1eb1abc4da9eb3038285c
 DIST faad2-patches-5.tar.bz2 8667 RMD160 daf1faab7af84cd6991ee34cfc0492faf07055fa SHA1 1470d2ee2ea5acf667db6b01c259b94e746f9dba SHA256 1aec9612878dae292b8152f79bcf8fedfefbd7aadaac89f4e6c00f942d4fc1f4
 EBUILD faad2-2.0-r13.ebuild 1525 RMD160 89a0d5781074f44f19c2d9f22c2365aaa981df2c SHA1 d83205056c1dddbeb706e54ff724436544f68a51 SHA256 94210dbbb4abfbaccddfa8cdc0a3efcd54e49c9c3942b6f1ec56c5a5de65624b
 EBUILD faad2-2.6.1-r1.ebuild 1338 RMD160 06ac66a7d1aa3803cc6f799ec5d9fd8cf8d09d42 SHA1 89e36021432c61b87a71a8f7f639130f7e0662c6 SHA256 d66136ca019cf531b0133f0aa94e2676c7299624a6b92fdf7d861087cf6f0ccf
-MISC ChangeLog 15146 RMD160 20ba0b39e3028e126a21505f90d878f4bb163799 SHA1 eb19466d1fe8ba11cd8506508ba116c8429c9fd6 SHA256 513899cde0993d88f0b9d9f66f220e33b91d4f53f8c6ede980d30fc7b3e263de
+EBUILD faad2-2.6.1-r2.ebuild 1398 RMD160 7eeae70f5f01cdf1a0b0b41d2bddbdfbd6931ad3 SHA1 7b7ae0cdb6400bbd790eb9d771853deed40e99a4 SHA256 6156e315bce0dcf8f703c616faf0075793b9ae9547e576377ad7f06354badf4c
+MISC ChangeLog 15343 RMD160 fadebbec11af6457c60501401f220e02c8350ca7 SHA1 f8d80842d4264c78d8c26a6a24cc3e73c7456411 SHA256 1cf9065b57b08bf4b82ef9acc9e2e14b852a7412647d7012172e2261eef5f2d3
 MISC metadata.xml 516 RMD160 650ad23c44a2e9ab7d0f259a5db14f68e8a24a75 SHA1 6f1fb72a6e773228e91bfe847dcbb563231c12ed SHA256 10ed6a6a6758a7339010881dbb065938792195b92b6a75d4374ca199da24e1fd
diff --git a/media-libs/faad2/faad2-2.6.1-r2.ebuild b/media-libs/faad2/faad2-2.6.1-r2.ebuild
new file mode 100644
index 000000000000..c0c5ffdb7709
--- /dev/null
+++ b/media-libs/faad2/faad2-2.6.1-r2.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/faad2/faad2-2.6.1-r2.ebuild,v 1.1 2008/09/23 12:37:28 loki_val Exp $
+
+inherit eutils autotools
+
+DESCRIPTION="AAC audio decoding library"
+HOMEPAGE="http://www.audiocoding.com/"
+SRC_URI="mirror://sourceforge/faac/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="drm"
+
+RDEPEND=""
+DEPEND=""
+
+S="${WORKDIR}/${PN}"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}/${P}-abi_has_changed.patch"
+	epatch "${FILESDIR}/${P}-libtool22.patch"
+	epatch "${FILESDIR}/${P}-broken-pipe.patch"
+	epatch "${FILESDIR}/${P}-implicitdeclar.patch"
+	epatch "${FILESDIR}/${P}-main-overflow.patch"
+	eautoreconf
+}
+
+src_compile() {
+	econf \
+		$(use_with drm)\
+		--without-xmms \
+		|| die "econf failed"
+
+	emake || die
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+
+	dodoc AUTHORS ChangeLog NEWS README README.linux TODO
+}
+
+pkg_postinst() {
+	elog "Please note that from ${PN}-2.0* to ${P}, ABI has changed"
+	elog "So if you are upgrading from those versions, you need to rebuild"
+	elog "all the packages linked against ${PN}."
+	elog "You can use revdep-rebuild from app-portage/gentoolkit if you are"
+	elog "using portage or reconcilio if you are using paludis, or ..."
+}
diff --git a/media-libs/faad2/files/faad2-2.6.1-main-overflow.patch b/media-libs/faad2/files/faad2-2.6.1-main-overflow.patch
new file mode 100644
index 000000000000..4111bae7f6b1
--- /dev/null
+++ b/media-libs/faad2/files/faad2-2.6.1-main-overflow.patch
@@ -0,0 +1,13 @@
+Index: faad2/frontend/main.c
+===================================================================
+--- faad2.orig/frontend/main.c
++++ faad2/frontend/main.c
+@@ -916,6 +916,8 @@ int decodeMP4file(char *mp4file, char *s
+                 sample_count = frameInfo.samples;
+             } else {
+                 sample_count = (unsigned int)(dur * frameInfo.channels);
++                if (sample_count > frameInfo.samples)
++                    sample_count = frameInfo.samples;
+ 
+                 if (!useAacLength && !initial && (sampleId < numSamples/2) && (sample_count != frameInfo.samples))
+                 {