CVS commit: pkgsrc/lang/php74

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Tue Sep 28 13:50:15 UTC 2021

Modified Files:
        pkgsrc/lang/php74: distinfo
Added Files:
        pkgsrc/lang/php74/patches: patch-ext_openssl_openssl.c

Log Message:
php74: Support OpenSSL 3.


To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.29 pkgsrc/lang/php74/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/lang/php74/patches/patch-ext_openssl_openssl.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/lang/php74/distinfo
diff -u pkgsrc/lang/php74/distinfo:1.28 pkgsrc/lang/php74/distinfo:1.29
--- pkgsrc/lang/php74/distinfo:1.28     Fri Sep 24 02:27:04 2021
+++ pkgsrc/lang/php74/distinfo  Tue Sep 28 13:50:15 2021
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.28 2021/09/24 02:27:04 taca Exp $
+$NetBSD: distinfo,v 1.29 2021/09/28 13:50:15 jperkin Exp $
 
 SHA1 (php-7.4.24.tar.xz) = 34660781db70c891dcaab046931d38f60464d7e3
 RMD160 (php-7.4.24.tar.xz) = 67a0c7ca2067311ee363e685fc89aba1980b0778
@@ -13,6 +13,7 @@ SHA1 (patch-ext_intl_dateformat_dateform
 SHA1 (patch-ext_intl_normalizer_normalizer__normalize.c) = 10a215438db81c9f1f002f9409ebd56de6d65617
 SHA1 (patch-ext_intl_timezone_timezone__class.cpp) = da8e7a227c04f366aa9aab08c5042826baa965fe
 SHA1 (patch-ext_intl_timezone_timezone__methods.cpp) = 48dc73ca68df2454549bb81de6da6753bbb097bc
+SHA1 (patch-ext_openssl_openssl.c) = bbd446bbf89e90749a01319553d666d86d1274e2
 SHA1 (patch-ext_phar_Makefile.frag) = 53ea5c58b0bc27d236118d5750a74b1cba43e5dd
 SHA1 (patch-ext_tidy_config.m4) = 380f4e8927582b2781faf58b17ad81b6dc967ba7
 SHA1 (patch-ext_xsl_php__xsl.h) = a9877bff7bacc77926a4541a0ac171c00ad1a627

Added files:

Index: pkgsrc/lang/php74/patches/patch-ext_openssl_openssl.c
diff -u /dev/null pkgsrc/lang/php74/patches/patch-ext_openssl_openssl.c:1.1
--- /dev/null   Tue Sep 28 13:50:15 2021
+++ pkgsrc/lang/php74/patches/patch-ext_openssl_openssl.c       Tue Sep 28 13:50:15 2021
@@ -0,0 +1,16 @@
+$NetBSD: patch-ext_openssl_openssl.c,v 1.1 2021/09/28 13:50:15 jperkin Exp $
+
+Support OpenSSL 3.x.
+
+--- ext/openssl/openssl.c.orig 2021-08-24 16:33:31.000000000 +0000
++++ ext/openssl/openssl.c
+@@ -1517,7 +1517,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);
++#if OPENSSL_VERSION_NUMBER < 0x03000000L
+       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);
+