fixed bug #350999; thx to idl0r@g.o

Package-Manager: portage-2.1.9.24/cvs/Linux i686

4 files changed, 46 insertions, 17 deletions

diff --git a/media-plugins/vdr-ffnetdev/ChangeLog b/media-plugins/vdr-ffnetdev/ChangeLog
index 24bfb8b84a36..ed79dff89e0c 100644
--- a/media-plugins/vdr-ffnetdev/ChangeLog
+++ b/media-plugins/vdr-ffnetdev/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-plugins/vdr-ffnetdev
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-ffnetdev/ChangeLog,v 1.14 2009/06/13 09:57:49 zzam Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-ffnetdev/ChangeLog,v 1.15 2011/01/16 22:35:03 hd_brummy Exp $
+
+  16 Jan 2011; Joerg Bornkessel <hd_brummy@gentoo.org>
+  vdr-ffnetdev-0.1.0-r1.ebuild,
+  +files/vdr-ffnetdev-0.1.0-buffer-overflow.diff:
+  fixed bug #350999; thx to idl0r@g.o
 
 *vdr-ffnetdev-0.1.0-r1 (13 Jun 2009)
 
diff --git a/media-plugins/vdr-ffnetdev/Manifest b/media-plugins/vdr-ffnetdev/Manifest
index f971c583a90b..d68d8addfcc5 100644
--- a/media-plugins/vdr-ffnetdev/Manifest
+++ b/media-plugins/vdr-ffnetdev/Manifest
@@ -4,17 +4,19 @@ Hash: SHA1
 AUX confd 878 RMD160 29fb905cfbae93ff1f1f9482f28ac143e2c2795b SHA1 894717b8696d27d9e3a1d85c06045fdcf6ba541f SHA256 3aa1783f7da29598a9ce227ce23762a48b159325c9a6565daafb1735de7d2d1d
 AUX rc-addon.sh 464 RMD160 6fdeef6fbf69731ecb957268b5e41cbe5dc5776b SHA1 c61fad949723901d83c06990e5218ba845074d0a SHA256 d19324a4d47db673c2fd5c6efdf8ecad35cacd39ef315f246b0c33dfb8d17181
 AUX vdr-ffnetdev-0.1.0-bigpatch-headers.diff 1161 RMD160 eb4e48ca418bd5e0d94662274af8d11792bf54b3 SHA1 59b171e917a382a065eb593f43572159762cd836 SHA256 e18abc0b7030472a4638f4a708e3b824d771efc05657b03cf2ed7186ea897cf5
+AUX vdr-ffnetdev-0.1.0-buffer-overflow.diff 891 RMD160 aa80c377ed8dd02381954d07ecc7d63b47cd06df SHA1 800c6d54936813042d5c1a9ccd06e524b51b2815 SHA256 44b4eabaa48287be54bd2e929c4ed09684f68e3b7efce7184c299c3e5a3dac22
 AUX vdr-ffnetdev-0.1.0-gcc4.3.patch 464 RMD160 df81f5d8de2c9f495c8f68b65b6e6395f213ff7f SHA1 7490ddffcd2c4ffb866250ae0c76f0cfec9f13b9 SHA256 017b985afb71267a169e7fd7b293a8aac52f510e4d4132be90851e50f10cd6bf
 AUX vdr-ffnetdev-0.1.0-uint64.diff 913 RMD160 d9f089cf65ec0f5d7b7545219f68c4da054506a2 SHA1 3bf0078f831406a7b44754a77806d9044dad62f0 SHA256 98f4b4a290230559c711f192ca14465740e44889906c4c73acadcee518caa920
 AUX vdr-ffnetdev-0.1.0-vdr-1.6.0.diff 1824 RMD160 8c587863e6906e35b40e9a85a4b1cde3eead5b5b SHA1 c20366575c6fe682f0e7985bb960020dcf7fbfce SHA256 f54449e0c8118969d2d958601e378418a9c5fd7c9972cc22a5b1851c40339803
 DIST vdr-ffnetdev-0.1.0.tar.bz2 51213 RMD160 7799671e7f85243abaa898bc0182c85e0befd7bb SHA1 3ae8720d0299433dfec50b1a350c7da11aeef6ab SHA256 7c0cde84118e972256dcf8b6490be6e5739fa3e9ba9374246dd5fad38fef641e
-EBUILD vdr-ffnetdev-0.1.0-r1.ebuild 969 RMD160 8166e3c167ffb48226063ce5bca62511a762cef6 SHA1 54d55c3fa12208fd61d92ae26ed1d7d765575105 SHA256 1e05f00f287bbf1ca40ffcff11e6ef94e0952cbaea7ab8879fb97797a7a23c8c
-MISC ChangeLog 2560 RMD160 2157818e5ac7a1fc53d656ff9d9cc223e53aee6e SHA1 c120f99256aca519cac21793a18cad094d482367 SHA256 e620988fa0d9845c0e350493a692c37a780c8601c72387be6b29b3b57efb6d6c
+EBUILD vdr-ffnetdev-0.1.0-r1.ebuild 937 RMD160 87d87b755bfc38748a04a2120f630b95865bacd0 SHA1 59777869d4b5f4f435b5d3a18dcd9dc402280b13 SHA256 762c397a47a2652111fe8a20c399efc72ccb0984befd75a8721d7b14e15031e9
+MISC ChangeLog 2741 RMD160 a1056d10ac97d17e7338d05b1c3c195f3bdd33e3 SHA1 74fc87c6b0d18258404c7b83ae9b5a7fc0c2c569 SHA256 d3167cb6ab8bc27bfa5d21252807aad46cab57bd3439b4475e0bc2a5b7dfc707
 MISC metadata.xml 358 RMD160 c9296bedaad321ec0ee658375280a80a318deec1 SHA1 e0ccc64724869d7a8017c8dba5677ccd5158cfa5 SHA256 facf60cf759199b7dfbfd8e517b644151b95dca7311cb424d142334811bb6c0c
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
+Version: GnuPG v1.4.5 (GNU/Linux)
+Comment: added by hd_brummy@gentoo.org
 
