7.4.33-2 Fixed issue with DB4, switched to openssl-1.1

3 files changed, 22 insertions, 105 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 6961a42299ae..50771af63a96 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by makepkg 6.0.2
-# Sat Nov  5 17:36:44 UTC 2022
+# Wed Jan 11 09:59:43 UTC 2023
 pkgbase = php74
 	pkgdesc = PHP 7.4.33 compiled as to not conflict with mainline php
 	pkgver = 7.4.33
-	pkgrel = 2
+	pkgrel = 3
 	url = http://www.php.net
 	arch = x86_64
 	license = PHP
@@ -34,8 +34,8 @@ pkgbase = php74
 	makedepends = findutils
 	makedepends = argon2
 	makedepends = libxslt
-	makedepends = openssl
 	makedepends = e2fsprogs
+	makedepends = openssl-1.1
 	makedepends = lmdb
 	makedepends = db
 	makedepends = postgresql-libs
@@ -70,7 +70,6 @@ pkgbase = php74
 	source = php-makefile-patcher.php
 	source = php-apache.conf
 	source = https://php.net/distributions/php-7.4.33.tar.xz
-	source = openssl-sslv3-consts.patch
 	source = mysql-socket-php7.1.patch
 	source = php74-enchant.patch
 	source = debian-php-7.4.patch
@@ -82,10 +81,9 @@ pkgbase = php74
 	sha256sums = ba72fc64f77822755a469314160d5889d5298f4eb5758dd7939dac9b811afe52
 	sha256sums = 6d0ad9becb5470ce8e5929d7d45660b0f32579038978496317544c5310281a91
 	sha256sums = 924846abf93bc613815c55dd3f5809377813ac62a9ec4eb3778675b82a27b927
-	sha256sums = aecd8dff7022e956718407a5b98dec19acdceef08b0a58e7266b483bc3845de6
 	sha256sums = 0a3a6e8ff04ff1e0869befcf2c7bca4e886d94065da6d7a10b809a4750b961a0
 	sha256sums = 8fb103438fe12875dbe7c1f5b0899a81a76b4ce1456f16960e23e287d273df14
-	sha256sums = ccaad50d9e855bebd9d98bec4db6085dde3446ecd68bdbb58c1d450e1f5aeab9
+	sha256sums = c30ff6fcf75b0c0068f3d49fde8024719b3677f104d93232e52c5358c840c0f5
 	sha256sums = 558e780e93dfa861a366c49b4d156d8fc43f17898f001ae6033ec63c33d5d41c
 	sha256sums = 40bcc1e5058602302198d0925e431495391d8469499593af477f59d84d32f764
 	sha256sums = 6ef318bf8d53a2288d037e3284f4dbfc26c36fd2ecc7d62e3d5036c19ec0a707
@@ -220,7 +218,7 @@ pkgname = php74-openssl
 	depends = php74=7.4.33
 	depends = krb5
 	depends = e2fsprogs
-	depends = openssl
+	depends = openssl-1.1
 
 pkgname = php74-pdo
 	pkgdesc = pdo module for php74
@@ -271,7 +269,7 @@ pkgname = php74-tokenizer
 pkgname = php74-dba
 	pkgdesc = dba module for php74
 	depends = php74=7.4.33
-	depends = db
+	depends = db5.3
 	depends = lmdb
 
 pkgname = php74-pgsql
@@ -393,7 +391,7 @@ pkgname = php74-soap
 pkgname = php74-ftp
 	pkgdesc = FTP module for php74
 	depends = php74=7.4.33
-	depends = openssl
+	depends = openssl-1.1
 
 pkgname = php74-curl
 	pkgdesc = curl module for php74
@@ -404,7 +402,7 @@ pkgname = php74-snmp
 	pkgdesc = snmp module for php74
 	depends = php74=7.4.33
 	depends = net-snmp
-	depends = openssl
+	depends = openssl-1.1
 
 pkgname = php74-ldap
 	pkgdesc = ldap module for php74
@@ -419,7 +417,7 @@ pkgname = php74-imap
 	depends = krb5
 	depends = c-client
 	depends = libxcrypt
-	depends = openssl
+	depends = openssl-1.1
 
 pkgname = php74-sodium
 	pkgdesc = sodium (libsodium) module for php74
