Merge lp:~logan/ubuntu/raring/pyvorbis/debian-merge into lp:ubuntu/raring/pyvorbis

[Logan Rosen]

[Logan Rosen (logan)]

I have forwarded the Ubuntu delta to Debian here: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=696902

[Dimitri John Ledkov (xnox)]

.pc/03_fix_call_to_ov_read.patch is missing from the branch, yet is actually patched in the tree & present in .pc/applied-patches.
Hence the branch is broken, the merge is fine though. Will upload that, but not merge this branch =(

One should always do
$ quilt push -a && bzr add .pc
before commiting =/

Oh well, bzr-bd workflow sometimes sucks.

[Dimitri John Ledkov (xnox)]

i am so sorry, it looks like cjwatson uploaded this merge in the mean time.

[Logan Rosen (logan)]

There are still some kinks to work out with UDD, I'm afraid. :/

=== modified file '.pc/applied-patches'
--- .pc/applied-patches	2011-08-17 17:47:50 +0000
+++ .pc/applied-patches	2012-12-29 00:24:23 +0000
@@ -1,2 +1,3 @@
 01_previous_changes.patch
 02_whrandom_gone.patch
+03_fix_call_to_ov_read.patch

=== modified file 'debian/changelog'
--- debian/changelog	2012-10-08 22:00:21 +0000
+++ debian/changelog	2012-12-29 00:24:23 +0000
@@ -1,3 +1,19 @@
+pyvorbis (1.5-2ubuntu1) raring; urgency=low
+
+  * Merge from Debian unstable. Remaining changes:
+    - Build using dh_python2.
+
+ -- Logan Rosen <[e-mail]>  Fri, 28 Dec 2012 19:12:53 -0500
+
+pyvorbis (1.5-2) unstable; urgency=low
+
+  * debian/patches/03_fix_call_to_ov_read.patch
+    - fix a crash ("Floating point exception") when calling read(); thanks to
+      Alessio Gaeta for the report and to Emmanuel Anne for the patch;
+      Closes: #696640
+
+ -- Sandro Tosi <[e-mail]>  Wed, 26 Dec 2012 12:37:57 +0100
+
 pyvorbis (1.5-1ubuntu2) quantal; urgency=low
 
   * Rebuild for new armel compiler default of ARMv5t.

=== modified file 'debian/control'
--- debian/control	2011-12-17 14:30:48 +0000
+++ debian/control	2012-12-29 00:24:23 +0000
@@ -1,7 +1,8 @@
 Source: pyvorbis
 Section: python
 Priority: optional
-Maintainer: Debian Python Modules Team <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Debian Python Modules Team <[e-mail]>
 Uploaders: Sandro Tosi <[e-mail]>
 Build-Depends: debhelper (>= 5.0.37.2), python-all-dev (>= 2.6.6-3~),
  python-all-dbg, python-ogg-dbg (>= 1.3-1.1), 

=== added file 'debian/patches/03_fix_call_to_ov_read.patch'
--- debian/patches/03_fix_call_to_ov_read.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/03_fix_call_to_ov_read.patch	2012-12-29 00:24:23 +0000
@@ -0,0 +1,90 @@
+Description: Fix the crash/no sound while trying to play fofix/guitar hero
+ This mod was trying to force a prototype on an array of callbacks, it's a
+ miracle that it ever worked, maybe older versions of python were more
+ forgiving, or recent versions of libc don't let this kind of thing to
+ pass...
+ .
+ Also changed the memory allocation of py_ov_read to something simpler
+Origin: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=670062#10
+Bug-Debian: http://bugs.debian.org/696640
+Forwarded: https://groups.google.com/d/topic/pyogg/IuvxXV5UgP4/discussion
+
+--- pyvorbis-1.5.orig/src/pyvorbisfile.c
++++ pyvorbis-1.5/src/pyvorbisfile.c
+@@ -35,7 +35,7 @@ length is the number of bytes to read\n\
+ \tbigendian is the endianness you want (defaults to host endianness)\n\
+ \tword is the word size\n\tnot sure what signed does\n";
+ 
+-static PyObject *py_ov_read(PyObject *, PyObject *, PyObject *);
++static PyObject *py_ov_read(PyObject *, PyObject *); // , PyObject *);
+ 
+ FDEF(ov_streams) "Returns the number of logical streams in this VorbisFile";
+ FDEF(ov_seekable) "Returns whether this VorbisFile is seekable.";
+@@ -119,7 +119,7 @@ PyTypeObject py_vorbisfile_type = {
+ 
+ 
+ static PyMethodDef OggVorbis_File_methods[] = {
+-  {"read", (PyCFunction) py_ov_read, 
++  {"read", py_ov_read, 
+    METH_VARARGS | METH_KEYWORDS, py_ov_read_doc},
+   {"info", py_ov_info, 
+    METH_VARARGS, py_ov_info_doc},
+@@ -288,7 +288,7 @@ static int is_big_endian() {
+ }
+ 
+ static PyObject *
+-py_ov_read(PyObject *self, PyObject *args, PyObject *kwdict)
++py_ov_read(PyObject *self, PyObject *args) // , PyObject *kwdict)
+ {
+   py_vorbisfile * ov_self = (py_vorbisfile *) self;
+   PyObject *retobj;
+@@ -298,7 +298,7 @@ py_ov_read(PyObject *self, PyObject *arg
+   PyObject *tuple;
+   char *buff;
+   
+-  int length, word, sgned, bitstream;
++  int length, word, sgned, bitstream = 0;
+   int bigendianp;
+ 
+   // Default to host order
+@@ -307,33 +307,23 @@ py_ov_read(PyObject *self, PyObject *arg
+   word = 2;
+   sgned = 1;
+ 
+-  if (!PyArg_ParseTupleAndKeywords(args, kwdict, "|llll", read_kwlist,
++/*  if (!PyArg_ParseTupleAndKeywords(args, kwdict, "|llll", read_kwlist,
+                                    &length, &bigendianp, &word, &sgned))
+-    return NULL;
+-
+-  buffobj = PyBuffer_New(length);
+-
+-  tuple = PyTuple_New(1);
+-  Py_INCREF(buffobj);
+-  PyTuple_SET_ITEM(tuple, 0, buffobj);
++    return NULL; */
+ 
+-  if (!(PyArg_ParseTuple(tuple, "t#", &buff, &length))) {
+-    return NULL;
+-  }
+-  Py_DECREF(tuple);
++    buff = malloc(length);
++    if (!buff) return NULL;
+ 
+-  Py_BEGIN_ALLOW_THREADS
+     retval = ov_read(ov_self->ovf, buff, length, 
+                      bigendianp, word, sgned, &bitstream);
+-  Py_END_ALLOW_THREADS
+ 
+     if (retval < 0) {
+-      Py_DECREF(buffobj);
++	free(buff);
+       return v_error_from_code(retval, "Error reading file: ");
+     }
+ 
+-  retobj = Py_BuildValue("Oii", buffobj, retval, bitstream);
+-  Py_DECREF(buffobj);
++  retobj = Py_BuildValue("s#ii", buff, retval, retval, bitstream);
++  free(buff);
+   return retobj;
+ }
+ 

=== modified file 'debian/patches/series'
--- debian/patches/series	2011-08-17 17:47:50 +0000
+++ debian/patches/series	2012-12-29 00:24:23 +0000
@@ -1,2 +1,3 @@
 01_previous_changes.patch
 02_whrandom_gone.patch
+03_fix_call_to_ov_read.patch

=== modified file 'src/pyvorbisfile.c'
--- src/pyvorbisfile.c	2011-08-17 17:47:50 +0000
+++ src/pyvorbisfile.c	2012-12-29 00:24:23 +0000
@@ -35,7 +35,7 @@
 \tbigendian is the endianness you want (defaults to host endianness)\n\
 \tword is the word size\n\tnot sure what signed does\n";
 
-static PyObject *py_ov_read(PyObject *, PyObject *, PyObject *);
+static PyObject *py_ov_read(PyObject *, PyObject *); // , PyObject *);
 
 FDEF(ov_streams) "Returns the number of logical streams in this VorbisFile";
 FDEF(ov_seekable) "Returns whether this VorbisFile is seekable.";
@@ -119,7 +119,7 @@
 
 
 static PyMethodDef OggVorbis_File_methods[] = {
-  {"read", (PyCFunction) py_ov_read, 
+  {"read", py_ov_read, 
    METH_VARARGS | METH_KEYWORDS, py_ov_read_doc},
   {"info", py_ov_info, 
    METH_VARARGS, py_ov_info_doc},
@@ -288,7 +288,7 @@
 }
 
 static PyObject *
-py_ov_read(PyObject *self, PyObject *args, PyObject *kwdict)
+py_ov_read(PyObject *self, PyObject *args) // , PyObject *kwdict)
 {
   py_vorbisfile * ov_self = (py_vorbisfile *) self;
   PyObject *retobj;
@@ -298,7 +298,7 @@
   PyObject *tuple;
   char *buff;
   
-  int length, word, sgned, bitstream;
+  int length, word, sgned, bitstream = 0;
   int bigendianp;
 
   // Default to host order
@@ -307,33 +307,23 @@
   word = 2;
   sgned = 1;
 
-  if (!PyArg_ParseTupleAndKeywords(args, kwdict, "|llll", read_kwlist,
+/*  if (!PyArg_ParseTupleAndKeywords(args, kwdict, "|llll", read_kwlist,
                                    &length, &bigendianp, &word, &sgned))
-    return NULL;
-
-  buffobj = PyBuffer_New(length);
-
-  tuple = PyTuple_New(1);
-  Py_INCREF(buffobj);
-  PyTuple_SET_ITEM(tuple, 0, buffobj);
-
-  if (!(PyArg_ParseTuple(tuple, "t#", &buff, &length))) {
-    return NULL;
-  }
-  Py_DECREF(tuple);
-
-  Py_BEGIN_ALLOW_THREADS
+    return NULL; */
+
+    buff = malloc(length);
+    if (!buff) return NULL;
+
     retval = ov_read(ov_self->ovf, buff, length, 
                      bigendianp, word, sgned, &bitstream);
-  Py_END_ALLOW_THREADS
 
     if (retval < 0) {
-      Py_DECREF(buffobj);
+	free(buff);
       return v_error_from_code(retval, "Error reading file: ");
     }
 
-  retobj = Py_BuildValue("Oii", buffobj, retval, bitstream);
-  Py_DECREF(buffobj);
+  retobj = Py_BuildValue("s#ii", buff, retval, retval, bitstream);
+  free(buff);
   return retobj;
 }