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

[Pierre Schmitz]

    Date: Wednesday, July 2, 2008 @ 14:34:54
  Author: pierre
Revision: 4031

Merged revisions 3342-4030 via svnmerge from 
svn+ssh://svn.archlinux.org/home/svn-packages/php/trunk

........
  r3767 | pierre | 2008-06-30 20:53:26 +0000 (Mo, 30 Jun 2008) | 1 line
  
  add /srv/http to open_basedir; prepare for db rebuild
........
  r4030 | pierre | 2008-07-02 18:34:20 +0000 (Mi, 02 Jul 2008) | 1 line
  
  upgpkg: php 5.2.6-3
........

Modified:
  php/repos/testing-x86_64/	(properties)
  php/repos/testing-x86_64/PKGBUILD
  php/repos/testing-x86_64/php.ini

----------+
 PKGBUILD |   10 +++++-----
 php.ini  |    2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)


Property changes on: php/repos/testing-x86_64
___________________________________________________________________
Name: svnmerge-integrated
   - /php/trunk:1-3341
   + /php/trunk:1-4030

Modified: testing-x86_64/PKGBUILD
===================================================================
--- testing-x86_64/PKGBUILD	2008-07-02 18:34:20 UTC (rev 4030)
+++ testing-x86_64/PKGBUILD	2008-07-02 18:34:54 UTC (rev 4031)
@@ -3,7 +3,7 @@
 
 pkgname=php
 pkgver=5.2.6
-pkgrel=2
+pkgrel=3
 _suhosinver=0.9.6.2
 pkgdesc='A high-level scripting language'
 arch=('i686' 'x86_64')
@@ -15,7 +15,7 @@
 makedepends=('apache' 'imap' 'postgresql-libs' 'mysql' 'libldap' 'smtp-server' \
              'libpng' 'libjpeg' 'sqlite3' 'unixodbc' 'net-snmp' \
              'libmcrypt' 'tidyhtml' 'aspell' 'libtool' 'freetype2' 'libjpeg' \
-             'curl' 'libxslt' 'pam' 'openssl' 'bzip2' 'gdbm')
+             'curl' 'libxslt' 'pam' 'openssl' 'bzip2' 'gdbm' 'db>=4.7')
 optdepends=('bzip2: bz2' \
             'curl: curl' \
             'gdbm: dba' \
@@ -36,17 +36,18 @@
             'tidyhtml: tidy' \
             'libxslt: xsl' \
             )
-options=('emptydirs' '!makeflags')
+options=('emptydirs')
 source=("http://www.php.net/distributions/${pkgname}-${pkgver}.tar.bz2" \
         "http://download.suhosin.org/suhosin-patch-${pkgver}-${_suhosinver}.patch.gz" \
         'php.ini' 'apache.conf')
 md5sums=('7380ffecebd95c6edb317ef861229ebd'
          'f2ec986341a314c271259dbe4d940858'
-         '7cb9c272fb373ee431f4a808952e0bef'
+         '0ee1dad48f7d67af3d2c78ca6eed68ba'
          '96ca078be6729b665be8a865535a97bf')
 
 build() {
 	[ -e /usr/lib/libdb-4.1.so ] && echo 'remove db4.1 package' && return 1
+	[ -e /usr/lib/libdb-4.5.so ] && echo 'remove db4.5 package' && return 1
 
 	phpconfig="--prefix=/usr \
 	--sysconfdir=/etc/php \
@@ -169,4 +170,4 @@
 	make || return 1
 	install -D -m644 libs/libphp5.so ${pkgdir}/usr/lib/httpd/modules/libphp5.so || return 1
 	install -D -m644 ${srcdir}/apache.conf ${pkgdir}/etc/httpd/conf/extra/php5_module.conf || return 1
-}
\ No newline at end of file
+}

Modified: testing-x86_64/php.ini
===================================================================
--- testing-x86_64/php.ini	2008-07-02 18:34:20 UTC (rev 4030)
+++ testing-x86_64/php.ini	2008-07-02 18:34:54 UTC (rev 4031)
@@ -249,7 +249,7 @@
 ; and below.  This directive makes most sense if used in a per-directory
 ; or per-virtualhost web server configuration file. This directive is
 ; *NOT* affected by whether Safe Mode is turned On or Off.
-open_basedir = /home/:/tmp/:/usr/share/pear/
+open_basedir = /srv/http/:/home/:/tmp/:/usr/share/pear/
 
 ; This directive allows you to disable certain functions for security reasons.
 ; It receives a comma-delimited list of function names. This directive is