Hi, 

We need these fixes from debian/ubuntu, otherwise bad things can 
happen:

python in free(): error: bogus pointer
Abort trap (core dumped)

#0  0x09d5318d in kill () from /usr/lib/libc.so.53.2
#1  0x09da90d5 in abort () at /usr/src/lib/libc/stdlib/abort.c:68
#2  0x09da6cce in wrterror (p=Variable "p" is not available.
) at /usr/src/lib/libc/stdlib/malloc.c:380
#3  0x09da80c9 in free (ptr=0x85519470) at 
/usr/src/lib/libc/stdlib/malloc.c:1321
#4  0x08ddbdad in py_ogg_page_dealloc () from 
/usr/local/lib/python2.5/site-packages/ogg/_ogg.so

Comments? OKs?

Index: audio/py-ao/Makefile
===================================================================
RCS file: /cvs/ports/audio/py-ao/Makefile,v
retrieving revision 1.9
diff -u -p -r1.9 Makefile
--- audio/py-ao/Makefile        10 Mar 2009 22:21:48 -0000      1.9
+++ audio/py-ao/Makefile        1 Jun 2010 13:44:21 -0000
@@ -5,7 +5,7 @@ SHARED_ONLY=    Yes
 COMMENT=       Python wrapper module for the ao library
 
 DISTNAME=      pyao-0.82
-PKGNAME=       ${DISTNAME:S/py/py-/}p3
+PKGNAME=       ${DISTNAME:S/py/py-/}p4
 CATEGORIES=    audio
 HOMEPAGE=      http://ekyo.nerim.net/software/pyogg/
 
Index: audio/py-ao/patches/patch-src_aomodule_c
===================================================================
RCS file: audio/py-ao/patches/patch-src_aomodule_c
diff -N audio/py-ao/patches/patch-src_aomodule_c
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ audio/py-ao/patches/patch-src_aomodule_c    1 Jun 2010 13:44:21 -0000
@@ -0,0 +1,21 @@
+$OpenBSD$
+--- src/aomodule.c.orig        Thu Jul 24 08:52:59 2003
++++ src/aomodule.c     Tue Jun  1 15:40:22 2010
+@@ -141,7 +141,7 @@ py_ao_new(PyObject *self, PyObject *args, PyObject *kw
+     return NULL;
+   }
+ 
+-  retobj = (ao_Object *) PyObject_NEW(ao_Object, &ao_Type);
++  retobj = (ao_Object *) PyObject_New(ao_Object, &ao_Type);
+   retobj->dev = dev;
+   return (PyObject *) retobj;
+ }
+@@ -150,7 +150,7 @@ static void
+ py_ao_dealloc(ao_Object *self)
+ {
+   ao_close(self->dev);
+-  PyMem_DEL(self);
++  PyObject_Del(self);
+ }
+ 
+ static PyObject *
Index: audio/py-ogg/Makefile
===================================================================
RCS file: /cvs/ports/audio/py-ogg/Makefile,v
retrieving revision 1.13
diff -u -p -r1.13 Makefile
--- audio/py-ogg/Makefile       1 Jun 2010 12:46:24 -0000       1.13
+++ audio/py-ogg/Makefile       1 Jun 2010 13:44:21 -0000
@@ -5,7 +5,7 @@ SHARED_ONLY=    Yes
 COMMENT=       Python wrapper for the Ogg libraries
 
 DISTNAME=      pyogg-1.3
-PKGNAME=       ${DISTNAME:S/py/py-/}p4
+PKGNAME=       ${DISTNAME:S/py/py-/}p5
 CATEGORIES=    audio
 HOMEPAGE=      http://ekyo.nerim.net/software/pyogg/
 
