[arch-commits] Commit in php/repos (18 files)
Pierre Schmitz
pierre at archlinux.org
Tue Apr 7 05:29:05 UTC 2015
Date: Tuesday, April 7, 2015 @ 07:29:04
Author: pierre
Revision: 235552
archrelease: copy trunk to staging-i686, staging-x86_64
Added:
php/repos/staging-i686/
php/repos/staging-i686/PKGBUILD
(from rev 235551, php/trunk/PKGBUILD)
php/repos/staging-i686/apache.conf
(from rev 235551, php/trunk/apache.conf)
php/repos/staging-i686/logrotate.d.php-fpm
(from rev 235551, php/trunk/logrotate.d.php-fpm)
php/repos/staging-i686/php-fpm.conf.in.patch
(from rev 235551, php/trunk/php-fpm.conf.in.patch)
php/repos/staging-i686/php-fpm.install
(from rev 235551, php/trunk/php-fpm.install)
php/repos/staging-i686/php-fpm.service
(from rev 235551, php/trunk/php-fpm.service)
php/repos/staging-i686/php-fpm.tmpfiles
(from rev 235551, php/trunk/php-fpm.tmpfiles)
php/repos/staging-i686/php.ini.patch
(from rev 235551, php/trunk/php.ini.patch)
php/repos/staging-x86_64/
php/repos/staging-x86_64/PKGBUILD
(from rev 235551, php/trunk/PKGBUILD)
php/repos/staging-x86_64/apache.conf
(from rev 235551, php/trunk/apache.conf)
php/repos/staging-x86_64/logrotate.d.php-fpm
(from rev 235551, php/trunk/logrotate.d.php-fpm)
php/repos/staging-x86_64/php-fpm.conf.in.patch
(from rev 235551, php/trunk/php-fpm.conf.in.patch)
php/repos/staging-x86_64/php-fpm.install
(from rev 235551, php/trunk/php-fpm.install)
php/repos/staging-x86_64/php-fpm.service
(from rev 235551, php/trunk/php-fpm.service)
php/repos/staging-x86_64/php-fpm.tmpfiles
(from rev 235551, php/trunk/php-fpm.tmpfiles)
php/repos/staging-x86_64/php.ini.patch
(from rev 235551, php/trunk/php.ini.patch)
--------------------------------------+
staging-i686/PKGBUILD | 395 +++++++++++++++++++++++++++++++++
staging-i686/apache.conf | 13 +
staging-i686/logrotate.d.php-fpm | 8
staging-i686/php-fpm.conf.in.patch | 52 ++++
staging-i686/php-fpm.install | 9
staging-i686/php-fpm.service | 13 +
staging-i686/php-fpm.tmpfiles | 1
staging-i686/php.ini.patch | 121 ++++++++++
staging-x86_64/PKGBUILD | 395 +++++++++++++++++++++++++++++++++
staging-x86_64/apache.conf | 13 +
staging-x86_64/logrotate.d.php-fpm | 8
staging-x86_64/php-fpm.conf.in.patch | 52 ++++
staging-x86_64/php-fpm.install | 9
staging-x86_64/php-fpm.service | 13 +
staging-x86_64/php-fpm.tmpfiles | 1
staging-x86_64/php.ini.patch | 121 ++++++++++
16 files changed, 1224 insertions(+)
Copied: php/repos/staging-i686/PKGBUILD (from rev 235551, php/trunk/PKGBUILD)
===================================================================
--- staging-i686/PKGBUILD (rev 0)
+++ staging-i686/PKGBUILD 2015-04-07 05:29:04 UTC (rev 235552)
@@ -0,0 +1,395 @@
+# $Id$
+# Maintainer: Pierre Schmitz <pierre at archlinux.de>
+
+pkgbase=php
+pkgname=('php'
+ 'php-cgi'
+ 'php-apache'
+ 'php-fpm'
+ 'php-embed'
+ 'php-phpdbg'
+ 'php-pear'
+ 'php-enchant'
+ 'php-gd'
+ 'php-intl'
+ 'php-ldap'
+ 'php-mcrypt'
+ 'php-mssql'
+ 'php-odbc'
+ 'php-pgsql'
+ 'php-pspell'
+ 'php-snmp'
+ 'php-sqlite'
+ 'php-tidy'
+ 'php-xsl')
+pkgver=5.6.7
+pkgrel=2
+arch=('i686' 'x86_64')
+license=('PHP')
+url='http://www.php.net'
+makedepends=('apache' 'imap' 'postgresql-libs' 'libldap' 'postfix'
+ 'sqlite' 'unixodbc' 'net-snmp' 'libzip' 'enchant' 'file' 'freetds'
+ 'libmcrypt' 'tidyhtml' 'aspell' 'libltdl' 'gd' 'icu'
+ 'curl' 'libxslt' 'openssl' 'db' 'gmp' 'systemd')
+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=('4e04eb021de009981ed963f993a171c1'
+# 'SKIP'
+ '942f9d8af9bcab2487ca710ef42ef1de'
+ 'dec2cbaad64e3abf4f0ec70e1de4e8e9'
+ '16b5e2e4da59f15bea4c2db78a7bc8dc'
+ '25bc67ad828e8147a817410b68d8016c'
+ 'cc2940f5312ba42e7aa1ddfab74b84c4'
+ 'c60343df74f8e1afb13b084d5c0e47ed')
+validpgpkeys=('6E4F6AB321FDC07F2C332E3AC2BF0BC433CFC8B3'
+ '0BD78B5F97500D450838F95DFE857D9A90D90EC1')
+
+prepare() {
+ cd ${srcdir}/${pkgbase}-${pkgver}
+
+ 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() {
+ local _phpconfig="--srcdir=../${pkgbase}-${pkgver} \
+ --config-cache \
+ --prefix=/usr \
+ --sbindir=/usr/bin \
+ --sysconfdir=/etc/php \
+ --localstatedir=/var \
+ --with-layout=GNU \
+ --with-config-file-path=/etc/php \
+ --with-config-file-scan-dir=/etc/php/conf.d \
+ --disable-rpath \
+ --mandir=/usr/share/man \
+ --without-pear \
+ "
+
+ 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 \
+ --enable-sysvmsg=shared \
+ --enable-sysvsem=shared \
+ --enable-sysvshm=shared \
+ --enable-zip=shared \
+ --with-bz2=shared \
+ --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-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-pcre-regex=/usr \
+ --with-pdo-mysql=shared,mysqlnd \
+ --with-pdo-odbc=shared,unixODBC,/usr \
+ --with-pdo-pgsql=shared \
+ --with-pdo-sqlite=shared,/usr \
+ --with-pgsql=shared \
+ --with-png-dir=/usr \
+ --with-pspell=shared \
+ --with-snmp=shared \
+ --with-sqlite3=shared,/usr \
+ --with-tidy=shared \
+ --with-unixODBC=shared,/usr \
+ --with-xmlrpc=shared \
+ --with-xsl=shared \
+ --with-zlib \
+ "
+
+ 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
+ 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 \
+ ${_phpextensions}
+ make
+
+ # apache
+ cp -a ${srcdir}/build-php ${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
+ 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}/build-php
+# export SNMP_TIMEOUT=1
+# export SNMP_RETRIES=0
+# export NO_INTERACTION=1
+# make test
+# echo
+# }
+
+package_php() {
+ pkgdesc='An HTML-embedded scripting language'
+ depends=('pcre' 'libxml2' 'curl' 'libzip')
+ 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
+ install -D -m644 ${srcdir}/${pkgbase}-${pkgver}/php.ini-production ${pkgdir}/etc/php/php.ini
+ install -d -m755 ${pkgdir}/etc/php/conf.d/
+
+ # 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,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
+ # fix broken link
+ ln -sf phar.phar ${pkgdir}/usr/bin/phar
+}
+
+package_php-cgi() {
+ pkgdesc='CGI and FCGI SAPI for PHP'
+ depends=('php')
+
+ install -D -m755 ${srcdir}/build-cgi/sapi/cgi/php-cgi ${pkgdir}/usr/bin/php-cgi
+}
+
+package_php-apache() {
+ pkgdesc='Apache SAPI for PHP'
+ depends=('php' 'apache')
+ backup=('etc/httpd/conf/extra/php5_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
+}
+
+package_php-fpm() {
+ pkgdesc='FastCGI Process Manager for PHP'
+ depends=('php' 'systemd')
+ backup=('etc/php/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
+}
+
+package_php-embed() {
+ pkgdesc='Embedded PHP SAPI library'
+ depends=('php')
+
+ 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
+}
+
+package_php-phpdbg() {
+ pkgdesc='Interactive PHP debugger'
+ depends=('php')
+
+ install -D -m755 ${srcdir}/build-phpdbg/sapi/phpdbg/phpdbg ${pkgdir}/usr/bin/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
+}
+
+package_php-gd() {
+ pkgdesc='gd module for PHP'
+ depends=('php' 'gd')
+
+ install -D -m755 ${srcdir}/build-php/modules/gd.so ${pkgdir}/usr/lib/php/modules/gd.so
+}
+
+package_php-intl() {
+ pkgdesc='intl module for PHP'
+ depends=('php' 'icu')
+
+ install -D -m755 ${srcdir}/build-php/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')
+
+ install -D -m755 ${srcdir}/build-php/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
+}
+
+package_php-pgsql() {
+ 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
+}
+
+package_php-pspell() {
+ pkgdesc='pspell module for PHP'
+ depends=('php' 'aspell')
+
+ install -D -m755 ${srcdir}/build-php/modules/pspell.so ${pkgdir}/usr/lib/php/modules/pspell.so
+}
+
+package_php-snmp() {
+ 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
+}
+
+package_php-sqlite() {
+ 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
+}
+
+package_php-tidy() {
+ pkgdesc='tidy module for PHP'
+ depends=('php' 'tidyhtml')
+
+ install -D -m755 ${srcdir}/build-php/modules/tidy.so ${pkgdir}/usr/lib/php/modules/tidy.so
+}
+
+package_php-xsl() {
+ pkgdesc='xsl module for PHP'
+ depends=('php' 'libxslt')
+
+ install -D -m755 ${srcdir}/build-php/modules/xsl.so ${pkgdir}/usr/lib/php/modules/xsl.so
+}
Copied: php/repos/staging-i686/apache.conf (from rev 235551, php/trunk/apache.conf)
===================================================================
--- staging-i686/apache.conf (rev 0)
+++ staging-i686/apache.conf 2015-04-07 05:29:04 UTC (rev 235552)
@@ -0,0 +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>
Copied: php/repos/staging-i686/logrotate.d.php-fpm (from rev 235551, php/trunk/logrotate.d.php-fpm)
===================================================================
--- staging-i686/logrotate.d.php-fpm (rev 0)
+++ staging-i686/logrotate.d.php-fpm 2015-04-07 05:29:04 UTC (rev 235552)
@@ -0,0 +1,8 @@
+/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
+}
Copied: php/repos/staging-i686/php-fpm.conf.in.patch (from rev 235551, php/trunk/php-fpm.conf.in.patch)
===================================================================
--- staging-i686/php-fpm.conf.in.patch (rev 0)
+++ staging-i686/php-fpm.conf.in.patch 2015-04-07 05:29:04 UTC (rev 235552)
@@ -0,0 +1,52 @@
+--- 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.
Copied: php/repos/staging-i686/php-fpm.install (from rev 235551, php/trunk/php-fpm.install)
===================================================================
--- staging-i686/php-fpm.install (rev 0)
+++ staging-i686/php-fpm.install 2015-04-07 05:29:04 UTC (rev 235552)
@@ -0,0 +1,9 @@
+post_install() {
+ if [[ ! -d run/php-fpm ]]; then
+ usr/bin/systemd-tmpfiles --create php-fpm.conf
+ fi
+}
+
+post_upgrade() {
+ post_install
+}
Copied: php/repos/staging-i686/php-fpm.service (from rev 235551, php/trunk/php-fpm.service)
===================================================================
--- staging-i686/php-fpm.service (rev 0)
+++ staging-i686/php-fpm.service 2015-04-07 05:29:04 UTC (rev 235552)
@@ -0,0 +1,13 @@
+[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
Copied: php/repos/staging-i686/php-fpm.tmpfiles (from rev 235551, php/trunk/php-fpm.tmpfiles)
===================================================================
--- staging-i686/php-fpm.tmpfiles (rev 0)
+++ staging-i686/php-fpm.tmpfiles 2015-04-07 05:29:04 UTC (rev 235552)
@@ -0,0 +1 @@
+d /run/php-fpm 755 root root
Copied: php/repos/staging-i686/php.ini.patch (from rev 235551, php/trunk/php.ini.patch)
===================================================================
--- staging-i686/php.ini.patch (rev 0)
+++ staging-i686/php.ini.patch 2015-04-07 05:29:04 UTC (rev 235552)
@@ -0,0 +1,121 @@
+--- 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/
+
+ ; 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 = "./"
++extension_dir = "/usr/lib/php/modules/"
+ ; On windows:
+ ; extension_dir = "ext"
+
+@@ -869,49 +869,48 @@
+ ; 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).
+-; Be sure to appropriately set the extension_dir directive.
+-;
+-;extension=php_bz2.dll
+-;extension=php_curl.dll
+-;extension=php_fileinfo.dll
+-;extension=php_gd2.dll
+-;extension=php_gettext.dll
+-;extension=php_gmp.dll
+-;extension=php_intl.dll
+-;extension=php_imap.dll
+-;extension=php_interbase.dll
+-;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
+-;extension=php_pdo_firebird.dll
+-;extension=php_pdo_mysql.dll
+-;extension=php_pdo_oci.dll
+-;extension=php_pdo_odbc.dll
+-;extension=php_pdo_pgsql.dll
+-;extension=php_pdo_sqlite.dll
+-;extension=php_pgsql.dll
+-;extension=php_pspell.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
+-;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
++;extension=bcmath.so
++;extension=bz2.so
++;extension=calendar.so
++extension=curl.so
++;extension=dba.so
++;extension=enchant.so
++;extension=exif.so
++;extension=ftp.so
++;extension=gd.so
++extension=gettext.so
++;extension=gmp.so
++;extension=iconv.so
++;extension=imap.so
++;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
++;extension=soap.so
++;extension=sockets.so
++;extension=sqlite3.so
++;extension=sysvmsg.so
++;extension=sysvsem.so
++;extension=sysvshm.so
++;extension=tidy.so
++;extension=xmlrpc.so
++;extension=xsl.so
++;extension=zip.so
+
+ ;;;;;;;;;;;;;;;;;;;
+ ; Module Settings ;
Copied: php/repos/staging-x86_64/PKGBUILD (from rev 235551, php/trunk/PKGBUILD)
===================================================================
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2015-04-07 05:29:04 UTC (rev 235552)
@@ -0,0 +1,395 @@
+# $Id$
+# Maintainer: Pierre Schmitz <pierre at archlinux.de>
+
+pkgbase=php
+pkgname=('php'
+ 'php-cgi'
+ 'php-apache'
+ 'php-fpm'
+ 'php-embed'
+ 'php-phpdbg'
+ 'php-pear'
+ 'php-enchant'
+ 'php-gd'
+ 'php-intl'
+ 'php-ldap'
+ 'php-mcrypt'
+ 'php-mssql'
+ 'php-odbc'
+ 'php-pgsql'
+ 'php-pspell'
+ 'php-snmp'
+ 'php-sqlite'
+ 'php-tidy'
+ 'php-xsl')
+pkgver=5.6.7
+pkgrel=2
+arch=('i686' 'x86_64')
+license=('PHP')
+url='http://www.php.net'
+makedepends=('apache' 'imap' 'postgresql-libs' 'libldap' 'postfix'
+ 'sqlite' 'unixodbc' 'net-snmp' 'libzip' 'enchant' 'file' 'freetds'
+ 'libmcrypt' 'tidyhtml' 'aspell' 'libltdl' 'gd' 'icu'
+ 'curl' 'libxslt' 'openssl' 'db' 'gmp' 'systemd')
+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=('4e04eb021de009981ed963f993a171c1'
+# 'SKIP'
+ '942f9d8af9bcab2487ca710ef42ef1de'
+ 'dec2cbaad64e3abf4f0ec70e1de4e8e9'
+ '16b5e2e4da59f15bea4c2db78a7bc8dc'
+ '25bc67ad828e8147a817410b68d8016c'
+ 'cc2940f5312ba42e7aa1ddfab74b84c4'
+ 'c60343df74f8e1afb13b084d5c0e47ed')
+validpgpkeys=('6E4F6AB321FDC07F2C332E3AC2BF0BC433CFC8B3'
+ '0BD78B5F97500D450838F95DFE857D9A90D90EC1')
+
+prepare() {
+ cd ${srcdir}/${pkgbase}-${pkgver}
+
+ 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() {
+ local _phpconfig="--srcdir=../${pkgbase}-${pkgver} \
+ --config-cache \
+ --prefix=/usr \
+ --sbindir=/usr/bin \
+ --sysconfdir=/etc/php \
+ --localstatedir=/var \
+ --with-layout=GNU \
+ --with-config-file-path=/etc/php \
+ --with-config-file-scan-dir=/etc/php/conf.d \
+ --disable-rpath \
+ --mandir=/usr/share/man \
+ --without-pear \
+ "
+
+ 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 \
+ --enable-sysvmsg=shared \
+ --enable-sysvsem=shared \
+ --enable-sysvshm=shared \
+ --enable-zip=shared \
+ --with-bz2=shared \
+ --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-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-pcre-regex=/usr \
+ --with-pdo-mysql=shared,mysqlnd \
+ --with-pdo-odbc=shared,unixODBC,/usr \
+ --with-pdo-pgsql=shared \
+ --with-pdo-sqlite=shared,/usr \
+ --with-pgsql=shared \
+ --with-png-dir=/usr \
+ --with-pspell=shared \
+ --with-snmp=shared \
+ --with-sqlite3=shared,/usr \
+ --with-tidy=shared \
+ --with-unixODBC=shared,/usr \
+ --with-xmlrpc=shared \
+ --with-xsl=shared \
+ --with-zlib \
+ "
+
+ 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
+ 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 \
+ ${_phpextensions}
+ make
+
+ # apache
+ cp -a ${srcdir}/build-php ${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
+ 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}/build-php
+# export SNMP_TIMEOUT=1
+# export SNMP_RETRIES=0
+# export NO_INTERACTION=1
+# make test
+# echo
+# }
+
+package_php() {
+ pkgdesc='An HTML-embedded scripting language'
+ depends=('pcre' 'libxml2' 'curl' 'libzip')
+ 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
+ install -D -m644 ${srcdir}/${pkgbase}-${pkgver}/php.ini-production ${pkgdir}/etc/php/php.ini
+ install -d -m755 ${pkgdir}/etc/php/conf.d/
+
+ # 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,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
+ # fix broken link
+ ln -sf phar.phar ${pkgdir}/usr/bin/phar
+}
+
+package_php-cgi() {
+ pkgdesc='CGI and FCGI SAPI for PHP'
+ depends=('php')
+
+ install -D -m755 ${srcdir}/build-cgi/sapi/cgi/php-cgi ${pkgdir}/usr/bin/php-cgi
+}
+
+package_php-apache() {
+ pkgdesc='Apache SAPI for PHP'
+ depends=('php' 'apache')
+ backup=('etc/httpd/conf/extra/php5_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
+}
+
+package_php-fpm() {
+ pkgdesc='FastCGI Process Manager for PHP'
+ depends=('php' 'systemd')
+ backup=('etc/php/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
+}
+
+package_php-embed() {
+ pkgdesc='Embedded PHP SAPI library'
+ depends=('php')
+
+ 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
+}
+
+package_php-phpdbg() {
+ pkgdesc='Interactive PHP debugger'
+ depends=('php')
+
+ install -D -m755 ${srcdir}/build-phpdbg/sapi/phpdbg/phpdbg ${pkgdir}/usr/bin/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
+}
+
+package_php-gd() {
+ pkgdesc='gd module for PHP'
+ depends=('php' 'gd')
+
+ install -D -m755 ${srcdir}/build-php/modules/gd.so ${pkgdir}/usr/lib/php/modules/gd.so
+}
+
+package_php-intl() {
+ pkgdesc='intl module for PHP'
+ depends=('php' 'icu')
+
+ install -D -m755 ${srcdir}/build-php/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')
+
+ install -D -m755 ${srcdir}/build-php/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
+}
+
+package_php-pgsql() {
+ 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
+}
+
+package_php-pspell() {
+ pkgdesc='pspell module for PHP'
+ depends=('php' 'aspell')
+
+ install -D -m755 ${srcdir}/build-php/modules/pspell.so ${pkgdir}/usr/lib/php/modules/pspell.so
+}
+
+package_php-snmp() {
+ 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
+}
+
+package_php-sqlite() {
+ 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
+}
+
+package_php-tidy() {
+ pkgdesc='tidy module for PHP'
+ depends=('php' 'tidyhtml')
+
+ install -D -m755 ${srcdir}/build-php/modules/tidy.so ${pkgdir}/usr/lib/php/modules/tidy.so
+}
+
+package_php-xsl() {
+ pkgdesc='xsl module for PHP'
+ depends=('php' 'libxslt')
+
+ install -D -m755 ${srcdir}/build-php/modules/xsl.so ${pkgdir}/usr/lib/php/modules/xsl.so
+}
Copied: php/repos/staging-x86_64/apache.conf (from rev 235551, php/trunk/apache.conf)
===================================================================
--- staging-x86_64/apache.conf (rev 0)
+++ staging-x86_64/apache.conf 2015-04-07 05:29:04 UTC (rev 235552)
@@ -0,0 +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>
Copied: php/repos/staging-x86_64/logrotate.d.php-fpm (from rev 235551, php/trunk/logrotate.d.php-fpm)
===================================================================
--- staging-x86_64/logrotate.d.php-fpm (rev 0)
+++ staging-x86_64/logrotate.d.php-fpm 2015-04-07 05:29:04 UTC (rev 235552)
@@ -0,0 +1,8 @@
+/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
+}
Copied: php/repos/staging-x86_64/php-fpm.conf.in.patch (from rev 235551, php/trunk/php-fpm.conf.in.patch)
===================================================================
--- staging-x86_64/php-fpm.conf.in.patch (rev 0)
+++ staging-x86_64/php-fpm.conf.in.patch 2015-04-07 05:29:04 UTC (rev 235552)
@@ -0,0 +1,52 @@
+--- 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.
Copied: php/repos/staging-x86_64/php-fpm.install (from rev 235551, php/trunk/php-fpm.install)
===================================================================
--- staging-x86_64/php-fpm.install (rev 0)
+++ staging-x86_64/php-fpm.install 2015-04-07 05:29:04 UTC (rev 235552)
@@ -0,0 +1,9 @@
+post_install() {
+ if [[ ! -d run/php-fpm ]]; then
+ usr/bin/systemd-tmpfiles --create php-fpm.conf
+ fi
+}
+
+post_upgrade() {
+ post_install
+}
Copied: php/repos/staging-x86_64/php-fpm.service (from rev 235551, php/trunk/php-fpm.service)
===================================================================
--- staging-x86_64/php-fpm.service (rev 0)
+++ staging-x86_64/php-fpm.service 2015-04-07 05:29:04 UTC (rev 235552)
@@ -0,0 +1,13 @@
+[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
Copied: php/repos/staging-x86_64/php-fpm.tmpfiles (from rev 235551, php/trunk/php-fpm.tmpfiles)
===================================================================
--- staging-x86_64/php-fpm.tmpfiles (rev 0)
+++ staging-x86_64/php-fpm.tmpfiles 2015-04-07 05:29:04 UTC (rev 235552)
@@ -0,0 +1 @@
+d /run/php-fpm 755 root root
Copied: php/repos/staging-x86_64/php.ini.patch (from rev 235551, php/trunk/php.ini.patch)
===================================================================
--- staging-x86_64/php.ini.patch (rev 0)
+++ staging-x86_64/php.ini.patch 2015-04-07 05:29:04 UTC (rev 235552)
@@ -0,0 +1,121 @@
+--- 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/
+
+ ; 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 = "./"
++extension_dir = "/usr/lib/php/modules/"
+ ; On windows:
+ ; extension_dir = "ext"
+
+@@ -869,49 +869,48 @@
+ ; 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).
+-; Be sure to appropriately set the extension_dir directive.
+-;
+-;extension=php_bz2.dll
+-;extension=php_curl.dll
+-;extension=php_fileinfo.dll
+-;extension=php_gd2.dll
+-;extension=php_gettext.dll
+-;extension=php_gmp.dll
+-;extension=php_intl.dll
+-;extension=php_imap.dll
+-;extension=php_interbase.dll
+-;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
+-;extension=php_pdo_firebird.dll
+-;extension=php_pdo_mysql.dll
+-;extension=php_pdo_oci.dll
+-;extension=php_pdo_odbc.dll
+-;extension=php_pdo_pgsql.dll
+-;extension=php_pdo_sqlite.dll
+-;extension=php_pgsql.dll
+-;extension=php_pspell.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
+-;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
++;extension=bcmath.so
++;extension=bz2.so
++;extension=calendar.so
++extension=curl.so
++;extension=dba.so
++;extension=enchant.so
++;extension=exif.so
++;extension=ftp.so
++;extension=gd.so
++extension=gettext.so
++;extension=gmp.so
++;extension=iconv.so
++;extension=imap.so
++;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
++;extension=soap.so
++;extension=sockets.so
++;extension=sqlite3.so
++;extension=sysvmsg.so
++;extension=sysvsem.so
++;extension=sysvshm.so
++;extension=tidy.so
++;extension=xmlrpc.so
++;extension=xsl.so
++;extension=zip.so
+
+ ;;;;;;;;;;;;;;;;;;;
+ ; Module Settings ;
More information about the arch-commits
mailing list