Date: Monday, December 28, 2015 @ 22:24:27
Author: pierre
Revision: 257336
upgpkg: php 7.0.1-2
PHP 7 update
Added:
php/trunk/apache.patch
php/trunk/generate_patches
php/trunk/php-fpm.patch
Modified:
php/trunk/PKGBUILD
php/trunk/apache.conf
php/trunk/php.ini.patch
Deleted:
php/trunk/logrotate.d.php-fpm
php/trunk/php-fpm.conf.in.patch
php/trunk/php-fpm.service
-----------------------+
PKGBUILD | 246 ++++++++++++++----------------------------------
apache.conf | 4
apache.patch | 20 +++
generate_patches | 46 ++++++++
logrotate.d.php-fpm | 8 -
php-fpm.conf.in.patch | 52 ----------
php-fpm.patch | 63 ++++++++++++
php-fpm.service | 13 --
php.ini.patch | 45 +-------
9 files changed, 217 insertions(+), 280 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2015-12-28 21:17:47 UTC (rev 257335)
+++ PKGBUILD 2015-12-28 21:24:27 UTC (rev 257336)
@@ -8,14 +8,11 @@
'php-fpm'
'php-embed'
'php-phpdbg'
- 'php-pear'
'php-enchant'
'php-gd'
'php-imap'
'php-intl'
- 'php-ldap'
'php-mcrypt'
- 'php-mssql'
'php-odbc'
'php-pgsql'
'php-pspell'
@@ -23,39 +20,32 @@
'php-sqlite'
'php-tidy'
'php-xsl')
-pkgver=5.6.16
-pkgrel=3
+pkgver=7.0.1
+pkgrel=2
arch=('i686' 'x86_64')
license=('PHP')
url='http://www.php.net'
-makedepends=('apache' 'c-client' 'postgresql-libs' 'libldap' 'postfix'
- 'sqlite' 'unixodbc' 'net-snmp' 'libzip' 'enchant' 'file' 'freetds'
- 'libmcrypt' 'tidyhtml' 'aspell' 'libltdl' 'gd' 'icu'
- 'curl' 'libxslt' 'openssl' 'db' 'gmp' 'systemd')
+makedepends=('apache' 'aspell' 'c-client' 'db' 'enchant' 'gd' 'gmp' 'icu'
'libmcrypt' 'libxslt' 'libzip' 'net-snmp'
+ 'postgresql-libs' 'sqlite' 'systemd' 'tidyhtml' 'unixodbc' 'curl'
'libtool')
checkdepends=('procps-ng')
-source=("http://www.php.net/distributions/${pkgbase}-${pkgver}.tar.xz";
- "http://www.php.net/distributions/${pkgbase}-${pkgver}.tar.xz.asc";
- 'php.ini.patch' 'apache.conf' 'php-fpm.conf.in.patch'
- 'logrotate.d.php-fpm' 'php-fpm.service' 'php-fpm.tmpfiles')
-md5sums=('3f1d999ed1f9cb5713c9a0161c557f2f'
- 'SKIP'
- '39eff6cc99dae4ec3b52125e6229de7e'
- 'dec2cbaad64e3abf4f0ec70e1de4e8e9'
- '16b5e2e4da59f15bea4c2db78a7bc8dc'
- '25bc67ad828e8147a817410b68d8016c'
- 'cc2940f5312ba42e7aa1ddfab74b84c4'
- 'c60343df74f8e1afb13b084d5c0e47ed')
-validpgpkeys=('6E4F6AB321FDC07F2C332E3AC2BF0BC433CFC8B3'
- '0BD78B5F97500D450838F95DFE857D9A90D90EC1')
+source=("https://www.php.net/distributions/${pkgbase}-${pkgver}.tar.xz"{,.asc}
+ 'apache.patch' 'apache.conf' 'php-fpm.patch' 'php-fpm.tmpfiles'
'php.ini.patch')
+sha256sums=('84fcb8b9c61f70db802d3b6636c6ba602470a375e593375c0c744483aa0c0357'
+ 'SKIP'
+ '672eb96207535775994dd1e189bd1bde2d51c565c55f7c5f3886be32db941eb6'
+ 'ebc0af1ef3a6baccb013d0ccb29923895a7b22ff2d032e3bba802dc6328301ce'
+ 'c5f593f28ee15c7c08c2a2b577128667466e38e8e5de094cc02871a22ba61906'
+ '640dba0d960bfeaae9ad38d2826d3f6b5d6c175a4d3e16664eefff29141faad5'
+ 'a85a953f866b0d3b51412dc4114e0d8d07261fcf2f2951aeb078504d63d42b08')
+validpgpkeys=('1A4E8B7277C42E53DBA9C7B9BCAA30EA9C0D5763'
+ '6E4F6AB321FDC07F2C332E3AC2BF0BC433CFC8B3')
prepare() {
cd ${srcdir}/${pkgbase}-${pkgver}
+ patch -p0 -i ${srcdir}/apache.patch
+ patch -p0 -i ${srcdir}/php-fpm.patch
patch -p0 -i ${srcdir}/php.ini.patch
- patch -p0 -i ${srcdir}/php-fpm.conf.in.patch
- # 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() {
@@ -71,19 +61,17 @@
--disable-rpath \
--mandir=/usr/share/man \
--without-pear \
+ --enable-zend-signals \
"
- local _phpextensions="--enable-bcmath=shared \
+ local _phpextensions="\
+ --enable-bcmath=shared \
--enable-calendar=shared \
--enable-dba=shared \
--enable-exif=shared \
--enable-ftp=shared \
- --enable-gd-native-ttf \
--enable-intl=shared \
--enable-mbstring \
- --enable-opcache \
- --enable-phar=shared \
- --enable-posix=shared \
--enable-shmop=shared \
--enable-soap=shared \
--enable-sockets=shared \
@@ -95,30 +83,22 @@
--with-curl=shared \
--with-db4=/usr \
--with-enchant=shared,/usr \
- --with-fpm-systemd \
- --with-freetype-dir=/usr \
- --with-xpm-dir=/usr \
--with-gd=shared,/usr \
--with-gdbm \
--with-gettext=shared \
--with-gmp=shared \
--with-iconv=shared \
- --with-icu-dir=/usr \
--with-imap-ssl \
--with-imap=shared \
--with-kerberos=/usr \
- --with-jpeg-dir=/usr \
- --with-vpx-dir=/usr \
--with-ldap=shared \
--with-ldap-sasl \
--with-libzip \
--with-mcrypt=shared \
--with-mhash \
- --with-mssql=shared \
--with-mysql-sock=/run/mysqld/mysqld.sock \
- --with-mysql=shared,mysqlnd \
--with-mysqli=shared,mysqlnd \
- --with-openssl=shared \
+ --with-openssl \
--with-pcre-regex=/usr \
--with-pdo-mysql=shared,mysqlnd \
--with-pdo-odbc=shared,unixODBC,/usr \
@@ -125,8 +105,8 @@
--with-pdo-pgsql=shared \
--with-pdo-sqlite=shared,/usr \
--with-pgsql=shared \
- --with-png-dir=/usr \
--with-pspell=shared \
+ --with-readline \
--with-snmp=shared \
--with-sqlite3=shared,/usr \
--with-tidy=shared \
@@ -134,115 +114,65 @@
--with-xmlrpc=shared \
--with-xsl=shared \
--with-zlib \
+ --enable-pcntl \
"
EXTENSION_DIR=/usr/lib/php/modules
export EXTENSION_DIR
- PEAR_INSTALLDIR=/usr/share/pear
- export PEAR_INSTALLDIR
- cd ${srcdir}/${pkgbase}-${pkgver}
-
- # php
- mkdir ${srcdir}/build-php
- cd ${srcdir}/build-php
+ mkdir ${srcdir}/build
+ cd ${srcdir}/build
ln -s ../${pkgbase}-${pkgver}/configure
./configure ${_phpconfig} \
- --disable-cgi \
- --with-readline \
- --enable-pcntl \
- ${_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
- ./configure ${_phpconfig} \
- --disable-cli \
--enable-cgi \
+ --enable-fpm \
+ --with-fpm-systemd \
+ --with-fpm-acl \
+ --with-fpm-user=http \
+ --with-fpm-group=http \
+ --enable-embed=shared \
${_phpextensions}
make
# apache
- cp -a ${srcdir}/build-php ${srcdir}/build-apache
+ # reuse the previous run; this will save us a lot of time
+ cp -a ${srcdir}/build ${srcdir}/build-apache
cd ${srcdir}/build-apache
./configure ${_phpconfig} \
- --disable-cli \
--with-apxs2 \
${_phpextensions}
make
- # fpm
- cp -a ${srcdir}/build-php ${srcdir}/build-fpm
- cd ${srcdir}/build-fpm
- ./configure ${_phpconfig} \
- --disable-cli \
- --enable-fpm \
- --with-fpm-user=http \
- --with-fpm-group=http \
- ${_phpextensions}
- make
-
- # embed
- cp -a ${srcdir}/build-php ${srcdir}/build-embed
- cd ${srcdir}/build-embed
- ./configure ${_phpconfig} \
- --disable-cli \
- --enable-embed=shared \
- ${_phpextensions}
- make
-
# phpdbg
- cp -a ${srcdir}/build-php ${srcdir}/build-phpdbg
+ cp -a ${srcdir}/build ${srcdir}/build-phpdbg
cd ${srcdir}/build-phpdbg
./configure ${_phpconfig} \
- --disable-cli \
- --disable-cgi \
- --with-readline \
--enable-phpdbg \
${_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() {
cd ${srcdir}/${pkgbase}-${pkgver}
- # tests on i686 fail
- [[ $CARCH == 'i686' ]] && return
- # a couple of tests fail in btrfs-backed chroots
- [[ $(stat -f -c %T .) == btrfs ]] && return
-
export REPORT_EXIT_STATUS=1
export NO_INTERACTION=1
export SKIP_ONLINE_TESTS=1
export SKIP_SLOW_TESTS=1
- ${srcdir}/build-php/sapi/cli/php -n \
- run-tests.php -n -P \
- {tests,Zend,ext/{spl,standard},sapi/cli}
+ ${srcdir}/build/sapi/cli/php -n run-tests.php -n -P {tests,Zend}
}
package_php() {
- pkgdesc='An HTML-embedded scripting language'
- depends=('pcre' 'libxml2' 'curl' 'libzip')
+ pkgdesc='A general-purpose scripting language that is especially suited
to web development'
+ depends=('libxml2' 'curl' 'libzip')
+ replaces=('php-ldap')
+ conflicts=('php-ldap')
+ provides=("php-ldap=${pkgver}")
backup=('etc/php/php.ini')
- cd ${srcdir}/build-php
- make -j1 INSTALL_ROOT=${pkgdir} install
- install -d -m755 ${pkgdir}/usr/share/pear
- # install php.ini
+ cd ${srcdir}/build
+ make -j1 INSTALL_ROOT=${pkgdir}
install-{modules,cli,build,headers,programs,pharcmd}
install -D -m644 ${srcdir}/${pkgbase}-${pkgver}/php.ini-production
${pkgdir}/etc/php/php.ini
install -d -m755 ${pkgdir}/etc/php/conf.d/
@@ -249,11 +179,9 @@
# remove static modules
rm -f ${pkgdir}/usr/lib/php/modules/*.a
# remove modules provided by sub packages
- rm -f
${pkgdir}/usr/lib/php/modules/{enchant,gd,imap,intl,ldap,mcrypt,mssql,odbc,pdo_odbc,pgsql,pdo_pgsql,pspell,snmp,sqlite3,pdo_sqlite,tidy,xsl}.so
+ rm -f
${pkgdir}/usr/lib/php/modules/{enchant,gd,imap,intl,mcrypt,odbc,pdo_odbc,pgsql,pdo_pgsql,pspell,snmp,sqlite3,pdo_sqlite,tidy,xsl}.so
# remove empty directory
rmdir ${pkgdir}/usr/include/php/include
- # fix broken link
- ln -sf phar.phar ${pkgdir}/usr/bin/phar
}
package_php-cgi() {
@@ -260,63 +188,55 @@
pkgdesc='CGI and FCGI SAPI for PHP'
depends=('php')
- install -D -m755 ${srcdir}/build-cgi/sapi/cgi/php-cgi
${pkgdir}/usr/bin/php-cgi
+ cd ${srcdir}/build
+ make -j1 INSTALL_ROOT=${pkgdir} install-cgi
}
package_php-apache() {
pkgdesc='Apache SAPI for PHP'
depends=('php' 'apache')
- backup=('etc/httpd/conf/extra/php5_module.conf')
+ backup=('etc/httpd/conf/extra/php7_module.conf')
- install -D -m755 ${srcdir}/build-apache/libs/libphp5.so
${pkgdir}/usr/lib/httpd/modules/libphp5.so
- install -D -m644 ${srcdir}/apache.conf
${pkgdir}/etc/httpd/conf/extra/php5_module.conf
+ install -D -m755 ${srcdir}/build-apache/libs/libphp7.so
${pkgdir}/usr/lib/httpd/modules/libphp7.so
+ install -D -m644 ${srcdir}/apache.conf
${pkgdir}/etc/httpd/conf/extra/php7_module.conf
}
package_php-fpm() {
pkgdesc='FastCGI Process Manager for PHP'
depends=('php' 'systemd')
- backup=('etc/php/php-fpm.conf')
+ backup=('etc/php/php-fpm.conf' 'etc/php/php-fpm.d/www.conf')
install='php-fpm.install'
+ options=('!emptydirs')
- 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
+ cd ${srcdir}/build
+ make -j1 INSTALL_ROOT=${pkgdir} install-fpm
+ install -D -m644 sapi/fpm/php-fpm.service
${pkgdir}/usr/lib/systemd/system/php-fpm.service
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
}
package_php-embed() {
pkgdesc='Embedded PHP SAPI library'
- depends=('php')
+ depends=('php' 'libsystemd')
+ options=('!emptydirs')
- install -D -m755 ${srcdir}/build-embed/libs/libphp5.so
${pkgdir}/usr/lib/libphp5.so
- install -D -m644 ${srcdir}/${pkgbase}-${pkgver}/sapi/embed/php_embed.h
${pkgdir}/usr/include/php/sapi/embed/php_embed.h
+ cd ${srcdir}/build
+ make -j1 INSTALL_ROOT=${pkgdir} PHP_SAPI=embed install-sapi
}
package_php-phpdbg() {
pkgdesc='Interactive PHP debugger'
depends=('php')
+ options=('!emptydirs')
- install -D -m755 ${srcdir}/build-phpdbg/sapi/phpdbg/phpdbg
${pkgdir}/usr/bin/phpdbg
+ cd ${srcdir}/build-phpdbg
+ make -j1 INSTALL_ROOT=${pkgdir} install-phpdbg
}
-package_php-pear() {
- pkgdesc='PHP Extension and Application Repository'
- depends=('php')
- backup=('etc/php/pear.conf')
-
- cd ${srcdir}/build-pear
- make install-pear INSTALL_ROOT=${pkgdir}
- rm -rf
${pkgdir}/usr/share/pear/.{channels,depdb,depdblock,filemap,lock,registry}
-}
-
package_php-enchant() {
pkgdesc='enchant module for PHP'
depends=('php' 'enchant')
- install -D -m755 ${srcdir}/build-php/modules/enchant.so
${pkgdir}/usr/lib/php/modules/enchant.so
+ install -D -m755 ${srcdir}/build/modules/enchant.so
${pkgdir}/usr/lib/php/modules/enchant.so
}
package_php-gd() {
@@ -323,7 +243,7 @@
pkgdesc='gd module for PHP'
depends=('php' 'gd')
- install -D -m755 ${srcdir}/build-php/modules/gd.so
${pkgdir}/usr/lib/php/modules/gd.so
+ install -D -m755 ${srcdir}/build/modules/gd.so
${pkgdir}/usr/lib/php/modules/gd.so
}
package_php-imap() {
@@ -330,7 +250,7 @@
pkgdesc='imap module for PHP'
depends=('php' 'c-client')
- install -D -m755 ${srcdir}/build-php/modules/imap.so
${pkgdir}/usr/lib/php/modules/imap.so
+ install -D -m755 ${srcdir}/build/modules/imap.so
${pkgdir}/usr/lib/php/modules/imap.so
}
package_php-intl() {
@@ -337,36 +257,22 @@
pkgdesc='intl module for PHP'
depends=('php' 'icu')
- install -D -m755 ${srcdir}/build-php/modules/intl.so
${pkgdir}/usr/lib/php/modules/intl.so
+ install -D -m755 ${srcdir}/build/modules/intl.so
${pkgdir}/usr/lib/php/modules/intl.so
}
-package_php-ldap() {
- pkgdesc='ldap module for PHP'
- depends=('php' 'libldap')
-
- install -D -m755 ${srcdir}/build-php/modules/ldap.so
${pkgdir}/usr/lib/php/modules/ldap.so
-}
-
package_php-mcrypt() {
pkgdesc='mcrypt module for PHP'
- depends=('php' 'libmcrypt' 'libltdl')
+ depends=('php' 'libmcrypt' 'libtool')
- install -D -m755 ${srcdir}/build-php/modules/mcrypt.so
${pkgdir}/usr/lib/php/modules/mcrypt.so
+ install -D -m755 ${srcdir}/build/modules/mcrypt.so
${pkgdir}/usr/lib/php/modules/mcrypt.so
}
-package_php-mssql() {
- pkgdesc='mssql module for PHP'
- depends=('php' 'freetds')
-
- install -D -m755 ${srcdir}/build-php/modules/mssql.so
${pkgdir}/usr/lib/php/modules/mssql.so
-}
-
package_php-odbc() {
pkgdesc='ODBC modules for PHP'
depends=('php' 'unixodbc')
- 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/modules/odbc.so
${pkgdir}/usr/lib/php/modules/odbc.so
+ install -D -m755 ${srcdir}/build/modules/pdo_odbc.so
${pkgdir}/usr/lib/php/modules/pdo_odbc.so
}
package_php-pgsql() {
@@ -373,8 +279,8 @@
pkgdesc='PostgreSQL modules for PHP'
depends=('php' 'postgresql-libs')
- 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/modules/pgsql.so
${pkgdir}/usr/lib/php/modules/pgsql.so
+ install -D -m755 ${srcdir}/build/modules/pdo_pgsql.so
${pkgdir}/usr/lib/php/modules/pdo_pgsql.so
}
package_php-pspell() {
@@ -381,7 +287,7 @@
pkgdesc='pspell module for PHP'
depends=('php' 'aspell')
- install -D -m755 ${srcdir}/build-php/modules/pspell.so
${pkgdir}/usr/lib/php/modules/pspell.so
+ install -D -m755 ${srcdir}/build/modules/pspell.so
${pkgdir}/usr/lib/php/modules/pspell.so
}
package_php-snmp() {
@@ -388,7 +294,7 @@
pkgdesc='snmp module for PHP'
depends=('php' 'net-snmp')
- install -D -m755 ${srcdir}/build-php/modules/snmp.so
${pkgdir}/usr/lib/php/modules/snmp.so
+ install -D -m755 ${srcdir}/build/modules/snmp.so
${pkgdir}/usr/lib/php/modules/snmp.so
}
package_php-sqlite() {
@@ -395,8 +301,8 @@
pkgdesc='sqlite module for PHP'
depends=('php' 'sqlite')
- 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/modules/sqlite3.so
${pkgdir}/usr/lib/php/modules/sqlite3.so
+ install -D -m755 ${srcdir}/build/modules/pdo_sqlite.so
${pkgdir}/usr/lib/php/modules/pdo_sqlite.so
}
package_php-tidy() {
@@ -403,7 +309,7 @@
pkgdesc='tidy module for PHP'
depends=('php' 'tidyhtml')
- install -D -m755 ${srcdir}/build-php/modules/tidy.so
${pkgdir}/usr/lib/php/modules/tidy.so
+ install -D -m755 ${srcdir}/build/modules/tidy.so
${pkgdir}/usr/lib/php/modules/tidy.so
}
package_php-xsl() {
@@ -410,5 +316,5 @@
pkgdesc='xsl module for PHP'
depends=('php' 'libxslt')
- install -D -m755 ${srcdir}/build-php/modules/xsl.so
${pkgdir}/usr/lib/php/modules/xsl.so
+ install -D -m755 ${srcdir}/build/modules/xsl.so
${pkgdir}/usr/lib/php/modules/xsl.so
}
Modified: apache.conf
===================================================================
--- apache.conf 2015-12-28 21:17:47 UTC (rev 257335)
+++ apache.conf 2015-12-28 21:24:27 UTC (rev 257336)
@@ -1,7 +1,7 @@
-# Required modules: dir_module, php5_module
+# Required modules: dir_module, php7_module
<IfModule dir_module>
- <IfModule php5_module>
+ <IfModule php7_module>
DirectoryIndex index.php index.html
<FilesMatch "\.php$">
SetHandler application/x-httpd-php
Added: apache.patch
===================================================================
--- apache.patch (rev 0)
+++ apache.patch 2015-12-28 21:24:27 UTC (rev 257336)
@@ -0,0 +1,20 @@
+--- sapi/apache2handler/config.m4.orig 2015-12-08 19:42:18.000000000 +0100
++++ sapi/apache2handler/config.m4 2015-12-15 07:26:17.866096130 +0100
+@@ -122,7 +122,6 @@
+ PHP_BUILD_THREAD_SAFE
+ fi
+ else
+- APACHE_THREADED_MPM=`$APXS_HTTPD -V | grep 'threaded:.*yes'`
+ if test -n "$APACHE_THREADED_MPM"; then
+ PHP_BUILD_THREAD_SAFE
+ fi
+--- configure.orig 2015-12-08 19:42:18.000000000 +0100
++++ configure 2015-12-15 07:26:18.146090579 +0100
+@@ -6875,7 +6875,6 @@
+
+ fi
+ else
+- APACHE_THREADED_MPM=`$APXS_HTTPD -V | grep 'threaded:.*yes'`
+ if test -n "$APACHE_THREADED_MPM"; then
+
+ enable_maintainer_zts=yes
Added: generate_patches
===================================================================
--- generate_patches (rev 0)
+++ generate_patches 2015-12-28 21:24:27 UTC (rev 257336)
@@ -0,0 +1,46 @@
+#!/bin/bash
+
+. PKGBUILD
+
+makepkg -o --nodeps --noprepare --skipinteg
+
+pushd src/${pkgbase}-${pkgver}
+
+sed '/APACHE_THREADED_MPM=/d' -i.orig sapi/apache2handler/config.m4 -i.orig
configure
+
+sed 's/.conf.default/.conf/g' -i.orig sapi/fpm/Makefile.frag
+
+sed \
+ -e 's#run/php-fpm.pid#/run/php-fpm/php-fpm.pid#' \
+ -e 's#^;error_log =.*#error_log = syslog#' \
+ -i.orig sapi/fpm/php-fpm.conf.in
+
+sed \
+ -e 's#^listen =.*#listen = /run/php-fpm/php-fpm.sock#' \
+ -e 's#^;chdir =.*#;chdir = /srv/http#' \
+ -i.orig sapi/fpm/www.conf.in
+
+sed \
+ -e 's#^PIDFile=.*#PIDFile=/run/php-fpm/php-fpm.pid#' \
+ -i.orig sapi/fpm/php-fpm.service.in
+
+extensions=";extension=bcmath.so\n;extension=bz2.so\n;extension=calendar.so\nextension=curl.so\n;extension=dba.so\n;extension=enchant.so\n;extension=exif.so\n;extension=ftp.so\n;extension=gd.so\n;extension=gettext.so\n;extension=gmp.so\n;extension=iconv.so\n;extension=imap.so\n;extension=intl.so\n;extension=ldap.so\n;extension=mcrypt.so\n;extension=mysqli.so\n;extension=odbc.so\n;zend_extension=opcache.so\n;extension=pdo_mysql.so\n;extension=pdo_odbc.so\n;extension=pdo_pgsql.so\n;extension=pdo_sqlite.so\n;extension=pgsql.so\n;extension=pspell.so\n;extension=shmop.so\n;extension=snmp.so\n;extension=soap.so\n;extension=sockets.so\n;extension=sqlite3.so\n;extension=sysvmsg.so\n;extension=sysvsem.so\n;extension=sysvshm.so\n;extension=tidy.so\n;extension=xmlrpc.so\n;extension=xsl.so\nextension=zip.so\n"
+
+sed \
+ -r ":a;N;\$!ba;s/; Windows
Extensions\n.+;?extension=php_[a-z]+\.dll\n/${extensions}/g" \
+ -i.orig php.ini-production
+sed \
+ -e 's#^; extension_dir = "\./"$#extension_dir =
"/usr/lib/php/modules/"#g' \
+ -i php.ini-production
+
+diff -u sapi/apache2handler/config.m4.orig sapi/apache2handler/config.m4 >
../../apache.patch
+diff -u configure.orig configure >> ../../apache.patch
+
+diff -u sapi/fpm/Makefile.frag.orig sapi/fpm/Makefile.frag >
../../php-fpm.patch
+diff -u sapi/fpm/php-fpm.conf.in.orig sapi/fpm/php-fpm.conf.in >>
../../php-fpm.patch
+diff -u sapi/fpm/www.conf.in.orig sapi/fpm/www.conf.in >> ../../php-fpm.patch
+diff -u sapi/fpm/php-fpm.service.in.orig sapi/fpm/php-fpm.service.in >>
../../php-fpm.patch
+
+diff -u php.ini-production.orig php.ini-production > ../../php.ini.patch
+
+popd
Property changes on: php/trunk/generate_patches
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Deleted: logrotate.d.php-fpm
===================================================================
--- logrotate.d.php-fpm 2015-12-28 21:17:47 UTC (rev 257335)
+++ logrotate.d.php-fpm 2015-12-28 21:24:27 UTC (rev 257336)
@@ -1,8 +0,0 @@
-/var/log/php-fpm.log {
- missingok
- notifempty
- delaycompress
- postrotate
- /bin/kill -SIGUSR1 `cat /run/php-fpm/php-fpm.pid 2>/dev/null`
2>/dev/null || true
- endscript
-}
Deleted: php-fpm.conf.in.patch
===================================================================
--- php-fpm.conf.in.patch 2015-12-28 21:17:47 UTC (rev 257335)
+++ php-fpm.conf.in.patch 2015-12-28 21:24:27 UTC (rev 257336)
@@ -1,52 +0,0 @@
---- sapi/fpm/php-fpm.conf.in 2015-01-21 01:40:37.000000000 +0100
-+++ sapi/fpm/php-fpm.conf.in 2015-01-22 16:22:09.076969777 +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)
- ; - @prefix@ otherwise
--;include=etc/fpm.d/*.conf
-+;include=/etc/php/fpm.d/*.conf
-
- ;;;;;;;;;;;;;;;;;;
- ; Global Options ;
-@@ -22,7 +22,7 @@
- ; Pid file
- ; Note: the default prefix is @EXPANDED_LOCALSTATEDIR@
- ; Default Value: none
--;pid = run/php-fpm.pid
-+pid = /run/php-fpm/php-fpm.pid
-
- ; Error log file
- ; If it's set to "syslog", log is sent to syslogd instead of being written
-@@ -161,7 +161,8 @@
- ; (IPv6 and IPv4-mapped) on a 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
-
- ; Set listen(2) backlog.
- ; Default Value: 65535 (-1 on FreeBSD and OpenBSD)
-@@ -172,9 +173,9 @@
- ; BSD-derived systems allow connections regardless of permissions.
- ; Default Values: user and group are set as the running user
- ; mode is set to 0660
--;listen.owner = @php_fpm_user@
--;listen.group = @php_fpm_group@
--;listen.mode = 0660
-+listen.owner = @php_fpm_user@
-+listen.group = @php_fpm_group@
-+listen.mode = 0660
- ; When POSIX Access Control Lists are supported you can set them using
- ; these options, value is a comma separated list of user/group names.
- ; When set, listen.owner and listen.group are ignored
-@@ -476,7 +477,7 @@
- ; Chdir to this directory at the start.
- ; Note: relative path can be used.
- ; Default Value: current directory or / when chroot
--;chdir = /var/www
-+;chdir = /srv/http
-
- ; Redirect worker stdout and stderr into main error log. If not set, stdout
and
- ; stderr will be redirected to /dev/null according to FastCGI specs.
Added: php-fpm.patch
===================================================================
--- php-fpm.patch (rev 0)
+++ php-fpm.patch 2015-12-28 21:24:27 UTC (rev 257336)
@@ -0,0 +1,63 @@
+--- sapi/fpm/Makefile.frag.orig 2015-12-08 19:42:18.000000000 +0100
++++ sapi/fpm/Makefile.frag 2015-12-15 07:26:18.149423847 +0100
+@@ -12,8 +12,8 @@
+
+ @echo "Installing PHP FPM config: $(INSTALL_ROOT)$(sysconfdir)/"
&& \
+ $(mkinstalldirs) $(INSTALL_ROOT)$(sysconfdir)/php-fpm.d || :
+- @$(INSTALL_DATA) sapi/fpm/php-fpm.conf
$(INSTALL_ROOT)$(sysconfdir)/php-fpm.conf.default || :
+- @$(INSTALL_DATA) sapi/fpm/www.conf
$(INSTALL_ROOT)$(sysconfdir)/php-fpm.d/www.conf.default || :
++ @$(INSTALL_DATA) sapi/fpm/php-fpm.conf
$(INSTALL_ROOT)$(sysconfdir)/php-fpm.conf || :
++ @$(INSTALL_DATA) sapi/fpm/www.conf
$(INSTALL_ROOT)$(sysconfdir)/php-fpm.d/www.conf || :
+
+ @echo "Installing PHP FPM man page: $(INSTALL_ROOT)$(mandir)/man8/"
+ @$(mkinstalldirs) $(INSTALL_ROOT)$(mandir)/man8
+--- sapi/fpm/php-fpm.conf.in.orig 2015-12-08 19:42:18.000000000 +0100
++++ sapi/fpm/php-fpm.conf.in 2015-12-15 07:26:18.152757113 +0100
+@@ -14,14 +14,14 @@
+ ; Pid file
+ ; Note: the default prefix is @EXPANDED_LOCALSTATEDIR@
+ ; Default Value: none
+-;pid = run/php-fpm.pid
++;pid = /run/php-fpm/php-fpm.pid
+
+ ; Error log file
+ ; If it's set to "syslog", log is sent to syslogd instead of being written
+ ; in a local file.
+ ; Note: the default prefix is @EXPANDED_LOCALSTATEDIR@
+ ; Default Value: log/php-fpm.log
+-;error_log = log/php-fpm.log
++error_log = syslog
+
+ ; syslog_facility is used to specify what type of program is logging the
+ ; message. This lets syslogd specify that messages from different facilities
+--- sapi/fpm/www.conf.in.orig 2015-12-08 19:42:18.000000000 +0100
++++ sapi/fpm/www.conf.in 2015-12-15 07:26:18.152757113 +0100
+@@ -33,7 +33,7 @@
+ ; (IPv6 and IPv4-mapped) on a specific port;
+ ; '/path/to/unix/socket' - to listen on a unix socket.
+ ; Note: This value is mandatory.
+-listen = 127.0.0.1:9000
++listen = /run/php-fpm/php-fpm.sock
+
+ ; Set listen(2) backlog.
+ ; Default Value: 511 (-1 on FreeBSD and OpenBSD)
+@@ -352,7 +352,7 @@
+ ; Chdir to this directory at the start.
+ ; Note: relative path can be used.
+ ; Default Value: current directory or / when chroot
+-;chdir = /var/www
++;chdir = /srv/http
+
+ ; Redirect worker stdout and stderr into main error log. If not set, stdout
and
+ ; stderr will be redirected to /dev/null according to FastCGI specs.
+--- sapi/fpm/php-fpm.service.in.orig 2015-12-08 19:42:18.000000000 +0100
++++ sapi/fpm/php-fpm.service.in 2015-12-15 07:26:18.156090381 +0100
+@@ -4,7 +4,7 @@
+
+ [Service]
+ Type=@php_fpm_systemd@
+-PIDFile=@localstatedir@/run/php-fpm.pid
++PIDFile=/run/php-fpm/php-fpm.pid
+ ExecStart=@sbindir@/php-fpm --nodaemonize --fpm-config
@sysconfdir@/php-fpm.conf
+ ExecReload=/bin/kill -USR2 $MAINPID
+
Deleted: php-fpm.service
===================================================================
--- php-fpm.service 2015-12-28 21:17:47 UTC (rev 257335)
+++ php-fpm.service 2015-12-28 21:24:27 UTC (rev 257336)
@@ -1,13 +0,0 @@
-[Unit]
-Description=The PHP FastCGI Process Manager
-After=syslog.target network.target
-
-[Service]
-Type=notify
-PIDFile=/run/php-fpm/php-fpm.pid
-PrivateTmp=true
-ExecStart=/usr/bin/php-fpm --nodaemonize --pid /run/php-fpm/php-fpm.pid
-ExecReload=/bin/kill -USR2 $MAINPID
-
-[Install]
-WantedBy=multi-user.target
Modified: php.ini.patch
===================================================================
--- php.ini.patch 2015-12-28 21:17:47 UTC (rev 257335)
+++ php.ini.patch 2015-12-28 21:24:27 UTC (rev 257336)
@@ -1,25 +1,7 @@
---- php.ini-production 2015-01-21 01:40:37.000000000 +0100
-+++ php.ini-production 2015-01-22 16:23:17.311890258 +0100
-@@ -295,7 +295,7 @@
- ; and below. This directive makes most sense if used in a per-directory
- ; or per-virtualhost web server configuration file.
- ; http://php.net/open-basedir
--;open_basedir =
-+open_basedir = /srv/http/:/home/:/tmp/:/usr/share/pear/:/usr/share/webapps/
+--- php.ini-production.orig 2015-12-08 19:42:18.000000000 +0100
++++ php.ini-production 2015-12-15 07:26:18.169423450 +0100
+@@ -720,7 +720,7 @@
- ; This directive allows you to disable certain functions for security reasons.
- ; It receives a comma-delimited list of function names.
-@@ -708,7 +708,7 @@
- ;;;;;;;;;;;;;;;;;;;;;;;;;
-
- ; UNIX: "/path1:/path2"
--;include_path = ".:/php/includes"
-+include_path = ".:/usr/share/pear"
- ;
- ; Windows: "\path1;\path2"
- ;include_path = ".;c:\php\includes"
-@@ -731,7 +731,7 @@
-
; Directory in which the loadable extensions (modules) reside.
; http://php.net/extension-dir
-; extension_dir = "./"
@@ -27,14 +9,14 @@
; On windows:
; extension_dir = "ext"
-@@ -869,48 +869,48 @@
+@@ -858,46 +858,43 @@
; If you only provide the name of the extension, PHP will look for it in its
; default extension directory.
;
-; Windows Extensions
-; Note that ODBC support is built in, so no dll is needed for it.
--; Note that many DLL files are located in the extensions/ (PHP 4) ext/ (PHP 5)
--; extension folders as well as the separate PECL DLL download (PHP 5).
+-; Note that many DLL files are located in the extensions/ (PHP 4) ext/ (PHP
5+)
+-; extension folders as well as the separate PECL DLL download (PHP 5+).
-; Be sure to appropriately set the extension_dir directive.
-;
-;extension=php_bz2.dll
@@ -49,7 +31,6 @@
-;extension=php_ldap.dll
-;extension=php_mbstring.dll
-;extension=php_exif.dll ; Must be after mbstring as it depends on it
--;extension=php_mysql.dll
-;extension=php_mysqli.dll
-;extension=php_oci8_12c.dll ; Use with Oracle Database 12c Instant Client
-;extension=php_openssl.dll
@@ -62,14 +43,13 @@
-;extension=php_pgsql.dll
-;extension=php_shmop.dll
-
--; The MIBS data available in the PHP distribution must be installed.
--; See http://www.php.net/manual/en/snmp.installation.php
+-; The MIBS data available in the PHP distribution must be installed.
+-; See http://www.php.net/manual/en/snmp.installation.php
-;extension=php_snmp.dll
-
-;extension=php_soap.dll
-;extension=php_sockets.dll
-;extension=php_sqlite3.dll
--;extension=php_sybase_ct.dll
-;extension=php_tidy.dll
-;extension=php_xmlrpc.dll
-;extension=php_xsl.dll
@@ -82,7 +62,7 @@
+;extension=exif.so
+;extension=ftp.so
+;extension=gd.so
-+extension=gettext.so
++;extension=gettext.so
+;extension=gmp.so
+;extension=iconv.so
+;extension=imap.so
@@ -89,19 +69,14 @@
+;extension=intl.so
+;extension=ldap.so
+;extension=mcrypt.so
-+;extension=mssql.so
-+;extension=mysql.so
+;extension=mysqli.so
+;extension=odbc.so
+;zend_extension=opcache.so
-+;extension=openssl.so
+;extension=pdo_mysql.so
+;extension=pdo_odbc.so
+;extension=pdo_pgsql.so
+;extension=pdo_sqlite.so
+;extension=pgsql.so
-+;extension=phar.so
-+;extension=posix.so
+;extension=pspell.so
+;extension=shmop.so
+;extension=snmp.so
@@ -114,7 +89,7 @@
+;extension=tidy.so
+;extension=xmlrpc.so
+;extension=xsl.so
-+;extension=zip.so
++extension=zip.so
;;;;;;;;;;;;;;;;;;;
; Module Settings ;