Index: audio/py-ogg/patches/patch-src_pyoggpackbuff_c
===================================================================
RCS file: audio/py-ogg/patches/patch-src_pyoggpackbuff_c
diff -N audio/py-ogg/patches/patch-src_pyoggpackbuff_c
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ audio/py-ogg/patches/patch-src_pyoggpackbuff_c      1 Jun 2010 13:44:21 
-0000
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- src/pyoggpackbuff.c.orig   Mon Oct  7 01:04:57 2002
++++ src/pyoggpackbuff.c        Tue Jun  1 15:38:26 2010
+@@ -89,7 +89,7 @@ static PyMethodDef py_oggpack_buffer_methods[] = {
+ static void
+ py_oggpack_buffer_dealloc(PyObject *self)
+ {
+-  PyMem_DEL(self);
++  PyObject_Del(self);
+ }
+ 
+ static PyObject*
Index: audio/py-ogg/patches/patch-src_pyoggpacket_c
===================================================================
RCS file: audio/py-ogg/patches/patch-src_pyoggpacket_c
diff -N audio/py-ogg/patches/patch-src_pyoggpacket_c
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ audio/py-ogg/patches/patch-src_pyoggpacket_c        1 Jun 2010 13:44:21 
-0000
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- src/pyoggpacket.c.orig     Mon Oct  7 01:04:57 2002
++++ src/pyoggpacket.c  Tue Jun  1 15:38:26 2010
+@@ -60,7 +60,7 @@ py_ogg_packet_from_packet(ogg_packet *op)
+ static void
+ py_ogg_packet_dealloc(PyObject *self)
+ {
+-  PyMem_DEL(self);
++  PyObject_Del(self);
+ }
+ 
+ static PyObject*
Index: audio/py-ogg/patches/patch-src_pyoggpage_c
===================================================================
RCS file: audio/py-ogg/patches/patch-src_pyoggpage_c
diff -N audio/py-ogg/patches/patch-src_pyoggpage_c
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ audio/py-ogg/patches/patch-src_pyoggpage_c  1 Jun 2010 13:44:21 -0000
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- src/pyoggpage.c.orig       Mon Oct  7 01:04:57 2002
++++ src/pyoggpage.c    Tue Jun  1 15:38:26 2010
+@@ -75,7 +75,7 @@ static PyMethodDef py_ogg_page_methods[] = {
+ static void 
+ py_ogg_page_dealloc(PyObject *self)
+ {
+-  PyMem_DEL(self);
++  PyObject_Del(self);
+ }
+ 
+ static PyObject* 
Index: audio/py-ogg/patches/patch-src_pyoggstreamstate_c
===================================================================
RCS file: audio/py-ogg/patches/patch-src_pyoggstreamstate_c
diff -N audio/py-ogg/patches/patch-src_pyoggstreamstate_c
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ audio/py-ogg/patches/patch-src_pyoggstreamstate_c   1 Jun 2010 13:44:21 
-0000
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- src/pyoggstreamstate.c.orig        Mon Oct  7 01:04:57 2002
++++ src/pyoggstreamstate.c     Tue Jun  1 15:38:26 2010
+@@ -77,7 +77,7 @@ static void 
+ py_ogg_stream_state_dealloc(PyObject *self)
+ {
+   ogg_stream_clear(PY_OGG_STREAM(self));
+-  PyMem_DEL(self);
++  PyObject_Del(self);
+ }
+ 
+ static PyObject* 
Index: audio/py-ogg/patches/patch-src_pyoggsyncstate_c
===================================================================
RCS file: audio/py-ogg/patches/patch-src_pyoggsyncstate_c
diff -N audio/py-ogg/patches/patch-src_pyoggsyncstate_c
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ audio/py-ogg/patches/patch-src_pyoggsyncstate_c     1 Jun 2010 13:44:21 
-0000
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- src/pyoggsyncstate.c.orig  Mon Oct  7 01:04:57 2002
++++ src/pyoggsyncstate.c       Tue Jun  1 15:38:26 2010
+@@ -88,7 +88,7 @@ static void 
+ py_ogg_sync_state_dealloc(PyObject *self)
+ {
+   ogg_sync_clear(PY_OGG_SYNC_STATE(self));
+-  PyMem_DEL(self);
++  PyObject_Del(self);
+ }
+ 
+ static PyObject* 

Reply via email to