dblib issues fixed. Openssl1.1 forced

3 files changed, 23 insertions, 104 deletions

diff --git a/.SRCINFO b/.SRCINFO
index df7becad153b..156701e142f8 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by makepkg 6.0.2
-# Sat Nov  5 17:54:35 UTC 2022
+# Tue Feb 21 12:21:09 UTC 2023
 pkgbase = php70
 	pkgdesc = PHP 7.0.33 compiled as to not conflict with mainline php
 	pkgver = 7.0.33
-	pkgrel = 10
+	pkgrel = 12
 	url = http://www.php.net
 	arch = x86_64
 	license = PHP
@@ -33,9 +33,9 @@ pkgbase = php70
 	makedepends = coreutils
 	makedepends = findutils
 	makedepends = libxslt
-	makedepends = openssl
 	makedepends = e2fsprogs
-	makedepends = db
+	makedepends = openssl-1.1
+	makedepends = db5.3
 	makedepends = postgresql-libs
 	makedepends = unixodbc
 	makedepends = libfbclient
@@ -70,7 +70,6 @@ pkgbase = php70
 	source = php-apache.conf
 	source = https://php.net/distributions/php-7.0.33.tar.xz
 	source = php55-phar-names.patch
-	source = openssl-sslv3-consts.patch
 	source = fpm-numeric-uid-gid.patch
 	source = fpm-reload-sighup.patch
 	source = mysql-socket-php5.3.patch
@@ -89,7 +88,6 @@ pkgbase = php70
 	sha256sums = 6d0ad9becb5470ce8e5929d7d45660b0f32579038978496317544c5310281a91
 	sha256sums = ab8c5be6e32b1f8d032909dedaaaa4bbb1a209e519abb01a52ce3914f9a13d96
 	sha256sums = 70e3cc00d954fa2b466a0e8f356c68bbb1e92b36304deaffd34c53cb6ae5e979
-	sha256sums = aecd8dff7022e956718407a5b98dec19acdceef08b0a58e7266b483bc3845de6
 	sha256sums = d175f0c14fdb22855090c93f76e18f04320d7bf15afc057ffde947f9bb361242
 	sha256sums = f5ae925036744a5e88cea2698879aea0498e1e23aee7801923d90f16be383908
 	sha256sums = 12f4e3aeab72e7d24221c07b64106c496c2e300518682bd301351dc9fa6ab3cf
@@ -98,7 +96,7 @@ pkgbase = php70
 	sha256sums = e07ebf146cea8e734c7704ba94f18279642df2b2f09d868781746d165041b8d5
 	sha256sums = ed3184d5a6f7a3bf35ee32169f8dc3b6cba09c38f60e868e24652fe9a7dd844d
 	sha256sums = c9f3b0dff07a7e9688f60b92a2a15817bd7cd59a8c5278cae629d856be66de5c
-	sha256sums = 159bbf8c7657352ed6d6086e2b03011722d339659c586a56965b157ed9c7c8f9
+	sha256sums = 526ff10b94dd352a086a42a1d1e2f9cee956ee1a84308784976e0e5cec11681f
 	sha256sums = 558e780e93dfa861a366c49b4d156d8fc43f17898f001ae6033ec63c33d5d41c
 	sha256sums = 40bcc1e5058602302198d0925e431495391d8469499593af477f59d84d32f764
 	sha256sums = e221c918a75bcd851ee9d32d50370aa430a4a9ef94eaf2f4e8cbcc53483f8d31
@@ -273,7 +271,7 @@ pkgname = php70-tokenizer
 pkgname = php70-dba
 	pkgdesc = dba module for php70
 	depends = php70=7.0.33
-	depends = db
+	depends = db5.3
 
 pkgname = php70-pgsql
 	pkgdesc = PostgreSQL modules for php70
@@ -409,7 +407,7 @@ pkgname = php70-soap
 pkgname = php70-ftp
 	pkgdesc = FTP module for php70
 	depends = php70=7.0.33
