From: Thierry Parmentelat <thierry.parmentelat@inria.fr>
Date: Tue, 28 May 2013 14:05:48 +0000 (+0200)
Subject: add patch for apache24
X-Git-Tag: mod_python-3.3.1-1~1
X-Git-Url: http://git.onelab.eu/?p=mod_python.git;a=commitdiff_plain;h=535b2e1e2c8a020376b9d2469ffab86815718b3f

add patch for apache24
---

diff --git a/mod_python-3.3.1-apache24.patch b/mod_python-3.3.1-apache24.patch
new file mode 100644
index 0000000..565f9e3
--- /dev/null
+++ b/mod_python-3.3.1-apache24.patch
@@ -0,0 +1,62 @@
+--- mod_python-3.3.1/src/mod_python.c~	2006-11-09 07:21:23.000000000 +0100
++++ mod_python-3.3.1/src/mod_python.c	2013-05-05 21:57:30.378136612 +0200
+@@ -561,8 +561,8 @@
+ 
+ #if !defined(OS2) && !defined(WIN32) && !defined(BEOS) && !defined(NETWARE)
+             if  (!geteuid()) {
+-                chown(fname, unixd_config.user_id, -1);
+-                unixd_set_global_mutex_perms(mutex[n]);
++                chown(fname, ap_unixd_config.user_id, -1);
++                ap_unixd_set_global_mutex_perms(mutex[n]);
+             }
+ #endif
+         }
+--- mod_python-3.3.1/src/serverobject.c~	2006-12-03 05:36:37.000000000 +0100
++++ mod_python-3.3.1/src/serverobject.c	2013-05-05 22:53:26.721477649 +0200
+@@ -191,7 +191,7 @@
+     {"server_hostname",    T_STRING,  OFF(server_hostname)},
+     {"port",               T_SHORT,   OFF(port)},
+     {"error_fname",        T_STRING,  OFF(error_fname)},
+-    {"loglevel",           T_INT,     OFF(loglevel)},
++    {"loglevel",           T_INT,     OFF(log.level)},
+     {"is_virtual",         T_INT,     OFF(is_virtual)},
+     /* XXX implement module_config ? */
+     /* XXX implement lookup_defaults ? */
+@@ -288,7 +288,9 @@
+ 
+ static PyObject *my_generation(serverobject *self, void *objname)
+ {
+-    return PyInt_FromLong((long)ap_my_generation);
++    ap_generation_t mpm_generation;
++    ap_mpm_query(AP_MPMQ_GENERATION, &mpm_generation);
++    return PyInt_FromLong((long)mpm_generation);
+ }
+ 
+ static PyObject *restart_time(serverobject *self, void *objname)
+--- mod_python-3.3.1/src/connobject.c.orig	2013-05-05 23:03:40.876114437 +0200
++++ mod_python-3.3.1/src/connobject.c	2013-05-05 23:10:10.889444946 +0200
+@@ -286,8 +286,10 @@
+     /* XXX vhost_lookup_data? */
+     /* XXX client_socket? */
+     {"local_addr",         T_OBJECT,    0,                       RO},
++    {"client_addr",        T_OBJECT,    0,                       RO},
+     {"remote_addr",        T_OBJECT,    0,                       RO},
+-    {"remote_ip",          T_STRING,    OFF(remote_ip),          RO},
++    {"client_ip",          T_STRING,    OFF(client_ip),          RO},
++    {"remote_ip",          T_STRING,    OFF(client_ip),          RO},
+     {"remote_host",        T_STRING,    OFF(remote_host),        RO},
+     {"remote_logname",     T_STRING,    OFF(remote_logname),     RO},
+     {"aborted",            T_INT,       0,                       RO},
+@@ -414,8 +416,11 @@
+     else if (strcmp(name, "local_addr") == 0) {
+         return makesockaddr(self->conn->local_addr);
+     }
++    else if (strcmp(name, "client_addr") == 0) {
++        return makesockaddr(self->conn->client_addr);
++    }
+     else if (strcmp(name, "remote_addr") == 0) {
+-        return makesockaddr(self->conn->remote_addr);
++        return makesockaddr(self->conn->client_addr);
+     }
+     else if (strcmp(name, "notes") == 0) {
+         Py_INCREF(self->notes);
diff --git a/mod_python-3.3.1-apache24.url b/mod_python-3.3.1-apache24.url
new file mode 100644
index 0000000..f6ff590
--- /dev/null
+++ b/mod_python-3.3.1-apache24.url
@@ -0,0 +1 @@
+https://raw.github.com/pld-linux/apache-mod_python/master/apache-mod_python-apache24.patch
diff --git a/mod_python.spec b/mod_python.spec
index 3a3dc37..c965696 100644
--- a/mod_python.spec
+++ b/mod_python.spec
@@ -17,6 +17,7 @@ Patch2: mod_python-3.1.4-cflags.patch
 Patch3: mod_python-3.3.1-buckets.patch
 Patch4: mod_python-3.3.1-pycapsule.patch
 Patch5: mod_python-3.3.1-no-user-site-directory.patch
+Patch6: mod_python-3.3.1-apache24.patch
 
 Packager: PlanetLab <devel@planet-lab.org>
 Distribution: PlanetLab %{plrelease}
@@ -43,6 +44,7 @@ performance over the traditional CGI approach.
 %patch3 -p1 -b .buckets
 %patch4 -p1 -b .capsule
 %patch5 -p1 -b .no-user-site-directory
+%patch6 -p1 -b .apache24
 
 # Convert to utf-8
 for file in CREDITS NEWS; do