Date: Thursday, July 19, 2018 @ 16:27:47 Author: pierre Revision: 329058
archrelease: copy trunk to extra-x86_64 Deleted: php/repos/extra-x86_64/PKGBUILD php/repos/extra-x86_64/apache.conf php/repos/extra-x86_64/apache.patch php/repos/extra-x86_64/enchant-2.patch php/repos/extra-x86_64/freetype.patch php/repos/extra-x86_64/generate_patches php/repos/extra-x86_64/php-fpm.patch php/repos/extra-x86_64/php-fpm.tmpfiles php/repos/extra-x86_64/php.ini.patch ------------------+ PKGBUILD | 343 ----------------------------------------------------- apache.conf | 13 -- apache.patch | 10 - enchant-2.patch | 61 --------- freetype.patch | 38 ----- generate_patches | 47 ------- php-fpm.patch | 74 ----------- php-fpm.tmpfiles | 1 php.ini.patch | 77 ----------- 9 files changed, 664 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2018-07-19 16:27:24 UTC (rev 329057) +++ PKGBUILD 2018-07-19 16:27:47 UTC (rev 329058) @@ -1,343 +0,0 @@ -# $Id$ -# Maintainer: Pierre Schmitz <[email protected]> - -pkgbase=php -pkgname=('php' - 'php-cgi' - 'php-apache' - 'php-fpm' - 'php-embed' - 'php-phpdbg' - 'php-dblib' - 'php-enchant' - 'php-gd' - 'php-imap' - 'php-intl' - 'php-sodium' - 'php-odbc' - 'php-pgsql' - 'php-pspell' - 'php-snmp' - 'php-sqlite' - 'php-tidy' - 'php-xsl') -pkgver=7.2.8 -pkgrel=1 -arch=('x86_64') -license=('PHP') -url='http://www.php.net' -makedepends=('apache' 'aspell' 'c-client' 'db' 'enchant' 'gd' 'gmp' 'icu' 'libsodium' 'libxslt' 'libzip' 'net-snmp' - 'postgresql-libs' 'sqlite' 'systemd' 'tidy' 'unixodbc' 'curl' 'libtool' 'postfix' 'freetds' 'pcre' 'libnsl') -checkdepends=('procps-ng') -source=("https://php.net/distributions/${pkgbase}-${pkgver}.tar.xz"{,.asc} - 'apache.patch' 'apache.conf' 'php-fpm.patch' 'php-fpm.tmpfiles' 'php.ini.patch' - 'enchant-2.patch' 'freetype.patch') -sha512sums=('8a52f2401ce46921c5842ca98bb81da1f6287d0ba68825f53d16853f808e702967fa9b4bea81d49a3e91c95c0b9eb218169cd6f32a403f7d120348ba5e009bea' - 'SKIP' - 'bb9abfc51c41e1de180ef09244691c909ee64feebd9749978e1ecb7f576466a37232d9c6e97c1a01a96b8413a33c4818a91dc79f63078dc1946f56dad516bb05' - 'eccbe1a0c7b2757ab3c982c871cc591a66ad70f085aaa0d44f93cacacedc7b8fd21b8d0c66471327ff070db1bab1ab83a802f6fa190f33bdd74c134975e3910e' - 'c5d57a4d06d33856082a461a6796975ec42b655e81abe14bc896692d44b5c28e9b344111e64d13af486168b3dc927d908705e543095f34052f72198f257b4c34' - '824e9a0d10063283357d49a81ab49bf834afd24f098482bdbaa9ab60bbad2b0dea6f5879259b73717d437626b02fb4f2d3ef68b7bcbb26bee274a7b61144720f' - '85000bcb4f5674bfcbac7f32aeb28c523904a23da716e7fd982ac225845843e0acb33c0b8552107c234b1dd106337ad0a6792253f200980b88a6f6239ec982d0' - '06b49fb044fe8cdeef5109aa7bb6858906396e3f3643827cdb241264029579c71b0a7661d24b78b16573c54832505491c4b2a1fd77ae7c313cb082731c2efd9e' - '97ca469d5234f5cc71af38bb99a60130fdab5f849ad1f49f112101779c7659ca4d6700aef72e0294c85bdcb18e487fc0cdda855cc51084b9e8cacb02ec0fb1eb') -validpgpkeys=('B1B44D8F021E4E2D6021E995DC9FF8D3EE5AF27F' - '1729F83938DA44E27BA0F4D3DBDB397470D12172') - -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 -p1 -i ${srcdir}/enchant-2.patch - patch -p1 -i ${srcdir}/freetype.patch - autoconf - - rm tests/output/stream_isatty_*.phpt -} - -build() { - # http://site.icu-project.org/download/61#TOC-Migration-Issues - CPPFLAGS+=' -DU_USING_ICU_NAMESPACE=1' - - 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-intl=shared \ - --enable-mbstring \ - --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-freetype-dir=/usr \ - --with-gd=shared,/usr \ - --with-gdbm \ - --with-gettext=shared \ - --with-gmp=shared \ - --with-iconv=shared \ - --with-imap-ssl \ - --with-imap=shared \ - --with-kerberos=/usr \ - --with-ldap=shared \ - --with-ldap-sasl \ - --with-libzip \ - --with-mhash \ - --with-mysql-sock=/run/mysqld/mysqld.sock \ - --with-mysqli=shared,mysqlnd \ - --with-openssl \ - --with-password-argon2 \ - --with-pcre-regex=/usr \ - --with-pdo-dblib=shared,/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-pspell=shared \ - --with-readline \ - --with-snmp=shared \ - --with-sodium=shared \ - --with-sqlite3=shared,/usr \ - --with-tidy=shared \ - --with-unixODBC=shared,/usr \ - --with-xmlrpc=shared \ - --with-xsl=shared \ - --with-zlib \ - --enable-pcntl \ - " - - EXTENSION_DIR=/usr/lib/php/modules - export EXTENSION_DIR - - mkdir ${srcdir}/build - cd ${srcdir}/build - ln -s ../${pkgbase}-${pkgver}/configure - ./configure ${_phpconfig} \ - --enable-cgi \ - --enable-fpm \ - --with-fpm-systemd \ - --with-fpm-acl \ - --with-fpm-user=http \ - --with-fpm-group=http \ - --enable-embed=shared \ - ${_phpextensions} - make - - # 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} \ - --with-apxs2 \ - ${_phpextensions} - make - - # phpdbg - cp -a ${srcdir}/build ${srcdir}/build-phpdbg - cd ${srcdir}/build-phpdbg - ./configure ${_phpconfig} \ - --enable-phpdbg \ - ${_phpextensions} - make -} - -check() { - cd ${srcdir}/${pkgbase}-${pkgver} - - # Check if sendmail was configured correctly (FS#47600) - ${srcdir}/build/sapi/cli/php -n -r 'echo ini_get("sendmail_path");' | grep -q '/usr/bin/sendmail' - - export REPORT_EXIT_STATUS=1 - export NO_INTERACTION=1 - export SKIP_ONLINE_TESTS=1 - export SKIP_SLOW_TESTS=1 - - ${srcdir}/build/sapi/cli/php -n run-tests.php -n -P {tests,Zend} -} - -package_php() { - pkgdesc='A general-purpose scripting language that is especially suited to web development' - depends=('libxml2' 'curl' 'libzip' 'pcre' 'argon2') - replaces=('php-ldap') - conflicts=('php-ldap') - provides=("php-ldap=${pkgver}") - backup=('etc/php/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/ - - # 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,sodium,odbc,pdo_dblib,pdo_odbc,pgsql,pdo_pgsql,pspell,snmp,sqlite3,pdo_sqlite,tidy,xsl}.so - # remove empty directory - rmdir ${pkgdir}/usr/include/php/include -} - -package_php-cgi() { - pkgdesc='CGI and FCGI SAPI for PHP' - depends=('php') - - cd ${srcdir}/build - make -j1 INSTALL_ROOT=${pkgdir} install-cgi -} - -package_php-apache() { - pkgdesc='Apache SAPI for PHP' - depends=('php' 'apache' 'libnsl') - backup=('etc/httpd/conf/extra/php7_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' 'etc/php/php-fpm.d/www.conf') - options=('!emptydirs') - - 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 -} - -package_php-embed() { - pkgdesc='Embedded PHP SAPI library' - depends=('php' 'libsystemd' 'libnsl') - options=('!emptydirs') - - cd ${srcdir}/build - make -j1 INSTALL_ROOT=${pkgdir} PHP_SAPI=embed install-sapi -} - -package_php-phpdbg() { - pkgdesc='Interactive PHP debugger' - depends=('php') - options=('!emptydirs') - - cd ${srcdir}/build-phpdbg - make -j1 INSTALL_ROOT=${pkgdir} install-phpdbg -} - -package_php-dblib() { - pkgdesc='dblib module for PHP' - depends=('php' 'freetds') - - install -D -m755 ${srcdir}/build/modules/pdo_dblib.so ${pkgdir}/usr/lib/php/modules/pdo_dblib.so -} - -package_php-enchant() { - pkgdesc='enchant module for PHP' - depends=('php' 'enchant') - - install -D -m755 ${srcdir}/build/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/modules/gd.so ${pkgdir}/usr/lib/php/modules/gd.so -} - -package_php-imap() { - pkgdesc='imap module for PHP' - depends=('php' 'c-client') - - install -D -m755 ${srcdir}/build/modules/imap.so ${pkgdir}/usr/lib/php/modules/imap.so -} - -package_php-intl() { - pkgdesc='intl module for PHP' - depends=('php' 'icu') - - install -D -m755 ${srcdir}/build/modules/intl.so ${pkgdir}/usr/lib/php/modules/intl.so -} - -package_php-sodium() { - pkgdesc='sodium module for PHP' - depends=('php' 'libsodium') - - install -D -m755 ${srcdir}/build/modules/sodium.so ${pkgdir}/usr/lib/php/modules/sodium.so -} - -package_php-odbc() { - pkgdesc='ODBC modules for PHP' - depends=('php' 'unixodbc') - - 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() { - pkgdesc='PostgreSQL modules for PHP' - depends=('php' 'postgresql-libs') - - 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() { - pkgdesc='pspell module for PHP' - depends=('php' 'aspell') - - install -D -m755 ${srcdir}/build/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/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/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() { - pkgdesc='tidy module for PHP' - depends=('php' 'tidy') - - install -D -m755 ${srcdir}/build/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/modules/xsl.so ${pkgdir}/usr/lib/php/modules/xsl.so -} Deleted: apache.conf =================================================================== --- apache.conf 2018-07-19 16:27:24 UTC (rev 329057) +++ apache.conf 2018-07-19 16:27:47 UTC (rev 329058) @@ -1,13 +0,0 @@ -# Required modules: dir_module, php7_module - -<IfModule dir_module> - <IfModule php7_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> Deleted: apache.patch =================================================================== --- apache.patch 2018-07-19 16:27:24 UTC (rev 329057) +++ apache.patch 2018-07-19 16:27:47 UTC (rev 329058) @@ -1,10 +0,0 @@ ---- sapi/apache2handler/config.m4.orig -+++ sapi/apache2handler/config.m4 -@@ -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 Deleted: enchant-2.patch =================================================================== --- enchant-2.patch 2018-07-19 16:27:24 UTC (rev 329057) +++ enchant-2.patch 2018-07-19 16:27:47 UTC (rev 329058) @@ -1,61 +0,0 @@ ---- php-7.1.13/ext/enchant/config.m4.orig 2018-01-03 02:32:29.000000000 +0000 -+++ php-7.1.13/ext/enchant/config.m4 2018-01-21 22:10:03.788875780 +0000 -@@ -14,9 +14,9 @@ - ENCHANT_SEARCH_DIRS="/usr/local /usr" - fi - for i in $ENCHANT_SEARCH_DIRS; do -- if test -f $i/include/enchant/enchant.h; then -+ if test -f $i/include/enchant-2/enchant.h; then - ENCHANT_DIR=$i -- ENCHANT_INCDIR=$i/include/enchant -+ ENCHANT_INCDIR=$i/include/enchant-2 - elif test -f $i/include/enchant.h; then - ENCHANT_DIR=$i - ENCHANT_INCDIR=$i/include -@@ -31,7 +31,7 @@ - - AC_DEFINE(HAVE_ENCHANT,1,[ ]) - PHP_SUBST(ENCHANT_SHARED_LIBADD) -- PHP_ADD_LIBRARY_WITH_PATH(enchant, $ENCHANT_LIBDIR, ENCHANT_SHARED_LIBADD) -+ PHP_ADD_LIBRARY_WITH_PATH(enchant-2, $ENCHANT_LIBDIR, ENCHANT_SHARED_LIBADD) - PHP_ADD_INCLUDE($ENCHANT_INCDIR) - PHP_CHECK_LIBRARY(enchant, enchant_broker_set_param, - [ ---- php-7.2.1/ext/enchant/enchant.c.orig 2018-01-02 22:36:05.000000000 +0000 -+++ php-7.2.1/ext/enchant/enchant.c 2018-01-21 22:34:50.205791491 +0000 -@@ -741,7 +741,7 @@ - for (i = 0; i < n_sugg; i++) { - add_next_index_string(sugg, suggs[i]); - } -- enchant_dict_free_suggestions(pdict->pdict, suggs); -+ enchant_dict_free_string_list(pdict->pdict, suggs); - } - - -@@ -798,7 +798,7 @@ - add_next_index_string(return_value, suggs[i]); - } - -- enchant_dict_free_suggestions(pdict->pdict, suggs); -+ enchant_dict_free_string_list(pdict->pdict, suggs); - } - } - /* }}} */ -@@ -818,7 +818,7 @@ - - PHP_ENCHANT_GET_DICT; - -- enchant_dict_add_to_personal(pdict->pdict, word, wordlen); -+ enchant_dict_add(pdict->pdict, word, wordlen); - } - /* }}} */ - -@@ -856,7 +856,7 @@ - - PHP_ENCHANT_GET_DICT; - -- RETURN_BOOL(enchant_dict_is_in_session(pdict->pdict, word, wordlen)); -+ RETURN_BOOL(enchant_dict_is_added(pdict->pdict, word, wordlen)); - } - /* }}} */ - Deleted: freetype.patch =================================================================== --- freetype.patch 2018-07-19 16:27:24 UTC (rev 329057) +++ freetype.patch 2018-07-19 16:27:47 UTC (rev 329058) @@ -1,38 +0,0 @@ -diff -u -r php-7.2.5/ext/gd/config.m4 php-7.2.5-freetype/ext/gd/config.m4 ---- php-7.2.5/ext/gd/config.m4 2018-04-24 17:09:54.000000000 +0200 -+++ php-7.2.5-freetype/ext/gd/config.m4 2018-05-09 14:49:03.647108948 +0200 -@@ -186,6 +186,9 @@ - AC_DEFUN([PHP_GD_FREETYPE2],[ - if test "$PHP_FREETYPE_DIR" != "no"; then - -+ AC_PATH_PROG(PKG_CONFIG, pkg-config, no) -+ -+ AC_MSG_CHECKING([for freetype]) - for i in $PHP_FREETYPE_DIR /usr/local /usr; do - if test -f "$i/bin/freetype-config"; then - FREETYPE2_DIR=$i -@@ -194,13 +197,20 @@ - fi - done - -- if test -z "$FREETYPE2_DIR"; then -+ if test -n "$FREETYPE2_CONFIG"; then -+ FREETYPE2_CFLAGS=`$FREETYPE2_CONFIG --cflags` -+ FREETYPE2_LIBS=`$FREETYPE2_CONFIG --libs` -+ AC_MSG_RESULT([found in $FREETYPE2_DIR]) -+ elif test "$PKG_CONFIG" != "no" && $PKG_CONFIG --exists freetype2; then -+ FREETYPE2_DIR=pkg-config -+ FREETYPE2_CFLAGS=`$PKG_CONFIG freetype2 --cflags` -+ FREETYPE2_LIBS=`$PKG_CONFIG freetype2 --libs` -+ AC_MSG_RESULT([found by pkg-config]) -+ else -+ AC_MSG_RESULT([not found]) - AC_MSG_ERROR([freetype-config not found.]) - fi - -- FREETYPE2_CFLAGS=`$FREETYPE2_CONFIG --cflags` -- FREETYPE2_LIBS=`$FREETYPE2_CONFIG --libs` -- - PHP_EVAL_INCLINE($FREETYPE2_CFLAGS) - PHP_EVAL_LIBLINE($FREETYPE2_LIBS, GD_SHARED_LIBADD) - AC_DEFINE(HAVE_LIBFREETYPE,1,[ ]) Deleted: generate_patches =================================================================== --- generate_patches 2018-07-19 16:27:24 UTC (rev 329057) +++ generate_patches 2018-07-19 16:27:47 UTC (rev 329058) @@ -1,47 +0,0 @@ -#!/bin/bash - -. PKGBUILD - -makepkg -o --nodeps --noprepare --skipinteg - -pushd src/${pkgbase}-${pkgver} - -sed '/APACHE_THREADED_MPM=/d' -i.orig sapi/apache2handler/config.m4 - -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#^;listen.owner =#listen.owner =#' \ - -e 's#^;listen.group =#listen.group =#' \ - -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\n;extension=bz2\n;extension=calendar\nextension=curl\n;extension=dba\n;extension=enchant\n;extension=exif\n;extension=ftp\n;extension=gd\n;extension=gettext\n;extension=gmp\n;extension=iconv\n;extension=imap\n;extension=intl\n;extension=sodium\n;extension=ldap\n;extension=mysqli\n;extension=odbc\n;zend_extension=opcache\n;extension=pdo_dblib\n;extension=pdo_mysql\n;extension=pdo_odbc\n;extension=pdo_pgsql\n;extension=pdo_sqlite\n;extension=pgsql\n;extension=pspell\n;extension=shmop\n;extension=snmp\n;extension=soap\n;extension=sockets\n;extension=sqlite3\n;extension=sysvmsg\n;extension=sysvsem\n;extension=sysvshm\n;extension=tidy\n;extension=xmlrpc\n;extension=xsl\nextension=zip\n" - -sed \ - -r ":a;N;\$!ba;s/; Notes for Windows environments :\n.+;?extension=\w+\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 | filterdiff --clean --remove-timestamps > ../../apache.patch - -diff -u sapi/fpm/Makefile.frag.orig sapi/fpm/Makefile.frag | filterdiff --clean --remove-timestamps > ../../php-fpm.patch -diff -u sapi/fpm/php-fpm.conf.in.orig sapi/fpm/php-fpm.conf.in | filterdiff --clean --remove-timestamps >> ../../php-fpm.patch -diff -u sapi/fpm/www.conf.in.orig sapi/fpm/www.conf.in | filterdiff --clean --remove-timestamps >> ../../php-fpm.patch -diff -u sapi/fpm/php-fpm.service.in.orig sapi/fpm/php-fpm.service.in | filterdiff --clean --remove-timestamps >> ../../php-fpm.patch - -diff -u php.ini-production.orig php.ini-production | filterdiff --clean --remove-timestamps > ../../php.ini.patch - -popd Deleted: php-fpm.patch =================================================================== --- php-fpm.patch 2018-07-19 16:27:24 UTC (rev 329057) +++ php-fpm.patch 2018-07-19 16:27:47 UTC (rev 329058) @@ -1,74 +0,0 @@ ---- sapi/fpm/Makefile.frag.orig -+++ sapi/fpm/Makefile.frag -@@ -15,8 +15,8 @@ - else \ - echo "Installing PHP FPM defconfig: $(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; \ - fi - - @echo "Installing PHP FPM man page: $(INSTALL_ROOT)$(mandir)/man8/" ---- sapi/fpm/php-fpm.conf.in.orig -+++ sapi/fpm/php-fpm.conf.in -@@ -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 - ; into 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 -+++ sapi/fpm/www.conf.in -@@ -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) -@@ -44,8 +44,8 @@ - ; 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.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. -@@ -362,7 +362,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 -+++ sapi/fpm/php-fpm.service.in -@@ -8,7 +8,7 @@ - - [Service] - Type=@php_fpm_systemd@ --PIDFile=@EXPANDED_LOCALSTATEDIR@/run/php-fpm.pid -+PIDFile=/run/php-fpm/php-fpm.pid - ExecStart=@EXPANDED_SBINDIR@/php-fpm --nodaemonize --fpm-config @EXPANDED_SYSCONFDIR@/php-fpm.conf - ExecReload=/bin/kill -USR2 $MAINPID - PrivateTmp=true Deleted: php-fpm.tmpfiles =================================================================== --- php-fpm.tmpfiles 2018-07-19 16:27:24 UTC (rev 329057) +++ php-fpm.tmpfiles 2018-07-19 16:27:47 UTC (rev 329058) @@ -1 +0,0 @@ -d /run/php-fpm 755 root root Deleted: php.ini.patch =================================================================== --- php.ini.patch 2018-07-19 16:27:24 UTC (rev 329057) +++ php.ini.patch 2018-07-19 16:27:47 UTC (rev 329058) @@ -1,77 +0,0 @@ ---- php.ini-production.orig -+++ php.ini-production -@@ -734,7 +734,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" - -@@ -883,47 +883,44 @@ - ; deprecated in a future PHP major version. So, when it is possible, please - ; move to the new ('extension=<ext>) syntax. - ; --; Notes for Windows environments : --; --; - Many DLL files are located in the extensions/ (PHP 4) or 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=bcmath - ;extension=bz2 --;extension=curl --;extension=fileinfo --;extension=gd2 -+;extension=calendar -+extension=curl -+;extension=dba -+;extension=enchant -+;extension=exif -+;extension=ftp -+;extension=gd - ;extension=gettext - ;extension=gmp --;extension=intl -+;extension=iconv - ;extension=imap --;extension=interbase -+;extension=intl -+;extension=sodium - ;extension=ldap --;extension=mbstring --;extension=exif ; Must be after mbstring as it depends on it - ;extension=mysqli --;extension=oci8_12c ; Use with Oracle Database 12c Instant Client - ;extension=odbc --;extension=openssl --;extension=pdo_firebird -+;zend_extension=opcache -+;extension=pdo_dblib - ;extension=pdo_mysql --;extension=pdo_oci - ;extension=pdo_odbc - ;extension=pdo_pgsql - ;extension=pdo_sqlite - ;extension=pgsql -+;extension=pspell - ;extension=shmop -- --; The MIBS data available in the PHP distribution must be installed. --; See http://www.php.net/manual/en/snmp.installation.php - ;extension=snmp -- - ;extension=soap - ;extension=sockets - ;extension=sqlite3 -+;extension=sysvmsg -+;extension=sysvsem -+;extension=sysvshm - ;extension=tidy - ;extension=xmlrpc - ;extension=xsl -+extension=zip - - ;;;;;;;;;;;;;;;;;;; - ; Module Settings ;
