diff options
Diffstat (limited to 'debian-php-7.4.patch')
-rw-r--r-- | debian-php-7.4.patch | 81 |
1 files changed, 0 insertions, 81 deletions
diff --git a/debian-php-7.4.patch b/debian-php-7.4.patch index 8e4252b8a74a..74ca1cf5f48a 100644 --- a/debian-php-7.4.patch +++ b/debian-php-7.4.patch @@ -29,74 +29,6 @@ index 23a35a2..0292501 100644 ;open_basedir = ; This directive allows you to disable certain functions. -diff --git a/ext/dba/config.m4 b/ext/dba/config.m4 -index 1e80319..51bdd84 100644 ---- a/ext/dba/config.m4 -+++ b/ext/dba/config.m4 -@@ -375,61 +375,13 @@ - dbdp4="/usr/local/BerkeleyDB.4." - dbdp5="/usr/local/BerkeleyDB.5." - for i in $PHP_DB4 ${dbdp5}1 ${dbdp5}0 ${dbdp4}8 ${dbdp4}7 ${dbdp4}6 ${dbdp4}5 ${dbdp4}4 ${dbdp4}3 ${dbdp4}2 ${dbdp4}1 ${dbdp}0 /usr/local /usr; do -- if test -f "$i/db5/db.h"; then -- THIS_PREFIX=$i -- THIS_INCLUDE=$i/db5/db.h -- break -- elif test -f "$i/db4/db.h"; then -- THIS_PREFIX=$i -- THIS_INCLUDE=$i/db4/db.h -- break -- elif test -f "$i/include/db5.3/db.h"; then -- THIS_PREFIX=$i -- THIS_INCLUDE=$i/include/db5.3/db.h -- break -- elif test -f "$i/include/db5.1/db.h"; then -- THIS_PREFIX=$i -- THIS_INCLUDE=$i/include/db5.1/db.h -- break -- elif test -f "$i/include/db5.0/db.h"; then -- THIS_PREFIX=$i -- THIS_INCLUDE=$i/include/db5.0/db.h -- break -- elif test -f "$i/include/db4.8/db.h"; then -- THIS_PREFIX=$i -- THIS_INCLUDE=$i/include/db4.8/db.h -- break -- elif test -f "$i/include/db4.7/db.h"; then -- THIS_PREFIX=$i -- THIS_INCLUDE=$i/include/db4.7/db.h -- break -- elif test -f "$i/include/db4.6/db.h"; then -- THIS_PREFIX=$i -- THIS_INCLUDE=$i/include/db4.6/db.h -- break -- elif test -f "$i/include/db4.5/db.h"; then -- THIS_PREFIX=$i -- THIS_INCLUDE=$i/include/db4.5/db.h -- break -- elif test -f "$i/include/db4/db.h"; then -- THIS_PREFIX=$i -- THIS_INCLUDE=$i/include/db4/db.h -- break -- elif test -f "$i/include/db/db4.h"; then -- THIS_PREFIX=$i -- THIS_INCLUDE=$i/include/db/db4.h -- break -- elif test -f "$i/include/db4.h"; then -- THIS_PREFIX=$i -- THIS_INCLUDE=$i/include/db4.h -- break -- elif test -f "$i/include/db.h"; then -+ if test -f "$i/include/db.h"; then - THIS_PREFIX=$i - THIS_INCLUDE=$i/include/db.h - break - fi - done -- PHP_DBA_DB_CHECK(4, db-5.3 db-5.1 db-5.0 db-4.8 db-4.7 db-4.6 db-4.5 db-4.4 db-4.3 db-4.2 db-4.1 db-4.0 db-4 db4 db, [(void)db_create((DB**)0, (DB_ENV*)0, 0)]) -+ PHP_DBA_DB_CHECK(4, db, [(void)db_create((DB**)0, (DB_ENV*)0, 0)]) - fi - PHP_DBA_STD_RESULT(db4,Berkeley DB4) - diff --git a/ext/dba/dba.c b/ext/dba/dba.c index 9581a57..21d3f11 100644 --- a/ext/dba/dba.c @@ -138,19 +70,6 @@ index 9581a57..21d3f11 100644 +--EXPECT-- diff --git a/ext/dba/config.m4 b/ext/dba/config.m4 index 51bdd84..79136d5 100644 ---- a/ext/dba/config.m4 -+++ b/ext/dba/config.m4 -@@ -145,6 +145,10 @@ - THIS_PREFIX=$i - THIS_INCLUDE=$i/include/qdbm/depot.h - break -+ elif test -f "$i/include/qdbm/depot.h"; then -+ THIS_PREFIX=$i -+ THIS_INCLUDE=$i/include/qdbm/depot.h -+ break - fi - done - diff --git a/sapi/fpm/php-fpm.8.in b/sapi/fpm/php-fpm.8.in index 972c242..002c44b 100644 --- a/sapi/fpm/php-fpm.8.in |