dblib issues fixed. Openssl1.1 forced

3 files changed, 14 insertions, 24 deletions

diff --git a/.SRCINFO b/.SRCINFO
index dfe108579ee9..fe24e6b85cfd 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by makepkg 6.0.2
-# Sat Nov  5 21:53:06 UTC 2022
+# Tue Feb 21 12:38:22 UTC 2023
 pkgbase = php54
 	pkgdesc = PHP 5.4.45 compiled as to not conflict with mainline php
 	pkgver = 5.4.45
-	pkgrel = 6
+	pkgrel = 8
 	url = http://www.php.net
 	arch = x86_64
 	license = PHP
@@ -33,10 +33,9 @@ pkgbase = php54
 	makedepends = coreutils
 	makedepends = findutils
 	makedepends = libxslt
-	makedepends = openssl
 	makedepends = e2fsprogs
 	makedepends = openssl-1.0
-	makedepends = db
+	makedepends = db5.3
 	makedepends = postgresql-libs
 	makedepends = unixodbc
 	makedepends = libfbclient
@@ -107,7 +106,7 @@ pkgbase = php54
 	sha256sums = c9b3c4153596b605a41456e8242d98e474be6391d6fb4b6ce70a21c4c23b5203
 	sha256sums = 7e59ff3e1669d55f2a26ccdd748bfed6bbfd85d5d9206c1241cfd4443994f42c
 	sha256sums = 616ec8aa12070fb058be511abdae703a62d1c99387dd6d2a7bb47cb1b5bbda5f
-	sha256sums = caf09b93feec38e4db644bfe4b4d7369b89df926f8041ed007f1cb6d2b687574
+	sha256sums = 8febb003b694a82bc9e5af6c4daf947fbae58f909ffcccf3e908d07b51fea837
 	sha256sums = 558e780e93dfa861a366c49b4d156d8fc43f17898f001ae6033ec63c33d5d41c
 
 pkgname = php54
@@ -271,7 +270,7 @@ pkgname = php54-tokenizer
 pkgname = php54-dba
 	pkgdesc = dba module for php54
 	depends = php54=5.4.45
-	depends = db
+	depends = db5.3
 
 pkgname = php54-pgsql
 	pkgdesc = PostgreSQL modules for php54
diff --git a/PKGBUILD b/PKGBUILD
index e0387a71a924..467ec2c5951f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -16,13 +16,14 @@
 _phpbase="54"
 _suffix=""
 pkgver="5.4.45"
-pkgrel="6"
+pkgrel="8"
 pkgbase="php54"
 pkgdesc="PHP 5.4.45 compiled as to not conflict with mainline php"
 _cppflags=" -DU_USING_ICU_NAMESPACE=1  -DOPENSSL_NO_SSL3=1  -DOPENSSL_NO_SSL2=1  -DU_DEFINE_FALSE_AND_TRUE=1 "
 _build_apache_cfg="etc/httpd/conf/extra"
 _build_bundled_gd="1"
 _build_conf_d="etc/php54/conf.d"
+_build_forced_openssl_11="0"
 _build_fpm_name="php-fpm54"
 _build_fpm_service_name="php54-fpm"
 _build_icu_src_dir="icu/source"
@@ -177,10 +178,9 @@ makedepends=(
     "coreutils"
     "findutils"
     "libxslt"
-    "openssl"
     "e2fsprogs"
     "openssl-1.0"
-    "db"
+    "db5.3"
     "postgresql-libs"
     "unixodbc"
     "libfbclient"
@@ -266,7 +266,7 @@ _ext_depends_mysql=(
 )
 _ext_depends_dba=(
     "php54=5.4.45"
-    "db"
+    "db5.3"
 )
 _ext_depends_odbc=(
     "php54=5.4.45"
@@ -524,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 "
@@ -1558,5 +1562,5 @@ sha256sums=('e6b8530d747000eebb0089249ec70a3b14add7b501337046700544883f62b17b'
             'c9b3c4153596b605a41456e8242d98e474be6391d6fb4b6ce70a21c4c23b5203'
             '7e59ff3e1669d55f2a26ccdd748bfed6bbfd85d5d9206c1241cfd4443994f42c'
             '616ec8aa12070fb058be511abdae703a62d1c99387dd6d2a7bb47cb1b5bbda5f'
-            'caf09b93feec38e4db644bfe4b4d7369b89df926f8041ed007f1cb6d2b687574'
+            '8febb003b694a82bc9e5af6c4daf947fbae58f909ffcccf3e908d07b51fea837'
             '558e780e93dfa861a366c49b4d156d8fc43f17898f001ae6033ec63c33d5d41c')
diff --git a/debian-php-5.4.45.patch b/debian-php-5.4.45.patch
index abe3371fc013..ae5224642139 100644
--- a/debian-php-5.4.45.patch
+++ b/debian-php-5.4.45.patch
@@ -94,19 +94,6 @@ index 3eb2616..98e55ea 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 cb1224e..794f508 100644
 --- a/sapi/fpm/php-fpm.8.in