diff --git a/net-irc/znc/metadata.xml b/net-irc/znc/metadata.xml index 0f8b809..3e24db4 100644 --- a/net-irc/znc/metadata.xml +++ b/net-irc/znc/metadata.xml @@ -7,6 +7,7 @@ Enable mod_deflate-like gzip support for znc's web interface using sys-libs/zlib. + Store password hashes using Argon2id instead of SHA-256 znc/znc diff --git a/net-irc/znc/znc-9999.ebuild b/net-irc/znc/znc-9999.ebuild index 5884b05..8f5aa0e 100644 --- a/net-irc/znc/znc-9999.ebuild +++ b/net-irc/znc/znc-9999.ebuild @@ -1,13 +1,13 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python3_{10..12} ) +PYTHON_COMPAT=( python3_{11..14} ) inherit cmake python-single-r1 -GTEST_VER="1.8.1" +GTEST_VER="1.14.0" GTEST_URL="https://github.com/google/googletest/archive/${GTEST_VER}.tar.gz -> gtest-${GTEST_VER}.tar.gz" DESCRIPTION="An advanced IRC Bouncer" @@ -30,7 +30,7 @@ LICENSE="Apache-2.0" # "If you upgrade your ZNC version, you must recompile all your modules." # - https://wiki.znc.in/Compiling_modules SLOT="0/${PV}" -IUSE="+icu nls perl python +ssl sasl tcl test +zlib" +IUSE="+argon2 +icu nls perl python +ssl sasl tcl test +zlib" RESTRICT="!test? ( test )" # tests run znc-buildmod which is a Python script @@ -53,12 +53,12 @@ BDEPEND=" ) test? ( ${PYTHON_DEPS} - dev-qt/qtnetwork:5 + dev-qt/qtbase:6[network] ) " DEPEND=" - app-crypt/argon2 - dev-cpp/cctz + dev-cpp/cctz:= + argon2? ( app-crypt/argon2:= ) icu? ( dev-libs/icu:= ) nls? ( dev-libs/boost:=[nls] ) perl? ( >=dev-lang/perl-5.10:= ) @@ -70,7 +70,7 @@ DEPEND=" " PATCHES=( - "${FILESDIR}"/${PN}-1.7.1-inttest-dir.patch + "${FILESDIR}/${PN}-1.7.1-inttest-dir.patch" ) pkg_setup() { @@ -97,6 +97,7 @@ src_prepare() { src_configure() { local mycmakeargs=( -DWANT_ICU="$(usex icu)" + -DWANT_ARGON="$(usex argon2)" -DWANT_IPV6=yes -DWANT_I18N="$(usex nls)" -DWANT_PERL="$(usex perl)" @@ -109,8 +110,8 @@ src_configure() { ) if [[ ${PV} != *9999* ]] && use test; then - export GTEST_ROOT="${WORKDIR}/googletest-release-${GTEST_VER}/googletest" - export GMOCK_ROOT="${WORKDIR}/googletest-release-${GTEST_VER}/googlemock" + export GTEST_ROOT="${WORKDIR}/googletest-${GTEST_VER}/googletest" + export GMOCK_ROOT="${WORKDIR}/googletest-${GTEST_VER}/googlemock" fi cmake_src_configure