mirror of
https://github.com/archlinuxarm/PKGBUILDs.git
synced 2024-11-18 22:54:00 +00:00
removed extra/php7
This commit is contained in:
Kevin Mihelich
parent
a2bbc284d1
commit
ac131cea7e
13 changed files with 0 additions and 876 deletions
|
|
@ -1,361 +0,0 @@
|
|||
# Maintainer: Pierre Schmitz <pierre@archlinux.de>
|
||||
# Contributor: Matt Harrison <matt@harrison.us.com>
|
||||
|
||||
# ALARM: Kevin Mihelich <kevin@archlinuxarm.org>
|
||||
# - add -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 to CPPFLAGS
|
||||
|
||||
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.33
|
||||
pkgrel=4
|
||||
arch=('x86_64')
|
||||
license=('PHP')
|
||||
url='https://www.php.net/'
|
||||
makedepends=('apache' 'aspell' 'c-client' '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')
|
||||
options=(debug)
|
||||
source=("https://php.net/distributions/php-${pkgver}.tar.xz"{,.asc}
|
||||
'php7-openssl3.patch::https://github.com/php/php-src/commit/a0972deb0f441fc7991001cb51efc994b70a3b51.patch'
|
||||
'php7-openssl3-eof.patch::https://github.com/php/php-src/commit/74f75db0c3665677ec006cd379fd561feacffdc6.patch'
|
||||
'apache.patch' 'apache.conf' 'php-fpm.patch' 'php-fpm.tmpfiles' 'php.ini.patch'
|
||||
'enchant-2.patch' 'php7.patch')
|
||||
sha512sums=('499b63b99e5d8e8082ff89d3a91b4cb9a593ea7553b96e48863414c13d2e50275904ed29070e2232e529ee91160f505e6060a4d129cb5bf098aa5b6ea0928d3d'
|
||||
'SKIP'
|
||||
'07b9ba019221cce6f73ebf1fdc6124f0730e42d19b9e0f846d132423da3b820439d4cba61fff8e65937c955ba985889f0c57ed2f94f380213e7279b0531c6444'
|
||||
'46112bf170c6f1772792c02d6cabd1219aa0d5e3123551cd2bbed480f7cf87743eece89539e3d62eacd312fd025235bb9f5ac1c771bd18ae5b606ae48a7bf222'
|
||||
'284e3c0fe3ded0ff3e7d53f2769ea207b4591ef42abeff2d8604e87fe379929bd3b19ff294a729834f339a9da85ae7d4a7d8605890677222f78601b4f2b22247'
|
||||
'eccbe1a0c7b2757ab3c982c871cc591a66ad70f085aaa0d44f93cacacedc7b8fd21b8d0c66471327ff070db1bab1ab83a802f6fa190f33bdd74c134975e3910e'
|
||||
'bf43a99b464a873986954233e2df4841eeab21a6d359a777b7514a4fa34462c9f0fd85243086122ed50c766d5b60fb83f9f181a9b43ae1b527672a4f3b8d8eed'
|
||||
'7248e9a93faebb86b156130b6ecd8c9733ae8dfa2789c738f9db5a2ab2daee294132b7d8a5a59c860e9e235fdc1bc6a9e9b8b410a23ccc5c6627297d834d3120'
|
||||
'642e9f84d9d0df96e5d9bafcd3aed7aab3b4374e7917be98e9fa386919c64e9a27ac2daace99b4fcaa7256cca60a87d22893c2ef5383e5353926d8869fda376d'
|
||||
'5d7d44d692848fbb952e17e5bd6dffa79b764526e4940fbe0a5138ad62cb41abdb8c9bb8dd64cd1d0b488c74972bcf3f9c6d32a3bbeac90982fdf6321d3ec788'
|
||||
'f8c197fb657958016340db87de3e3427cc692cccc791e88c650362ed89bfd3be6180e430e5c446d19566b7e66225f9fa8cbed46a0909c87d6e046e65135d3031')
|
||||
validpgpkeys=('5A52880781F755608BF815FC910DEB46F53EA312'
|
||||
'42670A7FE4D0441C8E4632349E4FDC074A4EF02D')
|
||||
_interpreter=${pkgver%.*}
|
||||
|
||||
prepare() {
|
||||
cd ${srcdir}/php-${pkgver}
|
||||
|
||||
patch -p1 -i "${srcdir}/php7-openssl3.patch"
|
||||
patch -p1 -i "${srcdir}/php7-openssl3-eof.patch"
|
||||
|
||||
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 -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64'
|
||||
|
||||
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 \
|
||||
--disable-gcc-global-regs \
|
||||
"
|
||||
|
||||
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-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')
|
||||
provides=(php-interpreter=$_interpreter)
|
||||
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
|
||||
}
|
||||
|
|
@ -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>
|
||||
|
|
@ -1,10 +0,0 @@
|
|||
--- 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
|
||||
|
|
@ -1,11 +0,0 @@
|
|||
--- aaa/ext/dba/config.m4 2022-12-11 16:33:02.721079548 +0100
|
||||
+++ bbb/ext/dba/config.m4 2022-12-11 16:33:59.821200682 +0100
|
||||
@@ -308,7 +308,7 @@
|
||||
]])],[
|
||||
AC_EGREP_CPP(yes,[
|
||||
#include "$THIS_INCLUDE"
|
||||
-#if DB_VERSION_MAJOR == $1 || ($1 == 4 && DB_VERSION_MAJOR == 5)
|
||||
+#if DB_VERSION_MAJOR == $1 || ($1 == 4 && DB_VERSION_MAJOR == 5) || ($1 == 4 && DB_VERSION_MAJOR == 6)
|
||||
yes
|
||||
#endif
|
||||
],[
|
||||
|
|
@ -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));
|
||||
}
|
||||
/* }}} */
|
||||
|
||||
|
|
@ -1,68 +0,0 @@
|
|||
#!/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
|
||||
|
|
@ -1,29 +0,0 @@
|
|||
-----BEGIN PGP PUBLIC KEY BLOCK-----
|
||||
|
||||
mQINBFzu5noBEACvjtOopc8qTQVT7N6DCGRLF6tupjmPPb2yaM+Fkl42RpI1vR1J
|
||||
X9t9f6xNOTupjmG+0ZRTEz91kyVvrcFvO91TO1fwLF8m1uVQi9S7ilO0Z+E8/my5
|
||||
ZmoJzOLURPJuOL0T0lBch3ubwag8AUgEkSiDmDepiX5jYrO3C3ht4J9BcJrFG4Xk
|
||||
dTjkpnS8TS+C3xEo6SE9uJN86fyqp5LAUGxY/grREEDuFHO3zLZpSYnmOgPqOtY9
|
||||
msbXir+ocLPDNp37qmL7FVwcOfKi7tu6lIJ/GggoMC5vw+RhV/yNdHY/8kwN6zGY
|
||||
vgEw6yP9E+LXcu92Hfn9oUG0O4GtVWre6KZ1i4C4nNkbYkUGgGTfdRmGxtSTE0e8
|
||||
6B5tLaw/bcYVUGwmYs0LaG3Xvj0VZmQzFwdkdbiYjZIRGZBU82erX9M0u+mgiW91
|
||||
uyB2E0UYSJOXq/lDhXabxajgijwTGkN9UCCCMex5FxcmXIcr8VEfPGsW4SKIsCkG
|
||||
5OKm4eZnBhQgOssMvjXJahWgcBYFU6zUjm00pNkljLJyPTNXxnEiUY6KEd/4Kz77
|
||||
NAboWuaIcdXBdUIxoopYbK+R6nKBORDU6HpJJPXLt1n6787B7/DRssEux/BOHsTA
|
||||
ZRshrXWzlaEMcUkIpFTxmnmGlrmrKnkguKvsMOBtZWrKtL/HxnUQE40qkQARAQAB
|
||||
tBpQZXRlciBLb2tvdCA8cGV0a0BwaHAubmV0PokCVAQTAQgAPhYhBEJnCn/k0EQc
|
||||
jkYyNJ5P3AdKTvAtBQJc7uZ6AhsDBQkDwmcABQsJCAcCBhUKCQgLAgQWAgMBAh4B
|
||||
AheAAAoJEJ5P3AdKTvAtohAP/Ah/BsbHj9D5dJAbf6L2r2XHmlr3+0taAdDBhN85
|
||||
yQaNNuhU4w3s9ws5zUrQ//66HKyNfdJ6cQxS0tXcFB6HBDT4sSKvi7QBNel5cLP9
|
||||
WZEPclmBbaWsJ0VWl7ZVEq6iiTCPDF4AYQt25dXldL2jAXdSmfm1fZDKEqkwqt8s
|
||||
Rb8+k/Pq4XxWukzOleaADroHvfL3sMP98FcuLKsRwFsgO4nDQ7JAWrgUEac0hxtu
|
||||
RS0YXTJgdiCJbNvln4T7GPyaFhbt9VRdPpb2ZRzz1zfPBPeu0VsvYKp2lXM6fV/f
|
||||
Mqu4U6AnpwRoX844csj/ByX9Bt5OcH7Qgp8ye+/0r5bwHTqW7xksuiJqlA/mTk2v
|
||||
qJnpr+X75DQk3JxSVIXNSjpiqQ2B29Q8zm1WlCButofWqFXg7u3PHSzOUff1zSjM
|
||||
tbmgo2YF6QHTV0gXem/FCJ8tgnqyrdHdPrVmf4w8bnEDntxPVoixp4nPn+tPARNt
|
||||
SsMKzdjR0+9ib7R8tS5H0eeQ5Wc6jWQGgztl5vfH8c2kuHtRqHp2mlb8w6RSdj/f
|
||||
N8bUjyASsdb2JS6hRlTH5AA1mT7kkogbH4d+wMkbvWDePThw5rD62h8yr+zwFuwB
|
||||
gf+bX3nDr1LFJeiHjSHQvV2qtRgOec0Y4uIWHkwYgV4+MVApYqbnAwLPt49Xy6A7
|
||||
CqK6
|
||||
=OMfg
|
||||
-----END PGP PUBLIC KEY BLOCK-----
|
||||
|
|
@ -1,92 +0,0 @@
|
|||
-----BEGIN PGP PUBLIC KEY BLOCK-----
|
||||
|
||||
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
|
||||
uNV2Pe9hGTB2+hDdxkmllksfJP2cNQ==
|
||||
=0twV
|
||||
-----END PGP PUBLIC KEY BLOCK-----
|
||||
|
|
@ -1,78 +0,0 @@
|
|||
From 74f75db0c3665677ec006cd379fd561feacffdc6 Mon Sep 17 00:00:00 2001
|
||||
From: Jakub Zelenka <bukka@php.net>
|
||||
Date: Sun, 15 May 2022 13:49:17 +0100
|
||||
Subject: [PATCH] Fix bug #79589: ssl3_read_n:unexpected eof while reading
|
||||
|
||||
The unexpected EOF failure was introduced in OpenSSL 3.0 to prevent
|
||||
truncation attack. However there are many non complaint servers and
|
||||
it is causing break for many users including potential majority
|
||||
of those where the truncation attack is not applicable. For that reason
|
||||
we try to keep behavior consitent with older OpenSSL versions which is
|
||||
also the path chosen by some other languages and web servers.
|
||||
|
||||
Closes GH-8369
|
||||
---
|
||||
NEWS | 4 ++++
|
||||
ext/openssl/tests/bug79589.phpt | 21 +++++++++++++++++++++
|
||||
ext/openssl/xp_ssl.c | 5 +++++
|
||||
3 files changed, 30 insertions(+)
|
||||
create mode 100644 ext/openssl/tests/bug79589.phpt
|
||||
|
||||
diff --git a/NEWS b/NEWS
|
||||
index e270ad3f1821..83a891b47d06 100644
|
||||
--- a/NEWS
|
||||
+++ b/NEWS
|
||||
@@ -11,6 +11,10 @@ PHP NEWS
|
||||
. Fixed bug GH-8461 (tracing JIT crash after function/method change).
|
||||
(Arnaud, Dmitry)
|
||||
|
||||
+- OpenSSL:
|
||||
+ . Fixed bug #79589 (error:14095126:SSL routines:ssl3_read_n:unexpected eof
|
||||
+ while reading). (Jakub Zelenka)
|
||||
+
|
||||
- SPL:
|
||||
. Fixed bug GH-8235 (iterator_count() may run indefinitely). (cmb)
|
||||
|
||||
diff --git a/ext/openssl/tests/bug79589.phpt b/ext/openssl/tests/bug79589.phpt
|
||||
new file mode 100644
|
||||
index 000000000000..5d277e8c63ce
|
||||
--- /dev/null
|
||||
+++ b/ext/openssl/tests/bug79589.phpt
|
||||
@@ -0,0 +1,21 @@
|
||||
+--TEST--
|
||||
+Bug #65538: TLS unexpected EOF failure
|
||||
+--EXTENSIONS--
|
||||
+openssl
|
||||
+--SKIPIF--
|
||||
+<?php
|
||||
+if (getenv("SKIP_ONLINE_TESTS")) die("skip online test");
|
||||
+?>
|
||||
+--FILE--
|
||||
+<?php
|
||||
+
|
||||
+$release = file_get_contents(
|
||||
+ 'https://chromedriver.storage.googleapis.com/LATEST_RELEASE',
|
||||
+ false,
|
||||
+ stream_context_create(['ssl' => ['verify_peer'=> false]])
|
||||
+);
|
||||
+echo gettype($release);
|
||||
+
|
||||
+?>
|
||||
+--EXPECT--
|
||||
+string
|
||||
diff --git a/ext/openssl/xp_ssl.c b/ext/openssl/xp_ssl.c
|
||||
index 918b3ca5b21d..ce23fb29f429 100644
|
||||
--- a/ext/openssl/xp_ssl.c
|
||||
+++ b/ext/openssl/xp_ssl.c
|
||||
@@ -1639,6 +1639,11 @@ int php_openssl_setup_crypto(php_stream *stream,
|
||||
|
||||
ssl_ctx_options &= ~SSL_OP_DONT_INSERT_EMPTY_FRAGMENTS;
|
||||
|
||||
+#ifdef SSL_OP_IGNORE_UNEXPECTED_EOF
|
||||
+ /* Only for OpenSSL 3+ to keep OpenSSL 1.1.1 behavior */
|
||||
+ ssl_ctx_options |= SSL_OP_IGNORE_UNEXPECTED_EOF;
|
||||
+#endif
|
||||
+
|
||||
if (!GET_VER_OPT("disable_compression") || zend_is_true(val)) {
|
||||
ssl_ctx_options |= SSL_OP_NO_COMPRESSION;
|
||||
}
|
||||
|
|
@ -1,76 +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-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
|
||||
|
|
@ -1 +0,0 @@
|
|||
d /run/php-fpm7 755 root root
|
||||
|
|
@ -1,77 +0,0 @@
|
|||
--- 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 ;
|
||||
|
|
@ -1,11 +0,0 @@
|
|||
--- 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.
|
||||
Loading…
Reference in a new issue