2 files changed, 52 insertions, 0 deletions
diff --git a/www-apache/mod_python/files/mod_python-3.3.1-LDFLAGS.patch b/www-apache/mod_python/files/mod_python-3.3.1-LDFLAGS.patch
new file mode 100644
index 000000000000..0562f93db748
--- /dev/null
+++ b/www-apache/mod_python/files/mod_python-3.3.1-LDFLAGS.patch
@@ -0,0 +1,14 @@
+--- configure.in
++++ configure.in
+@@ -267,10 +267,7 @@
+ AC_MSG_CHECKING(linker flags used to link Python)
+ AC_SUBST(LDFLAGS)
+ PyLFS=`grep "^LINKFORSHARED=" ${PyLIBPL}/Makefile | cut -f2 -d= | tr '\011\012\015' '   '`
+-PyLDFLAGS=`grep "^LDFLAGS=" ${PyLIBPL}/Makefile | cut -f2 -d= | tr '\011\012\015' '   '`
+-LDFLAGS="${LDFLAGS} ${PyLFS} ${PyLDFLAGS}"
+-LDFLAGS="${LDFLAGS} ${PY_LDFLAGS}"
+-AC_MSG_RESULT($PY_LDFLAGS)
++LDFLAGS="${LDFLAGS} ${PyLFS}"
+ 
+ AC_MSG_CHECKING(where Python include files are)
+ AC_SUBST(INCLUDES)
diff --git a/www-apache/mod_python/files/mod_python-3.3.1-apache-2.4.patch b/www-apache/mod_python/files/mod_python-3.3.1-apache-2.4.patch
new file mode 100644
index 000000000000..8484d08d8620
--- /dev/null
+++ b/www-apache/mod_python/files/mod_python-3.3.1-apache-2.4.patch
@@ -0,0 +1,38 @@
+TODO:
+src/requestobject.c uses ap_requires() which has been removed in r368027.
+https://svn.apache.org/viewvc?view=rev&revision=368027
+
+--- src/include/mod_python.h
++++ src/include/mod_python.h
+@@ -72,6 +72,11 @@
+ #endif
+ #endif
+ 
++#if !AP_MODULE_MAGIC_AT_LEAST(20081201,0)
++#define ap_unixd_config unixd_config
++#define ap_unixd_set_global_mutex_perms unixd_set_global_mutex_perms
++#endif
++
+ /* Python headers */
+ /* this gets rid of some compile warnings */
+ #if defined(_POSIX_THREADS)
+--- src/mod_python.c
++++ src/mod_python.c
+@@ -555,14 +555,14 @@
+         else {
+ 
+             /*XXX As of httpd 2.0.4, the below should be just
+-              a call to unixd_set_global_mutex_perms(mutex[n]); and
++              a call to ap_unixd_set_global_mutex_perms(mutex[n]); and
+               nothing else... For now, while 2.0.48 isn't commonplace yet,
+               this ugly code should be here */
+ 
+ #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
+         }