Updated to newer snapshot that should fix a segfault, Bug #211168.

(Portage version: 2.1.5)

3 files changed, 81 insertions, 1 deletions

diff --git a/media-tv/dvbstream/ChangeLog b/media-tv/dvbstream/ChangeLog
index 1a258b004bc8..48f974388b04 100644
--- a/media-tv/dvbstream/ChangeLog
+++ b/media-tv/dvbstream/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-tv/dvbstream
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/dvbstream/ChangeLog,v 1.8 2008/05/16 18:01:16 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/dvbstream/ChangeLog,v 1.9 2008/05/16 20:30:33 zzam Exp $
+
+*dvbstream-0.7_pre20080516 (16 May 2008)
+
+  16 May 2008; Matthias Schwarzott <zzam@gentoo.org>
+  +files/dvbstream-0.7_pre20080516-update.diff,
+  +dvbstream-0.7_pre20080516.ebuild:
+  Updated to newer snapshot that should fix a segfault, Bug #211168.
 
 *dvbstream-0.7_pre20080302-r1 (16 May 2008)
 
diff --git a/media-tv/dvbstream/dvbstream-0.7_pre20080516.ebuild b/media-tv/dvbstream/dvbstream-0.7_pre20080516.ebuild
new file mode 100644
index 000000000000..184795566280
--- /dev/null
+++ b/media-tv/dvbstream/dvbstream-0.7_pre20080516.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-tv/dvbstream/dvbstream-0.7_pre20080516.ebuild,v 1.1 2008/05/16 20:30:33 zzam Exp $
+
+inherit eutils
+
+IUSE=""
+
+DESCRIPTION="simple command line tools for DVB cards. Includes a RTP multicast stream server"
+HOMEPAGE="http://sourceforge.net/projects/dvbtools"
+
+#SRC_URI="mirror://sourceforge/dvbtools/${P}.tar.gz"
+#MY_P=${PN}-snapshot-${PV##*_pre}
+MY_P=${PN}-snapshot-20080302
+SRC_URI="mirror://gentoo/${MY_P}.tar.bz2"
+
+S="${WORKDIR}/${PN}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86"
+
+RDEPEND="dev-lang/perl"
+DEPEND="media-tv/linuxtv-dvb-headers"
+
+src_unpack() {
+	unpack ${A}
+
+	cd "${S}"
+	epatch "${FILESDIR}/${P}-update.diff"
+	epatch "${FILESDIR}/${PN}-0.7_pre20080302-telnet-port-switch.diff"
+
+	cd "${S}"
+	sed -i Makefile \
+		-e 's:$(CFLAGS):$(CFLAGS) $(CPPFLAGS):' \
+		-e '/CFLAGS.*=.*-g -Wall -O2/s:-g -Wall -O2::' \
+		-e '/CFLAGS.*=/s:CFLAGS:CPPFLAGS:' \
+		-e 's:-I \.\./DVB/include:-I /usr/include:'
+
+	cp TELNET/svdrpsend.pl dvbstream-send.pl
+	cp TELNET/README README.telnet
+
+	sed -e 's:\./svdrpsend.pl:dvbstream-send.pl:' \
+		-i TELNET/*.sh
+
+	sed -e 's:^DUMPRTP=.*$:DUMPRTP=dumprtp:' \
+		-e 's:^TS2ES=.*$:TS2ES=ts2es:' \
+		-i *.sh
+}
+
+src_install() {
+	dobin dvbstream dumprtp rtpfeed ts_filter dvbstream-send.pl
+
+	dodoc README*
+
+	insinto /usr/share/doc/${PF}/tune
+	doins TELNET/*.sh
+
+	insinto /usr/share/doc/${PF}/multicast
+	doins *.sh
+}
diff --git a/media-tv/dvbstream/files/dvbstream-0.7_pre20080516-update.diff b/media-tv/dvbstream/files/dvbstream-0.7_pre20080516-update.diff
new file mode 100644
index 000000000000..ed670e465376
--- /dev/null
+++ b/media-tv/dvbstream/files/dvbstream-0.7_pre20080516-update.diff
@@ -0,0 +1,12 @@
+diff -ru dvbstream-20080302/dvbstream.c dvbstream/dvbstream.c
+--- dvbstream-20080302/dvbstream.c	2007-09-14 23:02:39.000000000 +0200
++++ dvbstream/dvbstream.c	2008-03-24 19:28:16.000000000 +0100
+@@ -817,6 +817,8 @@
+     return 0;
+   else if(af == 3)
+     l += buf[4] + 1;
++  if(l >= TS_SIZE - 4)
++    return 0;
+ 
+   if(pid == 0)
+   {