diff --git a/net/znc/Makefile b/net/znc/Makefile index 76c443c16..a0b8c9359 100644 --- a/net/znc/Makefile +++ b/net/znc/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=znc PKG_VERSION:=1.7.1 -PKG_RELEASE:=2 +PKG_RELEASE:=3 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://znc.in/releases \ @@ -292,7 +292,7 @@ CONFIGURE_ARGS += \ --disable-perl \ --enable-poll \ --disable-python \ - --enable-ssl \ + --enable-openssl \ --disable-swig \ --disable-tcl \ --enable-tdns \ diff --git a/net/znc/patches/120-openssl-deprecated.patch b/net/znc/patches/120-openssl-deprecated.patch new file mode 100644 index 000000000..7d38e5f18 --- /dev/null +++ b/net/znc/patches/120-openssl-deprecated.patch @@ -0,0 +1,83 @@ +diff --git a/configure b/configure +index 18c5005..908fc09 100755 +--- a/configure ++++ b/configure +@@ -4746,6 +4746,7 @@ $as_echo_n "checking whether openssl is usable... " >&6; } + + + #include ++ #include + + int + main () +diff --git a/configure.ac b/configure.ac +index c94833e..b46a53d 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -368,6 +368,7 @@ if test "x$SSL" != "xno"; then + AC_LINK_IFELSE([ + AC_LANG_PROGRAM([[ + #include ++ #include + ]], [[ + SSL_CTX* ctx = SSL_CTX_new(TLSv1_method()); + SSL* ssl = SSL_new(ctx); +diff --git a/src/Utils.cpp b/src/Utils.cpp +index cced568..425831a 100644 +--- a/src/Utils.cpp ++++ b/src/Utils.cpp +@@ -27,6 +27,8 @@ + #include + #ifdef HAVE_LIBSSL + #include ++#include ++#include + #endif /* HAVE_LIBSSL */ + #include + #include +diff --git a/src/main.cpp b/src/main.cpp +index 7d4e209..8d458a9 100644 +--- a/src/main.cpp ++++ b/src/main.cpp +@@ -46,8 +46,8 @@ static void locking_callback(int mode, int type, const char* file, int line) { + } + } + +-static unsigned long thread_id_callback() { +- return (unsigned long)pthread_self(); ++static void thread_id_callback(CRYPTO_THREADID *id) { ++ CRYPTO_THREADID_set_numeric(id, (unsigned long)pthread_self()); + } + + static CRYPTO_dynlock_value* dyn_create_callback(const char* file, int line) { +@@ -78,7 +78,7 @@ static void thread_setup() { + for (std::unique_ptr& mtx : lock_cs) + mtx = std::unique_ptr(new CMutex()); + +- CRYPTO_set_id_callback(&thread_id_callback); ++ CRYPTO_THREADID_set_callback(&thread_id_callback); + CRYPTO_set_locking_callback(&locking_callback); + + CRYPTO_set_dynlock_create_callback(&dyn_create_callback); +diff --git a/third_party/Csocket/Csocket.cc b/third_party/Csocket/Csocket.cc +index 46a3bfd..017d22f 100644 +--- a/third_party/Csocket/Csocket.cc ++++ b/third_party/Csocket/Csocket.cc +@@ -47,10 +47,16 @@ + #include + #include + #include +-#include ++#include ++#include ++#include ++#include + #ifndef OPENSSL_NO_COMP + #include + #endif ++#ifndef OPENSSL_NO_ENGINE ++#include ++#endif + #define HAVE_ERR_REMOVE_STATE + #ifdef OPENSSL_VERSION_NUMBER + # if OPENSSL_VERSION_NUMBER >= 0x10000000