compile fix gcc-4.6; message overran fixed bug #363721

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

5 files changed, 68 insertions, 19 deletions

diff --git a/media-plugins/vdr-vompserver/ChangeLog b/media-plugins/vdr-vompserver/ChangeLog
index 1a6ebb568842..7c89eb13e5f0 100644
--- a/media-plugins/vdr-vompserver/ChangeLog
+++ b/media-plugins/vdr-vompserver/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-plugins/vdr-vompserver
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-vompserver/ChangeLog,v 1.15 2010/12/01 22:52:56 hd_brummy Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-vompserver/ChangeLog,v 1.16 2012/03/31 10:18:22 hd_brummy Exp $
+
+*vdr-vompserver-0.3.1-r1 (31 Mar 2012)
+
+  31 Mar 2012; Joerg Bornkessel <hd_brummy@gentoo.org>
+  -vdr-vompserver-0.3.0.ebuild, vdr-vompserver-0.3.1.ebuild,
+  +vdr-vompserver-0.3.1-r1.ebuild, +files/rrprocstart.patch:
+  compile fix gcc-4.6; message overran fixed bug #363721
 
   01 Dec 2010; Joerg Bornkessel <hd_brummy@gentoo.org>
   vdr-vompserver-0.3.0.ebuild:
diff --git a/media-plugins/vdr-vompserver/Manifest b/media-plugins/vdr-vompserver/Manifest
index 867190ca96df..e55ca939ec6f 100644
--- a/media-plugins/vdr-vompserver/Manifest
+++ b/media-plugins/vdr-vompserver/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX rrprocstart.patch 1420 RMD160 8fc79f576d09d7ea2692dbf39e610d090b96988e SHA1 36183257cc425055f5582add70ede9985eb3d268 SHA256 ba40db76e4d738634435560f0bce1a8d6415c5f5aaf1591624fbff85040411a9
 AUX vdr-vompserver-0.2.6-gentoo.diff 597 RMD160 74a61259c067c32a7bb6d8e443d61e9ae62f854c SHA1 e4816447a0480a521be772ccaa9ed4d85a40f39e SHA256 ccb700b83708c6452845bc408e245ead9d1cbf1092a8f012f2efa7e89bf1d035
 AUX vdr-vompserver-0.2.6-vdr-1.5.0.diff 779 RMD160 2f3d8d2a7daea06097dce5d2e23150c56470b323 SHA1 fbd059a5a61e31fa7069209eb0d9d1f613385d46 SHA256 187e990dece222bf4e8784ca6e6684e8d332e493b567a2cd759b3d639eb5feea
 AUX vdr-vompserver-0.2.7-gentoo.diff 1494 RMD160 1535c67292ba10c9598ec8932297b694da2a19d5 SHA1 49075b9db1b93f1a0ae3ea2502bd8760c334f008 SHA256 13fdf160f5fd8bf70e611d14ed055b82937b5c99375c514636677513b81543e3
 AUX vdr-vompserver-0.3.0_vdr-1.7.3-compile.diff 1853 RMD160 5e17b52cd03ac855c932322efac842b157fa4e20 SHA1 082df31c52420c9cf48f41fd82a42b94533b54ff SHA256 b794cee1e8524cac6a43447a03c97f4161fda1f8bb33166c1e622fcb075e5430
 DIST vdr-vompserver-0.2.7.tgz 45980 RMD160 cd2f09e151f82844cca2e7f59a765b48671887b0 SHA1 b5c7fc21a50ead0975740bf4eefb7e818f857076 SHA256 778a840f90682de94fa5d7e80dc69069c6d5c414f48b26489ae32d07296dfa96
