add a patch that fixes a bug that would give invalid premature eof errors, thanks to Daniel Pielmeier <daniel.pielmeier@googlemail.com>, bug #175504

Package-Manager: portage-2.1.3.19

5 files changed, 106 insertions, 8 deletions

diff --git a/media-video/vamps/ChangeLog b/media-video/vamps/ChangeLog
index 20226b3b2f5a..512e6809f9f5 100644
--- a/media-video/vamps/ChangeLog
+++ b/media-video/vamps/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-video/vamps
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vamps/ChangeLog,v 1.19 2007/11/19 19:22:28 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vamps/ChangeLog,v 1.20 2007/11/19 19:47:44 aballier Exp $
+
+*vamps-0.99.2-r1 (19 Nov 2007)
+
+  19 Nov 2007; Alexis Ballier <aballier@gentoo.org>
+  +files/vamps-0.99.2-premature-eof.patch, +vamps-0.99.2-r1.ebuild:
+  add a patch that fixes a bug that would give invalid premature eof errors,
+  thanks to Daniel Pielmeier <daniel.pielmeier@googlemail.com>, bug #175504
 
   19 Nov 2007; Alexis Ballier <aballier@gentoo.org>
   -files/vamps-0.95-amd64.patch, -vamps-0.95.ebuild:
diff --git a/media-video/vamps/Manifest b/media-video/vamps/Manifest
index 206ddd7c0500..c6893ed4f461 100644
--- a/media-video/vamps/Manifest
+++ b/media-video/vamps/Manifest
@@ -1,15 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX vamps-0.99.2-premature-eof.patch 1247 RMD160 23ebd5beac514fd2e8d223c70138159c0c4c5bdd SHA1 c95b6ea05d0e9ba3715d8e055d863cb7a93a6fc7 SHA256 a740c0dd04e2b296fed9efaf34edd67bf463d4411f40786d81cbb8a6a289787e
+MD5 7ea382e86f63e2cdc759fd659c7ed313 files/vamps-0.99.2-premature-eof.patch 1247
+RMD160 23ebd5beac514fd2e8d223c70138159c0c4c5bdd files/vamps-0.99.2-premature-eof.patch 1247
+SHA256 a740c0dd04e2b296fed9efaf34edd67bf463d4411f40786d81cbb8a6a289787e files/vamps-0.99.2-premature-eof.patch 1247
 DIST vamps-0.99.2.tar.gz 47062 RMD160 1b0d34ba3b583d9d35fc4cee30014c704e64a36d SHA1 b25e68508f43bee37156fd83cde09a519e0db778 SHA256 9bac71441db55c04a642c786d6427efdb65aa27f4b1719ffa34ebc3869572694
+EBUILD vamps-0.99.2-r1.ebuild 826 RMD160 161a3dc85f307504961a6a981e9084e32764a731 SHA1 56341f34076aa4436859064d352d781490f16997 SHA256 8efbb516338a08af643145b88df011b61d354f86f0534966e8a99e55ccdcde58
+MD5 6b82265d5f81873779861dd6dab62512 vamps-0.99.2-r1.ebuild 826
+RMD160 161a3dc85f307504961a6a981e9084e32764a731 vamps-0.99.2-r1.ebuild 826
+SHA256 8efbb516338a08af643145b88df011b61d354f86f0534966e8a99e55ccdcde58 vamps-0.99.2-r1.ebuild 826
 EBUILD vamps-0.99.2.ebuild 742 RMD160 1d1fe1823043b24fb4947c0b1d58d7110ba46423 SHA1 6688331682934e31470a02decc8bc14ef9928376 SHA256 f1914b8d3edd2ec11548adf2b3103eaf8c0d81a706cbf77beae97547cb7bba9a
 MD5 d614a89408de81360333aac7187a3cb0 vamps-0.99.2.ebuild 742
 RMD160 1d1fe1823043b24fb4947c0b1d58d7110ba46423 vamps-0.99.2.ebuild 742
 SHA256 f1914b8d3edd2ec11548adf2b3103eaf8c0d81a706cbf77beae97547cb7bba9a vamps-0.99.2.ebuild 742
-MISC ChangeLog 2608 RMD160 716ec0c61d1c7ad3a0661b6b016fc5a181bb2667 SHA1 3032e2497151e29b05670f7ba962ffa262ea02fe SHA256 45a1ea3fca181ab5eea4b3cf6ba40f0143495878e31bed909ea88e294cbc31c0
-MD5 4c9ffa21eeeba524a6a85f7ca6074d9a ChangeLog 2608
-RMD160 716ec0c61d1c7ad3a0661b6b016fc5a181bb2667 ChangeLog 2608
-SHA256 45a1ea3fca181ab5eea4b3cf6ba40f0143495878e31bed909ea88e294cbc31c0 ChangeLog 2608
+MISC ChangeLog 2914 RMD160 8b528c470630c9ff5fb9aa6aaf497ab5ba60c67f SHA1 ab3d658809acbe053e74108045c1da78132d7b03 SHA256 fd74c5337759c3e318093f9339bda8df9c9bee030988eb136967606af916d700
+MD5 e83d756645e9605c73023c54f3fe4e33 ChangeLog 2914
+RMD160 8b528c470630c9ff5fb9aa6aaf497ab5ba60c67f ChangeLog 2914
+SHA256 fd74c5337759c3e318093f9339bda8df9c9bee030988eb136967606af916d700 ChangeLog 2914
 MISC metadata.xml 223 RMD160 86b42c49b694db39ddb3fdc60b98a3ad1a0c3392 SHA1 ea8c387229caaf4b0d3c9fbef9143b70dcae0b0d SHA256 dd48e823ec9a151bc3611121402ed26ee24eb3304aa62870b1e875a8fa0ac812
 MD5 0338bfb24d7bfb6450aac4dd025c0096 metadata.xml 223
 RMD160 86b42c49b694db39ddb3fdc60b98a3ad1a0c3392 metadata.xml 223
