[22085] trunk/dports/www/mod_python

[source_changes at macosforge.org]

Revision: 22085
          http://trac.macosforge.org/projects/macports/changeset/22085
Author:   mww at macports.org
Date:     2007-02-17 03:58:02 -0800 (Sat, 17 Feb 2007)

Log Message:
-----------
version 3.3.1

Modified Paths:
--------------
    trunk/dports/www/mod_python/Portfile

Removed Paths:
-------------
    trunk/dports/www/mod_python/files/apr.diff

Modified: trunk/dports/www/mod_python/Portfile
===================================================================
--- trunk/dports/www/mod_python/Portfile	2007-02-17 10:18:04 UTC (rev 22084)
+++ trunk/dports/www/mod_python/Portfile	2007-02-17 11:58:02 UTC (rev 22085)
@@ -3,11 +3,10 @@
 PortSystem 1.0
 
 name			mod_python
-version			3.2.8
-revision		1
+version			3.3.1
 categories		www python
 platforms		darwin
-maintainers		mww at opendarwin.org
+maintainers		mww at macports.org
 description		Apache2 module that embeds Python within the server.
 long_description	Mod_python is an Apache 2 module that embeds the \
 				Python interpreter within the server. With mod_python \
@@ -20,14 +19,11 @@
 homepage		http://www.modpython.org/
 master_sites	apache:httpd/modpython
 extract.suffix	.tgz
-checksums		sha1 879900c1dece20a2ed08bfc81c16bfe539ee63de
+checksums		sha1 e538170fd78e09408b6d8593da980b126a0fef93
 
 depends_build	port:flex
 depends_lib		port:apache2 port:python24
 
-# see http://comments.gmane.org/gmane.comp.version-control.subversion.trac.general/7316
-patchfiles		apr.diff
-
 configure.env	CFLAGS="-I${prefix}/include/python2.4" \
 				LDFLAGS="-Wl,-F${prefix}/Library/Frameworks -L${prefix}/lib"
 configure.args	--with-apxs=${prefix}/apache2/bin/apxs \

Deleted: trunk/dports/www/mod_python/files/apr.diff
===================================================================
--- trunk/dports/www/mod_python/files/apr.diff	2007-02-17 10:18:04 UTC (rev 22084)
+++ trunk/dports/www/mod_python/files/apr.diff	2007-02-17 11:58:02 UTC (rev 22085)
@@ -1,55 +0,0 @@
-diff --speed-large-files --minimal -Nru mod_python-3.2.8.orig/src/connobject.c mod_python-3.2.8/src/connobject.c
---- mod_python-3.2.8.orig/src/connobject.c	2006-03-08 01:57:06.753128000 -0500
-+++ src/connobject.c	2006-03-08 01:56:01.738907000 -0500
-@@ -79,7 +79,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) {
-             PyErr_SetObject(PyExc_IOError, 
-                             PyString_FromString("Connection read error"));
-             return NULL;
-@@ -320,13 +320,7 @@
-     PyObject *addrobj = makeipaddr(addr);
-     PyObject *ret = NULL;
-     if (addrobj) {
--        apr_port_t port;
--        if(apr_sockaddr_port_get(&port, addr)==APR_SUCCESS) {
--            ret = Py_BuildValue("Oi", addrobj, port );
--        }
--        else {
--            PyErr_SetString(PyExc_SystemError,"apr_sockaddr_port_get failure");
--        }
-+        ret = Py_BuildValue("Oi", addrobj, ntohs(addr->sa.sin.sin_port));
-         Py_DECREF(addrobj);
-     }
-     return ret;
-diff --speed-large-files --minimal -Nru mod_python-3.2.8.orig/src/filterobject.c mod_python-3.2.8/src/filterobject.c
---- mod_python-3.2.8.orig/src/filterobject.c	2006-03-08 01:57:06.690443000 -0500
-+++ src/filterobject.c	2006-03-08 01:53:48.343873000 -0500
-@@ -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) {
-             PyErr_SetObject(PyExc_IOError, 
-                             PyString_FromString("Input filter read error"));
-             return NULL;
-diff --speed-large-files --minimal -Nru mod_python-3.2.8.orig/test/test.py mod_python-3.2.8/test/test.py
---- mod_python-3.2.8.orig/test/test.py	2006-03-08 01:57:06.125553000 -0500
-+++ test/test.py	2006-03-08 01:56:55.209055000 -0500
-@@ -290,9 +290,9 @@
-             PythonOption('PythonOptionTest sample_value'),
-             DocumentRoot(DOCUMENT_ROOT),
-             LoadModule("python_module %s" % quoteIfSpace(MOD_PYTHON_SO)),
--            IfModule("!mod_auth.c",
--                     LoadModule("auth_module %s" %
--                                quoteIfSpace(os.path.join(modpath, "mod_auth.so")))))
-+            IfModule("!mod_auth_basic.c",
-+                     LoadModule("auth_basic_module %s" %
-+                                quoteIfSpace(os.path.join(modpath, "mod_auth_basic.so")))))
- 
-         f = open(CONFIG, "w")
-         f.write(str(s))

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20070217/c07115ea/attachment.html