Browse Source

mod_python: Updated (3.1.4 -> 3.3.1)

stable/0.2
Christian Wiese 14 years ago
parent
commit
6242243849
  1. 40
      python/mod_python/bash-31.patch
  2. 32
      python/mod_python/mod_python-3.3.1-buckets.patch
  3. 77
      python/mod_python/mod_python-3.3.1-pycapsule.patch
  4. 17
      python/mod_python/mod_python.conf
  5. 6
      python/mod_python/mod_python.desc

40
python/mod_python/bash-31.patch

@ -1,40 +0,0 @@
# --- SDE-COPYRIGHT-NOTE-BEGIN ---
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
# Filename: package/.../mod_python/bash-31.patch
# Copyright (C) 2006 The T2 SDE Project
#
# More information can be found in the files COPYING and README.
#
# This patch file is dual-licensed. It is available under the license the
# patched project is licensed under, as long as it is an OpenSource license
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
# of the GNU General Public License as published by the Free Software
# Foundation; either version 2 of the License, or (at your option) any later
# version.
# --- SDE-COPYRIGHT-NOTE-END ---
diff -Nur mod_python-3.1.4-orig/configure mod_python-3.1.4/configure
--- mod_python-3.1.4-orig/configure 2005-01-29 21:25:27.000000000 +0000
+++ mod_python-3.1.4/configure 2006-01-24 21:11:44.387829000 +0000
@@ -2772,7 +2772,7 @@
# get the mod_python version
MP_VERSION=`awk '/MPV_STRING/ {print $3}' src/include/mpversion.h`
-MP_VERSION=`echo $MP_VERSION | sed s/\\"//g`
+MP_VERSION=`echo $MP_VERSION | sed s/\"//g`
ac_config_files="$ac_config_files Makefile src/Makefile Doc/Makefile test/testconf.py dist/setup.py dist/Makefile"
cat >confcache <<\_ACEOF
diff -Nur mod_python-3.1.4-orig/configure.in mod_python-3.1.4/configure.in
--- mod_python-3.1.4-orig/configure.in 2005-01-29 21:25:27.000000000 +0000
+++ mod_python-3.1.4/configure.in 2006-01-24 21:11:59.936800750 +0000
@@ -275,7 +275,7 @@
# get the mod_python version
AC_SUBST(MP_VERSION)
MP_VERSION=`awk '/MPV_STRING/ {print $3}' src/include/mpversion.h`
-MP_VERSION=`echo $MP_VERSION | sed s/\\"//g`
+MP_VERSION=`echo $MP_VERSION | sed s/\"//g`
AC_OUTPUT(Makefile src/Makefile Doc/Makefile test/testconf.py dist/setup.py dist/Makefile)

32
python/mod_python/mod_python-3.3.1-buckets.patch

@ -0,0 +1,32 @@
# --- SDE-COPYRIGHT-NOTE-BEGIN ---
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
# Filename: package/.../mod_python/mod_python-3.3.1-buckets.patch
# Copyright (C) 2011 The OpenSDE Project
#
# More information can be found in the files COPYING and README.
#
# This patch file is dual-licensed. It is available under the license the
# patched project is licensed under, as long as it is an OpenSource license
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
# of the GNU General Public License as published by the Free Software
# Foundation; either version 2 of the License, or (at your option) any later
# version.
# --- SDE-COPYRIGHT-NOTE-END ---
Description: fix build failure, thanks to Tomo Vuckovic (#465246)
Reference: https://bugzilla.redhat.com/show_bug.cgi?id=465246
Origin: Fedora Project
http://pkgs.fedoraproject.org/gitweb/?p=mod_python.git;a=blob_plain;f=mod_python-3.3.1-buckets.patch;hb=HEAD
--- mod_python-3.3.1/src/connobject.c.buckets
+++ mod_python-3.3.1/src/connobject.c
@@ -139,7 +139,7 @@ static PyObject * _conn_read(conn_rec *c
bytes_read = 0;
while ((bytes_read < len || len == 0) &&
- !(b == APR_BRIGADE_SENTINEL(b) ||
+ !(b == APR_BRIGADE_SENTINEL(bb) ||
APR_BUCKET_IS_EOS(b) || APR_BUCKET_IS_FLUSH(b))) {
const char *data;

77
python/mod_python/mod_python-3.3.1-pycapsule.patch

@ -0,0 +1,77 @@
# --- SDE-COPYRIGHT-NOTE-BEGIN ---
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
# Filename: package/.../mod_python/mod_python-3.3.1-pycapsule.patch
# Copyright (C) 2011 The OpenSDE Project
#
# More information can be found in the files COPYING and README.
#
# This patch file is dual-licensed. It is available under the license the
# patched project is licensed under, as long as it is an OpenSource license
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
# of the GNU General Public License as published by the Free Software
# Foundation; either version 2 of the License, or (at your option) any later
# version.
# --- SDE-COPYRIGHT-NOTE-END ---
Reference: https://bugzilla.redhat.com/show_bug.cgi?id=640432
Origin: Fedora Project
http://pkgs.fedoraproject.org/gitweb/?p=mod_python.git;a=blob_plain;f=mod_python-3.3.1-pycapsule.patch;hb=HEAD
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));

17
python/mod_python/mod_python.conf

@ -0,0 +1,17 @@
# --- SDE-COPYRIGHT-NOTE-BEGIN ---
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
# Filename: package/.../mod_python/mod_python.conf
# Copyright (C) 2011 The OpenSDE Project
#
# More information can be found in the files COPYING and README.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; version 2 of the License. A copy of the
# GNU General Public License can be found in the file COPYING.
# --- SDE-COPYRIGHT-NOTE-END ---
# apache is always required
pkgprefix -t apache
var_append extraconfopt ' ' "--with-apxs=$(pkgprefix -r sbindir apache)/apxs"

6
python/mod_python/mod_python.desc

@ -2,7 +2,7 @@
[COPY] This copyright note is auto-generated by ./scripts/Create-CopyPatch.
[COPY]
[COPY] Filename: package/.../mod_python/mod_python.desc
[COPY] Copyright (C) 2006 The OpenSDE Project
[COPY] Copyright (C) 2006 - 2011 The OpenSDE Project
[COPY] Copyright (C) 2004 - 2006 The T2 SDE Project
[COPY]
[COPY] More information can be found in the files COPYING and README.
@ -30,8 +30,8 @@
[L] GPL
[S] Stable
[V] 3.1.4
[V] 3.3.1
[P] X -----5---9 800.000
[D] 2961476982 mod_python-3.1.4.tgz http://apache.247available.com/httpd/modpython/
[D] 1636913624 mod_python-3.3.1.tgz http://archive.apache.org/dist/httpd/modpython/

Loading…
Cancel
Save