From: Chris White <chriswhite@gentoo.org>
Date: Sat, 6 Nov 2004 15:43:13 +0000 (+0000)
Subject: Took care of bug #70055.
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=ff2b3d940ca0fd7e16efaf083d3a58ca37aa3089;p=gentoo.git

Took care of bug #70055.
---

diff --git a/media-video/gxine/ChangeLog b/media-video/gxine/ChangeLog
index bc68a4e7fefd..34ea062fc749 100644
--- a/media-video/gxine/ChangeLog
+++ b/media-video/gxine/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-video/gxine
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/gxine/ChangeLog,v 1.21 2004/10/23 05:13:03 chriswhite Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/gxine/ChangeLog,v 1.22 2004/11/06 15:43:13 chriswhite Exp $
+
+*gxine-0.3.3-r1 (07 Nov 2004)
+
+  07 Nov 2004; Chris White <chriswhite@gentoo.org>
+  +files/gxine-0.3.3-http-overflow.patch, +gxine-0.3.3-r1.ebuild:
+  Took care of gxine ebuild for Bug #70055.
 
   23 Oct 2004; Chris White <chriswhite@gentoo.org>
   +files/gxine-0.3.3-Makefile.in.patch, gxine-0.3.3.ebuild:
diff --git a/media-video/gxine/Manifest b/media-video/gxine/Manifest
index ab71dcf348ef..8335f689dcaf 100644
--- a/media-video/gxine/Manifest
+++ b/media-video/gxine/Manifest
@@ -1,5 +1,8 @@
-MD5 c8e1b33d736892c8cf6693958ef359ef ChangeLog 2678
+MD5 705c529fbc92f2ae1bcd153a66792110 ChangeLog 2871
 MD5 c74cccc4b8ed6fc8eab451c23a1e97b9 gxine-0.3.3.ebuild 1232
 MD5 31018765c8c65a239dba78a98c405543 metadata.xml 224
+MD5 810ae141ce2a5ea9f65b93899edb5b54 gxine-0.3.3-r1.ebuild 1328
 MD5 a0134d60cfc89d88f7f76826e3728379 files/digest-gxine-0.3.3 64
 MD5 b18643e0d818679a729863e11852b1ac files/gxine-0.3.3-Makefile.in.patch 360
+MD5 2a140bbbc46a7d9e1117771638ad8d60 files/gxine-0.3.3-http-overflow.patch 484
+MD5 a0134d60cfc89d88f7f76826e3728379 files/digest-gxine-0.3.3-r1 64
diff --git a/media-video/gxine/files/digest-gxine-0.3.3-r1 b/media-video/gxine/files/digest-gxine-0.3.3-r1
new file mode 100644
index 000000000000..6a3e9fa9bf88
--- /dev/null
+++ b/media-video/gxine/files/digest-gxine-0.3.3-r1
@@ -0,0 +1 @@
+MD5 d54af2f901065555348a77fa3b61581e gxine-0.3.3.tar.gz 1038778
diff --git a/media-video/gxine/files/gxine-0.3.3-http-overflow.patch b/media-video/gxine/files/gxine-0.3.3-http-overflow.patch
new file mode 100644
index 000000000000..65b8e5e92cb4
--- /dev/null
+++ b/media-video/gxine/files/gxine-0.3.3-http-overflow.patch
@@ -0,0 +1,20 @@
+--- src/http.c_old	2004-11-07 00:27:19.271298616 +0900
++++ src/http.c	2004-11-07 00:28:46.266073400 +0900
+@@ -226,7 +226,7 @@
+     
+     if (filename != NULL)
+       *filename = slash + 1;
+-  } else
++  } else if (filename != NULL)
+     *filename = urlbuf + strlen(urlbuf);
+   
+   if (portcolon != NULL)
+@@ -449,7 +449,7 @@
+       }
+     }
+ 
+-    if (this->buf[len] == '\012') {
++    if (this->buf[len] == '\012' || len >= (BUFSIZE -2)) {
+ 
+       this->buf[len] = '\0';
+       len--;
diff --git a/media-video/gxine/gxine-0.3.3-r1.ebuild b/media-video/gxine/gxine-0.3.3-r1.ebuild
new file mode 100644
index 000000000000..5131c2ace112
--- /dev/null
+++ b/media-video/gxine/gxine-0.3.3-r1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/gxine/gxine-0.3.3-r1.ebuild,v 1.1 2004/11/06 15:43:13 chriswhite Exp $
+
+inherit eutils nsplugins
+
+DESCRIPTION="GTK+ Front-End for libxine"
+HOMEPAGE="http://xine.sourceforge.net/"
+LICENSE="GPL-2"
+
+DEPEND="media-libs/libpng
+	>=media-libs/xine-lib-1_beta10
+	>=x11-libs/gtk+-2.0.0
+	lirc? ( app-misc/lirc )
+	X? ( virtual/x11 )"
+RDEPEND="nls? ( sys-devel/gettext )"
+
+IUSE="X nls lirc"
+
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~sparc ~amd64 ~ppc64"
+
+SRC_URI="mirror://sourceforge/xine/${P}.tar.gz"
+
+src_unpack() {
+	unpack ${A}
+
+	cd ${S}
+
+	#fixes bug #65303 with missing X11 libs
+	epatch ${FILESDIR}/${P}-Makefile.in.patch
+
+	#fixes bug http overflow security bug #70055
+	epatch ${FILESDIR}/${P}-http-overflow.patch
+}
+
+src_compile() {
+
+	# Most of these are not working currently, but are here for completeness
+	local myconf
+	use X	   || myconf="${myconf} --disable-x11 --disable-xv"
+
+	myconf="${myconf} $(use_enable nls)"
+
+	econf ${myconf} || die
+	emake || die
+}
+
+src_install() {
+
+	make DESTDIR=${D} \
+		docdir=/usr/share/doc/${PF} \
+		docsdir=/usr/share/doc/${PF} \
+		install || die
+
+	dodoc AUTHORS COPYING ChangeLog INSTALL NEWS README
+
+	inst_plugin /usr/$(get_libdir)/gxine/gxineplugin.so
+}