From 88f366f99d8e731ae1a13d9eca9a5284484d2c6f Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 28 Feb 2024 05:40:38 +0000 Subject: gentoo auto-resync : 28:02:2024 - 05:40:38 --- net-irc/Manifest.gz | Bin 8236 -> 8235 bytes net-irc/znc/Manifest | 8 +- ....9.0-skip-modperl-modpython-tests-cleaner.patch | 248 +++++++++++++++++++++ net-irc/znc/metadata.xml | 1 + net-irc/znc/znc-1.9.0.ebuild | 199 +++++++++++++++++ net-irc/znc/znc-9999.ebuild | 18 +- 6 files changed, 464 insertions(+), 10 deletions(-) create mode 100644 net-irc/znc/files/znc-1.9.0-skip-modperl-modpython-tests-cleaner.patch create mode 100644 net-irc/znc/znc-1.9.0.ebuild (limited to 'net-irc') diff --git a/net-irc/Manifest.gz b/net-irc/Manifest.gz index 4e40a14cc7d5..c9dcaa397bec 100644 Binary files a/net-irc/Manifest.gz and b/net-irc/Manifest.gz differ diff --git a/net-irc/znc/Manifest b/net-irc/znc/Manifest index 7deadae1c827..0950175def54 100644 --- a/net-irc/znc/Manifest +++ b/net-irc/znc/Manifest @@ -6,10 +6,14 @@ AUX znc-1.8.2-fix-python-3.10.patch 997 BLAKE2B b2be81e71483ea64912db8511dd9cb8f AUX znc-1.8.2-fix-swig-2.patch 3911 BLAKE2B dcc0603cd89223b75116709fb3fa51f8d9804dd63268c917665e3d5950c71783481294ccf711603d6375b93bf66b900a6acb95667967b2bab797eeebf32a9763 SHA512 878657bcec24a1f2695096a38aeedbdf8ea1a6d4722d001765641c0920295935b7ecb460b05be0d46684d095c87d8b81e4410e5793a31b133a3b6f2686351344 AUX znc-1.8.2-fix-swig.patch 1506 BLAKE2B 93055d76cd6ff429f3052b3774db209dd3acf48a2b599874aa2ac44f71cc218f8f8aaf030428c75272874ea156817fccaeb12ababb49ed59fb3433e251082fd3 SHA512 f2923a98467231ca97d7bdb937ad96a36a464a935319f482b03f857ade88b6402b0a16205eaadddca3750483a4dc36db3d2acb33074ca1883507d72b64d8b80c AUX znc-1.8.2-fix-systemd-datadir.patch 692 BLAKE2B d6585fc5c2087b51c8c2277eb1c8f70585cad3621fcaa0f746a918a1f5e9f5455a8ca8dcbc6e73c0200e723d2fd6e3f4080d3a1d185fc9cc2dd3b14dcd80908a SHA512 d54f36cd4da9bb2d67852e2d7f302538fd2807d95b3480b4416fbf1d7a4d010a03a06e8f20c3f8907ea8d33d1be4872a4433c3db30530327fcfb39f43ada0b23 +AUX znc-1.9.0-skip-modperl-modpython-tests-cleaner.patch 6969 BLAKE2B ee937d2f949a7c43dea5573b92193cf924304ce6b0642b55f76afd7109e0d27349277d9122bf8f8de6b1b3239bcb830d6a40807b1288ab3a26fb9bee1bd6ac99 SHA512 12a2bed29e6d65efef27b2b975c8620a67b991bb8ca6e33280960cfc4dc64686a0172c3f54a15b168baff288f34c43dc399f6dfd69de3cb9c5bd21f79cdf0ca0 AUX znc.confd-r1 720 BLAKE2B 4857a8bcd36ed1008a558ac7b067d6fad53b5d39c0df9130ca28d4ac3db3924a3a1200682c19c7e6f7869f22338b492f73bf6ccbc2b723d117c9eebc10a89838 SHA512 3ab102f64ea0572350c8595fd3739874da591c43a3dbc3a740c72c53bd7418fded721d478d1fb92de0c0d18131313ba6679e842a135dfe239ea3f42821d8e468 AUX znc.initd-r2 952 BLAKE2B 81346bf0a1581543683eb5c125b29474c0bc01b8aee11c036a134c5a01042059564f2982aaec65715ac0a2c87b64fcd9746464148a81daeee549f4228d6ff55f SHA512 c3d676796aaa485dcaebee0fba58a8f86560cd192e0e2ccf06f58346c1368f58aa5be1c1e5160f8105e3dc5c684d3d1f82eff6a4d7b87c07f11450b72288727f +DIST gtest-1.14.0.tar.gz 867764 BLAKE2B c457f55ac572b9fb1553eee3df7eeeaf1e7dd2c3d747dd5e90dd279038fa5c71bb7b7d9ba1cf7e6143898b2a1d24d100584bd2a48ded41a426870c4825eec1b2 SHA512 765c326ccc1b87a01027385e69238266e356361cd4ee3e18e3c9d137a5d11fa5d657c164d02dd1be8fe693c8e10f2b580588dbfa57d27f070e2750f50d3e662c DIST gtest-1.8.1.tar.gz 992298 BLAKE2B 40ef3417fe424205c0617f07207347ce671ac87605f8ac9b8a333b0b06e3fbef9f556041ee324c18f957f3258ab9fe06704f31cdd038355fb7890180eb77ced1 SHA512 e6283c667558e1fd6e49fa96e52af0e415a3c8037afe1d28b7ff1ec4c2ef8f49beb70a9327b7fc77eb4052a58c4ccad8b5260ec90e4bceeac7a46ff59c4369d7 DIST znc-1.8.2.tar.gz 2101215 BLAKE2B 7f0e5840fe57cc6b6549115b0fcf02e6afd3be0bf52e79da0a39bcc1463d983cbeb504bad30f3d2f7582f0295c7210d3c1eec40ec87bcc3546ba2d21a67cca9e SHA512 e821647b50698c3a82fad039e69943e030bf644d8f8e82afa87c6c11da44761bceecddd510a7a956a1b487b1cca6ee46e8ac8818ea03127f0f1ff8f5d1a1a7f9 +DIST znc-1.9.0.tar.gz 2221116 BLAKE2B 00bf472f0c223684c52a8c1a1a4b699346e58718161e6c40e3423591ef49aa13b6a530eb705e6f9e9cd6ce8937b4ee4e89de62d15aca7f2b19e1e8b603351d6e SHA512 22b8bd6fd7332643860f7a99ceaa0f6d0c9dd8ba9edac14b3f3731c9301eeb58e03e3af8d09e939e453aa980ff9f24afbe79e66d1106993f81d8779c97731a17 EBUILD znc-1.8.2-r2.ebuild 5647 BLAKE2B 276b9611f95d3453a2e8359c364b2278e6710636379985043222991ce773250bbc42134e12c3c13f31d0ae93d54eb669b273be58507b836f84534c97e2b60c87 SHA512 99d46a73dc90c2eb9dd4e26803d6384a10b55f006de1640d149d2c35efabfb9a50cff6346620cb87876314ada41d16aa5fd579d9cfa4bc34132267fe61afe422 -EBUILD znc-9999.ebuild 5503 BLAKE2B 892178ccca7e571f7b2e3849cb7e5ae19953ace415d607f78fb1489f315af9c583c5304fedf11e5ea0642872aa909b0c473c2dd576ab741c89c733001bde509d SHA512 1274bd1a7419b859252a84795b2f9f672cc2f5bd6d954e856301d81c4f7a04daa77c4a1bc3b23cb9f253befdd773b14837cf4ca6f1bd6cf93499cb2c6a812039 -MISC metadata.xml 508 BLAKE2B 55a9f6a41856dfab6261b5cc23afa06756835fd740253084e06cfa53afcf6036974aeb5455373f43432515a5a88f476471ef9fa8bb38b30b8335af469eabf0c2 SHA512 5974ad23cb5256888b7b9c2c34a6fdbe46efb3e48bc075a3ebf09612bdb70ac27b56fd0bab13e1ada8234e2a3dce725aa8fc2bcf8e5248227f27e6e8a371c438 +EBUILD znc-1.9.0.ebuild 5684 BLAKE2B ceb2f6e2797b993aeebbda3a1e6e38ed5a045d461abe40263b854d582bc7dff1a4b0bc22a3c3da70a60a25de70261c7c9f4f8960c64f61f46046815d4acf5083 SHA512 03e23e19f900a310927fb3a93bc60bd444fc4ae30de8eab1154eefa5b3ee8cf0b1a82aebb28db63987c8b94188a814aa1670945c32f75024251b77e76fec761b +EBUILD znc-9999.ebuild 5525 BLAKE2B 6b563b7ccfd6651410b24c33b696d8de6eccd7e7636371020d8e0caab0460dbd566f49b39121b36d4622f37df01c28ec400862fd0df0cd6d8ebe06fb65d8a705 SHA512 339ea3a6e6ef167882ad9cc81a63510b03b11d2cabc153a8d5f6069d20d5e16c3f082c8363f10d8de42630a908e5ee610197f6e90e831366cac30d83b30aae63 +MISC metadata.xml 593 BLAKE2B 20191b1726221e530c845af505f81e2bb9770ee378ab6cf5854865d747803cc8704f29d739bc90abdd6562cb3a7c0e524591b922211a8382bf8f3981f4a2f2d4 SHA512 072679c68ecb3af85521ef6f0ed906721f595c6384d0832a2ad45078e9e9b84565123b114268a98f3cf4cbeb3706d04eea8dca66243aa3fd1664808a41890048 diff --git a/net-irc/znc/files/znc-1.9.0-skip-modperl-modpython-tests-cleaner.patch b/net-irc/znc/files/znc-1.9.0-skip-modperl-modpython-tests-cleaner.patch new file mode 100644 index 000000000000..fae99b5d6583 --- /dev/null +++ b/net-irc/znc/files/znc-1.9.0-skip-modperl-modpython-tests-cleaner.patch @@ -0,0 +1,248 @@ +https://github.com/znc/znc/commit/f8552fc814ebe662a9fc16d6cafa1c0314498971 + +From f8552fc814ebe662a9fc16d6cafa1c0314498971 Mon Sep 17 00:00:00 2001 +From: Alexey Sokolov +Date: Sun, 25 Feb 2024 14:12:53 +0000 +Subject: [PATCH] Skip modperl/modpython tests cleaner + +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -411,6 +411,8 @@ else() + endif() + + configure_file("include/znc/zncconfig.h.cmake.in" "include/znc/zncconfig.h") ++configure_file("test/integration/znctestconfig.h.cmake.in" ++ "test/integration/znctestconfig.h") + add_subdirectory(include) + add_subdirectory(src) + add_subdirectory(modules) +--- a/test/integration/CMakeLists.txt ++++ b/test/integration/CMakeLists.txt +@@ -45,6 +45,7 @@ add_executable(inttest + target_link_libraries(inttest Qt5::Network Threads::Threads) + target_include_directories(inttest PUBLIC + "${PROJECT_SOURCE_DIR}/framework" ++ "${PROJECT_BINARY_DIR}" + "${GTEST_ROOT}" "${GTEST_ROOT}/include" + "${GMOCK_ROOT}" "${GMOCK_ROOT}/include") + target_compile_definitions(inttest PRIVATE +--- a/test/integration/tests/core.cpp ++++ b/test/integration/tests/core.cpp +@@ -14,9 +14,11 @@ + * limitations under the License. + */ + ++#include + #include + + #include "znctest.h" ++#include "znctestconfig.h" + + using testing::HasSubstr; + using testing::ContainsRegex; +@@ -584,10 +586,9 @@ TEST_P(AllLanguages, ServerDependentCapInModule) { + )"); + break; + case 2: +- if (QProcessEnvironment::systemEnvironment().value( +- "DISABLED_ZNC_PERL_PYTHON_TEST") == "1") { +- return; +- } ++#ifndef WANT_PYTHON ++ GTEST_SKIP() << "Modpython is disabled"; ++#endif + znc->CanLeak(); + InstallModule("testmod.py", R"( + import znc +@@ -603,10 +604,9 @@ TEST_P(AllLanguages, ServerDependentCapInModule) { + client.Write("znc loadmod modpython"); + break; + case 3: +- if (QProcessEnvironment::systemEnvironment().value( +- "DISABLED_ZNC_PERL_PYTHON_TEST") == "1") { +- return; +- } ++#ifndef WANT_PERL ++ GTEST_SKIP() << "Modperl is disabled"; ++#endif + znc->CanLeak(); + InstallModule("testmod.pm", R"( + package testmod; +--- a/test/integration/tests/scripting.cpp ++++ b/test/integration/tests/scripting.cpp +@@ -15,15 +15,15 @@ + */ + + #include "znctest.h" ++#include "znctestconfig.h" + + namespace znc_inttest { + namespace { + + TEST_F(ZNCTest, Modperl) { +- if (QProcessEnvironment::systemEnvironment().value( +- "DISABLED_ZNC_PERL_PYTHON_TEST") == "1") { +- return; +- } ++#ifndef WANT_PERL ++ GTEST_SKIP() << "Modperl is disabled"; ++#endif + auto znc = Run(); + znc->CanLeak(); + auto ircd = ConnectIRCd(); +@@ -37,10 +37,9 @@ TEST_F(ZNCTest, Modperl) { + } + + TEST_F(ZNCTest, Modpython) { +- if (QProcessEnvironment::systemEnvironment().value( +- "DISABLED_ZNC_PERL_PYTHON_TEST") == "1") { +- return; +- } ++#ifndef WANT_PYTHON ++ GTEST_SKIP() << "Modpython is disabled"; ++#endif + auto znc = Run(); + znc->CanLeak(); + auto ircd = ConnectIRCd(); +@@ -65,10 +64,9 @@ TEST_F(ZNCTest, Modpython) { + } + + TEST_F(ZNCTest, ModpythonSocket) { +- if (QProcessEnvironment::systemEnvironment().value( +- "DISABLED_ZNC_PERL_PYTHON_TEST") == "1") { +- return; +- } ++#ifndef WANT_PYTHON ++ GTEST_SKIP() << "Modpython is disabled"; ++#endif + auto znc = Run(); + znc->CanLeak(); + +@@ -107,10 +105,9 @@ TEST_F(ZNCTest, ModpythonSocket) { + } + + TEST_F(ZNCTest, ModperlSocket) { +- if (QProcessEnvironment::systemEnvironment().value( +- "DISABLED_ZNC_PERL_PYTHON_TEST") == "1") { +- return; +- } ++#ifndef WANT_PERL ++ GTEST_SKIP() << "Modperl is disabled"; ++#endif + auto znc = Run(); + znc->CanLeak(); + +@@ -160,10 +157,9 @@ TEST_F(ZNCTest, ModperlSocket) { + } + + TEST_F(ZNCTest, ModpythonVCString) { +- if (QProcessEnvironment::systemEnvironment().value( +- "DISABLED_ZNC_PERL_PYTHON_TEST") == "1") { +- return; +- } ++#ifndef WANT_PYTHON ++ GTEST_SKIP() << "Modpython is disabled"; ++#endif + auto znc = Run(); + znc->CanLeak(); + +@@ -185,10 +181,9 @@ TEST_F(ZNCTest, ModpythonVCString) { + } + + TEST_F(ZNCTest, ModperlVCString) { +- if (QProcessEnvironment::systemEnvironment().value( +- "DISABLED_ZNC_PERL_PYTHON_TEST") == "1") { +- return; +- } ++#ifndef WANT_PERL ++ GTEST_SKIP() << "Modperl is disabled"; ++#endif + auto znc = Run(); + znc->CanLeak(); + +@@ -214,10 +209,9 @@ TEST_F(ZNCTest, ModperlVCString) { + } + + TEST_F(ZNCTest, ModperlNV) { +- if (QProcessEnvironment::systemEnvironment().value( +- "DISABLED_ZNC_PERL_PYTHON_TEST") == "1") { +- return; +- } ++#ifndef WANT_PERL ++ GTEST_SKIP() << "Modperl is disabled"; ++#endif + auto znc = Run(); + znc->CanLeak(); + +@@ -244,10 +238,9 @@ TEST_F(ZNCTest, ModperlNV) { + } + + TEST_F(ZNCTest, ModpythonPackage) { +- if (QProcessEnvironment::systemEnvironment().value( +- "DISABLED_ZNC_PERL_PYTHON_TEST") == "1") { +- return; +- } ++#ifndef WANT_PYTHON ++ GTEST_SKIP() << "Modpython is disabled"; ++#endif + auto znc = Run(); + znc->CanLeak(); + +@@ -285,10 +278,12 @@ TEST_F(ZNCTest, ModpythonPackage) { + } + + TEST_F(ZNCTest, ModpythonModperl) { +- if (QProcessEnvironment::systemEnvironment().value( +- "DISABLED_ZNC_PERL_PYTHON_TEST") == "1") { +- return; +- } ++#ifndef WANT_PYTHON ++ GTEST_SKIP() << "Modpython is disabled"; ++#endif ++#ifndef WANT_PERL ++ GTEST_SKIP() << "Modperl is disabled"; ++#endif + auto znc = Run(); + znc->CanLeak(); + +@@ -302,11 +297,9 @@ TEST_F(ZNCTest, ModpythonModperl) { + } + + TEST_F(ZNCTest, ModpythonCommand) { +- if (QProcessEnvironment::systemEnvironment().value( +- "DISABLED_ZNC_PERL_PYTHON_TEST") == "1") { +- return; +- } +- ++#ifndef WANT_PYTHON ++ GTEST_SKIP() << "Modpython is disabled"; ++#endif + auto znc = Run(); + znc->CanLeak(); + +--- /dev/null ++++ b/test/integration/znctestconfig.h.cmake.in +@@ -0,0 +1,23 @@ ++/* ++ * Copyright (C) 2004-2024 ZNC, see the NOTICE file for details. ++ * ++ * Licensed under the Apache License, Version 2.0 (the "License"); ++ * you may not use this file except in compliance with the License. ++ * You may obtain a copy of the License at ++ * ++ * http://www.apache.org/licenses/LICENSE-2.0 ++ * ++ * Unless required by applicable law or agreed to in writing, software ++ * distributed under the License is distributed on an "AS IS" BASIS, ++ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ++ * See the License for the specific language governing permissions and ++ * limitations under the License. ++ */ ++ ++#ifndef ZNCTESTCONFIG_H ++#define ZNCTESTCONFIG_H ++ ++#cmakedefine WANT_PYTHON 1 ++#cmakedefine WANT_PERL 1 ++ ++#endif /* ZNCTESTCONFIG_H */ diff --git a/net-irc/znc/metadata.xml b/net-irc/znc/metadata.xml index 0f8b809bc2b3..3e24db470216 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-1.9.0.ebuild b/net-irc/znc/znc-1.9.0.ebuild new file mode 100644 index 000000000000..8efbbbf65ba6 --- /dev/null +++ b/net-irc/znc/znc-1.9.0.ebuild @@ -0,0 +1,199 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..12} ) + +inherit cmake python-single-r1 readme.gentoo-r1 systemd + +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" + +if [[ ${PV} == *9999* ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/znc/znc.git" +else + MY_PV=${PV/_/-} + MY_P=${PN}-${MY_PV} + SRC_URI=" + https://znc.in/releases/archive/${MY_P}.tar.gz + test? ( ${GTEST_URL} ) + " + KEYWORDS="~amd64 ~arm ~arm64 ~ppc64" + S=${WORKDIR}/${MY_P} +fi + +HOMEPAGE="https://znc.in" +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="+argon2 +icu nls perl python +ssl sasl tcl test +zlib" +RESTRICT="!test? ( test )" + +# tests run znc-buildmod which is a Python script +REQUIRED_USE=" + python? ( ${PYTHON_REQUIRED_USE} icu ) + test? ( ${PYTHON_REQUIRED_USE} ) +" + +# perl is a build-time dependency of modpython +BDEPEND=" + virtual/pkgconfig + nls? ( sys-devel/gettext ) + perl? ( + >=dev-lang/swig-4.0.1 + >=dev-lang/perl-5.10 + ) + python? ( + >=dev-lang/swig-4.0.1 + >=dev-lang/perl-5.10 + ) + test? ( + ${PYTHON_DEPS} + dev-qt/qtnetwork:5 + ) +" +DEPEND=" + dev-cpp/cctz:= + argon2? ( app-crypt/argon2:= ) + icu? ( dev-libs/icu:= ) + nls? ( dev-libs/boost:=[nls] ) + perl? ( >=dev-lang/perl-5.10:= ) + python? ( ${PYTHON_DEPS} ) + sasl? ( >=dev-libs/cyrus-sasl-2 ) + ssl? ( dev-libs/openssl:0= ) + tcl? ( dev-lang/tcl:0= ) + zlib? ( sys-libs/zlib:0= ) +" +RDEPEND=" + ${DEPEND} + acct-user/znc + acct-group/znc +" + +PATCHES=( + "${FILESDIR}/${PN}-1.7.1-inttest-dir.patch" + # The following patch is a backport, it can be removed during the next bump + "${FILESDIR}/${P}-skip-modperl-modpython-tests-cleaner.patch" +) + +pkg_setup() { + if use python || use test; then + python-single-r1_pkg_setup + fi +} + +src_prepare() { + # Let SWIG rebuild modperl/modpython to make user patching easier. + if [[ ${PV} != *9999* ]]; then + rm modules/modperl/generated.tar.gz || die + rm modules/modpython/generated.tar.gz || die + fi + + sed -i -e "s|DZNC_BIN_DIR:path=|DZNC_BIN_DIR:path=${T}/inttest|" \ + test/CMakeLists.txt || die + + sed -i "s|--datadir=|&${EPREFIX}|" znc.service.in || die + + cmake_src_prepare +} + +src_configure() { + local mycmakeargs=( + -DWANT_SYSTEMD=yes # Causes -DSYSTEMD_DIR to be used. + -DSYSTEMD_DIR="$(systemd_get_systemunitdir)" + -DWANT_ICU="$(usex icu)" + -DWANT_ARGON="$(usex argon2)" + -DWANT_IPV6=yes + -DWANT_I18N="$(usex nls)" + -DWANT_PERL="$(usex perl)" + -DWANT_PYTHON="$(usex python)" + -DWANT_PYTHON_VERSION="${EPYTHON#python}" + -DWANT_CYRUS="$(usex sasl)" + -DWANT_OPENSSL="$(usex ssl)" + -DWANT_TCL="$(usex tcl)" + -DWANT_ZLIB="$(usex zlib)" + ) + + if [[ ${PV} != *9999* ]] && use test; then + export GTEST_ROOT="${WORKDIR}/googletest-${GTEST_VER}/googletest" + export GMOCK_ROOT="${WORKDIR}/googletest-${GTEST_VER}/googlemock" + fi + + cmake_src_configure +} + +src_test() { + cmake_build unittest + DESTDIR="${T}/inttest" cmake_build install + local filter='-' + if ! use perl; then + filter="${filter}:ZNCTest.Modperl*" + fi + if ! use python; then + filter="${filter}:ZNCTest.Modpython*" + fi + # CMAKE_PREFIX_PATH and CXXFLAGS are needed for znc-buildmod + # invocations from inside the test + GTEST_FILTER="${filter}" ZNC_UNUSUAL_ROOT="${T}/inttest" \ + CMAKE_PREFIX_PATH="${T}/inttest/usr/share/znc/cmake" \ + CXXFLAGS="${CXXFLAGS} -isystem ${T}/inttest/usr/include" \ + cmake_build inttest +} + +src_install() { + cmake_src_install + + dodoc NOTICE + newinitd "${FILESDIR}"/znc.initd-r2 znc + newconfd "${FILESDIR}"/znc.confd-r1 znc + + local DOC_CONTENTS + # "local" has its own return value which is not what we want to catch + DOC_CONTENTS=$(<"${FILESDIR}/README.gentoo-r1") || die + local DISABLE_AUTOFORMATTING=1 + readme.gentoo_create_doc +} + +pkg_postinst() { + if [[ -d "${EROOT}/var/lib/znc/.znc/" ]]; then + eerror "${EROOT}/var/lib/znc/.znc/ exists, please move your data to ${EROOT}/var/lib/znc/" + eerror "" + eerror "The systemd unit has changed and now expects data to be located" + eerror "at the root of ${EROOT}/var/lib/znc instead of its '.znc' subfolder." + eerror "The recommended procedure to move the data is the following:" + eerror "1. stop the service: systemctl stop znc.service" + eerror "2. move the data: cp -a '${EROOT}/var/lib/znc/.znc/.' '${EROOT}/var/lib/znc/'" + eerror "3. fix the config file: sed -i 's|${EROOT}/var/lib/znc/.znc|${EROOT}/var/lib/znc|g' '${EROOT}/var/lib/znc/configs/znc.conf'" + eerror "4. restart znc: systemctl start znc.service" + eerror "5. once everything works, remove the old data directory: rm -r '${EROOT}/var/lib/znc/.znc/'" + eerror "See https://bugs.gentoo.org/743856 for details." + fi + + if [[ -z "${REPLACING_VERSIONS}" ]]; then + # This is a new installation + readme.gentoo_print_elog + fi +} + +pkg_config() { + if [[ -d "${EROOT}/var/lib/znc/configs" ]]; then + ewarn "${EROOT}/var/lib/znc/configs/ already exists," + ewarn "aborting to avoid damaging any existing configuration." + ewarn "If you are sure you want to generate a new configuration," + ewarn "remove the folder and try again." + else + einfo "Press enter to interactively create a new configuration file for znc." + einfo "To abort, press Control-C" + read + su ${PN} -p -s /bin/sh -c 'ZNC_NO_LAUNCH_AFTER_MAKECONF=1 \ + "${EROOT}"/usr/bin/znc --makeconf \ + --datadir "${EROOT}/var/lib/znc"' || die "Config failed" + einfo + einfo "You can now start the znc service using the init system of your choice." + einfo "Don't forget to enable it if you want to use znc at boot." + fi +} diff --git a/net-irc/znc/znc-9999.ebuild b/net-irc/znc/znc-9999.ebuild index c40af00c86f0..4245192ac954 100644 --- a/net-irc/znc/znc-9999.ebuild +++ b/net-irc/znc/znc-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -7,7 +7,7 @@ PYTHON_COMPAT=( python3_{10..12} ) inherit cmake python-single-r1 readme.gentoo-r1 systemd -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" @@ -21,7 +21,7 @@ else https://znc.in/releases/archive/${MY_P}.tar.gz test? ( ${GTEST_URL} ) " - KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86" + KEYWORDS="~amd64" S=${WORKDIR}/${MY_P} fi @@ -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 @@ -57,7 +57,8 @@ BDEPEND=" ) " DEPEND=" - app-crypt/argon2:= + dev-cpp/cctz:= + argon2? ( app-crypt/argon2:= ) icu? ( dev-libs/icu:= ) nls? ( dev-libs/boost:=[nls] ) perl? ( >=dev-lang/perl-5.10:= ) @@ -74,7 +75,7 @@ RDEPEND=" " PATCHES=( - "${FILESDIR}"/${PN}-1.7.1-inttest-dir.patch + "${FILESDIR}/${PN}-1.7.1-inttest-dir.patch" ) pkg_setup() { @@ -103,6 +104,7 @@ src_configure() { -DWANT_SYSTEMD=yes # Causes -DSYSTEMD_DIR to be used. -DSYSTEMD_DIR="$(systemd_get_systemunitdir)" -DWANT_ICU="$(usex icu)" + -DWANT_ARGON="$(usex argon2)" -DWANT_IPV6=yes -DWANT_I18N="$(usex nls)" -DWANT_PERL="$(usex perl)" @@ -115,8 +117,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 -- cgit v1.2.3