diff options
-rw-r--r-- | .SRCINFO | 68 | ||||
-rw-r--r-- | PKGBUILD | 62 | ||||
-rw-r--r-- | apache.patch | 4 | ||||
-rw-r--r-- | enchant-2.patch | 46 | ||||
-rw-r--r-- | freetype.patch | 38 | ||||
-rwxr-xr-x | generate_patches | 22 | ||||
-rw-r--r-- | php-fpm.patch | 4 | ||||
-rw-r--r-- | php.ini.patch | 20 |
8 files changed, 119 insertions, 145 deletions
@@ -1,7 +1,7 @@ pkgbase = php-zts - pkgver = 7.3.5 + pkgver = 7.4.1 pkgrel = 1 - url = https://secure.php.net + url = https://www.php.net/ arch = x86_64 license = PHP checkdepends = procps-ng @@ -28,36 +28,36 @@ pkgbase = php-zts makedepends = freetds makedepends = pcre2 makedepends = libnsl - source = https://php.net/distributions/php-7.3.5.tar.xz - source = https://php.net/distributions/php-7.3.5.tar.xz.asc + makedepends = oniguruma + source = https://php.net/distributions/php-7.4.1.tar.xz + source = https://php.net/distributions/php-7.4.1.tar.xz.asc source = apache.patch source = apache.conf source = php-fpm.patch source = php-fpm.tmpfiles source = php.ini.patch source = enchant-2.patch - source = freetype.patch - validpgpkeys = CBAF69F173A0FEA4B537F470D66C9593118BCCB6 - validpgpkeys = F38252826ACD957EF380D39F2F7956BC5DA04B5D - sha256sums = e1011838a46fd4a195c8453b333916622d7ff5bce4aca2d9d99afac142db2472 + validpgpkeys = 5A52880781F755608BF815FC910DEB46F53EA312 + validpgpkeys = 42670A7FE4D0441C8E4632349E4FDC074A4EF02D + sha256sums = 561bb866bdd509094be00f4ece7c3543ec971c4d878645ee81437e291cffc762 sha256sums = SKIP - sha256sums = 54d9e3682c6b4621ee654e5c8df4ad95d790a3bccdd284afcff83e5bb7043fb1 + sha256sums = 537e6f9f8879de2ba021b5efcaf759fccebd0e7b506d03a7ce973a5f3a482219 sha256sums = 80c00b40b0de794d87fb0183cdce2f3c93869c849f7534e8ced42ca6c625f2f7 - sha256sums = 3de3c76930874c81824c23aa033cb9e66631659fd31f925d7c58f0479aeb18a9 + sha256sums = 41f23ebc2d986473b9a4eb3f233428349367b2baa2bb715c53e720cc34c9378c sha256sums = 640dba0d960bfeaae9ad38d2826d3f6b5d6c175a4d3e16664eefff29141faad5 - sha256sums = 4c4dd05358f614adfa9c539a3ed61134764fced358c92dde109aac3ab78496c9 - sha256sums = 3992491eebaf5b31f6b00095a7276d11682f9a8aaff473bfb25afbdcfa6eba32 - sha256sums = 07c4648669dc05afc3c1ad5a4739768079c423b817eabf5296ca3d1ea5ffd163 + sha256sums = 03beeb8b62a499805a4b912cb19d048635cb5542478753e58364bf24fb42ff3c + sha256sums = 92a048073713c3600713b3dd46e96b33a2dde2aef1fbdf175d83da1dc679a0c5 pkgname = php-zts - pkgdesc = PHP with ZTS enabled + pkgdesc = A general-purpose scripting language that is especially suited to web development(ZTS enabled) depends = libxml2 depends = curl depends = libzip depends = pcre2 depends = argon2 - provides = php=7.3.5 - provides = php-ldap=7.3.5 + depends = oniguruma + provides = php=7.4.1 + provides = php-ldap=7.4.1 conflicts = php conflicts = php-ldap replaces = php @@ -67,7 +67,7 @@ pkgname = php-zts pkgname = php-zts-cgi pkgdesc = CGI and FCGI SAPI for PHP depends = php-zts - provides = php-cgi=7.3.5 + provides = php-cgi=7.4.1 conflicts = php-cgi replaces = php-cgi @@ -76,7 +76,7 @@ pkgname = php-zts-apache depends = php-zts depends = apache depends = libnsl - provides = php-apache=7.3.5 + provides = php-apache=7.4.1 conflicts = php-apache replaces = php-apache backup = etc/httpd/conf/extra/php7_module.conf @@ -85,7 +85,7 @@ pkgname = php-zts-fpm pkgdesc = FastCGI Process Manager for PHP depends = php-zts depends = systemd - provides = php-fpm=7.3.5 + provides = php-fpm=7.4.1 conflicts = php-fpm replaces = php-fpm options = !emptydirs @@ -97,7 +97,7 @@ pkgname = php-zts-embed depends = php-zts depends = systemd-libs depends = libnsl - provides = php-embed=7.3.5 + provides = php-embed=7.4.1 conflicts = php-embed replaces = php-embed options = !emptydirs @@ -105,7 +105,7 @@ pkgname = php-zts-embed pkgname = php-zts-phpdbg pkgdesc = Interactive PHP debugger depends = php-zts - provides = php-phpdbg=7.3.5 + provides = php-phpdbg=7.4.1 conflicts = php-phpdbg replaces = php-phpdbg options = !emptydirs @@ -114,7 +114,7 @@ pkgname = php-zts-dblib pkgdesc = dblib module for PHP depends = php-zts depends = freetds - provides = php-dblib=7.3.5 + provides = php-dblib=7.4.1 conflicts = php-dblib replaces = php-dblib @@ -122,7 +122,7 @@ pkgname = php-zts-enchant pkgdesc = enchant module for PHP depends = php-zts depends = enchant - provides = php-enchant=7.3.5 + provides = php-enchant=7.4.1 conflicts = php-enchant replaces = php-enchant @@ -130,7 +130,7 @@ pkgname = php-zts-gd pkgdesc = gd module for PHP depends = php-zts depends = gd - provides = php-gd=7.3.5 + provides = php-gd=7.4.1 conflicts = php-gd replaces = php-gd @@ -138,7 +138,7 @@ pkgname = php-zts-imap pkgdesc = imap module for PHP depends = php-zts depends = c-client - provides = php-imap=7.3.5 + provides = php-imap=7.4.1 conflicts = php-imap replaces = php-imap @@ -146,7 +146,7 @@ pkgname = php-zts-intl pkgdesc = intl module for PHP depends = php-zts depends = icu - provides = php-intl=7.3.5 + provides = php-intl=7.4.1 conflicts = php-intl replaces = php-intl @@ -154,7 +154,7 @@ pkgname = php-zts-sodium pkgdesc = sodium module for PHP depends = php-zts depends = libsodium - provides = php-sodium=7.3.5 + provides = php-sodium=7.4.1 conflicts = php-sodium replaces = php-sodium @@ -162,7 +162,7 @@ pkgname = php-zts-odbc pkgdesc = ODBC modules for PHP depends = php-zts depends = unixodbc - provides = php-odbc=7.3.5 + provides = php-odbc=7.4.1 conflicts = php-odbc replaces = php-odbc @@ -170,7 +170,7 @@ pkgname = php-zts-pgsql pkgdesc = PostgreSQL modules for PHP depends = php-zts depends = postgresql-libs - provides = php-pgsql=7.3.5 + provides = php-pgsql=7.4.1 conflicts = php-pgsql replaces = php-pgsql @@ -178,7 +178,7 @@ pkgname = php-zts-pspell pkgdesc = pspell module for PHP depends = php-zts depends = aspell - provides = php-pspell=7.3.5 + provides = php-pspell=7.4.1 conflicts = php-pspell replaces = php-pspell @@ -186,7 +186,7 @@ pkgname = php-zts-snmp pkgdesc = snmp module for PHP depends = php-zts depends = net-snmp - provides = php-snmp=7.3.5 + provides = php-snmp=7.4.1 conflicts = php-snmp replaces = php-snmp @@ -194,7 +194,7 @@ pkgname = php-zts-sqlite pkgdesc = sqlite module for PHP depends = php-zts depends = sqlite - provides = php-sqlite=7.3.5 + provides = php-sqlite=7.4.1 conflicts = php-sqlite replaces = php-sqlite @@ -202,7 +202,7 @@ pkgname = php-zts-tidy pkgdesc = tidy module for PHP depends = php-zts depends = tidy - provides = php-tidy=7.3.5 + provides = php-tidy=7.4.1 conflicts = php-tidy replaces = php-tidy @@ -210,7 +210,7 @@ pkgname = php-zts-xsl pkgdesc = xsl module for PHP depends = php-zts depends = libxslt - provides = php-xsl=7.3.5 + provides = php-xsl=7.4.1 conflicts = php-xsl replaces = php-xsl @@ -24,28 +24,28 @@ pkgname=("${pkgbase}" "${pkgbase}-tidy" "${pkgbase}-xsl") -pkgver=7.3.5 +pkgver=7.4.1 pkgrel=1 arch=('x86_64') license=('PHP') -url='https://secure.php.net' +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') + 'postgresql-libs' 'sqlite' 'systemd' 'tidy' 'unixodbc' 'curl' 'libtool' 'postfix' 'freetds' 'pcre2' 'libnsl' + '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' 'freetype.patch') -sha256sums=('e1011838a46fd4a195c8453b333916622d7ff5bce4aca2d9d99afac142db2472' + 'enchant-2.patch') +sha256sums=('561bb866bdd509094be00f4ece7c3543ec971c4d878645ee81437e291cffc762' 'SKIP' - '54d9e3682c6b4621ee654e5c8df4ad95d790a3bccdd284afcff83e5bb7043fb1' + '537e6f9f8879de2ba021b5efcaf759fccebd0e7b506d03a7ce973a5f3a482219' '80c00b40b0de794d87fb0183cdce2f3c93869c849f7534e8ced42ca6c625f2f7' - '3de3c76930874c81824c23aa033cb9e66631659fd31f925d7c58f0479aeb18a9' + '41f23ebc2d986473b9a4eb3f233428349367b2baa2bb715c53e720cc34c9378c' '640dba0d960bfeaae9ad38d2826d3f6b5d6c175a4d3e16664eefff29141faad5' - '4c4dd05358f614adfa9c539a3ed61134764fced358c92dde109aac3ab78496c9' - '3992491eebaf5b31f6b00095a7276d11682f9a8aaff473bfb25afbdcfa6eba32' - '07c4648669dc05afc3c1ad5a4739768079c423b817eabf5296ca3d1ea5ffd163') -validpgpkeys=('CBAF69F173A0FEA4B537F470D66C9593118BCCB6' - 'F38252826ACD957EF380D39F2F7956BC5DA04B5D') + '03beeb8b62a499805a4b912cb19d048635cb5542478753e58364bf24fb42ff3c' + '92a048073713c3600713b3dd46e96b33a2dde2aef1fbdf175d83da1dc679a0c5') +validpgpkeys=('5A52880781F755608BF815FC910DEB46F53EA312' + '42670A7FE4D0441C8E4632349E4FDC074A4EF02D') prepare() { cd ${srcdir}/${_pkgbase}-${pkgver} @@ -53,8 +53,7 @@ prepare() { 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 + patch -p0 -i ${srcdir}/enchant-2.patch autoconf rm tests/output/stream_isatty_*.phpt @@ -75,7 +74,6 @@ build() { --with-config-file-scan-dir=/etc/php/conf.d \ --disable-rpath \ --mandir=/usr/share/man \ - --without-pear \ " local _phpextensions="\ @@ -84,54 +82,54 @@ build() { --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 \ - --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-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=/usr \ + --with-kerberos \ --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-pdo-sqlite=shared \ --with-pgsql=shared \ --with-pspell=shared \ --with-readline \ --with-snmp=shared \ --with-sodium=shared \ - --with-sqlite3=shared,/usr \ + --with-sqlite3=shared \ --with-tidy=shared \ - --with-unixODBC=shared,/usr \ + --with-unixODBC=shared \ --with-xmlrpc=shared \ --with-xsl=shared \ + --with-zip=shared \ --with-zlib \ - --enable-pcntl \ --enable-maintainer-zts \ " @@ -171,22 +169,24 @@ build() { } check() { - cd ${srcdir}/${_pkgbase}-${pkgver} + cd ${srcdir}/build # 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' + 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' - ${srcdir}/build/sapi/cli/php -n run-tests.php -n -P {tests,Zend} + make test } package_php-zts() { - pkgdesc='PHP with ZTS enabled' - depends=('libxml2' 'curl' 'libzip' 'pcre2' 'argon2') + pkgdesc='A general-purpose scripting language that is especially suited to web development(ZTS enabled)' + depends=('libxml2' 'curl' 'libzip' 'pcre2' 'argon2' 'oniguruma') replaces=("${_pkgbase}" 'php-ldap') conflicts=("${_pkgbase}" 'php-ldap') provides=("${_pkgbase}=${pkgver}" "php-ldap=${pkgver}") diff --git a/apache.patch b/apache.patch index 3e5f90978311..e336af3de4d6 100644 --- a/apache.patch +++ b/apache.patch @@ -1,6 +1,6 @@ --- sapi/apache2handler/config.m4.orig +++ sapi/apache2handler/config.m4 -@@ -107,17 +107,7 @@ +@@ -105,17 +105,7 @@ ;; esac @@ -10,7 +10,7 @@ - PHP_BUILD_THREAD_SAFE - fi - else -- APACHE_THREADED_MPM=`$APXS_HTTPD -V | grep 'threaded:.*yes'` +- APACHE_THREADED_MPM=`$APXS_HTTPD -V 2>/dev/null | grep 'threaded:.*yes'` - if test -n "$APACHE_THREADED_MPM"; then - PHP_BUILD_THREAD_SAFE - fi diff --git a/enchant-2.patch b/enchant-2.patch index 75be01369ffb..c2721d717ba4 100644 --- a/enchant-2.patch +++ b/enchant-2.patch @@ -1,29 +1,17 @@ ---- 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 @@ +--- 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 +@@ -740,7 +740,7 @@ for (i = 0; i < n_sugg; i++) { add_next_index_string(sugg, suggs[i]); } @@ -32,7 +20,7 @@ } -@@ -798,7 +798,7 @@ +@@ -797,7 +797,7 @@ add_next_index_string(return_value, suggs[i]); } @@ -41,7 +29,7 @@ } } /* }}} */ -@@ -818,7 +818,7 @@ +@@ -817,7 +817,7 @@ PHP_ENCHANT_GET_DICT; @@ -50,7 +38,7 @@ } /* }}} */ -@@ -856,7 +856,7 @@ +@@ -855,7 +855,7 @@ PHP_ENCHANT_GET_DICT; diff --git a/freetype.patch b/freetype.patch deleted file mode 100644 index f88695d65e2f..000000000000 --- a/freetype.patch +++ /dev/null @@ -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,[ ]) diff --git a/generate_patches b/generate_patches index d3f04eb307a9..eb196d506445 100755 --- a/generate_patches +++ b/generate_patches @@ -4,7 +4,7 @@ makepkg -o --nodeps --noprepare --skipinteg -pushd src/${_pkgbase}-${pkgver} +pushd src/${pkgbase}-${pkgver} sed -e '/if test "$APACHE_VERSION" -lt 2004001; then/i PHP_BUILD_THREAD_SAFE' \ -e '/if test "$APACHE_VERSION" -lt 2004001; then/,+10d' \ @@ -28,15 +28,28 @@ 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" +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/php/modules/"#g' \ + -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 @@ -46,4 +59,7 @@ diff -u sapi/fpm/php-fpm.service.in.orig sapi/fpm/php-fpm.service.in | filterdif 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/php-fpm.patch b/php-fpm.patch index c827d2e73ed0..aa5fff9fc52f 100644 --- a/php-fpm.patch +++ b/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. -@@ -362,7 +362,7 @@ +@@ -370,7 +370,7 @@ ; Chdir to this directory at the start. ; Note: relative path can be used. ; Default Value: current directory or / when chroot @@ -71,4 +71,4 @@ +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 + diff --git a/php.ini.patch b/php.ini.patch index 395cee840792..e1881058e56b 100644 --- a/php.ini.patch +++ b/php.ini.patch @@ -1,6 +1,15 @@ --- php.ini-production.orig +++ php.ini-production -@@ -903,48 +903,44 @@ +@@ -756,7 +756,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" + +@@ -904,48 +904,45 @@ ; deprecated in a future PHP major version. So, when it is possible, please ; move to the new ('extension=<ext>) syntax. ; @@ -13,13 +22,14 @@ +;extension=bcmath ;extension=bz2 -;extension=curl --;extension=fileinfo --;extension=gd2 +;extension=calendar +extension=curl +;extension=dba +;extension=enchant +;extension=exif + ;extension=ffi +-;extension=fileinfo +-;extension=gd2 +;extension=ftp +;extension=gd ;extension=gettext @@ -27,9 +37,7 @@ -;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 @@ -55,7 +63,7 @@ - ;extension=soap ;extension=sockets --;extension=sodium + ;extension=sodium ;extension=sqlite3 +;extension=sysvmsg +;extension=sysvsem |