On 24/04/29 10:46PM, aisha wrote: > Hi, > > Attached a simple update to ZNC from 1.8.2 to 1.9.0. > > OK?
Now updating to 1.9.1 as there is a CVE - https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2024-39844. The CVE doesn't affect us as we don't build the TCL module, so nothing to backport for stable. Will commit tonight unless anyone has an objection. OK? Aisha diff --git a/net/znc/Makefile b/net/znc/Makefile index dd1ff40c1b4..4b71df6763a 100644 --- a/net/znc/Makefile +++ b/net/znc/Makefile @@ -1,11 +1,9 @@ COMMENT-main= advanced IRC bouncer COMMENT-sasl= SASL module for ZNC -DISTNAME= znc-1.8.2 +DISTNAME= znc-1.9.1 CATEGORIES= net SITES= ${HOMEPAGE}releases/ -REVISION-main= 6 -REVISION-sasl= 0 HOMEPAGE= https://znc.in/ @@ -16,11 +14,12 @@ PERMIT_PACKAGE= Yes MULTI_PACKAGES= -main -sasl -WANTLIB= crypto icuuc icudata m pthread ssl z ${COMPILER_LIBCXX} -WANTLIB-main= c ${WANTLIB} +WANTLIB= crypto icuuc icudata m pthread ssl ${COMPILER_LIBCXX} +WANTLIB-main= argon2 c z ${WANTLIB} WANTLIB-sasl= sasl2 ${WANTLIB} -LIB_DEPENDS= textproc/icu4c +LIB_DEPENDS= security/argon2 \ + textproc/icu4c LIB_DEPENDS-sasl= ${LIB_DEPENDS} \ security/cyrus-sasl2 diff --git a/net/znc/distinfo b/net/znc/distinfo index 833699626bc..cfdac7ff913 100644 --- a/net/znc/distinfo +++ b/net/znc/distinfo @@ -1,2 +1,2 @@ -SHA256 (znc-1.8.2.tar.gz) = /yOKrj8q4OROaDxK7hfcjk/dJhypN52DtIp9QiSI3g0= -SIZE (znc-1.8.2.tar.gz) = 2101215 +SHA256 (znc-1.9.1.tar.gz) = 6KfPgOGarVELTigur2G1a8MN+I6i4PZPrc3TA8SJTzw= +SIZE (znc-1.9.1.tar.gz) = 2236498 diff --git a/net/znc/patches/patch-modules_crypt_cpp b/net/znc/patches/patch-modules_crypt_cpp deleted file mode 100644 index 3ca6f05437a..00000000000 --- a/net/znc/patches/patch-modules_crypt_cpp +++ /dev/null @@ -1,15 +0,0 @@ -DH_set0_pqg() has been available since LibreSSL version 2.7. This version -won't compile with opaque DH in LibreSSL 3.5. - -Index: modules/crypt.cpp ---- modules/crypt.cpp.orig -+++ modules/crypt.cpp -@@ -68,7 +68,7 @@ class CCryptMod : public CModule { - CString m_sPrivKey; - CString m_sPubKey; - --#if OPENSSL_VERSION_NUMBER < 0X10100000L || defined(LIBRESSL_VERSION_NUMBER) -+#if OPENSSL_VERSION_NUMBER < 0X10100000L - 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. diff --git a/net/znc/patches/patch-modules_schat_cpp b/net/znc/patches/patch-modules_schat_cpp deleted file mode 100644 index 2a67597a2ba..00000000000 --- a/net/znc/patches/patch-modules_schat_cpp +++ /dev/null @@ -1,14 +0,0 @@ -Index: modules/schat.cpp ---- modules/schat.cpp.orig -+++ modules/schat.cpp -@@ -25,8 +25,8 @@ - #include <znc/User.h> - #include <znc/IRCNetwork.h> - --#if !defined(OPENSSL_VERSION_NUMBER) || defined(LIBRESSL_VERSION_NUMBER) || \ -- OPENSSL_VERSION_NUMBER < 0x10100007 -+#if !defined(OPENSSL_VERSION_NUMBER) || OPENSSL_VERSION_NUMBER < 0x10100007 || \ -+ (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x3040000fL) - /* SSL_SESSION was made opaque in OpenSSL 1.1.0, cipher accessor was added 2 - weeks before the public release. - See openssl/openssl@e92813234318635639dba0168c7ef5568757449b. */ diff --git a/net/znc/pkg/PLIST-main b/net/znc/pkg/PLIST-main index 299db06cf03..0198567eb60 100644 --- a/net/znc/pkg/PLIST-main +++ b/net/znc/pkg/PLIST-main @@ -67,6 +67,7 @@ lib/znc/ @so lib/znc/clearbufferonmsg.so @so lib/znc/clientnotify.so @so lib/znc/controlpanel.so +@so lib/znc/corecaps.so @so lib/znc/crypt.so @so lib/znc/ctcpflood.so @so lib/znc/dcc.so @@ -105,8 +106,10 @@ lib/znc/ share/doc/pkg-readmes/${PKGSTEM} share/znc/ share/znc/cmake/ +share/znc/cmake/CMakeFindDependencyMacroPC.cmake share/znc/cmake/ZNCConfig.cmake share/znc/cmake/ZNCConfigVersion.cmake +share/znc/cmake/use_homebrew.cmake share/znc/cmake/znc_internal${MODCMAKE_BUILD_SUFFIX} share/znc/cmake/znc_internal.cmake share/znc/cmake/znc_public.cmake @@ -177,7 +180,10 @@ share/znc/translations/id-ID share/znc/translations/it-IT share/znc/translations/nl-NL share/znc/translations/pl-PL +share/znc/translations/pt-BR +share/znc/translations/pt-PT share/znc/translations/ru-RU +share/znc/translations/tr-TR share/znc/webskins/ share/znc/webskins/_default_/ share/znc/webskins/_default_/pub/