-DIST vdr-vompserver-0.3.0.tgz 62406 RMD160 ec7b0f9ccdfa1960c868b9dd09d3f12d8db45776 SHA1 67d21b3c7c294481750bd7bc8c3e8525b272c0cb SHA256 39246a991e56572bc78a42356c5673810fdc31451feb3035bbd1c787a1ff6c34
 DIST vdr-vompserver-0.3.1.tgz 84183 RMD160 2955899d529bc11ccc5dc9979ccf10032b5e0bb7 SHA1 017628f37ee71cd9f8dbd7b6e5ec35b47b8c0680 SHA256 bb9838b1139926bc0bd35e87a750a5aaf937015d78b351361c8611a7610488bd
 EBUILD vdr-vompserver-0.2.7.ebuild 1098 RMD160 073640fce9e2cba2b99ae3c65ad858fa033eaf04 SHA1 dd6261ff90506346ead8fed6861290b9333a67c3 SHA256 ea6a10516da9e832f6ad51458b900d7272157c85fe43e8260fc0c047935f0088
-EBUILD vdr-vompserver-0.3.0.ebuild 1221 RMD160 104bc6257dd1b68aeb93a1f8965701254d82f73f SHA1 7bd543405eb6342c48e37d275989264cc9097da8 SHA256 1d69b1d145aaf50305687ce76f47d4506d0d33d58cf54463ee6dbe9cda6ab19d
-EBUILD vdr-vompserver-0.3.1.ebuild 1070 RMD160 65c51cbaf528da4e4996f72cc8484ce122d15c3c SHA1 d871997f689a7172b7580ede0959dc749a0f99e4 SHA256 821b185dfbbfbed2b2908a800606d114e2b14f5720257e33eadf780dce62c1c5
-MISC ChangeLog 2722 RMD160 3489a530e9bed49f6a285a59f0f0c735ded08e43 SHA1 577b43dffb5b73da33c83d0da97497ce96f3b146 SHA256 55a388bdf8045155f7bda2a30bdb17865165c6a224b145b4c47089bdd2c6075b
+EBUILD vdr-vompserver-0.3.1-r1.ebuild 1158 RMD160 a081480ff4127f731d75333a450fa9d4f8f88faf SHA1 1faebcb71c019e6b77f7442192dfa8645f9b3d94 SHA256 4af68cb0e8dbcc01a3e9ed1f9fa9f6943ba12bf8b8b35517ffac86998c9a8b10
+EBUILD vdr-vompserver-0.3.1.ebuild 1112 RMD160 9f255b6a2c92f7d793aad4e64a154b50d77f520c SHA1 1674cfee4734e5c130b6d281cf8e378d847ac6ae SHA256 f70223edab3dcaa64ca3308bb03c23296af2cd134de51971f1ef2ba003a9aa67
+MISC ChangeLog 2997 RMD160 8c3332fd137729cbe45cba021c28cb11331f37bd SHA1 d2ec7a364a3cbde33efdc819d6a06c648683f026 SHA256 31de30d5c57b06c05bd73f90397692300397a5f2a791fe95edce32adc65cf30a
 MISC metadata.xml 535 RMD160 b26274618c1b5685adfc1e7b4704fc28cb04873e SHA1 d61aa6fc15a1a8a7d3fe07936990354449d51993 SHA256 85d5dba319863605021ca12cd31b3607b16b6d86897a0b0d129c5895ef3e0452
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 Comment: added by hd_brummy@gentoo.org
 
-iD8DBQFM9tHkdn07HTTCgIoRAhE6AJ4zi0no1Ekjmpe9jqx/UOpDvGAT0QCgsCtg
-NjpLFyzB27XS81awrIOORds=
-=9Jil
+iD8DBQFPdtuFdn07HTTCgIoRAgxvAJ9uLYoc3Hj/nN9XE4QEJ8QV1RSqmgCffGwd
+mFTNgayaYcM+5LjSVoBvqgc=
+=MpVo
 -----END PGP SIGNATURE-----
