SPECS: apache-mod_python.spec - up to 3.2.8 security release

[Kamil Jakubowski]

Hi,

- up to 3.2.8 security release
- poprawiony apache-mod_python-apr-status-is-success.patch
- SOA#1, rel 6
-------------- next part --------------
--- apache-mod_python.spec	2006-03-21 13:54:14.381517000 +0100
+++ apache-mod_python.spec.new	2006-03-21 13:53:49.471960250 +0100
@@ -19,12 +19,12 @@
 Summary(sl):	Vključeni pythonski tolmač za spletni strežnik Apache
 Summary(sv):	En inbyggd Python-interpretator för webbservern Apache
 Name:		apache-mod_%{mod_name}
-Version:	3.1.4
-Release:	5
+Version:	3.2.8
+Release:	6
 License:	Apache Group License
 Group:		Networking/Daemons
 Source0:	http://www.apache.org/dist/httpd/modpython/mod_%{mod_name}-%{version}.tgz
-# Source0-md5:	607175958137b06bcda91110414c82a1
+# Source0-md5:	d03452979a6a334f73cc2b95b39db331
 Source1:	%{name}.conf
 Patch0:		%{name}-lib64.patch
 Patch1:		%{name}-apr-status-is-success.patch
-------------- next part --------------
diff -urN mod_python-3.2.8/src/connobject.c mod_python-3.2.8.new/src/connobject.c
--- mod_python-3.2.8/src/connobject.c	2006-02-02 22:30:55.000000000 +0100
+++ mod_python-3.2.8.new/src/connobject.c	2006-03-21 13:47:36.384643750 +0100
@@ -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 != APR_SUCCESS) {
             PyErr_SetObject(PyExc_IOError, 
                             PyString_FromString("Connection read error"));
             return NULL;
@@ -321,12 +321,8 @@
     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");
-        }
+	port = addr->port; 
+	ret = Py_BuildValue("Oi", addrobj, port );
         Py_DECREF(addrobj);
     }
     return ret;
diff -urN mod_python-3.2.8/src/filterobject.c mod_python-3.2.8.new/src/filterobject.c
--- mod_python-3.2.8/src/filterobject.c	2004-11-25 23:10:52.000000000 +0100
+++ mod_python-3.2.8.new/src/filterobject.c	2006-03-21 13:25:05.140196250 +0100
@@ -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;