-	depends = openssl
+	depends = openssl-1.1
 
 pkgname = php70-curl
 	pkgdesc = curl module for php70
@@ -420,7 +418,7 @@ pkgname = php70-snmp
 	pkgdesc = snmp module for php70
 	depends = php70=7.0.33
 	depends = net-snmp
-	depends = openssl
+	depends = openssl-1.1
 
 pkgname = php70-ldap
 	pkgdesc = ldap module for php70
@@ -435,7 +433,7 @@ pkgname = php70-imap
 	depends = krb5
 	depends = c-client
 	depends = libxcrypt
-	depends = openssl
+	depends = openssl-1.1
 
 pkgname = php70-mcrypt
 	pkgdesc = mcrypt module for php70
diff --git a/PKGBUILD b/PKGBUILD
index 2caf2cd2015e..d0f861de3059 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -16,13 +16,14 @@
 _phpbase="70"
 _suffix=""
 pkgver="7.0.33"
-pkgrel="10"
+pkgrel="12"
 pkgbase="php70"
 pkgdesc="PHP 7.0.33 compiled as to not conflict with mainline php"
 _cppflags=" -DU_USING_ICU_NAMESPACE=1  -DU_DEFINE_FALSE_AND_TRUE=1 "
 _build_apache_cfg="etc/httpd/conf/extra"
 _build_bundled_gd="0"
 _build_conf_d="etc/php70/conf.d"
+_build_forced_openssl_11="1"
 _build_fpm_name="php-fpm70"
 _build_fpm_service_name="php70-fpm"
 _build_icu_src_dir="icu/source"
