Included a patch which fixes a bug where pyvorbis attempts to close a previously closed file descriptor. PyVorbis uses the ov_open libvorbis function which requires you call ov_clear to close all open descriptors, yet pyvrobis continues to call flcose on the descriptor after the call to ov_clear. Bug #101059.

Package-Manager: portage-2.0.53_rc7

5 files changed, 73 insertions, 6 deletions

diff --git a/dev-python/pyvorbis/ChangeLog b/dev-python/pyvorbis/ChangeLog
index 7c85fe15b497..3410f3acfb96 100644
--- a/dev-python/pyvorbis/ChangeLog
+++ b/dev-python/pyvorbis/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for dev-python/pyvorbis
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyvorbis/ChangeLog,v 1.19 2005/09/10 23:40:15 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyvorbis/ChangeLog,v 1.20 2005/11/13 17:55:41 port001 Exp $
+
+*pyvorbis-1.4-r1 (13 Nov 2005)
+
+  13 Nov 2005; Ian Leitch <port001@gentoo.org>
+  +files/pyvorbisfile.c-1.4.patch, +pyvorbis-1.4-r1.ebuild:
+  Included a patch which fixes a bug where pyvorbis attempts to close a
+  previously closed file descriptor. PyVorbis uses the ov_open libvorbis
+  function which requires you call ov_clear to close all open descriptors, yet
+  pyvrobis continues to call flcose on the descriptor after the call to
+  ov_clear. Bug #101059.
 
   10 Sep 2005; Aron Griffis <agriffis@gentoo.org> pyvorbis-1.3.ebuild:
   Mark 1.3 stable on alpha
diff --git a/dev-python/pyvorbis/Manifest b/dev-python/pyvorbis/Manifest
index fe08780ad1c3..6719affc08d1 100644
--- a/dev-python/pyvorbis/Manifest
+++ b/dev-python/pyvorbis/Manifest
@@ -1,8 +1,11 @@
+MD5 2af55b4593084e88d98536d920894477 ChangeLog 2659
+MD5 28ec3622a17a96ac8cc3ef8427ac3e45 files/digest-pyvorbis-1.1 63
+MD5 9cbd7d4ece2e640dc19e9110b51b5128 files/digest-pyvorbis-1.3 63
+MD5 0f3ffbc95f303e2b3aee01b3be77d513 files/digest-pyvorbis-1.4 63
+MD5 0f3ffbc95f303e2b3aee01b3be77d513 files/digest-pyvorbis-1.4-r1 63
+MD5 dd05077a480799edc7a1912053b6cc6a files/pyvorbisfile.c-1.4.patch 564
 MD5 71c4638c9c88af75b58e5f5cb54fe008 metadata.xml 159
-MD5 4069e08113b65ee5705e07e63e3a1b5f pyvorbis-1.4.ebuild 732
-MD5 f464b11ce2f5ab6b985041e5517f1a2c ChangeLog 2199
 MD5 68e27b8fffc1489df6b58a652aac3881 pyvorbis-1.1.ebuild 691
 MD5 4d25842e6ad9295991cdb2703aff023e pyvorbis-1.3.ebuild 759
-MD5 0f3ffbc95f303e2b3aee01b3be77d513 files/digest-pyvorbis-1.4 63
-MD5 28ec3622a17a96ac8cc3ef8427ac3e45 files/digest-pyvorbis-1.1 63
-MD5 9cbd7d4ece2e640dc19e9110b51b5128 files/digest-pyvorbis-1.3 63
+MD5 150b6ccc48e156c553260e41f5937d40 pyvorbis-1.4-r1.ebuild 819
+MD5 4069e08113b65ee5705e07e63e3a1b5f pyvorbis-1.4.ebuild 732
diff --git a/dev-python/pyvorbis/files/digest-pyvorbis-1.4-r1 b/dev-python/pyvorbis/files/digest-pyvorbis-1.4-r1
new file mode 100644
index 000000000000..aa10550bad04
--- /dev/null
+++ b/dev-python/pyvorbis/files/digest-pyvorbis-1.4-r1
@@ -0,0 +1 @@
+MD5 b4921e792c0a74f75b9d3057df10ee7c pyvorbis-1.4.tar.gz 39045
diff --git a/dev-python/pyvorbis/files/pyvorbisfile.c-1.4.patch b/dev-python/pyvorbis/files/pyvorbisfile.c-1.4.patch
new file mode 100644
index 000000000000..5d1d8ffc7c77
--- /dev/null
+++ b/dev-python/pyvorbis/files/pyvorbisfile.c-1.4.patch
@@ -0,0 +1,20 @@
+--- src/pyvorbisfile.c.orig	2003-12-19 07:11:02.000000000 +0000
++++ src/pyvorbisfile.c	2005-09-03 20:02:19.000000000 +0100
+@@ -190,9 +190,6 @@
+     /* If file was opened from a file object, decref it, so it can
+        close */
+     Py_DECREF(py_self->py_file);
+-  } else {
+-    /* Otherwise, we opened the file and should close it. */
+-    fclose(py_self->c_file);
+   }
+ 
+   PyMem_DEL(self);
+@@ -260,7 +257,6 @@
+   
+   retval = ov_open(file, self->ovf, initial, ibytes);
+ 
+-  self->c_file = file;
+   if (retval < 0) {
+     if (fname != NULL)
+       fclose(file);
diff --git a/dev-python/pyvorbis/pyvorbis-1.4-r1.ebuild b/dev-python/pyvorbis/pyvorbis-1.4-r1.ebuild
new file mode 100644
index 000000000000..59d4a7b03260
--- /dev/null
+++ b/dev-python/pyvorbis/pyvorbis-1.4-r1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyvorbis/pyvorbis-1.4-r1.ebuild,v 1.1 2005/11/13 17:55:42 port001 Exp $
+
+inherit distutils
+
+DESCRIPTION="Python bindings for the ogg.vorbis library"
+HOMEPAGE="http://www.andrewchatham.com/pyogg/"
+SRC_URI="http://www.andrewchatham.com/pyogg/download/${P}.tar.gz"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+DEPEND="dev-lang/python
+	>=media-libs/libogg-1.0
+	>=media-libs/libvorbis-1.0
+	>=dev-python/pyogg-1.1"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/pyvorbisfile.c-1.4.patch
+}
+
+src_compile() {
+	./config_unix.py || die
+	distutils_src_compile
+}
+
+DOCS="AUTHORS COPYING ChangeLog NEWS README"
+