[packages/php/PHP_5_5] Rel 25; fix openssl 3 build

arekm arekm at pld-linux.org
Sat Oct 23 19:39:51 CEST 2021


commit 5b8714db0de6a08fdd815f7063e52d7f5005d696
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date:   Sat Oct 23 19:38:52 2021 +0200

    Rel 25; 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 cfac9f1..9fcb8e9 100644
--- a/php.spec
+++ b/php.spec
@@ -140,7 +140,7 @@ ERROR: You need to select at least one Apache SAPI to build shared modules.
 %undefine	with_filter
 %endif
 
-%define		rel	24
+%define		rel	25
 %define		orgname	php
 %define		ver_suffix 55
 %define		php_suffix %{!?with_default_php:%{ver_suffix}}
diff --git a/openssl.patch b/openssl.patch
index 8edd9c6..0428aa2 100644
--- a/openssl.patch
+++ b/openssl.patch
@@ -959,3 +959,15 @@ diff -ur php-5.5.38.org/ext/openssl/openssl.c php-5.5.38/ext/openssl/openssl.c
  
  	if (len >= 0) {
  		data[len] = 0;
+--- 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/5b8714db0de6a08fdd815f7063e52d7f5005d696



More information about the pld-cvs-commit mailing list