From: Hugo Villeneuve <hugo@hugovil.com>
Date: Fri, 26 Dec 2014 22:21:54 +0000 (-0500)
Subject: Upgrade to php-5.6.4
X-Git-Url: http://gitweb.hugovil.com/?p=hvlinux.git;a=commitdiff_plain;h=905c897940ee015cc13759d12efefc86fae8babe

Upgrade to php-5.6.4
---

diff --git a/config/packages-list b/config/packages-list
index 1bef51e..7f73cb8 100644
--- a/config/packages-list
+++ b/config/packages-list
@@ -327,7 +327,7 @@ PERL_MOD_DIGEST_SHA1="Digest-SHA1-2.13"
 PERL_MOD_LWP="libwww-perl-6.04"
 PERL_MOD_URI="URI-1.60"
 PERL_MOD_NET_DNS="Net-DNS-0.68"
-PHP="php-5.4.10"
+PHP="php-5.6.4"
 PIXMAN="pixman-0.32.6"
 POPPLER="poppler-0.29.0"
 PKG_CONFIG="pkg-config-0.26"
diff --git a/stage5/pkg/php b/stage5/pkg/php
index 9944ca0..5eded98 100644
--- a/stage5/pkg/php
+++ b/stage5/pkg/php
@@ -12,9 +12,13 @@ hvconfig_pre()
     #   If not specified, php installs some man pages under /usr/php
     #   (phpize.1, php.1 and php-config.1)
     CONFIGURE_OPTS+=" \
-        --with-apxs2 \
-        --with-config-file-path=/etc \
+        --localstatedir=/var \
+        --datadir=/usr/share/php \
         --mandir=/usr/share/man \
+        --with-config-file-path=/etc \
+        --enable-fpm \
+        --with-fpm-user=${HTTPD_USER} \
+        --with-fpm-group=${HTTPD_USER} \
         --with-zlib \
         --enable-bcmath \
         --with-bz2 \
@@ -26,6 +30,7 @@ hvconfig_pre()
         --with-gettext \
         --enable-mbstring \
         --with-readline \
+        --with-apxs2 \
         --with-mysql=/usr \
         --with-openssl=/usr \
         --with-gd \