Browse Source

fix building against current Apache/APR version

master
parent
commit
3a648e59c9
  1. 16
      apache-python/apache-python.patch
  2. 2
      apache-python/apache-python.spec

16
apache-python/apache-python.patch

@ -1,6 +1,6 @@
Index: configure Index: configure
--- configure.orig 2006-03-11 04:46:52 +0100 --- configure.orig 2006-03-11 04:46:52.000000000 +0100
+++ configure 2008-01-18 18:05:44 +0100 +++ configure 2010-07-25 13:51:06.000000000 +0200
@@ -3022,7 +3022,7 @@ @@ -3022,7 +3022,7 @@
echo "$as_me:$LINENO: checking where Python include files are" >&5 echo "$as_me:$LINENO: checking where Python include files are" >&5
echo $ECHO_N "checking where Python include files are... $ECHO_C" >&6 echo $ECHO_N "checking where Python include files are... $ECHO_C" >&6
@ -10,3 +10,15 @@ Index: configure
INCLUDES="${INCLUDES} ${AP_INCLUDES} ${PY_INCLUDES}" INCLUDES="${INCLUDES} ${AP_INCLUDES} ${PY_INCLUDES}"
echo "$as_me:$LINENO: result: $PY_INCLUDES" >&5 echo "$as_me:$LINENO: result: $PY_INCLUDES" >&5
echo "${ECHO_T}$PY_INCLUDES" >&6 echo "${ECHO_T}$PY_INCLUDES" >&6
Index: src/connobject.c
--- src/connobject.c.orig 2006-12-03 05:36:37.000000000 +0100
+++ src/connobject.c 2010-07-25 13:55:18.000000000 +0200
@@ -139,7 +139,7 @@
bytes_read = 0;
while ((bytes_read < len || len == 0) &&
- !(b == APR_BRIGADE_SENTINEL(b) ||
+ !(b == APR_BRIGADE_SENTINEL(bb) ||
APR_BUCKET_IS_EOS(b) || APR_BUCKET_IS_FLUSH(b))) {
const char *data;

2
apache-python/apache-python.spec

@ -32,7 +32,7 @@ Class: EVAL
Group: Web Group: Web
License: Apache License: Apache
Version: 3.3.1 Version: 3.3.1
Release: 20080119 Release: 20100725
# list of sources # list of sources
Source0: http://www.apache.org/dist/httpd/modpython/mod_python-%{version}.tgz Source0: http://www.apache.org/dist/httpd/modpython/mod_python-%{version}.tgz

Loading…
Cancel
Save