packages: python-pyvorbis/python-pyvorbis.spec, python-pyvorbis/pyvorbis-do...

[jajcus]

Author: jajcus                       Date: Wed Dec 21 09:41:06 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- egg-info file added
- double free crash fixes (based on some Ubuntu patch and the unofficial 1.5a release)
- Release: 8

---- Files affected:
packages/python-pyvorbis:
   python-pyvorbis.spec (1.26 -> 1.27) , pyvorbis-double_free.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/python-pyvorbis/python-pyvorbis.spec
diff -u packages/python-pyvorbis/python-pyvorbis.spec:1.26 packages/python-pyvorbis/python-pyvorbis.spec:1.27
--- packages/python-pyvorbis/python-pyvorbis.spec:1.26	Sat Nov 13 01:20:59 2010
+++ packages/python-pyvorbis/python-pyvorbis.spec	Wed Dec 21 10:41:01 2011
@@ -4,11 +4,12 @@
 Summary(pl.UTF-8):	Moduł Pythona do biblioteki Ogg/Vorbis
 Name:		python-%{module}
 Version:	1.4
-Release:	7
+Release:	8
 License:	GPL
 Group:		Libraries/Python
 Source0:	http://ekyo.nerim.net/software/pyogg/%{module}-%{version}.tar.gz
 # Source0-md5:	b4921e792c0a74f75b9d3057df10ee7c
+Patch0:		pyvorbis-double_free.patch
 URL:		http://ekyo.nerim.net/software/pyogg/
 BuildRequires:	libvorbis-devel
 BuildRequires:	python-devel
@@ -49,6 +50,7 @@
 
 %prep
 %setup -q -n %{module}-%{version}
+%patch0 -p1
 
 %build
 python config_unix.py \
@@ -75,6 +77,7 @@
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog README NEWS
 %attr(755,root,root) %{py_sitedir}/ogg/*.so
+%attr(755,root,root) %{py_sitedir}/*.egg-info
 %{_examplesdir}/%{name}-%{version}
 
 %files devel
@@ -87,6 +90,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.27  2011/12/21 09:41:01  jajcus
+- egg-info file added
+- double free crash fixes (based on some Ubuntu patch and the unofficial 1.5a release)
+- Release: 8
+
 Revision 1.26  2010/11/13 00:20:59  pawelz
 - release 7
 

================================================================
Index: packages/python-pyvorbis/pyvorbis-double_free.patch
diff -u /dev/null packages/python-pyvorbis/pyvorbis-double_free.patch:1.1
--- /dev/null	Wed Dec 21 10:41:06 2011
+++ packages/python-pyvorbis/pyvorbis-double_free.patch	Wed Dec 21 10:41:01 2011
@@ -0,0 +1,77 @@
+diff -dur pyvorbis-1.4.orig/src/pyvorbiscodec.c pyvorbis-1.4/src/pyvorbiscodec.c
+--- pyvorbis-1.4.orig/src/pyvorbiscodec.c	2003-05-13 10:17:13.000000000 +0200
++++ pyvorbis-1.4/src/pyvorbiscodec.c	2011-12-21 10:30:52.000000000 +0100
+@@ -118,7 +118,7 @@
+ {
+   vorbis_dsp_clear(PY_DSP(self));
+   Py_XDECREF(((py_dsp *)self)->parent);
+-  PyMem_DEL(self);
++  PyObject_Del(self);
+ }
+ 
+ static PyObject*
+@@ -447,7 +447,7 @@
+ {
+   vorbis_block_clear(PY_BLOCK(self));
+   Py_XDECREF(((py_block *)self)->parent);
+-  PyMem_DEL(self);
++  PyObject_Del(self);
+ }
+ 
+ static PyObject*
+diff -dur pyvorbis-1.4.orig/src/pyvorbisfile.c pyvorbis-1.4/src/pyvorbisfile.c
+--- pyvorbis-1.4.orig/src/pyvorbisfile.c	2003-12-19 08:11:02.000000000 +0100
++++ pyvorbis-1.4/src/pyvorbisfile.c	2011-12-21 10:31:49.000000000 +0100
+@@ -171,7 +171,7 @@
+ 
+   ret = py_ov_open(newobj, args);
+   if (ret == NULL) {
+-    PyMem_DEL(newobj);
++    PyObject_Del(newobj);
+     return NULL;
+   } else
+     Py_DECREF(ret);
+@@ -191,11 +191,11 @@
+        close */
+     Py_DECREF(py_self->py_file);
+   } else {
+-    /* Otherwise, we opened the file and should close it. */
+-    fclose(py_self->c_file);
++    /* Do NOT close the file -- ov_open() takes ownership of the FILE*,
++     * and ov_close() is responsible for closing it. */
+   }
+ 
+-  PyMem_DEL(self);
++  PyObject_Del(self);
+ }
+ 
+ static PyObject *
+diff -dur pyvorbis-1.4.orig/src/pyvorbisinfo.c pyvorbis-1.4/src/pyvorbisinfo.c
+--- pyvorbis-1.4.orig/src/pyvorbisinfo.c	2003-12-19 08:51:36.000000000 +0100
++++ pyvorbis-1.4/src/pyvorbisinfo.c	2011-12-21 10:30:52.000000000 +0100
+@@ -134,7 +134,7 @@
+ static void
+ py_ov_info_dealloc(PyObject *self)
+ {
+-  PyMem_DEL(self);
++  PyObject_Del(self);
+ }
+ 
+ #define CMP_RET(x) \
+@@ -418,7 +418,7 @@
+     free(ovc_self->vc);
+   }
+ 
+-  PyMem_DEL(self);
++  PyObject_Del(self);
+ }
+ 
+ 
+@@ -999,6 +999,7 @@
+ #if PY_UNICODE
+       item = PyUnicode_DecodeUTF8(val, vallen, NULL);
+       if (!item) {
++        PyErr_Clear();
+         /* To deal with non-UTF8 comments (against the standard) */
+         item = PyString_FromStringAndSize(val, vallen); 
+       } 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/python-pyvorbis/python-pyvorbis.spec?r1=1.26&r2=1.27&f=u