first commit

8 files changed, 236 insertions, 148 deletions

diff --git a/.SRCINFO b/.SRCINFO
index fb600cb613bb..f26415be08e5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,9 @@
+# Generated by mksrcinfo v8
+# Mon Nov 21 12:21:21 UTC 2016
 pkgbase = php54
-	pkgver = 5.4.41
-	pkgrel = 1
+	pkgdesc = A general-purpose scripting language that is especially suited to web development
+	pkgver = 5.4.45
+	pkgrel = 2
 	url = http://www.php.net
 	arch = i686
 	arch = x86_64
@@ -10,7 +13,6 @@ pkgbase = php54
 	makedepends = postgresql-libs
 	makedepends = libldap
 	makedepends = postfix
-	makedepends = libvpx
 	makedepends = sqlite
 	makedepends = unixodbc
 	makedepends = net-snmp
@@ -32,21 +34,22 @@ pkgbase = php54
 	makedepends = db
 	makedepends = gmp
 	makedepends = freetype2
+	makedepends = pkg-config
 	makedepends = systemd
-	source = http://www.php.net/distributions/php-5.4.41.tar.bz2
+	source = http://php.net/distributions/php-5.4.45.tar.bz2
 	source = php.ini.patch
 	source = apache.conf
 	source = php-fpm.conf.in.patch
 	source = logrotate.d.php-fpm
 	source = php-fpm.service
 	source = php-fpm.tmpfiles
-	md5sums = e00817b920cfc6dde2d01d7a74c654c0
-	md5sums = 466e1436808a8baeb14021bc40cc4d86
-	md5sums = dec2cbaad64e3abf4f0ec70e1de4e8e9
-	md5sums = 262f637cc3af70b545a965a180272cbc
-	md5sums = e036c721e5ad927cd1613c7475a58b3a
-	md5sums = cc2940f5312ba42e7aa1ddfab74b84c4
-	md5sums = c60343df74f8e1afb13b084d5c0e47ed
+	sha256sums = 4e0d28b1554c95cfaea6fa2b64aac85433f158ce72bb571bcd5574f98f4c6582
+	sha256sums = 5498ed2eb6ca5c96384873c2c83db36df82af79100e7543a6d0b17539e0304e2
+	sha256sums = 6ee6ed48b8416390c56b2e32b75c79f85586431b5c44c48ed22ae6a8dbe68332
+	sha256sums = 63d88e95e1ef6e9bed1a695cb56f4c1e2dc768077c64fce45f927b6bee8b1dbf
+	sha256sums = 185d18221b09a43a0d5a05f9d3455f2f5514bb2b4751df98f297a3b4983c6fdb
+	sha256sums = 72eb165f7074df22a623428b71b03269e7e4d41cae14da41166ec746ab18cd92
+	sha256sums = 640dba0d960bfeaae9ad38d2826d3f6b5d6c175a4d3e16664eefff29141faad5
 
 pkgname = php54
 	pkgdesc = An HTML-embedded scripting language
@@ -54,19 +57,8 @@ pkgname = php54
 	depends = libxml2
 	depends = bzip2
 	depends = curl
-	provides = php-fileinfo
-	provides = php-gmp
-	provides = php-curl
-	provides = php
-	conflicts = php-fileinfo
-	conflicts = php-gmp
-	conflicts = php-curl
-	conflicts = php
-	replaces = php-fileinfo
-	replaces = php-gmp
-	replaces = php-curl
-	replaces = php
-	backup = etc/php/php.ini
+	provides = php=5.4.45
+	backup = etc/php54/php.ini
 
 pkgname = php54-cgi
 	pkgdesc = CGI and FCGI SAPI for PHP
@@ -83,7 +75,7 @@ pkgname = php54-fpm
 	install = php-fpm.install
 	depends = php54
 	depends = systemd
-	backup = etc/php/php-fpm.conf
+	backup = etc/php54/php-fpm.conf
 
 pkgname = php54-embed
 	pkgdesc = Embed SAPI for PHP
@@ -92,7 +84,7 @@ pkgname = php54-embed
 pkgname = php54-pear
 	pkgdesc = PHP Extension and Application Repository
 	depends = php54
-	backup = etc/php/pear.conf
+	backup = etc/php54/pear.conf
 
 pkgname = php54-enchant
 	pkgdesc = enchant module for PHP
@@ -105,7 +97,6 @@ pkgname = php54-gd
 	depends = libpng
 	depends = libjpeg
 	depends = freetype2
-	depends = libvpx
 
 pkgname = php54-intl
 	pkgdesc = intl module for PHP
