Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=51662b074721f79af1e6326b1252d279a473901c
commit 51662b074721f79af1e6326b1252d279a473901c Author: Miklos Vajna <[email protected]> Date: Fri Dec 26 22:55:20 2008 +0100 mod_python-3.3.1-2-i686 - add patch and sed hack to fix up build diff --git a/source/network-extra/mod_python/FrugalBuild b/source/network-extra/mod_python/FrugalBuild index 2c0a54c..2d6f3fb 100644 --- a/source/network-extra/mod_python/FrugalBuild +++ b/source/network-extra/mod_python/FrugalBuild @@ -3,22 +3,25 @@ pkgname=mod_python pkgver=3.3.1 -pkgrel=1 +pkgrel=2 pkgdesc="An Apache module that embeds the Python interpreter within the server." url="http://www.modpython.org/"; -depends=('apache>=2.2.0' 'python') +depends=('apache>=2.2.0' 'python>=2.5') groups=('network-extra') backup=(etc/httpd/conf/modules.d/mod_python.conf) archs=('i686' 'x86_64') up2date="lynx -dump http://httpd.apache.org/modules/python-download.cgi|grep 'now available'|sed 's/.* \([0-9\.]*\) .*/\1/;q'" source=(http://www.apache.org/dist/httpd/modpython/mod_python-$pkgver.tgz \ - mod_python.conf) -signatures=($source.asc '') + mod_python.conf \ + mod_python-apr_brigade_sentinel.patch) +signatures=($source.asc '' '') build() { Fpatchall - Fmake --with-apxs=/usr/sbin/apxs + Fconf --with-apxs=/usr/sbin/apxs + Fsed ' -Wl,--hash-style $' '' src/Makefile + make || return 1 Fmakeinstall Ffile /etc/httpd/conf/modules.d/mod_python.conf Fdocrel doc-html diff --git a/source/network-extra/mod_python/mod_python-apr_brigade_sentinel.patch b/source/network-extra/mod_python/mod_python-apr_brigade_sentinel.patch new file mode 100644 index 0000000..95e3ea2 --- /dev/null +++ b/source/network-extra/mod_python/mod_python-apr_brigade_sentinel.patch @@ -0,0 +1,12 @@ +diff -burN mod_python-3.3.1.original/src/connobject.c mod_python-3.3.1/src/connobject.c +--- mod_python-3.3.1.original/src/connobject.c 2006-12-03 05:36:37.000000000 +0100 ++++ mod_python-3.3.1/src/connobject.c 2008-07-15 01:05:01.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; \ No newline at end of file _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
