[gentoo-commits] repo/gentoo:master commit in: net-irc/znc/
commit: 2dbac9e223ecc064b17fc526a85b91ddc0a21e79
Author: Sam James gentoo org>
AuthorDate: Wed Jul 3 20:35:03 2024 +
Commit: Sam James gentoo org>
CommitDate: Wed Jul 3 20:35:03 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2dbac9e2
net-irc/znc: Stabilize 1.9.1 x86, #935428
Signed-off-by: Sam James gentoo.org>
net-irc/znc/znc-1.9.1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-irc/znc/znc-1.9.1.ebuild b/net-irc/znc/znc-1.9.1.ebuild
index ce0514db0499..2c7040a99a5d 100644
--- a/net-irc/znc/znc-1.9.1.ebuild
+++ b/net-irc/znc/znc-1.9.1.ebuild
@@ -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 arm arm64 ~ppc64 ~riscv x86"
S=${WORKDIR}/${MY_P}
fi
[gentoo-commits] repo/gentoo:master commit in: net-irc/znc/
commit: 42d343a8b32d1165fbf59eb4c58e85c78fbd4f77
Author: Sam James gentoo org>
AuthorDate: Wed Jul 3 20:35:00 2024 +
Commit: Sam James gentoo org>
CommitDate: Wed Jul 3 20:35:00 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=42d343a8
net-irc/znc: Stabilize 1.9.1 amd64, #935428
Signed-off-by: Sam James gentoo.org>
net-irc/znc/znc-1.9.1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-irc/znc/znc-1.9.1.ebuild b/net-irc/znc/znc-1.9.1.ebuild
index 7f7e1fc25004..ce0514db0499 100644
--- a/net-irc/znc/znc-1.9.1.ebuild
+++ b/net-irc/znc/znc-1.9.1.ebuild
@@ -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 arm arm64 ~ppc64 ~riscv ~x86"
S=${WORKDIR}/${MY_P}
fi
[gentoo-commits] repo/gentoo:master commit in: net-irc/znc/
commit: 4aea3ae61aa7298223dec79cdeb3c40ab73eb72a
Author: Sam James gentoo org>
AuthorDate: Wed Jul 3 20:32:10 2024 +
Commit: Sam James gentoo org>
CommitDate: Wed Jul 3 20:32:10 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4aea3ae6
net-irc/znc: Stabilize 1.9.1 arm64, #935428
Signed-off-by: Sam James gentoo.org>
net-irc/znc/znc-1.9.1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-irc/znc/znc-1.9.1.ebuild b/net-irc/znc/znc-1.9.1.ebuild
index 10f210f61e75..7f7e1fc25004 100644
--- a/net-irc/znc/znc-1.9.1.ebuild
+++ b/net-irc/znc/znc-1.9.1.ebuild
@@ -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 arm arm64 ~ppc64 ~riscv ~x86"
S=${WORKDIR}/${MY_P}
fi
[gentoo-commits] repo/gentoo:master commit in: net-irc/znc/
commit: c4349a8500c250ad371e81d761a06dd67a811a9a
Author: Sam James gentoo org>
AuthorDate: Wed Jul 3 20:32:09 2024 +
Commit: Sam James gentoo org>
CommitDate: Wed Jul 3 20:32:09 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c4349a85
net-irc/znc: Stabilize 1.9.1 arm, #935428
Signed-off-by: Sam James gentoo.org>
net-irc/znc/znc-1.9.1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-irc/znc/znc-1.9.1.ebuild b/net-irc/znc/znc-1.9.1.ebuild
index 019d97123dde..10f210f61e75 100644
--- a/net-irc/znc/znc-1.9.1.ebuild
+++ b/net-irc/znc/znc-1.9.1.ebuild
@@ -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 arm ~arm64 ~ppc64 ~riscv ~x86"
S=${WORKDIR}/${MY_P}
fi
[gentoo-commits] repo/gentoo:master commit in: net-irc/znc/
commit: 45b50f01229e0996103e007f68beed45194e6239
Author: Sam James gentoo org>
AuthorDate: Wed Jul 3 19:30:17 2024 +
Commit: Sam James gentoo org>
CommitDate: Wed Jul 3 19:30:17 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=45b50f01
net-irc/znc: add 1.9.1
Bug: https://bugs.gentoo.org/935422
Signed-off-by: Sam James gentoo.org>
net-irc/znc/Manifest | 1 +
net-irc/znc/znc-1.9.1.ebuild | 197 +++
2 files changed, 198 insertions(+)
diff --git a/net-irc/znc/Manifest b/net-irc/znc/Manifest
index 51254b02c536..97a5b8ade9f5 100644
--- a/net-irc/znc/Manifest
+++ b/net-irc/znc/Manifest
@@ -2,3 +2,4 @@ DIST gtest-1.14.0.tar.gz 867764 BLAKE2B
c457f55ac572b9fb1553eee3df7eeeaf1e7dd2c3
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
+DIST znc-1.9.1.tar.gz 2236498 BLAKE2B
b811939d13e45f2731f35721776e5f849078e14e785ae852cfc8ff7b1864d4ac6cae5aeba5ae01e529ffd366981f5ac8bb04f2586e60ac82af06d7af71f639db
SHA512
939eafbb2f20569d1b15b66e38b7da7a5210f2023e6fc98018566bd757d62d8ef2682d4b4e3b326a933a99cd7d9d65596ff0e2c43a2315c70e27c64f02d526a6
diff --git a/net-irc/znc/znc-1.9.1.ebuild b/net-irc/znc/znc-1.9.1.ebuild
new file mode 100644
index ..019d97123dde
--- /dev/null
+++ b/net-irc/znc/znc-1.9.1.ebuild
@@ -0,0 +1,197 @@
+# 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} == ** ]]; 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 ~riscv ~x86"
+ 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"
+)
+
+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} != ** ]]; 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
[gentoo-commits] repo/gentoo:master commit in: net-irc/znc/
commit: 4cf325dddfe2b38af18b43b6656da678fc7d8278
Author: Jakov Smolić gentoo org>
AuthorDate: Wed May 29 06:25:51 2024 +
Commit: Jakov Smolić gentoo org>
CommitDate: Wed May 29 06:25:51 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4cf325dd
net-irc/znc: Stabilize 1.9.0 x86, #933010
Signed-off-by: Jakov Smolić gentoo.org>
net-irc/znc/znc-1.9.0.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-irc/znc/znc-1.9.0.ebuild b/net-irc/znc/znc-1.9.0.ebuild
index 308d253146a5..6774979786e3 100644
--- a/net-irc/znc/znc-1.9.0.ebuild
+++ b/net-irc/znc/znc-1.9.0.ebuild
@@ -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 arm ~arm64 ~ppc64 ~riscv x86"
S=${WORKDIR}/${MY_P}
fi
[gentoo-commits] repo/gentoo:master commit in: net-irc/znc/
commit: d71e358d6af86733cae1a40f6350f8ff0e8add8f
Author: Jakov Smolić gentoo org>
AuthorDate: Wed May 29 06:25:48 2024 +
Commit: Jakov Smolić gentoo org>
CommitDate: Wed May 29 06:25:48 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d71e358d
net-irc/znc: Stabilize 1.9.0 amd64, #933010
Signed-off-by: Jakov Smolić gentoo.org>
net-irc/znc/znc-1.9.0.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-irc/znc/znc-1.9.0.ebuild b/net-irc/znc/znc-1.9.0.ebuild
index 11ecac268d53..308d253146a5 100644
--- a/net-irc/znc/znc-1.9.0.ebuild
+++ b/net-irc/znc/znc-1.9.0.ebuild
@@ -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 arm ~arm64 ~ppc64 ~riscv ~x86"
S=${WORKDIR}/${MY_P}
fi
[gentoo-commits] repo/gentoo:master commit in: net-irc/znc/
commit: 1619c00a0cf348b2315d13dbc3164c6eb6e40a7c
Author: Michał Górny gentoo org>
AuthorDate: Tue May 28 12:29:29 2024 +
Commit: Michał Górny gentoo org>
CommitDate: Tue May 28 12:29:29 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1619c00a
net-irc/znc: Stabilize 1.9.0 arm, #933010
Signed-off-by: Michał Górny gentoo.org>
net-irc/znc/znc-1.9.0.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-irc/znc/znc-1.9.0.ebuild b/net-irc/znc/znc-1.9.0.ebuild
index 6596c63a5cf0..11ecac268d53 100644
--- a/net-irc/znc/znc-1.9.0.ebuild
+++ b/net-irc/znc/znc-1.9.0.ebuild
@@ -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 arm ~arm64 ~ppc64 ~riscv ~x86"
S=${WORKDIR}/${MY_P}
fi
[gentoo-commits] repo/gentoo:master commit in: net-irc/znc-palaver/
commit: 5148ed2fe6e7bad186f876e2003dd09d79596802
Author: Conrad Kostecki gentoo org>
AuthorDate: Sun Mar 17 13:20:04 2024 +
Commit: Conrad Kostecki gentoo org>
CommitDate: Sun Mar 17 13:21:00 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5148ed2f
net-irc/znc-palaver: mask tests
Tests need network.
Closes: https://bugs.gentoo.org/926128
Signed-off-by: Conrad Kostecki gentoo.org>
net-irc/znc-palaver/znc-palaver-1.2.2.ebuild | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/net-irc/znc-palaver/znc-palaver-1.2.2.ebuild
b/net-irc/znc-palaver/znc-palaver-1.2.2.ebuild
index 8b46c97b7c03..074d0542dd7a 100644
--- a/net-irc/znc-palaver/znc-palaver-1.2.2.ebuild
+++ b/net-irc/znc-palaver/znc-palaver-1.2.2.ebuild
@@ -14,9 +14,10 @@
SRC_URI="https://github.com/cocodelabs/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
LICENSE="MIT"
SLOT="0"
KEYWORDS="amd64 x86"
-IUSE="test"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-RESTRICT="!test? ( test )"
+
+# Tests need network
+RESTRICT="test"
RDEPEND="
${PYTHON_DEPS}
[gentoo-commits] repo/gentoo:master commit in: net-irc/znc-palaver/
commit: 59ecce1836978b7cae4c515e889518a36edf8deb
Author: Conrad Kostecki gentoo org>
AuthorDate: Sat Mar 9 17:11:59 2024 +
Commit: Conrad Kostecki gentoo org>
CommitDate: Sat Mar 9 17:41:19 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=59ecce18
net-irc/znc-palaver: add python3.12 support
Signed-off-by: Conrad Kostecki gentoo.org>
net-irc/znc-palaver/znc-palaver-1.2.2.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/net-irc/znc-palaver/znc-palaver-1.2.2.ebuild
b/net-irc/znc-palaver/znc-palaver-1.2.2.ebuild
index b33f19fdfd21..8b46c97b7c03 100644
--- a/net-irc/znc-palaver/znc-palaver-1.2.2.ebuild
+++ b/net-irc/znc-palaver/znc-palaver-1.2.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..12} )
inherit python-single-r1 toolchain-funcs
[gentoo-commits] repo/gentoo:master commit in: net-irc/znc/files/, net-irc/znc/
commit: e77bccc40c96e94bac5fe1ba796f02c3f00544c2
Author: Alexey Sokolov asokolov org>
AuthorDate: Fri Jan 5 08:58:49 2024 +
Commit: Sam James gentoo org>
CommitDate: Fri Jan 5 11:35:02 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e77bccc4
net-irc/znc: fix build with dev-lang/swig-4.2.0
Closes: https://bugs.gentoo.org/921230
Signed-off-by: Alexey Sokolov asokolov.org>
Closes: https://github.com/gentoo/gentoo/pull/34654
Signed-off-by: Sam James gentoo.org>
net-irc/znc/files/znc-1.8.2-fix-swig-2.patch | 123 +++
net-irc/znc/znc-1.8.2-r2.ebuild | 3 +-
2 files changed, 125 insertions(+), 1 deletion(-)
diff --git a/net-irc/znc/files/znc-1.8.2-fix-swig-2.patch
b/net-irc/znc/files/znc-1.8.2-fix-swig-2.patch
new file mode 100644
index ..91d7f5657cbe
--- /dev/null
+++ b/net-irc/znc/files/znc-1.8.2-fix-swig-2.patch
@@ -0,0 +1,123 @@
+From 3f4c1cce77cbe1337e5642e9e0e9d048c9e07370 Mon Sep 17 00:00:00 2001
+From: Alexey Sokolov
+Date: Fri, 5 Jan 2024 02:19:55 +
+Subject: [PATCH] Fix build with SWIG 4.2.0
+
+https://bugs.gentoo.org/921230
+---
+ modules/modpython/codegen.pl | 88 ++--
+ 1 file changed, 65 insertions(+), 23 deletions(-)
+
+diff --git a/modules/modpython/codegen.pl b/modules/modpython/codegen.pl
+index 1bc09806e0..bbcb148bed 100755
+--- a/modules/modpython/codegen.pl
b/modules/modpython/codegen.pl
+@@ -50,29 +50,6 @@
+ ***/
+
+ namespace {
+-/*template
+- struct pyobj_to_ptr {
+- CString m_sType;
+- SvToPtr(const CString& sType) {
+- m_sType = sType;
+- }
+- bool operator()(PyObject* py, T** result) {
+- T* x = nullptr;
+- int res = SWIG_ConvertPtr(sv, (void**)&x,
SWIG_TypeQuery(m_sType.c_str()), 0);
+- if (SWIG_IsOK(res)) {
+- *result = x;
+- return true;
+- }
+- DEBUG("modpython: ");
+- return false;
+- }
+- };
+-
+- CModule::EModRet SvToEModRet(PyObject* py, CModule::EModRet* result) {
+- long int x = PyLong_AsLong();
+- return static_cast(SvUV(sv));
+- }*/
+-
+ inline swig_type_info* SWIG_pchar_descriptor(void) {
+ static int init = 0;
+ static swig_type_info* info = 0;
+@@ -83,6 +60,70 @@
+ return info;
+ }
+
++// SWIG 4.2.0 replaced SWIG_Python_str_AsChar with
SWIG_PyUnicode_AsUTF8AndSize.
++// SWIG doesn't provide any good way to detect SWIG version (other than
parsing
++// `swig -version`), but it also introduced SWIG_NULLPTR.
++// So let's abuse that define to do different code for new SWIG.
++#ifdef SWIG_NULLPTR
++ // This is copied from some SWIG 4.2.0 from pystrings.swg
++ inline int SWIG_AsCharPtrAndSize(PyObject *obj, char** cptr, size_t*
psize, int *alloc) {
++#if PY_VERSION_HEX>=0x0300
++#if defined(SWIG_PYTHON_STRICT_BYTE_CHAR)
++ if (PyBytes_Check(obj))
++#else
++ if (PyUnicode_Check(obj))
++#endif
++#else
++ if (PyString_Check(obj))
++#endif
++ {
++ char *cstr; Py_ssize_t len;
++ PyObject *bytes = NULL;
++ int ret = SWIG_OK;
++ if (alloc)
++ *alloc = SWIG_OLDOBJ;
++#if PY_VERSION_HEX>=0x0300 && defined(SWIG_PYTHON_STRICT_BYTE_CHAR)
++ if (PyBytes_AsStringAndSize(obj, &cstr, &len) == -1)
++ return SWIG_TypeError;
++#else
++ cstr = (char *)SWIG_PyUnicode_AsUTF8AndSize(obj, &len,
&bytes);
++ if (!cstr)
++ return SWIG_TypeError;
++ /* The returned string is only duplicated if the char *
returned is not owned and memory managed by obj */
++ if (bytes && cptr) {
++ if (alloc) {
++ //cstr = %new_copy_array(cstr, len + 1,
char);
++ cstr = (char *)memcpy((char
*)malloc((len + 1)*sizeof(char)), cstr, sizeof(char)*(len + 1));
++ *alloc = SWIG_NEWOBJ;
++ } else {
++ /* alloc must be set in order to clean
up allocated memory */
++ return SWIG_RuntimeError;
++ }
++ }
++#endif
++ if (cptr) *cptr = cstr;
++ if (psize) *psize = len + 1;
++ Py_XDECREF(bytes);
++ return ret;
++ } else
[gentoo-commits] repo/gentoo:master commit in: net-irc/znc/
commit: 8a08143250248bf5bb1b6ee20800d910aa5dd92b Author: Louis Sautier gentoo org> AuthorDate: Tue Nov 7 20:53:38 2023 + Commit: Louis Sautier gentoo org> CommitDate: Tue Nov 7 20:55:34 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8a081432 net-irc/znc: add slot specifier to argon2i dependency Signed-off-by: Louis Sautier gentoo.org> net-irc/znc/znc-.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net-irc/znc/znc-.ebuild b/net-irc/znc/znc-.ebuild index 1f2334900220..c40af00c86f0 100644 --- a/net-irc/znc/znc-.ebuild +++ b/net-irc/znc/znc-.ebuild @@ -57,7 +57,7 @@ BDEPEND=" ) " DEPEND=" - app-crypt/argon2 + app-crypt/argon2:= icu? ( dev-libs/icu:= ) nls? ( dev-libs/boost:=[nls] ) perl? ( >=dev-lang/perl-5.10:= )
[gentoo-commits] repo/gentoo:master commit in: net-irc/znc/
commit: ddb728b7158dc39af5d63ab1a4d00b803e673e24
Author: Louis Sautier gentoo org>
AuthorDate: Sun Oct 29 13:19:42 2023 +
Commit: Louis Sautier gentoo org>
CommitDate: Tue Nov 7 12:29:24 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ddb728b7
net-irc/znc: add new dependency on argon2 + enable py312
Argon2 is now used to hash passwords instead of SHA-256.
Also fix dependency on Python: it is also required to run tests because
znc-buildmod is a Python script.
Signed-off-by: Louis Sautier gentoo.org>
net-irc/znc/znc-.ebuild | 11 ---
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/net-irc/znc/znc-.ebuild b/net-irc/znc/znc-.ebuild
index a247a1966b36..1f2334900220 100644
--- a/net-irc/znc/znc-.ebuild
+++ b/net-irc/znc/znc-.ebuild
@@ -3,7 +3,7 @@
EAPI=8
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..12} )
inherit cmake python-single-r1 readme.gentoo-r1 systemd
@@ -33,7 +33,11 @@ SLOT="0/${PV}"
IUSE="+icu nls perl python +ssl sasl tcl test +zlib"
RESTRICT="!test? ( test )"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} icu )"
+# 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="
@@ -53,6 +57,7 @@ BDEPEND="
)
"
DEPEND="
+ app-crypt/argon2
icu? ( dev-libs/icu:= )
nls? ( dev-libs/boost:=[nls] )
perl? ( >=dev-lang/perl-5.10:= )
@@ -73,7 +78,7 @@ PATCHES=(
)
pkg_setup() {
- if use python; then
+ if use python || use test; then
python-single-r1_pkg_setup
fi
}
[gentoo-commits] repo/gentoo:master commit in: net-irc/znc/
commit: 8f1cce5259f44d283ce124d0ec04325cd345f94a
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Tue Mar 14 08:07:30 2023 +
Commit: Louis Sautier gentoo org>
CommitDate: Tue Mar 14 12:24:36 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8f1cce52
net-irc/znc: drop 1.8.2-r1
Closes: https://bugs.gentoo.org/893508
Signed-off-by: Andreas Sturmlechner gentoo.org>
Signed-off-by: Louis Sautier gentoo.org>
net-irc/znc/znc-1.8.2-r1.ebuild | 194
1 file changed, 194 deletions(-)
diff --git a/net-irc/znc/znc-1.8.2-r1.ebuild b/net-irc/znc/znc-1.8.2-r1.ebuild
deleted file mode 100644
index 1f40b9dfe14d..
--- a/net-irc/znc/znc-1.8.2-r1.ebuild
+++ /dev/null
@@ -1,194 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{9..10} )
-
-inherit cmake python-single-r1 readme.gentoo-r1 systemd
-
-GTEST_VER="1.8.1"
-GTEST_URL="https://github.com/google/googletest/archive/${GTEST_VER}.tar.gz ->
gtest-${GTEST_VER}.tar.gz"
-DESCRIPTION="An advanced IRC Bouncer"
-
-if [[ ${PV} == ** ]]; 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 ~riscv x86"
- 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="+ipv6 +icu nls perl python +ssl sasl tcl test +zlib"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} icu )"
-
-# perl is a build-time dependency of modpython
-BDEPEND="
- virtual/pkgconfig
- nls? ( sys-devel/gettext )
- perl? (
- >=dev-lang/swig-3.0.0
- >=dev-lang/perl-5.10
- )
- python? (
- >=dev-lang/swig-3.0.0
- >=dev-lang/perl-5.10
- )
- test? (
- ${PYTHON_DEPS}
- dev-qt/qtnetwork:5
- )
-"
-DEPEND="
- 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
- # All these are backports
- "${FILESDIR}"/${P}-fix-systemd-datadir.patch
- "${FILESDIR}"/${P}-add-libera.patch
- "${FILESDIR}"/${P}-fix-python-3.10.patch
-)
-
-pkg_setup() {
- if use python; then
- python-single-r1_pkg_setup
- fi
-}
-
-src_prepare() {
- # Let SWIG rebuild modperl/modpython to make user patching easier.
- if [[ ${PV} != ** ]]; 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_IPV6="$(usex ipv6)"
- -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} != ** ]] && use test; then
- export
GTEST_ROOT="${WORKDIR}/googletest-release-${GTEST_VER}/googletest"
- export
GMOCK_ROOT="${WORKDIR}/googletest-release-${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" \
-
[gentoo-commits] repo/gentoo:master commit in: net-irc/znc/
commit: a801ca0537b0f288d83fbda00db7a0d601b2686c
Author: Sam James gentoo org>
AuthorDate: Mon Mar 13 21:24:20 2023 +
Commit: Sam James gentoo org>
CommitDate: Mon Mar 13 21:24:20 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a801ca05
net-irc/znc: Stabilize 1.8.2-r2 amd64, #893508
Signed-off-by: Sam James gentoo.org>
net-irc/znc/znc-1.8.2-r2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-irc/znc/znc-1.8.2-r2.ebuild b/net-irc/znc/znc-1.8.2-r2.ebuild
index 2a9d9df79d3b..6b6d33d21374 100644
--- a/net-irc/znc/znc-1.8.2-r2.ebuild
+++ b/net-irc/znc/znc-1.8.2-r2.ebuild
@@ -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 arm arm64 ~ppc64 ~riscv x86"
S=${WORKDIR}/${MY_P}
fi
[gentoo-commits] repo/gentoo:master commit in: net-irc/znc/
commit: 443a95aaa182f5df6a0506a5c278c260721008d2
Author: Sam James gentoo org>
AuthorDate: Mon Mar 13 20:50:34 2023 +
Commit: Sam James gentoo org>
CommitDate: Mon Mar 13 20:50:34 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=443a95aa
net-irc/znc: Stabilize 1.8.2-r2 arm, #893508
Signed-off-by: Sam James gentoo.org>
net-irc/znc/znc-1.8.2-r2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-irc/znc/znc-1.8.2-r2.ebuild b/net-irc/znc/znc-1.8.2-r2.ebuild
index 64a4ec13d9ce..3cfa205dadca 100644
--- a/net-irc/znc/znc-1.8.2-r2.ebuild
+++ b/net-irc/znc/znc-1.8.2-r2.ebuild
@@ -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 arm arm64 ~ppc64 ~riscv ~x86"
S=${WORKDIR}/${MY_P}
fi
[gentoo-commits] repo/gentoo:master commit in: net-irc/znc/
commit: eeca770a4f7d82497c0adedb96529338bcaaf97f
Author: Sam James gentoo org>
AuthorDate: Mon Mar 13 20:50:36 2023 +
Commit: Sam James gentoo org>
CommitDate: Mon Mar 13 20:50:36 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eeca770a
net-irc/znc: Stabilize 1.8.2-r2 x86, #893508
Signed-off-by: Sam James gentoo.org>
net-irc/znc/znc-1.8.2-r2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-irc/znc/znc-1.8.2-r2.ebuild b/net-irc/znc/znc-1.8.2-r2.ebuild
index 3cfa205dadca..2a9d9df79d3b 100644
--- a/net-irc/znc/znc-1.8.2-r2.ebuild
+++ b/net-irc/znc/znc-1.8.2-r2.ebuild
@@ -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 arm arm64 ~ppc64 ~riscv x86"
S=${WORKDIR}/${MY_P}
fi
[gentoo-commits] repo/gentoo:master commit in: net-irc/znc/
commit: b37710067c706e429f6d1aee9bc1982d624ded41
Author: Arthur Zamarin gentoo org>
AuthorDate: Mon Mar 13 20:35:24 2023 +
Commit: Arthur Zamarin gentoo org>
CommitDate: Mon Mar 13 20:35:24 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b3771006
net-irc/znc: Stabilize 1.8.2-r2 arm64, #893508
Signed-off-by: Arthur Zamarin gentoo.org>
net-irc/znc/znc-1.8.2-r2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-irc/znc/znc-1.8.2-r2.ebuild b/net-irc/znc/znc-1.8.2-r2.ebuild
index 39851050e993..64a4ec13d9ce 100644
--- a/net-irc/znc/znc-1.8.2-r2.ebuild
+++ b/net-irc/znc/znc-1.8.2-r2.ebuild
@@ -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 ~arm arm64 ~ppc64 ~riscv ~x86"
S=${WORKDIR}/${MY_P}
fi
[gentoo-commits] repo/gentoo:master commit in: net-irc/znc-clientbuffer/
commit: c7c5b6c324bae021d948b91f150ed53703d0043e
Author: James Le Cuirot gentoo org>
AuthorDate: Mon Nov 28 21:20:32 2022 +
Commit: James Le Cuirot gentoo org>
CommitDate: Mon Nov 28 21:20:32 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c7c5b6c3
net-irc/znc-clientbuffer: Keyword 1.0.48-r1 for ~arm64
Tested and working.
Signed-off-by: James Le Cuirot gentoo.org>
net-irc/znc-clientbuffer/znc-clientbuffer-1.0.48-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-irc/znc-clientbuffer/znc-clientbuffer-1.0.48-r1.ebuild
b/net-irc/znc-clientbuffer/znc-clientbuffer-1.0.48-r1.ebuild
index 1575980e13a7..f88d5036124e 100644
--- a/net-irc/znc-clientbuffer/znc-clientbuffer-1.0.48-r1.ebuild
+++ b/net-irc/znc-clientbuffer/znc-clientbuffer-1.0.48-r1.ebuild
@@ -11,7 +11,7 @@
SRC_URI="https://github.com/CyberShadow/znc-clientbuffer/archive/v${PV}.tar.gz -
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
DEPEND="
net-irc/znc:="
[gentoo-commits] repo/gentoo:master commit in: net-irc/znc-palaver/files/
commit: 4a279b4b3b33e87d4c0d38c53720e0071ad94492
Author: Michael Mair-Keimberger levelnine at>
AuthorDate: Thu Nov 24 16:57:55 2022 +
Commit: Conrad Kostecki gentoo org>
CommitDate: Thu Nov 24 18:14:38 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4a279b4b
net-irc/znc-palaver: remove unused patch(es)
Signed-off-by: Michael Mair-Keimberger levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/28414
Signed-off-by: Conrad Kostecki gentoo.org>
.../files/znc-palaver-1.2.1-python310.patch| 48 --
.../files/znc-palaver-1.2.1-xunit2.patch | 23 ---
2 files changed, 71 deletions(-)
diff --git a/net-irc/znc-palaver/files/znc-palaver-1.2.1-python310.patch
b/net-irc/znc-palaver/files/znc-palaver-1.2.1-python310.patch
deleted file mode 100644
index 79e06f30a5ef..
--- a/net-irc/znc-palaver/files/znc-palaver-1.2.1-python310.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From 3d5a1a3c2a7cb3de82c618b1e70618195ec4a1e7 Mon Sep 17 00:00:00 2001
-From: Conrad Kostecki
-Date: Fri, 28 Aug 2020 23:48:23 +0200
-Subject: [PATCH] test/test_palaver.py: loop argument is deprecated
-
-DeprecationWarning: The loop argument is deprecated since Python 3.8,
-and scheduled for removal in Python 3.10.
-
-Signed-off-by: Conrad Kostecki
- test/test_palaver.py | 8
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/test/test_palaver.py b/test/test_palaver.py
-index 1b27878..d22366a 100644
a/test/test_palaver.py
-+++ b/test/test_palaver.py
-@@ -50,10 +50,10 @@ async def setUp(event_loop):
- running_as_root = os.getuid() == 0
- allow_root = ' --allow-root' if running_as_root else ''
-
--proc = await asyncio.create_subprocess_shell(f'znc -d test/fixtures
--foreground --debug{allow_root}', loop=event_loop)
-+proc = await asyncio.create_subprocess_shell(f'znc -d test/fixtures
--foreground --debug{allow_root}')
- time.sleep(31 if running_as_root else 1)
-
--(reader, writer) = await asyncio.open_connection('localhost', 6698,
loop=event_loop)
-+(reader, writer) = await asyncio.open_connection('localhost', 6698)
- writer.write(b'CAP LS 302\r\n')
-
- line = await reader.readline()
-@@ -184,7 +184,7 @@ async def connected(reader, writer):
-
- connected.called = True
-
--server = await asyncio.start_server(connected, host='127.0.0.1', port=0,
loop=event_loop)
-+server = await asyncio.start_server(connected, host='127.0.0.1', port=0)
- await asyncio.sleep(0.2)
- addr = server.sockets[0].getsockname()
- url = f'Serving on http://{addr[0]}:{addr[1]}/push'
-@@ -248,7 +248,7 @@ async def connected(reader, writer):
-
- connected.called = True
-
--server = await asyncio.start_server(connected, host='127.0.0.1', port=0,
loop=event_loop)
-+server = await asyncio.start_server(connected, host='127.0.0.1', port=0)
- await asyncio.sleep(0.2)
- addr = server.sockets[0].getsockname()
- url = f'Serving on http://{addr[0]}:{addr[1]}/push'
diff --git a/net-irc/znc-palaver/files/znc-palaver-1.2.1-xunit2.patch
b/net-irc/znc-palaver/files/znc-palaver-1.2.1-xunit2.patch
deleted file mode 100644
index ffbb2ad4543b..
--- a/net-irc/znc-palaver/files/znc-palaver-1.2.1-xunit2.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 3be5f33d76d4e34b1bc2671f7dbbc6c5fc3ccadd Mon Sep 17 00:00:00 2001
-From: Conrad Kostecki
-Date: Sat, 29 Aug 2020 00:06:53 +0200
-Subject: [PATCH] Makefile: use xunit2 as default for pytest
-
-PytestDeprecationWarning: The 'junit_family' default
-value will change to 'xunit2' in pytest 6.0.
-
-Signed-off-by: Conrad Kostecki
- Makefile | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Makefile b/Makefile
-index d5d4866..e88277e 100644
a/Makefile
-+++ b/Makefile
-@@ -30,4 +30,4 @@ test/fixtures/modules/palaver.so: palaver.so
- .PHONY: test-integration
- test-integration: test/fixtures/modules/palaver.so
- @mkdir -p test-reports
-- pytest --junitxml=test-reports/junit.xml
-+ pytest -o junit_family=xunit2 --junitxml=test-reports/junit.xml
[gentoo-commits] repo/gentoo:master commit in: net-irc/znc-palaver/
commit: 024e6cbae077bcc03122d0d966b07e37a2c32587
Author: Conrad Kostecki gentoo org>
AuthorDate: Wed Nov 23 23:43:00 2022 +
Commit: Conrad Kostecki gentoo org>
CommitDate: Wed Nov 23 23:44:53 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=024e6cba
net-irc/znc-palaver: amd64 stable
Signed-off-by: Conrad Kostecki gentoo.org>
net-irc/znc-palaver/znc-palaver-1.2.2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-irc/znc-palaver/znc-palaver-1.2.2.ebuild
b/net-irc/znc-palaver/znc-palaver-1.2.2.ebuild
index a02f04fc7453..9d6f3110de8a 100644
--- a/net-irc/znc-palaver/znc-palaver-1.2.2.ebuild
+++ b/net-irc/znc-palaver/znc-palaver-1.2.2.ebuild
@@ -13,7 +13,7 @@
SRC_URI="https://github.com/cocodelabs/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
IUSE="test"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
RESTRICT="!test? ( test )"
[gentoo-commits] repo/gentoo:master commit in: net-irc/znc-palaver/
commit: 8e3297e85b4b4a0d8221d5b164e25a7f4d5d949b
Author: Conrad Kostecki gentoo org>
AuthorDate: Wed Nov 23 23:44:01 2022 +
Commit: Conrad Kostecki gentoo org>
CommitDate: Wed Nov 23 23:44:55 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8e3297e8
net-irc/znc-palaver: drop 1.2.1-r1
Signed-off-by: Conrad Kostecki gentoo.org>
net-irc/znc-palaver/Manifest| 1 -
net-irc/znc-palaver/znc-palaver-1.2.1-r1.ebuild | 60 -
2 files changed, 61 deletions(-)
diff --git a/net-irc/znc-palaver/Manifest b/net-irc/znc-palaver/Manifest
index bff72c1e0f33..b571ecbc2f12 100644
--- a/net-irc/znc-palaver/Manifest
+++ b/net-irc/znc-palaver/Manifest
@@ -1,2 +1 @@
-DIST znc-palaver-1.2.1.tar.gz 13302 BLAKE2B
0a46e4dd93f06a2b1705d619b0960a246ebf326fe4ca1afdc152a90274984421478ff52bd942a09dffe58349477d622b2839b2e1af0cb11b5bc8c7a329d3b3a4
SHA512
0cfa4dfcebca79ed0aaa9b44c7395318782237a8752e26810686276587004ab95342f5983e6c9a74950da062c34e634d8a4bf502977289e59686eef069dca84a
DIST znc-palaver-1.2.2.tar.gz 14649 BLAKE2B
ad67bbbfc9ad293ce71669d84b7ccb3bd69f52e534662ac35c4a3ecd41fe91af2fe519f109dd2e9b9b824e5970883706a6dc7ebc89b806e74e5ad121466947f8
SHA512
b91ba7200cac393557252874293f131c83a4cea83203457e8f6f91a129d8207c16951b983e52848ce4f54750752f69765ca26b8e3f50e74da2a11138eaf2bdce
diff --git a/net-irc/znc-palaver/znc-palaver-1.2.1-r1.ebuild
b/net-irc/znc-palaver/znc-palaver-1.2.1-r1.ebuild
deleted file mode 100644
index 73185c6ac198..
--- a/net-irc/znc-palaver/znc-palaver-1.2.1-r1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit python-single-r1 toolchain-funcs
-
-DESCRIPTION="A ZNC module which provides push notifications to Palaver"
-HOMEPAGE="https://github.com/cocodelabs/znc-palaver";
-SRC_URI="https://github.com/cocodelabs/${PN}/archive/${PV}.tar.gz ->
${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="test"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
- ${PYTHON_DEPS}
- net-irc/znc:=[ssl]"
-
-BDEPEND="
- ${RDEPEND}
- $(python_gen_cond_dep '
- dev-python/pytest[${PYTHON_USEDEP}]
- dev-python/pytest-asyncio[${PYTHON_USEDEP}]
- dev-python/semantic_version[${PYTHON_USEDEP}]
- ')
-"
-
-DOCS=( "CHANGELOG.md" "README.md" )
-
-PATCHES=(
- "${FILESDIR}/${P}-python310.patch"
- "${FILESDIR}/${P}-xunit2.patch"
-)
-
-src_compile() {
- tc-export CXX
-
- # Building znc modules by 'znc-buildmod'
- # does not support multiple threads.
- emake -j1
-}
-
-src_test() {
- default
-
- emake test-integration
-}
-
-src_install() {
- insinto /usr/$(get_libdir)/znc
- doins palaver.so
-
- einstalldocs
-}
[gentoo-commits] repo/gentoo:master commit in: net-irc/znc-palaver/
commit: 5f4c55d53e6e27989881457c74b083d8bab68807
Author: Conrad Kostecki gentoo org>
AuthorDate: Wed Nov 23 23:43:24 2022 +
Commit: Conrad Kostecki gentoo org>
CommitDate: Wed Nov 23 23:44:54 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5f4c55d5
net-irc/znc-palaver: x86 stable
Signed-off-by: Conrad Kostecki gentoo.org>
net-irc/znc-palaver/znc-palaver-1.2.2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-irc/znc-palaver/znc-palaver-1.2.2.ebuild
b/net-irc/znc-palaver/znc-palaver-1.2.2.ebuild
index 9d6f3110de8a..fb325d4797bb 100644
--- a/net-irc/znc-palaver/znc-palaver-1.2.2.ebuild
+++ b/net-irc/znc-palaver/znc-palaver-1.2.2.ebuild
@@ -13,7 +13,7 @@
SRC_URI="https://github.com/cocodelabs/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
LICENSE="MIT"
SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="test"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
RESTRICT="!test? ( test )"
[gentoo-commits] repo/gentoo:master commit in: net-irc/znc/, net-irc/znc/files/
commit: 9a5aad2bf2e54dab53a598fa151baaa8dd1b1f0c
Author: Louis Sautier gentoo org>
AuthorDate: Sat Nov 5 17:15:58 2022 +
Commit: Louis Sautier gentoo org>
CommitDate: Sat Nov 5 18:35:20 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9a5aad2b
net-irc/znc: fix build with SWIG 4.1.0 and USE=perl/python
Also always enable IPv6 as it doesn't require additional dependencies
(pkgcheck warned of "UseFlagWithoutDeps").
Closes: https://bugs.gentoo.org/878587
Signed-off-by: Louis Sautier gentoo.org>
net-irc/znc/files/znc-1.8.2-fix-swig.patch | 43 ++
net-irc/znc/znc-1.8.2-r2.ebuild| 9 ---
2 files changed, 48 insertions(+), 4 deletions(-)
diff --git a/net-irc/znc/files/znc-1.8.2-fix-swig.patch
b/net-irc/znc/files/znc-1.8.2-fix-swig.patch
new file mode 100644
index ..d07d136c5940
--- /dev/null
+++ b/net-irc/znc/files/znc-1.8.2-fix-swig.patch
@@ -0,0 +1,43 @@
+From fecdd9895894b3afe903021b0843a422eb4d3308 Mon Sep 17 00:00:00 2001
+From: Alexey Sokolov
+Date: Sat, 5 Nov 2022 12:54:40 +
+Subject: [PATCH] Add support SWIG 4.1.0, drop support for < 4.0.1
+
+https://bugs.gentoo.org/878587
+---
+ CMakeLists.txt | 2 +-
+ modules/modperl/CMakeLists.txt | 1 -
+ modules/modpython/CMakeLists.txt | 1 -
+ 3 files changed, 1 insertion(+), 3 deletions(-)
+
+--- 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. "
+--- 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"
+--- 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"
diff --git a/net-irc/znc/znc-1.8.2-r2.ebuild b/net-irc/znc/znc-1.8.2-r2.ebuild
index b9d4a004fac3..885291374ae4 100644
--- a/net-irc/znc/znc-1.8.2-r2.ebuild
+++ b/net-irc/znc/znc-1.8.2-r2.ebuild
@@ -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="+ipv6 +icu nls perl python +ssl sasl tcl test +zlib"
+IUSE="+icu nls perl python +ssl sasl tcl test +zlib"
RESTRICT="!test? ( test )"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} icu )"
@@ -40,11 +40,11 @@ BDEPEND="
virtual/pkgconfig
nls? ( sys-devel/gettext )
perl? (
- >=dev-lang/swig-3.0.0
+ >=dev-lang/swig-4.0.1
>=dev-lang/perl-5.10
)
python? (
- >=dev-lang/swig-3.0.0
+ >=dev-lang/swig-4.0.1
>=dev-lang/perl-5.10
)
test? (
@@ -75,6 +75,7 @@ PATCHES=(
"${FILESDIR}"/${P}-add-libera.patch
"${FILESDIR}"/${P}-fix-python-3.10.patch
"${FILESDIR}"/${P}-fix-odr-violation.patch
+ "${FILESDIR}"/${P}-fix-swig.patch
)
pkg_setup() {
@@ -103,7 +104,7 @@ src_configure() {
-DWANT_SYSTEMD=yes # Causes -DSYSTEMD_DIR to be used.
-DSYSTEMD_DIR="$(systemd_get_systemunitdir)"
-DWANT_ICU="$(usex icu)"
- -DWANT_IPV6="$(usex ipv6)"
+ -DWANT_IPV6=yes
-DWANT_I18N="$(usex nls)"
-DWANT_PERL="$(usex perl)"
-DWANT_PYTHON="$(usex python)"
[gentoo-commits] repo/gentoo:master commit in: net-irc/znc/
commit: ff6a22cae4d6df2b3dd968e183dae735b55521bf
Author: Louis Sautier gentoo org>
AuthorDate: Sat Nov 5 17:24:17 2022 +
Commit: Louis Sautier gentoo org>
CommitDate: Sat Nov 5 18:38:03 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ff6a22ca
net-irc/znc: sync live ebuild with 1.8.2-r2
Signed-off-by: Louis Sautier gentoo.org>
net-irc/znc/znc-.ebuild | 10 +-
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/net-irc/znc/znc-.ebuild b/net-irc/znc/znc-.ebuild
index fc85afa7b5a1..39f23a0ebbd1 100644
--- a/net-irc/znc/znc-.ebuild
+++ b/net-irc/znc/znc-.ebuild
@@ -21,7 +21,7 @@ else
https://znc.in/releases/archive/${MY_P}.tar.gz
test? ( ${GTEST_URL} )
"
- KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+ KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
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="+ipv6 +icu nls perl python +ssl sasl tcl test +zlib"
+IUSE="+icu nls perl python +ssl sasl tcl test +zlib"
RESTRICT="!test? ( test )"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} icu )"
@@ -40,11 +40,11 @@ BDEPEND="
virtual/pkgconfig
nls? ( sys-devel/gettext )
perl? (
- >=dev-lang/swig-3.0.0
+ >=dev-lang/swig-4.0.1
>=dev-lang/perl-5.10
)
python? (
- >=dev-lang/swig-3.0.0
+ >=dev-lang/swig-4.0.1
>=dev-lang/perl-5.10
)
test? (
@@ -98,7 +98,7 @@ src_configure() {
-DWANT_SYSTEMD=yes # Causes -DSYSTEMD_DIR to be used.
-DSYSTEMD_DIR="$(systemd_get_systemunitdir)"
-DWANT_ICU="$(usex icu)"
- -DWANT_IPV6="$(usex ipv6)"
+ -DWANT_IPV6=yes
-DWANT_I18N="$(usex nls)"
-DWANT_PERL="$(usex perl)"
-DWANT_PYTHON="$(usex python)"
[gentoo-commits] repo/gentoo:master commit in: net-irc/znc-palaver/
commit: 8895d3752009bcdaa286b2a75f2926c161ed64b1
Author: Conrad Kostecki gentoo org>
AuthorDate: Fri Oct 21 22:02:51 2022 +
Commit: Conrad Kostecki gentoo org>
CommitDate: Fri Oct 21 22:02:51 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8895d375
net-irc/znc-palaver: add 1.2.2
Signed-off-by: Conrad Kostecki gentoo.org>
net-irc/znc-palaver/Manifest | 1 +
net-irc/znc-palaver/znc-palaver-1.2.2.ebuild | 55
2 files changed, 56 insertions(+)
diff --git a/net-irc/znc-palaver/Manifest b/net-irc/znc-palaver/Manifest
index b1dc595c2cc7..bff72c1e0f33 100644
--- a/net-irc/znc-palaver/Manifest
+++ b/net-irc/znc-palaver/Manifest
@@ -1 +1,2 @@
DIST znc-palaver-1.2.1.tar.gz 13302 BLAKE2B
0a46e4dd93f06a2b1705d619b0960a246ebf326fe4ca1afdc152a90274984421478ff52bd942a09dffe58349477d622b2839b2e1af0cb11b5bc8c7a329d3b3a4
SHA512
0cfa4dfcebca79ed0aaa9b44c7395318782237a8752e26810686276587004ab95342f5983e6c9a74950da062c34e634d8a4bf502977289e59686eef069dca84a
+DIST znc-palaver-1.2.2.tar.gz 14649 BLAKE2B
ad67bbbfc9ad293ce71669d84b7ccb3bd69f52e534662ac35c4a3ecd41fe91af2fe519f109dd2e9b9b824e5970883706a6dc7ebc89b806e74e5ad121466947f8
SHA512
b91ba7200cac393557252874293f131c83a4cea83203457e8f6f91a129d8207c16951b983e52848ce4f54750752f69765ca26b8e3f50e74da2a11138eaf2bdce
diff --git a/net-irc/znc-palaver/znc-palaver-1.2.2.ebuild
b/net-irc/znc-palaver/znc-palaver-1.2.2.ebuild
new file mode 100644
index ..a02f04fc7453
--- /dev/null
+++ b/net-irc/znc-palaver/znc-palaver-1.2.2.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit python-single-r1 toolchain-funcs
+
+DESCRIPTION="A ZNC module which provides push notifications to Palaver"
+HOMEPAGE="https://github.com/cocodelabs/znc-palaver";
+SRC_URI="https://github.com/cocodelabs/${PN}/archive/${PV}.tar.gz ->
${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ ${PYTHON_DEPS}
+ net-irc/znc:=[ssl]"
+
+BDEPEND="
+ ${RDEPEND}
+ $(python_gen_cond_dep '
+ dev-python/pytest[${PYTHON_USEDEP}]
+ dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+ dev-python/semantic_version[${PYTHON_USEDEP}]
+ ')
+"
+
+DOCS=( "CHANGELOG.md" "README.md" )
+
+src_compile() {
+ tc-export CXX
+
+ # Building znc modules by 'znc-buildmod'
+ # does not support multiple threads.
+ emake -j1
+}
+
+src_test() {
+ default
+
+ emake test-integration
+}
+
+src_install() {
+ insinto /usr/$(get_libdir)/znc
+ doins palaver.so
+
+ einstalldocs
+}
[gentoo-commits] repo/gentoo:master commit in: net-irc/znc-clientbuffer/
commit: 533b6b4b99a8f45d1d62b8eb9bf35172219e01b7
Author: Sam James gentoo org>
AuthorDate: Fri Sep 30 23:11:26 2022 +
Commit: Sam James gentoo org>
CommitDate: Fri Sep 30 23:24:24 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=533b6b4b
net-irc/znc-clientbuffer: fix StaticSrcUri
Signed-off-by: Sam James gentoo.org>
net-irc/znc-clientbuffer/znc-clientbuffer-1.0.48.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-irc/znc-clientbuffer/znc-clientbuffer-1.0.48.ebuild
b/net-irc/znc-clientbuffer/znc-clientbuffer-1.0.48.ebuild
index 2491cc61317b..217f9c0703cc 100644
--- a/net-irc/znc-clientbuffer/znc-clientbuffer-1.0.48.ebuild
+++ b/net-irc/znc-clientbuffer/znc-clientbuffer-1.0.48.ebuild
@@ -5,7 +5,7 @@ EAPI=7
DESCRIPTION="A ZNC module which provides client specific buffers"
HOMEPAGE="https://github.com/CyberShadow/znc-clientbuffer";
-SRC_URI="https://github.com/CyberShadow/znc-clientbuffer/archive/v1.0.48.tar.gz
-> ${P}.tar.gz"
+SRC_URI="https://github.com/CyberShadow/znc-clientbuffer/archive/v${PV}.tar.gz
-> ${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
[gentoo-commits] repo/gentoo:master commit in: net-irc/znc/
commit: 6a3b1f0b4a9b1a8ddb3075d299a6a3286517455b
Author: Arthur Zamarin gentoo org>
AuthorDate: Tue Aug 23 18:36:29 2022 +
Commit: Arthur Zamarin gentoo org>
CommitDate: Tue Aug 23 18:36:29 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6a3b1f0b
net-irc/znc: Keyword 1.8.2-r2 ppc64, #866189
Signed-off-by: Arthur Zamarin gentoo.org>
net-irc/znc/znc-1.8.2-r2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-irc/znc/znc-1.8.2-r2.ebuild b/net-irc/znc/znc-1.8.2-r2.ebuild
index fab250986d5e..b9d4a004fac3 100644
--- a/net-irc/znc/znc-1.8.2-r2.ebuild
+++ b/net-irc/znc/znc-1.8.2-r2.ebuild
@@ -21,7 +21,7 @@ else
https://znc.in/releases/archive/${MY_P}.tar.gz
test? ( ${GTEST_URL} )
"
- KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+ KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
S=${WORKDIR}/${MY_P}
fi
[gentoo-commits] repo/gentoo:master commit in: net-irc/znc/
commit: da03374202ee2271360c87bb10e896f8d344c9c3
Author: Louis Sautier gentoo org>
AuthorDate: Sun Aug 7 15:55:50 2022 +
Commit: Louis Sautier gentoo org>
CommitDate: Sun Aug 7 16:00:12 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=da033742
net-irc/znc: drop 1.8.2
Signed-off-by: Louis Sautier gentoo.org>
net-irc/znc/znc-1.8.2.ebuild | 181 ---
1 file changed, 181 deletions(-)
diff --git a/net-irc/znc/znc-1.8.2.ebuild b/net-irc/znc/znc-1.8.2.ebuild
deleted file mode 100644
index 8993eb8037d9..
--- a/net-irc/znc/znc-1.8.2.ebuild
+++ /dev/null
@@ -1,181 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-inherit cmake python-single-r1 readme.gentoo-r1 systemd
-
-GTEST_VER="1.8.1"
-GTEST_URL="https://github.com/google/googletest/archive/${GTEST_VER}.tar.gz ->
gtest-${GTEST_VER}.tar.gz"
-DESCRIPTION="An advanced IRC Bouncer"
-
-if [[ ${PV} == ** ]]; then
- inherit git-r3
- EGIT_REPO_URI=${EGIT_REPO_URI:-"https://github.com/znc/znc.git"}
- SRC_URI=""
-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 x86"
- 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="+ipv6 +icu nls perl python +ssl sasl tcl test +zlib"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} icu )"
-
-DEPEND="
- 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
-"
-BDEPEND="
- virtual/pkgconfig
- nls? ( sys-devel/gettext )
- perl? (
- >=dev-lang/swig-3.0.0
- >=dev-lang/perl-5.10
- )
- python? (
- >=dev-lang/swig-3.0.0
- >=dev-lang/perl-5.10
- )
- test? (
- ${PYTHON_DEPS}
- dev-qt/qtnetwork:5
- )
-"
-
-PATCHES=( "${FILESDIR}"/${PN}-1.7.1-inttest-dir.patch )
-
-pkg_setup() {
- if use python; then
- python-single-r1_pkg_setup
- fi
-}
-
-src_prepare() {
- # Let SWIG rebuild modperl/modpython to make user patching easier.
- if [[ ${PV} != ** ]]; 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
-
- 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_IPV6="$(usex ipv6)"
- -DWANT_I18N="$(usex nls)"
- -DWANT_PERL="$(usex perl)"
- -DWANT_PYTHON="$(usex python)"
- -DWANT_CYRUS="$(usex sasl)"
- -DWANT_OPENSSL="$(usex ssl)"
- -DWANT_TCL="$(usex tcl)"
- -DWANT_ZLIB="$(usex zlib)"
- )
-
- if [[ ${PV} != ** ]] && use test; then
- export
GTEST_ROOT="${WORKDIR}/googletest-release-${GTEST_VER}/googletest"
- export
GMOCK_ROOT="${WORKDIR}/googletest-release-${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
-
- DOC_CONTENTS=$(<"${FILESDIR}/README.gentoo-r1") || die
- DISABLE_AUTOFORMATTING=1
- readme.gentoo_create_doc
-}
-
-pkg_postinst() {
- if [[ -z "${REP
[gentoo-commits] repo/gentoo:master commit in: net-irc/znc/
commit: b820f2afc2b1fb551ea4443569ad123c0a1cbec6
Author: Louis Sautier gentoo org>
AuthorDate: Sun Aug 7 15:55:20 2022 +
Commit: Louis Sautier gentoo org>
CommitDate: Sun Aug 7 16:00:12 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b820f2af
net-irc/znc: update EAPI 7 -> 8, add Python 3.11
Signed-off-by: Louis Sautier gentoo.org>
net-irc/znc/znc-.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/net-irc/znc/znc-.ebuild b/net-irc/znc/znc-.ebuild
index 018091f6423e..fc85afa7b5a1 100644
--- a/net-irc/znc/znc-.ebuild
+++ b/net-irc/znc/znc-.ebuild
@@ -1,9 +1,9 @@
# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
inherit cmake python-single-r1 readme.gentoo-r1 systemd
[gentoo-commits] repo/gentoo:master commit in: net-irc/znc/, net-irc/znc/files/
commit: 7dd0463d8d7d3a9b80c6a702e8ad561de31db674
Author: Louis Sautier gentoo org>
AuthorDate: Sun Aug 7 15:51:33 2022 +
Commit: Louis Sautier gentoo org>
CommitDate: Sun Aug 7 16:00:12 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7dd0463d
net-irc/znc: fix build with -Werror=odr, add py3.11, EAPI 8
Closes: https://bugs.gentoo.org/861470
Signed-off-by: Louis Sautier gentoo.org>
.../znc/files/znc-1.8.2-fix-odr-violation.patch| 56 ++
net-irc/znc/znc-1.8.2-r2.ebuild| 195 +
2 files changed, 251 insertions(+)
diff --git a/net-irc/znc/files/znc-1.8.2-fix-odr-violation.patch
b/net-irc/znc/files/znc-1.8.2-fix-odr-violation.patch
new file mode 100644
index ..967d6e35c2ea
--- /dev/null
+++ b/net-irc/znc/files/znc-1.8.2-fix-odr-violation.patch
@@ -0,0 +1,56 @@
+From 3e45b2f35f194100ec3293c7f3e36f95f48b0cb8 Mon Sep 17 00:00:00 2001
+From: Uli Schlachter
+Date: Fri, 5 Aug 2022 16:12:40 +0200
+Subject: [PATCH] Fix an ODR violation
+
+Building with CFLAGS="-flto -Werror=odr -Werror=lto-type-mismatch
+-Werror=strict-aliasing" CXXFLAGS="-flto -Werror=odr
+-Werror=lto-type-mismatch -Werror=strict-aliasing" LDFLAGS=-flto fails
+due to a violation of the one definition rule. There are two different
+definitions of TOption that are both linked into the znc binary.
+
+Fix this by putting them into anonymous namespaces.
+
+Fixes: https://github.com/znc/znc/issues/1834
+Signed-off-by: Uli Schlachter
+---
+ src/IRCNetwork.cpp | 2 ++
+ src/User.cpp | 2 ++
+ 2 files changed, 4 insertions(+)
+
+diff --git a/src/IRCNetwork.cpp b/src/IRCNetwork.cpp
+index 46a2481a49..99f9242907 100644
+--- a/src/IRCNetwork.cpp
b/src/IRCNetwork.cpp
+@@ -363,11 +363,13 @@ CString CIRCNetwork::GetNetworkPath() const {
+ return sNetworkPath;
+ }
+
++namespace {
+ template
+ struct TOption {
+ const char* name;
+ void (CIRCNetwork::*pSetter)(T);
+ };
++}
+
+ bool CIRCNetwork::ParseConfig(CConfig* pConfig, CString& sError,
+ bool bUpgrade) {
+diff --git a/src/User.cpp b/src/User.cpp
+index 2ab5fac66f..16624adbbe 100644
+--- a/src/User.cpp
b/src/User.cpp
+@@ -135,11 +135,13 @@ CUser::~CUser() {
+ CZNC::Get().AddBytesWritten(m_uBytesWritten);
+ }
+
++namespace {
+ template
+ struct TOption {
+ const char* name;
+ void (CUser::*pSetter)(T);
+ };
++}
+
+ bool CUser::ParseConfig(CConfig* pConfig, CString& sError) {
+ TOption StringOptions[] = {
diff --git a/net-irc/znc/znc-1.8.2-r2.ebuild b/net-irc/znc/znc-1.8.2-r2.ebuild
new file mode 100644
index ..fab250986d5e
--- /dev/null
+++ b/net-irc/znc/znc-1.8.2-r2.ebuild
@@ -0,0 +1,195 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit cmake python-single-r1 readme.gentoo-r1 systemd
+
+GTEST_VER="1.8.1"
+GTEST_URL="https://github.com/google/googletest/archive/${GTEST_VER}.tar.gz ->
gtest-${GTEST_VER}.tar.gz"
+DESCRIPTION="An advanced IRC Bouncer"
+
+if [[ ${PV} == ** ]]; 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 ~riscv ~x86"
+ 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="+ipv6 +icu nls perl python +ssl sasl tcl test +zlib"
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} icu )"
+
+# perl is a build-time dependency of modpython
+BDEPEND="
+ virtual/pkgconfig
+ nls? ( sys-devel/gettext )
+ perl? (
+ >=dev-lang/swig-3.0.0
+ >=dev-lang/perl-5.10
+ )
+ python? (
+ >=dev-lang/swig-3.0.0
+ >=dev-lang/perl-5.10
+ )
+ test? (
+ ${PYTHON_DEPS}
+ dev-qt/qtnetwork:5
+ )
+"
+DEPEND="
+ 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
+ # All these are backports
+ "${FILESDIR}"/${P}-fix-systemd-datadir.patch
+ "${FILESDIR}"/${P}-add-libera.patch
+ "${FILESDIR}"/${P}-fix-python-3.10.patch
+ "${FILESDIR}"/${P}-fix-odr-violation.patch
+)
+
+pkg_setup() {
+ if use python; then
+ py
[gentoo-commits] repo/gentoo:master commit in: net-irc/znc-clientbuffer/
commit: 1ae162314922d77e47b167e349d2e47aa5f1a671
Author: Thomas Bracht Laumann Jespersen laumann xyz>
AuthorDate: Wed Jun 8 20:11:54 2022 +
Commit: Sam James gentoo org>
CommitDate: Thu Jun 16 16:30:39 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1ae16231
net-irc/znc-clientbuffer: fix unquoted variables
Signed-off-by: Thomas Bracht Laumann Jespersen laumann.xyz>
Signed-off-by: Sam James gentoo.org>
net-irc/znc-clientbuffer/znc-clientbuffer-1.0.48.ebuild | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/net-irc/znc-clientbuffer/znc-clientbuffer-1.0.48.ebuild
b/net-irc/znc-clientbuffer/znc-clientbuffer-1.0.48.ebuild
index 7ad332d77a02..2491cc61317b 100644
--- a/net-irc/znc-clientbuffer/znc-clientbuffer-1.0.48.ebuild
+++ b/net-irc/znc-clientbuffer/znc-clientbuffer-1.0.48.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020 Gentoo Authors
+# Copyright 2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -21,7 +21,7 @@ DOCS=( README.md )
_emake() {
emake \
-j1 \
- PREFIX=${EPREFIX}/usr \
+ PREFIX="${EPREFIX}"/usr \
LIBDIR=/$(get_libdir) \
"$@"
}
@@ -31,7 +31,7 @@ src_compile() {
}
src_install() {
- _emake DESTDIR=${ED} install
+ _emake DESTDIR="${ED}" install
einstalldocs
}
[gentoo-commits] repo/gentoo:master commit in: net-irc/znc-clientbuffer/, net-irc/znc-clientbuffer/files/
commit: 73ecc6c24d708bbc8c0c72e5fb4e77e10b72fe47
Author: Adrian Schollmeyer nexadn de>
AuthorDate: Sun Jun 5 12:38:39 2022 +
Commit: Sam James gentoo org>
CommitDate: Sun Jun 12 00:48:28 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=73ecc6c2
net-irc/znc-clientbuffer: QA fixes; adopt
- Add myself as a maintainer
- Migrate to cmake.eclass
Removes the implicit dependency on Python (due to znc-buildmod) and
allows for more flexible options during building.
- Use PV in SRC_URI
Previous SRC_URI had the version hard-coded, although it's equal to PV.
- update EAPI 7 -> 8
- Remove unneded DOCS
The default DOCS doesn't need to be modified for the docs to be
installed as expected.
Signed-off-by: Adrian Schollmeyer nexadn.de>
Closes: https://github.com/gentoo/gentoo/pull/25768
Signed-off-by: Sam James gentoo.org>
net-irc/znc-clientbuffer/files/CMakeLists.txt | 8 +
net-irc/znc-clientbuffer/metadata.xml | 9 +-
.../znc-clientbuffer-1.0.48-r1.ebuild | 35 ++
3 files changed, 51 insertions(+), 1 deletion(-)
diff --git a/net-irc/znc-clientbuffer/files/CMakeLists.txt
b/net-irc/znc-clientbuffer/files/CMakeLists.txt
new file mode 100644
index ..92048a07b19d
--- /dev/null
+++ b/net-irc/znc-clientbuffer/files/CMakeLists.txt
@@ -0,0 +1,8 @@
+# Autogenerated using znc-buildmod -v from net-irc/znc-1.8.2
+cmake_minimum_required(VERSION 3.1)
+project(ExternalModules LANGUAGES CXX)
+find_package(ZNC HINTS /usr/share/znc REQUIRED)
+
+add_library(module_clientbuffer MODULE clientbuffer.cpp)
+znc_setup_module(TARGET module_clientbuffer NAME clientbuffer)
+target_link_libraries(module_clientbuffer PRIVATE)
diff --git a/net-irc/znc-clientbuffer/metadata.xml
b/net-irc/znc-clientbuffer/metadata.xml
index 51ac8d02eab7..8cca526cf091 100644
--- a/net-irc/znc-clientbuffer/metadata.xml
+++ b/net-irc/znc-clientbuffer/metadata.xml
@@ -1,7 +1,14 @@
https://www.gentoo.org/dtd/metadata.dtd";>
-
+
+ nex+b-...@nexadn.de
+ Adrian Schollmeyer
+
+
+ proxy-ma...@gentoo.org
+ Proxy Maintainers
+
https://git.jordanko.ch/Igloo/Push/issues
CyberShadow/znc-clientbuffer
diff --git a/net-irc/znc-clientbuffer/znc-clientbuffer-1.0.48-r1.ebuild
b/net-irc/znc-clientbuffer/znc-clientbuffer-1.0.48-r1.ebuild
new file mode 100644
index ..1575980e13a7
--- /dev/null
+++ b/net-irc/znc-clientbuffer/znc-clientbuffer-1.0.48-r1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="A ZNC module which provides client specific buffers"
+HOMEPAGE="https://github.com/CyberShadow/znc-clientbuffer";
+SRC_URI="https://github.com/CyberShadow/znc-clientbuffer/archive/v${PV}.tar.gz
-> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="
+ net-irc/znc:="
+
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+ cp -v "${FILESDIR}/CMakeLists.txt" "${S}" || die
+ cmake_src_prepare
+}
+
+src_compile() {
+ cmake_src_compile
+}
+
+src_install() {
+ exeinto /usr/$(get_libdir)/znc
+ doexe "${BUILD_DIR}"/clientbuffer.so
+
+ einstalldocs
+}
[gentoo-commits] repo/gentoo:master commit in: net-irc/znc/
commit: 47320e7713f9eef4aea1568ed342b74676acb605
Author: Jakov Smolić gentoo org>
AuthorDate: Mon Jun 6 11:02:03 2022 +
Commit: Jakov Smolić gentoo org>
CommitDate: Mon Jun 6 11:02:03 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=47320e77
net-irc/znc: Stabilize 1.8.2-r1 amd64, #848585
Signed-off-by: Jakov Smolić gentoo.org>
net-irc/znc/znc-1.8.2-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-irc/znc/znc-1.8.2-r1.ebuild b/net-irc/znc/znc-1.8.2-r1.ebuild
index a8fd4c2c3330..a3b29fce9948 100644
--- a/net-irc/znc/znc-1.8.2-r1.ebuild
+++ b/net-irc/znc/znc-1.8.2-r1.ebuild
@@ -21,7 +21,7 @@ else
https://znc.in/releases/archive/${MY_P}.tar.gz
test? ( ${GTEST_URL} )
"
- KEYWORDS="~amd64 arm arm64 ~riscv x86"
+ KEYWORDS="amd64 arm arm64 ~riscv x86"
S=${WORKDIR}/${MY_P}
fi
[gentoo-commits] repo/gentoo:master commit in: net-irc/znc/
commit: 0a69cd7a8868521782e67c8c5ec30ddd6508dd85
Author: Jakov Smolić gentoo org>
AuthorDate: Mon Jun 6 11:01:54 2022 +
Commit: Jakov Smolić gentoo org>
CommitDate: Mon Jun 6 11:01:54 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0a69cd7a
net-irc/znc: Stabilize 1.8.2-r1 x86, #848585
Signed-off-by: Jakov Smolić gentoo.org>
net-irc/znc/znc-1.8.2-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-irc/znc/znc-1.8.2-r1.ebuild b/net-irc/znc/znc-1.8.2-r1.ebuild
index d39c9f614a45..a8fd4c2c3330 100644
--- a/net-irc/znc/znc-1.8.2-r1.ebuild
+++ b/net-irc/znc/znc-1.8.2-r1.ebuild
@@ -21,7 +21,7 @@ else
https://znc.in/releases/archive/${MY_P}.tar.gz
test? ( ${GTEST_URL} )
"
- KEYWORDS="~amd64 arm arm64 ~riscv ~x86"
+ KEYWORDS="~amd64 arm arm64 ~riscv x86"
S=${WORKDIR}/${MY_P}
fi
[gentoo-commits] repo/gentoo:master commit in: net-irc/znc/
commit: 626786fb3efd74f5c9c7a1a966c75bc6f6a08477
Author: Jakov Smolić gentoo org>
AuthorDate: Mon Jun 6 09:32:14 2022 +
Commit: Jakov Smolić gentoo org>
CommitDate: Mon Jun 6 09:32:14 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=626786fb
net-irc/znc: Stabilize 1.8.2-r1 arm, #848585
Signed-off-by: Jakov Smolić gentoo.org>
net-irc/znc/znc-1.8.2-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-irc/znc/znc-1.8.2-r1.ebuild b/net-irc/znc/znc-1.8.2-r1.ebuild
index 31c146f6c7a7..d39c9f614a45 100644
--- a/net-irc/znc/znc-1.8.2-r1.ebuild
+++ b/net-irc/znc/znc-1.8.2-r1.ebuild
@@ -21,7 +21,7 @@ else
https://znc.in/releases/archive/${MY_P}.tar.gz
test? ( ${GTEST_URL} )
"
- KEYWORDS="~amd64 ~arm arm64 ~riscv ~x86"
+ KEYWORDS="~amd64 arm arm64 ~riscv ~x86"
S=${WORKDIR}/${MY_P}
fi
[gentoo-commits] repo/gentoo:master commit in: net-irc/znc/
commit: 5d2186770b02ec89a954b9d0e65d68986e65a90b
Author: Jakov Smolić gentoo org>
AuthorDate: Mon Jun 6 06:53:13 2022 +
Commit: Jakov Smolić gentoo org>
CommitDate: Mon Jun 6 06:53:13 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5d218677
net-irc/znc: Stabilize 1.8.2-r1 arm64, #848585
Signed-off-by: Jakov Smolić gentoo.org>
net-irc/znc/znc-1.8.2-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-irc/znc/znc-1.8.2-r1.ebuild b/net-irc/znc/znc-1.8.2-r1.ebuild
index 7bd58f59e5b0..31c146f6c7a7 100644
--- a/net-irc/znc/znc-1.8.2-r1.ebuild
+++ b/net-irc/znc/znc-1.8.2-r1.ebuild
@@ -21,7 +21,7 @@ else
https://znc.in/releases/archive/${MY_P}.tar.gz
test? ( ${GTEST_URL} )
"
- KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+ KEYWORDS="~amd64 ~arm arm64 ~riscv ~x86"
S=${WORKDIR}/${MY_P}
fi
[gentoo-commits] repo/gentoo:master commit in: net-irc/znc/
commit: 5e378f84c7ac7eeb88b87ec64f9a6180a4152b4f
Author: Yixun Lan gentoo org>
AuthorDate: Thu Apr 28 08:42:47 2022 +
Commit: Yixun Lan gentoo org>
CommitDate: Thu Apr 28 08:42:47 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5e378f84
net-irc/znc: forward keywords to live ebuild
try to keep regular version sync to live one
Signed-off-by: Yixun Lan gentoo.org>
net-irc/znc/znc-.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/net-irc/znc/znc-.ebuild b/net-irc/znc/znc-.ebuild
index d00dd9757dd2..018091f6423e 100644
--- a/net-irc/znc/znc-.ebuild
+++ b/net-irc/znc/znc-.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -21,7 +21,7 @@ else
https://znc.in/releases/archive/${MY_P}.tar.gz
test? ( ${GTEST_URL} )
"
- KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+ KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
S=${WORKDIR}/${MY_P}
fi
[gentoo-commits] repo/gentoo:master commit in: net-irc/znc/
commit: 3cfdd526001ae567c9e5371ce39f22e77ced6289
Author: Yixun Lan gentoo org>
AuthorDate: Thu Apr 28 08:38:17 2022 +
Commit: Yixun Lan gentoo org>
CommitDate: Thu Apr 28 08:38:40 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3cfdd526
net-irc/znc: Keyword 1.8.2-r1 riscv, #841377
Signed-off-by: Yixun Lan gentoo.org>
net-irc/znc/znc-1.8.2-r1.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/net-irc/znc/znc-1.8.2-r1.ebuild b/net-irc/znc/znc-1.8.2-r1.ebuild
index 396026d8980b..7bd58f59e5b0 100644
--- a/net-irc/znc/znc-1.8.2-r1.ebuild
+++ b/net-irc/znc/znc-1.8.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -21,7 +21,7 @@ else
https://znc.in/releases/archive/${MY_P}.tar.gz
test? ( ${GTEST_URL} )
"
- KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+ KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
S=${WORKDIR}/${MY_P}
fi
[gentoo-commits] repo/gentoo:master commit in: net-irc/znc/files/
commit: e4bc068f905f39108da4c40fb210cea20ba3e25f Author: Louis Sautier gentoo org> AuthorDate: Sat Jan 8 01:57:52 2022 + Commit: Louis Sautier gentoo org> CommitDate: Sat Jan 8 01:59:44 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e4bc068f net-irc/znc: display qualified package name in README Signed-off-by: Louis Sautier gentoo.org> net-irc/znc/files/README.gentoo-r1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net-irc/znc/files/README.gentoo-r1 b/net-irc/znc/files/README.gentoo-r1 index 1812383beb29..8fa94e2f0775 100644 --- a/net-irc/znc/files/README.gentoo-r1 +++ b/net-irc/znc/files/README.gentoo-r1 @@ -1,6 +1,6 @@ To run znc as a user, run 'znc --makeconf' to create a configuration file. -To configure the system-wide daemon, you may run 'emerge --config znc'. +To configure the system-wide daemon, you may run 'emerge --config net-irc/znc'. If migrating from a user-based install, you can copy the existing configuration files:
[gentoo-commits] repo/gentoo:master commit in: net-irc/znc/, net-irc/znc/files/
commit: f302ee221545dd442429c19dd3a21545df86be63
Author: Louis Sautier gentoo org>
AuthorDate: Sun Aug 22 22:36:36 2021 +
Commit: Louis Sautier gentoo org>
CommitDate: Tue Aug 24 19:23:39 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f302ee22
net-irc/znc: fix data location on systemd, #743856, enable py3.10
Also:
* Backport a patch to replace freenode with libera.
* Adjust README.
* Remove an 8-year-old ewarn.
* Respect PYTHON_SINGLE_TARGET when building modpython.
* Fix pkg_postinst to work on systemd.
* Remove/fix some checks in pkg_postinst that became broken/unnecessary
with the swith to acct-user.
* Improve README.gentoo slightly.
Closes: https://bugs.gentoo.org/743856
Signed-off-by: Louis Sautier gentoo.org>
net-irc/znc/files/README.gentoo-r1 | 6 +-
net-irc/znc/files/znc-1.8.2-add-libera.patch | 55 ++
net-irc/znc/files/znc-1.8.2-fix-python-3.10.patch | 31
.../znc/files/znc-1.8.2-fix-systemd-datadir.patch | 23 +++
net-irc/znc/znc-1.8.2-r1.ebuild| 194 +
5 files changed, 306 insertions(+), 3 deletions(-)
diff --git a/net-irc/znc/files/README.gentoo-r1
b/net-irc/znc/files/README.gentoo-r1
index ca41e4dac26..1812383beb2 100644
--- a/net-irc/znc/files/README.gentoo-r1
+++ b/net-irc/znc/files/README.gentoo-r1
@@ -5,11 +5,11 @@ To configure the system-wide daemon, you may run 'emerge
--config znc'.
If migrating from a user-based install, you can copy the existing
configuration files:
- # mkdir /var/lib/znc
# mv /home/$USER/.znc/* /var/lib/znc
# rm -rf /home/$USER/.znc
# chown -R znc:znc /var/lib/znc
OpenRC users may also adjust the location of the files and the user running
-znc in /etc/conf.d/znc instead. Systemd users may have to overwrite the
-existing unit file.
+znc in /etc/conf.d/znc instead.
+The same thing can be achieved for systemd by overriding the existing
+unit file (systemctl edit znc.service).
diff --git a/net-irc/znc/files/znc-1.8.2-add-libera.patch
b/net-irc/znc/files/znc-1.8.2-add-libera.patch
new file mode 100644
index 000..e7015754d8c
--- /dev/null
+++ b/net-irc/znc/files/znc-1.8.2-add-libera.patch
@@ -0,0 +1,55 @@
+From 15e2351d40763acee5d246df7c725c3bd259c304 Mon Sep 17 00:00:00 2001
+From: Alexey Sokolov
+Date: Wed, 26 May 2021 10:10:20 +0100
+Subject: [PATCH] Switch --makeconf wizard from freenode to libera
+
+---
+ src/znc.cpp | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/znc.cpp b/src/znc.cpp
+index c5ad17dc69..365367545a 100644
+--- a/src/znc.cpp
b/src/znc.cpp
+@@ -778,7 +778,7 @@ bool CZNC::WriteNewConfig(const CString& sConfigFile) {
+ CUtils::PrintMessage("");
+
+ do {
+-CUtils::GetInput("Name", sNetwork, "freenode");
++CUtils::GetInput("Name", sNetwork, "libera");
+ } while (!CIRCNetwork::IsValidNetwork(sNetwork));
+
+ vsLines.push_back("\t");
+@@ -795,8 +795,8 @@ bool CZNC::WriteNewConfig(const CString& sConfigFile) {
+ bool bSSL = false;
+ unsigned int uServerPort = 0;
+
+-if (sNetwork.Equals("freenode")) {
+-sHost = "chat.freenode.net";
++if (sNetwork.Equals("libera")) {
++sHost = "irc.libera.chat";
+ #ifdef HAVE_LIBSSL
+ bSSL = true;
+ #endif
+From 688645413c258f1fe42a39e42e5b5d1dead03d71 Mon Sep 17 00:00:00 2001
+From: Alexey Sokolov
+Date: Fri, 18 Jun 2021 21:20:53 +0100
+Subject: [PATCH] Fix integration test after switch to libera
+
+---
+ test/integration/framework/znctest.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/test/integration/framework/znctest.cpp
b/test/integration/framework/znctest.cpp
+index 195b6083a9..40dae85fc2 100644
+--- a/test/integration/framework/znctest.cpp
b/test/integration/framework/znctest.cpp
+@@ -39,7 +39,7 @@ void WriteConfig(QString path) {
+ p.ReadUntil("Real name"); p.Write();
+ p.ReadUntil("Bind host"); p.Write();
+ p.ReadUntil("Set up a network?"); p.Write();
+-p.ReadUntil("Name [freenode]"); p.Write("test");
++p.ReadUntil("Name [libera]"); p.Write("test");
+ p.ReadUntil("Server host (host only)"); p.Write("127.0.0.1");
+ p.ReadUntil("Server uses SSL?");p.Write();
+ p.ReadUntil("6667");p.Write();
diff --git a/net-irc/znc/files/znc-1.8.2-fix-python-3.10.patch
b/net-irc/znc/files/znc-1.8.2-fix-python-3.10.patch
new file mode 100644
index 000..fe40d190d1b
--- /dev/null
+++ b/net-irc/znc/files/znc-1.8.2-fix-python-3.10.patch
@@ -0,0 +1,31 @@
+From e8ff16123582eb9d5c321f5c7e652335abfba368 Mon Sep 17 00:00:00 2001
+From: Alexey Sokolov
+Date: Sat, 23 May 2020 13:28:13 +0100
+Subject: [PATCH] Fix PY_SSIZE_T_CLEAN python warning
+
+---
+ .travis.yml | 2 +-
+ modules/modpython.cpp | 3 ++-
+ 2 files changed, 3 insertions(+), 2 deletions(-)
+
+diff -
[gentoo-commits] repo/gentoo:master commit in: net-irc/znc/
commit: e8f4256f6405c53c49c2b0f3725862505a512d85
Author: Louis Sautier gentoo org>
AuthorDate: Tue Aug 24 19:21:38 2021 +
Commit: Louis Sautier gentoo org>
CommitDate: Tue Aug 24 19:23:39 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e8f4256f
net-irc/znc: sync live ebuild with 1.8.2-r1
Signed-off-by: Louis Sautier gentoo.org>
net-irc/znc/znc-.ebuild | 89 +
1 file changed, 49 insertions(+), 40 deletions(-)
diff --git a/net-irc/znc/znc-.ebuild b/net-irc/znc/znc-.ebuild
index 303be815490..d00dd9757dd 100644
--- a/net-irc/znc/znc-.ebuild
+++ b/net-irc/znc/znc-.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8..10} )
inherit cmake python-single-r1 readme.gentoo-r1 systemd
@@ -13,8 +13,7 @@ DESCRIPTION="An advanced IRC Bouncer"
if [[ ${PV} == ** ]]; then
inherit git-r3
- EGIT_REPO_URI=${EGIT_REPO_URI:-"https://github.com/znc/znc.git"}
- SRC_URI=""
+ EGIT_REPO_URI="https://github.com/znc/znc.git";
else
MY_PV=${PV/_/-}
MY_P=${PN}-${MY_PV}
@@ -36,21 +35,7 @@ RESTRICT="!test? ( test )"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} icu )"
-DEPEND="
- 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
-"
+# perl is a build-time dependency of modpython
BDEPEND="
virtual/pkgconfig
nls? ( sys-devel/gettext )
@@ -67,8 +52,25 @@ BDEPEND="
dev-qt/qtnetwork:5
)
"
+DEPEND="
+ 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 )
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.7.1-inttest-dir.patch
+)
pkg_setup() {
if use python; then
@@ -86,6 +88,8 @@ src_prepare() {
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
}
@@ -98,6 +102,7 @@ src_configure() {
-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)"
@@ -137,43 +142,47 @@ src_install() {
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
- DISABLE_AUTOFORMATTING=1
+ 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
-
- if [[ -d "${EROOT}"/etc/znc ]]; then
- ewarn "${EROOT}/etc/znc exists on your system."
- ewarn "Due to the nature of the contents of that folder,"
- ewarn "we have changed the default configuration to use"
- ewarn " ${EROOT}/var/lib/znc"
- ewarn "please move $
[gentoo-commits] repo/gentoo:master commit in: net-irc/znc/
commit: 9c5e461b6a846f4f916a27acfcf22a464848f46e
Author: Louis Sautier gentoo org>
AuthorDate: Sun Aug 22 22:53:41 2021 +
Commit: Louis Sautier gentoo org>
CommitDate: Tue Aug 24 19:23:39 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9c5e461b
net-irc/znc: drop 1.8.1
Signed-off-by: Louis Sautier gentoo.org>
net-irc/znc/Manifest | 1 -
net-irc/znc/znc-1.8.1.ebuild | 179 ---
2 files changed, 180 deletions(-)
diff --git a/net-irc/znc/Manifest b/net-irc/znc/Manifest
index f9e311890fe..7216d3aa814 100644
--- a/net-irc/znc/Manifest
+++ b/net-irc/znc/Manifest
@@ -1,3 +1,2 @@
DIST gtest-1.8.1.tar.gz 992298 BLAKE2B
40ef3417fe424205c0617f07207347ce671ac87605f8ac9b8a333b0b06e3fbef9f556041ee324c18f957f3258ab9fe06704f31cdd038355fb7890180eb77ced1
SHA512
e6283c667558e1fd6e49fa96e52af0e415a3c8037afe1d28b7ff1ec4c2ef8f49beb70a9327b7fc77eb4052a58c4ccad8b5260ec90e4bceeac7a46ff59c4369d7
-DIST znc-1.8.1.tar.gz 2161359 BLAKE2B
5b9026156a62748659ae0496f9d799e7d1e0815358fa59f7538ca9d750b8f418fe8a57362b5b5bba40cfb00c2adc5fdc3eee0b56ebde50565c97d158296b827e
SHA512
87713ca05621806a399abc23f45671746578f6487561666704bb2ed1cd1863159a42ef4344eea95c9e7dc13d131b669eeabedda37e919d0bad6a05103ad80a16
DIST znc-1.8.2.tar.gz 2101215 BLAKE2B
7f0e5840fe57cc6b6549115b0fcf02e6afd3be0bf52e79da0a39bcc1463d983cbeb504bad30f3d2f7582f0295c7210d3c1eec40ec87bcc3546ba2d21a67cca9e
SHA512
e821647b50698c3a82fad039e69943e030bf644d8f8e82afa87c6c11da44761bceecddd510a7a956a1b487b1cca6ee46e8ac8818ea03127f0f1ff8f5d1a1a7f9
diff --git a/net-irc/znc/znc-1.8.1.ebuild b/net-irc/znc/znc-1.8.1.ebuild
deleted file mode 100644
index 4caac33b16d..000
--- a/net-irc/znc/znc-1.8.1.ebuild
+++ /dev/null
@@ -1,179 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-inherit cmake python-single-r1 readme.gentoo-r1 systemd
-
-GTEST_VER="1.8.1"
-GTEST_URL="https://github.com/google/googletest/archive/${GTEST_VER}.tar.gz ->
gtest-${GTEST_VER}.tar.gz"
-DESCRIPTION="An advanced IRC Bouncer"
-
-if [[ ${PV} == ** ]]; then
- inherit git-r3
- EGIT_REPO_URI=${EGIT_REPO_URI:-"https://github.com/znc/znc.git"}
- SRC_URI=""
-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 x86"
- S=${WORKDIR}/${MY_P}
-fi
-
-HOMEPAGE="https://znc.in";
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="+ipv6 +icu nls perl python +ssl sasl tcl test +zlib"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} icu )"
-
-DEPEND="
- 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
-"
-BDEPEND="
- virtual/pkgconfig
- nls? ( sys-devel/gettext )
- perl? (
- >=dev-lang/swig-3.0.0
- >=dev-lang/perl-5.10
- )
- python? (
- >=dev-lang/swig-3.0.0
- >=dev-lang/perl-5.10
- )
- test? (
- ${PYTHON_DEPS}
- dev-qt/qtnetwork:5
- )
-"
-
-PATCHES=( "${FILESDIR}"/${PN}-1.7.1-inttest-dir.patch )
-
-pkg_setup() {
- if use python; then
- python-single-r1_pkg_setup
- fi
-}
-
-src_prepare() {
- # Let SWIG rebuild modperl/modpython to make user patching easier.
- if [[ ${PV} != ** ]]; 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
-
- 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_IPV6="$(usex ipv6)"
- -DWANT_I18N="$(usex nls)"
- -DWANT_PERL="$(usex perl)"
- -DWANT_PYTHON="$(usex python)"
- -DWANT_CYRUS="$(usex sasl)"
- -DWANT_OPENSSL="$(usex ssl)"
- -DWANT_TCL="$(usex tcl)"
- -DWANT_ZLIB="$(usex zlib)"
- )
-
- if [[ ${PV} != ** ]] && use test; then
- export
GTEST_ROOT="${WORKDIR}/googletest-release-${GTEST_VER}/googletest"
- export
GMOCK_ROOT="${WORKDIR}/googletest-release-${GTEST_VER}/googlemock"
- fi
-
- cmake_src_configure
-}
-
-src_test
[gentoo-commits] repo/gentoo:master commit in: net-irc/znc-palaver/
commit: fe98fdc15b11d9812dd3adbf2bfb1d1bb5ade7aa
Author: Conrad Kostecki gentoo org>
AuthorDate: Thu Jul 1 20:50:10 2021 +
Commit: Conrad Kostecki gentoo org>
CommitDate: Thu Jul 1 21:15:40 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fe98fdc1
net-irc/znc-palaver: add python3.10 support
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Conrad Kostecki gentoo.org>
net-irc/znc-palaver/znc-palaver-1.2.1.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/net-irc/znc-palaver/znc-palaver-1.2.1.ebuild
b/net-irc/znc-palaver/znc-palaver-1.2.1.ebuild
index 7668f69d021..a39dad1cfee 100644
--- a/net-irc/znc-palaver/znc-palaver-1.2.1.ebuild
+++ b/net-irc/znc-palaver/znc-palaver-1.2.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
inherit python-single-r1 toolchain-funcs
[gentoo-commits] repo/gentoo:master commit in: net-irc/znc/
commit: 739e8f5fbea2b6f9835621c090f549dcef7ef705
Author: Louis Sautier gentoo org>
AuthorDate: Tue Jun 1 17:56:23 2021 +
Commit: Louis Sautier gentoo org>
CommitDate: Tue Jun 1 18:04:30 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=739e8f5f
net-irc/znc: fix SLOT for live ebuild
Signed-off-by: Louis Sautier gentoo.org>
net-irc/znc/znc-1.8.2.ebuild | 6 +++---
net-irc/znc/znc-.ebuild | 7 +++
2 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/net-irc/znc/znc-1.8.2.ebuild b/net-irc/znc/znc-1.8.2.ebuild
index 915c424ab54..8993eb8037d 100644
--- a/net-irc/znc/znc-1.8.2.ebuild
+++ b/net-irc/znc/znc-1.8.2.ebuild
@@ -23,14 +23,14 @@ else
test? ( ${GTEST_URL} )
"
KEYWORDS="amd64 arm arm64 x86"
- # "If you upgrade your ZNC version you must recompile all your modules."
- # - https://wiki.znc.in/Compiling_modules
- SLOT="0/${PV}"
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="+ipv6 +icu nls perl python +ssl sasl tcl test +zlib"
RESTRICT="!test? ( test )"
diff --git a/net-irc/znc/znc-.ebuild b/net-irc/znc/znc-.ebuild
index a8bc97c74b9..303be815490 100644
--- a/net-irc/znc/znc-.ebuild
+++ b/net-irc/znc/znc-.ebuild
@@ -23,15 +23,14 @@ else
test? ( ${GTEST_URL} )
"
KEYWORDS="~amd64 ~arm ~arm64 ~x86"
- # "If you upgrade your ZNC version you must recompile all your modules."
- # - https://wiki.znc.in/Compiling_modules
- SLOT="0/${PV}"
S=${WORKDIR}/${MY_P}
fi
HOMEPAGE="https://znc.in";
LICENSE="Apache-2.0"
-SLOT="0"
+# "If you upgrade your ZNC version, you must recompile all your modules."
+# - https://wiki.znc.in/Compiling_modules
+SLOT="0/${PV}"
IUSE="+ipv6 +icu nls perl python +ssl sasl tcl test +zlib"
RESTRICT="!test? ( test )"
[gentoo-commits] repo/gentoo:master commit in: net-irc/znc/
commit: aaf60c8295a55a3aa59310bf304e4b7c9d69fa7c
Author: Mikle Kolyada gentoo org>
AuthorDate: Fri Apr 30 09:47:11 2021 +
Commit: Mikle Kolyada gentoo org>
CommitDate: Fri Apr 30 09:54:52 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aaf60c82
net-irc/znc: remove libressl support
Package-Manager: Portage-3.0.18, Repoman-3.0.2
Signed-off-by: Mikle Kolyada gentoo.org>
net-irc/znc/znc-1.8.1.ebuild | 9 +++--
net-irc/znc/znc-1.8.2.ebuild | 9 +++--
net-irc/znc/znc-.ebuild | 9 +++--
3 files changed, 9 insertions(+), 18 deletions(-)
diff --git a/net-irc/znc/znc-1.8.1.ebuild b/net-irc/znc/znc-1.8.1.ebuild
index a47c2912b00..4caac33b16d 100644
--- a/net-irc/znc/znc-1.8.1.ebuild
+++ b/net-irc/znc/znc-1.8.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -29,7 +29,7 @@ fi
HOMEPAGE="https://znc.in";
LICENSE="Apache-2.0"
SLOT="0"
-IUSE="+ipv6 +icu libressl nls perl python +ssl sasl tcl test +zlib"
+IUSE="+ipv6 +icu nls perl python +ssl sasl tcl test +zlib"
RESTRICT="!test? ( test )"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} icu )"
@@ -40,10 +40,7 @@ DEPEND="
perl? ( >=dev-lang/perl-5.10:= )
python? ( ${PYTHON_DEPS} )
sasl? ( >=dev-libs/cyrus-sasl-2 )
- ssl? (
- !libressl? ( dev-libs/openssl:0= )
- libressl? ( dev-libs/libressl:0= )
- )
+ ssl? ( dev-libs/openssl:0= )
tcl? ( dev-lang/tcl:0= )
zlib? ( sys-libs/zlib:0= )
"
diff --git a/net-irc/znc/znc-1.8.2.ebuild b/net-irc/znc/znc-1.8.2.ebuild
index edd0b05a83d..915c424ab54 100644
--- a/net-irc/znc/znc-1.8.2.ebuild
+++ b/net-irc/znc/znc-1.8.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -31,7 +31,7 @@ fi
HOMEPAGE="https://znc.in";
LICENSE="Apache-2.0"
-IUSE="+ipv6 +icu libressl nls perl python +ssl sasl tcl test +zlib"
+IUSE="+ipv6 +icu nls perl python +ssl sasl tcl test +zlib"
RESTRICT="!test? ( test )"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} icu )"
@@ -42,10 +42,7 @@ DEPEND="
perl? ( >=dev-lang/perl-5.10:= )
python? ( ${PYTHON_DEPS} )
sasl? ( >=dev-libs/cyrus-sasl-2 )
- ssl? (
- !libressl? ( dev-libs/openssl:0= )
- libressl? ( dev-libs/libressl:0= )
- )
+ ssl? ( dev-libs/openssl:0= )
tcl? ( dev-lang/tcl:0= )
zlib? ( sys-libs/zlib:0= )
"
diff --git a/net-irc/znc/znc-.ebuild b/net-irc/znc/znc-.ebuild
index e407d3d52d2..a8bc97c74b9 100644
--- a/net-irc/znc/znc-.ebuild
+++ b/net-irc/znc/znc-.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -32,7 +32,7 @@ fi
HOMEPAGE="https://znc.in";
LICENSE="Apache-2.0"
SLOT="0"
-IUSE="+ipv6 +icu libressl nls perl python +ssl sasl tcl test +zlib"
+IUSE="+ipv6 +icu nls perl python +ssl sasl tcl test +zlib"
RESTRICT="!test? ( test )"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} icu )"
@@ -43,10 +43,7 @@ DEPEND="
perl? ( >=dev-lang/perl-5.10:= )
python? ( ${PYTHON_DEPS} )
sasl? ( >=dev-libs/cyrus-sasl-2 )
- ssl? (
- !libressl? ( dev-libs/openssl:0= )
- libressl? ( dev-libs/libressl:0= )
- )
+ ssl? ( dev-libs/openssl:0= )
tcl? ( dev-lang/tcl:0= )
zlib? ( sys-libs/zlib:0= )
"
[gentoo-commits] repo/gentoo:master commit in: net-irc/znc/
commit: 13ff4f209b2f5f8fb76d438996536c6381aa55b0
Author: Sam James gentoo org>
AuthorDate: Thu Nov 12 16:50:29 2020 +
Commit: Sam James gentoo org>
CommitDate: Thu Nov 12 16:50:55 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=13ff4f20
net-irc/znc: Stabilize 1.8.2 amd64, #753395
Signed-off-by: Sam James gentoo.org>
net-irc/znc/znc-1.8.2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-irc/znc/znc-1.8.2.ebuild b/net-irc/znc/znc-1.8.2.ebuild
index 2dec015cc75..313155eaeb2 100644
--- a/net-irc/znc/znc-1.8.2.ebuild
+++ b/net-irc/znc/znc-1.8.2.ebuild
@@ -22,7 +22,7 @@ else
https://znc.in/releases/archive/${MY_P}.tar.gz
test? ( ${GTEST_URL} )
"
- KEYWORDS="~amd64 arm arm64 x86"
+ KEYWORDS="amd64 arm arm64 x86"
# "If you upgrade your ZNC version you must recompile all your modules."
# - https://wiki.znc.in/Compiling_modules
SLOT="0/${PV}"
[gentoo-commits] repo/gentoo:master commit in: net-irc/znc/
commit: 2b5ba5439defa103066cabcc382cc001c5d568e4
Author: Thomas Deutschmann gentoo org>
AuthorDate: Thu Nov 12 00:34:48 2020 +
Commit: Thomas Deutschmann gentoo org>
CommitDate: Thu Nov 12 00:35:41 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2b5ba543
net-irc/znc: x86 stable (bug #753395)
Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Thomas Deutschmann gentoo.org>
net-irc/znc/znc-1.8.2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-irc/znc/znc-1.8.2.ebuild b/net-irc/znc/znc-1.8.2.ebuild
index 734cd3671b5..2dec015cc75 100644
--- a/net-irc/znc/znc-1.8.2.ebuild
+++ b/net-irc/znc/znc-1.8.2.ebuild
@@ -22,7 +22,7 @@ else
https://znc.in/releases/archive/${MY_P}.tar.gz
test? ( ${GTEST_URL} )
"
- KEYWORDS="~amd64 arm arm64 ~x86"
+ KEYWORDS="~amd64 arm arm64 x86"
# "If you upgrade your ZNC version you must recompile all your modules."
# - https://wiki.znc.in/Compiling_modules
SLOT="0/${PV}"
[gentoo-commits] repo/gentoo:master commit in: net-irc/znc/
commit: ae869c77bd27dba7b17ddcaba33e798c2629b340
Author: Sam James gentoo org>
AuthorDate: Sun Nov 8 00:27:43 2020 +
Commit: Sam James gentoo org>
CommitDate: Sun Nov 8 00:31:58 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ae869c77
net-irc/znc: Stabilize 1.8.2 arm, #753395
Signed-off-by: Sam James gentoo.org>
net-irc/znc/znc-1.8.2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-irc/znc/znc-1.8.2.ebuild b/net-irc/znc/znc-1.8.2.ebuild
index dbffa5162f9..734cd3671b5 100644
--- a/net-irc/znc/znc-1.8.2.ebuild
+++ b/net-irc/znc/znc-1.8.2.ebuild
@@ -22,7 +22,7 @@ else
https://znc.in/releases/archive/${MY_P}.tar.gz
test? ( ${GTEST_URL} )
"
- KEYWORDS="~amd64 ~arm arm64 ~x86"
+ KEYWORDS="~amd64 arm arm64 ~x86"
# "If you upgrade your ZNC version you must recompile all your modules."
# - https://wiki.znc.in/Compiling_modules
SLOT="0/${PV}"
[gentoo-commits] repo/gentoo:master commit in: net-irc/znc/
commit: 57e0b0cf7cd4152694ac66b65b2767b082db08b7
Author: Sam James gentoo org>
AuthorDate: Sun Nov 8 00:25:35 2020 +
Commit: Sam James gentoo org>
CommitDate: Sun Nov 8 00:31:57 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=57e0b0cf
net-irc/znc: Stabilize 1.8.2 arm64, #753395
Signed-off-by: Sam James gentoo.org>
net-irc/znc/znc-1.8.2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-irc/znc/znc-1.8.2.ebuild b/net-irc/znc/znc-1.8.2.ebuild
index 975978dcf4e..dbffa5162f9 100644
--- a/net-irc/znc/znc-1.8.2.ebuild
+++ b/net-irc/znc/znc-1.8.2.ebuild
@@ -22,7 +22,7 @@ else
https://znc.in/releases/archive/${MY_P}.tar.gz
test? ( ${GTEST_URL} )
"
- KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+ KEYWORDS="~amd64 ~arm arm64 ~x86"
# "If you upgrade your ZNC version you must recompile all your modules."
# - https://wiki.znc.in/Compiling_modules
SLOT="0/${PV}"
[gentoo-commits] repo/gentoo:master commit in: net-irc/znc-palaver/
commit: 96b385888f8056943e05578bddd08798600e0f3e
Author: Agostino Sarubbo gentoo org>
AuthorDate: Tue Oct 13 10:01:27 2020 +
Commit: Agostino Sarubbo gentoo org>
CommitDate: Tue Oct 13 10:01:40 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=96b38588
net-irc/znc-palaver: x86 stable wrt bug #745222
Package-Manager: Portage-3.0.4, Repoman-3.0.1
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo gentoo.org>
net-irc/znc-palaver/znc-palaver-1.2.1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-irc/znc-palaver/znc-palaver-1.2.1.ebuild
b/net-irc/znc-palaver/znc-palaver-1.2.1.ebuild
index bf8f2d32088..37383594fb1 100644
--- a/net-irc/znc-palaver/znc-palaver-1.2.1.ebuild
+++ b/net-irc/znc-palaver/znc-palaver-1.2.1.ebuild
@@ -13,7 +13,7 @@
SRC_URI="https://github.com/cocodelabs/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
LICENSE="MIT"
SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="test"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
RESTRICT="!test? ( test )"
[gentoo-commits] repo/gentoo:master commit in: net-irc/znc-palaver/
commit: 201e1dc5b72b38f45532476351e8d43b94476335
Author: Agostino Sarubbo gentoo org>
AuthorDate: Fri Oct 9 08:27:06 2020 +
Commit: Agostino Sarubbo gentoo org>
CommitDate: Fri Oct 9 08:30:51 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=201e1dc5
net-irc/znc-palaver: amd64 stable wrt bug #745222
Package-Manager: Portage-2.3.103, Repoman-2.3.23
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo gentoo.org>
net-irc/znc-palaver/znc-palaver-1.2.1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-irc/znc-palaver/znc-palaver-1.2.1.ebuild
b/net-irc/znc-palaver/znc-palaver-1.2.1.ebuild
index 45c850d4f1f..bf8f2d32088 100644
--- a/net-irc/znc-palaver/znc-palaver-1.2.1.ebuild
+++ b/net-irc/znc-palaver/znc-palaver-1.2.1.ebuild
@@ -13,7 +13,7 @@
SRC_URI="https://github.com/cocodelabs/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
IUSE="test"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
RESTRICT="!test? ( test )"
[gentoo-commits] repo/gentoo:master commit in: net-irc/znc/
commit: 5582b02f90dcfeba51ce63a49c97f9551a0f45b7
Author: Sam James gentoo org>
AuthorDate: Wed Sep 9 21:30:23 2020 +
Commit: Sam James gentoo org>
CommitDate: Wed Sep 9 21:31:13 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5582b02f
net-irc/znc: sync live ebuild
Include subslot definition in to make sure
it is not lost on any future bumps.
Package-Manager: Portage-3.0.4, Repoman-3.0.1
Signed-off-by: Sam James gentoo.org>
net-irc/znc/znc-1.8.2.ebuild | 6 +++---
net-irc/znc/znc-.ebuild | 3 +++
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/net-irc/znc/znc-1.8.2.ebuild b/net-irc/znc/znc-1.8.2.ebuild
index b70a1b5af26..975978dcf4e 100644
--- a/net-irc/znc/znc-1.8.2.ebuild
+++ b/net-irc/znc/znc-1.8.2.ebuild
@@ -23,14 +23,14 @@ else
test? ( ${GTEST_URL} )
"
KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+ # "If you upgrade your ZNC version you must recompile all your modules."
+ # - https://wiki.znc.in/Compiling_modules
+ SLOT="0/${PV}"
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="+ipv6 +icu libressl nls perl python +ssl sasl tcl test +zlib"
RESTRICT="!test? ( test )"
diff --git a/net-irc/znc/znc-.ebuild b/net-irc/znc/znc-.ebuild
index fa6a8f89ce8..764c35c45dc 100644
--- a/net-irc/znc/znc-.ebuild
+++ b/net-irc/znc/znc-.ebuild
@@ -23,6 +23,9 @@ else
test? ( ${GTEST_URL} )
"
KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+ # "If you upgrade your ZNC version you must recompile all your modules."
+ # - https://wiki.znc.in/Compiling_modules
+ SLOT="0/${PV}"
S=${WORKDIR}/${MY_P}
fi
[gentoo-commits] repo/gentoo:master commit in: net-irc/znc/
commit: cde8c50c91dcd2467248a87f8e003aa9f9ab452c
Author: Sam James gentoo org>
AuthorDate: Tue Sep 8 00:53:45 2020 +
Commit: Sam James gentoo org>
CommitDate: Tue Sep 8 00:53:45 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cde8c50c
net-irc/znc: add subslot to 1.8.2
Plugins need a rebuild on every new version
of ZNC.
Acked-by: Louis Sautier gentoo.org>
Package-Manager: Portage-3.0.4, Repoman-3.0.1
Signed-off-by: Sam James gentoo.org>
net-irc/znc/znc-1.8.2.ebuild | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/net-irc/znc/znc-1.8.2.ebuild b/net-irc/znc/znc-1.8.2.ebuild
index fa6a8f89ce8..b70a1b5af26 100644
--- a/net-irc/znc/znc-1.8.2.ebuild
+++ b/net-irc/znc/znc-1.8.2.ebuild
@@ -28,7 +28,9 @@ fi
HOMEPAGE="https://znc.in";
LICENSE="Apache-2.0"
-SLOT="0"
+# "If you upgrade your ZNC version you must recompile all your modules."
+# - https://wiki.znc.in/Compiling_modules
+SLOT="0/${PV}"
IUSE="+ipv6 +icu libressl nls perl python +ssl sasl tcl test +zlib"
RESTRICT="!test? ( test )"
[gentoo-commits] repo/gentoo:master commit in: net-irc/znc/
commit: 0f0c29f2883c43490f245cb1bdf940b1e700d576
Author: Louis Sautier gentoo org>
AuthorDate: Mon Sep 7 23:33:16 2020 +
Commit: Louis Sautier gentoo org>
CommitDate: Mon Sep 7 23:42:34 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0f0c29f2
net-irc/znc: remove old
Package-Manager: Portage-3.0.3, Repoman-2.3.23
Signed-off-by: Louis Sautier gentoo.org>
net-irc/znc/Manifest | 1 -
net-irc/znc/znc-1.7.5.ebuild | 183 ---
2 files changed, 184 deletions(-)
diff --git a/net-irc/znc/Manifest b/net-irc/znc/Manifest
index b951a8b2b30..f9e311890fe 100644
--- a/net-irc/znc/Manifest
+++ b/net-irc/znc/Manifest
@@ -1,4 +1,3 @@
DIST gtest-1.8.1.tar.gz 992298 BLAKE2B
40ef3417fe424205c0617f07207347ce671ac87605f8ac9b8a333b0b06e3fbef9f556041ee324c18f957f3258ab9fe06704f31cdd038355fb7890180eb77ced1
SHA512
e6283c667558e1fd6e49fa96e52af0e415a3c8037afe1d28b7ff1ec4c2ef8f49beb70a9327b7fc77eb4052a58c4ccad8b5260ec90e4bceeac7a46ff59c4369d7
-DIST znc-1.7.5.tar.gz 2170656 BLAKE2B
af5548bff1d9c6e740e668f467f52e8540a59bec9363fb4a17c594e1a9638417f75321b074e2aad6380769a594fc134543681928a7a33d00083ba9babc441a69
SHA512
f067503e5f45499c0acd687ef66266c4a65b80048e2a5835d3f9dfc4cd69b35890abdc3457726d7a7b25909f507349770eec43d9941bd62094c3527e64fbd825
DIST znc-1.8.1.tar.gz 2161359 BLAKE2B
5b9026156a62748659ae0496f9d799e7d1e0815358fa59f7538ca9d750b8f418fe8a57362b5b5bba40cfb00c2adc5fdc3eee0b56ebde50565c97d158296b827e
SHA512
87713ca05621806a399abc23f45671746578f6487561666704bb2ed1cd1863159a42ef4344eea95c9e7dc13d131b669eeabedda37e919d0bad6a05103ad80a16
DIST znc-1.8.2.tar.gz 2101215 BLAKE2B
7f0e5840fe57cc6b6549115b0fcf02e6afd3be0bf52e79da0a39bcc1463d983cbeb504bad30f3d2f7582f0295c7210d3c1eec40ec87bcc3546ba2d21a67cca9e
SHA512
e821647b50698c3a82fad039e69943e030bf644d8f8e82afa87c6c11da44761bceecddd510a7a956a1b487b1cca6ee46e8ac8818ea03127f0f1ff8f5d1a1a7f9
diff --git a/net-irc/znc/znc-1.7.5.ebuild b/net-irc/znc/znc-1.7.5.ebuild
deleted file mode 100644
index 6f190e2ca05..000
--- a/net-irc/znc/znc-1.7.5.ebuild
+++ /dev/null
@@ -1,183 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit cmake-utils python-single-r1 readme.gentoo-r1 systemd user
-
-GTEST_VER="1.8.1"
-GTEST_URL="https://github.com/google/googletest/archive/${GTEST_VER}.tar.gz ->
gtest-${GTEST_VER}.tar.gz"
-DESCRIPTION="An advanced IRC Bouncer"
-
-if [[ ${PV} == ** ]]; then
- inherit git-r3
- EGIT_REPO_URI=${EGIT_REPO_URI:-"https://github.com/znc/znc.git"}
- SRC_URI=""
-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 x86"
- S=${WORKDIR}/${MY_P}
-fi
-
-HOMEPAGE="https://znc.in";
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="+ipv6 +icu libressl nls perl python +ssl sasl tcl test +zlib"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} icu )"
-
-RDEPEND="
- 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? (
- !libressl? ( dev-libs/openssl:0= )
- libressl? ( dev-libs/libressl:0= )
- )
- tcl? ( dev-lang/tcl:0= )
- zlib? ( sys-libs/zlib:0= )
-"
-DEPEND="
- ${RDEPEND}
- virtual/pkgconfig
- nls? ( sys-devel/gettext )
- perl? ( >=dev-lang/swig-3.0.0 )
- python? ( >=dev-lang/swig-3.0.0 )
- test? ( dev-qt/qtnetwork:5 )
-"
-
-PATCHES=( "${FILESDIR}"/${PN}-1.7.1-inttest-dir.patch )
-
-pkg_setup() {
- if use python; then
- python-single-r1_pkg_setup
- fi
-
- enewgroup ${PN}
- enewuser ${PN} -1 -1 /var/lib/${PN} ${PN}
- # The home directory was previously set to /dev/null
- # This caused a bug with the systemd unit
- # https://bugs.gentoo.org/521916
- esethome ${PN} /var/lib/${PN}
-}
-
-src_prepare() {
- # Let SWIG rebuild modperl/modpython to make user patching easier.
- if [[ ${PV} != ** ]]; 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
-
- cmake-utils_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_IPV6="$(usex ipv6)"
- -DWANT_I18N="$(usex nls)"
- -DWANT_PERL="$(usex perl)"
- -D
[gentoo-commits] repo/gentoo:master commit in: net-irc/znc/
commit: 319fe5c5ba288a568737057be5829d6a218bc453
Author: Louis Sautier gentoo org>
AuthorDate: Mon Sep 7 23:21:37 2020 +
Commit: Louis Sautier gentoo org>
CommitDate: Mon Sep 7 23:25:22 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=319fe5c5
net-irc/znc: bump to 1.8.2
Package-Manager: Portage-3.0.3, Repoman-2.3.23
Signed-off-by: Louis Sautier gentoo.org>
net-irc/znc/Manifest | 1 +
net-irc/znc/znc-1.8.2.ebuild | 182 +++
2 files changed, 183 insertions(+)
diff --git a/net-irc/znc/Manifest b/net-irc/znc/Manifest
index 838db7de2b5..b951a8b2b30 100644
--- a/net-irc/znc/Manifest
+++ b/net-irc/znc/Manifest
@@ -1,3 +1,4 @@
DIST gtest-1.8.1.tar.gz 992298 BLAKE2B
40ef3417fe424205c0617f07207347ce671ac87605f8ac9b8a333b0b06e3fbef9f556041ee324c18f957f3258ab9fe06704f31cdd038355fb7890180eb77ced1
SHA512
e6283c667558e1fd6e49fa96e52af0e415a3c8037afe1d28b7ff1ec4c2ef8f49beb70a9327b7fc77eb4052a58c4ccad8b5260ec90e4bceeac7a46ff59c4369d7
DIST znc-1.7.5.tar.gz 2170656 BLAKE2B
af5548bff1d9c6e740e668f467f52e8540a59bec9363fb4a17c594e1a9638417f75321b074e2aad6380769a594fc134543681928a7a33d00083ba9babc441a69
SHA512
f067503e5f45499c0acd687ef66266c4a65b80048e2a5835d3f9dfc4cd69b35890abdc3457726d7a7b25909f507349770eec43d9941bd62094c3527e64fbd825
DIST znc-1.8.1.tar.gz 2161359 BLAKE2B
5b9026156a62748659ae0496f9d799e7d1e0815358fa59f7538ca9d750b8f418fe8a57362b5b5bba40cfb00c2adc5fdc3eee0b56ebde50565c97d158296b827e
SHA512
87713ca05621806a399abc23f45671746578f6487561666704bb2ed1cd1863159a42ef4344eea95c9e7dc13d131b669eeabedda37e919d0bad6a05103ad80a16
+DIST znc-1.8.2.tar.gz 2101215 BLAKE2B
7f0e5840fe57cc6b6549115b0fcf02e6afd3be0bf52e79da0a39bcc1463d983cbeb504bad30f3d2f7582f0295c7210d3c1eec40ec87bcc3546ba2d21a67cca9e
SHA512
e821647b50698c3a82fad039e69943e030bf644d8f8e82afa87c6c11da44761bceecddd510a7a956a1b487b1cca6ee46e8ac8818ea03127f0f1ff8f5d1a1a7f9
diff --git a/net-irc/znc/znc-1.8.2.ebuild b/net-irc/znc/znc-1.8.2.ebuild
new file mode 100644
index 000..fa6a8f89ce8
--- /dev/null
+++ b/net-irc/znc/znc-1.8.2.ebuild
@@ -0,0 +1,182 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9} )
+
+inherit cmake python-single-r1 readme.gentoo-r1 systemd
+
+GTEST_VER="1.8.1"
+GTEST_URL="https://github.com/google/googletest/archive/${GTEST_VER}.tar.gz ->
gtest-${GTEST_VER}.tar.gz"
+DESCRIPTION="An advanced IRC Bouncer"
+
+if [[ ${PV} == ** ]]; then
+ inherit git-r3
+ EGIT_REPO_URI=${EGIT_REPO_URI:-"https://github.com/znc/znc.git"}
+ SRC_URI=""
+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 ~x86"
+ S=${WORKDIR}/${MY_P}
+fi
+
+HOMEPAGE="https://znc.in";
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="+ipv6 +icu libressl nls perl python +ssl sasl tcl test +zlib"
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} icu )"
+
+DEPEND="
+ 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? (
+ !libressl? ( dev-libs/openssl:0= )
+ libressl? ( dev-libs/libressl:0= )
+ )
+ tcl? ( dev-lang/tcl:0= )
+ zlib? ( sys-libs/zlib:0= )
+"
+RDEPEND="
+ ${DEPEND}
+ acct-user/znc
+ acct-group/znc
+"
+BDEPEND="
+ virtual/pkgconfig
+ nls? ( sys-devel/gettext )
+ perl? (
+ >=dev-lang/swig-3.0.0
+ >=dev-lang/perl-5.10
+ )
+ python? (
+ >=dev-lang/swig-3.0.0
+ >=dev-lang/perl-5.10
+ )
+ test? (
+ ${PYTHON_DEPS}
+ dev-qt/qtnetwork:5
+ )
+"
+
+PATCHES=( "${FILESDIR}"/${PN}-1.7.1-inttest-dir.patch )
+
+pkg_setup() {
+ if use python; then
+ python-single-r1_pkg_setup
+ fi
+}
+
+src_prepare() {
+ # Let SWIG rebuild modperl/modpython to make user patching easier.
+ if [[ ${PV} != ** ]]; 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
+
+ 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_IPV6="$(usex ipv6)"
+ -DWANT_I18N="$(usex nls)"
+ -DWANT_PERL="$(usex perl)"
+ -DWANT_PYTHON="$(usex python)"
+
[gentoo-commits] repo/gentoo:master commit in: net-irc/znc-igloo-push/
commit: 3c5de23dea9b039e0202ed46a86eb4ead0f5c7f6
Author: Thomas Deutschmann gentoo org>
AuthorDate: Sun Aug 30 18:28:25 2020 +
Commit: Thomas Deutschmann gentoo org>
CommitDate: Sun Aug 30 18:58:03 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3c5de23d
net-irc/znc-igloo-push: new package
Package-Manager: Portage-3.0.4, Repoman-3.0.1
Signed-off-by: Thomas Deutschmann gentoo.org>
net-irc/znc-igloo-push/Manifest| 1 +
net-irc/znc-igloo-push/metadata.xml| 15 +
.../znc-igloo-push/znc-igloo-push-20200520.ebuild | 37 ++
3 files changed, 53 insertions(+)
diff --git a/net-irc/znc-igloo-push/Manifest b/net-irc/znc-igloo-push/Manifest
new file mode 100644
index 000..9637995ec7b
--- /dev/null
+++ b/net-irc/znc-igloo-push/Manifest
@@ -0,0 +1 @@
+DIST znc-igloo-push-20200520.tar.gz 12071 BLAKE2B
41272e479b8a6e201e3981e04f88a216aee9ed7051ae5573ea5266d74219a0a3f441ccf5621e040d4feb4bb81c349dfdc73357d7d43cf3f358a181a52bf79be7
SHA512
aaf23e1ffec4c0b5e14d9abc7ce276cc27f342e24f32fdd54f451d53729ce24fbf3665f2ad266bf38bbea2485386045c1cbc46593ed2eb6b87ac8889b8b7772e
diff --git a/net-irc/znc-igloo-push/metadata.xml
b/net-irc/znc-igloo-push/metadata.xml
new file mode 100644
index 000..65e385ef136
--- /dev/null
+++ b/net-irc/znc-igloo-push/metadata.xml
@@ -0,0 +1,15 @@
+
+http://www.gentoo.org/dtd/metadata.dtd";>
+
+
+ whi...@gentoo.org
+ Thomas Deutschmann
+
+
+ A ZNC module which provides push notifications through ZNC
+ for the iOS Igloo App while being disconnected from IRC.
+
+
+ https://git.jordanko.ch/Igloo/Push/issues
+
+
diff --git a/net-irc/znc-igloo-push/znc-igloo-push-20200520.ebuild
b/net-irc/znc-igloo-push/znc-igloo-push-20200520.ebuild
new file mode 100644
index 000..4022d504d1a
--- /dev/null
+++ b/net-irc/znc-igloo-push/znc-igloo-push-20200520.ebuild
@@ -0,0 +1,37 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_COMMIT="f952b87a1fc235917a28fbabbe8626719d622e4c"
+
+DESCRIPTION="A ZNC module which provides push notifications for Igloo client"
+HOMEPAGE="https://git.jordanko.ch/Igloo/Push";
+SRC_URI="https://git.jordanko.ch/Igloo/Push/archive/${MY_COMMIT}.tar.gz ->
${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="
+ net-irc/znc:=[ssl]"
+
+RDEPEND="${DEPEND}"
+
+DOCS=( README.md )
+
+S="${WORKDIR}/push"
+
+src_prepare() {
+ default
+
+ # No parallel build support
+ MAKEOPTS=-j1
+}
+
+src_install() {
+ insinto /usr/$(get_libdir)/znc
+ doins push.so
+
+ einstalldocs
+}
[gentoo-commits] repo/gentoo:master commit in: net-irc/znc-playback/
commit: 98e6a01d2d9ab374e7cb261e71e91758221fa1d6
Author: Thomas Deutschmann gentoo org>
AuthorDate: Sun Aug 30 18:57:28 2020 +
Commit: Thomas Deutschmann gentoo org>
CommitDate: Sun Aug 30 18:58:04 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=98e6a01d
net-irc/znc-playback: new package
Package-Manager: Portage-3.0.4, Repoman-3.0.1
Signed-off-by: Thomas Deutschmann gentoo.org>
net-irc/znc-playback/Manifest | 1 +
net-irc/znc-playback/metadata.xml | 19
net-irc/znc-playback/znc-playback-20200510.ebuild | 37 +++
3 files changed, 57 insertions(+)
diff --git a/net-irc/znc-playback/Manifest b/net-irc/znc-playback/Manifest
new file mode 100644
index 000..4ac6fa035c6
--- /dev/null
+++ b/net-irc/znc-playback/Manifest
@@ -0,0 +1 @@
+DIST znc-playback-20200510.tar.gz 3139 BLAKE2B
b074fb2cf98dcde39a5ec51a625196b61d7a540cbbdae374268f576756b876967a1be72f78e6ee5cf62d284c0cbfc3034d78678772cd975eb38f4757712bbabe
SHA512
50e924574c71fb6ace98c654201040aa2c193f4f1f811aa2ea26ad6ce6ced21bafe61c207936164125d84509e252890b383b21d904fe4cd46490711073052daf
diff --git a/net-irc/znc-playback/metadata.xml
b/net-irc/znc-playback/metadata.xml
new file mode 100644
index 000..af3b2726475
--- /dev/null
+++ b/net-irc/znc-playback/metadata.xml
@@ -0,0 +1,19 @@
+
+http://www.gentoo.org/dtd/metadata.dtd";>
+
+
+ whi...@gentoo.org
+ Thomas Deutschmann
+
+
+ The advanced playback module for ZNC makes it possible for IRC
clients
+ to avoid undesired repetitive buffer playback. IRC clients may
request
+ the module to send a partial buffer playback starting from and
ending
+ to a certain point of time. The detailed instructions are
available
+ at https://wiki.znc.in/Playback.
+
+
+
https://github.com/jpnurmi/znc-playback/issues
+ jpnurmi/znc-playback
+
+
diff --git a/net-irc/znc-playback/znc-playback-20200510.ebuild
b/net-irc/znc-playback/znc-playback-20200510.ebuild
new file mode 100644
index 000..5e8fda1097d
--- /dev/null
+++ b/net-irc/znc-playback/znc-playback-20200510.ebuild
@@ -0,0 +1,37 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_COMMIT="8dd128bfe2b24b2cc6a9ea2e2d28bfaa28d2a833"
+
+DESCRIPTION="A ZNC module to control buffer playback"
+HOMEPAGE="https://github.com/jpnurmi/znc-playback";
+SRC_URI="https://github.com/jpnurmi/znc-playback/archive/${MY_COMMIT}.tar.gz
-> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="
+ net-irc/znc:="
+
+RDEPEND="${DEPEND}"
+
+DOCS=( README.md )
+
+S="${WORKDIR}/${PN}-${MY_COMMIT}"
+
+src_prepare() {
+ default
+
+ # No parallel build support
+ MAKEOPTS=-j1
+}
+
+src_install() {
+ insinto /usr/$(get_libdir)/znc
+ doins playback.so
+
+ einstalldocs
+}
[gentoo-commits] repo/gentoo:master commit in: net-irc/znc-clientbuffer/
commit: 8f6e7049fe6a316489be768ad2e261a4217fd0a7
Author: Thomas Deutschmann gentoo org>
AuthorDate: Sun Aug 30 18:46:54 2020 +
Commit: Thomas Deutschmann gentoo org>
CommitDate: Sun Aug 30 18:58:04 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8f6e7049
net-irc/znc-clientbuffer: new package
Package-Manager: Portage-3.0.4, Repoman-3.0.1
Signed-off-by: Thomas Deutschmann gentoo.org>
net-irc/znc-clientbuffer/Manifest | 1 +
net-irc/znc-clientbuffer/metadata.xml | 12 +++
.../znc-clientbuffer-1.0.48.ebuild | 37 ++
3 files changed, 50 insertions(+)
diff --git a/net-irc/znc-clientbuffer/Manifest
b/net-irc/znc-clientbuffer/Manifest
new file mode 100644
index 000..c46a634584b
--- /dev/null
+++ b/net-irc/znc-clientbuffer/Manifest
@@ -0,0 +1 @@
+DIST znc-clientbuffer-1.0.48.tar.gz 5602 BLAKE2B
16a2c807df7371619f9e8456e3a65226dfd60e37872a86af11861d2130aa75fbfcfdc1c326baa0676cc253f27dda32893110638d4747a283e224bd672a49e0b1
SHA512
eac4d748b670a8e3563a424fcb5c9c411af6c9b1f9965f065936ddfcfbff946783e34e0d6b32de18fb3b87fb27db129ff58bedfb179473c804750a9b770897f6
diff --git a/net-irc/znc-clientbuffer/metadata.xml
b/net-irc/znc-clientbuffer/metadata.xml
new file mode 100644
index 000..b18a0ff2536
--- /dev/null
+++ b/net-irc/znc-clientbuffer/metadata.xml
@@ -0,0 +1,12 @@
+
+http://www.gentoo.org/dtd/metadata.dtd";>
+
+
+ whi...@gentoo.org
+ Thomas Deutschmann
+
+
+ https://git.jordanko.ch/Igloo/Push/issues
+ CyberShadow/znc-clientbuffer
+
+
diff --git a/net-irc/znc-clientbuffer/znc-clientbuffer-1.0.48.ebuild
b/net-irc/znc-clientbuffer/znc-clientbuffer-1.0.48.ebuild
new file mode 100644
index 000..7ad332d77a0
--- /dev/null
+++ b/net-irc/znc-clientbuffer/znc-clientbuffer-1.0.48.ebuild
@@ -0,0 +1,37 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="A ZNC module which provides client specific buffers"
+HOMEPAGE="https://github.com/CyberShadow/znc-clientbuffer";
+SRC_URI="https://github.com/CyberShadow/znc-clientbuffer/archive/v1.0.48.tar.gz
-> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="
+ net-irc/znc:="
+
+RDEPEND="${DEPEND}"
+
+DOCS=( README.md )
+
+_emake() {
+ emake \
+ -j1 \
+ PREFIX=${EPREFIX}/usr \
+ LIBDIR=/$(get_libdir) \
+ "$@"
+}
+
+src_compile() {
+ _emake
+}
+
+src_install() {
+ _emake DESTDIR=${ED} install
+
+ einstalldocs
+}
[gentoo-commits] repo/gentoo:master commit in: net-irc/znc-palaver/files/, net-irc/znc-palaver/
commit: a4dc42a459fc2f2ecf185b54ddeba53d999034ab
Author: Conrad Kostecki gentoo org>
AuthorDate: Sat Aug 29 00:43:41 2020 +
Commit: Conrad Kostecki gentoo org>
CommitDate: Sat Aug 29 00:44:08 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a4dc42a4
net-irc/znc-palaver: new package
Palaver ZNC module provides push notifications
to Palaver while Palaver is disconnected from IRC.
Package-Manager: Portage-3.0.4, Repoman-3.0.1
Signed-off-by: Conrad Kostecki gentoo.org>
net-irc/znc-palaver/Manifest | 1 +
.../files/znc-palaver-1.2.1-python310.patch| 48 +
.../files/znc-palaver-1.2.1-xunit2.patch | 23 +
net-irc/znc-palaver/metadata.xml | 16 ++
net-irc/znc-palaver/znc-palaver-1.2.1.ebuild | 60 ++
5 files changed, 148 insertions(+)
diff --git a/net-irc/znc-palaver/Manifest b/net-irc/znc-palaver/Manifest
new file mode 100644
index 000..b1dc595c2cc
--- /dev/null
+++ b/net-irc/znc-palaver/Manifest
@@ -0,0 +1 @@
+DIST znc-palaver-1.2.1.tar.gz 13302 BLAKE2B
0a46e4dd93f06a2b1705d619b0960a246ebf326fe4ca1afdc152a90274984421478ff52bd942a09dffe58349477d622b2839b2e1af0cb11b5bc8c7a329d3b3a4
SHA512
0cfa4dfcebca79ed0aaa9b44c7395318782237a8752e26810686276587004ab95342f5983e6c9a74950da062c34e634d8a4bf502977289e59686eef069dca84a
diff --git a/net-irc/znc-palaver/files/znc-palaver-1.2.1-python310.patch
b/net-irc/znc-palaver/files/znc-palaver-1.2.1-python310.patch
new file mode 100644
index 000..79e06f30a5e
--- /dev/null
+++ b/net-irc/znc-palaver/files/znc-palaver-1.2.1-python310.patch
@@ -0,0 +1,48 @@
+From 3d5a1a3c2a7cb3de82c618b1e70618195ec4a1e7 Mon Sep 17 00:00:00 2001
+From: Conrad Kostecki
+Date: Fri, 28 Aug 2020 23:48:23 +0200
+Subject: [PATCH] test/test_palaver.py: loop argument is deprecated
+
+DeprecationWarning: The loop argument is deprecated since Python 3.8,
+and scheduled for removal in Python 3.10.
+
+Signed-off-by: Conrad Kostecki
+---
+ test/test_palaver.py | 8
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/test/test_palaver.py b/test/test_palaver.py
+index 1b27878..d22366a 100644
+--- a/test/test_palaver.py
b/test/test_palaver.py
+@@ -50,10 +50,10 @@ async def setUp(event_loop):
+ running_as_root = os.getuid() == 0
+ allow_root = ' --allow-root' if running_as_root else ''
+
+-proc = await asyncio.create_subprocess_shell(f'znc -d test/fixtures
--foreground --debug{allow_root}', loop=event_loop)
++proc = await asyncio.create_subprocess_shell(f'znc -d test/fixtures
--foreground --debug{allow_root}')
+ time.sleep(31 if running_as_root else 1)
+
+-(reader, writer) = await asyncio.open_connection('localhost', 6698,
loop=event_loop)
++(reader, writer) = await asyncio.open_connection('localhost', 6698)
+ writer.write(b'CAP LS 302\r\n')
+
+ line = await reader.readline()
+@@ -184,7 +184,7 @@ async def connected(reader, writer):
+
+ connected.called = True
+
+-server = await asyncio.start_server(connected, host='127.0.0.1', port=0,
loop=event_loop)
++server = await asyncio.start_server(connected, host='127.0.0.1', port=0)
+ await asyncio.sleep(0.2)
+ addr = server.sockets[0].getsockname()
+ url = f'Serving on http://{addr[0]}:{addr[1]}/push'
+@@ -248,7 +248,7 @@ async def connected(reader, writer):
+
+ connected.called = True
+
+-server = await asyncio.start_server(connected, host='127.0.0.1', port=0,
loop=event_loop)
++server = await asyncio.start_server(connected, host='127.0.0.1', port=0)
+ await asyncio.sleep(0.2)
+ addr = server.sockets[0].getsockname()
+ url = f'Serving on http://{addr[0]}:{addr[1]}/push'
diff --git a/net-irc/znc-palaver/files/znc-palaver-1.2.1-xunit2.patch
b/net-irc/znc-palaver/files/znc-palaver-1.2.1-xunit2.patch
new file mode 100644
index 000..ffbb2ad4543
--- /dev/null
+++ b/net-irc/znc-palaver/files/znc-palaver-1.2.1-xunit2.patch
@@ -0,0 +1,23 @@
+From 3be5f33d76d4e34b1bc2671f7dbbc6c5fc3ccadd Mon Sep 17 00:00:00 2001
+From: Conrad Kostecki
+Date: Sat, 29 Aug 2020 00:06:53 +0200
+Subject: [PATCH] Makefile: use xunit2 as default for pytest
+
+PytestDeprecationWarning: The 'junit_family' default
+value will change to 'xunit2' in pytest 6.0.
+
+Signed-off-by: Conrad Kostecki
+---
+ Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile b/Makefile
+index d5d4866..e88277e 100644
+--- a/Makefile
b/Makefile
+@@ -30,4 +30,4 @@ test/fixtures/modules/palaver.so: palaver.so
+ .PHONY: test-integration
+ test-integration: test/fixtures/modules/palaver.so
+ @mkdir -p test-reports
+- pytest --junitxml=test-reports/junit.xml
++ pytest -o junit_family=xunit2 --junitxml=test-reports/junit.xml
diff --git a/net-irc/znc-palaver/metadata.xml b/net-irc/znc-palaver/metadata.xml
new file mode 100644
index 000..b0e19e1bdc9
---
[gentoo-commits] repo/gentoo:master commit in: net-irc/znc/
commit: 528891dfd84d390a786d2892a60d5ff523b1c461
Author: Agostino Sarubbo gentoo org>
AuthorDate: Sat Aug 22 05:43:16 2020 +
Commit: Agostino Sarubbo gentoo org>
CommitDate: Sat Aug 22 05:43:16 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=528891df
net-irc/znc: amd64 stable wrt bug #737508
Package-Manager: Portage-2.3.103, Repoman-2.3.23
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo gentoo.org>
net-irc/znc/znc-1.8.1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-irc/znc/znc-1.8.1.ebuild b/net-irc/znc/znc-1.8.1.ebuild
index adefc980b98..6d5ad64431a 100644
--- a/net-irc/znc/znc-1.8.1.ebuild
+++ b/net-irc/znc/znc-1.8.1.ebuild
@@ -22,7 +22,7 @@ else
https://znc.in/releases/archive/${MY_P}.tar.gz
test? ( ${GTEST_URL} )
"
- KEYWORDS="~amd64 arm arm64 x86"
+ KEYWORDS="amd64 arm arm64 x86"
S=${WORKDIR}/${MY_P}
fi
[gentoo-commits] repo/gentoo:master commit in: net-irc/znc/
commit: 149d8ca02e66439cf2f9bfcb63a943041f4785a1
Author: Sam James gentoo org>
AuthorDate: Tue Aug 18 08:56:45 2020 +
Commit: Sam James gentoo org>
CommitDate: Tue Aug 18 08:56:45 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=149d8ca0
net-irc/znc: Stabilize 1.8.1 arm64, #737508
Signed-off-by: Sam James gentoo.org>
net-irc/znc/znc-1.8.1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-irc/znc/znc-1.8.1.ebuild b/net-irc/znc/znc-1.8.1.ebuild
index 51650eb0a51..adefc980b98 100644
--- a/net-irc/znc/znc-1.8.1.ebuild
+++ b/net-irc/znc/znc-1.8.1.ebuild
@@ -22,7 +22,7 @@ else
https://znc.in/releases/archive/${MY_P}.tar.gz
test? ( ${GTEST_URL} )
"
- KEYWORDS="~amd64 arm ~arm64 x86"
+ KEYWORDS="~amd64 arm arm64 x86"
S=${WORKDIR}/${MY_P}
fi
[gentoo-commits] repo/gentoo:master commit in: net-irc/znc/
commit: 4f3951c52fcc2762dd9394d8ccd7cf8feb877073
Author: Agostino Sarubbo gentoo org>
AuthorDate: Mon Aug 17 14:52:00 2020 +
Commit: Agostino Sarubbo gentoo org>
CommitDate: Mon Aug 17 14:52:00 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4f3951c5
net-irc/znc: arm stable wrt bug #737508
Package-Manager: Portage-2.3.103, Repoman-2.3.23
RepoMan-Options: --include-arches="arm"
Signed-off-by: Agostino Sarubbo gentoo.org>
net-irc/znc/znc-1.8.1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-irc/znc/znc-1.8.1.ebuild b/net-irc/znc/znc-1.8.1.ebuild
index a224d0da540..51650eb0a51 100644
--- a/net-irc/znc/znc-1.8.1.ebuild
+++ b/net-irc/znc/znc-1.8.1.ebuild
@@ -22,7 +22,7 @@ else
https://znc.in/releases/archive/${MY_P}.tar.gz
test? ( ${GTEST_URL} )
"
- KEYWORDS="~amd64 ~arm ~arm64 x86"
+ KEYWORDS="~amd64 arm ~arm64 x86"
S=${WORKDIR}/${MY_P}
fi
[gentoo-commits] repo/gentoo:master commit in: net-irc/znc/
commit: 6eea3a5e4c70dc17a434191a186dbde6f903
Author: Agostino Sarubbo gentoo org>
AuthorDate: Mon Aug 17 14:07:32 2020 +
Commit: Agostino Sarubbo gentoo org>
CommitDate: Mon Aug 17 14:07:32 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6eea3a5e
net-irc/znc: x86 stable wrt bug #737508
Package-Manager: Portage-2.3.103, Repoman-2.3.23
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo gentoo.org>
net-irc/znc/znc-1.8.1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-irc/znc/znc-1.8.1.ebuild b/net-irc/znc/znc-1.8.1.ebuild
index fa6a8f89ce8..a224d0da540 100644
--- a/net-irc/znc/znc-1.8.1.ebuild
+++ b/net-irc/znc/znc-1.8.1.ebuild
@@ -22,7 +22,7 @@ else
https://znc.in/releases/archive/${MY_P}.tar.gz
test? ( ${GTEST_URL} )
"
- KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+ KEYWORDS="~amd64 ~arm ~arm64 x86"
S=${WORKDIR}/${MY_P}
fi
[gentoo-commits] repo/gentoo:master commit in: net-irc/znc/
commit: a1f1f7d5e7c55914427fd840846a350c1ded4d5e
Author: Louis Sautier gentoo org>
AuthorDate: Fri Jun 12 15:18:17 2020 +
Commit: Louis Sautier gentoo org>
CommitDate: Fri Jun 12 16:33:10 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a1f1f7d5
net-irc/znc: remove old
Package-Manager: Portage-2.3.100, Repoman-2.3.22
Signed-off-by: Louis Sautier gentoo.org>
net-irc/znc/Manifest | 1 -
net-irc/znc/znc-1.7.4.ebuild | 183 ---
2 files changed, 184 deletions(-)
diff --git a/net-irc/znc/Manifest b/net-irc/znc/Manifest
index 9ca3d2f47dd..838db7de2b5 100644
--- a/net-irc/znc/Manifest
+++ b/net-irc/znc/Manifest
@@ -1,4 +1,3 @@
DIST gtest-1.8.1.tar.gz 992298 BLAKE2B
40ef3417fe424205c0617f07207347ce671ac87605f8ac9b8a333b0b06e3fbef9f556041ee324c18f957f3258ab9fe06704f31cdd038355fb7890180eb77ced1
SHA512
e6283c667558e1fd6e49fa96e52af0e415a3c8037afe1d28b7ff1ec4c2ef8f49beb70a9327b7fc77eb4052a58c4ccad8b5260ec90e4bceeac7a46ff59c4369d7
-DIST znc-1.7.4.tar.gz 2084756 BLAKE2B
3b389a13d7c1c59b8ac485b6996b5a56a03689e8191a65c99692ea849a99ed0a013065a47ea3d213faf883e1d3e595375a665090b4173e97261c3afe21a120e7
SHA512
ea559ee9e06bfbc51c03ef08e145bc39ee7402638cc153fab7dc1dcedae01548fa0743d726304f9e4631a66241eb96c03940b76093954093a35f69641133b2ae
DIST znc-1.7.5.tar.gz 2170656 BLAKE2B
af5548bff1d9c6e740e668f467f52e8540a59bec9363fb4a17c594e1a9638417f75321b074e2aad6380769a594fc134543681928a7a33d00083ba9babc441a69
SHA512
f067503e5f45499c0acd687ef66266c4a65b80048e2a5835d3f9dfc4cd69b35890abdc3457726d7a7b25909f507349770eec43d9941bd62094c3527e64fbd825
DIST znc-1.8.1.tar.gz 2161359 BLAKE2B
5b9026156a62748659ae0496f9d799e7d1e0815358fa59f7538ca9d750b8f418fe8a57362b5b5bba40cfb00c2adc5fdc3eee0b56ebde50565c97d158296b827e
SHA512
87713ca05621806a399abc23f45671746578f6487561666704bb2ed1cd1863159a42ef4344eea95c9e7dc13d131b669eeabedda37e919d0bad6a05103ad80a16
diff --git a/net-irc/znc/znc-1.7.4.ebuild b/net-irc/znc/znc-1.7.4.ebuild
deleted file mode 100644
index 899adac5a0d..000
--- a/net-irc/znc/znc-1.7.4.ebuild
+++ /dev/null
@@ -1,183 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit cmake-utils python-single-r1 readme.gentoo-r1 systemd user
-
-GTEST_VER="1.8.1"
-GTEST_URL="https://github.com/google/googletest/archive/${GTEST_VER}.tar.gz ->
gtest-${GTEST_VER}.tar.gz"
-DESCRIPTION="An advanced IRC Bouncer"
-
-if [[ ${PV} == ** ]]; then
- inherit git-r3
- EGIT_REPO_URI=${EGIT_REPO_URI:-"https://github.com/znc/znc.git"}
- SRC_URI=""
-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 x86"
- S=${WORKDIR}/${MY_P}
-fi
-
-HOMEPAGE="https://znc.in";
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="+ipv6 +icu libressl nls perl python +ssl sasl tcl test +zlib"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} icu )"
-
-RDEPEND="
- 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? (
- !libressl? ( dev-libs/openssl:0= )
- libressl? ( dev-libs/libressl:0= )
- )
- tcl? ( dev-lang/tcl:0= )
- zlib? ( sys-libs/zlib:0= )
-"
-DEPEND="
- ${RDEPEND}
- virtual/pkgconfig
- nls? ( sys-devel/gettext )
- perl? ( >=dev-lang/swig-3.0.0 )
- python? ( >=dev-lang/swig-3.0.0 )
- test? ( dev-qt/qtnetwork:5 )
-"
-
-PATCHES=( "${FILESDIR}"/${PN}-1.7.1-inttest-dir.patch )
-
-pkg_setup() {
- if use python; then
- python-single-r1_pkg_setup
- fi
-
- enewgroup ${PN}
- enewuser ${PN} -1 -1 /var/lib/${PN} ${PN}
- # The home directory was previously set to /dev/null
- # This caused a bug with the systemd unit
- # https://bugs.gentoo.org/521916
- esethome ${PN} /var/lib/${PN}
-}
-
-src_prepare() {
- # Let SWIG rebuild modperl/modpython to make user patching easier.
- if [[ ${PV} != ** ]]; 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
-
- cmake-utils_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_IPV6="$(usex ipv6)"
- -DWANT_I18N="$(usex nls)"
- -DWANT_PERL="$(usex perl)"
- -DWANT_PY
[gentoo-commits] repo/gentoo:master commit in: net-irc/znc/
commit: faa057cf366c979eb2adb89c5c69f87a6db0a3b7
Author: Louis Sautier gentoo org>
AuthorDate: Sat May 16 15:38:28 2020 +
Commit: Louis Sautier gentoo org>
CommitDate: Fri Jun 12 11:06:17 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=faa057cf
net-irc/znc: sync live ebuild with 1.8.1
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Louis Sautier gentoo.org>
net-irc/znc/znc-.ebuild | 79 ++---
1 file changed, 39 insertions(+), 40 deletions(-)
diff --git a/net-irc/znc/znc-.ebuild b/net-irc/znc/znc-.ebuild
index 6820a1521d1..fa6a8f89ce8 100644
--- a/net-irc/znc/znc-.ebuild
+++ b/net-irc/znc/znc-.ebuild
@@ -3,9 +3,9 @@
EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
-inherit cmake-utils python-single-r1 readme.gentoo-r1 systemd user
+inherit cmake python-single-r1 readme.gentoo-r1 systemd
GTEST_VER="1.8.1"
GTEST_URL="https://github.com/google/googletest/archive/${GTEST_VER}.tar.gz ->
gtest-${GTEST_VER}.tar.gz"
@@ -22,7 +22,7 @@ else
https://znc.in/releases/archive/${MY_P}.tar.gz
test? ( ${GTEST_URL} )
"
- KEYWORDS="~amd64 ~arm ~x86"
+ KEYWORDS="~amd64 ~arm ~arm64 ~x86"
S=${WORKDIR}/${MY_P}
fi
@@ -34,7 +34,7 @@ RESTRICT="!test? ( test )"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} icu )"
-RDEPEND="
+DEPEND="
icu? ( dev-libs/icu:= )
nls? ( dev-libs/boost:=[nls] )
perl? ( >=dev-lang/perl-5.10:= )
@@ -47,13 +47,26 @@ RDEPEND="
tcl? ( dev-lang/tcl:0= )
zlib? ( sys-libs/zlib:0= )
"
-DEPEND="
- ${RDEPEND}
+RDEPEND="
+ ${DEPEND}
+ acct-user/znc
+ acct-group/znc
+"
+BDEPEND="
virtual/pkgconfig
nls? ( sys-devel/gettext )
- perl? ( >=dev-lang/swig-3.0.0 )
- python? ( >=dev-lang/swig-3.0.0 )
- test? ( dev-qt/qtnetwork:5 )
+ perl? (
+ >=dev-lang/swig-3.0.0
+ >=dev-lang/perl-5.10
+ )
+ python? (
+ >=dev-lang/swig-3.0.0
+ >=dev-lang/perl-5.10
+ )
+ test? (
+ ${PYTHON_DEPS}
+ dev-qt/qtnetwork:5
+ )
"
PATCHES=( "${FILESDIR}"/${PN}-1.7.1-inttest-dir.patch )
@@ -62,13 +75,6 @@ pkg_setup() {
if use python; then
python-single-r1_pkg_setup
fi
-
- enewgroup ${PN}
- enewuser ${PN} -1 -1 /var/lib/${PN} ${PN}
- # The home directory was previously set to /dev/null
- # This caused a bug with the systemd unit
- # https://bugs.gentoo.org/521916
- esethome ${PN} /var/lib/${PN}
}
src_prepare() {
@@ -81,7 +87,7 @@ src_prepare() {
sed -i -e "s|DZNC_BIN_DIR:path=|DZNC_BIN_DIR:path=${T}/inttest|" \
test/CMakeLists.txt || die
- cmake-utils_src_prepare
+ cmake_src_prepare
}
src_configure() {
@@ -104,36 +110,29 @@ src_configure() {
export
GMOCK_ROOT="${WORKDIR}/googletest-release-${GTEST_VER}/googlemock"
fi
- cmake-utils_src_configure
+ cmake_src_configure
}
src_test() {
- cmake-utils_src_make unittest
- if has network-sandbox ${FEATURES}; then
- DESTDIR="${T}/inttest" cmake-utils_src_make 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-utils_src_make inttest
- else
- # TODO: don't require sandbox after
- # https://github.com/znc/znc/pull/1363 is implemented
- ewarn "FEATURES=-network-sandbox; skipping integration tests
which"
- ewarn "temporary open local ports."
+ 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-
[gentoo-commits] repo/gentoo:master commit in: net-irc/znc/
commit: bf49a9f25df401c74952ecb2cbd962640f6e217a
Author: Louis Sautier gentoo org>
AuthorDate: Sat May 16 15:35:46 2020 +
Commit: Louis Sautier gentoo org>
CommitDate: Fri Jun 12 11:06:16 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bf49a9f2
net-irc/znc: bump to 1.8.1, migrate to acct-user, fix deps
Also remove a reference to the non-standard FEATURES variable,
migrate from cmake-utils to cmake, add Python 3.9 support.
Closes: https://bugs.gentoo.org/727894
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Louis Sautier gentoo.org>
net-irc/znc/Manifest | 1 +
net-irc/znc/znc-1.8.1.ebuild | 182 +++
2 files changed, 183 insertions(+)
diff --git a/net-irc/znc/Manifest b/net-irc/znc/Manifest
index 37134a38810..9ca3d2f47dd 100644
--- a/net-irc/znc/Manifest
+++ b/net-irc/znc/Manifest
@@ -1,3 +1,4 @@
DIST gtest-1.8.1.tar.gz 992298 BLAKE2B
40ef3417fe424205c0617f07207347ce671ac87605f8ac9b8a333b0b06e3fbef9f556041ee324c18f957f3258ab9fe06704f31cdd038355fb7890180eb77ced1
SHA512
e6283c667558e1fd6e49fa96e52af0e415a3c8037afe1d28b7ff1ec4c2ef8f49beb70a9327b7fc77eb4052a58c4ccad8b5260ec90e4bceeac7a46ff59c4369d7
DIST znc-1.7.4.tar.gz 2084756 BLAKE2B
3b389a13d7c1c59b8ac485b6996b5a56a03689e8191a65c99692ea849a99ed0a013065a47ea3d213faf883e1d3e595375a665090b4173e97261c3afe21a120e7
SHA512
ea559ee9e06bfbc51c03ef08e145bc39ee7402638cc153fab7dc1dcedae01548fa0743d726304f9e4631a66241eb96c03940b76093954093a35f69641133b2ae
DIST znc-1.7.5.tar.gz 2170656 BLAKE2B
af5548bff1d9c6e740e668f467f52e8540a59bec9363fb4a17c594e1a9638417f75321b074e2aad6380769a594fc134543681928a7a33d00083ba9babc441a69
SHA512
f067503e5f45499c0acd687ef66266c4a65b80048e2a5835d3f9dfc4cd69b35890abdc3457726d7a7b25909f507349770eec43d9941bd62094c3527e64fbd825
+DIST znc-1.8.1.tar.gz 2161359 BLAKE2B
5b9026156a62748659ae0496f9d799e7d1e0815358fa59f7538ca9d750b8f418fe8a57362b5b5bba40cfb00c2adc5fdc3eee0b56ebde50565c97d158296b827e
SHA512
87713ca05621806a399abc23f45671746578f6487561666704bb2ed1cd1863159a42ef4344eea95c9e7dc13d131b669eeabedda37e919d0bad6a05103ad80a16
diff --git a/net-irc/znc/znc-1.8.1.ebuild b/net-irc/znc/znc-1.8.1.ebuild
new file mode 100644
index 000..fa6a8f89ce8
--- /dev/null
+++ b/net-irc/znc/znc-1.8.1.ebuild
@@ -0,0 +1,182 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9} )
+
+inherit cmake python-single-r1 readme.gentoo-r1 systemd
+
+GTEST_VER="1.8.1"
+GTEST_URL="https://github.com/google/googletest/archive/${GTEST_VER}.tar.gz ->
gtest-${GTEST_VER}.tar.gz"
+DESCRIPTION="An advanced IRC Bouncer"
+
+if [[ ${PV} == ** ]]; then
+ inherit git-r3
+ EGIT_REPO_URI=${EGIT_REPO_URI:-"https://github.com/znc/znc.git"}
+ SRC_URI=""
+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 ~x86"
+ S=${WORKDIR}/${MY_P}
+fi
+
+HOMEPAGE="https://znc.in";
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="+ipv6 +icu libressl nls perl python +ssl sasl tcl test +zlib"
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} icu )"
+
+DEPEND="
+ 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? (
+ !libressl? ( dev-libs/openssl:0= )
+ libressl? ( dev-libs/libressl:0= )
+ )
+ tcl? ( dev-lang/tcl:0= )
+ zlib? ( sys-libs/zlib:0= )
+"
+RDEPEND="
+ ${DEPEND}
+ acct-user/znc
+ acct-group/znc
+"
+BDEPEND="
+ virtual/pkgconfig
+ nls? ( sys-devel/gettext )
+ perl? (
+ >=dev-lang/swig-3.0.0
+ >=dev-lang/perl-5.10
+ )
+ python? (
+ >=dev-lang/swig-3.0.0
+ >=dev-lang/perl-5.10
+ )
+ test? (
+ ${PYTHON_DEPS}
+ dev-qt/qtnetwork:5
+ )
+"
+
+PATCHES=( "${FILESDIR}"/${PN}-1.7.1-inttest-dir.patch )
+
+pkg_setup() {
+ if use python; then
+ python-single-r1_pkg_setup
+ fi
+}
+
+src_prepare() {
+ # Let SWIG rebuild modperl/modpython to make user patching easier.
+ if [[ ${PV} != ** ]]; 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
+
+ cmake_src_prepare
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DWANT_SYSTEMD=yes # Causes -DSYSTEMD_DIR to be used.
+ -DSYSTEMD_DIR="$(systemd_get_systemunitdir)"
+ -DWANT_ICU="$(usex
[gentoo-commits] repo/gentoo:master commit in: net-irc/znc/
commit: 1241792977f2a94cbf36f1e4b371cc6f323c4ba5
Author: Agostino Sarubbo gentoo org>
AuthorDate: Fri May 8 17:10:03 2020 +
Commit: Agostino Sarubbo gentoo org>
CommitDate: Fri May 8 17:10:03 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=12417929
net-irc/znc: arm stable wrt bug #720750
Package-Manager: Portage-2.3.89, Repoman-2.3.20
RepoMan-Options: --include-arches="arm"
Signed-off-by: Agostino Sarubbo gentoo.org>
net-irc/znc/znc-1.7.5.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-irc/znc/znc-1.7.5.ebuild b/net-irc/znc/znc-1.7.5.ebuild
index 285bcfb0d9a..6f190e2ca05 100644
--- a/net-irc/znc/znc-1.7.5.ebuild
+++ b/net-irc/znc/znc-1.7.5.ebuild
@@ -22,7 +22,7 @@ else
https://znc.in/releases/archive/${MY_P}.tar.gz
test? ( ${GTEST_URL} )
"
- KEYWORDS="amd64 ~arm ~arm64 x86"
+ KEYWORDS="amd64 arm ~arm64 x86"
S=${WORKDIR}/${MY_P}
fi
[gentoo-commits] repo/gentoo:master commit in: net-irc/znc/
commit: 7e8282d8798e59e7be1a5ddf0d93694d71d278c9
Author: Agostino Sarubbo gentoo org>
AuthorDate: Mon May 4 14:38:29 2020 +
Commit: Agostino Sarubbo gentoo org>
CommitDate: Mon May 4 14:38:29 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7e8282d8
net-irc/znc: amd64 stable wrt bug #720750
Package-Manager: Portage-2.3.89, Repoman-2.3.20
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo gentoo.org>
net-irc/znc/znc-1.7.5.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-irc/znc/znc-1.7.5.ebuild b/net-irc/znc/znc-1.7.5.ebuild
index 81ccb82f02c..285bcfb0d9a 100644
--- a/net-irc/znc/znc-1.7.5.ebuild
+++ b/net-irc/znc/znc-1.7.5.ebuild
@@ -22,7 +22,7 @@ else
https://znc.in/releases/archive/${MY_P}.tar.gz
test? ( ${GTEST_URL} )
"
- KEYWORDS="~amd64 ~arm ~arm64 x86"
+ KEYWORDS="amd64 ~arm ~arm64 x86"
S=${WORKDIR}/${MY_P}
fi
[gentoo-commits] repo/gentoo:master commit in: net-irc/znc/
commit: e2e16f5604996ea71404be6455daccb7ba632150
Author: Agostino Sarubbo gentoo org>
AuthorDate: Mon May 4 06:42:41 2020 +
Commit: Agostino Sarubbo gentoo org>
CommitDate: Mon May 4 06:42:41 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e2e16f56
net-irc/znc: x86 stable wrt bug #720750
Package-Manager: Portage-2.3.89, Repoman-2.3.20
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo gentoo.org>
net-irc/znc/znc-1.7.5.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-irc/znc/znc-1.7.5.ebuild b/net-irc/znc/znc-1.7.5.ebuild
index dc3919cbef0..81ccb82f02c 100644
--- a/net-irc/znc/znc-1.7.5.ebuild
+++ b/net-irc/znc/znc-1.7.5.ebuild
@@ -22,7 +22,7 @@ else
https://znc.in/releases/archive/${MY_P}.tar.gz
test? ( ${GTEST_URL} )
"
- KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+ KEYWORDS="~amd64 ~arm ~arm64 x86"
S=${WORKDIR}/${MY_P}
fi
[gentoo-commits] repo/gentoo:master commit in: net-irc/znc/
commit: 53a036023a3f49aa370516df48d00978ef207dae
Author: Sam James (sam_c) cmpct info>
AuthorDate: Sun May 3 12:15:07 2020 +
Commit: Mart Raudsepp gentoo org>
CommitDate: Mon May 4 06:15:45 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=53a03602
net-irc/znc: arm64 keyworded (bug #720752)
Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Sam James (sam_c) cmpct.info>
Signed-off-by: Mart Raudsepp gentoo.org>
net-irc/znc/znc-1.7.5.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-irc/znc/znc-1.7.5.ebuild b/net-irc/znc/znc-1.7.5.ebuild
index 6820a1521d1..dc3919cbef0 100644
--- a/net-irc/znc/znc-1.7.5.ebuild
+++ b/net-irc/znc/znc-1.7.5.ebuild
@@ -22,7 +22,7 @@ else
https://znc.in/releases/archive/${MY_P}.tar.gz
test? ( ${GTEST_URL} )
"
- KEYWORDS="~amd64 ~arm ~x86"
+ KEYWORDS="~amd64 ~arm ~arm64 ~x86"
S=${WORKDIR}/${MY_P}
fi
[gentoo-commits] repo/gentoo:master commit in: net-irc/znc/
commit: 77a966bcf628d2871d4344eda306c6f874e64e65
Author: Louis Sautier gentoo org>
AuthorDate: Wed Apr 22 22:38:33 2020 +
Commit: Louis Sautier gentoo org>
CommitDate: Thu Apr 23 07:20:34 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=77a966bc
net-irc/znc: add Python 3.8 support
Package-Manager: Portage-2.3.96, Repoman-2.3.22
Signed-off-by: Louis Sautier gentoo.org>
net-irc/znc/znc-1.7.5.ebuild | 2 +-
net-irc/znc/znc-.ebuild | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/net-irc/znc/znc-1.7.5.ebuild b/net-irc/znc/znc-1.7.5.ebuild
index e703db8161d..6820a1521d1 100644
--- a/net-irc/znc/znc-1.7.5.ebuild
+++ b/net-irc/znc/znc-1.7.5.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7,8} )
inherit cmake-utils python-single-r1 readme.gentoo-r1 systemd user
diff --git a/net-irc/znc/znc-.ebuild b/net-irc/znc/znc-.ebuild
index e703db8161d..6820a1521d1 100644
--- a/net-irc/znc/znc-.ebuild
+++ b/net-irc/znc/znc-.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7,8} )
inherit cmake-utils python-single-r1 readme.gentoo-r1 systemd user
[gentoo-commits] repo/gentoo:master commit in: net-irc/znc/
commit: 9021f41fe86b9dbc34a7c77e7e99632d435e6ef5
Author: Louis Sautier gentoo org>
AuthorDate: Sat Sep 28 22:25:44 2019 +
Commit: Louis Sautier gentoo org>
CommitDate: Sat Sep 28 22:26:42 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9021f41f
net-irc/znc: bump to 1.7.5
Package-Manager: Portage-2.3.76, Repoman-2.3.17
Signed-off-by: Louis Sautier gentoo.org>
net-irc/znc/Manifest | 1 +
net-irc/znc/znc-1.7.5.ebuild | 182 +++
2 files changed, 183 insertions(+)
diff --git a/net-irc/znc/Manifest b/net-irc/znc/Manifest
index 4a2dbc1e157..37134a38810 100644
--- a/net-irc/znc/Manifest
+++ b/net-irc/znc/Manifest
@@ -1,2 +1,3 @@
DIST gtest-1.8.1.tar.gz 992298 BLAKE2B
40ef3417fe424205c0617f07207347ce671ac87605f8ac9b8a333b0b06e3fbef9f556041ee324c18f957f3258ab9fe06704f31cdd038355fb7890180eb77ced1
SHA512
e6283c667558e1fd6e49fa96e52af0e415a3c8037afe1d28b7ff1ec4c2ef8f49beb70a9327b7fc77eb4052a58c4ccad8b5260ec90e4bceeac7a46ff59c4369d7
DIST znc-1.7.4.tar.gz 2084756 BLAKE2B
3b389a13d7c1c59b8ac485b6996b5a56a03689e8191a65c99692ea849a99ed0a013065a47ea3d213faf883e1d3e595375a665090b4173e97261c3afe21a120e7
SHA512
ea559ee9e06bfbc51c03ef08e145bc39ee7402638cc153fab7dc1dcedae01548fa0743d726304f9e4631a66241eb96c03940b76093954093a35f69641133b2ae
+DIST znc-1.7.5.tar.gz 2170656 BLAKE2B
af5548bff1d9c6e740e668f467f52e8540a59bec9363fb4a17c594e1a9638417f75321b074e2aad6380769a594fc134543681928a7a33d00083ba9babc441a69
SHA512
f067503e5f45499c0acd687ef66266c4a65b80048e2a5835d3f9dfc4cd69b35890abdc3457726d7a7b25909f507349770eec43d9941bd62094c3527e64fbd825
diff --git a/net-irc/znc/znc-1.7.5.ebuild b/net-irc/znc/znc-1.7.5.ebuild
new file mode 100644
index 000..6d5656de499
--- /dev/null
+++ b/net-irc/znc/znc-1.7.5.ebuild
@@ -0,0 +1,182 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{5,6,7} )
+
+inherit cmake-utils python-single-r1 readme.gentoo-r1 systemd user
+
+GTEST_VER="1.8.1"
+GTEST_URL="https://github.com/google/googletest/archive/${GTEST_VER}.tar.gz ->
gtest-${GTEST_VER}.tar.gz"
+DESCRIPTION="An advanced IRC Bouncer"
+
+if [[ ${PV} == ** ]]; then
+ inherit git-r3
+ EGIT_REPO_URI=${EGIT_REPO_URI:-"https://github.com/znc/znc.git"}
+ SRC_URI=""
+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 ~x86"
+ S=${WORKDIR}/${MY_P}
+fi
+
+HOMEPAGE="https://znc.in";
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="+ipv6 +icu libressl nls perl python +ssl sasl tcl test +zlib"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} icu )"
+
+RDEPEND="
+ 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? (
+ !libressl? ( dev-libs/openssl:0= )
+ libressl? ( dev-libs/libressl:0= )
+ )
+ tcl? ( dev-lang/tcl:0= )
+ zlib? ( sys-libs/zlib:0= )
+"
+DEPEND="
+ ${RDEPEND}
+ virtual/pkgconfig
+ nls? ( sys-devel/gettext )
+ perl? ( >=dev-lang/swig-3.0.0 )
+ python? ( >=dev-lang/swig-3.0.0 )
+ test? ( dev-qt/qtnetwork:5 )
+"
+
+PATCHES=( "${FILESDIR}"/${PN}-1.7.1-inttest-dir.patch )
+
+pkg_setup() {
+ if use python; then
+ python-single-r1_pkg_setup
+ fi
+
+ enewgroup ${PN}
+ enewuser ${PN} -1 -1 /var/lib/${PN} ${PN}
+ # The home directory was previously set to /dev/null
+ # This caused a bug with the systemd unit
+ # https://bugs.gentoo.org/521916
+ esethome ${PN} /var/lib/${PN}
+}
+
+src_prepare() {
+ # Let SWIG rebuild modperl/modpython to make user patching easier.
+ if [[ ${PV} != ** ]]; 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
+
+ cmake-utils_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_IPV6="$(usex ipv6)"
+ -DWANT_I18N="$(usex nls)"
+ -DWANT_PERL="$(usex perl)"
+ -DWANT_PYTHON="$(usex python)"
+ -DWANT_CYRUS="$(usex sasl)"
+ -DWANT_OPENSSL="$(usex ssl)"
+ -DWANT_TCL="$(usex tcl)"
+ -DWANT_ZLIB="$(usex zlib)"
+ )
+
+ if [[ ${PV} != ** ]] && use test; then
+ export
GTEST_ROOT="${WORKDIR}/googletest-release-${GTEST
[gentoo-commits] repo/gentoo:master commit in: net-irc/znc/
commit: b1df133a9e287eccda10b2d280a6aaeb28ea0c0b
Author: Louis Sautier gentoo org>
AuthorDate: Sun Jul 28 23:04:46 2019 +
Commit: Louis Sautier gentoo org>
CommitDate: Sun Jul 28 23:05:19 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b1df133a
net-irc/znc: remove vulnerable version 1.7.3
Bug: https://bugs.gentoo.org/688152
Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Louis Sautier gentoo.org>
net-irc/znc/Manifest | 1 -
net-irc/znc/znc-1.7.3.ebuild | 182 ---
2 files changed, 183 deletions(-)
diff --git a/net-irc/znc/Manifest b/net-irc/znc/Manifest
index beff2345859..4a2dbc1e157 100644
--- a/net-irc/znc/Manifest
+++ b/net-irc/znc/Manifest
@@ -1,3 +1,2 @@
DIST gtest-1.8.1.tar.gz 992298 BLAKE2B
40ef3417fe424205c0617f07207347ce671ac87605f8ac9b8a333b0b06e3fbef9f556041ee324c18f957f3258ab9fe06704f31cdd038355fb7890180eb77ced1
SHA512
e6283c667558e1fd6e49fa96e52af0e415a3c8037afe1d28b7ff1ec4c2ef8f49beb70a9327b7fc77eb4052a58c4ccad8b5260ec90e4bceeac7a46ff59c4369d7
-DIST znc-1.7.3.tar.gz 2084575 BLAKE2B
4d8f76abef8bf2c5f96d9bd04716cd2debae2b2fcd3b8688aa715af6ef09e60c2aac203c5c7b32d2f4d56730f30dbbe9abd5eeec4f07e7580900dcb1cd164530
SHA512
4cd63be2cb3bc1e3950f38984b128c6511bd1b9fc01a00d51cfcdc46826c2dedad120d6ed8e30d9c400909e33d39b2b14579fb40ee1e3508b7f3a07eff3a15d8
DIST znc-1.7.4.tar.gz 2084756 BLAKE2B
3b389a13d7c1c59b8ac485b6996b5a56a03689e8191a65c99692ea849a99ed0a013065a47ea3d213faf883e1d3e595375a665090b4173e97261c3afe21a120e7
SHA512
ea559ee9e06bfbc51c03ef08e145bc39ee7402638cc153fab7dc1dcedae01548fa0743d726304f9e4631a66241eb96c03940b76093954093a35f69641133b2ae
diff --git a/net-irc/znc/znc-1.7.3.ebuild b/net-irc/znc/znc-1.7.3.ebuild
deleted file mode 100644
index 3bd414de002..000
--- a/net-irc/znc/znc-1.7.3.ebuild
+++ /dev/null
@@ -1,182 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{5,6,7} )
-
-inherit cmake-utils python-single-r1 readme.gentoo-r1 systemd user
-
-GTEST_VER="1.8.1"
-GTEST_URL="https://github.com/google/googletest/archive/${GTEST_VER}.tar.gz ->
gtest-${GTEST_VER}.tar.gz"
-DESCRIPTION="An advanced IRC Bouncer"
-
-if [[ ${PV} == ** ]]; then
- inherit git-r3
- EGIT_REPO_URI=${EGIT_REPO_URI:-"https://github.com/znc/znc.git"}
- SRC_URI=""
-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 x86"
- S=${WORKDIR}/${MY_P}
-fi
-
-HOMEPAGE="https://znc.in";
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="+ipv6 +icu libressl nls perl python +ssl sasl tcl test +zlib"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} icu )"
-
-RDEPEND="
- 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? (
- !libressl? ( dev-libs/openssl:0= )
- libressl? ( dev-libs/libressl:0= )
- )
- tcl? ( dev-lang/tcl:0= )
- zlib? ( sys-libs/zlib:0= )
-"
-DEPEND="
- ${RDEPEND}
- virtual/pkgconfig
- nls? ( sys-devel/gettext )
- perl? ( >=dev-lang/swig-3.0.0 )
- python? ( >=dev-lang/swig-3.0.0 )
- test? ( dev-qt/qtnetwork:5 )
-"
-
-PATCHES=( "${FILESDIR}"/${PN}-1.7.1-inttest-dir.patch )
-
-pkg_setup() {
- if use python; then
- python-single-r1_pkg_setup
- fi
-
- enewgroup ${PN}
- enewuser ${PN} -1 -1 /var/lib/${PN} ${PN}
- # The home directory was previously set to /dev/null
- # This caused a bug with the systemd unit
- # https://bugs.gentoo.org/521916
- esethome ${PN} /var/lib/${PN}
-}
-
-src_prepare() {
- # Let SWIG rebuild modperl/modpython to make user patching easier.
- if [[ ${PV} != ** ]]; 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
-
- cmake-utils_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_IPV6="$(usex ipv6)"
- -DWANT_I18N="$(usex nls)"
- -DWANT_PERL="$(usex perl)"
- -DWANT_PYTHON="$(usex python)"
- -DWANT_CYRUS="$(usex sasl)"
- -DWANT_OPENSSL="$(usex ssl)"
- -DWANT_TCL="$(usex tcl)"
- -DWANT_ZLIB="$(usex zlib)"
- )
-
- if [[ ${PV} != ** ]] && use test; then
- exp
[gentoo-commits] repo/gentoo:master commit in: net-irc/znc/
commit: 1385a1e9c8abec269c4fa454182a83dc07b663c3
Author: Mikle Kolyada gentoo org>
AuthorDate: Sun Jul 28 20:18:16 2019 +
Commit: Mikle Kolyada gentoo org>
CommitDate: Sun Jul 28 20:18:16 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1385a1e9
net-irc/znc: arm stable wrt bug #688152
Package-Manager: Portage-2.3.66, Repoman-2.3.16
RepoMan-Options: --include-arches="arm"
Signed-off-by: Mikle Kolyada gentoo.org>
net-irc/znc/znc-1.7.4.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-irc/znc/znc-1.7.4.ebuild b/net-irc/znc/znc-1.7.4.ebuild
index d6e9044033e..3bd414de002 100644
--- a/net-irc/znc/znc-1.7.4.ebuild
+++ b/net-irc/znc/znc-1.7.4.ebuild
@@ -22,7 +22,7 @@ else
https://znc.in/releases/archive/${MY_P}.tar.gz
test? ( ${GTEST_URL} )
"
- KEYWORDS="amd64 ~arm x86"
+ KEYWORDS="amd64 arm x86"
S=${WORKDIR}/${MY_P}
fi
[gentoo-commits] repo/gentoo:master commit in: net-irc/znc/
commit: c55605245534154be4d88ce7e123d8559f886699
Author: Louis Sautier gentoo org>
AuthorDate: Thu Jul 25 16:39:33 2019 +
Commit: Louis Sautier gentoo org>
CommitDate: Fri Jul 26 10:20:51 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c5560524
net-irc/znc: remove slash strip from EAPI=7 ebuilds
Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Louis Sautier gentoo.org>
net-irc/znc/znc-1.7.3.ebuild | 18 +-
net-irc/znc/znc-1.7.4.ebuild | 18 +-
net-irc/znc/znc-.ebuild | 18 +-
3 files changed, 27 insertions(+), 27 deletions(-)
diff --git a/net-irc/znc/znc-1.7.3.ebuild b/net-irc/znc/znc-1.7.3.ebuild
index 60cd7cf8147..3bd414de002 100644
--- a/net-irc/znc/znc-1.7.3.ebuild
+++ b/net-irc/znc/znc-1.7.3.ebuild
@@ -149,19 +149,19 @@ pkg_postinst() {
readme.gentoo_print_elog
fi
- if [[ -d "${EROOT%/}"/etc/znc ]]; then
- ewarn "${EROOT%/}/etc/znc exists on your system."
+ if [[ -d "${EROOT}"/etc/znc ]]; then
+ ewarn "${EROOT}/etc/znc exists on your system."
ewarn "Due to the nature of the contents of that folder,"
ewarn "we have changed the default configuration to use"
- ewarn " ${EROOT%/}/var/lib/znc"
- ewarn "please move ${EROOT%/}/etc/znc to ${EROOT%/}/var/lib/znc"
+ ewarn " ${EROOT}/var/lib/znc"
+ ewarn "please move ${EROOT}/etc/znc to ${EROOT}/var/lib/znc"
ewarn "or adjust your service configuration."
fi
}
pkg_config() {
- if [[ -e "${EROOT%/}/var/lib/znc" ]]; then
- ewarn "${EROOT%/}/var/lib/znc already exists, aborting to avoid
damaging"
+ if [[ -e "${EROOT}/var/lib/znc" ]]; then
+ ewarn "${EROOT}/var/lib/znc already exists, aborting to avoid
damaging"
ewarn "any existing configuration. If you are sure you want"
ewarn "to generate a new configuration, remove the folder"
ewarn "and try again."
@@ -169,11 +169,11 @@ pkg_config() {
einfo "Press enter to interactively create a new configuration
file for znc."
einfo "To abort, press Control-C"
read
- mkdir -p "${EROOT%/}/var/lib/znc" || die
- chown -R ${PN}:${PN} "${EROOT%/}/var/lib/znc" ||
+ mkdir -p "${EROOT}/var/lib/znc" || die
+ chown -R ${PN}:${PN} "${EROOT}/var/lib/znc" ||
die "Setting permissions failed"
start-stop-daemon --start --user ${PN}:${PN} --env
ZNC_NO_LAUNCH_AFTER_MAKECONF=1 \
- "${EROOT%/}"/usr/bin/znc -- --makeconf --datadir
"${EROOT%/}/var/lib/znc" ||
+ "${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."
diff --git a/net-irc/znc/znc-1.7.4.ebuild b/net-irc/znc/znc-1.7.4.ebuild
index 9e33853571d..d6e9044033e 100644
--- a/net-irc/znc/znc-1.7.4.ebuild
+++ b/net-irc/znc/znc-1.7.4.ebuild
@@ -149,19 +149,19 @@ pkg_postinst() {
readme.gentoo_print_elog
fi
- if [[ -d "${EROOT%/}"/etc/znc ]]; then
- ewarn "${EROOT%/}/etc/znc exists on your system."
+ if [[ -d "${EROOT}"/etc/znc ]]; then
+ ewarn "${EROOT}/etc/znc exists on your system."
ewarn "Due to the nature of the contents of that folder,"
ewarn "we have changed the default configuration to use"
- ewarn " ${EROOT%/}/var/lib/znc"
- ewarn "please move ${EROOT%/}/etc/znc to ${EROOT%/}/var/lib/znc"
+ ewarn " ${EROOT}/var/lib/znc"
+ ewarn "please move ${EROOT}/etc/znc to ${EROOT}/var/lib/znc"
ewarn "or adjust your service configuration."
fi
}
pkg_config() {
- if [[ -e "${EROOT%/}/var/lib/znc" ]]; then
- ewarn "${EROOT%/}/var/lib/znc already exists, aborting to avoid
damaging"
+ if [[ -e "${EROOT}/var/lib/znc" ]]; then
+ ewarn "${EROOT}/var/lib/znc already exists, aborting to avoid
damaging"
ewarn "any existing configuration. If you are sure you want"
ewarn "to generate a new configuration, remove the folder"
ewarn "and try again."
@@ -169,11 +169,11 @@ pkg_config() {
einfo "Press enter to interactively create a new configuration
file for znc."
einfo "To abort, press Control-C"
read
- mkdir -p "${EROOT%/}/var/lib/znc" || die
- chown -R ${PN}:${PN} "${EROOT%/}/var/lib/znc" ||
+ mkdir -p "${EROOT}/var/lib/znc" || die
+ chown -R ${PN}:${PN} "${EROOT}/var/lib/znc" ||
[gentoo-commits] repo/gentoo:master commit in: net-irc/znc/
commit: 5117fe83797d162c186cd4e04385949eb9a55da8
Author: Louis Sautier gentoo org>
AuthorDate: Tue Jun 25 21:42:58 2019 +
Commit: Louis Sautier gentoo org>
CommitDate: Tue Jun 25 21:56:24 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5117fe83
net-irc/znc: bump to 1.7.4
There are no differences compared to rc1 except for the version change:
https://github.com/znc/znc/compare/znc-1.7.4-rc1...znc-1.7.4
Bug: https://bugs.gentoo.org/688152
Package-Manager: Portage-2.3.67, Repoman-2.3.14
Signed-off-by: Louis Sautier gentoo.org>
net-irc/znc/Manifest | 2 +-
net-irc/znc/{znc-1.7.4_rc1.ebuild => znc-1.7.4.ebuild} | 0
2 files changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-irc/znc/Manifest b/net-irc/znc/Manifest
index c04a8449bb7..beff2345859 100644
--- a/net-irc/znc/Manifest
+++ b/net-irc/znc/Manifest
@@ -1,3 +1,3 @@
DIST gtest-1.8.1.tar.gz 992298 BLAKE2B
40ef3417fe424205c0617f07207347ce671ac87605f8ac9b8a333b0b06e3fbef9f556041ee324c18f957f3258ab9fe06704f31cdd038355fb7890180eb77ced1
SHA512
e6283c667558e1fd6e49fa96e52af0e415a3c8037afe1d28b7ff1ec4c2ef8f49beb70a9327b7fc77eb4052a58c4ccad8b5260ec90e4bceeac7a46ff59c4369d7
DIST znc-1.7.3.tar.gz 2084575 BLAKE2B
4d8f76abef8bf2c5f96d9bd04716cd2debae2b2fcd3b8688aa715af6ef09e60c2aac203c5c7b32d2f4d56730f30dbbe9abd5eeec4f07e7580900dcb1cd164530
SHA512
4cd63be2cb3bc1e3950f38984b128c6511bd1b9fc01a00d51cfcdc46826c2dedad120d6ed8e30d9c400909e33d39b2b14579fb40ee1e3508b7f3a07eff3a15d8
-DIST znc-1.7.4-rc1.tar.gz 2084722 BLAKE2B
cdbc9a6713ecb1261275060b07bfdc16f9edd933bd7337f346c4c2bbf450f1810b5c82f382d31000d3b07fef145279adacf2bdd8518541dbe9ba3a9c4ab972f5
SHA512
49e45732db371159ada2678df1e494a0f4ae9c517f111672ab184e3c5ac60e354a63f7039167a7ca0ca09c300c33b9cc3f9dfc35ba3940f5a70efa35c0089911
+DIST znc-1.7.4.tar.gz 2084756 BLAKE2B
3b389a13d7c1c59b8ac485b6996b5a56a03689e8191a65c99692ea849a99ed0a013065a47ea3d213faf883e1d3e595375a665090b4173e97261c3afe21a120e7
SHA512
ea559ee9e06bfbc51c03ef08e145bc39ee7402638cc153fab7dc1dcedae01548fa0743d726304f9e4631a66241eb96c03940b76093954093a35f69641133b2ae
diff --git a/net-irc/znc/znc-1.7.4_rc1.ebuild b/net-irc/znc/znc-1.7.4.ebuild
similarity index 100%
rename from net-irc/znc/znc-1.7.4_rc1.ebuild
rename to net-irc/znc/znc-1.7.4.ebuild
[gentoo-commits] repo/gentoo:master commit in: net-irc/znc/
commit: 6f39db5b27af0065d89fe985783831bbdbea9f76
Author: Mikle Kolyada gentoo org>
AuthorDate: Thu Jun 20 09:26:30 2019 +
Commit: Mikle Kolyada gentoo org>
CommitDate: Thu Jun 20 09:26:30 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6f39db5b
net-irc/znc: amd64 stable wrt bug #688152
Signed-off-by: Mikle Kolyada gentoo.org>
Package-Manager: Portage-2.3.66, Repoman-2.3.11
RepoMan-Options: --include-arches="amd64"
net-irc/znc/znc-1.7.4_rc1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-irc/znc/znc-1.7.4_rc1.ebuild b/net-irc/znc/znc-1.7.4_rc1.ebuild
index 7f06cfb1a01..9e33853571d 100644
--- a/net-irc/znc/znc-1.7.4_rc1.ebuild
+++ b/net-irc/znc/znc-1.7.4_rc1.ebuild
@@ -22,7 +22,7 @@ else
https://znc.in/releases/archive/${MY_P}.tar.gz
test? ( ${GTEST_URL} )
"
- KEYWORDS="~amd64 ~arm x86"
+ KEYWORDS="amd64 ~arm x86"
S=${WORKDIR}/${MY_P}
fi
[gentoo-commits] repo/gentoo:master commit in: net-irc/znc/
commit: 5b8d411d09bb18e9ddb7c6cc7990d988b43d62ef
Author: Thomas Deutschmann gentoo org>
AuthorDate: Tue Jun 18 18:22:54 2019 +
Commit: Thomas Deutschmann gentoo org>
CommitDate: Tue Jun 18 18:24:31 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5b8d411d
net-irc/znc: x86 stable (bug #688152)
Package-Manager: Portage-2.3.67, Repoman-2.3.14
Signed-off-by: Thomas Deutschmann gentoo.org>
net-irc/znc/znc-1.7.4_rc1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-irc/znc/znc-1.7.4_rc1.ebuild b/net-irc/znc/znc-1.7.4_rc1.ebuild
index e2a032f9ea5..7f06cfb1a01 100644
--- a/net-irc/znc/znc-1.7.4_rc1.ebuild
+++ b/net-irc/znc/znc-1.7.4_rc1.ebuild
@@ -22,7 +22,7 @@ else
https://znc.in/releases/archive/${MY_P}.tar.gz
test? ( ${GTEST_URL} )
"
- KEYWORDS="~amd64 ~arm ~x86"
+ KEYWORDS="~amd64 ~arm x86"
S=${WORKDIR}/${MY_P}
fi
[gentoo-commits] repo/gentoo:master commit in: net-irc/znc/
commit: f70923983bf75ea5175942f34d9825a2193dc846
Author: Louis Sautier gentoo org>
AuthorDate: Sun Jun 16 14:01:53 2019 +
Commit: Louis Sautier gentoo org>
CommitDate: Sun Jun 16 14:03:24 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f7092398
net-irc/znc: bump 1.7.4_rc1, fixes authenticated RCE CVE-2019-12816
Bug: https://bugs.gentoo.org/688152
Package-Manager: Portage-2.3.67, Repoman-2.3.14
Signed-off-by: Louis Sautier gentoo.org>
net-irc/znc/Manifest | 1 +
net-irc/znc/znc-1.7.4_rc1.ebuild | 182 +++
2 files changed, 183 insertions(+)
diff --git a/net-irc/znc/Manifest b/net-irc/znc/Manifest
index 015aae3862b..c04a8449bb7 100644
--- a/net-irc/znc/Manifest
+++ b/net-irc/znc/Manifest
@@ -1,2 +1,3 @@
DIST gtest-1.8.1.tar.gz 992298 BLAKE2B
40ef3417fe424205c0617f07207347ce671ac87605f8ac9b8a333b0b06e3fbef9f556041ee324c18f957f3258ab9fe06704f31cdd038355fb7890180eb77ced1
SHA512
e6283c667558e1fd6e49fa96e52af0e415a3c8037afe1d28b7ff1ec4c2ef8f49beb70a9327b7fc77eb4052a58c4ccad8b5260ec90e4bceeac7a46ff59c4369d7
DIST znc-1.7.3.tar.gz 2084575 BLAKE2B
4d8f76abef8bf2c5f96d9bd04716cd2debae2b2fcd3b8688aa715af6ef09e60c2aac203c5c7b32d2f4d56730f30dbbe9abd5eeec4f07e7580900dcb1cd164530
SHA512
4cd63be2cb3bc1e3950f38984b128c6511bd1b9fc01a00d51cfcdc46826c2dedad120d6ed8e30d9c400909e33d39b2b14579fb40ee1e3508b7f3a07eff3a15d8
+DIST znc-1.7.4-rc1.tar.gz 2084722 BLAKE2B
cdbc9a6713ecb1261275060b07bfdc16f9edd933bd7337f346c4c2bbf450f1810b5c82f382d31000d3b07fef145279adacf2bdd8518541dbe9ba3a9c4ab972f5
SHA512
49e45732db371159ada2678df1e494a0f4ae9c517f111672ab184e3c5ac60e354a63f7039167a7ca0ca09c300c33b9cc3f9dfc35ba3940f5a70efa35c0089911
diff --git a/net-irc/znc/znc-1.7.4_rc1.ebuild b/net-irc/znc/znc-1.7.4_rc1.ebuild
new file mode 100644
index 000..e2a032f9ea5
--- /dev/null
+++ b/net-irc/znc/znc-1.7.4_rc1.ebuild
@@ -0,0 +1,182 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{5,6,7} )
+
+inherit cmake-utils python-single-r1 readme.gentoo-r1 systemd user
+
+GTEST_VER="1.8.1"
+GTEST_URL="https://github.com/google/googletest/archive/${GTEST_VER}.tar.gz ->
gtest-${GTEST_VER}.tar.gz"
+DESCRIPTION="An advanced IRC Bouncer"
+
+if [[ ${PV} == ** ]]; then
+ inherit git-r3
+ EGIT_REPO_URI=${EGIT_REPO_URI:-"https://github.com/znc/znc.git"}
+ SRC_URI=""
+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 ~x86"
+ S=${WORKDIR}/${MY_P}
+fi
+
+HOMEPAGE="https://znc.in";
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="+ipv6 +icu libressl nls perl python +ssl sasl tcl test +zlib"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} icu )"
+
+RDEPEND="
+ 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? (
+ !libressl? ( dev-libs/openssl:0= )
+ libressl? ( dev-libs/libressl:0= )
+ )
+ tcl? ( dev-lang/tcl:0= )
+ zlib? ( sys-libs/zlib:0= )
+"
+DEPEND="
+ ${RDEPEND}
+ virtual/pkgconfig
+ nls? ( sys-devel/gettext )
+ perl? ( >=dev-lang/swig-3.0.0 )
+ python? ( >=dev-lang/swig-3.0.0 )
+ test? ( dev-qt/qtnetwork:5 )
+"
+
+PATCHES=( "${FILESDIR}"/${PN}-1.7.1-inttest-dir.patch )
+
+pkg_setup() {
+ if use python; then
+ python-single-r1_pkg_setup
+ fi
+
+ enewgroup ${PN}
+ enewuser ${PN} -1 -1 /var/lib/${PN} ${PN}
+ # The home directory was previously set to /dev/null
+ # This caused a bug with the systemd unit
+ # https://bugs.gentoo.org/521916
+ esethome ${PN} /var/lib/${PN}
+}
+
+src_prepare() {
+ # Let SWIG rebuild modperl/modpython to make user patching easier.
+ if [[ ${PV} != ** ]]; 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
+
+ cmake-utils_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_IPV6="$(usex ipv6)"
+ -DWANT_I18N="$(usex nls)"
+ -DWANT_PERL="$(usex perl)"
+ -DWANT_PYTHON="$(usex python)"
+ -DWANT_CYRUS="$(usex sasl)"
+ -DWANT_OPENSSL="$(usex ssl)"
+ -DWANT_TCL="$(usex tcl)"
+ -DWANT_ZLIB="$(usex zlib)"
+ )
+
+ if [[ ${PV} != *999
[gentoo-commits] repo/gentoo:master commit in: net-irc/znc/
commit: a627297e675af58ff38009ff59fa790275334868
Author: Louis Sautier gentoo org>
AuthorDate: Sun Apr 7 22:49:32 2019 +
Commit: Louis Sautier gentoo org>
CommitDate: Sun Apr 7 22:49:32 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a627297e
net-irc/znc: remove versions vulnerable to CVE-2019-9917
Bug: https://bugs.gentoo.org/681864
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Louis Sautier gentoo.org>
net-irc/znc/Manifest | 3 -
net-irc/znc/znc-1.7.1.ebuild | 182 ---
net-irc/znc/znc-1.7.2.ebuild | 182 ---
3 files changed, 367 deletions(-)
diff --git a/net-irc/znc/Manifest b/net-irc/znc/Manifest
index a57a86eff9b..015aae3862b 100644
--- a/net-irc/znc/Manifest
+++ b/net-irc/znc/Manifest
@@ -1,5 +1,2 @@
DIST gtest-1.8.1.tar.gz 992298 BLAKE2B
40ef3417fe424205c0617f07207347ce671ac87605f8ac9b8a333b0b06e3fbef9f556041ee324c18f957f3258ab9fe06704f31cdd038355fb7890180eb77ced1
SHA512
e6283c667558e1fd6e49fa96e52af0e415a3c8037afe1d28b7ff1ec4c2ef8f49beb70a9327b7fc77eb4052a58c4ccad8b5260ec90e4bceeac7a46ff59c4369d7
-DIST gtest-ba96d0b1161f540656efdaed035b3c062b60e006.tar.gz 987370 BLAKE2B
fcedfe559c4c93166962900117dc492da3cbb99165c30766c39131c20e3b41f057a31a8cb631beaca829c1e9966e90cbc37469ba56a5fc15a2bea86cbe401a63
SHA512
ce78098f973b45f4a177db387c42a56d5ea34407a2af278760b850c326e8450760a58991d62a5408f5df79f89fefd10fee71745b7e8669b2a6f74fa63a259600
-DIST znc-1.7.1.tar.gz 2041669 BLAKE2B
57ead136e28b0fc4a875802ef89ef004213789e68d19ceeab15c6fac6fe51ea51618764c484ea618fc6359d9c15cc7ffcf5529642d730b9217a4f127e92d9ae6
SHA512
907068fb0828091026d440145b70ca76109302f13c18d94f772660192434287f209a06a52da1dd39726b9a38735b3cea9afbd062eb6def4cd428bb73c562a902
-DIST znc-1.7.2.tar.gz 2083306 BLAKE2B
907581df536d9bab15964f6fcecbbf660403c39368b984ab1d2957bd43c4a90ca0694844b41786dab5495a4f4dccd675eaa54189782d47683e013d1faf9cc368
SHA512
fcc67bf676e066db64d62584ff8ecfd63280b3237e88dcbe18ab0b78a9b5f4dc202b589876b6fc14c6092ca5509937bc170a54fba44df2aeb1645cca02afe577
DIST znc-1.7.3.tar.gz 2084575 BLAKE2B
4d8f76abef8bf2c5f96d9bd04716cd2debae2b2fcd3b8688aa715af6ef09e60c2aac203c5c7b32d2f4d56730f30dbbe9abd5eeec4f07e7580900dcb1cd164530
SHA512
4cd63be2cb3bc1e3950f38984b128c6511bd1b9fc01a00d51cfcdc46826c2dedad120d6ed8e30d9c400909e33d39b2b14579fb40ee1e3508b7f3a07eff3a15d8
diff --git a/net-irc/znc/znc-1.7.1.ebuild b/net-irc/znc/znc-1.7.1.ebuild
deleted file mode 100644
index 1de5e05761e..000
--- a/net-irc/znc/znc-1.7.1.ebuild
+++ /dev/null
@@ -1,182 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{4,5,6,7} )
-
-inherit cmake-utils python-single-r1 readme.gentoo-r1 systemd user
-
-GTEST_VER="ba96d0b1161f540656efdaed035b3c062b60e006" # 1.8.0 is too old, but
newer version not released yet
-GTEST_URL="https://github.com/google/googletest/archive/${GTEST_VER}.tar.gz ->
gtest-${GTEST_VER}.tar.gz"
-DESCRIPTION="An advanced IRC Bouncer"
-
-if [[ ${PV} == ** ]]; then
- inherit git-r3
- EGIT_REPO_URI=${EGIT_REPO_URI:-"https://github.com/znc/znc.git"}
- SRC_URI=""
-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 x86"
- S=${WORKDIR}/${MY_P}
-fi
-
-HOMEPAGE="https://znc.in";
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="+ipv6 +icu libressl nls perl python +ssl sasl tcl test +zlib"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} icu )"
-
-RDEPEND="
- 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? (
- !libressl? ( dev-libs/openssl:0= )
- libressl? ( dev-libs/libressl:0= )
- )
- tcl? ( dev-lang/tcl:0= )
- zlib? ( sys-libs/zlib:0= )
-"
-DEPEND="
- ${RDEPEND}
- virtual/pkgconfig
- nls? ( sys-devel/gettext )
- perl? ( >=dev-lang/swig-3.0.0 )
- python? ( >=dev-lang/swig-3.0.0 )
- test? ( dev-qt/qtnetwork:5 )
-"
-
-PATCHES=( "${FILESDIR}"/${PN}-1.7.1-inttest-dir.patch )
-
-pkg_setup() {
- if use python; then
- python-single-r1_pkg_setup
- fi
-
- enewgroup ${PN}
- enewuser ${PN} -1 -1 /var/lib/${PN} ${PN}
- # The home directory was previously set to /dev/null
- # This caused a bug with the systemd unit
- # https://bugs.gentoo.org/521916
- esethome ${PN} /var/lib/${PN}
-}
-
-src_prepare() {
- # Let SWIG rebuild modperl/modpython to make user patching easier.
- if [[ ${PV} != ** ]]; then
- rm modules/modperl/generated.tar.gz || die
- rm modules/modpython/genera
[gentoo-commits] repo/gentoo:master commit in: net-irc/znc/
commit: 987ee2cbf2fc574824a62ee8e304be3f47c1ae1a
Author: Mikle Kolyada gentoo org>
AuthorDate: Sun Apr 7 21:42:10 2019 +
Commit: Mikle Kolyada gentoo org>
CommitDate: Sun Apr 7 21:42:10 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=987ee2cb
net-irc/znc: arm stable wrt bug #681864
Signed-off-by: Mikle Kolyada gentoo.org>
Package-Manager: Portage-2.3.62, Repoman-2.3.11
RepoMan-Options: --include-arches="arm"
net-irc/znc/znc-1.7.3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-irc/znc/znc-1.7.3.ebuild b/net-irc/znc/znc-1.7.3.ebuild
index 2e12fe36390..995ab53ba14 100644
--- a/net-irc/znc/znc-1.7.3.ebuild
+++ b/net-irc/znc/znc-1.7.3.ebuild
@@ -22,7 +22,7 @@ else
https://znc.in/releases/archive/${MY_P}.tar.gz
test? ( ${GTEST_URL} )
"
- KEYWORDS="amd64 ~arm x86"
+ KEYWORDS="amd64 arm x86"
S=${WORKDIR}/${MY_P}
fi
[gentoo-commits] repo/gentoo:master commit in: net-irc/znc/
commit: 21845b291f7b7ddd046960db9f0907cf3b91d9c2
Author: Mikle Kolyada gentoo org>
AuthorDate: Tue Apr 2 09:27:40 2019 +
Commit: Mikle Kolyada gentoo org>
CommitDate: Tue Apr 2 09:27:40 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=21845b29
net-irc/znc: amd64 stable wrt bug #681864
Signed-off-by: Mikle Kolyada gentoo.org>
Package-Manager: Portage-2.3.62, Repoman-2.3.11
RepoMan-Options: --include-arches="amd64"
net-irc/znc/znc-1.7.3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-irc/znc/znc-1.7.3.ebuild b/net-irc/znc/znc-1.7.3.ebuild
index 59a766ba986..2e12fe36390 100644
--- a/net-irc/znc/znc-1.7.3.ebuild
+++ b/net-irc/znc/znc-1.7.3.ebuild
@@ -22,7 +22,7 @@ else
https://znc.in/releases/archive/${MY_P}.tar.gz
test? ( ${GTEST_URL} )
"
- KEYWORDS="~amd64 ~arm x86"
+ KEYWORDS="amd64 ~arm x86"
S=${WORKDIR}/${MY_P}
fi
[gentoo-commits] repo/gentoo:master commit in: net-irc/znc/
commit: 35085a2b9d327e7ea81c7669fdcf29ac1f9c51e4
Author: Thomas Deutschmann gentoo org>
AuthorDate: Mon Apr 1 17:19:45 2019 +
Commit: Thomas Deutschmann gentoo org>
CommitDate: Mon Apr 1 17:19:45 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=35085a2b
net-irc/znc: x86 stable (bug #681864)
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Thomas Deutschmann gentoo.org>
net-irc/znc/znc-1.7.3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-irc/znc/znc-1.7.3.ebuild b/net-irc/znc/znc-1.7.3.ebuild
index b8d5eb3df8f..59a766ba986 100644
--- a/net-irc/znc/znc-1.7.3.ebuild
+++ b/net-irc/znc/znc-1.7.3.ebuild
@@ -22,7 +22,7 @@ else
https://znc.in/releases/archive/${MY_P}.tar.gz
test? ( ${GTEST_URL} )
"
- KEYWORDS="~amd64 ~arm ~x86"
+ KEYWORDS="~amd64 ~arm x86"
S=${WORKDIR}/${MY_P}
fi
[gentoo-commits] repo/gentoo:master commit in: net-irc/znc/
commit: a9cc051e15e39e75565eb2acf397f8eaad21cb0f
Author: Louis Sautier gentoo org>
AuthorDate: Sun Mar 31 22:55:10 2019 +
Commit: Louis Sautier gentoo org>
CommitDate: Sun Mar 31 22:56:34 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a9cc051e
net-irc/znc: bump to 1.7.3, fixes CVE-2019-9917
Bug: https://bugs.gentoo.org/681864
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Louis Sautier gentoo.org>
net-irc/znc/Manifest | 1 +
net-irc/znc/znc-1.7.3.ebuild | 182 +++
2 files changed, 183 insertions(+)
diff --git a/net-irc/znc/Manifest b/net-irc/znc/Manifest
index 5c3a7e5e7aa..a57a86eff9b 100644
--- a/net-irc/znc/Manifest
+++ b/net-irc/znc/Manifest
@@ -2,3 +2,4 @@ DIST gtest-1.8.1.tar.gz 992298 BLAKE2B
40ef3417fe424205c0617f07207347ce671ac8760
DIST gtest-ba96d0b1161f540656efdaed035b3c062b60e006.tar.gz 987370 BLAKE2B
fcedfe559c4c93166962900117dc492da3cbb99165c30766c39131c20e3b41f057a31a8cb631beaca829c1e9966e90cbc37469ba56a5fc15a2bea86cbe401a63
SHA512
ce78098f973b45f4a177db387c42a56d5ea34407a2af278760b850c326e8450760a58991d62a5408f5df79f89fefd10fee71745b7e8669b2a6f74fa63a259600
DIST znc-1.7.1.tar.gz 2041669 BLAKE2B
57ead136e28b0fc4a875802ef89ef004213789e68d19ceeab15c6fac6fe51ea51618764c484ea618fc6359d9c15cc7ffcf5529642d730b9217a4f127e92d9ae6
SHA512
907068fb0828091026d440145b70ca76109302f13c18d94f772660192434287f209a06a52da1dd39726b9a38735b3cea9afbd062eb6def4cd428bb73c562a902
DIST znc-1.7.2.tar.gz 2083306 BLAKE2B
907581df536d9bab15964f6fcecbbf660403c39368b984ab1d2957bd43c4a90ca0694844b41786dab5495a4f4dccd675eaa54189782d47683e013d1faf9cc368
SHA512
fcc67bf676e066db64d62584ff8ecfd63280b3237e88dcbe18ab0b78a9b5f4dc202b589876b6fc14c6092ca5509937bc170a54fba44df2aeb1645cca02afe577
+DIST znc-1.7.3.tar.gz 2084575 BLAKE2B
4d8f76abef8bf2c5f96d9bd04716cd2debae2b2fcd3b8688aa715af6ef09e60c2aac203c5c7b32d2f4d56730f30dbbe9abd5eeec4f07e7580900dcb1cd164530
SHA512
4cd63be2cb3bc1e3950f38984b128c6511bd1b9fc01a00d51cfcdc46826c2dedad120d6ed8e30d9c400909e33d39b2b14579fb40ee1e3508b7f3a07eff3a15d8
diff --git a/net-irc/znc/znc-1.7.3.ebuild b/net-irc/znc/znc-1.7.3.ebuild
new file mode 100644
index 000..b8d5eb3df8f
--- /dev/null
+++ b/net-irc/znc/znc-1.7.3.ebuild
@@ -0,0 +1,182 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{4,5,6,7} )
+
+inherit cmake-utils python-single-r1 readme.gentoo-r1 systemd user
+
+GTEST_VER="1.8.1"
+GTEST_URL="https://github.com/google/googletest/archive/${GTEST_VER}.tar.gz ->
gtest-${GTEST_VER}.tar.gz"
+DESCRIPTION="An advanced IRC Bouncer"
+
+if [[ ${PV} == ** ]]; then
+ inherit git-r3
+ EGIT_REPO_URI=${EGIT_REPO_URI:-"https://github.com/znc/znc.git"}
+ SRC_URI=""
+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 ~x86"
+ S=${WORKDIR}/${MY_P}
+fi
+
+HOMEPAGE="https://znc.in";
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="+ipv6 +icu libressl nls perl python +ssl sasl tcl test +zlib"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} icu )"
+
+RDEPEND="
+ 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? (
+ !libressl? ( dev-libs/openssl:0= )
+ libressl? ( dev-libs/libressl:0= )
+ )
+ tcl? ( dev-lang/tcl:0= )
+ zlib? ( sys-libs/zlib:0= )
+"
+DEPEND="
+ ${RDEPEND}
+ virtual/pkgconfig
+ nls? ( sys-devel/gettext )
+ perl? ( >=dev-lang/swig-3.0.0 )
+ python? ( >=dev-lang/swig-3.0.0 )
+ test? ( dev-qt/qtnetwork:5 )
+"
+
+PATCHES=( "${FILESDIR}"/${PN}-1.7.1-inttest-dir.patch )
+
+pkg_setup() {
+ if use python; then
+ python-single-r1_pkg_setup
+ fi
+
+ enewgroup ${PN}
+ enewuser ${PN} -1 -1 /var/lib/${PN} ${PN}
+ # The home directory was previously set to /dev/null
+ # This caused a bug with the systemd unit
+ # https://bugs.gentoo.org/521916
+ esethome ${PN} /var/lib/${PN}
+}
+
+src_prepare() {
+ # Let SWIG rebuild modperl/modpython to make user patching easier.
+ if [[ ${PV} != ** ]]; 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
+
+ cmake-utils_src_prepare
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DWANT_SYSTEMD=yes # Causes -DSYSTEMD_DIR to be used.
+ -DSYSTEMD_DIR="$(systemd_get_systemunitdir)"
+ -DWANT_ICU="$(usex icu)"
+
[gentoo-commits] repo/gentoo:master commit in: net-irc/znc/
commit: e9e5b32a38cb45e120f5484d7f7c9f8e5de0740f
Author: Louis Sautier gentoo org>
AuthorDate: Sun Jan 27 14:15:45 2019 +
Commit: Louis Sautier gentoo org>
CommitDate: Sun Jan 27 14:37:34 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e9e5b32a
net-irc/znc: sync live ebuild with latest release
Package-Manager: Portage-2.3.58, Repoman-2.3.12
Signed-off-by: Louis Sautier gentoo.org>
net-irc/znc/znc-.ebuild | 14 +++---
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/net-irc/znc/znc-.ebuild b/net-irc/znc/znc-.ebuild
index e59849a6e29..b8d5eb3df8f 100644
--- a/net-irc/znc/znc-.ebuild
+++ b/net-irc/znc/znc-.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
-PYTHON_COMPAT=( python3_{4,5,6} )
+PYTHON_COMPAT=( python3_{4,5,6,7} )
inherit cmake-utils python-single-r1 readme.gentoo-r1 systemd user
-GTEST_VER="ba96d0b1161f540656efdaed035b3c062b60e006" # 1.8.0 is too old, but
newer version not released yet
+GTEST_VER="1.8.1"
GTEST_URL="https://github.com/google/googletest/archive/${GTEST_VER}.tar.gz ->
gtest-${GTEST_VER}.tar.gz"
DESCRIPTION="An advanced IRC Bouncer"
@@ -99,8 +99,8 @@ src_configure() {
)
if [[ ${PV} != ** ]] && use test; then
- export
GTEST_ROOT="${WORKDIR}/googletest-${GTEST_VER}/googletest"
- export
GMOCK_ROOT="${WORKDIR}/googletest-${GTEST_VER}/googlemock"
+ export
GTEST_ROOT="${WORKDIR}/googletest-release-${GTEST_VER}/googletest"
+ export
GMOCK_ROOT="${WORKDIR}/googletest-release-${GTEST_VER}/googlemock"
fi
cmake-utils_src_configure
@@ -109,7 +109,7 @@ src_configure() {
src_test() {
cmake-utils_src_make unittest
if has network-sandbox ${FEATURES}; then
- cmake-utils_src_make install DESTDIR="${T}/inttest"
+ DESTDIR="${T}/inttest" cmake-utils_src_make install
local filter='-'
if ! use perl; then
filter="${filter}:ZNCTest.Modperl*"
[gentoo-commits] repo/gentoo:master commit in: net-irc/znc/
commit: 76cd8cf9dc4a2cebef4406d7edf435c9fb022034
Author: Louis Sautier gentoo org>
AuthorDate: Sun Jan 27 14:15:05 2019 +
Commit: Louis Sautier gentoo org>
CommitDate: Sun Jan 27 14:37:34 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=76cd8cf9
net-irc/znc: bump to 1.7.2, EAPI=7, uses ninja instead of make
Package-Manager: Portage-2.3.58, Repoman-2.3.12
Signed-off-by: Louis Sautier gentoo.org>
net-irc/znc/Manifest | 2 +
net-irc/znc/znc-1.7.2.ebuild | 182 +++
2 files changed, 184 insertions(+)
diff --git a/net-irc/znc/Manifest b/net-irc/znc/Manifest
index cf9e0f5c01a..5c3a7e5e7aa 100644
--- a/net-irc/znc/Manifest
+++ b/net-irc/znc/Manifest
@@ -1,2 +1,4 @@
+DIST gtest-1.8.1.tar.gz 992298 BLAKE2B
40ef3417fe424205c0617f07207347ce671ac87605f8ac9b8a333b0b06e3fbef9f556041ee324c18f957f3258ab9fe06704f31cdd038355fb7890180eb77ced1
SHA512
e6283c667558e1fd6e49fa96e52af0e415a3c8037afe1d28b7ff1ec4c2ef8f49beb70a9327b7fc77eb4052a58c4ccad8b5260ec90e4bceeac7a46ff59c4369d7
DIST gtest-ba96d0b1161f540656efdaed035b3c062b60e006.tar.gz 987370 BLAKE2B
fcedfe559c4c93166962900117dc492da3cbb99165c30766c39131c20e3b41f057a31a8cb631beaca829c1e9966e90cbc37469ba56a5fc15a2bea86cbe401a63
SHA512
ce78098f973b45f4a177db387c42a56d5ea34407a2af278760b850c326e8450760a58991d62a5408f5df79f89fefd10fee71745b7e8669b2a6f74fa63a259600
DIST znc-1.7.1.tar.gz 2041669 BLAKE2B
57ead136e28b0fc4a875802ef89ef004213789e68d19ceeab15c6fac6fe51ea51618764c484ea618fc6359d9c15cc7ffcf5529642d730b9217a4f127e92d9ae6
SHA512
907068fb0828091026d440145b70ca76109302f13c18d94f772660192434287f209a06a52da1dd39726b9a38735b3cea9afbd062eb6def4cd428bb73c562a902
+DIST znc-1.7.2.tar.gz 2083306 BLAKE2B
907581df536d9bab15964f6fcecbbf660403c39368b984ab1d2957bd43c4a90ca0694844b41786dab5495a4f4dccd675eaa54189782d47683e013d1faf9cc368
SHA512
fcc67bf676e066db64d62584ff8ecfd63280b3237e88dcbe18ab0b78a9b5f4dc202b589876b6fc14c6092ca5509937bc170a54fba44df2aeb1645cca02afe577
diff --git a/net-irc/znc/znc-1.7.2.ebuild b/net-irc/znc/znc-1.7.2.ebuild
new file mode 100644
index 000..b8d5eb3df8f
--- /dev/null
+++ b/net-irc/znc/znc-1.7.2.ebuild
@@ -0,0 +1,182 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{4,5,6,7} )
+
+inherit cmake-utils python-single-r1 readme.gentoo-r1 systemd user
+
+GTEST_VER="1.8.1"
+GTEST_URL="https://github.com/google/googletest/archive/${GTEST_VER}.tar.gz ->
gtest-${GTEST_VER}.tar.gz"
+DESCRIPTION="An advanced IRC Bouncer"
+
+if [[ ${PV} == ** ]]; then
+ inherit git-r3
+ EGIT_REPO_URI=${EGIT_REPO_URI:-"https://github.com/znc/znc.git"}
+ SRC_URI=""
+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 ~x86"
+ S=${WORKDIR}/${MY_P}
+fi
+
+HOMEPAGE="https://znc.in";
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="+ipv6 +icu libressl nls perl python +ssl sasl tcl test +zlib"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} icu )"
+
+RDEPEND="
+ 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? (
+ !libressl? ( dev-libs/openssl:0= )
+ libressl? ( dev-libs/libressl:0= )
+ )
+ tcl? ( dev-lang/tcl:0= )
+ zlib? ( sys-libs/zlib:0= )
+"
+DEPEND="
+ ${RDEPEND}
+ virtual/pkgconfig
+ nls? ( sys-devel/gettext )
+ perl? ( >=dev-lang/swig-3.0.0 )
+ python? ( >=dev-lang/swig-3.0.0 )
+ test? ( dev-qt/qtnetwork:5 )
+"
+
+PATCHES=( "${FILESDIR}"/${PN}-1.7.1-inttest-dir.patch )
+
+pkg_setup() {
+ if use python; then
+ python-single-r1_pkg_setup
+ fi
+
+ enewgroup ${PN}
+ enewuser ${PN} -1 -1 /var/lib/${PN} ${PN}
+ # The home directory was previously set to /dev/null
+ # This caused a bug with the systemd unit
+ # https://bugs.gentoo.org/521916
+ esethome ${PN} /var/lib/${PN}
+}
+
+src_prepare() {
+ # Let SWIG rebuild modperl/modpython to make user patching easier.
+ if [[ ${PV} != ** ]]; 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
+
+ cmake-utils_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_IPV6="$(usex ipv6)"
+ -DWANT_I18N="$(usex nls)"
+ -D
[gentoo-commits] repo/gentoo:master commit in: net-irc/znc/
commit: cb2784be1a0263fcb9d6773cbbaa289e9a571b0d
Author: Louis Sautier gentoo org>
AuthorDate: Thu Jul 19 11:03:53 2018 +
Commit: Louis Sautier gentoo org>
CommitDate: Thu Jul 19 11:04:02 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cb2784be
net-irc/znc: add Python 3.7
Package-Manager: Portage-2.3.43, Repoman-2.3.10
net-irc/znc/znc-1.7.1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-irc/znc/znc-1.7.1.ebuild b/net-irc/znc/znc-1.7.1.ebuild
index 0b449633796..1de5e05761e 100644
--- a/net-irc/znc/znc-1.7.1.ebuild
+++ b/net-irc/znc/znc-1.7.1.ebuild
@@ -3,7 +3,7 @@
EAPI=6
-PYTHON_COMPAT=( python3_{4,5,6} )
+PYTHON_COMPAT=( python3_{4,5,6,7} )
inherit cmake-utils python-single-r1 readme.gentoo-r1 systemd user
[gentoo-commits] repo/gentoo:master commit in: net-irc/znc/
commit: 4b16146c0145d5b8729e9bceb45dc412370c88f9
Author: Louis Sautier gentoo org>
AuthorDate: Tue Jul 17 22:49:39 2018 +
Commit: Louis Sautier gentoo org>
CommitDate: Tue Jul 17 22:53:04 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4b16146c
net-irc/znc: bump to 1.7.1, only the version string changes
See the following link for a comparison of both releases:
https://github.com/znc/znc/compare/znc-1.7.1-rc1...znc-1.7.1
Bug: https://bugs.gentoo.org/661228
Package-Manager: Portage-2.3.43, Repoman-2.3.10
net-irc/znc/Manifest | 2 +-
net-irc/znc/{znc-1.7.1_rc1.ebuild => znc-1.7.1.ebuild} | 0
2 files changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-irc/znc/Manifest b/net-irc/znc/Manifest
index 62133c7bbce..cf9e0f5c01a 100644
--- a/net-irc/znc/Manifest
+++ b/net-irc/znc/Manifest
@@ -1,2 +1,2 @@
DIST gtest-ba96d0b1161f540656efdaed035b3c062b60e006.tar.gz 987370 BLAKE2B
fcedfe559c4c93166962900117dc492da3cbb99165c30766c39131c20e3b41f057a31a8cb631beaca829c1e9966e90cbc37469ba56a5fc15a2bea86cbe401a63
SHA512
ce78098f973b45f4a177db387c42a56d5ea34407a2af278760b850c326e8450760a58991d62a5408f5df79f89fefd10fee71745b7e8669b2a6f74fa63a259600
-DIST znc-1.7.1-rc1.tar.gz 2041320 BLAKE2B
62669b598d7423cb55fad458fe6172be36904e8599dcde757936883093f24deb6a5ed6a093e3e92854810f02e96372f44139f9807e70e0cf007de90a1373c6a8
SHA512
b4e223c86c75bc97620c52333d90d6458a02777dce9c629f8a095f8134a06992a60978b2fe8bbce29ed1155932f9f37e0a324a498ee16527b0235e4306c34973
+DIST znc-1.7.1.tar.gz 2041669 BLAKE2B
57ead136e28b0fc4a875802ef89ef004213789e68d19ceeab15c6fac6fe51ea51618764c484ea618fc6359d9c15cc7ffcf5529642d730b9217a4f127e92d9ae6
SHA512
907068fb0828091026d440145b70ca76109302f13c18d94f772660192434287f209a06a52da1dd39726b9a38735b3cea9afbd062eb6def4cd428bb73c562a902
diff --git a/net-irc/znc/znc-1.7.1_rc1.ebuild b/net-irc/znc/znc-1.7.1.ebuild
similarity index 100%
rename from net-irc/znc/znc-1.7.1_rc1.ebuild
rename to net-irc/znc/znc-1.7.1.ebuild
[gentoo-commits] repo/gentoo:master commit in: net-irc/znc/, net-irc/znc/files/
commit: e3b663adafd6756f5fd136e71e078fe31083eac8
Author: Louis Sautier gentoo org>
AuthorDate: Mon Jul 16 07:02:08 2018 +
Commit: Louis Sautier gentoo org>
CommitDate: Mon Jul 16 07:03:45 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e3b663ad
net-irc/znc: remove the last vulnerable version
Bug: https://bugs.gentoo.org/661228
Package-Manager: Portage-2.3.42, Repoman-2.3.9
net-irc/znc/Manifest | 2 -
net-irc/znc/files/README.gentoo| 22 ---
.../znc-1.6.1-create-pidfile-per-default.patch | 23 ---
net-irc/znc/files/znc-1.6.1-systemwideconfig.patch | 215 -
net-irc/znc/files/znc.initd-r1 | 39
net-irc/znc/metadata.xml | 1 -
net-irc/znc/znc-1.6.6.ebuild | 129 -
7 files changed, 431 deletions(-)
diff --git a/net-irc/znc/Manifest b/net-irc/znc/Manifest
index eedc2aef66e..62133c7bbce 100644
--- a/net-irc/znc/Manifest
+++ b/net-irc/znc/Manifest
@@ -1,4 +1,2 @@
-DIST googletest-release-1.7.0.tar.gz 468653 BLAKE2B
8dfca8b79dcd7b64ce84bad11ee68c549f4fe3dff7638ed1d845af4a7f754ad5df782d2cbebdb9fecfda2499dae6585e07cda7a8c8c454f0b70723d5c9578aa4
SHA512
c623d5720c4ed574e95158529872815ecff478c03bdcee8b79c9b042a603533f93fe55f939bcfe2cd745ce340fd626ad6d9a95981596f1a4d05053d874cd1dfc
DIST gtest-ba96d0b1161f540656efdaed035b3c062b60e006.tar.gz 987370 BLAKE2B
fcedfe559c4c93166962900117dc492da3cbb99165c30766c39131c20e3b41f057a31a8cb631beaca829c1e9966e90cbc37469ba56a5fc15a2bea86cbe401a63
SHA512
ce78098f973b45f4a177db387c42a56d5ea34407a2af278760b850c326e8450760a58991d62a5408f5df79f89fefd10fee71745b7e8669b2a6f74fa63a259600
-DIST znc-1.6.6.tar.gz 1471612 BLAKE2B
8bd977a95417c4259e9f38759d838f55a146f376dc8bb6230ab6e1b698fb7c9e060cbc237efd4e836961314abab56cc02e7c6bc74e40bad17abaf06e47fbb516
SHA512
cc5bc7328bfe36525ab215b4b53c7cd20aa02b41e7bb28507ff9d9632560f4c30396804e4b828bca0ece19f42813e3fce59d1bae639ea5fc149059f6979e63e7
DIST znc-1.7.1-rc1.tar.gz 2041320 BLAKE2B
62669b598d7423cb55fad458fe6172be36904e8599dcde757936883093f24deb6a5ed6a093e3e92854810f02e96372f44139f9807e70e0cf007de90a1373c6a8
SHA512
b4e223c86c75bc97620c52333d90d6458a02777dce9c629f8a095f8134a06992a60978b2fe8bbce29ed1155932f9f37e0a324a498ee16527b0235e4306c34973
diff --git a/net-irc/znc/files/README.gentoo b/net-irc/znc/files/README.gentoo
deleted file mode 100644
index 5b222a24f58..000
--- a/net-irc/znc/files/README.gentoo
+++ /dev/null
@@ -1,22 +0,0 @@
-To run znc as a user, run 'znc --makeconf' to create a configuration file.
-
-If znc was compiled with the 'daemon' use flag, you may run
-emerge --config znc
-to configure it.
-
-To generate a new SSL certificate, run:
-znc --system-wide-config-as znc --makepem -d /var/lib/znc
-as root.
-
-If migrating from a user-based install, you can copy the existing
-configuration files:
- mkdir /var/lib/znc
- mv /home/$USER/.znc/* /var/lib/znc
- rm -rf /home/$USER/.znc
- chown -R znc:znc /var/lib/znc
-You may also adjust the location of the files and the user running znc
-in /etc/conf.d/znc instead.
-
-To run as a daemon, please make sure that your configuration contains
-PidFile = /run/znc/znc.pid
-or that the PidFile value matches the one in /etc/conf.d/znc.
diff --git a/net-irc/znc/files/znc-1.6.1-create-pidfile-per-default.patch
b/net-irc/znc/files/znc-1.6.1-create-pidfile-per-default.patch
deleted file mode 100644
index 8419e9344bf..000
--- a/net-irc/znc/files/znc-1.6.1-create-pidfile-per-default.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Add PidFile option to new configurations per default
-
-Our runscript requires that ZNC creates a pidfile. This patch will add
-the PidFile directive to ZNC's default configuration.
- src/znc.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/znc.cpp b/src/znc.cpp
-index b33e860..4a02568 100644
a/src/znc.cpp
-+++ b/src/znc.cpp
-@@ -575,6 +575,7 @@ bool CZNC::WriteNewConfig(const CString& sConfigFile) {
- VCString vsLines;
-
- vsLines.push_back(MakeConfigHeader());
-+ vsLines.push_back("PidFile = /run/znc/znc.pid");
- vsLines.push_back("Version = " + CString(VERSION_STR));
-
- m_sConfigFile = ExpandConfigPath(sConfigFile);
---
-2.5.0
-
diff --git a/net-irc/znc/files/znc-1.6.1-systemwideconfig.patch
b/net-irc/znc/files/znc-1.6.1-systemwideconfig.patch
deleted file mode 100644
index d28fa30c219..000
--- a/net-irc/znc/files/znc-1.6.1-systemwideconfig.patch
+++ /dev/null
@@ -1,215 +0,0 @@
-Add system-wide daemon support.
-
-This patch adds system-wide daemon support to ZNC so that you can run
-one ZNC instance system-wide using the new "--system-wide-config-as"
-option.
-
-Patch is based on @mrueg version from 2012.
-
-X-Gentoo-Bug: 438430
-X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=438430
- include/znc/znc.h | 3 ++
- src/main.cpp | 83
[gentoo-commits] repo/gentoo:master commit in: net-irc/znc/
commit: 3611b3d6bfa64c3256b2f40f8ba4f2c6001b749a
Author: Mikle Kolyada gentoo org>
AuthorDate: Mon Jul 16 01:11:28 2018 +
Commit: Mikle Kolyada gentoo org>
CommitDate: Mon Jul 16 01:11:28 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3611b3d6
net-irc/znc: arm stable wrt bug #661228
Package-Manager: Portage-2.3.40, Repoman-2.3.9
net-irc/znc/znc-1.7.1_rc1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-irc/znc/znc-1.7.1_rc1.ebuild b/net-irc/znc/znc-1.7.1_rc1.ebuild
index 1b1dc8571f1..0b449633796 100644
--- a/net-irc/znc/znc-1.7.1_rc1.ebuild
+++ b/net-irc/znc/znc-1.7.1_rc1.ebuild
@@ -22,7 +22,7 @@ else
https://znc.in/releases/archive/${MY_P}.tar.gz
test? ( ${GTEST_URL} )
"
- KEYWORDS="amd64 ~arm x86"
+ KEYWORDS="amd64 arm x86"
S=${WORKDIR}/${MY_P}
fi
[gentoo-commits] repo/gentoo:master commit in: net-irc/znc/
commit: 82417f797939226dbb10962d782b9096cef485ae
Author: Mikle Kolyada gentoo org>
AuthorDate: Sun Jul 15 23:36:13 2018 +
Commit: Mikle Kolyada gentoo org>
CommitDate: Sun Jul 15 23:36:13 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=82417f79
net-irc/znc: amd64 stable wrt bug #661228
Package-Manager: Portage-2.3.40, Repoman-2.3.9
net-irc/znc/znc-1.7.1_rc1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-irc/znc/znc-1.7.1_rc1.ebuild b/net-irc/znc/znc-1.7.1_rc1.ebuild
index 9ed08bcd9d2..1b1dc8571f1 100644
--- a/net-irc/znc/znc-1.7.1_rc1.ebuild
+++ b/net-irc/znc/znc-1.7.1_rc1.ebuild
@@ -22,7 +22,7 @@ else
https://znc.in/releases/archive/${MY_P}.tar.gz
test? ( ${GTEST_URL} )
"
- KEYWORDS="~amd64 ~arm x86"
+ KEYWORDS="amd64 ~arm x86"
S=${WORKDIR}/${MY_P}
fi
[gentoo-commits] repo/gentoo:master commit in: net-irc/znc/
commit: 701670b187f9ea2c76dda335e0f126c8e17af190
Author: Thomas Deutschmann gentoo org>
AuthorDate: Sun Jul 15 23:30:35 2018 +
Commit: Thomas Deutschmann gentoo org>
CommitDate: Sun Jul 15 23:30:35 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=701670b1
net-irc/znc: x86 stable (bug #661228)
Package-Manager: Portage-2.3.42, Repoman-2.3.9
net-irc/znc/znc-1.7.1_rc1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-irc/znc/znc-1.7.1_rc1.ebuild b/net-irc/znc/znc-1.7.1_rc1.ebuild
index e59849a6e29..9ed08bcd9d2 100644
--- a/net-irc/znc/znc-1.7.1_rc1.ebuild
+++ b/net-irc/znc/znc-1.7.1_rc1.ebuild
@@ -22,7 +22,7 @@ else
https://znc.in/releases/archive/${MY_P}.tar.gz
test? ( ${GTEST_URL} )
"
- KEYWORDS="~amd64 ~arm ~x86"
+ KEYWORDS="~amd64 ~arm x86"
S=${WORKDIR}/${MY_P}
fi
[gentoo-commits] repo/gentoo:master commit in: net-irc/znc/, net-irc/znc/files/
commit: 444ca74f9ed8b53b80e335df98065aac879151ec
Author: Louis Sautier gentoo org>
AuthorDate: Sun Jul 15 22:41:33 2018 +
Commit: Louis Sautier gentoo org>
CommitDate: Sun Jul 15 22:41:33 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=444ca74f
net-irc/znc: remove old
Package-Manager: Portage-2.3.42, Repoman-2.3.9
net-irc/znc/Manifest | 1 -
net-irc/znc/files/znc-1.7.0-inttest-dir.patch | 55 ---
.../files/znc-1.7.0-inttest-fix-make-warning.patch | 26 ---
net-irc/znc/znc-1.7.0.ebuild | 182 -
4 files changed, 264 deletions(-)
diff --git a/net-irc/znc/Manifest b/net-irc/znc/Manifest
index 741c0f30e99..eedc2aef66e 100644
--- a/net-irc/znc/Manifest
+++ b/net-irc/znc/Manifest
@@ -1,5 +1,4 @@
DIST googletest-release-1.7.0.tar.gz 468653 BLAKE2B
8dfca8b79dcd7b64ce84bad11ee68c549f4fe3dff7638ed1d845af4a7f754ad5df782d2cbebdb9fecfda2499dae6585e07cda7a8c8c454f0b70723d5c9578aa4
SHA512
c623d5720c4ed574e95158529872815ecff478c03bdcee8b79c9b042a603533f93fe55f939bcfe2cd745ce340fd626ad6d9a95981596f1a4d05053d874cd1dfc
DIST gtest-ba96d0b1161f540656efdaed035b3c062b60e006.tar.gz 987370 BLAKE2B
fcedfe559c4c93166962900117dc492da3cbb99165c30766c39131c20e3b41f057a31a8cb631beaca829c1e9966e90cbc37469ba56a5fc15a2bea86cbe401a63
SHA512
ce78098f973b45f4a177db387c42a56d5ea34407a2af278760b850c326e8450760a58991d62a5408f5df79f89fefd10fee71745b7e8669b2a6f74fa63a259600
DIST znc-1.6.6.tar.gz 1471612 BLAKE2B
8bd977a95417c4259e9f38759d838f55a146f376dc8bb6230ab6e1b698fb7c9e060cbc237efd4e836961314abab56cc02e7c6bc74e40bad17abaf06e47fbb516
SHA512
cc5bc7328bfe36525ab215b4b53c7cd20aa02b41e7bb28507ff9d9632560f4c30396804e4b828bca0ece19f42813e3fce59d1bae639ea5fc149059f6979e63e7
-DIST znc-1.7.0.tar.gz 1853666 BLAKE2B
3e519d4005a10a9a5329f22ab6abbd19dfa2c7cecb949c138bc72909eae8883576fc0352e3ac46b852b8c58f038150419720aa48791a1339b004206f3afc20e9
SHA512
718dec65dfa2374c568b2694e4faef1f8cf313ae96d171e2263656e077e0fae5f8037c69a23ae33f4ea314ac6e15480c7dccef73ad3ac9324eb79caca622d54b
DIST znc-1.7.1-rc1.tar.gz 2041320 BLAKE2B
62669b598d7423cb55fad458fe6172be36904e8599dcde757936883093f24deb6a5ed6a093e3e92854810f02e96372f44139f9807e70e0cf007de90a1373c6a8
SHA512
b4e223c86c75bc97620c52333d90d6458a02777dce9c629f8a095f8134a06992a60978b2fe8bbce29ed1155932f9f37e0a324a498ee16527b0235e4306c34973
diff --git a/net-irc/znc/files/znc-1.7.0-inttest-dir.patch
b/net-irc/znc/files/znc-1.7.0-inttest-dir.patch
deleted file mode 100644
index 250eccc53fb..000
--- a/net-irc/znc/files/znc-1.7.0-inttest-dir.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-diff --git a/include/znc/znc.h b/include/znc/znc.h
-index ecb2b41a..a791a648 100644
a/include/znc/znc.h
-+++ b/include/znc/znc.h
-@@ -251,6 +251,7 @@ class CZNC : private CCoreTranslationMixin {
- void DisableConfigTimer();
-
- static void DumpConfig(const CConfig* Config);
-+static CString UnusualRoot();
-
- private:
- static CString FormatBindError();
-diff --git a/src/Modules.cpp b/src/Modules.cpp
-index 5aec7805..6f9c34ae 100644
a/src/Modules.cpp
-+++ b/src/Modules.cpp
-@@ -1899,9 +1899,10 @@ CModules::ModDirList CModules::GetModDirs() {
- sDir = CZNC::Get().GetModPath() + "/";
- ret.push(std::make_pair(sDir, sDir));
-
-+CString sUnusualRoot = CZNC::UnusualRoot();
- // and (/lib/znc)
--ret.push(std::make_pair(_MODDIR_ + CString("/"),
--_DATADIR_ + CString("/modules/")));
-+ret.push(std::make_pair(sUnusualRoot + _MODDIR_ + CString("/"),
-+sUnusualRoot + _DATADIR_ + CString("/modules/")));
-
- return ret;
- }
-diff --git a/src/WebModules.cpp b/src/WebModules.cpp
-index 19ece50a..8ea4d9fa 100644
a/src/WebModules.cpp
-+++ b/src/WebModules.cpp
-@@ -563,7 +563,7 @@ CString CWebSock::GetSkinPath(const CString& sSkinName) {
- sRet = CZNC::Get().GetCurPath() + "/webskins/" + sSkinName;
-
- if (!CFile::IsDir(sRet)) {
--sRet = CString(_SKINDIR_) + "/" + sSkinName;
-+sRet = CZNC::UnusualRoot() + CString(_SKINDIR_) + "/" + sSkinName;
- }
- }
-
-diff --git a/src/znc.cpp b/src/znc.cpp
-index 4e7216ee..dd901497 100644
a/src/znc.cpp
-+++ b/src/znc.cpp
-@@ -2130,3 +2130,8 @@ void CZNC::DisableConfigTimer() {
- m_pConfigTimer = nullptr;
- }
- }
-+
-+CString CZNC::UnusualRoot() {
-+char* szUnusualRoot = getenv("ZNC_UNUSUAL_ROOT");
-+return szUnusualRoot ? szUnusualRoot : "";
-+}
diff --git a/net-irc/znc/files/znc-1.7.0-inttest-fix-make-warning.patch
b/net-irc/znc/files/znc-1.7.0-inttest-fix-make-warning.patch
deleted file mode 100644
index 0be20e4c08d..000
--- a/net-irc/znc/files/znc-1.7.0-inttest-fix-make-warning.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From abee9f9bfc8c9ca9d4616238fdd812c4200b17d5 Mon Sep 17 00:00:00 2001
-From: Alexey Sokolov
-Date: Thu, 28 Jun 2018 23:57:29 +0100
-Subject:
[gentoo-commits] repo/gentoo:master commit in: net-irc/znc/, net-irc/znc/files/
commit: 25ec114c14413ef58d51274f8f1ac800b19c650c
Author: Louis Sautier gentoo org>
AuthorDate: Sun Jul 15 22:11:56 2018 +
Commit: Louis Sautier gentoo org>
CommitDate: Sun Jul 15 22:40:41 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=25ec114c
net-irc/znc: bump to 1.7.1_rc1, fixes multiple vulnerabilities
Bug: https://bugs.gentoo.org/661228
Package-Manager: Portage-2.3.42, Repoman-2.3.9
net-irc/znc/Manifest | 1 +
net-irc/znc/files/znc-1.7.1-inttest-dir.patch | 64 +
net-irc/znc/znc-1.7.1_rc1.ebuild | 182 ++
3 files changed, 247 insertions(+)
diff --git a/net-irc/znc/Manifest b/net-irc/znc/Manifest
index c68a275dfe4..08205bafd48 100644
--- a/net-irc/znc/Manifest
+++ b/net-irc/znc/Manifest
@@ -3,3 +3,4 @@ DIST gtest-ba96d0b1161f540656efdaed035b3c062b60e006.tar.gz
987370 BLAKE2B fcedfe
DIST znc-1.6.5.tar.gz 1470681 BLAKE2B
9de0b211280489423bc2894d0e76d7276aa42428d07d64516372a9ca6d1616db1f27c0142b54160c61cbee89d65ceadf941d001319254dbff9eb5b016988482e
SHA512
d78603ac86d1fb92cdf591b1eb6d32fa19b0e39414bd69e1300c537051612ae590c43d3b8e4dd598cdff605bf3aa1d3d5d806edd428d15d50f733e1670f3e626
DIST znc-1.6.6.tar.gz 1471612 BLAKE2B
8bd977a95417c4259e9f38759d838f55a146f376dc8bb6230ab6e1b698fb7c9e060cbc237efd4e836961314abab56cc02e7c6bc74e40bad17abaf06e47fbb516
SHA512
cc5bc7328bfe36525ab215b4b53c7cd20aa02b41e7bb28507ff9d9632560f4c30396804e4b828bca0ece19f42813e3fce59d1bae639ea5fc149059f6979e63e7
DIST znc-1.7.0.tar.gz 1853666 BLAKE2B
3e519d4005a10a9a5329f22ab6abbd19dfa2c7cecb949c138bc72909eae8883576fc0352e3ac46b852b8c58f038150419720aa48791a1339b004206f3afc20e9
SHA512
718dec65dfa2374c568b2694e4faef1f8cf313ae96d171e2263656e077e0fae5f8037c69a23ae33f4ea314ac6e15480c7dccef73ad3ac9324eb79caca622d54b
+DIST znc-1.7.1-rc1.tar.gz 2041320 BLAKE2B
62669b598d7423cb55fad458fe6172be36904e8599dcde757936883093f24deb6a5ed6a093e3e92854810f02e96372f44139f9807e70e0cf007de90a1373c6a8
SHA512
b4e223c86c75bc97620c52333d90d6458a02777dce9c629f8a095f8134a06992a60978b2fe8bbce29ed1155932f9f37e0a324a498ee16527b0235e4306c34973
diff --git a/net-irc/znc/files/znc-1.7.1-inttest-dir.patch
b/net-irc/znc/files/znc-1.7.1-inttest-dir.patch
new file mode 100644
index 000..9aff2a9b64b
--- /dev/null
+++ b/net-irc/znc/files/znc-1.7.1-inttest-dir.patch
@@ -0,0 +1,64 @@
+commit 95f1c7e9081866ea1e716743ea039a74565f80c6
+Author: Louis Sautier
+Date: Sun Jul 15 15:36:21 2018 +0200
+
+Allow integration tests to be run inside a different root
+
+Based on DarthGandalf's patch submitted in
+
https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=15112014e7605d13624297d7601504b5d187a6de
+
+diff --git a/include/znc/znc.h b/include/znc/znc.h
+index ecb2b41a..a791a648 100644
+--- a/include/znc/znc.h
b/include/znc/znc.h
+@@ -251,6 +251,7 @@ class CZNC : private CCoreTranslationMixin {
+ void DisableConfigTimer();
+
+ static void DumpConfig(const CConfig* Config);
++static CString UnusualRoot();
+
+ private:
+ static CString FormatBindError();
+diff --git a/src/Modules.cpp b/src/Modules.cpp
+index 5aec7805..6f9c34ae 100644
+--- a/src/Modules.cpp
b/src/Modules.cpp
+@@ -1899,9 +1899,10 @@ CModules::ModDirList CModules::GetModDirs() {
+ sDir = CZNC::Get().GetModPath() + "/";
+ ret.push(std::make_pair(sDir, sDir));
+
++CString sUnusualRoot = CZNC::UnusualRoot();
+ // and (/lib/znc)
+-ret.push(std::make_pair(_MODDIR_ + CString("/"),
+-_DATADIR_ + CString("/modules/")));
++ret.push(std::make_pair(sUnusualRoot + _MODDIR_ + CString("/"),
++sUnusualRoot + _DATADIR_ + CString("/modules/")));
+
+ return ret;
+ }
+diff --git a/src/WebModules.cpp b/src/WebModules.cpp
+index a5841987..f1b8a421 100644
+--- a/src/WebModules.cpp
b/src/WebModules.cpp
+@@ -565,7 +565,7 @@ CString CWebSock::GetSkinPath(const CString& sSkinName) {
+ sRet = CZNC::Get().GetCurPath() + "/webskins/" + sSkin;
+
+ if (!CFile::IsDir(sRet)) {
+-sRet = CString(_SKINDIR_) + "/" + sSkin;
++sRet = CZNC::UnusualRoot() + CString(_SKINDIR_) + "/" + sSkin;
+ }
+ }
+
+diff --git a/src/znc.cpp b/src/znc.cpp
+index 4e7216ee..dd901497 100644
+--- a/src/znc.cpp
b/src/znc.cpp
+@@ -2130,3 +2130,8 @@ void CZNC::DisableConfigTimer() {
+ m_pConfigTimer = nullptr;
+ }
+ }
++
++CString CZNC::UnusualRoot() {
++char* szUnusualRoot = getenv("ZNC_UNUSUAL_ROOT");
++return szUnusualRoot ? szUnusualRoot : "";
++}
diff --git a/net-irc/znc/znc-1.7.1_rc1.ebuild b/net-irc/znc/znc-1.7.1_rc1.ebuild
new file mode 100644
index 000..e59849a6e29
--- /dev/null
+++ b/net-irc/znc/znc-1.7.1_rc1.ebuild
@@ -0,0 +1,182 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{4,5,6} )
+
+inherit cmake-util
[gentoo-commits] repo/gentoo:master commit in: net-irc/znc/
commit: 741a0dc49393d412b0d688bd249a4625b5024b20
Author: Louis Sautier gentoo org>
AuthorDate: Sun Jul 15 22:13:00 2018 +
Commit: Louis Sautier gentoo org>
CommitDate: Sun Jul 15 22:40:41 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=741a0dc4
net-irc/znc: sync live ebuild with 1.7.1_rc1
Package-Manager: Portage-2.3.42, Repoman-2.3.9
net-irc/znc/znc-.ebuild | 9 +
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/net-irc/znc/znc-.ebuild b/net-irc/znc/znc-.ebuild
index ec9c6196f37..e59849a6e29 100644
--- a/net-irc/znc/znc-.ebuild
+++ b/net-irc/znc/znc-.ebuild
@@ -16,11 +16,14 @@ if [[ ${PV} == ** ]]; then
EGIT_REPO_URI=${EGIT_REPO_URI:-"https://github.com/znc/znc.git"}
SRC_URI=""
else
+ MY_PV=${PV/_/-}
+ MY_P=${PN}-${MY_PV}
SRC_URI="
- https://znc.in/releases/archive/${P}.tar.gz
+ https://znc.in/releases/archive/${MY_P}.tar.gz
test? ( ${GTEST_URL} )
"
KEYWORDS="~amd64 ~arm ~x86"
+ S=${WORKDIR}/${MY_P}
fi
HOMEPAGE="https://znc.in";
@@ -52,9 +55,7 @@ DEPEND="
test? ( dev-qt/qtnetwork:5 )
"
-PATCHES=(
- "${FILESDIR}"/${PN}-1.7.0-inttest-dir.patch
-)
+PATCHES=( "${FILESDIR}"/${PN}-1.7.1-inttest-dir.patch )
pkg_setup() {
if use python; then
[gentoo-commits] repo/gentoo:master commit in: net-irc/znc/
commit: 1396695a1c97a6f71f07ad2635b2095554dfa03c
Author: Louis Sautier gentoo org>
AuthorDate: Sun Jul 15 22:17:19 2018 +
Commit: Louis Sautier gentoo org>
CommitDate: Sun Jul 15 22:40:41 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1396695a
net-irc/znc: remove old
Package-Manager: Portage-2.3.42, Repoman-2.3.9
net-irc/znc/Manifest | 1 -
net-irc/znc/znc-1.6.5.ebuild | 130 ---
2 files changed, 131 deletions(-)
diff --git a/net-irc/znc/Manifest b/net-irc/znc/Manifest
index 08205bafd48..741c0f30e99 100644
--- a/net-irc/znc/Manifest
+++ b/net-irc/znc/Manifest
@@ -1,6 +1,5 @@
DIST googletest-release-1.7.0.tar.gz 468653 BLAKE2B
8dfca8b79dcd7b64ce84bad11ee68c549f4fe3dff7638ed1d845af4a7f754ad5df782d2cbebdb9fecfda2499dae6585e07cda7a8c8c454f0b70723d5c9578aa4
SHA512
c623d5720c4ed574e95158529872815ecff478c03bdcee8b79c9b042a603533f93fe55f939bcfe2cd745ce340fd626ad6d9a95981596f1a4d05053d874cd1dfc
DIST gtest-ba96d0b1161f540656efdaed035b3c062b60e006.tar.gz 987370 BLAKE2B
fcedfe559c4c93166962900117dc492da3cbb99165c30766c39131c20e3b41f057a31a8cb631beaca829c1e9966e90cbc37469ba56a5fc15a2bea86cbe401a63
SHA512
ce78098f973b45f4a177db387c42a56d5ea34407a2af278760b850c326e8450760a58991d62a5408f5df79f89fefd10fee71745b7e8669b2a6f74fa63a259600
-DIST znc-1.6.5.tar.gz 1470681 BLAKE2B
9de0b211280489423bc2894d0e76d7276aa42428d07d64516372a9ca6d1616db1f27c0142b54160c61cbee89d65ceadf941d001319254dbff9eb5b016988482e
SHA512
d78603ac86d1fb92cdf591b1eb6d32fa19b0e39414bd69e1300c537051612ae590c43d3b8e4dd598cdff605bf3aa1d3d5d806edd428d15d50f733e1670f3e626
DIST znc-1.6.6.tar.gz 1471612 BLAKE2B
8bd977a95417c4259e9f38759d838f55a146f376dc8bb6230ab6e1b698fb7c9e060cbc237efd4e836961314abab56cc02e7c6bc74e40bad17abaf06e47fbb516
SHA512
cc5bc7328bfe36525ab215b4b53c7cd20aa02b41e7bb28507ff9d9632560f4c30396804e4b828bca0ece19f42813e3fce59d1bae639ea5fc149059f6979e63e7
DIST znc-1.7.0.tar.gz 1853666 BLAKE2B
3e519d4005a10a9a5329f22ab6abbd19dfa2c7cecb949c138bc72909eae8883576fc0352e3ac46b852b8c58f038150419720aa48791a1339b004206f3afc20e9
SHA512
718dec65dfa2374c568b2694e4faef1f8cf313ae96d171e2263656e077e0fae5f8037c69a23ae33f4ea314ac6e15480c7dccef73ad3ac9324eb79caca622d54b
DIST znc-1.7.1-rc1.tar.gz 2041320 BLAKE2B
62669b598d7423cb55fad458fe6172be36904e8599dcde757936883093f24deb6a5ed6a093e3e92854810f02e96372f44139f9807e70e0cf007de90a1373c6a8
SHA512
b4e223c86c75bc97620c52333d90d6458a02777dce9c629f8a095f8134a06992a60978b2fe8bbce29ed1155932f9f37e0a324a498ee16527b0235e4306c34973
diff --git a/net-irc/znc/znc-1.6.5.ebuild b/net-irc/znc/znc-1.6.5.ebuild
deleted file mode 100644
index 20fc31e0957..000
--- a/net-irc/znc/znc-1.6.5.ebuild
+++ /dev/null
@@ -1,130 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{4,5,6} )
-inherit eutils python-single-r1 readme.gentoo-r1 systemd user
-
-MY_PV=${PV/_/-}
-GTEST_VER="1.7.0"
-GTEST_URL="https://github.com/google/googletest/archive/release-${GTEST_VER}.tar.gz
-> googletest-release-${GTEST_VER}.tar.gz"
-DESCRIPTION="An advanced IRC Bouncer"
-
-SRC_URI="
- http://znc.in/releases/archive/${PN}-${MY_PV}.tar.gz
- test? ( ${GTEST_URL} )
-"
-KEYWORDS="amd64 arm x86"
-
-HOMEPAGE="https://znc.in";
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="daemon debug +ipv6 +icu libressl perl python +ssl sasl tcl test +zlib"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
- icu? ( dev-libs/icu:= )
- perl? ( >=dev-lang/perl-5.10:= )
- python? ( ${PYTHON_DEPS} )
- sasl? ( >=dev-libs/cyrus-sasl-2 )
- ssl? (
- !libressl? ( dev-libs/openssl:0= )
- libressl? ( dev-libs/libressl:0= )
- )
- tcl? ( dev-lang/tcl:0= )
- zlib? ( sys-libs/zlib )
-"
-DEPEND="
- ${RDEPEND}
- virtual/pkgconfig
-"
-
-S=${WORKDIR}/${PN}-${MY_PV}
-
-PATCHES=(
- "${FILESDIR}"/${PN}-1.6.1-systemwideconfig.patch
- "${FILESDIR}"/${PN}-1.6.1-create-pidfile-per-default.patch
-)
-
-pkg_setup() {
- if use python; then
- python-single-r1_pkg_setup
- fi
- if use daemon; then
- enewgroup ${PN}
- enewuser ${PN} -1 -1 /var/lib/${PN} ${PN}
- # The home directory was previously set to /dev/null
- # This caused a bug with the systemd unit
- # https://bugs.gentoo.org/521916
- esethome ${PN} /var/lib/${PN}
- fi
-}
-
-src_configure() {
- econf \
- --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" \
- $(use_enable debug) \
- $(use_enable icu charset) \
- $(use_enable ipv6) \
- $(use_enable perl) \
- $(use_enable python) \
- $(use_enable sasl cyrus) \
- $(use_enable ssl openssl) \
- $(use_enable tcl
[gentoo-commits] repo/gentoo:master commit in: net-irc/znc/, net-irc/znc/files/
commit: 15112014e7605d13624297d7601504b5d187a6de
Author: Alexey Sokolov google com>
AuthorDate: Tue Jun 19 01:13:38 2018 +
Commit: Louis Sautier gentoo org>
CommitDate: Wed Jul 4 21:33:36 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=15112014
net-irc/znc: enable integration testing
Closes: https://github.com/gentoo/gentoo/pull/8901
net-irc/znc/Manifest | 2 +-
net-irc/znc/files/znc-1.7.0-inttest-dir.patch | 55 ++
.../files/znc-1.7.0-inttest-fix-make-warning.patch | 26 ++
net-irc/znc/znc-1.7.0.ebuild | 38 +--
net-irc/znc/znc-.ebuild| 37 +--
5 files changed, 149 insertions(+), 9 deletions(-)
diff --git a/net-irc/znc/Manifest b/net-irc/znc/Manifest
index 6949365add4..c68a275dfe4 100644
--- a/net-irc/znc/Manifest
+++ b/net-irc/znc/Manifest
@@ -1,5 +1,5 @@
DIST googletest-release-1.7.0.tar.gz 468653 BLAKE2B
8dfca8b79dcd7b64ce84bad11ee68c549f4fe3dff7638ed1d845af4a7f754ad5df782d2cbebdb9fecfda2499dae6585e07cda7a8c8c454f0b70723d5c9578aa4
SHA512
c623d5720c4ed574e95158529872815ecff478c03bdcee8b79c9b042a603533f93fe55f939bcfe2cd745ce340fd626ad6d9a95981596f1a4d05053d874cd1dfc
-DIST gtest-1.8.0.tar.gz 1281617 BLAKE2B
ac052b4d0eb0d8ded03a8c7dff05177818627b8a51f2dbc2c162b2ee2a5d1323539e7d0d02236d9ebb75e018f0171c2fdaeb4de3bb339548265e50de79e6
SHA512
1dbece324473e53a83a60601b02c92c089f5d314761351974e097b2cf4d24af4296f9eb8653b6b03b1e363d9c5f793897acae1f0c7ac40149216035c4d395d9d
+DIST gtest-ba96d0b1161f540656efdaed035b3c062b60e006.tar.gz 987370 BLAKE2B
fcedfe559c4c93166962900117dc492da3cbb99165c30766c39131c20e3b41f057a31a8cb631beaca829c1e9966e90cbc37469ba56a5fc15a2bea86cbe401a63
SHA512
ce78098f973b45f4a177db387c42a56d5ea34407a2af278760b850c326e8450760a58991d62a5408f5df79f89fefd10fee71745b7e8669b2a6f74fa63a259600
DIST znc-1.6.5.tar.gz 1470681 BLAKE2B
9de0b211280489423bc2894d0e76d7276aa42428d07d64516372a9ca6d1616db1f27c0142b54160c61cbee89d65ceadf941d001319254dbff9eb5b016988482e
SHA512
d78603ac86d1fb92cdf591b1eb6d32fa19b0e39414bd69e1300c537051612ae590c43d3b8e4dd598cdff605bf3aa1d3d5d806edd428d15d50f733e1670f3e626
DIST znc-1.6.6.tar.gz 1471612 BLAKE2B
8bd977a95417c4259e9f38759d838f55a146f376dc8bb6230ab6e1b698fb7c9e060cbc237efd4e836961314abab56cc02e7c6bc74e40bad17abaf06e47fbb516
SHA512
cc5bc7328bfe36525ab215b4b53c7cd20aa02b41e7bb28507ff9d9632560f4c30396804e4b828bca0ece19f42813e3fce59d1bae639ea5fc149059f6979e63e7
DIST znc-1.7.0.tar.gz 1853666 BLAKE2B
3e519d4005a10a9a5329f22ab6abbd19dfa2c7cecb949c138bc72909eae8883576fc0352e3ac46b852b8c58f038150419720aa48791a1339b004206f3afc20e9
SHA512
718dec65dfa2374c568b2694e4faef1f8cf313ae96d171e2263656e077e0fae5f8037c69a23ae33f4ea314ac6e15480c7dccef73ad3ac9324eb79caca622d54b
diff --git a/net-irc/znc/files/znc-1.7.0-inttest-dir.patch
b/net-irc/znc/files/znc-1.7.0-inttest-dir.patch
new file mode 100644
index 000..250eccc53fb
--- /dev/null
+++ b/net-irc/znc/files/znc-1.7.0-inttest-dir.patch
@@ -0,0 +1,55 @@
+diff --git a/include/znc/znc.h b/include/znc/znc.h
+index ecb2b41a..a791a648 100644
+--- a/include/znc/znc.h
b/include/znc/znc.h
+@@ -251,6 +251,7 @@ class CZNC : private CCoreTranslationMixin {
+ void DisableConfigTimer();
+
+ static void DumpConfig(const CConfig* Config);
++static CString UnusualRoot();
+
+ private:
+ static CString FormatBindError();
+diff --git a/src/Modules.cpp b/src/Modules.cpp
+index 5aec7805..6f9c34ae 100644
+--- a/src/Modules.cpp
b/src/Modules.cpp
+@@ -1899,9 +1899,10 @@ CModules::ModDirList CModules::GetModDirs() {
+ sDir = CZNC::Get().GetModPath() + "/";
+ ret.push(std::make_pair(sDir, sDir));
+
++CString sUnusualRoot = CZNC::UnusualRoot();
+ // and (/lib/znc)
+-ret.push(std::make_pair(_MODDIR_ + CString("/"),
+-_DATADIR_ + CString("/modules/")));
++ret.push(std::make_pair(sUnusualRoot + _MODDIR_ + CString("/"),
++sUnusualRoot + _DATADIR_ + CString("/modules/")));
+
+ return ret;
+ }
+diff --git a/src/WebModules.cpp b/src/WebModules.cpp
+index 19ece50a..8ea4d9fa 100644
+--- a/src/WebModules.cpp
b/src/WebModules.cpp
+@@ -563,7 +563,7 @@ CString CWebSock::GetSkinPath(const CString& sSkinName) {
+ sRet = CZNC::Get().GetCurPath() + "/webskins/" + sSkinName;
+
+ if (!CFile::IsDir(sRet)) {
+-sRet = CString(_SKINDIR_) + "/" + sSkinName;
++sRet = CZNC::UnusualRoot() + CString(_SKINDIR_) + "/" + sSkinName;
+ }
+ }
+
+diff --git a/src/znc.cpp b/src/znc.cpp
+index 4e7216ee..dd901497 100644
+--- a/src/znc.cpp
b/src/znc.cpp
+@@ -2130,3 +2130,8 @@ void CZNC::DisableConfigTimer() {
+ m_pConfigTimer = nullptr;
+ }
+ }
++
++CString CZNC::UnusualRoot() {
++char* szUnusualRoot = getenv("ZNC_UNUSUAL_ROOT");
++return szUnusualRoot ? szUnusualRoot : "";
++}
diff
[gentoo-commits] repo/gentoo:master commit in: net-irc/znc/
commit: 7277b7e4768145485130273bfccf7dac2f893da6 Author: Louis Sautier gentoo org> AuthorDate: Sun Jun 17 23:33:52 2018 + Commit: Louis Sautier gentoo org> CommitDate: Mon Jun 18 10:34:11 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7277b7e4 net-irc/znc: change my email in metadata.xml Package-Manager: Portage-2.3.40, Repoman-2.3.9 net-irc/znc/metadata.xml | 6 +- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/net-irc/znc/metadata.xml b/net-irc/znc/metadata.xml index 51954559918..16293e77692 100644 --- a/net-irc/znc/metadata.xml +++ b/net-irc/znc/metadata.xml @@ -2,13 +2,9 @@ http://www.gentoo.org/dtd/metadata.dtd";> - sautier.lo...@gmail.com + sb...@gentoo.org Louis Sautier - - proxy-ma...@gentoo.org - Proxy Maintainers - Allow znc to run as a system-wide service. Installs an init script and creates a znc user:group. Enable mod_deflate-like gzip support for znc's web interface using sys-libs/zlib.
[gentoo-commits] repo/gentoo:master commit in: net-irc/znc/files/
commit: bbd5adeecb8da210b6aa45883c74d904c14fc301
Author: Alexey Sokolov google com>
AuthorDate: Sun Jun 17 10:22:54 2018 +
Commit: Michał Górny gentoo org>
CommitDate: Sun Jun 17 12:46:09 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bbd5adee
net-irc/znc: remove non-referenced files
Closes: https://github.com/gentoo/gentoo/pull/8873
net-irc/znc/files/znc-1.0-systemwideconfig.patch | 147 ---
net-irc/znc/files/znc.confd | 7 --
net-irc/znc/files/znc.initd | 38 --
3 files changed, 192 deletions(-)
diff --git a/net-irc/znc/files/znc-1.0-systemwideconfig.patch
b/net-irc/znc/files/znc-1.0-systemwideconfig.patch
deleted file mode 100644
index 336163dd6a0..000
--- a/net-irc/znc/files/znc-1.0-systemwideconfig.patch
+++ /dev/null
@@ -1,147 +0,0 @@
-diff --git a/include/znc/znc.h b/include/znc/znc.h
-index 03be646..f493c83 100644
a/include/znc/znc.h
-+++ b/include/znc/znc.h
-@@ -169,6 +169,8 @@ public:
-
- static void DumpConfig(const CConfig* Config);
-
-+ void SetSystemWideConfig(bool systemWideConfig);
-+
- private:
- CFile* InitPidFile();
- bool DoRehash(CString& sError);
-@@ -209,6 +211,7 @@ protected:
- unsigned int m_uiConnectPaused;
- TCacheMap m_sConnectThrottle;
- bool m_bProtectWebSessions;
-+ bool m_bSystemWideConfig;
- };
-
- #endif // !_ZNC_H
-diff --git a/src/main.cpp b/src/main.cpp
-index a1f3904..4950911 100644
a/src/main.cpp
-+++ b/src/main.cpp
-@@ -10,6 +10,9 @@
- #include
- #include
- #include
-+#include
-+#include
-+#include
-
- using std::cout;
- using std::endl;
-@@ -46,6 +49,7 @@ static const struct option g_LongOpts[] = {
- { "makepass",no_argument, 0, 's' },
- { "makepem", no_argument, 0, 'p' },
- { "datadir", required_argument, 0, 'd' },
-+ { "system-wide-config-as", required_argument, 0, 'S' },
- { 0, 0, 0, 0 }
- };
-
-@@ -127,6 +131,8 @@ int main(int argc, char** argv) {
- bool bMakeConf = false;
- bool bMakePass = false;
- bool bAllowRoot = false;
-+ bool bSystemWideConfig = false;
-+ CString sSystemWideConfigUser = "znc";
- bool bForeground = false;
- #ifdef ALWAYS_RUN_IN_FOREGROUND
- bForeground = true;
-@@ -135,7 +141,7 @@ int main(int argc, char** argv) {
- bool bMakePem = false;
- #endif
-
-- while ((iArg = getopt_long(argc, argv, "hvnrcspd:Df", g_LongOpts,
&iOptIndex)) != -1) {
-+ while ((iArg = getopt_long(argc, argv, "hvnrcspd:DfS:", g_LongOpts,
&iOptIndex)) != -1) {
- switch (iArg) {
- case 'h':
- GenerateHelp(argv[0]);
-@@ -153,6 +159,10 @@ int main(int argc, char** argv) {
- case 'c':
- bMakeConf = true;
- break;
-+ case 'S':
-+ bSystemWideConfig = true;
-+ sSystemWideConfigUser = optarg;
-+ break;
- case 's':
- bMakePass = true;
- break;
-@@ -187,8 +197,36 @@ int main(int argc, char** argv) {
- return 1;
- }
-
-+ if (bSystemWideConfig && getuid() == 0) {
-+ struct passwd *pwd;
-+
-+ pwd = getpwnam(sSystemWideConfigUser.c_str());
-+ if (pwd == NULL) {
-+ CUtils::PrintError("Daemon user not found.");
-+ return 1;
-+ }
-+
-+ if ((long) pwd->pw_uid == 0) {
-+ CUtils::PrintError("Please define a daemon user other
than root.");
-+ return 1;
-+ }
-+ if (setgroups(0, NULL) != 0) {
-+ CUtils::PrintError("setgroups: Unable to clear
supplementary group IDs");
-+ return 1;
-+ }
-+ if (setgid((long) pwd->pw_gid) != 0) {
-+ CUtils::PrintError("setgid: Unable to drop group
privileges");
-+ return 1;
-+ }
-+ if (setuid((long) pwd->pw_uid) != 0) {
-+ CUtils::PrintError("setuid: Unable to drop user
privileges");
-+ return 1;
-+ }
-+ }
-+
- CZNC* pZNC = &CZNC::Get();
- pZNC->InitDirs(((argc) ? argv[0] : ""), sDataDir);
-+ pZNC->SetSystemWideConfig(bSystemWideConfig);
-
- #ifdef HAVE_LIBSSL
- if (bMakePem) {
-@@ -229,7 +267,7 @@ int main(int argc, char** argv) {
- CUtils::PrintStatus(true, "");
- }
-
-- if (isRoot()) {
-+ if (isRoot() && !bSystemWideConfig) {
- CUtils::PrintError("You are running ZNC as root! Don't do that!
There are not many valid");
- CUtils::PrintError("reasons for this and it can, in theory,
cause g
