[arch-commits] Commit in mod_python/repos (3 files)

[andyrtr at archlinux.org]

    Date: Thursday, July 10, 2008 @ 15:41:24
  Author: andyrtr
Revision: 4842

Merged revisions 3353-4841 via svnmerge from 
svn+ssh://svn.archlinux.org/home/svn-packages/mod_python/trunk

........
  r4841 | andyrtr | 2008-07-10 19:40:54 +0000 (Do, 10 Jul 2008) | 1 line
  
  upgpkg: mod_python 3.3.1-3
........

Added:
  mod_python/repos/testing-x86_64/compile.patch
    (from rev 4841, mod_python/trunk/compile.patch)
Modified:
  mod_python/repos/testing-x86_64/	(properties)
  mod_python/repos/testing-x86_64/PKGBUILD

---------------+
 PKGBUILD      |   20 ++++++++++----------
 compile.patch |   11 +++++++++++
 2 files changed, 21 insertions(+), 10 deletions(-)


Property changes on: mod_python/repos/testing-x86_64
___________________________________________________________________
Name: svnmerge-integrated
   - /mod_python/trunk:1-3352
   + /mod_python/trunk:1-4841

Modified: testing-x86_64/PKGBUILD
===================================================================
--- testing-x86_64/PKGBUILD	2008-07-10 19:40:54 UTC (rev 4841)
+++ testing-x86_64/PKGBUILD	2008-07-10 19:41:24 UTC (rev 4842)
@@ -2,22 +2,22 @@
 # Maintainer: Judd Vinet <jvinet at zeroflux.org>
 pkgname=mod_python
 pkgver=3.3.1
-pkgrel=2
+pkgrel=3
 pkgdesc="an Apache module that embeds the Python interpreter within the server"
-arch=(i686 x86_64)
+arch=('i686' 'x86_64')
+license=('APACHE')
 url="http://www.modpython.org/"
-depends=('apache>=2.2.0' 'python>=2.5-1')
+depends=('apache>=2.2.9-4' 'python>=2.5.2-5')
 install=mod_python.install
-source=(http://www.apache.org/dist/httpd/modpython/mod_python-$pkgver.tgz mod_python.patch apache22.patch)
-md5sums=('a3b0150176b726bd2833dac3a7837dc5' '800c9d65cfef8105e9d1729653d69a39'\
-         '24a1ad9acf709fb75d4aa836e37fdecc')
+source=(http://www.apache.org/dist/httpd/modpython/mod_python-$pkgver.tgz
+	compile.patch)
+md5sums=('a3b0150176b726bd2833dac3a7837dc5'
+         '4786c158223c2d3a94f3b6e69826b522')
 
 build() {
   cd $startdir/src/$pkgname-$pkgver
-  #patch -Np1 -i ../apache22.patch || return 1
-  #patch -p1 -i ../mod_python.patch || return 1
-  autoconf
-  automake
+  patch -Np0 -i ../compile.patch || return 1
+  autoreconf
   ./configure --prefix=/usr
   make || return 1
   make DESTDIR=$startdir/pkg install

Copied: mod_python/repos/testing-x86_64/compile.patch (from rev 4841, mod_python/trunk/compile.patch)
===================================================================
--- testing-x86_64/compile.patch	                        (rev 0)
+++ testing-x86_64/compile.patch	2008-07-10 19:41:24 UTC (rev 4842)
@@ -0,0 +1,11 @@
+--- src/connobject.c	2006-12-03 04:36:37.000000000 +0000
++++ src/connobject.c.new	2008-07-10 19:35:36.000000000 +0000
+@@ -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;