CVS commit: pkgsrc/lang/php80

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

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Tue Sep 28 13:59:12 UTC 2021

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

Log Message:
php80: Support OpenSSL 3.


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 pkgsrc/lang/php80/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/lang/php80/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/php80/distinfo
diff -u pkgsrc/lang/php80/distinfo:1.8 pkgsrc/lang/php80/distinfo:1.9
--- pkgsrc/lang/php80/distinfo:1.8      Thu Sep 23 15:48:37 2021
+++ pkgsrc/lang/php80/distinfo  Tue Sep 28 13:59:12 2021
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.8 2021/09/23 15:48:37 taca Exp $
+$NetBSD: distinfo,v 1.9 2021/09/28 13:59:12 jperkin Exp $
 
 SHA1 (php-8.0.11.tar.xz) = a69e003e68abe2a511fa7632f1cfa017f32be34d
 RMD160 (php-8.0.11.tar.xz) = 291d6e4d7e331bb43f570ef053b4fb484ff40c3c
@@ -8,6 +8,7 @@ SHA1 (patch-build_libtool.m4) = e58a2bce
 SHA1 (patch-configure) = 6c3d2537eb4d1c2ed05e8e1e411701d316c67d8b
 SHA1 (patch-disable-filter-url) = 0a2c19c18f089448a8d842e99738b292ab9e5640
 SHA1 (patch-ext_enchant_enchant.c) = 74e0ec62928c84998ea41863088203f2511911fd
+SHA1 (patch-ext_openssl_openssl.c) = 6d83ad075866c90e17a8085fc7b562f33aea8583
 SHA1 (patch-ext_phar_Makefile.frag) = 53ea5c58b0bc27d236118d5750a74b1cba43e5dd
 SHA1 (patch-ext_tidy_config.m4) = 380f4e8927582b2781faf58b17ad81b6dc967ba7
 SHA1 (patch-ext_xsl_php__xsl.h) = cf930c5d6d9dab29b12558d265c67d3534a006fd

Added files:

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