Hello community, here is the log from the commit of package apache2-mod_python for openSUSE:11.4 checked in at Fri Mar 4 16:16:33 CET 2011.
-------- --- old-versions/11.4/all/apache2-mod_python/apache2-mod_python.changes 2010-05-06 16:42:39.000000000 +0200 +++ 11.4/apache2-mod_python/apache2-mod_python.changes 2011-03-01 18:51:52.000000000 +0100 @@ -1,0 +2,6 @@ +Tue Mar 1 18:49:15 CET 2011 - [email protected] + +- apache2-mod_python-bnc675927.patch fixes bnc#675927: + python segfaults on openSUSE 11.4 when used with mod_python + +------------------------------------------------------------------- Package does not exist at destination yet. Using Fallback old-versions/11.4/all/apache2-mod_python Destination is old-versions/11.4/UPDATES/all/apache2-mod_python calling whatdependson for 11.4-i586 New: ---- apache2-mod_python-bnc675927.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ apache2-mod_python.spec ++++++ --- /var/tmp/diff_new_pack.6VIYKh/_old 2011-03-04 16:15:58.000000000 +0100 +++ /var/tmp/diff_new_pack.6VIYKh/_new 2011-03-04 16:15:58.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package apache2-mod_python (Version 3.3.1) +# spec file for package apache2-mod_python # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -45,7 +45,7 @@ %define apache_localstatedir %(%{apxs} -q LOCALSTATEDIR) %define apache_mmn %(MMN=$(%{apxs} -q LIBEXECDIR)_MMN; test -x $MMN && $MMN) Version: 3.3.1 -Release: 159 +Release: 161.<RELEASE2> Summary: A Python Module for the Apache 2 Web Server License: X11/MIT, Other License(s), see package Group: Productivity/Networking/Web/Servers @@ -56,6 +56,7 @@ Source: %{modname}-%{version}.tar.bz2 Patch1: mod_python-3.3.1-bucket-brigade.patch Patch2: fix_md5_hashlib.patch +Patch3: apache2-mod_python-bnc675927.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -98,6 +99,7 @@ %setup -n %{modname}-%{version} %patch1 -p1 %patch2 -p1 +%patch3 -p1 case %_lib in lib) ;; *) mv lib %_lib;; ++++++ apache2-mod_python-bnc675927.patch ++++++ via https://bugzilla.redhat.com/show_bug.cgi?id=640432 and https://bugzilla.novell.com/show_bug.cgi?id=675927 diff -Nur mod_python-3.3.1.orig/src/connobject.c mod_python-3.3.1/src/connobject.c --- mod_python-3.3.1.orig/src/connobject.c 2006-12-03 15:36:37.000000000 +1100 +++ mod_python-3.3.1/src/connobject.c 2010-10-20 19:33:28.853600297 +1100 @@ -426,7 +426,7 @@ return (PyObject *)self->hlo; } else if (strcmp(name, "_conn_rec") == 0) { - return PyCObject_FromVoidPtr(self->conn, 0); + return PyCapsule_New(self->conn, "MpConn", 0); } else return PyMember_Get((char *)self->conn, conn_memberlist, name); diff -Nur mod_python-3.3.1.orig/src/mod_python.c mod_python-3.3.1/src/mod_python.c --- mod_python-3.3.1.orig/src/mod_python.c 2006-11-09 17:21:23.000000000 +1100 +++ mod_python-3.3.1/src/mod_python.c 2010-10-20 19:34:44.124630590 +1100 @@ -182,7 +182,7 @@ idata->istate = istate; /* obcallback will be created on first use */ idata->obcallback = NULL; - p = PyCObject_FromVoidPtr((void *) idata, NULL); + p = PyCapsule_New((void *) idata, "MpInterpreterData", NULL); PyDict_SetItemString(interpreters, (char *)name, p); Py_DECREF(p); @@ -261,7 +261,7 @@ idata = save_interpreter(name, istate); } else { - idata = (interpreterdata *)PyCObject_AsVoidPtr(p); + idata = (interpreterdata *)PyCapsule_GetPointer(p, "MpInterpreterData"); } #ifdef WITH_THREAD diff -Nur mod_python-3.3.1.orig/src/requestobject.c mod_python-3.3.1/src/requestobject.c --- mod_python-3.3.1.orig/src/requestobject.c 2006-12-03 15:36:37.000000000 +1100 +++ mod_python-3.3.1/src/requestobject.c 2010-10-20 19:33:28.853600297 +1100 @@ -1611,7 +1611,7 @@ } } else if (strcmp(name, "_request_rec") == 0) { - return PyCObject_FromVoidPtr(self->request_rec, 0); + return PyCapsule_New(self->request_rec, "MpRequest", 0); } else return PyMember_GetOne((char*)self->request_rec, diff -Nur mod_python-3.3.1.orig/src/serverobject.c mod_python-3.3.1/src/serverobject.c --- mod_python-3.3.1.orig/src/serverobject.c 2006-12-03 15:36:37.000000000 +1100 +++ mod_python-3.3.1/src/serverobject.c 2010-10-20 19:33:28.856933673 +1100 @@ -225,7 +225,7 @@ static PyObject *getsrv_recmbr(serverobject *self, void *name) { if (strcmp(name, "_server_rec") == 0) { - return PyCObject_FromVoidPtr(self->server, 0); + return PyCapsule_New(self->server, "MpServer", 0); } return PyMember_GetOne((char*)self->server, find_memberdef(server_rec_mbrs, name)); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
