Build against openssl v1.1

2 files changed, 18 insertions, 18 deletions

diff --git a/.SRCINFO b/.SRCINFO
index fd0699e166fa..000b78491482 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by makepkg 6.0.2
-# Sat Nov  5 17:57:32 UTC 2022
+# Tue Nov  8 15:58:10 UTC 2022
 pkgbase = php80
 	pkgdesc = PHP 8.0.25 compiled as to not conflict with mainline php
 	pkgver = 8.0.25
-	pkgrel = 2
+	pkgrel = 3
 	url = http://www.php.net
 	arch = x86_64
 	license = PHP
@@ -34,8 +34,8 @@ pkgbase = php80
 	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 = php80
 	source = php-makefile-patcher.php
 	source = php-apache.conf
 	source = https://php.net/distributions/php-8.0.25.tar.xz
-	source = openssl-sslv3-consts.patch
 	source = debian-php-8.0.patch
 	source = php-phpinfo.patch
 	source = timezonedb-guess.patch
@@ -80,7 +79,6 @@ pkgbase = php80
 	sha256sums = ba72fc64f77822755a469314160d5889d5298f4eb5758dd7939dac9b811afe52
 	sha256sums = 6d0ad9becb5470ce8e5929d7d45660b0f32579038978496317544c5310281a91
 	sha256sums = a291b71d0498707fc5514eb5b9513e88f0f1d4890bcdefd67282ded8a2bfb941
-	sha256sums = aecd8dff7022e956718407a5b98dec19acdceef08b0a58e7266b483bc3845de6
 	sha256sums = 9281736f0cbc60699992f92359a62d861c9c53391fd53e3826e77710ab981718
 	sha256sums = 558e780e93dfa861a366c49b4d156d8fc43f17898f001ae6033ec63c33d5d41c
 	sha256sums = 40bcc1e5058602302198d0925e431495391d8469499593af477f59d84d32f764
@@ -216,7 +214,7 @@ pkgname = php80-openssl
 	depends = php80=8.0.25
 	depends = krb5
 	depends = e2fsprogs
-	depends = openssl
+	depends = openssl-1.1
 
 pkgname = php80-pdo
 	pkgdesc = pdo module for php80
@@ -385,7 +383,7 @@ pkgname = php80-soap
 pkgname = php80-ftp
 	pkgdesc = FTP module for php80
 	depends = php80=8.0.25
-	depends = openssl
+	depends = openssl-1.1
 
 pkgname = php80-curl
 	pkgdesc = curl module for php80
@@ -396,7 +394,7 @@ pkgname = php80-snmp
 	pkgdesc = snmp module for php80
 	depends = php80=8.0.25
 	depends = net-snmp
-	depends = openssl
+	depends = openssl-1.1
 
 pkgname = php80-ldap
 	pkgdesc = ldap module for php80
@@ -411,7 +409,7 @@ pkgname = php80-imap
 	depends = krb5
 	depends = c-client
 	depends = libxcrypt
-	depends = openssl
+	depends = openssl-1.1
 
 pkgname = php80-sodium
 	pkgdesc = sodium (libsodium) module for php80
diff --git a/PKGBUILD b/PKGBUILD
index 1844125d6984..6076fb8cb446 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -16,13 +16,14 @@
 _phpbase="80"
 _suffix=""
 pkgver="8.0.25"
-pkgrel="2"
+pkgrel="3"
 pkgbase="php80"
 pkgdesc="PHP 8.0.25 compiled as to not conflict with mainline php"
 _cppflags=" -DU_USING_ICU_NAMESPACE=1 "
 _build_apache_cfg="etc/httpd/conf/extra"
 _build_bundled_gd="0"
 _build_conf_d="etc/php80/conf.d"
+_build_forced_openssl_11="1"
 _build_fpm_name="php-fpm80"
 _build_fpm_service_name="php80-fpm"
 _build_icu_src_dir="icu/source"
@@ -129,7 +130,6 @@ source=(
     "php-makefile-patcher.php"
     "php-apache.conf"
     "https://php.net/distributions/php-${pkgver}.tar.xz"
-    "openssl-sslv3-consts.patch"
     "debian-php-8.0.patch"
     "php-phpinfo.patch"
     "timezonedb-guess.patch"
@@ -163,8 +163,8 @@ makedepends=(
     "findutils"
     "argon2"
     "libxslt"
-    "openssl"
     "e2fsprogs"
+    "openssl-1.1"
     "lmdb"
     "db"
     "postgresql-libs"
@@ -197,7 +197,6 @@ makedepends=(
 arch=(
 )
 _patches=(
-    "openssl-sslv3-consts.patch"
     "debian-php-8.0.patch"
     "php-phpinfo.patch"
     "timezonedb-guess.patch"
@@ -212,11 +211,11 @@ _sapi_depends=(
 _ext_depends_snmp=(
     "php80=8.0.25"
     "net-snmp"
-    "openssl"
+    "openssl-1.1"
 )
 _ext_depends_ftp=(
     "php80=8.0.25"
-    "openssl"
+    "openssl-1.1"
 )
 _ext_depends_intl=(
     "php80=8.0.25"
@@ -228,7 +227,7 @@ _ext_depends_imap=(
     "krb5"
     "c-client"
     "libxcrypt"
-    "openssl"
+    "openssl-1.1"
 )
 _ext_depends_gd=(
     "php80=8.0.25"
@@ -272,7 +271,7 @@ _ext_depends_openssl=(
     "php80=8.0.25"
     "krb5"
     "e2fsprogs"
-    "openssl"
+    "openssl-1.1"
 )
 _phpconfig="\
     --prefix=/usr \
@@ -504,6 +503,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 "
@@ -1522,7 +1525,6 @@ sha256sums=('e6b8530d747000eebb0089249ec70a3b14add7b501337046700544883f62b17b'
             'ba72fc64f77822755a469314160d5889d5298f4eb5758dd7939dac9b811afe52'
             '6d0ad9becb5470ce8e5929d7d45660b0f32579038978496317544c5310281a91'
             'a291b71d0498707fc5514eb5b9513e88f0f1d4890bcdefd67282ded8a2bfb941'
-            'aecd8dff7022e956718407a5b98dec19acdceef08b0a58e7266b483bc3845de6'
             '9281736f0cbc60699992f92359a62d861c9c53391fd53e3826e77710ab981718'
             '558e780e93dfa861a366c49b4d156d8fc43f17898f001ae6033ec63c33d5d41c'
             '40bcc1e5058602302198d0925e431495391d8469499593af477f59d84d32f764'