diff --git a/PKGBUILD b/PKGBUILD
index 1364910ebeeb..9715e435a0b7 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,3 +1,6 @@
+# Maintainer: M0Rf30
+# Maintainer: Massimiliano Torromeo <massimiliano.torromeo@gmail.com>
+
 pkgbase=php54
 pkgname=('php54'
          'php54-cgi'
@@ -18,37 +21,54 @@ pkgname=('php54'
          'php54-sqlite'
          'php54-tidy'
          'php54-xsl')
-pkgver=5.4.41
-pkgrel=1
+pkgver=5.4.45
+pkgrel=2
+pkgdesc="A general-purpose scripting language that is especially suited to web development"
 arch=('i686' 'x86_64')
 license=('PHP')
 url='http://www.php.net'
-makedepends=('apache' 'imap' 'postgresql-libs' 'libldap' 'postfix' 'libvpx'
+makedepends=('apache' 'imap' 'postgresql-libs' 'libldap' 'postfix'
              'sqlite' 'unixodbc' 'net-snmp' 'libzip' 'enchant' 'file' 'freetds'
              'libmcrypt' 'tidyhtml' 'aspell' 'libltdl' 'libpng' 'libjpeg' 'icu'
-             'curl' 'libxslt' 'openssl' 'bzip2' 'db' 'gmp' 'freetype2' 'systemd')
-source=("http://www.php.net/distributions/${pkgbase%54}-${pkgver}.tar.bz2"
+             'curl' 'libxslt' 'openssl' 'bzip2' 'db' 'gmp' 'freetype2'
+             'pkg-config' 'systemd')
+source=("http://php.net/distributions/${pkgbase%54}-${pkgver}.tar.bz2"
         'php.ini.patch' 'apache.conf' 'php-fpm.conf.in.patch'
         'logrotate.d.php-fpm' 'php-fpm.service' 'php-fpm.tmpfiles')
 
 prepare() {
 	cd ${srcdir}/${pkgbase%54}-${pkgver}
 
+	# fix man pages (bug #66842)
+	# sed '/.1 | xargs rm -f$/d' -i Makefile.global
+
+	# adjust paths
 	patch -p0 -i ${srcdir}/php.ini.patch
 	patch -p0 -i ${srcdir}/php-fpm.conf.in.patch
+
+	# workaround for pkg-config 0.28
+	sed -e 's/ && test -n "$OPENSSL_INCS"//g' \
+		-i configure
+
+	# Just because our Apache 2.4 is configured with a threaded MPM by default does not mean we want to build a ZTS PHP.
+	# Let's supress this behaviour and build a SAPI that works fine with the prefork MPM.
+	sed '/APACHE_THREADED_MPM=/d' -i sapi/apache2handler/config.m4 -i configure
 }
 
 build() {
 	local _phpconfig="--srcdir=../${pkgbase%54}-${pkgver} \
 		--config-cache \
-		--prefix=/usr \
-		--sbindir=/usr/bin \
-		--sysconfdir=/etc/php \
+		--prefix=/opt/php54 \
+		--sysconfdir=/etc/php54 \
 		--localstatedir=/var \
 		--with-layout=GNU \
-		--with-config-file-path=/etc/php \
-		--with-config-file-scan-dir=/etc/php/conf.d \
+		--with-config-file-path=/etc/php54 \
+		--with-config-file-scan-dir=/etc/php54/conf.d \
+		--enable-inline-optimization \
+		--disable-debug \
 		--disable-rpath \
+		--disable-static \
+		--enable-shared \
 		--mandir=/usr/share/man \
 		--without-pear \
 		"
@@ -60,38 +80,42 @@ build() {
 		--enable-ftp=shared \
 		--enable-gd-native-ttf \
 		--enable-intl=shared \
+		--enable-json=shared \
+		--enable-mbregex \
 		--enable-mbstring \
+		--enable-pdo \
 		--enable-phar=shared \
 		--enable-posix=shared \
+		--enable-session \
 		--enable-shmop=shared \
 		--enable-soap=shared \
 		--enable-sockets=shared \
 		--enable-sysvmsg=shared \
 		--enable-sysvsem=shared \
 		--enable-sysvshm=shared \
+		--enable-xml \
 		--enable-zip=shared \
 		--with-bz2=shared \
 		--with-curl=shared \
 		--with-db4=/usr \
 		--with-enchant=shared,/usr \
-		--with-fpm-systemd \
-		--with-freetype-dir=/usr \
+		--with-freetype-dir=shared,/usr \
 		--with-gd=shared \
-		--with-gdbm \
+		--with-gdbm=shared \
 		--with-gettext=shared \
 		--with-gmp=shared \
 		--with-iconv=shared \
 		--with-icu-dir=/usr \
-		--with-imap-ssl \
+		--with-imap-ssl=shared \
 		--with-imap=shared \
-		--with-jpeg-dir=/usr \
-		--with-vpx-dir=/usr \
+		--with-kerberos=/usr \
+		--with-jpeg-dir=shared,/usr \
 		--with-ldap=shared \
 		--with-ldap-sasl \
 		--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 \
@@ -101,8 +125,9 @@ build() {
 		--with-pdo-pgsql=shared \
 		--with-pdo-sqlite=shared,/usr \
 		--with-pgsql=shared \
-		--with-png-dir=/usr \
+		--with-png-dir=shared,/usr \
 		--with-pspell=shared \
+		--with-regex=php \
 		--with-snmp=shared \
 		--with-sqlite3=shared,/usr \
 		--with-tidy=shared \
@@ -110,18 +135,18 @@ build() {
 		--with-xmlrpc=shared \
 		--with-xsl=shared \
 		--with-zlib \
+		--without-db2 \
+		--without-db3 \
 		"
 
-	EXTENSION_DIR=/usr/lib/php/modules
-	export EXTENSION_DIR
-	PEAR_INSTALLDIR=/usr/share/pear
-	export PEAR_INSTALLDIR
-
-	cd ${srcdir}/${pkgbase%54}-${pkgver}
+	export EXTENSION_DIR=/opt/php54/modules
+	export PEAR_INSTALLDIR=/opt/php54/pear
 
-	# php
-	mkdir ${srcdir}/build-php
-	cd ${srcdir}/build-php
+	msg2 "Building CLI"
+	cd "$srcdir"
+	rm -rf build-php
+	mkdir build-php
+	cd build-php
 	ln -s ../${pkgbase%54}-${pkgver}/configure
 	./configure ${_phpconfig} \
 		--disable-cgi \
@@ -130,17 +155,18 @@ build() {
 		${_phpextensions}
 	make
 
-	# cgi and fcgi
-	# reuse the previous run; this will save us a lot of time
-	cp -a ${srcdir}/build-php ${srcdir}/build-cgi
-	cd ${srcdir}/build-cgi
+	msg2 "Building cgi/fcgi API"
+	cd "$srcdir"
+	rm -rf build-cgi
+	cp -a build-php build-cgi
+	cd build-cgi
 	./configure ${_phpconfig} \
 		--disable-cli \
 		--enable-cgi \
 		${_phpextensions}
 	make
 
-	# apache
+	msg2 "Building apache API"
 	cp -a ${srcdir}/build-php ${srcdir}/build-apache
 	cd ${srcdir}/build-apache
 	./configure ${_phpconfig} \
@@ -149,9 +175,11 @@ build() {
 		${_phpextensions}
 	make
 
-	# fpm
-	cp -a ${srcdir}/build-php ${srcdir}/build-fpm
-	cd ${srcdir}/build-fpm
+	msg2 "Building FPM API"
+	cd "$srcdir"
+	rm -rf build-fpm
+	cp -a build-php build-fpm
+	cd build-fpm
 	./configure ${_phpconfig} \
 		--disable-cli \
 		--enable-fpm \
@@ -160,6 +188,7 @@ build() {
 		${_phpextensions}
 	make
 
+	msg2 "Building Embed"
 	# embed
 	cp -a ${srcdir}/build-php ${srcdir}/build-embed
 	cd ${srcdir}/build-embed
@@ -169,9 +198,11 @@ build() {
 		${_phpextensions}
 	make
 
-	# pear
-	cp -a ${srcdir}/build-php ${srcdir}/build-pear
-	cd ${srcdir}/build-pear
+	msg2 "Building PEAR"
+	cd "$srcdir"
+	rm -rf build-pear
+	cp -a build-php build-pear
+	cd build-pear
 	./configure ${_phpconfig} \
 		--disable-cgi \
 		--with-readline \
@@ -188,36 +219,42 @@ build() {
 
 package_php54() {
 	pkgdesc='An HTML-embedded scripting language'
+	provides=("php=$pkgver")
 	depends=('pcre' 'libxml2' 'bzip2' 'curl')
-	replaces=('php-fileinfo' 'php-gmp' 'php-curl' 'php')
-	provides=('php-fileinfo' 'php-gmp' 'php-curl' 'php')
-	conflicts=('php-fileinfo' 'php-gmp' 'php-curl' 'php')
-	backup=('etc/php/php.ini')
+	backup=('etc/php54/php.ini')
 
 	cd ${srcdir}/build-php
 	make -j1 INSTALL_ROOT=${pkgdir} install
-	install -d -m755 ${pkgdir}/usr/share/pear
+
 	# install php.ini
-	install -D -m644 ${srcdir}/${pkgbase%54}-${pkgver}/php.ini-production ${pkgdir}/etc/php/php.ini
-	install -d -m755 ${pkgdir}/etc/php/conf.d/
+	install -D -m644 ${srcdir}/${pkgbase%54}-${pkgver}/php.ini-production ${pkgdir}/etc/php54/php.ini
+	install -d -m755 ${pkgdir}/etc/php54/conf.d/
+
+	# links
+	install -dm755 "$pkgdir/usr/bin"
+	for bin in php phar; do
+		ln -s /opt/php54/bin/$bin "$pkgdir/usr/bin/${bin}54"
+	done
+
+	# remove conflicting files
+	rm -rf ${pkgdir}/usr/share/man
 
 	# remove static modules
-	rm -f ${pkgdir}/usr/lib/php/modules/*.a
+	rm -f ${pkgdir}/opt/php54/modules/*.a
 	# remove modules provided by sub packages
-	rm -f ${pkgdir}/usr/lib/php/modules/{enchant,gd,intl,ldap,mcrypt,mssql,odbc,pdo_odbc,pgsql,pdo_pgsql,pspell,snmp,sqlite3,pdo_sqlite,tidy,xsl}.so
-	# remove empty directory
-	rmdir ${pkgdir}/usr/include/php/include
+	rm -f ${pkgdir}/opt/php54/modules/{enchant,gd,intl,ldap,mcrypt,mssql,odbc,pdo_odbc,pgsql,pdo_pgsql,pspell,snmp,sqlite3,pdo_sqlite,tidy,xsl}.so
 }
 
 package_php54-cgi() {
 	pkgdesc='CGI and FCGI SAPI for PHP'
 	depends=('php54')
 
-	install -D -m755 ${srcdir}/build-cgi/sapi/cgi/php-cgi ${pkgdir}/usr/bin/php-cgi
+	install -D -m755 ${srcdir}/build-cgi/sapi/cgi/php-cgi ${pkgdir}/opt/php54/bin/php-cgi
 }
 
 package_php54-apache() {
 	pkgdesc='Apache SAPI for PHP'
+# 	conflicts="php-apache"
 	depends=('php54' 'apache')
 	backup=('etc/httpd/conf/extra/php5_module.conf')
 
@@ -228,121 +265,129 @@ package_php54-apache() {
 package_php54-fpm() {
 	pkgdesc='FastCGI Process Manager for PHP'
 	depends=('php54' 'systemd')
-	backup=('etc/php/php-fpm.conf')
+	backup=('etc/php54/php-fpm.conf')
 	install='php-fpm.install'
 
-	install -D -m755 ${srcdir}/build-fpm/sapi/fpm/php-fpm ${pkgdir}/usr/bin/php-fpm
-	install -D -m644 ${srcdir}/build-fpm/sapi/fpm/php-fpm.8 ${pkgdir}/usr/share/man/man8/php-fpm.8
-	install -D -m644 ${srcdir}/build-fpm/sapi/fpm/php-fpm.conf ${pkgdir}/etc/php/php-fpm.conf
-	install -D -m644 ${srcdir}/logrotate.d.php-fpm ${pkgdir}/etc/logrotate.d/php-fpm
-	install -d -m755 ${pkgdir}/etc/php/fpm.d
-	install -D -m644 ${srcdir}/php-fpm.tmpfiles ${pkgdir}/usr/lib/tmpfiles.d/php-fpm.conf
-	install -D -m644 ${srcdir}/php-fpm.service ${pkgdir}/usr/lib/systemd/system/php-fpm.service
+	install -D -m755 ${srcdir}/build-fpm/sapi/fpm/php-fpm ${pkgdir}/opt/php54/bin/php-fpm
+	install -D -m644 ${srcdir}/build-fpm/sapi/fpm/php-fpm.conf ${pkgdir}/etc/php54/php-fpm.conf
+	install -D -m644 ${srcdir}/logrotate.d.php-fpm ${pkgdir}/etc/logrotate.d/php54-fpm
+	install -d -m755 ${pkgdir}/etc/php54/fpm.d
+	install -D -m644 ${srcdir}/php-fpm.tmpfiles ${pkgdir}/usr/lib/tmpfiles.d/php54-fpm.conf
+	install -D -m644 ${srcdir}/php-fpm.service ${pkgdir}/usr/lib/systemd/system/php54-fpm.service
 }
 
 package_php54-embed() {
 	pkgdesc='Embed SAPI for PHP'
 	depends=('php54')
 
-	install -D -m755 ${srcdir}/build-embed/libs/libphp5.so ${pkgdir}/usr/lib/libphp5.so
-	install -D -m644 ${srcdir}/${pkgbase%54}-${pkgver}/sapi/embed/php_embed.h ${pkgdir}/usr/include/php/sapi/embed/php_embed.h
+	install -D -m755 ${srcdir}/build-embed/libs/libphp5.so ${pkgdir}/opt/php54/lib/libphp5.so
+	install -D -m644 ${srcdir}/php-${pkgver}/sapi/embed/php_embed.h ${pkgdir}/opt/php54/include/php/sapi/embed/php_embed.h
 }
 
 package_php54-pear() {
 	pkgdesc='PHP Extension and Application Repository'
 	depends=('php54')
-	backup=('etc/php/pear.conf')
+	backup=('etc/php54/pear.conf')
 
 	cd ${srcdir}/build-pear
-	make install-pear INSTALL_ROOT=${pkgdir}
-	rm -rf ${pkgdir}/usr/share/pear/.{channels,depdb,depdblock,filemap,lock,registry}
+	make -j1 install-pear INSTALL_ROOT=${pkgdir}
+	local i
+	while read i; do
+		[ ! -e "$i" ] || rm -rf "$i"
+	done < <(find ${pkgdir} -name '.*')
+
+	# links
+	install -dm755 "$pkgdir/usr/bin"
+	for bin in pear pecl; do
+		ln -s /opt/php54/bin/$bin "$pkgdir/usr/bin/${bin}54"
+	done
 }
 
 package_php54-enchant() {
 	depends=('php54' 'enchant')
 	pkgdesc='enchant module for PHP'
-	install -D -m755 ${srcdir}/build-php/modules/enchant.so ${pkgdir}/usr/lib/php/modules/enchant.so
+	install -D -m755 ${srcdir}/build-php/modules/enchant.so ${pkgdir}/opt/php54/modules/enchant.so
 }
 
 package_php54-gd() {
-	depends=('php54' 'libpng' 'libjpeg' 'freetype2' 'libvpx')
+	depends=('php54' 'libpng' 'libjpeg' 'freetype2')
 	pkgdesc='gd module for PHP'
-	install -D -m755 ${srcdir}/build-php/modules/gd.so ${pkgdir}/usr/lib/php/modules/gd.so
+	install -D -m755 ${srcdir}/build-php/modules/gd.so ${pkgdir}/opt/php54/modules/gd.so
 }
 
 package_php54-intl() {
 	depends=('php54' 'icu')
 	pkgdesc='intl module for PHP'
-	install -D -m755 ${srcdir}/build-php/modules/intl.so ${pkgdir}/usr/lib/php/modules/intl.so
+	install -D -m755 ${srcdir}/build-php/modules/intl.so ${pkgdir}/opt/php54/modules/intl.so
 }
 
 package_php54-ldap() {
 	depends=('php54' 'libldap')
 	pkgdesc='ldap module for PHP'
-	install -D -m755 ${srcdir}/build-php/modules/ldap.so ${pkgdir}/usr/lib/php/modules/ldap.so
+	install -D -m755 ${srcdir}/build-php/modules/ldap.so ${pkgdir}/opt/php54/modules/ldap.so
 }
 
 package_php54-mcrypt() {
 	depends=('php54' 'libmcrypt' 'libltdl')
 	pkgdesc='mcrypt module for PHP'
-	install -D -m755 ${srcdir}/build-php/modules/mcrypt.so ${pkgdir}/usr/lib/php/modules/mcrypt.so
+	install -D -m755 ${srcdir}/build-php/modules/mcrypt.so ${pkgdir}/opt/php54/modules/mcrypt.so
 }
 
 package_php54-mssql() {
 	depends=('php54' 'freetds')
 	pkgdesc='mssql module for PHP'
-	install -D -m755 ${srcdir}/build-php/modules/mssql.so ${pkgdir}/usr/lib/php/modules/mssql.so
+	install -D -m755 ${srcdir}/build-php/modules/mssql.so ${pkgdir}/opt/php54/modules/mssql.so
 }
 
 package_php54-odbc() {
 	depends=('php54' 'unixodbc')
 	pkgdesc='ODBC modules for PHP'
-	install -D -m755 ${srcdir}/build-php/modules/odbc.so ${pkgdir}/usr/lib/php/modules/odbc.so
-	install -D -m755 ${srcdir}/build-php/modules/pdo_odbc.so ${pkgdir}/usr/lib/php/modules/pdo_odbc.so
+	install -D -m755 ${srcdir}/build-php/modules/odbc.so ${pkgdir}/opt/php54/modules/odbc.so
+	install -D -m755 ${srcdir}/build-php/modules/pdo_odbc.so ${pkgdir}/opt/php54/modules/pdo_odbc.so
 }
 
 package_php54-pgsql() {
 	depends=('php54' 'postgresql-libs')
 	pkgdesc='PostgreSQL modules for PHP'
-	install -D -m755 ${srcdir}/build-php/modules/pgsql.so ${pkgdir}/usr/lib/php/modules/pgsql.so
-	install -D -m755 ${srcdir}/build-php/modules/pdo_pgsql.so ${pkgdir}/usr/lib/php/modules/pdo_pgsql.so
+	install -D -m755 ${srcdir}/build-php/modules/pgsql.so ${pkgdir}/opt/php54/modules/pgsql.so
+	install -D -m755 ${srcdir}/build-php/modules/pdo_pgsql.so ${pkgdir}/opt/php54/modules/pdo_pgsql.so
 }
 
 package_php54-pspell() {
 	depends=('php54' 'aspell')
 	pkgdesc='pspell module for PHP'
-	install -D -m755 ${srcdir}/build-php/modules/pspell.so ${pkgdir}/usr/lib/php/modules/pspell.so
+	install -D -m755 ${srcdir}/build-php/modules/pspell.so ${pkgdir}/opt/php54/modules/pspell.so
 }
 
 package_php54-snmp() {
 	depends=('php54' 'net-snmp')
 	pkgdesc='snmp module for PHP'
-	install -D -m755 ${srcdir}/build-php/modules/snmp.so ${pkgdir}/usr/lib/php/modules/snmp.so
+	install -D -m755 ${srcdir}/build-php/modules/snmp.so ${pkgdir}/opt/php54/modules/snmp.so
 }
 
 package_php54-sqlite() {
 	depends=('php54' 'sqlite')
 	pkgdesc='sqlite module for PHP'
-	install -D -m755 ${srcdir}/build-php/modules/sqlite3.so ${pkgdir}/usr/lib/php/modules/sqlite3.so
-	install -D -m755 ${srcdir}/build-php/modules/pdo_sqlite.so ${pkgdir}/usr/lib/php/modules/pdo_sqlite.so
+	install -D -m755 ${srcdir}/build-php/modules/sqlite3.so ${pkgdir}/opt/php54/modules/sqlite3.so
+	install -D -m755 ${srcdir}/build-php/modules/pdo_sqlite.so ${pkgdir}/opt/php54/modules/pdo_sqlite.so
 }
 
 package_php54-tidy() {
 	depends=('php54' 'tidyhtml')
 	pkgdesc='tidy module for PHP'
-	install -D -m755 ${srcdir}/build-php/modules/tidy.so ${pkgdir}/usr/lib/php/modules/tidy.so
+	install -D -m755 ${srcdir}/build-php/modules/tidy.so ${pkgdir}/opt/php54/modules/tidy.so
 }
 
 package_php54-xsl() {
 	depends=('php54' 'libxslt')
 	pkgdesc='xsl module for PHP'
-	install -D -m755 ${srcdir}/build-php/modules/xsl.so ${pkgdir}/usr/lib/php/modules/xsl.so
+	install -D -m755 ${srcdir}/build-php/modules/xsl.so ${pkgdir}/opt/php54/modules/xsl.so
 }
 
-md5sums=('e00817b920cfc6dde2d01d7a74c654c0'
-         '466e1436808a8baeb14021bc40cc4d86'
-         'dec2cbaad64e3abf4f0ec70e1de4e8e9'
-         '262f637cc3af70b545a965a180272cbc'
-         'e036c721e5ad927cd1613c7475a58b3a'
-         'cc2940f5312ba42e7aa1ddfab74b84c4'
-         'c60343df74f8e1afb13b084d5c0e47ed')
+sha256sums=('4e0d28b1554c95cfaea6fa2b64aac85433f158ce72bb571bcd5574f98f4c6582'
+            '5498ed2eb6ca5c96384873c2c83db36df82af79100e7543a6d0b17539e0304e2'
+            '6ee6ed48b8416390c56b2e32b75c79f85586431b5c44c48ed22ae6a8dbe68332'
+            '63d88e95e1ef6e9bed1a695cb56f4c1e2dc768077c64fce45f927b6bee8b1dbf'
+            '185d18221b09a43a0d5a05f9d3455f2f5514bb2b4751df98f297a3b4983c6fdb'
+            '72eb165f7074df22a623428b71b03269e7e4d41cae14da41166ec746ab18cd92'
+            '640dba0d960bfeaae9ad38d2826d3f6b5d6c175a4d3e16664eefff29141faad5')
diff --git a/apache.conf b/apache.conf
index c3ca0aad509e..5b7ee4784c42 100644
--- a/apache.conf
+++ b/apache.conf
@@ -1,13 +1,13 @@
 # Required modules: dir_module, php5_module
 
 <IfModule dir_module>
-	<IfModule php5_module>
-		DirectoryIndex index.php index.html
-		<FilesMatch "\.php$">
-			SetHandler application/x-httpd-php
-		</FilesMatch>
-		<FilesMatch "\.phps$">
-			SetHandler application/x-httpd-php-source
-		</FilesMatch>
-	</IfModule>
-</IfModule>
+    <IfModule php5_module>
+        DirectoryIndex index.php index.html
+        <FilesMatch "\.php$">
+            SetHandler application/x-httpd-php
+        </FilesMatch>
+        <FilesMatch "\.phps$">
+            SetHandler application/x-httpd-php-source
+        </FilesMatch>
+    </IfModule>
+</IfModule>
\ No newline at end of file
diff --git a/logrotate.d.php-fpm b/logrotate.d.php-fpm
index 1895c5b972f5..dc372c6164de 100644
--- a/logrotate.d.php-fpm
+++ b/logrotate.d.php-fpm
@@ -1,8 +1,8 @@
-/var/log/php-fpm.log {
+/var/log/php54-fpm.log {
 	missingok
 	notifempty
 	delaycompress
 	postrotate
-		systemctl reload php-fpm.service || true
+		kill -USR1 `cat /run/php54-fpm/php-fpm.pid 2>/dev/null` 2>/dev/null || true
 	endscript
 }
diff --git a/php-fpm.conf.in.patch b/php-fpm.conf.in.patch
index 6b253379ebf5..8d27ebb090b8 100644
--- a/php-fpm.conf.in.patch
+++ b/php-fpm.conf.in.patch
@@ -1,11 +1,11 @@
---- sapi/fpm/php-fpm.conf.in
-+++ sapi/fpm/php-fpm.conf.in
+--- sapi/fpm/php-fpm.conf.in.orig	2014-05-05 09:58:32.055383183 +0200
++++ sapi/fpm/php-fpm.conf.in	2014-05-05 10:00:54.398714767 +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 argument)
  ;  - @prefix@ otherwise
 -;include=etc/fpm.d/*.conf
-+;include=/etc/php/fpm.d/*.conf
++include=/etc/php54/fpm.d/*.conf
  
  ;;;;;;;;;;;;;;;;;;
  ; Global Options ;
@@ -14,17 +14,26 @@
  ; Note: the default prefix is @EXPANDED_LOCALSTATEDIR@
  ; Default Value: none
 -;pid = run/php-fpm.pid
-+pid = /run/php-fpm/php-fpm.pid
++pid = /run/php-fpm/php54-fpm.pid
  
  ; Error log file
  ; If it's set to "syslog", log is sent to syslogd instead of being written
+@@ -42,7 +42,7 @@
+ ; instances running on the same server, you can change the default value
+ ; which must suit common needs.
+ ; Default Value: php-fpm
+-;syslog.ident = php-fpm
++syslog.ident = php54-fpm
+ 
+ ; Log level
+ ; Possible Values: alert, error, warning, notice, debug
 @@ -156,7 +156,8 @@
  ;                            specific port;
  ;   '/path/to/unix/socket' - to listen on a unix socket.
  ; Note: This value is mandatory.
 -listen = 127.0.0.1:9000
 +;listen = 127.0.0.1:9000
-+listen = /run/php-fpm/php-fpm.sock
++listen = /run/php-fpm/php54-fpm.sock
  
  ; Set listen(2) backlog.
  ; Default Value: 128 (-1 on FreeBSD and OpenBSD)
@@ -41,6 +50,15 @@
   
  ; List of ipv4 addresses of FastCGI clients which are allowed to connect.
  ; Equivalent to the FCGI_WEB_SERVER_ADDRS environment variable in the original
+@@ -177,7 +178,7 @@
+ ; must be separated by a comma. If this value is left blank, connections will be
+ ; accepted from any ip address.
+ ; Default Value: any
+-;listen.allowed_clients = 127.0.0.1
++listen.allowed_clients = 127.0.0.1
+ 
+ ; Specify the nice(2) priority to apply to the pool processes (only if set)
+ ; The value can vary from -19 (highest priority) to 20 (lower priority)
 @@ -466,7 +467,7 @@
  ; Chdir to this directory at the start.
  ; Note: relative path can be used.
diff --git a/php-fpm.install b/php-fpm.install
index 3572a765315c..3064c18f88c1 100644
--- a/php-fpm.install
+++ b/php-fpm.install
@@ -1,7 +1,5 @@
 post_install() {
-	if [[ ! -d run/php-fpm ]]; then
-		usr/bin/systemd-tmpfiles --create php-fpm.conf
-	fi
+	usr/bin/systemd-tmpfiles --create php54-fpm.conf
 }
 
 post_upgrade() {
diff --git a/php-fpm.service b/php-fpm.service
index 6e2faafd8650..c62a11917a38 100644
--- a/php-fpm.service
+++ b/php-fpm.service
@@ -1,13 +1,13 @@
 [Unit]
-Description=The PHP FastCGI Process Manager
+Description=The PHP 5.4 FastCGI Process Manager
 After=syslog.target network.target
 
 [Service]
-Type=notify
-PIDFile=/run/php-fpm/php-fpm.pid
+Type=forking
+PIDFile=/run/php-fpm/php54-fpm.pid
 PrivateTmp=true
-ExecStart=/usr/bin/php-fpm --nodaemonize --pid /run/php-fpm/php-fpm.pid
-ExecReload=/bin/kill -USR2 $MAINPID
+ExecStart=/opt/php54/bin/php-fpm --pid /run/php-fpm/php54-fpm.pid
+ExecReload=/usr/bin/kill -USR2 $MAINPID
 
 [Install]
 WantedBy=multi-user.target
diff --git a/php.ini.patch b/php.ini.patch
index c911bc151249..5633bcd65bf0 100644
--- a/php.ini.patch
+++ b/php.ini.patch
@@ -1,6 +1,6 @@
---- php.ini-production	2012-03-29 06:17:59.000000000 +0200
-+++ php.ini-production	2012-03-30 10:46:21.181340861 +0200
-@@ -305,7 +305,7 @@
+--- php.ini-production.orig	2014-05-05 09:53:16.438718687 +0200
++++ php.ini-production	2014-05-05 09:54:37.502051360 +0200
+@@ -296,7 +296,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,25 +9,61 @@
  
  ; 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 @@
+@@ -363,7 +363,7 @@
+ ; threat in any way, but it makes it possible to determine whether you use PHP
+ ; on your server or not.
+ ; http://php.net/expose-php
+-expose_php = On
++expose_php = Off
+ 
+ ;;;;;;;;;;;;;;;;;;;
+ ; Resource Limits ;
+@@ -389,7 +389,7 @@
+ ;max_input_nesting_level = 64
+ 
+ ; How many GET/POST/COOKIE input variables may be accepted
+-; max_input_vars = 1000
++max_input_vars = 10000
+ 
+ ; Maximum amount of memory a script may consume (128MB)
+ ; http://php.net/memory-limit
+@@ -574,7 +574,7 @@
+ ; Example:
+ ;error_log = php_errors.log
+ ; Log errors to syslog (Event Log on Windows).
+-;error_log = syslog
++error_log = syslog
+ 
+ ;windows.show_crt_warning
+ ; Default value: 0
+@@ -693,7 +693,7 @@
  ;;;;;;;;;;;;;;;;;;;;;;;;;
  
  ; UNIX: "/path1:/path2"
 -;include_path = ".:/php/includes"
-+include_path = ".:/usr/share/pear"
++include_path = ".:/opt/php54/share/pear"
  ;
  ; Windows: "\path1;\path2"
  ;include_path = ".;c:\php\includes"
-@@ -725,7 +725,7 @@
+@@ -716,7 +716,7 @@
  
  ; Directory in which the loadable extensions (modules) reside.
  ; http://php.net/extension-dir
 -; extension_dir = "./"
-+extension_dir = "/usr/lib/php/modules/"
++extension_dir = "/opt/php54/modules/"
  ; On windows:
  ; extension_dir = "ext"
  
-@@ -859,50 +859,47 @@
+@@ -788,7 +788,7 @@
+ 
+ ; Maximum allowed size for uploaded files.
+ ; http://php.net/upload-max-filesize
+-upload_max_filesize = 2M
++upload_max_filesize = 8M
+ 
+ ; Maximum number of files that can be uploaded via a single request
+ max_file_uploads = 20
+@@ -850,50 +850,47 @@
  ; If you only provide the name of the extension, PHP will look for it in its
  ; default extension directory.
  ;
@@ -76,7 +112,7 @@
 -;extension=php_xmlrpc.dll
 -;extension=php_xsl.dll
 +;extension=bcmath.so
-+;extension=bz2.so
++extension=bz2.so
 +;extension=calendar.so
 +extension=curl.so
 +;extension=dba.so