dblib issues fixed. Openssl1.1 forced

1 files changed, 14 insertions, 14 deletions

diff --git a/PKGBUILD b/PKGBUILD
index b899d6ff5f4d..86f19ff1df0a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -16,13 +16,14 @@
 _phpbase="72"
 _suffix=""
 pkgver="7.2.34"
-pkgrel="12"
+pkgrel="14"
 pkgbase="php72"
 pkgdesc="PHP 7.2.34 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/php72/conf.d"
+_build_forced_openssl_11="1"
 _build_fpm_name="php-fpm72"
 _build_fpm_service_name="php72-fpm"
 _build_icu_src_dir="icu/source"
@@ -133,7 +134,6 @@ source=(
     "php-apache.conf"
     "https://php.net/distributions/php-${pkgver}.tar.xz"
     "php71-phar-names.patch"
-    "openssl-sslv3-consts.patch"
     "fpm-numeric-uid-gid.patch"
     "fpm-reload-sighup.patch"
     "mysql-socket-php7.1.patch"
@@ -149,8 +149,6 @@ source=(
 )
 depends=(
 )
-checkdepends=(
-)
 makedepends=(
     "acl"
     "libtool"
@@ -177,10 +175,10 @@ makedepends=(
     "findutils"
     "argon2"
     "libxslt"
-    "openssl"
     "e2fsprogs"
+    "openssl-1.1"
     "lmdb"
-    "db"
+    "db5.3"
     "postgresql-libs"
     "unixodbc"
     "libfbclient"
@@ -212,7 +210,6 @@ arch=(
 )
 _patches=(
     "php71-phar-names.patch"
-    "openssl-sslv3-consts.patch"
     "fpm-numeric-uid-gid.patch"
     "fpm-reload-sighup.patch"
     "mysql-socket-php7.1.patch"
@@ -235,11 +232,11 @@ _sapi_depends=(
 _ext_depends_snmp=(
     "php72=7.2.34"
     "net-snmp"
-    "openssl"
+    "openssl-1.1"
 )
 _ext_depends_ftp=(
     "php72=7.2.34"
-    "openssl"
+    "openssl-1.1"
 )
 _ext_depends_intl=(
     "php72=7.2.34"
@@ -251,7 +248,7 @@ _ext_depends_imap=(
     "krb5"
     "c-client"
     "libxcrypt"
-    "openssl"
+    "openssl-1.1"
 )
 _ext_depends_gd=(
     "php72=7.2.34"
@@ -263,7 +260,7 @@ _ext_depends_mysql=(
 )
 _ext_depends_dba=(
     "php72=7.2.34"
-    "db"
+    "db5.3"
     "lmdb"
 )
 _ext_depends_odbc=(
@@ -293,7 +290,7 @@ _ext_depends_openssl=(
     "php72=7.2.34"
     "krb5"
     "e2fsprogs"
-    "openssl"
+    "openssl-1.1"
 )
 _phpconfig="\
     --prefix=/usr \
@@ -529,6 +526,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 "
@@ -1548,7 +1549,6 @@ sha256sums=('e6b8530d747000eebb0089249ec70a3b14add7b501337046700544883f62b17b'
             '6d0ad9becb5470ce8e5929d7d45660b0f32579038978496317544c5310281a91'
             '409e11bc6a2c18707dfc44bc61c820ddfd81e17481470f3405ee7822d8379903'
             'ee6529d441b2446d784e80aba23aa956541e541bd73ad54aee480d4a1a6117ca'
-            'aecd8dff7022e956718407a5b98dec19acdceef08b0a58e7266b483bc3845de6'
             'd175f0c14fdb22855090c93f76e18f04320d7bf15afc057ffde947f9bb361242'
             'f5ae925036744a5e88cea2698879aea0498e1e23aee7801923d90f16be383908'
             '0a3a6e8ff04ff1e0869befcf2c7bca4e886d94065da6d7a10b809a4750b961a0'
@@ -1557,7 +1557,7 @@ sha256sums=('e6b8530d747000eebb0089249ec70a3b14add7b501337046700544883f62b17b'
             'e07ebf146cea8e734c7704ba94f18279642df2b2f09d868781746d165041b8d5'
             'ed3184d5a6f7a3bf35ee32169f8dc3b6cba09c38f60e868e24652fe9a7dd844d'
             'c9f3b0dff07a7e9688f60b92a2a15817bd7cd59a8c5278cae629d856be66de5c'
-            '1377d3627fbccb6edca87742836771a6546ecca121bbd43c3981880217258c22'
+            'edfc52a057a5806bc5173d86b72c5443acc19672e762de79aeaec6ae688199c4'
             '558e780e93dfa861a366c49b4d156d8fc43f17898f001ae6033ec63c33d5d41c'
             '40bcc1e5058602302198d0925e431495391d8469499593af477f59d84d32f764'
             'db38b1fe1f6d6aa80bbca3c142bf7a166e3e83212dcc1396f9ec706daad36ad2')