Buffer Overflow in Processing Content-Type Headers fix, bug #69663

8 files changed, 101 insertions, 5 deletions

diff --git a/media-video/kaffeine/ChangeLog b/media-video/kaffeine/ChangeLog
index 0b8781c01545..2f47fe27af49 100644
--- a/media-video/kaffeine/ChangeLog
+++ b/media-video/kaffeine/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-video/kaffeine
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/kaffeine/ChangeLog,v 1.20 2004/10/17 10:47:33 absinthe Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/kaffeine/ChangeLog,v 1.21 2004/11/02 23:29:37 motaboy Exp $
+
+*kaffeine-0.4.3b-r1 (03 Nov 2004)
+
+  03 Nov 2004; Simone Gotti <motaboy@gentoo.org>
+  +files/kaffeine-0.4.3b-SecurityTracker-1011936.patch,
+  +files/kaffeine-0.5_rc1-SecurityTracker-1011936.patch,
+  +kaffeine-0.4.3b-r1.ebuild, +kaffeine-0.5_rc1-r1.ebuild:
+  Buffer Overflow in Processing Content-Type Headers fix, bug #69663
 
   17 Oct 2004; Dylan Carlson <absinthe@gentoo.org> kaffeine-0.5_rc1.ebuild:
   keywords ~amd64.
diff --git a/media-video/kaffeine/Manifest b/media-video/kaffeine/Manifest
index 77c7213d8776..ebb0ce13edb9 100644
--- a/media-video/kaffeine/Manifest
+++ b/media-video/kaffeine/Manifest
@@ -1,10 +1,16 @@
-MD5 2a2ad3c2aeca1748106cae7e7daeaf72 ChangeLog 2765
-MD5 65ce67f9202c4ab4b0c7d55b90cd3e74 kaffeine-0.4.2.ebuild 533
+MD5 666a5e54d0e606ef367e1a3955607c51 kaffeine-0.5_rc1-r1.ebuild 667
 MD5 471b602be69babf7d2a784e247675d60 kaffeine-0.4.3.ebuild 534
-MD5 1d3d74167521d25f916521458e3cb406 kaffeine-0.4.3b.ebuild 541
-MD5 8a3ecc0a99d1bd7af3f1eafa2e5addfc metadata.xml 181
+MD5 189122e1e4b354b7c1129c4332849d6a kaffeine-0.4.3b-r1.ebuild 635
 MD5 7937737b7a28fe03f2ae44fca59df3b2 kaffeine-0.5_rc1.ebuild 575
+MD5 25a659ece21c9976cf3b6f2b9f59e492 ChangeLog 3090
+MD5 65ce67f9202c4ab4b0c7d55b90cd3e74 kaffeine-0.4.2.ebuild 533
+MD5 8a3ecc0a99d1bd7af3f1eafa2e5addfc metadata.xml 181
+MD5 1d3d74167521d25f916521458e3cb406 kaffeine-0.4.3b.ebuild 541
 MD5 e23a375f14cbdc8be89e586c916f1c10 files/digest-kaffeine-0.4.2 68
 MD5 cc29aecd04b378be51efbbc6e9f12d4b files/digest-kaffeine-0.4.3 68
+MD5 cf9c8c2f62620f4a358eed800b577940 files/kaffeine-0.5_rc1-SecurityTracker-1011936.patch 609
+MD5 bfc18ded9ac63703bbeb950ebe235a5b files/digest-kaffeine-0.5_rc1-r1 70
 MD5 55963dfde83165e0585ba2712830f521 files/digest-kaffeine-0.4.3b 69
+MD5 55963dfde83165e0585ba2712830f521 files/digest-kaffeine-0.4.3b-r1 69
+MD5 9e27f564404f819353430570620b88a3 files/kaffeine-0.4.3b-SecurityTracker-1011936.patch 583
 MD5 bfc18ded9ac63703bbeb950ebe235a5b files/digest-kaffeine-0.5_rc1 70
