From owner-freebsd-ports@FreeBSD.ORG Thu Jan 5 10:36:54 2006 Return-Path: X-Original-To: freebsd-ports@freebsd.org Delivered-To: freebsd-ports@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 83C3716A41F for ; Thu, 5 Jan 2006 10:36:54 +0000 (GMT) (envelope-from chch@cds.tomsknet.ru) Received: from cds.tomsknet.ru (cds.tomsknet.ru [217.18.136.2]) by mx1.FreeBSD.org (Postfix) with ESMTP id 51E5943D4C for ; Thu, 5 Jan 2006 10:36:52 +0000 (GMT) (envelope-from chch@cds.tomsknet.ru) Received: from cds.tomsknet.ru (localhost.cds.tomsk.ru [127.0.0.1]) by cds.tomsknet.ru (Postfix) with ESMTP id DCD6C6135; Thu, 5 Jan 2006 16:34:31 +0600 (NOVT) Received: from [192.168.1.86] (wschch.cds.com [192.168.1.86]) by cds.tomsknet.ru (Postfix) with ESMTP id BAA8160D9; Thu, 5 Jan 2006 16:34:31 +0600 (NOVT) Message-ID: <43BCF6C5.9040005@cds.tomsknet.ru> Date: Thu, 05 Jan 2006 16:36:53 +0600 From: Andrey Chichak User-Agent: Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.7.12) Gecko/20050915 X-Accept-Language: en-us, en MIME-Version: 1.0 To: freebsd-ports@freebsd.org, perky@i18n.org Content-Type: multipart/mixed; boundary="------------080406090700010200080206" X-Virus-Scanned: ClamAV using ClamSMTP Cc: Subject: [FreeBSD Port: mod_python-3.1.4_1] "Undefined symbol" with apache22 X-BeenThere: freebsd-ports@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Porting software to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 05 Jan 2006 10:36:54 -0000 This is a multi-part message in MIME format. --------------080406090700010200080206 Content-Type: text/plain; charset=us-ascii; format=flowed Content-Transfer-Encoding: 7bit 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! --------------080406090700010200080206 Content-Type: text/plain; name="patch_mod_python3_for_apache22_compatibility" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="patch_mod_python3_for_apache22_compatibility" 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@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 -@exec %D/sbin/apxs -e -a -n python %f -@unexec %D/sbin/apxs -e -A -n python %f +%%APACHEMODDIR%%/%%AP_MODULE%% +@exec %D/sbin/apxs -e -a -n %%AP_NAME%% %f +@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 --------------080406090700010200080206--