diff --git a/media-plugins/vdr-vompserver/files/rrprocstart.patch b/media-plugins/vdr-vompserver/files/rrprocstart.patch
new file mode 100644
index 000000000000..bccdc9d5700d
--- /dev/null
+++ b/media-plugins/vdr-vompserver/files/rrprocstart.patch
@@ -0,0 +1,43 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 10-rrprocstart.dpatch by  <marten.richter@freenet.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Backport of a bug in rrproc
+
+fix a message overrun when MediaMVP boots
+The topic is documented in http://forum.loggytronic.com/index.php?topic=528.0
+
+@DPATCH@
+diff -u vdr-plugin-vompserver-new/vompclientrrproc.c vdr-plugin-vompserver-0.3.1/vompclientrrproc.c
+--- vdr-plugin-vompserver-new/vompclientrrproc.c	2010-07-05 19:20:11.000000000 +0200
++++ vdr-plugin-vompserver-0.3.1/vompclientrrproc.c	2010-07-05 19:24:05.000000000 +0200
+@@ -87,9 +87,25 @@
+ 
+   if (req_queue.size() != 0)
+   {
+-    log->log("RRProc", Log::ERR, "threadMethod err 1");     
+-    threadUnlock();
+-    return;
++    log->log("RRProc", Log::ERR, "threadMethod startup with already queued packets");     
++    while (req_queue.size()) 
++    {
++      //log->log("RRProc", Log::DEBUG, "thread while");
++      req = req_queue.front();
++      req_queue.pop();
++      
++      threadUnlock(); // allow recvRequest to be queuing packets while we are working on this one
++      
++      if (!processPacket())
++      {
++        log->log("RRProc", Log::ERR, "processPacket exited with fail");     
++        return;
++      }
++      
++      threadLock();
++    } 
++    log->log("RRProc", Log::ERR, "threadMethod startup with already queued packets done.");     
++
+   }
+     
+   while(1)
+
diff --git a/media-plugins/vdr-vompserver/vdr-vompserver-0.3.0.ebuild b/media-plugins/vdr-vompserver/vdr-vompserver-0.3.1-r1.ebuild
index cb733877666a..ef8ba67a876d 100644
--- a/media-plugins/vdr-vompserver/vdr-vompserver-0.3.0.ebuild
+++ b/media-plugins/vdr-vompserver/vdr-vompserver-0.3.1-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-vompserver/vdr-vompserver-0.3.0.ebuild,v 1.3 2010/12/01 22:52:56 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-vompserver/vdr-vompserver-0.3.1-r1.ebuild,v 1.1 2012/03/31 10:18:22 hd_brummy Exp $
 
-EAPI="2"
+EAPI="4"
 
 inherit vdr-plugin
 
@@ -18,12 +18,13 @@ IUSE=""
 DEPEND=">=media-video/vdr-1.2.6"
 RDEPEND="${DEPEND}"
 
-PATCHES="${FILESDIR}/${P}_vdr-1.7.3-compile.diff"
+PATCHES=("${FILESDIR}/rrprocstart.patch")
 
 src_prepare() {
 	vdr-plugin_src_prepare
 
 	sed -i "s:vompserver:vomp:" vompserver.c
+	sed -i "s:char b:// char b:" mediafile.c
 }
 
 src_install() {
@@ -45,7 +46,4 @@ pkg_postinst() {
 	elog "You have to download the dongle file (i.e. firmware) and adapt"
 	elog "the vomp configuration files accordingly."
 	echo
-
-	elog "Please edit up from version ${PN}-0.2.6"
-	elog "all config files in /etc/vdr/plugins/vomp/"
 }
diff --git a/media-plugins/vdr-vompserver/vdr-vompserver-0.3.1.ebuild b/media-plugins/vdr-vompserver/vdr-vompserver-0.3.1.ebuild
index a6d6b09670fe..d7497e5c03c6 100644
--- a/media-plugins/vdr-vompserver/vdr-vompserver-0.3.1.ebuild
+++ b/media-plugins/vdr-vompserver/vdr-vompserver-0.3.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-vompserver/vdr-vompserver-0.3.1.ebuild,v 1.1 2010/12/01 20:53:00 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-vompserver/vdr-vompserver-0.3.1.ebuild,v 1.2 2012/03/31 10:18:22 hd_brummy Exp $
 
-EAPI="2"
+EAPI="4"
 
 inherit vdr-plugin
 
@@ -22,6 +22,7 @@ src_prepare() {
 	vdr-plugin_src_prepare
 
 	sed -i "s:vompserver:vomp:" vompserver.c
+	sed -i "s:char b:// char b:" mediafile.c
 }
 
 src_install() {