Date: Thursday, April 15, 2021 @ 13:46:18 Author: foutrelis Revision: 412535
archrelease: copy trunk to staging-x86_64 Added: php7/repos/staging-x86_64/ php7/repos/staging-x86_64/PKGBUILD (from rev 412534, php7/trunk/PKGBUILD) php7/repos/staging-x86_64/apache.conf (from rev 412534, php7/trunk/apache.conf) php7/repos/staging-x86_64/apache.patch (from rev 412534, php7/trunk/apache.patch) php7/repos/staging-x86_64/enchant-2.patch (from rev 412534, php7/trunk/enchant-2.patch) php7/repos/staging-x86_64/generate_patches (from rev 412534, php7/trunk/generate_patches) php7/repos/staging-x86_64/php-fpm.patch (from rev 412534, php7/trunk/php-fpm.patch) php7/repos/staging-x86_64/php-fpm.tmpfiles (from rev 412534, php7/trunk/php-fpm.tmpfiles) php7/repos/staging-x86_64/php.ini.patch (from rev 412534, php7/trunk/php.ini.patch) php7/repos/staging-x86_64/php7.patch (from rev 412534, php7/trunk/php7.patch) ------------------+ PKGBUILD | 347 +++++++++++++++++++++++++++++++++++++++++++++++++++++ apache.conf | 13 + apache.patch | 10 + enchant-2.patch | 49 +++++++ generate_patches | 68 ++++++++++ php-fpm.patch | 76 +++++++++++ php-fpm.tmpfiles | 1 php.ini.patch | 77 +++++++++++ php7.patch | 11 + 9 files changed, 652 insertions(+) Copied: php7/repos/staging-x86_64/PKGBUILD (from rev 412534, php7/trunk/PKGBUILD) =================================================================== --- staging-x86_64/PKGBUILD (rev 0) +++ staging-x86_64/PKGBUILD 2021-04-15 13:46:18 UTC (rev 412535) @@ -0,0 +1,347 @@ +# Maintainer: Pierre Schmitz <pie...@archlinux.de> +# Contributor: Matt Harrison <m...@harrison.us.com> + +pkgbase=php7 +pkgname=('php7' + 'php7-cgi' + 'php7-apache' + 'php7-fpm' + 'php7-embed' + 'php7-phpdbg' + 'php7-dblib' + 'php7-enchant' + 'php7-gd' + 'php7-imap' + 'php7-intl' + 'php7-sodium' + 'php7-odbc' + 'php7-pgsql' + 'php7-pspell' + 'php7-snmp' + 'php7-sqlite' + 'php7-tidy' + 'php7-xsl') +pkgver=7.4.16 +pkgrel=2 +arch=('x86_64') +license=('PHP') +url='https://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' 'pcre2' 'libnsl' + 'oniguruma') +checkdepends=('procps-ng') +source=("https://php.net/distributions/php-${pkgver}.tar.xz"{,.asc} + 'apache.patch' 'apache.conf' 'php-fpm.patch' 'php-fpm.tmpfiles' 'php.ini.patch' + 'enchant-2.patch' 'php7.patch') +sha512sums=('a7845fe0a7c334829bfa9518d3f2947036e1b03c8f4346622f9ab37563ff3af03f6559878b83aa0e6ad69e9919b6478345a0cc6ec59161ef36c64a5073e83f84' + 'SKIP' + '284e3c0fe3ded0ff3e7d53f2769ea207b4591ef42abeff2d8604e87fe379929bd3b19ff294a729834f339a9da85ae7d4a7d8605890677222f78601b4f2b22247' + 'eccbe1a0c7b2757ab3c982c871cc591a66ad70f085aaa0d44f93cacacedc7b8fd21b8d0c66471327ff070db1bab1ab83a802f6fa190f33bdd74c134975e3910e' + 'bf43a99b464a873986954233e2df4841eeab21a6d359a777b7514a4fa34462c9f0fd85243086122ed50c766d5b60fb83f9f181a9b43ae1b527672a4f3b8d8eed' + '7248e9a93faebb86b156130b6ecd8c9733ae8dfa2789c738f9db5a2ab2daee294132b7d8a5a59c860e9e235fdc1bc6a9e9b8b410a23ccc5c6627297d834d3120' + '642e9f84d9d0df96e5d9bafcd3aed7aab3b4374e7917be98e9fa386919c64e9a27ac2daace99b4fcaa7256cca60a87d22893c2ef5383e5353926d8869fda376d' + '5d7d44d692848fbb952e17e5bd6dffa79b764526e4940fbe0a5138ad62cb41abdb8c9bb8dd64cd1d0b488c74972bcf3f9c6d32a3bbeac90982fdf6321d3ec788' + 'f8c197fb657958016340db87de3e3427cc692cccc791e88c650362ed89bfd3be6180e430e5c446d19566b7e66225f9fa8cbed46a0909c87d6e046e65135d3031') +validpgpkeys=('5A52880781F755608BF815FC910DEB46F53EA312' + '42670A7FE4D0441C8E4632349E4FDC074A4EF02D') + +prepare() { + cd "${srcdir}/php-${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}/enchant-2.patch" + patch -p0 -i "${srcdir}/php7.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=../php-${pkgver} \ + --config-cache \ + --prefix=/usr \ + --sbindir=/usr/bin \ + --sysconfdir=/etc/php7 \ + --localstatedir=/var \ + --with-layout=GNU \ + --with-config-file-path=/etc/php7 \ + --with-config-file-scan-dir=/etc/php7/conf.d \ + --disable-rpath \ + --mandir=/usr/share/man \ + --libdir=/usr/lib/php7 \ + --datarootdir=/usr/share/php7 \ + --datadir=/usr/share/php7 \ + --program-suffix=7 \ + --includedir=/usr/include/php7 + " + + local _phpextensions="\ + --enable-bcmath=shared \ + --enable-calendar=shared \ + --enable-dba=shared \ + --enable-exif=shared \ + --enable-ftp=shared \ + --enable-gd=shared \ + --enable-intl=shared \ + --enable-mbstring \ + --enable-pcntl \ + --enable-shmop=shared \ + --enable-soap=shared \ + --enable-sockets=shared \ + --enable-sysvmsg=shared \ + --enable-sysvsem=shared \ + --enable-sysvshm=shared \ + --with-bz2=shared \ + --with-curl=shared \ + --with-db4=/usr \ + --with-enchant=shared \ + --with-external-gd \ + --with-external-pcre \ + --with-ffi=shared \ + --with-gdbm \ + --with-gettext=shared \ + --with-gmp=shared \ + --with-iconv=shared \ + --with-imap-ssl \ + --with-imap=shared \ + --with-kerberos \ + --with-ldap=shared \ + --with-ldap-sasl \ + --with-mhash \ + --with-mysql-sock=/run/mysqld/mysqld.sock \ + --with-mysqli=shared,mysqlnd \ + --with-openssl \ + --with-password-argon2 \ + --with-pdo-dblib=shared,/usr \ + --with-pdo-mysql=shared,mysqlnd \ + --with-pdo-odbc=shared,unixODBC,/usr \ + --with-pdo-pgsql=shared \ + --with-pdo-sqlite=shared \ + --with-pgsql=shared \ + --with-pspell=shared \ + --with-readline \ + --with-snmp=shared \ + --with-sodium=shared \ + --with-sqlite3=shared \ + --with-tidy=shared \ + --with-unixODBC=shared \ + --with-xmlrpc=shared \ + --with-xsl=shared \ + --with-zip=shared \ + --with-zlib \ + " + + EXTENSION_DIR=/usr/lib/php7/modules + export EXTENSION_DIR + + mkdir "${srcdir}/build" + cd "${srcdir}/build" + ln -s ../php-${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}/build" + + # Check if sendmail was configured correctly (FS#47600) + 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 + export TEST_PHP_ARGS="-j$(nproc)" + export TESTS='tests Zend' + + make test +} + +package_php7() { + pkgdesc='A general-purpose scripting language that is especially suited to web development' + depends=('libxml2' 'curl' 'libzip' 'pcre2' 'argon2' 'oniguruma') + backup=('etc/php7/php.ini') + + cd "${srcdir}/build" + make -j1 INSTALL_ROOT="${pkgdir}" install-{modules,cli,build,headers,programs,pharcmd} + install -D -m644 "${srcdir}/php-${pkgver}/php.ini-production" "${pkgdir}/etc/php7/php.ini" + install -d -m755 "${pkgdir}/etc/php7/conf.d/" + + # remove static modules + rm -f "${pkgdir}/usr/lib/php7/modules/"*.a + # remove modules provided by sub packages + rm -f "${pkgdir}/usr/lib/php7/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/php7/php/include" +} + +package_php7-cgi() { + pkgdesc='CGI and FCGI SAPI for PHP' + depends=('php7') + + cd "${srcdir}/build" + make -j1 INSTALL_ROOT="${pkgdir}" install-cgi +} + +package_php7-apache() { + pkgdesc='Apache SAPI for PHP' + depends=('php7' '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_php7-fpm() { + pkgdesc='FastCGI Process Manager for PHP' + depends=('php7' 'systemd') + backup=('etc/php7/php-fpm.conf' 'etc/php7/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-fpm7.service" + install -D -m644 "${srcdir}/php-fpm.tmpfiles" "${pkgdir}/usr/lib/tmpfiles.d/php-fpm7.conf" +} + +package_php7-embed() { + pkgdesc='Embedded PHP SAPI library' + depends=('php7' 'systemd-libs' 'libnsl' 'libxcrypt') + options=('!emptydirs') + + cd "${srcdir}/build" + make -j1 INSTALL_ROOT="${pkgdir}" PHP_SAPI=embed install-sapi +} + +package_php7-phpdbg() { + pkgdesc='Interactive PHP debugger' + depends=('php7') + options=('!emptydirs') + + cd "${srcdir}/build-phpdbg" + make -j1 INSTALL_ROOT="${pkgdir}" install-phpdbg +} + +package_php7-dblib() { + pkgdesc='dblib module for PHP' + depends=('php7' 'freetds') + + install -D -m755 "${srcdir}/build/modules/pdo_dblib.so" "${pkgdir}/usr/lib/php7/modules/pdo_dblib.so" +} + +package_php7-enchant() { + pkgdesc='enchant module for PHP' + depends=('php7' 'enchant') + + install -D -m755 "${srcdir}/build/modules/enchant.so" "${pkgdir}/usr/lib/php7/modules/enchant.so" +} + +package_php7-gd() { + pkgdesc='gd module for PHP' + depends=('php7' 'gd') + + install -D -m755 "${srcdir}/build/modules/gd.so" "${pkgdir}/usr/lib/php7/modules/gd.so" +} + +package_php7-imap() { + pkgdesc='imap module for PHP' + depends=('php7' 'c-client' 'libxcrypt') + + install -D -m755 "${srcdir}/build/modules/imap.so" "${pkgdir}/usr/lib/php7/modules/imap.so" +} + +package_php7-intl() { + pkgdesc='intl module for PHP' + depends=('php7' 'icu') + + install -D -m755 "${srcdir}/build/modules/intl.so" "${pkgdir}/usr/lib/php7/modules/intl.so" +} + +package_php7-sodium() { + pkgdesc='sodium module for PHP' + depends=('php7' 'libsodium') + + install -D -m755 "${srcdir}/build/modules/sodium.so" "${pkgdir}/usr/lib/php7/modules/sodium.so" +} + +package_php7-odbc() { + pkgdesc='ODBC modules for PHP' + depends=('php7' 'unixodbc') + + install -D -m755 "${srcdir}/build/modules/odbc.so" "${pkgdir}/usr/lib/php7/modules/odbc.so" + install -D -m755 "${srcdir}/build/modules/pdo_odbc.so" "${pkgdir}/usr/lib/php7/modules/pdo_odbc.so" +} + +package_php7-pgsql() { + pkgdesc='PostgreSQL modules for PHP' + depends=('php7' 'postgresql-libs') + + install -D -m755 "${srcdir}/build/modules/pgsql.so" "${pkgdir}/usr/lib/php7/modules/pgsql.so" + install -D -m755 "${srcdir}/build/modules/pdo_pgsql.so" "${pkgdir}/usr/lib/php7/modules/pdo_pgsql.so" +} + +package_php7-pspell() { + pkgdesc='pspell module for PHP' + depends=('php7' 'aspell') + + install -D -m755 "${srcdir}/build/modules/pspell.so" "${pkgdir}/usr/lib/php7/modules/pspell.so" +} + +package_php7-snmp() { + pkgdesc='snmp module for PHP' + depends=('php7' 'net-snmp') + + install -D -m755 "${srcdir}/build/modules/snmp.so" "${pkgdir}/usr/lib/php7/modules/snmp.so" +} + +package_php7-sqlite() { + pkgdesc='sqlite module for PHP' + depends=('php7' 'sqlite') + + install -D -m755 "${srcdir}/build/modules/sqlite3.so" "${pkgdir}/usr/lib/php7/modules/sqlite3.so" + install -D -m755 "${srcdir}/build/modules/pdo_sqlite.so" "${pkgdir}/usr/lib/php7/modules/pdo_sqlite.so" +} + +package_php7-tidy() { + pkgdesc='tidy module for PHP' + depends=('php7' 'tidy') + + install -D -m755 "${srcdir}/build/modules/tidy.so" "${pkgdir}/usr/lib/php7/modules/tidy.so" +} + +package_php7-xsl() { + pkgdesc='xsl module for PHP' + depends=('php7' 'libxslt') + + install -D -m755 "${srcdir}/build/modules/xsl.so" "${pkgdir}/usr/lib/php7/modules/xsl.so" +} Copied: php7/repos/staging-x86_64/apache.conf (from rev 412534, php7/trunk/apache.conf) =================================================================== --- staging-x86_64/apache.conf (rev 0) +++ staging-x86_64/apache.conf 2021-04-15 13:46:18 UTC (rev 412535) @@ -0,0 +1,13 @@ +# 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> Copied: php7/repos/staging-x86_64/apache.patch (from rev 412534, php7/trunk/apache.patch) =================================================================== --- staging-x86_64/apache.patch (rev 0) +++ staging-x86_64/apache.patch 2021-04-15 13:46:18 UTC (rev 412535) @@ -0,0 +1,10 @@ +--- sapi/apache2handler/config.m4.orig ++++ sapi/apache2handler/config.m4 +@@ -111,7 +111,6 @@ + PHP_BUILD_THREAD_SAFE + fi + else +- APACHE_THREADED_MPM=`$APXS_HTTPD -V 2>/dev/null | grep 'threaded:.*yes'` + if test -n "$APACHE_THREADED_MPM"; then + PHP_BUILD_THREAD_SAFE + fi Copied: php7/repos/staging-x86_64/enchant-2.patch (from rev 412534, php7/trunk/enchant-2.patch) =================================================================== --- staging-x86_64/enchant-2.patch (rev 0) +++ staging-x86_64/enchant-2.patch 2021-04-15 13:46:18 UTC (rev 412535) @@ -0,0 +1,49 @@ +--- ext/enchant/config.m4.orig ++++ ext/enchant/config.m4 +@@ -4,7 +4,7 @@ + [Include Enchant support])]) + + if test "$PHP_ENCHANT" != "no"; then +- PKG_CHECK_MODULES([ENCHANT], [enchant]) ++ PKG_CHECK_MODULES([ENCHANT], [enchant-2]) + + PHP_EVAL_INCLINE($ENCHANT_CFLAGS) + PHP_EVAL_LIBLINE($ENCHANT_LIBS, ENCHANT_SHARED_LIBADD) +--- ext/enchant/enchant.c.orig ++++ ext/enchant/enchant.c +@@ -738,7 +738,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); + } + + +@@ -793,7 +793,7 @@ + add_next_index_string(return_value, suggs[i]); + } + +- enchant_dict_free_suggestions(pdict->pdict, suggs); ++ enchant_dict_free_string_list(pdict->pdict, suggs); + } + } + /* }}} */ +@@ -813,7 +813,7 @@ + + PHP_ENCHANT_GET_DICT; + +- enchant_dict_add_to_personal(pdict->pdict, word, wordlen); ++ enchant_dict_add(pdict->pdict, word, wordlen); + } + /* }}} */ + +@@ -851,7 +851,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)); + } + /* }}} */ + Copied: php7/repos/staging-x86_64/generate_patches (from rev 412534, php7/trunk/generate_patches) =================================================================== --- staging-x86_64/generate_patches (rev 0) +++ staging-x86_64/generate_patches 2021-04-15 13:46:18 UTC (rev 412535) @@ -0,0 +1,68 @@ +#!/bin/bash + +. PKGBUILD + +makepkg -o --nodeps --noprepare --skipinteg + +pushd "src/php-${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-fpm7/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-fpm7/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-fpm7/php-fpm.pid#' \ + -e 's#^ExecStart=@EXPANDED_SBINDIR@/php-fpm#ExecStart=@EXPANDED_SBINDIR@/php-fpm7#' \ + -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=ffi\n;extension=ftp\n;extension=gd\n;extension=gettext\n;extension=gmp\n;extension=iconv\n;extension=imap\n;extension=intl\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=sodium\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/php7/modules/"#g' \ + -i php.ini-production + +sed \ + -r 's#PKG_CHECK_MODULES\(\[ENCHANT\], \[enchant\]\)#PKG_CHECK_MODULES([ENCHANT], [enchant-2])#g' \ + -i.orig ext/enchant/config.m4 +sed \ + -r 's#enchant_dict_free_suggestions\(pdict->pdict, suggs\)#enchant_dict_free_string_list(pdict->pdict, suggs)#g' \ + -i.orig ext/enchant/enchant.c +sed \ + -r 's#enchant_dict_add_to_personal\(pdict->pdict, word, wordlen\)#enchant_dict_add(pdict->pdict, word, wordlen)#g' \ + -i ext/enchant/enchant.c +sed \ + -r 's#enchant_dict_is_in_session\(pdict->pdict, word, wordlen\)#enchant_dict_is_added(pdict->pdict, word, wordlen)#g' \ + -i ext/enchant/enchant.c + +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 + +diff -u ext/enchant/config.m4.orig ext/enchant/config.m4 | filterdiff --clean --remove-timestamps > ../../enchant-2.patch +diff -u ext/enchant/enchant.c.orig ext/enchant/enchant.c | filterdiff --clean --remove-timestamps >> ../../enchant-2.patch + + +sed -i.orig 's/ \[php-config\],/ [php-config7],/g' scripts/phpize.m4 +diff -u scripts/phpize.m4.orig scripts/phpize.m4 | filterdiff --clean --remove-timestamps > ../../php7.patch + +popd Copied: php7/repos/staging-x86_64/php-fpm.patch (from rev 412534, php7/trunk/php-fpm.patch) =================================================================== --- staging-x86_64/php-fpm.patch (rev 0) +++ staging-x86_64/php-fpm.patch 2021-04-15 13:46:18 UTC (rev 412535) @@ -0,0 +1,76 @@ +--- 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-fpm7/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-fpm7/php-fpm.sock + + ; Set listen(2) backlog. + ; Default Value: 511 (-1 on FreeBSD and OpenBSD) +@@ -45,8 +45,8 @@ + ; and group can be specified either by name or by their numeric IDs. + ; 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. +@@ -371,7 +371,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,8 +8,8 @@ + + [Service] + Type=@php_fpm_systemd@ +-PIDFile=@EXPANDED_LOCALSTATEDIR@/run/php-fpm.pid +-ExecStart=@EXPANDED_SBINDIR@/php-fpm --nodaemonize --fpm-config @EXPANDED_SYSCONFDIR@/php-fpm.conf ++PIDFile=/run/php-fpm7/php-fpm.pid ++ExecStart=@EXPANDED_SBINDIR@/php-fpm7 --nodaemonize --fpm-config @EXPANDED_SYSCONFDIR@/php-fpm.conf + ExecReload=/bin/kill -USR2 $MAINPID + + # Set up a new file system namespace and mounts private /tmp and /var/tmp directories Copied: php7/repos/staging-x86_64/php-fpm.tmpfiles (from rev 412534, php7/trunk/php-fpm.tmpfiles) =================================================================== --- staging-x86_64/php-fpm.tmpfiles (rev 0) +++ staging-x86_64/php-fpm.tmpfiles 2021-04-15 13:46:18 UTC (rev 412535) @@ -0,0 +1 @@ +d /run/php-fpm7 755 root root Copied: php7/repos/staging-x86_64/php.ini.patch (from rev 412534, php7/trunk/php.ini.patch) =================================================================== --- staging-x86_64/php.ini.patch (rev 0) +++ staging-x86_64/php.ini.patch 2021-04-15 13:46:18 UTC (rev 412535) @@ -0,0 +1,77 @@ +--- php.ini-production.orig ++++ php.ini-production +@@ -756,7 +756,7 @@ + + ; Directory in which the loadable extensions (modules) reside. + ; http://php.net/extension-dir +-;extension_dir = "./" ++extension_dir = "/usr/lib/php7/modules/" + ; On windows: + ;extension_dir = "ext" + +@@ -904,49 +904,45 @@ + ; 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=calendar ++extension=curl ++;extension=dba ++;extension=enchant ++;extension=exif + ;extension=ffi + ;extension=ftp +-;extension=fileinfo +-;extension=gd2 ++;extension=gd + ;extension=gettext + ;extension=gmp +-;extension=intl ++;extension=iconv + ;extension=imap ++;extension=intl + ;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=sodium + ;extension=sqlite3 ++;extension=sysvmsg ++;extension=sysvsem ++;extension=sysvshm + ;extension=tidy + ;extension=xmlrpc + ;extension=xsl ++extension=zip + + ;;;;;;;;;;;;;;;;;;; + ; Module Settings ; Copied: php7/repos/staging-x86_64/php7.patch (from rev 412534, php7/trunk/php7.patch) =================================================================== --- staging-x86_64/php7.patch (rev 0) +++ staging-x86_64/php7.patch 2021-04-15 13:46:18 UTC (rev 412535) @@ -0,0 +1,11 @@ +--- scripts/phpize.m4.orig ++++ scripts/phpize.m4 +@@ -51,7 +51,7 @@ + PHP_ARG_WITH([php-config],, + [AS_HELP_STRING([--with-php-config=PATH], + [Path to php-config [php-config]])], +- [php-config], ++ [php-config7], + [no]) + + dnl For BC.