diff options
| author | tz <tz@FreeBSD.org> | 2018-04-26 18:25:56 +0800 |
|---|---|---|
| committer | tz <tz@FreeBSD.org> | 2018-04-26 18:25:56 +0800 |
| commit | 4b6120c10558f6cc386e8f3ac9115110add9f17a (patch) | |
| tree | bfc17e4b4c714381ab0b06064c3a1a391600d786 /security | |
| parent | 1788b2107260d579bfc1569f85d02fe223f6dfca (diff) | |
| download | freebsd-ports-gnome-4b6120c10558f6cc386e8f3ac9115110add9f17a.tar.gz freebsd-ports-gnome-4b6120c10558f6cc386e8f3ac9115110add9f17a.tar.zst freebsd-ports-gnome-4b6120c10558f6cc386e8f3ac9115110add9f17a.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>
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 |