From 65522e9769e7ba8aa63d78bb7194cd2bed1dbb63 Mon Sep 17 00:00:00 2001 From: Kevin Mihelich Date: Fri, 29 Jan 2021 01:12:46 +0000 Subject: [PATCH] extra/php to 8.0.1-1 --- extra/php/PKGBUILD | 126 ++++++++++++++++++------------------- extra/php/apache.conf | 4 +- extra/php/apache.patch | 2 +- extra/php/enchant-2.patch | 49 --------------- extra/php/generate_patches | 84 ++++++++++++++++++------- extra/php/php-fpm.patch | 2 +- extra/php/php.ini.patch | 11 ++-- 7 files changed, 133 insertions(+), 145 deletions(-) delete mode 100644 extra/php/enchant-2.patch diff --git a/extra/php/PKGBUILD b/extra/php/PKGBUILD index 05bbf99c1..ee34ec5ac 100644 --- a/extra/php/PKGBUILD +++ b/extra/php/PKGBUILD @@ -23,7 +23,7 @@ pkgname=('php' 'php-sqlite' 'php-tidy' 'php-xsl') -pkgver=7.4.14 +pkgver=8.0.1 pkgrel=1 arch=('x86_64') license=('PHP') @@ -33,35 +33,32 @@ makedepends=('apache' 'aspell' 'c-client' 'db' 'enchant' 'gd' 'gmp' 'icu' 'libso 'oniguruma') 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') -sha512sums=('5c48874d1e78d83297e98773089993ee3c8a7cdd8a611afc536eed8bc91cc4b2b492e1940923ccb7fe2dd039732082e568191e64923b74d4fc80362fbd06e6b7' + 'apache.patch' 'apache.conf' 'php-fpm.patch' 'php-fpm.tmpfiles' 'php.ini.patch') +sha256sums=('208b3330af881b44a6a8c6858d569c72db78dab97810332978cc65206b0ec2dc' 'SKIP' - '284e3c0fe3ded0ff3e7d53f2769ea207b4591ef42abeff2d8604e87fe379929bd3b19ff294a729834f339a9da85ae7d4a7d8605890677222f78601b4f2b22247' - 'eccbe1a0c7b2757ab3c982c871cc591a66ad70f085aaa0d44f93cacacedc7b8fd21b8d0c66471327ff070db1bab1ab83a802f6fa190f33bdd74c134975e3910e' - '86ee6630bf0cac43bbf5a4b3918e63f32e01e74ac00845ebba2d122e14300bb47b41af17d88dfbf655b3a03966f5619b87b6f1ad8623e22482fe46be273309cb' - '824e9a0d10063283357d49a81ab49bf834afd24f098482bdbaa9ab60bbad2b0dea6f5879259b73717d437626b02fb4f2d3ef68b7bcbb26bee274a7b61144720f' - 'a924bfece3d57286dce44f0173dd856184e7a1c1de5e880229c7dac0874efde52090af155932614f2594eebba118f8b89ac48e48d1161e7b3d8a95a93a24fe5d' - '5d7d44d692848fbb952e17e5bd6dffa79b764526e4940fbe0a5138ad62cb41abdb8c9bb8dd64cd1d0b488c74972bcf3f9c6d32a3bbeac90982fdf6321d3ec788') -validpgpkeys=('5A52880781F755608BF815FC910DEB46F53EA312' - '42670A7FE4D0441C8E4632349E4FDC074A4EF02D') + '702b163c66c65af92dcad8d79f41bda84bcd5d863235fcf1497c33a86db9e4ca' + '4a2add00d93fa991ccdf6356090264c1059c79935642afff6e8d4a2107fa037e' + '2228131cc65139bd819b617bba06c2406e559c55fbfb38a29f9853ce48c58eeb' + '640dba0d960bfeaae9ad38d2826d3f6b5d6c175a4d3e16664eefff29141faad5' + 'b538a7c974adde626c35481e4a66d506dc12c598f369dfe79f3fcb9585d8b920') +validpgpkeys=('1729F83938DA44E27BA0F4D3DBDB397470D12172' + 'BFDDD28642824F8118EF77909B67A5C12229118F') prepare() { - cd ${srcdir}/${pkgbase}-${pkgver} + 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}/enchant-2.patch + patch -p0 -i "${srcdir}/apache.patch" + patch -p0 -i "${srcdir}/php-fpm.patch" + patch -p0 -i "${srcdir}/php.ini.patch" autoconf + # Disable failing tests rm tests/output/stream_isatty_*.phpt + rm Zend/tests/arginfo_zpp_mismatch*.phpt } build() { - # http://site.icu-project.org/download/61#TOC-Migration-Issues - CPPFLAGS+=' -DU_USING_ICU_NAMESPACE=1 -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64' - + CPPFLAGS+=' -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64' local _phpconfig="--srcdir=../${pkgbase}-${pkgver} \ --config-cache \ --prefix=/usr \ @@ -125,7 +122,6 @@ build() { --with-sqlite3=shared \ --with-tidy=shared \ --with-unixODBC=shared \ - --with-xmlrpc=shared \ --with-xsl=shared \ --with-zip=shared \ --with-zlib \ @@ -134,9 +130,9 @@ build() { EXTENSION_DIR=/usr/lib/php/modules export EXTENSION_DIR - mkdir ${srcdir}/build - cd ${srcdir}/build - ln -s ../${pkgbase}-${pkgver}/configure + mkdir "${srcdir}/build" + cd "${srcdir}/build" + ln -s "../${pkgbase}-${pkgver}/configure" ./configure ${_phpconfig} \ --enable-cgi \ --enable-fpm \ @@ -150,16 +146,16 @@ 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 + 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 + cp -a "${srcdir}/build" "${srcdir}/build-phpdbg" + cd "${srcdir}/build-phpdbg" ./configure ${_phpconfig} \ --enable-phpdbg \ ${_phpextensions} @@ -167,7 +163,7 @@ build() { } check() { - cd ${srcdir}/build + 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' @@ -190,34 +186,34 @@ package_php() { 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/ + 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 + 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 + 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 + 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 + 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') + backup=('etc/httpd/conf/extra/php_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 + install -D -m755 "${srcdir}/build-apache/libs/libphp.so" "${pkgdir}/usr/lib/httpd/modules/libphp.so" + install -D -m644 "${srcdir}/apache.conf" "${pkgdir}/etc/httpd/conf/extra/php_module.conf" } package_php-fpm() { @@ -226,10 +222,10 @@ package_php-fpm() { 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 + 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() { @@ -237,8 +233,8 @@ package_php-embed() { depends=('php' 'systemd-libs' 'libnsl' 'libxcrypt') options=('!emptydirs') - cd ${srcdir}/build - make -j1 INSTALL_ROOT=${pkgdir} PHP_SAPI=embed install-sapi + cd "${srcdir}/build" + make -j1 INSTALL_ROOT="${pkgdir}" PHP_SAPI=embed install-sapi } package_php-phpdbg() { @@ -246,100 +242,100 @@ package_php-phpdbg() { depends=('php') options=('!emptydirs') - cd ${srcdir}/build-phpdbg - make -j1 INSTALL_ROOT=${pkgdir} install-phpdbg + 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 + 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 + 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 + 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' 'libxcrypt') - install -D -m755 ${srcdir}/build/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() { pkgdesc='intl module for PHP' depends=('php' 'icu') - install -D -m755 ${srcdir}/build/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-sodium() { pkgdesc='sodium module for PHP' depends=('php' 'libsodium') - install -D -m755 ${srcdir}/build/modules/sodium.so ${pkgdir}/usr/lib/php/modules/sodium.so + 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 + 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 + 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 + 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 + 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 + 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 + 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 + install -D -m755 "${srcdir}/build/modules/xsl.so" "${pkgdir}/usr/lib/php/modules/xsl.so" } diff --git a/extra/php/apache.conf b/extra/php/apache.conf index b516b5e66..bc57ba73d 100644 --- a/extra/php/apache.conf +++ b/extra/php/apache.conf @@ -1,7 +1,7 @@ -# Required modules: dir_module, php7_module +# Required modules: dir_module, php_module - + DirectoryIndex index.php index.html SetHandler application/x-httpd-php diff --git a/extra/php/apache.patch b/extra/php/apache.patch index c64021b8f..d46aceef4 100644 --- a/extra/php/apache.patch +++ b/extra/php/apache.patch @@ -1,6 +1,6 @@ --- sapi/apache2handler/config.m4.orig +++ sapi/apache2handler/config.m4 -@@ -111,7 +111,6 @@ +@@ -114,7 +114,6 @@ PHP_BUILD_THREAD_SAFE fi else diff --git a/extra/php/enchant-2.patch b/extra/php/enchant-2.patch deleted file mode 100644 index 5aee2f729..000000000 --- a/extra/php/enchant-2.patch +++ /dev/null @@ -1,49 +0,0 @@ ---- 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)); - } - /* }}} */ - diff --git a/extra/php/generate_patches b/extra/php/generate_patches index b417124a0..9ce182415 100755 --- a/extra/php/generate_patches +++ b/extra/php/generate_patches @@ -4,7 +4,7 @@ makepkg -o --nodeps --noprepare --skipinteg -pushd src/${pkgbase}-${pkgver} +pushd "src/${pkgbase}-${pkgver}" sed '/APACHE_THREADED_MPM=/d' -i.orig sapi/apache2handler/config.m4 @@ -26,7 +26,61 @@ 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=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" +# available extensions after build +# find /var/lib/archbuild/*-x86_64/*/build/php/src/build/modules -name '*.so' -exec basename {} .so \; | sort -u +availableExtensions=( + bcmath + bz2 + calendar + curl + dba + enchant + exif + ffi + ftp + gd + gettext + gmp + iconv + imap + intl + ldap + mysqli + odbc + opcache + pdo_dblib + pdo_mysql + pdo_odbc + pdo_pgsql + pdo_sqlite + pgsql + pspell + shmop + snmp + soap + sockets + sodium + sqlite3 + sysvmsg + sysvsem + sysvshm + tidy + xsl + zip +) + +extensions='' +for extension in "${availableExtensions[@]}"; do + if [[ $extension == 'curl' ]]; then + extensions+="extension=${extension}\n" + elif [[ $extension == 'opcache' ]]; then + extensions+=";zend_extension=${extension}\n" + elif [[ $extension == 'zip' ]]; then + extensions+="extension=${extension}\n" + else + extensions+=";extension=${extension}\n" + fi +done sed \ -r ":a;N;\$!ba;s/; Notes for Windows environments :\n.+;?extension=\w+\n/${extensions}/g" \ @@ -35,29 +89,15 @@ sed \ -e 's#^;extension_dir = "\./"$#extension_dir = "/usr/lib/php/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 sapi/fpm/Makefile.frag.orig sapi/fpm/Makefile.frag + diff -u sapi/fpm/php-fpm.conf.in.orig sapi/fpm/php-fpm.conf.in + diff -u sapi/fpm/www.conf.in.orig sapi/fpm/www.conf.in + 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 - popd diff --git a/extra/php/php-fpm.patch b/extra/php/php-fpm.patch index c74134220..4aa71ce18 100644 --- a/extra/php/php-fpm.patch +++ b/extra/php/php-fpm.patch @@ -52,7 +52,7 @@ ;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 @@ +@@ -387,7 +387,7 @@ ; Chdir to this directory at the start. ; Note: relative path can be used. ; Default Value: current directory or / when chroot diff --git a/extra/php/php.ini.patch b/extra/php/php.ini.patch index 22b5abb16..7918d5bf1 100644 --- a/extra/php/php.ini.patch +++ b/extra/php/php.ini.patch @@ -1,6 +1,6 @@ --- php.ini-production.orig +++ php.ini-production -@@ -756,7 +756,7 @@ +@@ -765,7 +765,7 @@ ; Directory in which the loadable extensions (modules) reside. ; http://php.net/extension-dir @@ -9,7 +9,7 @@ ; On windows: ;extension_dir = "ext" -@@ -904,49 +904,45 @@ +@@ -913,51 +913,44 @@ ; deprecated in a future PHP major version. So, when it is possible, please ; move to the new ('extension=) syntax. ; @@ -30,8 +30,7 @@ ;extension=ffi ;extension=ftp -;extension=fileinfo --;extension=gd2 -+;extension=gd + ;extension=gd ;extension=gettext ;extension=gmp -;extension=intl @@ -43,6 +42,7 @@ -;extension=exif ; Must be after mbstring as it depends on it ;extension=mysqli -;extension=oci8_12c ; Use with Oracle Database 12c Instant Client +-;extension=oci8_19 ; Use with Oracle Database 19 Instant Client ;extension=odbc -;extension=openssl -;extension=pdo_firebird @@ -69,8 +69,9 @@ +;extension=sysvsem +;extension=sysvshm ;extension=tidy - ;extension=xmlrpc ;extension=xsl +- +-;zend_extension=opcache +extension=zip ;;;;;;;;;;;;;;;;;;;