[FreeBSD Port: mod_python-3.1.4_1] "Undefined symbol" with apache22

[Andrey Chichak]

Hi!

Small patch for mod_python3 and apache22 compatibility in attach included.

It fixes port's Makefile, pkg-plist and contains patch for mod_python 
sources to make them apr 1.0 compatible.

Good luck!
-------------- next part --------------
diff -ruN mod_python3.ORIG/Makefile mod_python3/Makefile
--- mod_python3.ORIG/Makefile	Thu Jan  5 12:48:20 2006
+++ mod_python3/Makefile	Thu Jan  5 11:58:10 2006
@@ -16,8 +16,8 @@
 MAINTAINER=	perky at FreeBSD.org
 COMMENT=	Apache module that embeds the Python interpreter within the server
 
-WITH_APACHE2=	yes
-USE_APACHE=	yes
+WITH_APACHE=	yes
+USE_APACHE=	2.0+
 USE_PYTHON=	2.3+
 
 LATEST_LINK=	mod_python3
diff -ruN mod_python3.ORIG/files/patch-apr10 mod_python3/files/patch-apr10
--- mod_python3.ORIG/files/patch-apr10	Thu Jan  1 07:00:00 1970
+++ mod_python3/files/patch-apr10	Thu Jan  5 12:44:52 2006
@@ -0,0 +1,24 @@
+diff -ru src.ORIG/connobject.c src/connobject.c
+--- src.ORIG/connobject.c	Thu Jan  5 12:40:27 2006
++++ src/connobject.c	Thu Jan  5 12:37:23 2006
+@@ -78,7 +78,7 @@
+     rc = ap_get_brigade(c->input_filters, bb, mode, APR_BLOCK_READ, bufsize);
+     Py_END_ALLOW_THREADS;
+ 
+-    if (! APR_STATUS_IS_SUCCESS(rc)) {
++    if (rc != APR_SUCCESS) {
+         PyErr_SetObject(PyExc_IOError, 
+                         PyString_FromString("Connection read error"));
+         return NULL;
+diff -ru src.ORIG/filterobject.c src/filterobject.c
+--- src.ORIG/filterobject.c	Thu Jan  5 12:40:27 2006
++++ src/filterobject.c	Thu Jan  5 12:38:48 2006
+@@ -178,7 +178,7 @@
+                                   APR_BLOCK_READ, self->readbytes);
+         Py_END_ALLOW_THREADS;
+ 
+-        if (!APR_STATUS_IS_EAGAIN(self->rc) && !APR_STATUS_IS_SUCCESS(self->rc)) {
++        if (!APR_STATUS_IS_EAGAIN(self->rc) && self->rc != APR_SUCCESS) {
+             PyErr_SetObject(PyExc_IOError, 
+                             PyString_FromString("Input filter read error"));
+             return NULL;
diff -ruN mod_python3.ORIG/pkg-plist mod_python3/pkg-plist
--- mod_python3.ORIG/pkg-plist	Thu Jan  5 12:48:20 2006
+++ mod_python3/pkg-plist	Thu Jan  5 12:02:25 2006
@@ -1,6 +1,6 @@
-libexec/apache2/mod_python.so
- at exec %D/sbin/apxs -e -a -n python %f
- at unexec %D/sbin/apxs -e -A -n python %f
+%%APACHEMODDIR%%/%%AP_MODULE%%
+ at exec %D/sbin/apxs -e -a -n %%AP_NAME%% %f
+ at unexec %D/sbin/apxs -e -A -n %%AP_NAME%% %f
 %%PYTHON_SITELIBDIR%%/mod_python/Cookie.py
 %%PYTHON_SITELIBDIR%%/mod_python/Cookie.pyc
 %%PYTHON_SITELIBDIR%%/mod_python/Cookie.pyo