diff --git a/media-video/kaffeine/files/digest-kaffeine-0.4.3b-r1 b/media-video/kaffeine/files/digest-kaffeine-0.4.3b-r1
new file mode 100644
index 000000000000..58a734152087
--- /dev/null
+++ b/media-video/kaffeine/files/digest-kaffeine-0.4.3b-r1
@@ -0,0 +1 @@
+MD5 a1bbcbf5dccffc81cb168472d9e87ecd kaffeine-0.4.3b.tar.bz2 1554547
diff --git a/media-video/kaffeine/files/digest-kaffeine-0.5_rc1-r1 b/media-video/kaffeine/files/digest-kaffeine-0.5_rc1-r1
new file mode 100644
index 000000000000..dbada7f96328
--- /dev/null
+++ b/media-video/kaffeine/files/digest-kaffeine-0.5_rc1-r1
@@ -0,0 +1 @@
+MD5 931962417968b5d10c14dbd02afeb22d kaffeine-0.5-rc1.tar.bz2 1199887
diff --git a/media-video/kaffeine/files/kaffeine-0.4.3b-SecurityTracker-1011936.patch b/media-video/kaffeine/files/kaffeine-0.4.3b-SecurityTracker-1011936.patch
new file mode 100644
index 000000000000..792e159b3530
--- /dev/null
+++ b/media-video/kaffeine/files/kaffeine-0.4.3b-SecurityTracker-1011936.patch
@@ -0,0 +1,15 @@
+--- kaffeine/http.c.orig	2004-11-02 23:55:11.735826752 +0100
++++ kaffeine/http.c	2004-11-02 23:55:14.000000000 +0100
+@@ -521,10 +521,10 @@
+ 	    this->contentlength = contentlength;
+ 	  }
+         }
+-        if (sscanf(this->buf, "Content-Type: %s", mime_type) == 1) {
++        /*if (sscanf(this->buf, "Content-Type: %s", mime_type) == 1) {
+ 	  printf ("http: content type = '%s'\n", mime_type);
+ 	  strcpy(this->mime_type, mime_type);
+-	}	
++	}*/	
+ 	if (!strncasecmp(this->buf, "Location: ", 10)) {
+       	  printf ("http: Location redirection not implemented\n");
+ 	  free (this);
diff --git a/media-video/kaffeine/files/kaffeine-0.5_rc1-SecurityTracker-1011936.patch b/media-video/kaffeine/files/kaffeine-0.5_rc1-SecurityTracker-1011936.patch
new file mode 100644
index 000000000000..9ffc5bc86924
--- /dev/null
+++ b/media-video/kaffeine/files/kaffeine-0.5_rc1-SecurityTracker-1011936.patch
@@ -0,0 +1,15 @@
+--- kaffeine/player-parts/http.c.orig	2004-11-03 00:14:18.004567416 +0100
++++ kaffeine/player-parts/http.c	2004-11-03 00:15:08.342914824 +0100
+@@ -521,10 +521,10 @@
+ 	    this->contentlength = contentlength;
+ 	  }
+         }
+-        if (sscanf(this->buf, "Content-Type: %s", mime_type) == 1) {
++        /*if (sscanf(this->buf, "Content-Type: %s", mime_type) == 1) {
+ 	  printf ("http: content type = '%s'\n", mime_type);
+ 	  strcpy(this->mime_type, mime_type);
+-	}	
++	}*/	
+ 	if (!strncasecmp(this->buf, "Location: ", 10)) {
+       	  printf ("http: Location redirection not implemented\n");
+ 	  free (this);
diff --git a/media-video/kaffeine/kaffeine-0.4.3b-r1.ebuild b/media-video/kaffeine/kaffeine-0.4.3b-r1.ebuild
new file mode 100644
index 000000000000..ea4157b03a49
--- /dev/null
+++ b/media-video/kaffeine/kaffeine-0.4.3b-r1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/kaffeine/kaffeine-0.4.3b-r1.ebuild,v 1.1 2004/11/02 23:29:37 motaboy Exp $
+
+inherit kde
+
+DESCRIPTION="The Kaffeine media player for KDE3 based on xine-lib."
+HOMEPAGE="http://kaffeine.sourceforge.net/"
+SRC_URI="mirror://sourceforge/kaffeine/${P}.tar.bz2"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="x86 ~ppc ~sparc ~amd64"
+IUSE=""
+
+DEPEND=">=media-libs/xine-lib-1_rc4
+	sys-devel/gettext"
+need-kde 3.1
+
+src_unpack() {
+	kde_src_unpack
+
+	epatch ${FILESDIR}/${P}-SecurityTracker-1011936.patch
+}
\ No newline at end of file
diff --git a/media-video/kaffeine/kaffeine-0.5_rc1-r1.ebuild b/media-video/kaffeine/kaffeine-0.5_rc1-r1.ebuild
new file mode 100644
index 000000000000..9c54e4b81a13
--- /dev/null
+++ b/media-video/kaffeine/kaffeine-0.5_rc1-r1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/kaffeine/kaffeine-0.5_rc1-r1.ebuild,v 1.1 2004/11/02 23:29:37 motaboy Exp $
+
+inherit kde
+
+DESCRIPTION="The Kaffeine media player for KDE3 based on xine-lib."
+HOMEPAGE="http://kaffeine.sourceforge.net/"
+SRC_URI="mirror://sourceforge/kaffeine/${P/_/-}.tar.bz2"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~x86 ~ppc ~sparc ~amd64"
+IUSE=""
+
+DEPEND=">=media-libs/xine-lib-1_rc4
+	sys-devel/gettext"
+need-kde 3.2
+
+S="${WORKDIR}/${P/_/-}"
+
+src_unpack() {
+	kde_src_unpack
+
+	epatch ${FILESDIR}/${P}-SecurityTracker-1011936.patch
+}