diff options
| author | James Mills <prologic@shortcircuit.net.au> | 2007-04-25 15:05:22 +1000 |
|---|---|---|
| committer | James Mills <prologic@shortcircuit.net.au> | 2007-04-25 15:05:22 +1000 |
| commit | 23e0eceb95f12935a34e7250118fed062dc13821 (patch) | |
| tree | bd475bdaf57c6e0b03dd71fcf8d02662c3b2807f /mod_python | |
| parent | c9a59aca118abfd2b1871a6a8d9896cc923cf031 (diff) | |
| download | contrib-23e0eceb95f12935a34e7250118fed062dc13821.tar.gz contrib-23e0eceb95f12935a34e7250118fed062dc13821.tar.xz | |
mod_python: 3.2.8 -> 3.3.1
Diffstat (limited to 'mod_python')
| -rw-r--r-- | mod_python/.footprint | 5 | ||||
| -rw-r--r-- | mod_python/.md5sum | 4 | ||||
| -rw-r--r-- | mod_python/Pkgfile | 36 | ||||
| -rw-r--r-- | mod_python/configure.patch | 8 |
4 files changed, 29 insertions, 24 deletions
diff --git a/mod_python/.footprint b/mod_python/.footprint index 7cb7b23db..10248e504 100644 --- a/mod_python/.footprint +++ b/mod_python/.footprint @@ -4,7 +4,7 @@ drwxr-xr-x root/root usr/lib/apache/ -rwxr-xr-x root/root usr/lib/apache/mod_python.so drwxr-xr-x root/root usr/lib/python2.5/ drwxr-xr-x root/root usr/lib/python2.5/site-packages/ --rw-r--r-- root/root usr/lib/python2.5/site-packages/mod_python-3.2.8-py2.5.egg-info +-rw-r--r-- root/root usr/lib/python2.5/site-packages/mod_python-3.3.1-py2.5.egg-info drwxr-xr-x root/root usr/lib/python2.5/site-packages/mod_python/ -rw-r--r-- root/root usr/lib/python2.5/site-packages/mod_python/Cookie.py -rw-r--r-- root/root usr/lib/python2.5/site-packages/mod_python/Cookie.pyc @@ -25,6 +25,9 @@ drwxr-xr-x root/root usr/lib/python2.5/site-packages/mod_python/ -rw-r--r-- root/root usr/lib/python2.5/site-packages/mod_python/cgihandler.py -rw-r--r-- root/root usr/lib/python2.5/site-packages/mod_python/cgihandler.pyc -rw-r--r-- root/root usr/lib/python2.5/site-packages/mod_python/cgihandler.pyo +-rw-r--r-- root/root usr/lib/python2.5/site-packages/mod_python/importer.py +-rw-r--r-- root/root usr/lib/python2.5/site-packages/mod_python/importer.pyc +-rw-r--r-- root/root usr/lib/python2.5/site-packages/mod_python/importer.pyo -rw-r--r-- root/root usr/lib/python2.5/site-packages/mod_python/psp.py -rw-r--r-- root/root usr/lib/python2.5/site-packages/mod_python/psp.pyc -rw-r--r-- root/root usr/lib/python2.5/site-packages/mod_python/psp.pyo diff --git a/mod_python/.md5sum b/mod_python/.md5sum index dd64351e7..fbced7413 100644 --- a/mod_python/.md5sum +++ b/mod_python/.md5sum @@ -1,2 +1,2 @@ -525647983569a57ae3a002a2006c7dc7 configure.patch -d03452979a6a334f73cc2b95b39db331 mod_python-3.2.8.tgz +b46447bb88423bc6073708a26de6932c configure.patch +a3b0150176b726bd2833dac3a7837dc5 mod_python-3.3.1.tgz diff --git a/mod_python/Pkgfile b/mod_python/Pkgfile index 3d8809545..b13a5e016 100644 --- a/mod_python/Pkgfile +++ b/mod_python/Pkgfile @@ -1,24 +1,26 @@ -# Description: Apache module that embeds the Python interpreter. -# URL: http://www.modpython.org -# Maintainer: James Mills, prologic at shortcircuit dot net dot au -# Packager: James Mills, prologic at shortcircuit dot net dot au +# Description: Apache module that embeds the Python interpreter. +# URL: http://www.modpython.org +# Maintainer: James Mills, prologic at shortcircuit dot net dot au +# Packager: James Mills, prologic at shortcircuit dot net dot au # -# Depends on: apache, python +# Depends on: apache, python name=mod_python -version=3.2.8 -release=3 -source=(http://www.apache.org/dist/httpd/modpython/$name-$version.tgz \ - configure.patch) +version=3.3.1 +release=1 +source=(http://www.apache.org/dist/httpd/modpython/mod_python-$version.tgz + configure.patch) -build () { - cd $name-$version - patch -p1 -i $SRC/configure.patch configure +build() { + cd mod_python-$version + patch -p1 -i $SRC/configure.patch configure - ./configure \ - --prefix=/usr \ - --with-apxs=/usr/sbin/apxs + ./configure \ + --prefix=/usr \ + --with-apxs=/usr/sbin/apxs - make && make DESTDIR=$PKG install - chown -R root:root $PKG + make + make DESTDIR=$PKG install + chown -R root:root $PKG } + diff --git a/mod_python/configure.patch b/mod_python/configure.patch index afa123065..a5c0d630b 100644 --- a/mod_python/configure.patch +++ b/mod_python/configure.patch @@ -1,10 +1,10 @@ ---- mod_python-3.2.8.orig/configure 2006-07-22 15:27:04.000000000 +1000 -+++ mod_python-3.2.8/configure 2006-07-22 15:27:28.000000000 +1000 -@@ -3035,7 +3035,7 @@ +--- mod_python-3.3.1/configure.orig 2007-04-20 04:35:29.000000000 +1000 ++++ mod_python-3.3.1/configure 2007-04-20 04:36:17.000000000 +1000 +@@ -3036,7 +3036,7 @@ # get the mod_python version MP_VERSION=`awk '/MPV_STRING/ {print $3}' src/include/mpversion.h` --MP_VERSION=`echo $MP_VERSION | sed s/\\"//g` +-MP_VERSION=`echo $MP_VERSION | sed 's/"//g'` +MP_VERSION=`echo $MP_VERSION | tr -d '"'` # get --with-python-src. The python src is required to generate the documentation |