Sun Aug 18 01:29:08 PDT 2013

3 files changed, 21 insertions, 20 deletions

diff --git a/extra/php/PKGBUILD b/extra/php/PKGBUILD
index e8d4742ea..b0df40433 100644
--- a/extra/php/PKGBUILD
+++ b/extra/php/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 193093 2013-08-16 07:06:58Z pierre $
+# $Id: PKGBUILD 193137 2013-08-17 08:22:16Z pierre $
 # Maintainer: Pierre Schmitz <pierre@archlinux.de>
 
 pkgbase=php
@@ -21,7 +21,7 @@ pkgname=('php'
          'php-sqlite'
          'php-tidy'
          'php-xsl')
-pkgver=5.4.18
+pkgver=5.5.2
 pkgrel=1
 arch=('i686' 'x86_64')
 license=('PHP')
@@ -33,10 +33,10 @@ makedepends=('apache' 'imap' 'postgresql-libs' 'libldap' 'postfix' 'libvpx'
 source=("http://www.php.net/distributions/${pkgbase}-${pkgver}.tar.bz2"
         'php.ini.patch' 'apache.conf' 'php-fpm.conf.in.patch'
         'logrotate.d.php-fpm' 'php-fpm.service' 'php-fpm.tmpfiles')
-md5sums=('b2e185b46b22a48a385cf21a0dc76e65'
-         '44c1bb1df346b3b9d3e092c7df9a37d0'
+md5sums=('caf7f4d86514a568fb3c8021b096a9f0'
+         'f9ee638591aaf1526767db7976d95847'
          'dec2cbaad64e3abf4f0ec70e1de4e8e9'
-         '5c1f4c967b66ce3eaf819b46951dcbf5'
+         '880afea327bb00c47082d22c507e6bfc'
          'e036c721e5ad927cd1613c7475a58b3a'
          'cc2940f5312ba42e7aa1ddfab74b84c4'
          'c60343df74f8e1afb13b084d5c0e47ed')
@@ -71,6 +71,7 @@ build() {
 		--enable-gd-native-ttf \
 		--enable-intl=shared \
 		--enable-mbstring \
+		--enable-opcache \
 		--enable-phar=shared \
 		--enable-posix=shared \
 		--enable-shmop=shared \
@@ -101,7 +102,7 @@ build() {
 		--with-mcrypt=shared \
 		--with-mhash \
 		--with-mssql=shared \
-		--with-mysql-sock=/var/run/mysqld/mysqld.sock \
+		--with-mysql-sock=/run/mysqld/mysqld.sock \
 		--with-mysql=shared,mysqlnd \
 		--with-mysqli=shared,mysqlnd \
 		--with-openssl=shared \
@@ -193,15 +194,15 @@ build() {
 
 # check() {
 # 	cd ${srcdir}/build-php
-# 	make test
+# 	export SNMP_TIMEOUT=1
+# 	export SNMP_RETRIES=0
+# 	printf "n\n" | make test
+# 	echo
 # }
 
 package_php() {
 	pkgdesc='An HTML-embedded scripting language'
 	depends=('pcre' 'libxml2' 'bzip2' 'curl')
-	replaces=('php-fileinfo' 'php-gmp' 'php-curl')
-	provides=('php-fileinfo' 'php-gmp' 'php-curl')
-	conflicts=('php-fileinfo' 'php-gmp' 'php-curl')
 	backup=('etc/php/php.ini')
 
 	cd ${srcdir}/build-php
diff --git a/extra/php/php-fpm.conf.in.patch b/extra/php/php-fpm.conf.in.patch
index d618fca4e..317c2024f 100644
--- a/extra/php/php-fpm.conf.in.patch
+++ b/extra/php/php-fpm.conf.in.patch
@@ -1,8 +1,8 @@
---- sapi/fpm/php-fpm.conf.in	2012-08-15 06:26:05.000000000 +0200
-+++ sapi/fpm/php-fpm.conf.in	2012-08-16 14:17:41.809663595 +0200
+--- sapi/fpm/php-fpm.conf.in	2013-06-19 22:03:18.000000000 +0200
++++ sapi/fpm/php-fpm.conf.in	2013-06-20 17:03:03.728835784 +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)
+ ;  - the global prefix if it's been set (-p argument)
  ;  - @prefix@ otherwise
 -;include=etc/fpm.d/*.conf
 +;include=/etc/php/fpm.d/*.conf
@@ -18,7 +18,7 @@
  
  ; Error log file
  ; If it's set to "syslog", log is sent to syslogd instead of being written
-@@ -148,7 +148,8 @@
+@@ -156,7 +156,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.
  ; Default Value: 128 (-1 on FreeBSD and OpenBSD)
-@@ -159,9 +160,9 @@
+@@ -167,9 +168,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 @@
   
  ; List of ipv4 addresses of FastCGI clients which are allowed to connect.
  ; Equivalent to the FCGI_WEB_SERVER_ADDRS environment variable in the original
-@@ -458,7 +459,7 @@
+@@ -466,7 +467,7 @@
  ; Chdir to this directory at the start.
  ; Note: relative path can be used.
  ; Default Value: current directory or / when chroot
diff --git a/extra/php/php.ini.patch b/extra/php/php.ini.patch
index 62555d66a..b2e7d8f87 100644
--- a/extra/php/php.ini.patch
+++ b/extra/php/php.ini.patch
@@ -1,5 +1,5 @@
---- php.ini-production	2012-03-29 06:17:59.000000000 +0200
-+++ php.ini-production	2012-03-30 10:46:21.181340861 +0200
+--- php.ini-production	2013-08-15 22:42:04.000000000 +0200
++++ php.ini-production	2013-08-16 08:03:36.178726858 +0200
 @@ -305,7 +305,7 @@
  ; or per-virtualhost web server configuration file. This directive is
  ; *NOT* affected by whether Safe Mode is turned On or Off.
@@ -27,7 +27,7 @@
  ; On windows:
  ; extension_dir = "ext"
  
-@@ -859,51 +859,47 @@
+@@ -863,50 +863,48 @@
  ; If you only provide the name of the extension, PHP will look for it in its
  ; default extension directory.
  ;
@@ -75,7 +75,6 @@
 -;extension=php_tidy.dll
 -;extension=php_xmlrpc.dll
 -;extension=php_xsl.dll
--;extension=php_zip.dll
 +;extension=bcmath.so
 +;extension=bz2.so
 +;extension=calendar.so
@@ -96,6 +95,7 @@
 +;extension=mysqli.so
 +;extension=mysql.so
 +;extension=odbc.so
++;zend_extension=opcache.so
 +;extension=openssl.so
 +;extension=pdo_mysql.so
 +;extension=pdo_odbc.so