@@ -17,10 +25,13 @@ SHA256 dd48e823ec9a151bc3611121402ed26ee24eb3304aa62870b1e875a8fa0ac812 metadata
 MD5 ec8db2087039b5501fce90ec0ca5c497 files/digest-vamps-0.99.2 235
 RMD160 6d71abc39e14c5c603bb51f3eafcb404670b7baf files/digest-vamps-0.99.2 235
 SHA256 74f060e3432c3a3181a6307d5f66bddf8e3fb7983ec0b6a1cb96ba0e59bf6688 files/digest-vamps-0.99.2 235
+MD5 ec8db2087039b5501fce90ec0ca5c497 files/digest-vamps-0.99.2-r1 235
+RMD160 6d71abc39e14c5c603bb51f3eafcb404670b7baf files/digest-vamps-0.99.2-r1 235
+SHA256 74f060e3432c3a3181a6307d5f66bddf8e3fb7983ec0b6a1cb96ba0e59bf6688 files/digest-vamps-0.99.2-r1 235
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFHQeKevFcC4BYPU0oRAkhaAJ9JkRX66FTq450eI0H8BeIeqSkP5wCfUrO/
-XlgcE/c3yWJyJ/Yl8Qis5vs=
-=yTzf
+iD8DBQFHQeiLvFcC4BYPU0oRAsO1AJ9dmD8Hm/sV1zXndVVJKgLxcQ8ymwCgi3Mm
+Y9lM8w8gm0repYs8XeVwh/w=
+=+8xb
 -----END PGP SIGNATURE-----
diff --git a/media-video/vamps/files/digest-vamps-0.99.2-r1 b/media-video/vamps/files/digest-vamps-0.99.2-r1
new file mode 100644
index 000000000000..2607b4916eb3
--- /dev/null
+++ b/media-video/vamps/files/digest-vamps-0.99.2-r1
@@ -0,0 +1,3 @@
+MD5 7d438185a2ae95ebb245472d9fa47d06 vamps-0.99.2.tar.gz 47062
+RMD160 1b0d34ba3b583d9d35fc4cee30014c704e64a36d vamps-0.99.2.tar.gz 47062
+SHA256 9bac71441db55c04a642c786d6427efdb65aa27f4b1719ffa34ebc3869572694 vamps-0.99.2.tar.gz 47062
diff --git a/media-video/vamps/files/vamps-0.99.2-premature-eof.patch b/media-video/vamps/files/vamps-0.99.2-premature-eof.patch
new file mode 100644
index 000000000000..48340498d9bc
--- /dev/null
+++ b/media-video/vamps/files/vamps-0.99.2-premature-eof.patch
@@ -0,0 +1,46 @@
+--- vamps-0.99.2/vamps/vamps.c.orig	2006-04-15 08:00:07.000000000 -0400
++++ vamps-0.99.2/vamps/vamps.c	2007-01-26 06:54:27.000000000 -0500
+@@ -18,6 +18,9 @@
+ //
+ // Revision history (latest first):
+ //
++// 2007/01/26: V0.99.3: Fixed assumptions in lock() which do not hold for pipes.
++//                      This cures the "Premature EOF" problem.
++//
+ // 2006/04/15: V0.99.2: Fixed some signed/unsigned issues which caused compiler
+ //                      warnings on some platforms. No funtional changes.
+ //
+@@ -396,13 +399,24 @@
+     rhwp = rptr + avail;
+   }
+ 
+-  n = read (0, rhwp, RBUF_SIZE - avail);
+-
+-  if (n % SECT_SIZE)
+-    fatal ("Premature EOF");
+-
+-  rhwp       += n;
+-  bytes_read += n;
++  while (avail < size)  
++  {
++    // read; reads from an open pipe will return any non-zero amount of data
++    //       (not necessarily the amount we wanted!)
++    n = read (0, rhwp, RBUF_SIZE - avail);
++    if (!n)
++    {
++      if (avail % SECT_SIZE)
++        // we got an EOF and only a partial sector
++        fatal ("Premature EOF");
++      break;
++    }
++    else if (n == -1)
++      fatal ("Read from stdin: %s", strerror (errno));
++    rhwp       += n;
++    bytes_read += n;
++    avail      += n;
++  }
+ 
+   return !n;
+ }
+
+ 	  	 
diff --git a/media-video/vamps/vamps-0.99.2-r1.ebuild b/media-video/vamps/vamps-0.99.2-r1.ebuild
new file mode 100644
index 000000000000..ead00a119bba
--- /dev/null
+++ b/media-video/vamps/vamps-0.99.2-r1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/vamps/vamps-0.99.2-r1.ebuild,v 1.1 2007/11/19 19:47:44 aballier Exp $
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Very fast requantisizing tool for backup DVDs"
+HOMEPAGE="http://vamps.sourceforge.net/"
+SRC_URI="mirror://sourceforge/vamps/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+DEPEND=">=media-libs/libdvdread-0.9.4"
+
+RDEPEND="${DEPEND}
+	>=media-video/dvdauthor-0.6.10"
+
+src_unpack() {
+	unpack ${A}
+	epatch "${FILESDIR}/${P}-premature-eof.patch"
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" || die "emake failed"
+}
+
+src_install() {
+	dobin vamps/vamps play_cell/play_cell || die "install failed"
+}