Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Lalo Martins (9182e2a6c7fc3fccfaa0be7dbff4c16287a2560b)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Lalo Martins <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Lalo Martins (9182e2a6c7fc3fccfaa0be7dbff4c16287a2560b)
  • Date: Wed, 23 Nov 2011 22:23:07 -0600

GIT changes to master grimoire by Lalo Martins <lalo.martins AT gmail.com>:

http/mod_python/DETAILS | 2 +-
http/mod_python/HISTORY | 5 +++++
http/mod_python/PRE_BUILD | 3 +++
http/mod_python/mod_python-3.3.1-apr.patch | 12 ++++++++++++
4 files changed, 21 insertions(+), 1 deletion(-)

New commits:
commit 9182e2a6c7fc3fccfaa0be7dbff4c16287a2560b
Author: Lalo Martins <lalo.martins AT gmail.com>
Commit: Lalo Martins <lalo.martins AT gmail.com>

mod_python compatibility for apr-util >= 1.3.4

diff --git a/http/mod_python/DETAILS b/http/mod_python/DETAILS
index 76c127f..e705a1e 100755
--- a/http/mod_python/DETAILS
+++ b/http/mod_python/DETAILS
@@ -12,7 +12,7 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://www.apache.org/dist/httpd/modpython/$SOURCE
WEB_SITE=http://www.modpython.org/
ENTERED=20021129
- UPDATED=20030614
+ PATCHLEVEL=1
KEYWORDS="interpreter http python"
SHORT='Mod_python is an Apache module that embeds the Python
interpreter within the server'
cat << EOF
diff --git a/http/mod_python/HISTORY b/http/mod_python/HISTORY
index 0dbb620..abb762c 100644
--- a/http/mod_python/HISTORY
+++ b/http/mod_python/HISTORY
@@ -1,3 +1,8 @@
+2011-11-23 Lalo Martins <lalo AT sourcemage.org>
+ * PRE_BUILD: use a patch for compatibility with apr-util >= 1.3.4
+ see: https://bugzilla.redhat.com/show_bug.cgi?id=465246
+ or https://issues.apache.org/jira/browse/MODPYTHON-249
+
2007-04-25 Bearcat M. Sandor <Sourcemage AT feline-soul.com>
* DETAILS: Updated to 3.3.1

diff --git a/http/mod_python/PRE_BUILD b/http/mod_python/PRE_BUILD
new file mode 100755
index 0000000..47f93db
--- /dev/null
+++ b/http/mod_python/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+patch -p1 < $SCRIPT_DIRECTORY/mod_python-3.3.1-apr.patch
\ No newline at end of file
diff --git a/http/mod_python/mod_python-3.3.1-apr.patch
b/http/mod_python/mod_python-3.3.1-apr.patch
new file mode 100644
index 0000000..216b049
--- /dev/null
+++ b/http/mod_python/mod_python-3.3.1-apr.patch
@@ -0,0 +1,12 @@
+diff -rNu mod_python-3.3.1/src/connobject.c
mod_python-3.3.1-atomix/src/connobject.c
+--- mod_python-3.3.1/src/connobject.c 2006-12-03 05:36:37.000000000 +0100
++++ mod_python-3.3.1-atomix/src/connobject.c 2008-10-02 14:10:02.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;



  • [SM-Commit] GIT changes to master grimoire by Lalo Martins (9182e2a6c7fc3fccfaa0be7dbff4c16287a2560b), Lalo Martins, 11/23/2011

Archive powered by MHonArc 2.6.24.

Top of Page