diff options
| author | Torsten Zuehlsdorff <tz@FreeBSD.org> | 2018-04-26 10:25:56 +0000 |
|---|---|---|
| committer | Torsten Zuehlsdorff <tz@FreeBSD.org> | 2018-04-26 10:25:56 +0000 |
| commit | 1cc9a6db1864a3a2ee02deb0961f62ec432b5449 (patch) | |
| tree | bfc17e4b4c714381ab0b06064c3a1a391600d786 /security | |
| parent | fc2d111b76fa433d8b054f38d8d109aceac716df (diff) | |
| download | ports-1cc9a6db1864a3a2ee02deb0961f62ec432b5449.tar.gz ports-1cc9a6db1864a3a2ee02deb0961f62ec432b5449.zip | |
security/php70-openssl and security/php71-openssl: fix build with libressl-devel
LibreSSL 2.7 brings out a number of incompatibilities.
The new patch allows PHP to compile against the new LibreSSL version.
It is ported from security/php72-openssl in r468343
PR: 226902
Submitted by: Piotr Kubaj <pkubaj@anongoth.pl>
Notes
Notes:
svn path=/head/; revision=468345
Diffstat (limited to 'security')
| -rw-r--r-- | security/php70-openssl/files/patch-openssl.c | 11 | ||||
| -rw-r--r-- | security/php71-openssl/files/patch-openssl.c | 11 |
2 files changed, 22 insertions, 0 deletions
diff --git a/security/php70-openssl/files/patch-openssl.c b/security/php70-openssl/files/patch-openssl.c new file mode 100644 index 000000000000..7dce8bd80c65 --- /dev/null +++ b/security/php70-openssl/files/patch-openssl.c @@ -0,0 +1,11 @@ +--- openssl.c.orig 2018-03-27 13:10:48 UTC ++++ openssl.c +@@ -566,7 +566,7 @@ ZEND_GET_MODULE(openssl) + #endif + + /* {{{ OpenSSL compatibility functions and macros */ +-#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined (LIBRESSL_VERSION_NUMBER) ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || ( defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000L ) + #define EVP_PKEY_get0_RSA(_pkey) _pkey->pkey.rsa + #define EVP_PKEY_get0_DH(_pkey) _pkey->pkey.dh + #define EVP_PKEY_get0_DSA(_pkey) _pkey->pkey.dsa diff --git a/security/php71-openssl/files/patch-openssl.c b/security/php71-openssl/files/patch-openssl.c new file mode 100644 index 000000000000..7dce8bd80c65 --- /dev/null +++ b/security/php71-openssl/files/patch-openssl.c @@ -0,0 +1,11 @@ +--- openssl.c.orig 2018-03-27 13:10:48 UTC ++++ openssl.c +@@ -566,7 +566,7 @@ ZEND_GET_MODULE(openssl) + #endif + + /* {{{ OpenSSL compatibility functions and macros */ +-#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined (LIBRESSL_VERSION_NUMBER) ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || ( defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000L ) + #define EVP_PKEY_get0_RSA(_pkey) _pkey->pkey.rsa + #define EVP_PKEY_get0_DH(_pkey) _pkey->pkey.dh + #define EVP_PKEY_get0_DSA(_pkey) _pkey->pkey.dsa |