-iEYEARECAAYFAkozeCMACgkQt2vP6XvVdOfF7gCgwBxL+hOMztve0Gty2LM8Ugn9
-2fYAn1Xt/uAElwoupPggziqLuW+/zjwv
-=D7DQ
+iD8DBQFNM3Ksdn07HTTCgIoRAkbWAKCxeevivU6CU/7fI5BQDJ51hUQo2gCgkQC0
+1MC8/XxgyWRgn1rkSIqC1oQ=
+=4iQB
 -----END PGP SIGNATURE-----
diff --git a/media-plugins/vdr-ffnetdev/files/vdr-ffnetdev-0.1.0-buffer-overflow.diff b/media-plugins/vdr-ffnetdev/files/vdr-ffnetdev-0.1.0-buffer-overflow.diff
new file mode 100644
index 000000000000..667fa5feaa88
--- /dev/null
+++ b/media-plugins/vdr-ffnetdev/files/vdr-ffnetdev-0.1.0-buffer-overflow.diff
@@ -0,0 +1,23 @@
+<<<<<<<<<<<<<<<<<< vdr-ffnetdev-0.1.0-buffer-overflow.diff >>>>>>>>>>>>>
+fix buffer overflow
+https://bugs.gentoo.org/show_bug.cgi?id=350999
+Signed-off-by: Joerg Bornkessel <hd_brummy@gentoo.org>
+Signed-off-by: Christian Ruppert <idl0r@gentoo.org>
+
+diff -Naur vdr-ffnetdev-0.1.0.orig/osdworker.c vdr-ffnetdev-0.1.0/osdworker.c
+--- vdr-ffnetdev-0.1.0.orig/osdworker.c	2011-01-16 22:58:55.000000000 +0100
++++ vdr-ffnetdev-0.1.0/osdworker.c	2011-01-16 23:00:15.000000000 +0100
+@@ -721,9 +721,9 @@
+ 						    break;
+ 						}
+ 						
+-					 	CARD8 name[7];
+-					 	strcpy((char*)&name, "VDR-OSD");
+-					 	if (!m_OSDClient->SafeWrite(&name, 7))
++//					 	CARD8 name[7];
++//					 	strcpy((char*)&name, "VDR-OSD");
++					 	if (!m_OSDClient->SafeWrite("VDR-OSD", 7))
+ 						{   
+ 						    state = NO_CLIENT;
+ 						    break;
+<<<<<<<<<<<<<<<<<< vdr-ffnetdev-0.1.0-buffer-overflow.diff >>>>>>>>>>>>>
diff --git a/media-plugins/vdr-ffnetdev/vdr-ffnetdev-0.1.0-r1.ebuild b/media-plugins/vdr-ffnetdev/vdr-ffnetdev-0.1.0-r1.ebuild
index aef32fb95338..11a02689d5e0 100644
--- a/media-plugins/vdr-ffnetdev/vdr-ffnetdev-0.1.0-r1.ebuild
+++ b/media-plugins/vdr-ffnetdev/vdr-ffnetdev-0.1.0-r1.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-ffnetdev/vdr-ffnetdev-0.1.0-r1.ebuild,v 1.1 2009/06/13 09:57:49 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-ffnetdev/vdr-ffnetdev-0.1.0-r1.ebuild,v 1.2 2011/01/16 22:35:03 hd_brummy Exp $
+
+EAPI="2"
 
 inherit vdr-plugin eutils
 
@@ -15,11 +17,11 @@ IUSE=""
 
 S=${WORKDIR}/${P}
 
-DEPEND=">=media-video/vdr-1.3.7"
+DEPEND=">=media-video/vdr-1.6.0"
 RDEPEND="${DEPEND}"
 
-src_unpack() {
-	vdr-plugin_src_unpack unpack
+src_prepare() {
+	vdr-plugin_src_prepare
 
 	epatch "${FILESDIR}/${P}-uint64.diff"
 	epatch "${FILESDIR}/${P}-gcc4.3.patch"
@@ -28,9 +30,6 @@ src_unpack() {
 		epatch "${FILESDIR}/${P}-bigpatch-headers.diff"
 	fi
 
-	if has_version ">=media-video/vdr-1.6.0"; then
 		epatch "${FILESDIR}/${P}-vdr-1.6.0.diff"
-	fi
-
-	vdr-plugin_src_unpack all_but_unpack
+		epatch "${FILESDIR}/${P}-buffer-overflow.diff"
 }