@@ -133,7 +134,6 @@ source=(
     "php-apache.conf"
     "https://php.net/distributions/php-${pkgver}.tar.xz"
     "php55-phar-names.patch"
-    "openssl-sslv3-consts.patch"
     "fpm-numeric-uid-gid.patch"
     "fpm-reload-sighup.patch"
     "mysql-socket-php5.3.patch"
@@ -149,8 +149,6 @@ source=(
 )
 depends=(
 )
-checkdepends=(
-)
 makedepends=(
     "acl"
     "libtool"
@@ -176,9 +174,9 @@ makedepends=(
     "coreutils"
     "findutils"
     "libxslt"
-    "openssl"
     "e2fsprogs"
-    "db"
+    "openssl-1.1"
+    "db5.3"
     "postgresql-libs"
     "unixodbc"
     "libfbclient"
@@ -211,7 +209,6 @@ arch=(
 )
 _patches=(
     "php55-phar-names.patch"
-    "openssl-sslv3-consts.patch"
     "fpm-numeric-uid-gid.patch"
     "fpm-reload-sighup.patch"
     "mysql-socket-php5.3.patch"
@@ -233,11 +230,11 @@ _sapi_depends=(
 _ext_depends_snmp=(
     "php70=7.0.33"
     "net-snmp"
-    "openssl"
+    "openssl-1.1"
 )
 _ext_depends_ftp=(
     "php70=7.0.33"
-    "openssl"
+    "openssl-1.1"
 )
 _ext_depends_intl=(
     "php70=7.0.33"
@@ -249,7 +246,7 @@ _ext_depends_imap=(
     "krb5"
     "c-client"
     "libxcrypt"
-    "openssl"
+    "openssl-1.1"
 )
 _ext_depends_gd=(
     "php70=7.0.33"
@@ -262,7 +259,7 @@ _ext_depends_mysql=(
 )
 _ext_depends_dba=(
     "php70=7.0.33"
-    "db"
+    "db5.3"
 )
 _ext_depends_odbc=(
     "php70=7.0.33"
@@ -291,7 +288,7 @@ _ext_depends_openssl=(
     "php70=7.0.33"
     "krb5"
     "e2fsprogs"
-    "openssl"
+    "openssl-1.1"
 )
 _phpconfig="\
     --prefix=/usr \
@@ -527,6 +524,10 @@ build() {
     export EXTENSION_DIR="/usr/lib/${pkgbase}/modules"
     if ((_build_openssl_v10_patch)); then
         export PHP_OPENSSL_DIR="/usr/lib/openssl-1.0"
+        export PKG_CONFIG_PATH="/usr/lib/openssl-1.0/pkgconfig"
+    elif ((_build_forced_openssl_11)); then
+        export PHP_OPENSSL_DIR="/usr/lib/openssl-1.1"
+        export PKG_CONFIG_PATH="/usr/lib/openssl-1.1/pkgconfig"
     fi
     if [[ ! -z "${_cppflags}" ]]; then
         CPPFLAGS+=" $_cppflags "
@@ -1546,7 +1547,6 @@ sha256sums=('e6b8530d747000eebb0089249ec70a3b14add7b501337046700544883f62b17b'
             '6d0ad9becb5470ce8e5929d7d45660b0f32579038978496317544c5310281a91'
             'ab8c5be6e32b1f8d032909dedaaaa4bbb1a209e519abb01a52ce3914f9a13d96'
             '70e3cc00d954fa2b466a0e8f356c68bbb1e92b36304deaffd34c53cb6ae5e979'
-            'aecd8dff7022e956718407a5b98dec19acdceef08b0a58e7266b483bc3845de6'
             'd175f0c14fdb22855090c93f76e18f04320d7bf15afc057ffde947f9bb361242'
             'f5ae925036744a5e88cea2698879aea0498e1e23aee7801923d90f16be383908'
             '12f4e3aeab72e7d24221c07b64106c496c2e300518682bd301351dc9fa6ab3cf'
@@ -1555,7 +1555,7 @@ sha256sums=('e6b8530d747000eebb0089249ec70a3b14add7b501337046700544883f62b17b'
             'e07ebf146cea8e734c7704ba94f18279642df2b2f09d868781746d165041b8d5'
             'ed3184d5a6f7a3bf35ee32169f8dc3b6cba09c38f60e868e24652fe9a7dd844d'
             'c9f3b0dff07a7e9688f60b92a2a15817bd7cd59a8c5278cae629d856be66de5c'
-            '159bbf8c7657352ed6d6086e2b03011722d339659c586a56965b157ed9c7c8f9'
+            '526ff10b94dd352a086a42a1d1e2f9cee956ee1a84308784976e0e5cec11681f'
             '558e780e93dfa861a366c49b4d156d8fc43f17898f001ae6033ec63c33d5d41c'
             '40bcc1e5058602302198d0925e431495391d8469499593af477f59d84d32f764'
             'e221c918a75bcd851ee9d32d50370aa430a4a9ef94eaf2f4e8cbcc53483f8d31')
diff --git a/debian-php-7.0.33.patch b/debian-php-7.0.33.patch
index 98bd0c868ac4..d9b056ffc763 100644
--- a/debian-php-7.0.33.patch
+++ b/debian-php-7.0.33.patch
@@ -31,72 +31,6 @@ index 7765cfe..bc53aed 100644
  ; This directive allows you to disable certain functions for security reasons.
 diff --git a/ext/dba/config.m4 b/ext/dba/config.m4
 index 740cf14..1e8d51b 100644
---- a/ext/dba/config.m4
-+++ b/ext/dba/config.m4
-@@ -312,61 +312,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 4335a86..a7b1bb5 100644
 --- a/ext/dba/dba.c
@@ -175,19 +109,6 @@ index ff2fafd..a044916 100644
  .PHONY: $(ALWAYS) snapshot
 diff --git a/ext/dba/config.m4 b/ext/dba/config.m4
 index 1e8d51b..d2e6fd9 100644
---- a/ext/dba/config.m4
-+++ b/ext/dba/config.m4
-@@ -113,6 +113,10 @@
-       THIS_PREFIX=$i
-       THIS_INCLUDE=$i/include/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 cdee4c6..ed733c5 100644
 --- a/sapi/fpm/php-fpm.8.in