commit 75564cd7e5325790cd87ed0887f42e2e2a5df14c
Author: Arkadiusz Miśkiewicz <[email protected]>
Date: Sun Oct 31 19:13:12 2021 +0100
Rel 37; fix openssl 3 build
openssl.patch | 12 ++++++++++++
php.spec | 2 +-
2 files changed, 13 insertions(+), 1 deletion(-)
---
diff --git a/php.spec b/php.spec
index ac3dc50..c794536 100644
--- a/php.spec
+++ b/php.spec
@@ -112,7 +112,7 @@ ERROR: You need to select at least one Apache SAPI to build
shared modules.
%define magic_mime /usr/share/misc/magic.mime
%endif
-%define rel 36
+%define rel 37
%define orgname php
%define ver_suffix 52
%define php_suffix %{!?with_default_php:%{ver_suffix}}
diff --git a/openssl.patch b/openssl.patch
index 4030bc5..9cbb650 100644
--- a/openssl.patch
+++ b/openssl.patch
@@ -428,3 +428,15 @@ diff -ur php-5.2.17/ext/openssl.org/xp_ssl.c
php-5.2.17/ext/openssl/xp_ssl.c
PHP_EVAL_INCLINE($OPENSSL_INCS)
fi
fi
+--- php-5.3.29/ext/openssl/openssl.c~ 2021-10-23 19:18:21.000000000 +0200
++++ php-5.3.29/ext/openssl/openssl.c 2021-10-23 19:19:01.483125024 +0200
+@@ -1044,7 +1044,9 @@ PHP_MINIT_FUNCTION(openssl)
+ REGISTER_LONG_CONSTANT("PKCS7_NOSIGS", PKCS7_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/75564cd7e5325790cd87ed0887f42e2e2a5df14c
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
