From 65eeff79fff8a1bfdf67ca51d147384f46f4d5c0 Mon Sep 17 00:00:00 2001
From: Nicolás Reynolds <fauno@endefensadelsl.org>
Date: Fri, 27 Dec 2013 23:55:53 +0000
Subject: Fri Dec 27 23:54:04 UTC 2013

---
 extra/php/PKGBUILD              | 13 ++++++++-----
 extra/php/php-fpm.conf.in.patch |  6 +++---
 extra/php/php.ini.patch         | 12 ++++++------
 3 files changed, 17 insertions(+), 14 deletions(-)

(limited to 'extra/php')

diff --git a/extra/php/PKGBUILD b/extra/php/PKGBUILD
index d72b8e07c..e4d2e892c 100644
--- a/extra/php/PKGBUILD
+++ b/extra/php/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 196746 2013-10-17 14:02:52Z andyrtr $
+# $Id: PKGBUILD 201484 2013-12-12 18:14:36Z pierre $
 # Maintainer: Pierre Schmitz <pierre@archlinux.de>
 
 pkgbase=php
@@ -21,7 +21,7 @@ pkgname=('php'
          'php-sqlite'
          'php-tidy'
          'php-xsl')
-pkgver=5.5.5
+pkgver=5.5.7
 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.xz"
         'php.ini.patch' 'apache.conf' 'php-fpm.conf.in.patch'
         'logrotate.d.php-fpm' 'php-fpm.service' 'php-fpm.tmpfiles')
-md5sums=('a4788118fdb0c4d8cef08be72025e983'
-         'f9ee638591aaf1526767db7976d95847'
+md5sums=('0c02437f661105221e99a301a5275a41'
+         '799cd5f91f5253f4b47ec4fd7fccf4f1'
          'dec2cbaad64e3abf4f0ec70e1de4e8e9'
-         '880afea327bb00c47082d22c507e6bfc'
+         '9f8263996836e27f5be1483e86ac2e33'
          'e036c721e5ad927cd1613c7475a58b3a'
          'cc2940f5312ba42e7aa1ddfab74b84c4'
          'c60343df74f8e1afb13b084d5c0e47ed')
@@ -46,6 +46,9 @@ prepare() {
 
 	patch -p0 -i ${srcdir}/php.ini.patch
 	patch -p0 -i ${srcdir}/php-fpm.conf.in.patch
+	# freetype2 headers moved
+	# see README at http://sourceforge.net/projects/freetype/files/freetype2/2.5.1/
+	sed 's#/include/freetype2/freetype/freetype.h#/include/freetype2/freetype.h#g' -i configure
 }
 
 build() {
diff --git a/extra/php/php-fpm.conf.in.patch b/extra/php/php-fpm.conf.in.patch
index 317c2024f..4bcdb73d5 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	2013-06-19 22:03:18.000000000 +0200
-+++ sapi/fpm/php-fpm.conf.in	2013-06-20 17:03:03.728835784 +0200
+--- sapi/fpm/php-fpm.conf.in	2013-11-12 15:17:27.000000000 +0100
++++ sapi/fpm/php-fpm.conf.in	2013-11-12 17:27:21.283279538 +0100
 @@ -12,7 +12,7 @@
  ; Relative path can also be used. They will be prefixed by:
  ;  - the global prefix if it's been set (-p argument)
@@ -27,7 +27,7 @@
 +listen = /run/php-fpm/php-fpm.sock
  
  ; Set listen(2) backlog.
- ; Default Value: 128 (-1 on FreeBSD and OpenBSD)
+ ; Default Value: 65535 (-1 on FreeBSD and OpenBSD)
 @@ -167,9 +168,9 @@
  ; BSD-derived systems allow connections regardless of permissions. 
  ; Default Values: user and group are set as the running user
diff --git a/extra/php/php.ini.patch b/extra/php/php.ini.patch
index b2e7d8f87..aa8100ecc 100644
--- a/extra/php/php.ini.patch
+++ b/extra/php/php.ini.patch
@@ -1,6 +1,6 @@
---- 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 @@
+--- php.ini-production	2013-11-12 15:17:27.000000000 +0100
++++ php.ini-production	2013-11-12 17:28:12.715321014 +0100
+@@ -306,7 +306,7 @@
  ; or per-virtualhost web server configuration file. This directive is
  ; *NOT* affected by whether Safe Mode is turned On or Off.
  ; http://php.net/open-basedir
@@ -9,7 +9,7 @@
  
  ; This directive allows you to disable certain functions for security reasons.
  ; It receives a comma-delimited list of function names. This directive is
-@@ -702,7 +702,7 @@
+@@ -703,7 +703,7 @@
  ;;;;;;;;;;;;;;;;;;;;;;;;;
  
  ; UNIX: "/path1:/path2"
@@ -18,7 +18,7 @@
  ;
  ; Windows: "\path1;\path2"
  ;include_path = ".;c:\php\includes"
-@@ -725,7 +725,7 @@
+@@ -726,7 +726,7 @@
  
  ; Directory in which the loadable extensions (modules) reside.
  ; http://php.net/extension-dir
@@ -27,7 +27,7 @@
  ; On windows:
  ; extension_dir = "ext"
  
-@@ -863,50 +863,48 @@
+@@ -864,50 +864,48 @@
  ; If you only provide the name of the extension, PHP will look for it in its
  ; default extension directory.
  ;
-- 
cgit v1.2.3-54-g00ecf