package/zip/0007-timezone.c-needs-time.h-fixes-musl-compile.patch Upstream
package/zip/0008-fix-musl-static-build.patch Upstream
package/zmqpp/0001-Allow-building-shared-or-static-library-only.patch Upstream
-package/znc/0001-LibreSSL-3.5-opaqued-structures.patch Upstream
-package/znc/0002-Fix-build-with-libressl.patch Upstream
-package/znc/0003-DH_set0_pqg-and-DH_get0_key-have-existed-since-Libre.patch Upstream
package/zziplib/0001-implant-ZZIP_LIBLATEST-for-zzip_lib.patch Upstream
support/dependencies/check-host-asciidoc.sh Shellcheck
support/dependencies/check-host-cmake.sh Shellcheck
+++ /dev/null
-From 87f3dac8ba8dea5628b05416bdef454b4ef2d236 Mon Sep 17 00:00:00 2001
-Date: Mon, 14 Mar 2022 17:36:36 -0400
-Subject: [PATCH] LibreSSL 3.5 opaqued structures
-
-Downloaded from upstream commit
-https://github.com/znc/Csocket/commit/87f3dac8ba8dea5628b05416bdef454b4ef2d236
-
-(rebased for znc)
----
- Csocket.cc | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Csocket.cc b/Csocket.cc
-index 46a3bfd..a30da14 100644
---- a/third_party/Csocket/Csocket.cc
-+++ b/third_party/Csocket/Csocket.cc
-@@ -61,7 +61,7 @@
- # define OPENSSL_NO_TLS1_1 /* 1.0.1-pre~: openssl/openssl@637f374ad49d5f6d4f81d87d7cdd226428aa470c */
- # define OPENSSL_NO_TLS1_2 /* 1.0.1-pre~: openssl/openssl@7409d7ad517650db332ae528915a570e4e0ab88b */
- # endif
--# ifndef LIBRESSL_VERSION_NUMBER /* forked from OpenSSL 1.0.1g, sets high version "with the idea of discouraging software from relying on magic numbers for detecting features"(!) */
-+# if !defined(LIBRESSL_VERSION_NUMBER) || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER >= 0x03050000fL)
- # if OPENSSL_VERSION_NUMBER >= 0x10100000
- # undef HAVE_ERR_REMOVE_THREAD_STATE /* 1.1.0-pre4: openssl/openssl@8509dcc9f319190c565ab6baad7c88d37a951d1c */
- # undef OPENSSL_NO_SSL2 /* 1.1.0-pre4: openssl/openssl@e80381e1a3309f5d4a783bcaa508a90187a48882 */
+++ /dev/null
-From dcb5f3df82fcfec48aab356252067dc897fb98cf Mon Sep 17 00:00:00 2001
-Date: Sun, 14 Nov 2021 00:45:01 +0000
-Subject: [PATCH] Fix build with libressl
-
-It got another feature of openssl implemented, which broke this
-
-Downloaded from upstream commit
-https://github.com/znc/znc/commit/dcb5f3df82fcfec48aab356252067dc897fb98cf
-
----
- CMakeLists.txt | 14 ++++++++++++++
- include/znc/zncconfig.h.cmake.in | 1 +
- modules/schat.cpp | 3 +--
- 3 files changed, 16 insertions(+), 2 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 0913ff2691..1f77f5632b 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -82,6 +82,20 @@ endmacro()
- tristate_option(OPENSSL "Support SSL")
- if(WANT_OPENSSL)
- find_package(OpenSSL ${TRISTATE_OPENSSL_REQUIRED})
-+
-+ if(OPENSSL_FOUND)
-+ # SSL_SESSION was made opaque in OpenSSL 1.1.0;
-+ # LibreSSL gained that function later too.
-+ # TODO: maybe remove this check at some point, and stop supporting old
-+ # libssl versions
-+ function(check_SSL_SESSION_get0_cipher)
-+ set(CMAKE_REQUIRED_LIBRARIES ${OPENSSL_LIBRARIES})
-+ set(CMAKE_REQUIRED_INCLUDES ${OPENSSL_INCLUDE_DIR})
-+ check_cxx_symbol_exists(SSL_SESSION_get0_cipher openssl/ssl.h
-+ HAVE_SSL_SESSION_get0_cipher)
-+ endfunction()
-+ check_SSL_SESSION_get0_cipher()
-+ endif()
- endif()
- set(HAVE_LIBSSL "${OPENSSL_FOUND}")
-
-diff --git a/include/znc/zncconfig.h.cmake.in b/include/znc/zncconfig.h.cmake.in
-index 5426b828af..7b07b99aec 100644
---- a/include/znc/zncconfig.h.cmake.in
-+++ b/include/znc/zncconfig.h.cmake.in
-@@ -31,6 +31,7 @@
- #define HAVE_PTHREAD 1
- #cmakedefine HAVE_THREADED_DNS 1
- #cmakedefine HAVE_LIBSSL 1
-+#cmakedefine HAVE_SSL_SESSION_get0_cipher 1
- #cmakedefine HAVE_IPV6 1
- #cmakedefine HAVE_ZLIB 1
- #cmakedefine HAVE_I18N 1
-diff --git a/modules/schat.cpp b/modules/schat.cpp
-index aa7a338dcd..66e67e695c 100644
---- a/modules/schat.cpp
-+++ b/modules/schat.cpp
-@@ -25,8 +25,7 @@
- #include <znc/User.h>
- #include <znc/IRCNetwork.h>
-
--#if !defined(OPENSSL_VERSION_NUMBER) || defined(LIBRESSL_VERSION_NUMBER) || \
-- OPENSSL_VERSION_NUMBER < 0x10100007
-+#ifndef HAVE_SSL_SESSION_get0_cipher
- /* SSL_SESSION was made opaque in OpenSSL 1.1.0, cipher accessor was added 2
- weeks before the public release.
- See openssl/openssl@e92813234318635639dba0168c7ef5568757449b. */
+++ /dev/null
-From 7c8ac8981a8516edaba469641aff4d8ec452ae9e Mon Sep 17 00:00:00 2001
-Date: Mon, 14 Mar 2022 18:32:46 -0400
-Subject: [PATCH] DH_set0_pqg and DH_get0_key have existed since LibreSSL 2.7
-
-https://github.com/libressl-portable/openbsd/commit/848e2a019c796b685fc8c5848283b86e48fbe0bf
-https://github.com/libressl-portable/openbsd/commit/3789e379353c1d53313a249461b3d735de4ac742
-
-Downloaded from upstream commit
-https://github.com/znc/znc/commit/7c8ac8981a8516edaba469641aff4d8ec452ae9e
-
----
- modules/crypt.cpp | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/modules/crypt.cpp b/modules/crypt.cpp
-index 7655371b6e..68f7aafcea 100644
---- a/modules/crypt.cpp
-+++ b/modules/crypt.cpp
-@@ -68,7 +68,8 @@ class CCryptMod : public CModule {
- CString m_sPrivKey;
- CString m_sPubKey;
-
--#if OPENSSL_VERSION_NUMBER < 0X10100000L || defined(LIBRESSL_VERSION_NUMBER)
-+#if OPENSSL_VERSION_NUMBER < 0X10100000L || \
-+ (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x02070000fL)
- static int DH_set0_pqg(DH* dh, BIGNUM* p, BIGNUM* q, BIGNUM* g) {
- /* If the fields p and g in dh are nullptr, the corresponding input
- * parameters MUST be non-nullptr. q may remain nullptr.
+++ /dev/null
-From fecdd9895894b3afe903021b0843a422eb4d3308 Mon Sep 17 00:00:00 2001
-Date: Sat, 5 Nov 2022 12:54:40 +0000
-Subject: [PATCH] Add support SWIG 4.1.0, drop support for < 4.0.1
-
-https://bugs.gentoo.org/878587
-
-Upstream: https://github.com/znc/znc/commit/fecdd9895894b3afe903021b0843a422eb4d3308
-
----
- CMakeLists.txt | 2 +-
- modules/modperl/CMakeLists.txt | 1 -
- modules/modpython/CMakeLists.txt | 1 -
- 3 files changed, 1 insertion(+), 3 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 9d43578e0e..efab0ee1ee 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -173,7 +173,7 @@ if(WANT_PYTHON AND NOT EXISTS
- endif()
- endif()
- if(search_swig)
-- find_package(SWIG 3.0.0)
-+ find_package(SWIG 4.0.1)
- if(NOT SWIG_FOUND)
- message(FATAL_ERROR
- "Can't find SWIG, therefore Perl and Python aren't supported. "
-diff --git a/modules/modperl/CMakeLists.txt b/modules/modperl/CMakeLists.txt
-index e18fe47644..a87f74e478 100644
---- a/modules/modperl/CMakeLists.txt
-+++ b/modules/modperl/CMakeLists.txt
-@@ -53,7 +53,6 @@ if(SWIG_FOUND)
- "-I${PROJECT_SOURCE_DIR}/include"
- "-I${CMAKE_CURRENT_SOURCE_DIR}/.."
- "-I${CMAKE_CURRENT_SOURCE_DIR}/include"
-- -DZNC_EXPORT_LIB_EXPORT
- -outdir "${CMAKE_CURRENT_BINARY_DIR}"
- -o "${CMAKE_CURRENT_BINARY_DIR}/modperl_biglib.cpp"
- "${CMAKE_CURRENT_SOURCE_DIR}/modperl.i"
-diff --git a/modules/modpython/CMakeLists.txt b/modules/modpython/CMakeLists.txt
-index edbeb41ed5..36a2e649f0 100644
---- a/modules/modpython/CMakeLists.txt
-+++ b/modules/modpython/CMakeLists.txt
-@@ -50,7 +50,6 @@ if(SWIG_FOUND)
- "-I${PROJECT_BINARY_DIR}/include"
- "-I${PROJECT_SOURCE_DIR}/include"
- "-I${CMAKE_CURRENT_SOURCE_DIR}/.."
-- -DZNC_EXPORT_LIB_EXPORT
- -outdir "${CMAKE_CURRENT_BINARY_DIR}"
- -o "${CMAKE_CURRENT_BINARY_DIR}/modpython_biglib.cpp"
- "${CMAKE_CURRENT_SOURCE_DIR}/modpython.i"
depends on BR2_INSTALL_LIBSTDCPP
depends on BR2_USE_MMU # fork()
depends on !BR2_STATIC_LIBS
- depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8
+ depends on BR2_TOOLCHAIN_GCC_AT_LEAST_8
depends on BR2_TOOLCHAIN_HAS_THREADS
select BR2_PACKAGE_LIBOPENSSL_ENABLE_BLOWFISH if BR2_PACKAGE_LIBOPENSSL
help
http://www.znc.in
-comment "znc needs a toolchain w/ C++, dynamic library, gcc >= 4.8, threads"
+comment "znc needs a toolchain w/ C++, dynamic library, gcc >= 8, threads"
depends on !BR2_INSTALL_LIBSTDCPP || BR2_STATIC_LIBS || \
- !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 || !BR2_TOOLCHAIN_HAS_THREADS
+ !BR2_TOOLCHAIN_GCC_AT_LEAST_8 || !BR2_TOOLCHAIN_HAS_THREADS
depends on BR2_USE_MMU
# Locally calculated
-sha256 ff238aae3f2ae0e44e683c4aee17dc8e4fdd261ca9379d83b48a7d422488de0d znc-1.8.2.tar.gz
+sha256 8b99c9dbb21c1309705073460be9bfacb6f7b0e83a15fe5d4b7140201b39d2a1 znc-1.9.0.tar.gz
sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE
#
################################################################################
-ZNC_VERSION = 1.8.2
+ZNC_VERSION = 1.9.0
ZNC_SITE = http://znc.in/releases/archive
ZNC_LICENSE = Apache-2.0
ZNC_LICENSE_FILES = LICENSE
projects / buildroot-mgba.git / commitdiff