diff options
| author | Rosen Penev <rosenp@gmail.com> | 2021-03-06 20:03:26 -0800 |
|---|---|---|
| committer | Rosen Penev <rosenp@gmail.com> | 2021-03-06 20:04:43 -0800 |
| commit | b92f2c2bee23c54cfc673af3bec4e614c1f95312 (patch) | |
| tree | 2c107a4d04175638c25695e20fc9ec060bf82002 /net/znc/patches | |
| parent | 0a7fcae3245ee354098d3b55430988b91f1f9c23 (diff) | |
znc: update to 1.8.2
Switch to CMake + Ninja to fix parallel compilation.
Switched PKG_BUILD_DIR to use PKG_INSTALL_DIR for easier readability.
Signed-off-by: Rosen Penev <rosenp@gmail.com>
Diffstat (limited to 'net/znc/patches')
| -rw-r--r-- | net/znc/patches/120-openssl-deprecated.patch | 62 |
1 files changed, 0 insertions, 62 deletions
diff --git a/net/znc/patches/120-openssl-deprecated.patch b/net/znc/patches/120-openssl-deprecated.patch deleted file mode 100644 index 66a173107..000000000 --- a/net/znc/patches/120-openssl-deprecated.patch +++ /dev/null @@ -1,62 +0,0 @@ ---- a/src/Utils.cpp -+++ b/src/Utils.cpp -@@ -29,7 +29,7 @@ - #include <openssl/ssl.h> - #include <openssl/bn.h> - #include <openssl/rsa.h> --#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || (LIBRESSL_VERSION_NUMBER < 0x20700000L) -+#if (OPENSSL_VERSION_NUMBER < 0x10100000L) - #define X509_getm_notBefore X509_get_notBefore - #define X509_getm_notAfter X509_get_notAfter - #endif ---- a/third_party/Csocket/Csocket.cc -+++ b/third_party/Csocket/Csocket.cc -@@ -47,10 +47,16 @@ - #include <stdio.h> - #include <openssl/ssl.h> - #include <openssl/conf.h> --#include <openssl/engine.h> -+#include <openssl/bn.h> -+#include <openssl/dh.h> -+#include <openssl/dsa.h> -+#include <openssl/rsa.h> - #ifndef OPENSSL_NO_COMP - #include <openssl/comp.h> - #endif -+#ifndef OPENSSL_NO_ENGINE -+#include <openssl/engine.h> -+#endif - #define HAVE_ERR_REMOVE_STATE - #ifdef OPENSSL_VERSION_NUMBER - # if OPENSSL_VERSION_NUMBER >= 0x10000000 -@@ -583,6 +589,7 @@ bool InitCsocket() - void ShutdownCsocket() - { - #ifdef HAVE_LIBSSL -+#if OPENSSL_VERSION_NUMBER < 0x10100000L - #if defined( HAVE_ERR_REMOVE_THREAD_STATE ) - ERR_remove_thread_state( NULL ); - #elif defined( HAVE_ERR_REMOVE_STATE ) -@@ -597,6 +604,7 @@ void ShutdownCsocket() - ERR_free_strings(); - EVP_cleanup(); - CRYPTO_cleanup_all_ex_data(); -+#endif - #endif /* HAVE_LIBSSL */ - #ifdef HAVE_C_ARES - #if ARES_VERSION >= CREATE_ARES_VER( 1, 6, 1 ) -@@ -611,12 +619,14 @@ void ShutdownCsocket() - #ifdef HAVE_LIBSSL - bool InitSSL( ECompType eCompressionType ) - { -+#if OPENSSL_VERSION_NUMBER < 0x10100000L - SSL_load_error_strings(); - if( SSL_library_init() != 1 ) - { - CS_DEBUG( "SSL_library_init() failed!" ); - return( false ); - } -+#endif - - #ifndef _WIN32 - if( access( "/dev/urandom", R_OK ) == 0 ) |