Sat Aug 20 23:14:32 UTC 2011

2 files changed, 15 insertions, 44 deletions

diff --git a/extra/php/PKGBUILD b/extra/php/PKGBUILD
index 4e7f515cd..12e326423 100644
--- a/extra/php/PKGBUILD
+++ b/extra/php/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 127446 2011-06-15 08:33:01Z pierre $
+# $Id: PKGBUILD 135860 2011-08-19 20:05:50Z pierre $
 # Maintainer: Pierre Schmitz <pierre@archlinux.de>
 
 pkgbase=php
@@ -7,7 +7,6 @@ pkgname=('php'
          'php-apache'
          'php-fpm'
          'php-embed'
-         'php-pear'
          'php-curl'
          'php-enchant'
          'php-gd'
@@ -15,7 +14,7 @@ pkgname=('php'
          'php-intl'
          'php-ldap'
          'php-mcrypt'
-	 'php-mssql'
+         'php-mssql'
          'php-odbc'
          'php-pgsql'
          'php-pspell'
@@ -23,33 +22,29 @@ pkgname=('php'
          'php-sqlite'
          'php-tidy'
          'php-xsl')
-pkgver=5.3.6
-pkgrel=5
+pkgver=5.3.7
 _suhosinver=${pkgver}-0.9.10
+pkgrel=2
 arch=('i686' 'x86_64')
 license=('PHP')
 url='http://www.php.net'
-makedepends=('apache' 'imap' 'postgresql-libs' 'mysql' 'libldap' 'postfix'
+makedepends=('apache' 'imap' 'postgresql-libs' 'libldap' 'postfix'
              'sqlite3' 'unixodbc' 'net-snmp' 'libzip' 'enchant' 'file' 'freetds'
              'libmcrypt' 'tidyhtml' 'aspell' 'libtool' 'libpng' 'libjpeg' 'icu'
              'curl' 'libxslt' 'openssl' 'bzip2' 'db' 'gmp' 'freetype2')
 source=("http://www.php.net/distributions/${pkgbase}-${pkgver}.tar.bz2"
-        "suhosin-patch-${_suhosinver}.patch.gz"
+        "http://download.suhosin.org/suhosin-patch-${_suhosinver}.patch.gz"
         'php.ini.patch' 'apache.conf' 'rc.d.php-fpm' 'php-fpm.conf.in.patch'
         'logrotate.d.php-fpm')
-md5sums=('2286f5a82a6e8397955a0025c1c2ad98'
-         'fff1a38877142f3ae6036dbe5a85d0a6'
+md5sums=('2d47d003c96de4e88863ff38da61af33'
+         '08582e502fed8221c6577042ca45ddb8'
          '39eaa70d276fc3d45d6bcf6cd5ae1106'
          'dec2cbaad64e3abf4f0ec70e1de4e8e9'
          'b01be5f816988fcee7e78225836e5e27'
-         'd50ff349da08110a7cc8c691ce2d0423'
+         '09005dabd90c48ddd392b3dbf05f8a82'
          '07c4e412909ac65a44ec90e7a2c4bade')
 
 build() {
-	# ldap-sasl does not compile with --as-needed
-	export LDFLAGS="${LDFLAGS//-Wl,--as-needed}"
-	export LDFLAGS="${LDFLAGS//,--as-needed}"
-
 	phpconfig="--srcdir=../${pkgbase}-${pkgver} \
 		--prefix=/usr \
 		--sysconfdir=/etc/php \
@@ -196,17 +191,6 @@ build() {
 		--enable-embed=shared \
 		${phpextensions}
 	make
-
-	# pear
-	cp -a ${srcdir}/build-php ${srcdir}/build-pear
-	cd ${srcdir}/build-pear
-	./configure ${phpconfig} \
-		--disable-cgi \
-		--with-readline \
-		--enable-pcntl \
-		--with-pear \
-		${phpextensions}
-	make
 }
 
 # check() {
@@ -272,19 +256,6 @@ package_php-embed() {
 	install -D -m644 ${srcdir}/${pkgbase}-${pkgver}/sapi/embed/php_embed.h ${pkgdir}/usr/include/php/sapi/embed/php_embed.h
 }
 
-package_php-pear() {
-	pkgdesc='PHP Extension and Application Repository'
-	depends=('php' 'bash')
-	backup=('etc/php/pear.conf')
-
-	cd ${srcdir}/build-pear
-	make -j1 install-pear INSTALL_ROOT=${pkgdir}
-	local i
-	while read i; do
-		[ ! -e "$i" ] || rm -rf "$i"
-	done < <(find ${pkgdir} -name '.*')
-}
-
 package_php-curl() {
 	depends=('php' 'curl')
 	pkgdesc='curl module for PHP'
diff --git a/extra/php/php-fpm.conf.in.patch b/extra/php/php-fpm.conf.in.patch
index 93c62430a..b4dd32f96 100644
--- a/extra/php/php-fpm.conf.in.patch
+++ b/extra/php/php-fpm.conf.in.patch
@@ -1,5 +1,5 @@
---- sapi/fpm/php-fpm.conf.in	2010-12-11 08:31:47.695294987 +0100
-+++ sapi/fpm/php-fpm.conf.in	2010-12-11 08:31:55.907812237 +0100
+--- sapi/fpm/php-fpm.conf.in	2011-07-04 23:22:56.000000000 +0200
++++ sapi/fpm/php-fpm.conf.in	2011-08-12 16:56:23.686606725 +0200
 @@ -12,7 +12,7 @@
  ; Relative path can also be used. They will be prefixed by:
  ;  - the global prefix if it's been set (-p arguement)
@@ -18,7 +18,7 @@
  
  ; Error log file
  ; Note: the default prefix is @EXPANDED_LOCALSTATEDIR@
-@@ -93,7 +93,8 @@
+@@ -102,7 +102,8 @@
  ;                            specific port;
  ;   '/path/to/unix/socket' - to listen on a unix socket.
  ; Note: This value is mandatory.
@@ -28,7 +28,7 @@
  
  ; Set listen(2) backlog. A value of '-1' means unlimited.
  ; Default Value: 128 (-1 on FreeBSD and OpenBSD)
-@@ -112,9 +113,9 @@
+@@ -121,9 +122,9 @@
  ; BSD-derived systems allow connections regardless of permissions. 
  ; Default Values: user and group are set as the running user
  ;                 mode is set to 0666
@@ -41,7 +41,7 @@
  
  ; Unix user/group of processes
  ; Note: The user is mandatory. If the group is not set, the default user's group
-@@ -154,23 +155,23 @@
+@@ -163,23 +164,23 @@
  ; The number of child processes created on startup.
  ; Note: Used only when pm is set to 'dynamic'
  ; Default Value: min_spare_servers + (max_spare_servers - min_spare_servers) / 2
@@ -69,7 +69,7 @@
  
  ; The URI to view the FPM status page. If this value is not set, no URI will be
  ; recognized as a status page. By default, the status page shows the following
-@@ -264,7 +265,7 @@
+@@ -333,7 +334,7 @@
  ; Chdir to this directory at the start.
  ; Note: relative path can be used.
  ; Default Value: current directory or / when chroot