diff --git a/PKGBUILD b/PKGBUILD
index a71f6f957f96..b1e6cab0b903 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -16,13 +16,14 @@
 _phpbase="74"
 _suffix=""
 pkgver="7.4.33"
-pkgrel="2"
+pkgrel="3"
 pkgbase="php74"
 pkgdesc="PHP 7.4.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/php74/conf.d"
+_build_forced_openssl_11="1"
 _build_fpm_name="php-fpm74"
 _build_fpm_service_name="php74-fpm"
 _build_icu_src_dir="icu/source"
@@ -130,7 +131,6 @@ source=(
     "php-makefile-patcher.php"
     "php-apache.conf"
     "https://php.net/distributions/php-${pkgver}.tar.xz"
-    "openssl-sslv3-consts.patch"
     "mysql-socket-php7.1.patch"
     "php74-enchant.patch"
     "debian-php-7.4.patch"
@@ -140,8 +140,6 @@ source=(
 )
 depends=(
 )
-checkdepends=(
-)
 makedepends=(
     "acl"
     "libtool"
@@ -168,8 +166,8 @@ makedepends=(
     "findutils"
     "argon2"
     "libxslt"
-    "openssl"
     "e2fsprogs"
+    "openssl-1.1"
     "lmdb"
     "db"
     "postgresql-libs"
@@ -202,7 +200,6 @@ makedepends=(
 arch=(
 )
 _patches=(
-    "openssl-sslv3-consts.patch"
     "mysql-socket-php7.1.patch"
     "php74-enchant.patch"
     "debian-php-7.4.patch"
@@ -219,11 +216,11 @@ _sapi_depends=(
 _ext_depends_snmp=(
     "php74=7.4.33"
     "net-snmp"
-    "openssl"
+    "openssl-1.1"
 )
 _ext_depends_ftp=(
     "php74=7.4.33"
-    "openssl"
+    "openssl-1.1"
 )
 _ext_depends_intl=(
     "php74=7.4.33"
@@ -235,7 +232,7 @@ _ext_depends_imap=(
     "krb5"
     "c-client"
     "libxcrypt"
-    "openssl"
+    "openssl-1.1"
 )
 _ext_depends_gd=(
     "php74=7.4.33"
@@ -248,7 +245,7 @@ _ext_depends_mysql=(
 )
 _ext_depends_dba=(
     "php74=7.4.33"
-    "db"
+    "db5.3"
     "lmdb"
 )
 _ext_depends_odbc=(
@@ -279,7 +276,7 @@ _ext_depends_openssl=(
     "php74=7.4.33"
     "krb5"
     "e2fsprogs"
-    "openssl"
+    "openssl-1.1"
 )
 _phpconfig="\
     --prefix=/usr \
@@ -512,6 +509,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 "
@@ -1530,10 +1531,9 @@ sha256sums=('e6b8530d747000eebb0089249ec70a3b14add7b501337046700544883f62b17b'
             'ba72fc64f77822755a469314160d5889d5298f4eb5758dd7939dac9b811afe52'
             '6d0ad9becb5470ce8e5929d7d45660b0f32579038978496317544c5310281a91'
             '924846abf93bc613815c55dd3f5809377813ac62a9ec4eb3778675b82a27b927'
-            'aecd8dff7022e956718407a5b98dec19acdceef08b0a58e7266b483bc3845de6'
             '0a3a6e8ff04ff1e0869befcf2c7bca4e886d94065da6d7a10b809a4750b961a0'
             '8fb103438fe12875dbe7c1f5b0899a81a76b4ce1456f16960e23e287d273df14'
-            'ccaad50d9e855bebd9d98bec4db6085dde3446ecd68bdbb58c1d450e1f5aeab9'
+            'c30ff6fcf75b0c0068f3d49fde8024719b3677f104d93232e52c5358c840c0f5'
             '558e780e93dfa861a366c49b4d156d8fc43f17898f001ae6033ec63c33d5d41c'
             '40bcc1e5058602302198d0925e431495391d8469499593af477f59d84d32f764'
             '6ef318bf8d53a2288d037e3284f4dbfc26c36fd2ecc7d62e3d5036c19ec0a707')
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