[packages/php] Rel 3; fix openssl 3 build
arekm
arekm at pld-linux.org
Sat Oct 23 21:42:53 CEST 2021
commit a2270cdbb518094f7812fc1c437b210daf108d7d
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date: Sat Oct 23 21:41:43 2021 +0200
Rel 3; fix openssl 3 build
openssl.patch | 12 ++++++++++++
php.spec | 4 +++-
2 files changed, 15 insertions(+), 1 deletion(-)
---
diff --git a/php.spec b/php.spec
index 7efb664..23673b3 100644
--- a/php.spec
+++ b/php.spec
@@ -148,7 +148,7 @@ Summary(ru.UTF-8): PHP - язык препроцессирования HTML-фа
Summary(uk.UTF-8): PHP - мова препроцесування HTML-файлів, виконувана на сервері
Name: %{orgname}%{php_suffix}
Version: 8.0.8
-Release: 2
+Release: 3
Epoch: 4
# All files licensed under PHP version 3.01, except
# Zend is licensed under Zend
@@ -200,6 +200,7 @@ Patch67: mysql-lib-ver-mismatch.patch
# https://bugs.php.net/bug.php?id=68344
Patch68: php-mysql-ssl-context.patch
Patch71: libdb-info.patch
+Patch72: openssl.patch
URL: http://php.net/
%{?with_pdo_firebird:%{!?with_interbase_inst:BuildRequires: Firebird-devel >= 1.0.2.908-2}}
%{?with_pspell:BuildRequires: aspell-devel >= 2:0.50.0}
@@ -1890,6 +1891,7 @@ cp -p php.ini-production php.ini
%patch67 -p1 -b .mysql-lib-ver-mismatch
#%patch68 -p1 DROP or update to 7.0 APIs
%patch71 -p1 -b .libdb-info
+%patch72 -p1
sed -E -i -e '1s,#!\s*/usr/bin/env\s+(.*),#!%{__bindir}\1,' \
ext/ext_skel.php \
diff --git a/openssl.patch b/openssl.patch
new file mode 100644
index 0000000..a8dabb1
--- /dev/null
+++ b/openssl.patch
@@ -0,0 +1,12 @@
+--- php-8.0.8/ext/openssl/openssl.c~ 2021-06-29 09:41:19.000000000 +0200
++++ php-8.0.8/ext/openssl/openssl.c 2021-10-23 20:39:04.743124767 +0200
+@@ -1221,7 +1221,9 @@ PHP_MINIT_FUNCTION(openssl)
+ REGISTER_LONG_CONSTANT("OPENSSL_CMS_NOSIGS", CMS_NOSIGS, CONST_CS|CONST_PERSISTENT);
+
+ REGISTER_LONG_CONSTANT("OPENSSL_PKCS1_PADDING", RSA_PKCS1_PADDING, CONST_CS|CONST_PERSISTENT);
++#ifdef RSA_SSLV23_PADDING
+ REGISTER_LONG_CONSTANT("OPENSSL_SSLV23_PADDING", RSA_SSLV23_PADDING, CONST_CS|CONST_PERSISTENT);
++#endif
+ REGISTER_LONG_CONSTANT("OPENSSL_NO_PADDING", RSA_NO_PADDING, CONST_CS|CONST_PERSISTENT);
+ REGISTER_LONG_CONSTANT("OPENSSL_PKCS1_OAEP_PADDING", RSA_PKCS1_OAEP_PADDING, CONST_CS|CONST_PERSISTENT);
+
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/php.git/commitdiff/a2270cdbb518094f7812fc1c437b210daf108d7d
More information about the pld-cvs-commit
mailing list