diff options
Diffstat (limited to 'net-analyzer')
285 files changed, 8703 insertions, 2558 deletions
diff --git a/net-analyzer/arpon/arpon-3.0.ebuild b/net-analyzer/arpon/arpon-3.0.ebuild index 6e995a6e9f1a..d564c5e19b27 100644 --- a/net-analyzer/arpon/arpon-3.0.ebuild +++ b/net-analyzer/arpon/arpon-3.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -10,7 +10,7 @@ MY_P="${MY_PN}-${PV}" DESCRIPTION="ArpON (Arp handler inspectiON) is a portable Arp handler" HOMEPAGE="https://arpon.sourceforge.io/" -SRC_URI="mirror://sourceforge/${PN}/${MY_P}-ng.tar.gz" +SRC_URI="https://downloads.sourceforge.net/${PN}/${MY_P}-ng.tar.gz" S="${WORKDIR}/${MY_P}-ng" LICENSE="BSD-2" diff --git a/net-analyzer/arptools/arptools-1.0.2-r1.ebuild b/net-analyzer/arptools/arptools-1.0.2-r1.ebuild index 561a0216cfff..6b1d50d07a27 100644 --- a/net-analyzer/arptools/arptools-1.0.2-r1.ebuild +++ b/net-analyzer/arptools/arptools-1.0.2-r1.ebuild @@ -1,13 +1,13 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -DESCRIPTION="a collection of libnet and libpcap based ARP utilities" +DESCRIPTION="Collection of libnet and libpcap based ARP utilities" HOMEPAGE="https://github.com/burghardt/arptools" SRC_URI="http://www.burghardt.pl/files/${P}.tar.gz" -LICENSE="GPL-2" +LICENSE="GPL-2+" SLOT="0" KEYWORDS="~amd64 ~ppc ~riscv ~x86" diff --git a/net-analyzer/arptools/metadata.xml b/net-analyzer/arptools/metadata.xml index 8839b3f3fc8e..2b6b33a1fea3 100644 --- a/net-analyzer/arptools/metadata.xml +++ b/net-analyzer/arptools/metadata.xml @@ -8,4 +8,7 @@ <email>netmon@gentoo.org</email> <name>Gentoo network monitoring and analysis project</name> </maintainer> +<upstream> + <remote-id type="github">burghardt/arptools</remote-id> +</upstream> </pkgmetadata> diff --git a/net-analyzer/barnyard/barnyard-0.2.0-r7.ebuild b/net-analyzer/barnyard/barnyard-0.2.0-r7.ebuild index 94966b420485..c937739a33da 100644 --- a/net-analyzer/barnyard/barnyard-0.2.0-r7.ebuild +++ b/net-analyzer/barnyard/barnyard-0.2.0-r7.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -8,7 +8,7 @@ inherit autotools toolchain-funcs DESCRIPTION="Fast output system for Snort" HOMEPAGE="https://sourceforge.net/projects/barnyard" SRC_URI=" - mirror://sourceforge/barnyard/barnyard-${PV/_/-}.tar.gz + https://downloads.sourceforge.net/barnyard/barnyard-${PV/_/-}.tar.gz https://dev.gentoo.org/~jsmolic/distfiles/${P}-patches.tar.xz " diff --git a/net-analyzer/barnyard2/barnyard2-1.13.ebuild b/net-analyzer/barnyard2/barnyard2-1.13.ebuild index d071abba7072..a6c5e14eee5c 100644 --- a/net-analyzer/barnyard2/barnyard2-1.13.ebuild +++ b/net-analyzer/barnyard2/barnyard2-1.13.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -7,9 +7,10 @@ inherit autotools DESCRIPTION="Parser for Snort unified/unified2 files" HOMEPAGE="https://github.com/firnsy/barnyard2 https://firnsy.com/projects" SRC_URI="https://github.com/firnsy/barnyard2/archive/v2-${PV}.tar.gz -> ${P}-github.tar.gz" +S="${WORKDIR}/${PN}-2-${PV}" -SLOT="0" LICENSE="GPL-2" +SLOT="0" KEYWORDS="amd64 x86" IUSE="debug gre mpls mysql odbc postgres sguil" @@ -24,7 +25,6 @@ RDEPEND=" ${DEPEND} " DOCS="RELEASE.NOTES etc/barnyard2.conf doc/README* schemas/create_*" -S="${WORKDIR}/${PN}-2-${PV}" PATCHES=( "${FILESDIR}"/${PN}-1.13-free.patch "${FILESDIR}"/${PN}-1.13-libdir.patch diff --git a/net-analyzer/barnyard2/metadata.xml b/net-analyzer/barnyard2/metadata.xml index a4e413a2cf4c..4bf528f8851c 100644 --- a/net-analyzer/barnyard2/metadata.xml +++ b/net-analyzer/barnyard2/metadata.xml @@ -20,6 +20,7 @@ </maintainer> <doc>http://www.securixlive.com/barnyard2/docs/index.php</doc> <bugs-to>mailto:dev@securixlive.com</bugs-to> + <remote-id type="github">firnsy/barnyard2</remote-id> </upstream> <use> <flag name="gre">Enable GRE support</flag> diff --git a/net-analyzer/bwmon/bwmon-1.3-r2.ebuild b/net-analyzer/bwmon/bwmon-1.3-r2.ebuild index af95094201d5..3de0d8294e7b 100644 --- a/net-analyzer/bwmon/bwmon-1.3-r2.ebuild +++ b/net-analyzer/bwmon/bwmon-1.3-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -7,7 +7,7 @@ inherit toolchain-funcs DESCRIPTION="Simple ncurses bandwidth monitor" HOMEPAGE="https://bwmon.sourceforge.net/" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" +SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.gz" BDEPEND="virtual/pkgconfig" RDEPEND="sys-libs/ncurses" diff --git a/net-analyzer/cacti-spine/cacti-spine-1.2.20.ebuild b/net-analyzer/cacti-spine/cacti-spine-1.2.20.ebuild index 8cadbd1d2cb0..7166713208bb 100644 --- a/net-analyzer/cacti-spine/cacti-spine-1.2.20.ebuild +++ b/net-analyzer/cacti-spine/cacti-spine-1.2.20.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -13,7 +13,7 @@ SRC_URI="https://www.cacti.net/downloads/spine/${MY_P}.tar.gz" LICENSE="LGPL-2.1" SLOT="0" -KEYWORDS="~alpha amd64 ~hppa ~ppc ~ppc64 sparc x86" +KEYWORDS="~alpha amd64 ~hppa ~ppc64 sparc x86" DEPEND="dev-db/mysql-connector-c:= dev-libs/openssl:= diff --git a/net-analyzer/cacti/Manifest b/net-analyzer/cacti/Manifest index 89938bf84fc4..28480b1c97a6 100644 --- a/net-analyzer/cacti/Manifest +++ b/net-analyzer/cacti/Manifest @@ -1 +1,2 @@ DIST cacti-1.2.21.tar.gz 40798454 BLAKE2B 86eae6743c07e45b4b06202cca072a385f45d2021159f0f5160a8c2a8eb8f3a2f9db63512515602d1c3eb6be4b53f5755c20d6da2194ff445c133a2bcdb33e27 SHA512 084ff9135dd0a92596a4d65f2fd461c8e84907ff87e467f6d144ee3b52ef7aeb44ffa5a8c25e74e5ff25588bc6c5b13b44ab2f24ef5e1c6652513b5c2a39f78d +DIST cacti-1.2.26.tar.gz 43637358 BLAKE2B 862b98e9b194f211a400b37f90c2bfb128bf71ee4660391ba2311deedd8b1342ce0d17d67181d16deae345c12596d7599b1272272b32fd7ab52fe2850f8209f6 SHA512 43bfa2fa5b87267191f845de8be38025b795509eb12817e5ff9884b20676655ec4e5230e015abe2afa9f10354317eec39081613e5c9fec4f6a6f314bedf873ab diff --git a/net-analyzer/cacti/cacti-1.2.21.ebuild b/net-analyzer/cacti/cacti-1.2.21.ebuild index 8b3907868f76..1bbc77868e48 100644 --- a/net-analyzer/cacti/cacti-1.2.21.ebuild +++ b/net-analyzer/cacti/cacti-1.2.21.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -13,7 +13,7 @@ HOMEPAGE="https://www.cacti.net/" SRC_URI="https://www.cacti.net/downloads/${MY_P}.tar.gz" LICENSE="GPL-2" -KEYWORDS="~alpha amd64 ~arm ~hppa ~ppc ~ppc64 sparc x86" +KEYWORDS="~alpha amd64 ~arm ~hppa ~ppc64 sparc x86" IUSE="snmp doc" need_httpd diff --git a/net-analyzer/cacti/cacti-1.2.26.ebuild b/net-analyzer/cacti/cacti-1.2.26.ebuild new file mode 100644 index 000000000000..9a2afedc7d82 --- /dev/null +++ b/net-analyzer/cacti/cacti-1.2.26.ebuild @@ -0,0 +1,49 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit edos2unix webapp + +# Support for _p* in version. +MY_P=${P/_p*/} + +DESCRIPTION="Cacti is a complete frontend to rrdtool" +HOMEPAGE="https://www.cacti.net/" +SRC_URI="https://www.cacti.net/downloads/${MY_P}.tar.gz" + +LICENSE="GPL-2" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc64 ~sparc ~x86" +IUSE="snmp doc" + +need_httpd + +RDEPEND=" + dev-lang/php[cli,mysql,pdo,session,sockets,xml] + dev-php/adodb + net-analyzer/rrdtool[graph] + virtual/cron + snmp? ( >=net-analyzer/net-snmp-5.2.0 ) +" + +src_compile() { :; } + +src_install() { + dodoc CHANGELOG + dodoc -r docs + mv docs .. || die + + webapp_src_preinst + + edos2unix `find -type f -name '*.php'` + + dodir ${MY_HTDOCSDIR} + cp -r . "${ED}"${MY_HTDOCSDIR} + + webapp_serverowned ${MY_HTDOCSDIR}/rra + webapp_serverowned ${MY_HTDOCSDIR}/log + webapp_configfile ${MY_HTDOCSDIR}/include/config.php + webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt + + webapp_src_install +} diff --git a/net-analyzer/check_mk_agent/Manifest b/net-analyzer/check_mk_agent/Manifest deleted file mode 100644 index 4f03d903bfdd..000000000000 --- a/net-analyzer/check_mk_agent/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST check-mk-raw-1.4.0p31.cre.tar.gz 314212612 BLAKE2B 07c9bda8524250f949a21204427d455ef0ac0a323fe38b66c7c4f03b50f7677099b5c24dae22f55fe1e1a2e475d541e1b643169a2368925e960ea514a03fd6b2 SHA512 b1dfe22e54a3d6f9c7f76b408adeb7ca46aa4b21d933149c1681bf87dae7af8f5bf645ba19b225f30b0057d8d075f657756019e3b908d3090e1d14451e7fcc0b diff --git a/net-analyzer/check_mk_agent/check_mk_agent-1.4.0_p31.ebuild b/net-analyzer/check_mk_agent/check_mk_agent-1.4.0_p31.ebuild deleted file mode 100644 index c41c9b1f3484..000000000000 --- a/net-analyzer/check_mk_agent/check_mk_agent-1.4.0_p31.ebuild +++ /dev/null @@ -1,74 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit systemd - -DESCRIPTION="Agent to report data to Check_MK for monitoring" -HOMEPAGE="http://mathias-kettner.de/check_mk.html" - -MY_PV="${PV/_p/p}" -MY_P="check-mk-raw-${MY_PV}.cre" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="apache_status inventory logwatch mysql nfsexports oracle postgres smart +xinetd zypper" - -RDEPEND="!!net-analyzer/check_mk - app-shells/bash:* - xinetd? ( || ( sys-apps/xinetd sys-apps/systemd ) ) - " -DEPEND="${RDEPEND}" - -SRC_URI="http://mathias-kettner.de/support/${MY_PV}/${MY_P}.tar.gz" - -src_unpack() { - # check_mk is a tarball containing tarballs - unpack ${A} - unpack "${WORKDIR}"/${MY_P}/packages/check_mk/check_mk-${MY_PV}.tar.gz - mkdir -p "${S}" || die - cd "${S}" || die - unpack "${WORKDIR}"/check_mk-${MY_PV}/agents.tar.gz - mkdir -p "${S}"/doc || die - cd "${S}"/doc || die - unpack "${WORKDIR}"/check_mk-${MY_PV}/doc.tar.gz -} - -src_install() { - # Install agent related files - newbin check_mk_agent.linux check_mk_agent - - keepdir /usr/lib/check_mk_agent/local - dodir /usr/lib/check_mk_agent/plugins - dodir /etc/check_mk - - dodoc doc/{AUTHORS,COPYING,ChangeLog} - docompress - - if use xinetd; then - insinto /etc/xinetd.d - newins cfg_examples/xinetd.conf check_mk - systemd_dounit cfg_examples/systemd/check_mk{.socket,@.service} - fi - - # Install the check_mk_agent logwatch plugin - if use logwatch; then - insinto /etc/check_mk - doins cfg_examples/logwatch.cfg - exeinto /usr/lib/check_mk_agent/plugins - doexe plugins/mk_logwatch - fi - - # Install any other useflag-enabled agent plugins - exeinto /usr/lib/check_mk_agent/plugins - use inventory && newexe plugins/mk_inventory.linux mk_inventory - use smart && doexe plugins/smart - use mysql && doexe plugins/mk_mysql - use postgres && doexe plugins/mk_postgres - use apache_status && doexe plugins/apache_status - use zypper && doexe plugins/mk_zypper - use oracle && doexe plugins/mk_oracle - use nfsexports && doexe plugins/nfsexports -} diff --git a/net-analyzer/check_mk_agent/metadata.xml b/net-analyzer/check_mk_agent/metadata.xml deleted file mode 100644 index 89c9c6e274a7..000000000000 --- a/net-analyzer/check_mk_agent/metadata.xml +++ /dev/null @@ -1,23 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <!-- maintainer-needed --> - <longdescription lang="en"> - The agent, to gather and report system and other monitoring data to Check_MK enabled - Nagios/Icigna centralized monitoring servers. - </longdescription> - <use> - <flag name="inventory">Install check_mk-agent linux inventory plugin.</flag> - <flag name="logwatch">Install check_mk-agent logwatch plugin.</flag> - <flag name="smart">Install check_mk-agent S.M.A.R.T plugin.</flag> - <flag name="mysql">Install check_mk-agent mysql plugin.</flag> - <flag name="postgres">Install check_mk-agent postgres plugin.</flag> - <flag name="apache_status">Install check_mk-agent apache-status plugin.</flag> - <flag name="nfsexports">Install check_mk-agent nfsexports plugin.</flag> - <flag name="zypper">Install check_mk-agent zypper plugin.</flag> - </use> - <upstream> - <changelog>http://mathias-kettner.com/check_mk_download.html</changelog> - <doc>http://mathias-kettner.com/checkmk.html</doc> - </upstream> -</pkgmetadata> diff --git a/net-analyzer/cryptcat/cryptcat-1.2.1-r2.ebuild b/net-analyzer/cryptcat/cryptcat-1.2.1-r2.ebuild index f60626e479c6..a09503c512ea 100644 --- a/net-analyzer/cryptcat/cryptcat-1.2.1-r2.ebuild +++ b/net-analyzer/cryptcat/cryptcat-1.2.1-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -7,7 +7,7 @@ inherit toolchain-funcs DESCRIPTION="Netcat clone extended with twofish encryption" HOMEPAGE="https://cryptcat.sourceforge.io" -SRC_URI="mirror://sourceforge/${PN}/${PN}-unix-${PV}.tar" +SRC_URI="https://downloads.sourceforge.net/${PN}/${PN}-unix-${PV}.tar" S="${WORKDIR}"/unix LICENSE="GPL-2" diff --git a/net-analyzer/echoping/echoping-6.0.2_p434-r5.ebuild b/net-analyzer/echoping/echoping-6.0.2_p434-r5.ebuild index de26fde05061..a1b34e731c1b 100644 --- a/net-analyzer/echoping/echoping-6.0.2_p434-r5.ebuild +++ b/net-analyzer/echoping/echoping-6.0.2_p434-r5.ebuild @@ -5,7 +5,7 @@ EAPI=7 inherit autotools DESCRIPTION="Small program to test performances of remote servers" -HOMEPAGE="http://echoping.sourceforge.net/" +HOMEPAGE="https://framagit.org/bortzmeyer/echoping" SRC_URI="https://dev.gentoo.org/~jsmolic/distfiles/${P}.tar.gz" LICENSE="GPL-2" @@ -37,6 +37,7 @@ PATCHES=( "${FILESDIR}"/${PN}-6.0.2_p434-gnutls_certificate_type_set_priority.patch "${FILESDIR}"/${PN}-6.0.2_p434-gnutls_session.patch "${FILESDIR}"/${PN}-6.0.2_p434-fno-common.patch + "${FILESDIR}"/0001-correctly-link-to-libm.patch ) src_prepare() { diff --git a/net-analyzer/echoping/files/0001-correctly-link-to-libm.patch b/net-analyzer/echoping/files/0001-correctly-link-to-libm.patch new file mode 100644 index 000000000000..2bd38fea6c6e --- /dev/null +++ b/net-analyzer/echoping/files/0001-correctly-link-to-libm.patch @@ -0,0 +1,32 @@ +From a951dcd0ea6cc64afbba2a438aead17706562486 Mon Sep 17 00:00:00 2001 +From: Eli Schwartz <eschwartz93@gmail.com> +Date: Mon, 4 Mar 2024 22:43:43 -0500 +Subject: [PATCH] correctly link to libm + +The program depends on math.h symbols via util.c, but blindly assumes +that it will be available without explicitly linking to it -- a POSIX +violation. + +Also an LTO violation. + +Signed-off-by: Eli Schwartz <eschwartz93@gmail.com> +--- + Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile.am b/Makefile.am +index a586281..3f96637 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -6,7 +6,7 @@ bin_PROGRAMS = echoping + man_MANS = echoping.1 + echoping_SOURCES = echoping.c error.c readline.c writen.c util.c http.c icp.c HTParse.c echoping.h icp.h HTParse.h smtp.c + pkginclude_HEADERS = echoping.h compilation.h +-echoping_LDADD = ++echoping_LDADD = -lm + echoping_LDFLAGS = -export-dynamic + DOCS=DETAILS PLUGINS + SUBDIRS=plugins +-- +2.43.0 + diff --git a/net-analyzer/echoping/metadata.xml b/net-analyzer/echoping/metadata.xml index 082e1799e9a2..78a65a684593 100644 --- a/net-analyzer/echoping/metadata.xml +++ b/net-analyzer/echoping/metadata.xml @@ -12,7 +12,4 @@ <flag name="smtp">enable support for SMTP protocol.</flag> <flag name="tos">enable support for TOS (TYpe Of Service).</flag> </use> - <upstream> - <remote-id type="sourceforge">echoping</remote-id> - </upstream> </pkgmetadata> diff --git a/net-analyzer/etherape/etherape-0.9.20.ebuild b/net-analyzer/etherape/etherape-0.9.20.ebuild index e1b4495473b6..eeacc6874cfc 100644 --- a/net-analyzer/etherape/etherape-0.9.20.ebuild +++ b/net-analyzer/etherape/etherape-0.9.20.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 DESCRIPTION="A graphical network monitor for Unix modeled after etherman" HOMEPAGE="https://etherape.sourceforge.io/" -SRC_URI="mirror://sourceforge/etherape/${P}.tar.gz" +SRC_URI="https://downloads.sourceforge.net/etherape/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" diff --git a/net-analyzer/fail2ban/Manifest b/net-analyzer/fail2ban/Manifest index ab84e5639461..54681ec36bc0 100644 --- a/net-analyzer/fail2ban/Manifest +++ b/net-analyzer/fail2ban/Manifest @@ -1 +1,2 @@ DIST fail2ban-1.0.2.tar.gz 583295 BLAKE2B 84eb5e3487c4db734f4f0a36af142d520e1cc53c2960893ee2f05ff4e78133860be59ed9580fa0d972509a03c17e5d9458b8e3f6b470a4c3154f10911f94691e SHA512 688a84361b5794e1658f53d2d200ce752fe1e3320ddb1742c32c4b4b82a79ace16ae464e7ea3eeb94a0e862bcac73c2d3a0e61dd7b28e179a4c857f950d74dbb +DIST fail2ban-1.1.0.tar.gz 603854 BLAKE2B f7c2d3a1e5b5cdca1f26d92cefe75958bb61b87ad1cf316380b91527c96f3261e5665478c5fbb053f6419956dda934c8ef3ce837af2819b1b1c8d162246fc15f SHA512 9bff7b9c41e58a953901800468e5c4153c9db6af01c7eb18111ad8620b40d03a0771020472fb759b2809d250e2bb45471e6c7e8283e72ea48290ecf7bf921821 diff --git a/net-analyzer/fail2ban/fail2ban-1.0.2-r2.ebuild b/net-analyzer/fail2ban/fail2ban-1.0.2-r3.ebuild index 2a67b21bda7b..fd9d7373924e 100644 --- a/net-analyzer/fail2ban/fail2ban-1.0.2-r2.ebuild +++ b/net-analyzer/fail2ban/fail2ban-1.0.2-r3.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 DISTUTILS_SINGLE_IMPL=1 -PYTHON_COMPAT=( python3_{10..11} ) +PYTHON_COMPAT=( python3_{10..12} ) inherit bash-completion-r1 distutils-r1 systemd tmpfiles @@ -16,7 +16,7 @@ if [[ ${PV} == *9999 ]] ; then inherit git-r3 else SRC_URI="https://github.com/fail2ban/fail2ban/archive/${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ppc ppc64 ~riscv sparc x86" + KEYWORDS="~alpha amd64 arm arm64 ~loong ppc ppc64 ~riscv sparc x86" fi LICENSE="GPL-2" @@ -24,6 +24,10 @@ SLOT="0" IUSE="selinux systemd" RDEPEND=" + $(python_gen_cond_dep ' + dev-python/pyasyncore[${PYTHON_USEDEP}] + dev-python/pyasynchat[${PYTHON_USEDEP}] + ' 3.12) virtual/logger virtual/mta selinux? ( sec-policy/selinux-fail2ban ) @@ -48,6 +52,9 @@ python_prepare_all() { # Replace /var/run with /run, but not in the top source directory find . -mindepth 2 -type f -exec \ sed -i -e 's|/var\(/run/fail2ban\)|\1|g' {} + || die + + # Incompatible with Python 3.12 in 1.0.x, 9999 uses dev-python/aiosmtpd. + rm fail2ban/tests/action_d/test_smtp.py || die } python_compile() { @@ -57,6 +64,7 @@ python_compile() { python_test() { # Skip testRepairDb for bug #907348 (didn't always fail..) + # https://github.com/fail2ban/fail2ban/issues/3586 bin/fail2ban-testcases \ --no-network \ --no-gamin \ diff --git a/net-analyzer/fail2ban/fail2ban-1.1.0-r1.ebuild b/net-analyzer/fail2ban/fail2ban-1.1.0-r1.ebuild new file mode 100644 index 000000000000..0035a85226e7 --- /dev/null +++ b/net-analyzer/fail2ban/fail2ban-1.1.0-r1.ebuild @@ -0,0 +1,136 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISTUTILS_SINGLE_IMPL=1 +PYTHON_COMPAT=( python3_{10..13} ) + +inherit bash-completion-r1 distutils-r1 systemd tmpfiles + +DESCRIPTION="Scans log files and bans IPs that show malicious signs" +HOMEPAGE="https://www.fail2ban.org/" + +if [[ ${PV} == *9999 ]] ; then + EGIT_REPO_URI="https://github.com/fail2ban/fail2ban" + inherit git-r3 +else + SRC_URI="https://github.com/fail2ban/fail2ban/archive/${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86" +fi + +LICENSE="GPL-2" +SLOT="0" +IUSE="selinux systemd test" +RESTRICT="!test? ( test )" + +RDEPEND=" + $(python_gen_cond_dep ' + dev-python/pyasyncore[${PYTHON_USEDEP}] + dev-python/pyasynchat[${PYTHON_USEDEP}] + ' 3.12) + virtual/logger + virtual/mta + selinux? ( sec-policy/selinux-fail2ban ) + systemd? ( + $(python_gen_cond_dep ' + dev-python/python-systemd[${PYTHON_USEDEP}] + ') + ) +" +BDEPEND=" + test? ( + $(python_gen_cond_dep ' + dev-python/aiosmtpd[${PYTHON_USEDEP}] + ') + ) +" + +DOCS=( ChangeLog DEVELOP README.md THANKS TODO doc/run-rootless.txt ) + +PATCHES=( + "${FILESDIR}"/${PN}-0.11.2-adjust-apache-logs-paths.patch + "${FILESDIR}"/${PN}-1.0.2-umask-tests.patch + "${FILESDIR}"/${PN}-1.1.0-openssh-9.8.patch +) + +python_prepare_all() { + distutils-r1_python_prepare_all + + # Replace /var/run with /run, but not in the top source directory + find . -mindepth 2 -type f -exec \ + sed -i -e 's|/var\(/run/fail2ban\)|\1|g' {} + || die +} + +python_test() { + # Skip testRepairDb for bug #907348 (didn't always fail..) + # https://github.com/fail2ban/fail2ban/issues/3586 + bin/fail2ban-testcases \ + --no-network \ + --ignore databasetestcase.DatabaseTest.testRepairDb \ + --verbosity=4 || die "Tests failed with ${EPYTHON}" + + # Workaround for bug #790251 + rm -rf fail2ban.egg-info || die +} + +python_install_all() { + distutils-r1_python_install_all + + rm -rf "${ED}"/usr/share/doc/${PN} "${ED}"/run || die + + newconfd files/fail2ban-openrc.conf ${PN} + + # These two are placed in the ${BUILD_DIR} after being "built" + # in install_scripts(). + newinitd "${BUILD_DIR}/fail2ban-openrc.init" "${PN}" + systemd_dounit "${BUILD_DIR}/${PN}.service" + + dotmpfiles files/${PN}-tmpfiles.conf + + doman man/*.{1,5} + + # Use INSTALL_MASK if you do not want to touch /etc/logrotate.d. + # See http://thread.gmane.org/gmane.linux.gentoo.devel/35675 + insinto /etc/logrotate.d + newins files/${PN}-logrotate ${PN} + + keepdir /var/lib/${PN} + + newbashcomp files/bash-completion ${PN}-client + bashcomp_alias ${PN}-client ${PN}-server ${PN}-regex +} + +pkg_preinst() { + has_version "<${CATEGORY}/${PN}-0.7" + previous_less_than_0_7=$? +} + +pkg_postinst() { + tmpfiles_process ${PN}-tmpfiles.conf + + if [[ ${previous_less_than_0_7} == 0 ]] ; then + elog + elog "Configuration files are now in /etc/fail2ban/" + elog "You probably have to manually update your configuration" + elog "files before restarting Fail2Ban!" + elog + elog "Fail2Ban is not installed under /usr/lib anymore. The" + elog "new location is under /usr/share." + elog + elog "You are upgrading from version 0.6.x, please see:" + elog "http://www.fail2ban.org/wiki/index.php/HOWTO_Upgrade_from_0.6_to_0.8" + fi + + if ! has_version dev-python/pyinotify ; then + elog "For most jail.conf configurations, it is recommended you install" + elog "dev-python/pyinotify to control how log file modifications are detected" + fi + + if ! has_version dev-lang/python[sqlite] ; then + elog "If you want to use ${PN}'s persistent database, then reinstall" + elog "dev-lang/python with USE=sqlite. If you do not use the" + elog "persistent database feature, then you should set" + elog "dbfile = :memory: in fail2ban.conf accordingly." + fi +} diff --git a/net-analyzer/fail2ban/fail2ban-1.1.0.ebuild b/net-analyzer/fail2ban/fail2ban-1.1.0.ebuild new file mode 100644 index 000000000000..8f83d3ea20cf --- /dev/null +++ b/net-analyzer/fail2ban/fail2ban-1.1.0.ebuild @@ -0,0 +1,135 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISTUTILS_SINGLE_IMPL=1 +PYTHON_COMPAT=( python3_{10..12} ) + +inherit bash-completion-r1 distutils-r1 systemd tmpfiles + +DESCRIPTION="Scans log files and bans IPs that show malicious signs" +HOMEPAGE="https://www.fail2ban.org/" + +if [[ ${PV} == *9999 ]] ; then + EGIT_REPO_URI="https://github.com/fail2ban/fail2ban" + inherit git-r3 +else + SRC_URI="https://github.com/fail2ban/fail2ban/archive/${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86" +fi + +LICENSE="GPL-2" +SLOT="0" +IUSE="selinux systemd test" +RESTRICT="!test? ( test )" + +RDEPEND=" + $(python_gen_cond_dep ' + dev-python/pyasyncore[${PYTHON_USEDEP}] + dev-python/pyasynchat[${PYTHON_USEDEP}] + ' 3.12) + virtual/logger + virtual/mta + selinux? ( sec-policy/selinux-fail2ban ) + systemd? ( + $(python_gen_cond_dep ' + dev-python/python-systemd[${PYTHON_USEDEP}] + ') + ) +" +BDEPEND=" + test? ( + $(python_gen_cond_dep ' + dev-python/aiosmtpd[${PYTHON_USEDEP}] + ') + ) +" + +DOCS=( ChangeLog DEVELOP README.md THANKS TODO doc/run-rootless.txt ) + +PATCHES=( + "${FILESDIR}"/${PN}-0.11.2-adjust-apache-logs-paths.patch + "${FILESDIR}"/${PN}-1.0.2-umask-tests.patch +) + +python_prepare_all() { + distutils-r1_python_prepare_all + + # Replace /var/run with /run, but not in the top source directory + find . -mindepth 2 -type f -exec \ + sed -i -e 's|/var\(/run/fail2ban\)|\1|g' {} + || die +} + +python_test() { + # Skip testRepairDb for bug #907348 (didn't always fail..) + # https://github.com/fail2ban/fail2ban/issues/3586 + bin/fail2ban-testcases \ + --no-network \ + --ignore databasetestcase.DatabaseTest.testRepairDb \ + --verbosity=4 || die "Tests failed with ${EPYTHON}" + + # Workaround for bug #790251 + rm -rf fail2ban.egg-info || die +} + +python_install_all() { + distutils-r1_python_install_all + + rm -rf "${ED}"/usr/share/doc/${PN} "${ED}"/run || die + + newconfd files/fail2ban-openrc.conf ${PN} + + # These two are placed in the ${BUILD_DIR} after being "built" + # in install_scripts(). + newinitd "${BUILD_DIR}/fail2ban-openrc.init" "${PN}" + systemd_dounit "${BUILD_DIR}/${PN}.service" + + dotmpfiles files/${PN}-tmpfiles.conf + + doman man/*.{1,5} + + # Use INSTALL_MASK if you do not want to touch /etc/logrotate.d. + # See http://thread.gmane.org/gmane.linux.gentoo.devel/35675 + insinto /etc/logrotate.d + newins files/${PN}-logrotate ${PN} + + keepdir /var/lib/${PN} + + newbashcomp files/bash-completion ${PN}-client + bashcomp_alias ${PN}-client ${PN}-server ${PN}-regex +} + +pkg_preinst() { + has_version "<${CATEGORY}/${PN}-0.7" + previous_less_than_0_7=$? +} + +pkg_postinst() { + tmpfiles_process ${PN}-tmpfiles.conf + + if [[ ${previous_less_than_0_7} == 0 ]] ; then + elog + elog "Configuration files are now in /etc/fail2ban/" + elog "You probably have to manually update your configuration" + elog "files before restarting Fail2Ban!" + elog + elog "Fail2Ban is not installed under /usr/lib anymore. The" + elog "new location is under /usr/share." + elog + elog "You are upgrading from version 0.6.x, please see:" + elog "http://www.fail2ban.org/wiki/index.php/HOWTO_Upgrade_from_0.6_to_0.8" + fi + + if ! has_version dev-python/pyinotify ; then + elog "For most jail.conf configurations, it is recommended you install" + elog "dev-python/pyinotify to control how log file modifications are detected" + fi + + if ! has_version dev-lang/python[sqlite] ; then + elog "If you want to use ${PN}'s persistent database, then reinstall" + elog "dev-lang/python with USE=sqlite. If you do not use the" + elog "persistent database feature, then you should set" + elog "dbfile = :memory: in fail2ban.conf accordingly." + fi +} diff --git a/net-analyzer/fail2ban/fail2ban-9999.ebuild b/net-analyzer/fail2ban/fail2ban-9999.ebuild index d9a3b9fdb4da..45aad51f16eb 100644 --- a/net-analyzer/fail2ban/fail2ban-9999.ebuild +++ b/net-analyzer/fail2ban/fail2ban-9999.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 DISTUTILS_SINGLE_IMPL=1 -PYTHON_COMPAT=( python3_{10..11} ) +PYTHON_COMPAT=( python3_{10..13} ) inherit bash-completion-r1 distutils-r1 systemd tmpfiles @@ -16,14 +16,19 @@ if [[ ${PV} == *9999 ]] ; then inherit git-r3 else SRC_URI="https://github.com/fail2ban/fail2ban/archive/${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86" fi LICENSE="GPL-2" SLOT="0" -IUSE="selinux systemd" +IUSE="selinux systemd test" +RESTRICT="!test? ( test )" RDEPEND=" + $(python_gen_cond_dep ' + dev-python/pyasyncore[${PYTHON_USEDEP}] + dev-python/pyasynchat[${PYTHON_USEDEP}] + ' 3.12) virtual/logger virtual/mta selinux? ( sec-policy/selinux-fail2ban ) @@ -33,6 +38,13 @@ RDEPEND=" ') ) " +BDEPEND=" + test? ( + $(python_gen_cond_dep ' + dev-python/aiosmtpd[${PYTHON_USEDEP}] + ') + ) +" DOCS=( ChangeLog DEVELOP README.md THANKS TODO doc/run-rootless.txt ) @@ -51,6 +63,7 @@ python_prepare_all() { python_test() { # Skip testRepairDb for bug #907348 (didn't always fail..) + # https://github.com/fail2ban/fail2ban/issues/3586 bin/fail2ban-testcases \ --no-network \ --ignore databasetestcase.DatabaseTest.testRepairDb \ diff --git a/net-analyzer/fail2ban/files/fail2ban-1.1.0-openssh-9.8.patch b/net-analyzer/fail2ban/files/fail2ban-1.1.0-openssh-9.8.patch new file mode 100644 index 000000000000..6b7800ca3f0a --- /dev/null +++ b/net-analyzer/fail2ban/files/fail2ban-1.1.0-openssh-9.8.patch @@ -0,0 +1,75 @@ +https://bugs.gentoo.org/935392 +https://github.com/fail2ban/fail2ban/commit/6fce23e7baa484c7d1f9b0c9a11986f3916c41dd +https://github.com/fail2ban/fail2ban/commit/2fed408c05ac5206b490368d94599869bd6a056d +https://github.com/fail2ban/fail2ban/commit/50ff131a0fd8f54fdeb14b48353f842ee8ae8c1a + +From 6fce23e7baa484c7d1f9b0c9a11986f3916c41dd Mon Sep 17 00:00:00 2001 +From: "Sergey G. Brester" <serg.brester@sebres.de> +Date: Mon, 10 Jun 2024 01:40:59 +0200 +Subject: [PATCH] `filterd./sshd.conf`: fixed journalmatch (sshd.service seems + to be renamed to ssh.service) + +closes gh-3747 +--- + config/filter.d/sshd.conf | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/config/filter.d/sshd.conf b/config/filter.d/sshd.conf +index a954774c62..1c8a02deb5 100644 +--- a/config/filter.d/sshd.conf ++++ b/config/filter.d/sshd.conf +@@ -126,7 +126,7 @@ ignoreregex = + + maxlines = 1 + +-journalmatch = _SYSTEMD_UNIT=sshd.service + _COMM=sshd ++journalmatch = _SYSTEMD_UNIT=ssh.service + _COMM=sshd + + # DEV Notes: + # + +From 2fed408c05ac5206b490368d94599869bd6a056d Mon Sep 17 00:00:00 2001 +From: Fabian Dellwing <fabian.dellwing@mbconnectline.de> +Date: Tue, 2 Jul 2024 07:54:15 +0200 +Subject: [PATCH] Adjust sshd filter for OpenSSH 9.8 new daemon name + +--- + config/filter.d/sshd.conf | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/config/filter.d/sshd.conf b/config/filter.d/sshd.conf +index 1c8a02deb5..a1fd749aed 100644 +--- a/config/filter.d/sshd.conf ++++ b/config/filter.d/sshd.conf +@@ -16,7 +16,7 @@ before = common.conf + + [DEFAULT] + +-_daemon = sshd ++_daemon = (?:sshd(?:-session)?) + + # optional prefix (logged from several ssh versions) like "error: ", "error: PAM: " or "fatal: " + __pref = (?:(?:error|fatal): (?:PAM: )?)? + +From 50ff131a0fd8f54fdeb14b48353f842ee8ae8c1a Mon Sep 17 00:00:00 2001 +From: "Sergey G. Brester" <serg.brester@sebres.de> +Date: Wed, 3 Jul 2024 19:35:28 +0200 +Subject: [PATCH] filter.d/sshd.conf: ungroup (unneeded for _daemon) + +--- + config/filter.d/sshd.conf | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/config/filter.d/sshd.conf b/config/filter.d/sshd.conf +index a1fd749aed..3a84b1ba52 100644 +--- a/config/filter.d/sshd.conf ++++ b/config/filter.d/sshd.conf +@@ -16,7 +16,7 @@ before = common.conf + + [DEFAULT] + +-_daemon = (?:sshd(?:-session)?) ++_daemon = sshd(?:-session)? + + # optional prefix (logged from several ssh versions) like "error: ", "error: PAM: " or "fatal: " + __pref = (?:(?:error|fatal): (?:PAM: )?)? diff --git a/net-analyzer/flow-tools/metadata.xml b/net-analyzer/flow-tools/metadata.xml index f685af7a2744..52394dd65495 100644 --- a/net-analyzer/flow-tools/metadata.xml +++ b/net-analyzer/flow-tools/metadata.xml @@ -14,5 +14,6 @@ interface have been contributed and are included in the distribution.</longdescription> <upstream> <remote-id type="google-code">flow-tools</remote-id> + <remote-id type="github">5u623l20/flow-tools</remote-id> </upstream> </pkgmetadata> diff --git a/net-analyzer/fping/Manifest b/net-analyzer/fping/Manifest index 5d58b6f9d312..78cb10654baa 100644 --- a/net-analyzer/fping/Manifest +++ b/net-analyzer/fping/Manifest @@ -1 +1,2 @@ DIST fping-5.1.tar.gz 191224 BLAKE2B 2fb344e650b5a359fb8780f2c599455d39405ae823edf695ee4385aa2661dc5811e088bafa1b9f53846ee90c0afa959a92832381a03346d1fda048eb4e7ee098 SHA512 1a208da8dcd99093d0512af5d85ba5e7b5743ec97993d24c1fe612bb58d93090ac1ba0952f648aa075f16d390a77c4be65e394ae56dbede2a6914e0e8c68e2bd +DIST fping-5.2.tar.gz 194259 BLAKE2B 7efb445f32ffe2d3766d598da5f1585270ae8e68ceb8b64e418040f330e7736bfaf0313077e28b12031af25ed7952943603d3a5908174c3f78d9a1af0b735da9 SHA512 062896662804c55ffe2d4e3eb7efc2ff796d20a77b367e16f8fa381e302986b5127ca55f0866bbf08f8ae2b2f6795ec4c5d43dc59ebec157fb3e8eff25d0bdb3 diff --git a/net-analyzer/fping/files/fping-5.1-c99-musl.patch b/net-analyzer/fping/files/fping-5.1-c99-musl.patch new file mode 100644 index 000000000000..d56bb501682c --- /dev/null +++ b/net-analyzer/fping/files/fping-5.1-c99-musl.patch @@ -0,0 +1,39 @@ +https://bugs.gentoo.org/895182 +https://github.com/schweikert/fping/commit/c0fbccb977c523ba671afdf0f37de40d26351f77 + +From c0fbccb977c523ba671afdf0f37de40d26351f77 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Mon, 29 Aug 2022 15:41:51 -0700 +Subject: [PATCH] fping: Initialize msghdr struct in a portable way + +Initializing the structure assuming glibc layout results in +compile errors on musl, therefore do partial intialization and then +assigning the members individually. + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- a/src/fping.c ++++ b/src/fping.c +@@ -1962,15 +1962,13 @@ int receive_packet(int64_t wait_time, + reply_buf, + reply_buf_len + }; +- struct msghdr recv_msghdr = { +- reply_src_addr, +- reply_src_addr_len, +- &msg_iov, +- 1, +- &msg_control, +- sizeof(msg_control), +- 0 +- }; ++ struct msghdr recv_msghdr = {0}; ++ recv_msghdr.msg_name = reply_src_addr; ++ recv_msghdr.msg_namelen = reply_src_addr_len; ++ recv_msghdr.msg_iov = &msg_iov; ++ recv_msghdr.msg_iovlen = 1; ++ recv_msghdr.msg_control = &msg_control; ++ recv_msghdr.msg_controllen = sizeof(msg_control); + #if HAVE_SO_TIMESTAMPNS + struct cmsghdr *cmsg; + #endif + diff --git a/net-analyzer/fping/fping-5.1-r1.ebuild b/net-analyzer/fping/fping-5.1-r1.ebuild new file mode 100644 index 000000000000..0b69f0dcac00 --- /dev/null +++ b/net-analyzer/fping/fping-5.1-r1.ebuild @@ -0,0 +1,35 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit fcaps + +DESCRIPTION="A utility to ping multiple hosts at once" +HOMEPAGE="https://fping.org/ https://github.com/schweikert/fping/" +SRC_URI="https://fping.org/dist/${P}.tar.gz" + +LICENSE="fping" +SLOT="0" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux" +IUSE="suid" + +FILECAPS=( cap_net_raw+ep usr/sbin/fping ) + +PATCHES=( + "${FILESDIR}"/${PN}-5.1-c99-musl.patch +) + +src_configure() { + econf --enable-ipv6 +} + +src_install() { + default + + if use suid; then + fperms u+s /usr/sbin/fping + fi + + dosym fping /usr/sbin/fping6 +} diff --git a/net-analyzer/fping/fping-5.2.ebuild b/net-analyzer/fping/fping-5.2.ebuild new file mode 100644 index 000000000000..4cd7221d0476 --- /dev/null +++ b/net-analyzer/fping/fping-5.2.ebuild @@ -0,0 +1,39 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit fcaps + +DESCRIPTION="Utility to ping multiple hosts at once" +HOMEPAGE="https://fping.org/ https://github.com/schweikert/fping/" +SRC_URI=" + https://fping.org/dist/${P}.tar.gz + https://github.com/schweikert/fping/releases/download/v${PV}/${P}.tar.gz +" + +LICENSE="fping" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux" +IUSE="debug suid" +# There are some tests in ci/* but they don't seem to be for packaging +# (they want to modify the live FS by e.g. copying to /tmp.) +RESTRICT="test" + +FILECAPS=( cap_net_raw+ep usr/sbin/fping ) + +src_configure() { + econf \ + $(use_enable debug) \ + --enable-ipv6 +} + +src_install() { + default + + if use suid; then + fperms u+s /usr/sbin/fping + fi + + dosym fping /usr/sbin/fping6 +} diff --git a/net-analyzer/fprobe/fprobe-1.1-r6.ebuild b/net-analyzer/fprobe/fprobe-1.1-r6.ebuild index b873e1f9619b..31aa5507e0c1 100644 --- a/net-analyzer/fprobe/fprobe-1.1-r6.ebuild +++ b/net-analyzer/fprobe/fprobe-1.1-r6.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -7,7 +7,7 @@ inherit autotools DESCRIPTION="libpcap-based tool to collect network traffic data and emit it as NetFlow flows" HOMEPAGE="https://fprobe.sourceforge.net" -SRC_URI="mirror://sourceforge/fprobe/${P}.tar.bz2" +SRC_URI="https://downloads.sourceforge.net/fprobe/${P}.tar.bz2" LICENSE="GPL-2" SLOT="0" diff --git a/net-analyzer/fprobe/fprobe-1.1-r7.ebuild b/net-analyzer/fprobe/fprobe-1.1-r7.ebuild index 2e60316ccd2c..6fcab549b32c 100644 --- a/net-analyzer/fprobe/fprobe-1.1-r7.ebuild +++ b/net-analyzer/fprobe/fprobe-1.1-r7.ebuild @@ -7,11 +7,11 @@ inherit autotools DESCRIPTION="libpcap-based tool to collect network traffic data and emit it as NetFlow flows" HOMEPAGE="https://fprobe.sourceforge.net" -SRC_URI="mirror://sourceforge/fprobe/${P}.tar.bz2" +SRC_URI="https://downloads.sourceforge.net/fprobe/${P}.tar.bz2" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" +KEYWORDS="amd64 ppc x86" IUSE="debug messages" RDEPEND="net-libs/libpcap" diff --git a/net-analyzer/gensink/Manifest b/net-analyzer/gensink/Manifest deleted file mode 100644 index 1afa17b7d79e..000000000000 --- a/net-analyzer/gensink/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST gensink-4.1.tar.gz 12352 BLAKE2B 024f65d0a0a5c4b23ca8e3b8d7f80b68888ff9eacbfa01028b2df8e2bafc7034837701a49aa6eeb5392a042029e6bf122c8d5c47c935e218830b902e5e36461d SHA512 5572c4df9b3c688f6a0f33c539bcdbd3c7b2a0992ba560907e0d22440176380cb6888732ab11ef4d6ced0c2d906ab494895a65c00a64db8603cbd1245d9c0d27 diff --git a/net-analyzer/gensink/files/gensink-4.1-make.patch b/net-analyzer/gensink/files/gensink-4.1-make.patch deleted file mode 100644 index 103043f79ae1..000000000000 --- a/net-analyzer/gensink/files/gensink-4.1-make.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/Makefile -+++ b/Makefile -@@ -1,7 +1,4 @@ - PROGS = gen4 sink4 tub4 --CC = gcc --CFLAGS = -O2 -g -Wall --LDFLAGS = -O -g - - all: $(PROGS) - diff --git a/net-analyzer/gensink/gensink-4.1-r2.ebuild b/net-analyzer/gensink/gensink-4.1-r2.ebuild deleted file mode 100644 index 808eea74cb25..000000000000 --- a/net-analyzer/gensink/gensink-4.1-r2.ebuild +++ /dev/null @@ -1,25 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit toolchain-funcs - -DESCRIPTION="A simple TCP benchmark suite" -HOMEPAGE="http://jes.home.cern.ch/jes/gensink/" -SRC_URI="http://jes.home.cern.ch/jes/gensink/${P}.tar.gz" -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~ppc x86" - -PATCHES=( - "${FILESDIR}/${P}-make.patch" -) - -src_compile() { - tc-export CC - default -} -src_install() { - dobin sink4 tub4 gen4 -} diff --git a/net-analyzer/gensink/metadata.xml b/net-analyzer/gensink/metadata.xml deleted file mode 100644 index dce3f3be66c0..000000000000 --- a/net-analyzer/gensink/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> -<maintainer type="project"> - <email>netmon@gentoo.org</email> - <name>Gentoo network monitoring and analysis project</name> -</maintainer> -</pkgmetadata> diff --git a/net-analyzer/goaccess/Manifest b/net-analyzer/goaccess/Manifest index 4fe953157e67..f9dd67d760d4 100644 --- a/net-analyzer/goaccess/Manifest +++ b/net-analyzer/goaccess/Manifest @@ -1,3 +1,2 @@ -DIST goaccess-1.6.3.tar.gz 658827 BLAKE2B 48378235a75c11e7392bcaca98c64689032e74377696cf6fd3e0e230dd35a2e0f78e5f4283da2c4693ec072942ae6be4d3dc27f91f23d8390f81a330d9955c93 SHA512 7890fc35700db9ce1d3c720607cce6008a3140a14d143fcdd02f11a79f5344a26c648c9b7e6316a21d3ff07f588815bcdfb33072b5e0a18c429e9bfdb8bf99f4 -DIST goaccess-1.7.2.tar.gz 679321 BLAKE2B a423553fcbac76eb1358bffda9ec413da48241f9702d01872cede4999fa2baef60758f48ad621986789ddf2f514ca77ac72a4d367469ec493d792dea01c3f957 SHA512 0e057c9d49d5a9189af0b8f12e867d4402326ca0d2f562771b4d2c73fcfc2e5d79a826465ee56e03e036fbcddb7c6171005cd06ba28a2c25fc1683fe37bd59a7 DIST goaccess-1.8.1.tar.gz 740177 BLAKE2B cc1f17c72adeeaf50d3b6c7bef47a044a3bbf06fb44d73da9b1ae68ea71d8e276dbe02c6a89cf0a72f3327e817e8d59235f788d29aeb7c7c889bacf81b64292a SHA512 96f0b73f13cfb77ad57748bce7d8791f8486bfd5ce47420d1c0016826a4deb9ab2d2742f4afd5d8b0eed003f9b596aae51f232fa71bf47f823b6ff8119f91354 +DIST goaccess-1.9.3.tar.gz 821878 BLAKE2B 99a3a0f9b73a24bb871df2eb16be44dfefbe8fdcd9f10aec66beca98bae65a8b98085c58168c35407f53cf599cf33bc930247f7f7241742ca7750ef68236992e SHA512 6f838d006bec65819d42115b9ce6edb3d839c1bbb609353163960361684ae67c5ecb859e5c9e19eb3233aac4e97c18bdd4d19e1919b05695b3dfef3ca5e7a192 diff --git a/net-analyzer/goaccess/files/goaccess.initd b/net-analyzer/goaccess/files/goaccess.initd index be0059588396..bd782952cfb4 100644 --- a/net-analyzer/goaccess/files/goaccess.initd +++ b/net-analyzer/goaccess/files/goaccess.initd @@ -1,5 +1,5 @@ #!/sbin/openrc-run -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 command="/usr/bin/goaccess" @@ -7,6 +7,7 @@ name="GoAccess" description="Real-time web log analyzer" config="${CONFIG:-/etc/goaccess/goaccess.conf}" command_args="--real-time-html --daemonize -p $config ${OPTS}" +pidfile="/run/goaccess/${RC_SVCNAME}.pid" start_stop_daemon_args="-q" depend() { diff --git a/net-analyzer/goaccess/goaccess-1.6.3.ebuild b/net-analyzer/goaccess/goaccess-1.6.3.ebuild deleted file mode 100644 index 52788637826a..000000000000 --- a/net-analyzer/goaccess/goaccess-1.6.3.ebuild +++ /dev/null @@ -1,70 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit autotools optfeature systemd tmpfiles - -DESCRIPTION="A real-time web log analyzer and interactive viewer in a terminal" -HOMEPAGE="https://goaccess.io" -SRC_URI="https://tar.goaccess.io/${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="debug geoip geoipv2 getline ssl unicode" -REQUIRED_USE="geoipv2? ( geoip )" - -RDEPEND="acct-group/goaccess - acct-user/goaccess - sys-libs/ncurses:=[unicode(+)?] - geoip? ( - !geoipv2? ( dev-libs/geoip ) - geoipv2? ( dev-libs/libmaxminddb:0= ) - ) - ssl? ( dev-libs/openssl:0= )" -DEPEND="${RDEPEND}" -BDEPEND="virtual/pkgconfig" - -src_prepare() { - default - - # Enable log-format, define log file and db path, - # change path to GeoIP bases in config - sed -i -e '/log-format COMBINED/s/#//' \ - -e '/log-file/s/#//' \ - -e '/db-path/s|tmp|var/lib/goaccess|' \ - -e '/geoip-database/s|local/||' config/goaccess.conf \ - || die "sed failed for goaccess.conf" - - eautoreconf -} - -src_configure() { - local myeconfargs=() - readarray -t myeconfargs < <( - use_enable debug - use_enable geoip geoip "$(usex geoipv2 mmdb legacy)" - use_enable unicode utf8 - use_with getline - use_with ssl openssl - ) - econf "${myeconfargs[@]}" -} - -src_install() { - default - - newinitd "${FILESDIR}"/goaccess.initd goaccess - newconfd "${FILESDIR}"/goaccess.confd goaccess - systemd_dounit "${FILESDIR}"/goaccess.service - newtmpfiles "${FILESDIR}"/goaccess.tmpfile goaccess.conf - - diropts -o goaccess -g goaccess -m 0700 - keepdir /var/lib/goaccess/db /var/log/goaccess -} - -pkg_postinst() { - optfeature "update GeoIP databases" net-misc/geoipupdate - tmpfiles_process goaccess.conf -} diff --git a/net-analyzer/goaccess/goaccess-1.7.2.ebuild b/net-analyzer/goaccess/goaccess-1.9.3.ebuild index 483e675fa316..cd8029868ed2 100644 --- a/net-analyzer/goaccess/goaccess-1.7.2.ebuild +++ b/net-analyzer/goaccess/goaccess-1.9.3.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # shellcheck disable=SC2207 EAPI=8 -inherit autotools optfeature systemd tmpfiles +inherit optfeature systemd tmpfiles DESCRIPTION="A real-time web log analyzer and interactive viewer in a terminal" HOMEPAGE="https://goaccess.io" @@ -38,8 +38,6 @@ src_prepare() { -e '/db-path/s|tmp|var/lib/goaccess|' \ -e '/geoip-database/s|local/||' config/goaccess.conf \ || die "sed failed for goaccess.conf" - - eautoreconf } src_configure() { diff --git a/net-analyzer/goaccess/goaccess-9999.ebuild b/net-analyzer/goaccess/goaccess-9999.ebuild index f865c1c79c2b..58691f5c27b8 100644 --- a/net-analyzer/goaccess/goaccess-9999.ebuild +++ b/net-analyzer/goaccess/goaccess-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # shellcheck disable=SC2207 @@ -11,11 +11,9 @@ inherit autotools git-r3 optfeature systemd tmpfiles DESCRIPTION="A real-time web log analyzer and interactive viewer in a terminal" HOMEPAGE="https://goaccess.io" -SRC_URI="" LICENSE="MIT" SLOT="0" -KEYWORDS="" IUSE="debug geoip geoipv2 getline ssl unicode" REQUIRED_USE="geoipv2? ( geoip )" diff --git a/net-analyzer/gr-fosphor/gr-fosphor-0.0_p20210108.ebuild b/net-analyzer/gr-fosphor/gr-fosphor-0.0_p20210108-r1.ebuild index 3a6f011748ef..f96577d17e9e 100644 --- a/net-analyzer/gr-fosphor/gr-fosphor-0.0_p20210108.ebuild +++ b/net-analyzer/gr-fosphor/gr-fosphor-0.0_p20210108-r1.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_{9..12} ) inherit cmake python-single-r1 diff --git a/net-analyzer/gr-fosphor/gr-fosphor-9999.ebuild b/net-analyzer/gr-fosphor/gr-fosphor-9999.ebuild index accf82083f3d..add2ec07ba9e 100644 --- a/net-analyzer/gr-fosphor/gr-fosphor-9999.ebuild +++ b/net-analyzer/gr-fosphor/gr-fosphor-9999.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_{9..12} ) inherit cmake python-single-r1 diff --git a/net-analyzer/greenbone-feed-sync/Manifest b/net-analyzer/greenbone-feed-sync/Manifest index 231c9f429725..23d120d9afc1 100644 --- a/net-analyzer/greenbone-feed-sync/Manifest +++ b/net-analyzer/greenbone-feed-sync/Manifest @@ -1,2 +1,2 @@ DIST greenbone-feed-sync-23.10.0.tar.gz 63001 BLAKE2B 5566cef8649e578cb498f0a5bc1e41f237a3702698b2012f3a62d8f5f647e6b1e3253c7d92e4a9fc82ad7991de8010b94ba8c1194a820511c49e5f5262e471ff SHA512 fe5864c4e650f17a072cd6e4153779ea33ad8f0ac28e92114b40c465a04b70791b603ccbe82934dcdad13fce2003e2d9786cec75854efecf8aefa74c7ce178f4 -DIST greenbone-feed-sync-24.1.1.tar.gz 58806 BLAKE2B 01229e630584fc04a6c1806f06d6769cdf76adfdff7b8b97032dff908c7de41cb928a902a43da2407e03643e0f7a868cbad148e6fd1680b4c91eb7b953c6cf20 SHA512 bb8d7c2917fe5096dc1041df832a7880a2760dff049e139e6a9d453c4e24ff04557be3c4f52a785496f67820d0c7bc256f7bfd23617a4734e263b0bc725ae039 +DIST greenbone-feed-sync-24.3.0.tar.gz 58949 BLAKE2B 10260850dad8781682e9f3e3eb31faa4139080b3c5661261770fe28053df472b21b4e2ef98f258b5c634c26d543313da30bb01d9eadfdb8ea8e7b7b57205b7f5 SHA512 ac1ce1f0a2898997e5a330e9a186b6203b7593e5b847d23202c28e7b3b7be1556001cc6d8ba5abd7077d1b51e0f21640728f78659ecf9a60eede28ea483344b4 diff --git a/net-analyzer/greenbone-feed-sync/greenbone-feed-sync-24.1.1.ebuild b/net-analyzer/greenbone-feed-sync/greenbone-feed-sync-24.3.0-r1.ebuild index 7ae049456675..d62d82b0000a 100644 --- a/net-analyzer/greenbone-feed-sync/greenbone-feed-sync-24.1.1.ebuild +++ b/net-analyzer/greenbone-feed-sync/greenbone-feed-sync-24.3.0-r1.ebuild @@ -3,7 +3,7 @@ EAPI=8 -PYTHON_COMPAT=( python3_{10..12} ) +PYTHON_COMPAT=( python3_{10..12} pypy3 ) DISTUTILS_USE_PEP517=poetry inherit distutils-r1 systemd @@ -11,22 +11,24 @@ DESCRIPTION="New script for syncing the Greenbone Community Feed" HOMEPAGE="https://github.com/greenbone/greenbone-feed-sync" SRC_URI="https://github.com/greenbone/greenbone-feed-sync/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" -SLOT="0" LICENSE="GPL-3+" -KEYWORDS="~amd64" +SLOT="0" +KEYWORDS="amd64" IUSE="cron" COMMON_DEPEND=" acct-user/gvm net-misc/rsync >=net-analyzer/gvmd-22.5.0 - dev-python/tomli[${PYTHON_USEDEP}] + $(python_gen_cond_dep ' + >dev-python/tomli-2.0.1[${PYTHON_USEDEP}] + ' 3.10) >=dev-python/rich-13.2.0[${PYTHON_USEDEP}] - >=dev-python/shtab-1.6.5[${PYTHON_USEDEP}] + >=dev-python/shtab-1.7.0[${PYTHON_USEDEP}] " DEPEND=" ${COMMON_DEPEND} - test? ( net-analyzer/pontos[${PYTHON_USEDEP}] ) + test? ( >=net-analyzer/pontos-22.12.2[${PYTHON_USEDEP}] ) " RDEPEND=" ${COMMON_DEPEND} @@ -35,6 +37,34 @@ RDEPEND=" distutils_enable_tests unittest +src_test() { + # Make a copy of the original config + cp greenbone/feed/sync/config.py "${T}"/config.py.orig || die + + # Patch the config.py to not use files from /etc/gvm, as this may + # cause a PermissionError. See https://bugs.gentoo.org/932836#c10 + sed -i \ + -e 's:DEFAULT_CONFIG_FILE = "/etc/gvm/greenbone-feed-sync.toml":DEFAULT_CONFIG_FILE = "'"${WORKDIR}/${P}-${TARGET}"'/install/etc/gvm/greenbone-feed-sync.toml":' \ + -e 's:DEFAULT_ENTERPRISE_KEY_PATH = "/etc/gvm/greenbone-enterprise-feed-key":DEFAULT_ENTERPRISE_KEY_PATH = "'"${WORKDIR}/${P}-${TARGET}"'/install/etc/gvm/greenbone-enterprise-feed-key":' \ + greenbone/feed/sync/config.py || die + + # Disable tests that require network access. + sed -i \ + -e 's:test_do_not_run_as_root:_&:' \ + -e 's:test_sync_nvts:_&:' \ + -e 's:test_sync_nvts_quiet:_&:' \ + -e 's:test_sync_nvts_rsync_error:_&:' \ + -e 's:test_sync_nvts_verbose:_&:' \ + -e 's:test_sync_nvts:_&:' \ + -e 's:test_sync_nvts_error:_&:' \ + tests/test_main.py || die + + distutils-r1_src_test + + # Restore config.py after test. + mv "${T}"/config.py.orig greenbone/feed/sync/config.py || die +} + python_install() { distutils-r1_python_install diff --git a/net-analyzer/gspoof/gspoof-3.2-r3.ebuild b/net-analyzer/gspoof/gspoof-3.2-r3.ebuild index 0dc610e0e3d7..b44beb880250 100644 --- a/net-analyzer/gspoof/gspoof-3.2-r3.ebuild +++ b/net-analyzer/gspoof/gspoof-3.2-r3.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -inherit autotools desktop +inherit autotools desktop flag-o-matic DESCRIPTION="A simple GTK/command line TCP/IP packet generator" HOMEPAGE="http://gspoof.sourceforge.net/" @@ -31,6 +31,17 @@ src_prepare() { eautoreconf } +src_configure() { + # -Werror=lto-type-mismatch + # https://bugs.gentoo.org/861158 + # + # Upstream sourceforge is dead. Software last updated in December 2003. + # No bug filed. + filter-lto + + default +} + src_compile() { emake CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" } diff --git a/net-analyzer/gvm-libs/Manifest b/net-analyzer/gvm-libs/Manifest index 6a1d171a1d8a..6af3eeab1e2f 100644 --- a/net-analyzer/gvm-libs/Manifest +++ b/net-analyzer/gvm-libs/Manifest @@ -1 +1,3 @@ DIST gvm-libs-22.8.0.tar.gz 310304 BLAKE2B ed880ca924d5f9c6d376c1b6b0711adecb095b0b79c565da6d62bf53d71ef0f49892263dc7e28e08841d33db0c480d691f4d4d95b3883d4f0751088fcf0b1d90 SHA512 5daa9157399fc8cf52cdfbdfeffe5e10a282cbe2f7b8eb6a3fefb202984f9df3bca91ef80d1d9d1bf37307cc475bd41d4b64b4f1ad0644975b295b6f32b294a6 +DIST gvm-libs-22.9.0.tar.gz 314119 BLAKE2B 481ca7a977647a53ef21079b054ed1294c0ce081693abe373dc9bb241725a141c11ab54a4eb2716b7543c678400ca933f9611d9a6615c4d39a9877a8cb40406a SHA512 39049d0eea3cca632ed25f3a807d03568213cf0daac4e7ab8d088458212e76db881644421dd44a2b34f6490eab35c171339e52e6b4ba4204ff2d9b7422578876 +DIST gvm-libs-22.9.1.tar.gz 314228 BLAKE2B 117ddf5824f0a1f5788695074fa5044b21b5dcfb8d6235a9f423174fa76d9262f361371d1f6807e88979ce49cafab64f5aa9fd1d2e855395bfa103bf6b121ec8 SHA512 b06c21ced89dc9f14dd19b256b57af910f4d7e585bf9c90fb7e3c3497bb429294e3ffb64dc6ee710e8b3beeb4ca9ac6aecb9d5e4b25f0f9761fa0c9f18a8dfd1 diff --git a/net-analyzer/gvm-libs/files/gvm-libs-22.8.0-linking-math-library.patch b/net-analyzer/gvm-libs/files/gvm-libs-22.8.0-linking-math-library.patch new file mode 100644 index 000000000000..11130f5c209d --- /dev/null +++ b/net-analyzer/gvm-libs/files/gvm-libs-22.8.0-linking-math-library.patch @@ -0,0 +1,23 @@ +Fixes underlinking math lib in base/CMakeLists.txt +Bug: https://bugs.gentoo.org/9889 +Upstream PR: https://github.com/greenbone/gvm-libs/pull/811 + +--- a/base/CMakeLists.txt ++++ b/base/CMakeLists.txt +@@ -37,6 +37,7 @@ set (HEADERS array.h credentials.h cvss.h drop_privileges.h hosts.h logging.h + if (BUILD_STATIC) + set (LIBGVM_BASE_NAME gvm_base_static) + add_library (gvm_base_static STATIC ${FILES}) ++ target_link_libraries(gvm_base_static m) + set_target_properties (gvm_base_static PROPERTIES OUTPUT_NAME "gvm_base") + set_target_properties (gvm_base_static PROPERTIES CLEAN_DIRECT_OUTPUT 1) + set_target_properties (gvm_base_static PROPERTIES PUBLIC_HEADER "${HEADERS}") +@@ -51,7 +52,7 @@ if (BUILD_SHARED) + set_target_properties (gvm_base_shared PROPERTIES VERSION "${CPACK_PACKAGE_VERSION}") + set_target_properties (gvm_base_shared PROPERTIES PUBLIC_HEADER "${HEADERS}") + +- target_link_libraries (gvm_base_shared LINK_PRIVATE ${GLIB_LDFLAGS} ${LINKER_HARDENING_FLAGS} ${SENTRY_LDFLAGS}) ++ target_link_libraries (gvm_base_shared LINK_PRIVATE ${GLIB_LDFLAGS} ${LINKER_HARDENING_FLAGS} ${SENTRY_LDFLAGS} m) + endif (BUILD_SHARED) + + set (LIBGVM_BASE_NAME diff --git a/net-analyzer/gvm-libs/gvm-libs-22.8.0-r1.ebuild b/net-analyzer/gvm-libs/gvm-libs-22.8.0-r1.ebuild new file mode 100644 index 000000000000..337879f76695 --- /dev/null +++ b/net-analyzer/gvm-libs/gvm-libs-22.8.0-r1.ebuild @@ -0,0 +1,118 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake toolchain-funcs + +DESCRIPTION="Greenbone Vulnerability Management (GVM) libraries" +HOMEPAGE="https://www.greenbone.net https://github.com/greenbone/gvm-libs/" +SRC_URI="https://github.com/greenbone/gvm-libs/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="doc ldap test radius" +RESTRICT="!test? ( test )" + +DEPEND=" + acct-user/gvm + >=app-crypt/gpgme-1.7.0:= + >=dev-libs/glib-2.42:2 + >=dev-libs/hiredis-0.10.1:= + dev-libs/libgcrypt:= + dev-libs/libgpg-error + >=dev-libs/libxml2-2.0:2 + >=net-libs/gnutls-3.2.15:= + net-libs/libnet:1.1 + net-libs/libpcap + >=net-libs/libssh-0.6.0:= + >=sys-apps/util-linux-2.25.0 + sys-libs/libxcrypt:= + >=sys-libs/zlib-1.2.8 + net-libs/paho-mqtt-c:1.3 + ldap? ( net-nds/openldap:= ) + radius? ( net-dialup/freeradius-client ) +" +RDEPEND="${DEPEND}" +BDEPEND=" + dev-vcs/git + app-alternatives/yacc + app-alternatives/lex + virtual/pkgconfig + doc? ( + app-text/doxygen[dot] + app-text/xmltoman + app-text/htmldoc + dev-perl/CGI + dev-perl/SQL-Translator + ) + test? ( dev-libs/cgreen ) +" + +PATCHES=( + # Fix bug 925932 + # See https://github.com/greenbone/gvm-libs/pull/811 + "${FILESDIR}"/gvm-libs-22.8.0-linking-math-library.patch +) + +src_prepare() { + cmake_src_prepare + # QA-Fix | Remove -Werror compiler flag | Bug: #909558 + sed -i -e "s/-Werror//" "${S}"/CMakeLists.txt || die + # QA-Fix | Remove doxygen warnings for !CLANG + if use doc; then + if ! tc-is-clang; then + local f + for f in doc/*.in; do + sed -i \ + -e "s*CLANG_ASSISTED_PARSING = NO*#CLANG_ASSISTED_PARSING = NO*g" \ + -e "s*CLANG_OPTIONS*#CLANG_OPTIONS*g" \ + "${f}" || die "couldn't disable CLANG parsing" + done + fi + fi + + #Remove tests that doesn't work in the network sandbox + if use test; then + sed -i 's/add_test (networking-test networking-test)/ /g' base/CMakeLists.txt || die + sed -i 's/add_test (util-test util-test)/ /g' boreas/CMakeLists.txt || die + fi +} + +src_configure() { + local mycmakeargs=( + "-DLOCALSTATEDIR=${EPREFIX}/var" + "-DSYSCONFDIR=${EPREFIX}/etc" + "-DGVM_RUN_DIR=${EPREFIX}/var/lib/gvm" + "-DBUILD_TESTS=$(usex test)" + "-DBUILD_WITH_RADIUS=$(usex radius)" + "-DBUILD_WITH_LDAP=$(usex ldap)" + ) + cmake_src_configure +} + +src_compile() { + cmake_src_compile + if use doc; then + cmake_build -C "${BUILD_DIR}" doc + cmake_build doc-full -C "${BUILD_DIR}" doc + fi + cmake_build rebuild_cache + if use test; then + cmake_build tests + fi +} + +src_install() { + if use doc; then + local HTML_DOCS=( "${BUILD_DIR}"/doc/generated/html/. ) + fi + cmake_src_install + + # Set proper permissions on required files/directories + keepdir /var/lib/gvm + if ! use prefix; then + fowners -R gvm:gvm /var/lib/gvm + fi +} diff --git a/net-analyzer/gvm-libs/gvm-libs-22.9.0.ebuild b/net-analyzer/gvm-libs/gvm-libs-22.9.0.ebuild new file mode 100644 index 000000000000..337879f76695 --- /dev/null +++ b/net-analyzer/gvm-libs/gvm-libs-22.9.0.ebuild @@ -0,0 +1,118 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake toolchain-funcs + +DESCRIPTION="Greenbone Vulnerability Management (GVM) libraries" +HOMEPAGE="https://www.greenbone.net https://github.com/greenbone/gvm-libs/" +SRC_URI="https://github.com/greenbone/gvm-libs/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="doc ldap test radius" +RESTRICT="!test? ( test )" + +DEPEND=" + acct-user/gvm + >=app-crypt/gpgme-1.7.0:= + >=dev-libs/glib-2.42:2 + >=dev-libs/hiredis-0.10.1:= + dev-libs/libgcrypt:= + dev-libs/libgpg-error + >=dev-libs/libxml2-2.0:2 + >=net-libs/gnutls-3.2.15:= + net-libs/libnet:1.1 + net-libs/libpcap + >=net-libs/libssh-0.6.0:= + >=sys-apps/util-linux-2.25.0 + sys-libs/libxcrypt:= + >=sys-libs/zlib-1.2.8 + net-libs/paho-mqtt-c:1.3 + ldap? ( net-nds/openldap:= ) + radius? ( net-dialup/freeradius-client ) +" +RDEPEND="${DEPEND}" +BDEPEND=" + dev-vcs/git + app-alternatives/yacc + app-alternatives/lex + virtual/pkgconfig + doc? ( + app-text/doxygen[dot] + app-text/xmltoman + app-text/htmldoc + dev-perl/CGI + dev-perl/SQL-Translator + ) + test? ( dev-libs/cgreen ) +" + +PATCHES=( + # Fix bug 925932 + # See https://github.com/greenbone/gvm-libs/pull/811 + "${FILESDIR}"/gvm-libs-22.8.0-linking-math-library.patch +) + +src_prepare() { + cmake_src_prepare + # QA-Fix | Remove -Werror compiler flag | Bug: #909558 + sed -i -e "s/-Werror//" "${S}"/CMakeLists.txt || die + # QA-Fix | Remove doxygen warnings for !CLANG + if use doc; then + if ! tc-is-clang; then + local f + for f in doc/*.in; do + sed -i \ + -e "s*CLANG_ASSISTED_PARSING = NO*#CLANG_ASSISTED_PARSING = NO*g" \ + -e "s*CLANG_OPTIONS*#CLANG_OPTIONS*g" \ + "${f}" || die "couldn't disable CLANG parsing" + done + fi + fi + + #Remove tests that doesn't work in the network sandbox + if use test; then + sed -i 's/add_test (networking-test networking-test)/ /g' base/CMakeLists.txt || die + sed -i 's/add_test (util-test util-test)/ /g' boreas/CMakeLists.txt || die + fi +} + +src_configure() { + local mycmakeargs=( + "-DLOCALSTATEDIR=${EPREFIX}/var" + "-DSYSCONFDIR=${EPREFIX}/etc" + "-DGVM_RUN_DIR=${EPREFIX}/var/lib/gvm" + "-DBUILD_TESTS=$(usex test)" + "-DBUILD_WITH_RADIUS=$(usex radius)" + "-DBUILD_WITH_LDAP=$(usex ldap)" + ) + cmake_src_configure +} + +src_compile() { + cmake_src_compile + if use doc; then + cmake_build -C "${BUILD_DIR}" doc + cmake_build doc-full -C "${BUILD_DIR}" doc + fi + cmake_build rebuild_cache + if use test; then + cmake_build tests + fi +} + +src_install() { + if use doc; then + local HTML_DOCS=( "${BUILD_DIR}"/doc/generated/html/. ) + fi + cmake_src_install + + # Set proper permissions on required files/directories + keepdir /var/lib/gvm + if ! use prefix; then + fowners -R gvm:gvm /var/lib/gvm + fi +} diff --git a/net-analyzer/gvm-libs/gvm-libs-22.9.1.ebuild b/net-analyzer/gvm-libs/gvm-libs-22.9.1.ebuild new file mode 100644 index 000000000000..5c0ad0faa80c --- /dev/null +++ b/net-analyzer/gvm-libs/gvm-libs-22.9.1.ebuild @@ -0,0 +1,112 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake toolchain-funcs + +DESCRIPTION="Greenbone Vulnerability Management (GVM) libraries" +HOMEPAGE="https://www.greenbone.net https://github.com/greenbone/gvm-libs/" +SRC_URI="https://github.com/greenbone/gvm-libs/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="amd64 ~x86" +IUSE="doc ldap test radius" +RESTRICT="!test? ( test )" + +DEPEND=" + acct-user/gvm + >=app-crypt/gpgme-1.7.0:= + >=dev-libs/glib-2.42:2 + >=dev-libs/hiredis-0.10.1:= + dev-libs/libgcrypt:= + dev-libs/libgpg-error + >=dev-libs/libxml2-2.0:2 + >=net-libs/gnutls-3.2.15:= + net-libs/libnet:1.1 + net-libs/libpcap + >=net-libs/libssh-0.6.0:= + >=sys-apps/util-linux-2.25.0 + sys-libs/libxcrypt:= + >=sys-libs/zlib-1.2.8 + net-libs/paho-mqtt-c:1.3 + ldap? ( net-nds/openldap:= ) + radius? ( net-dialup/freeradius-client ) +" +RDEPEND="${DEPEND}" +BDEPEND=" + dev-vcs/git + app-alternatives/yacc + app-alternatives/lex + virtual/pkgconfig + doc? ( + app-text/doxygen[dot] + app-text/xmltoman + app-text/htmldoc + dev-perl/CGI + dev-perl/SQL-Translator + ) + test? ( dev-libs/cgreen ) +" + +src_prepare() { + cmake_src_prepare + # QA-Fix | Remove -Werror compiler flag | Bug: #909558 + sed -i -e "s/-Werror//" "${S}"/CMakeLists.txt || die + # QA-Fix | Remove doxygen warnings for !CLANG + if use doc; then + if ! tc-is-clang; then + local f + for f in doc/*.in; do + sed -i \ + -e "s*CLANG_ASSISTED_PARSING = NO*#CLANG_ASSISTED_PARSING = NO*g" \ + -e "s*CLANG_OPTIONS*#CLANG_OPTIONS*g" \ + "${f}" || die "couldn't disable CLANG parsing" + done + fi + fi + + #Remove tests that doesn't work in the network sandbox + if use test; then + sed -i 's/add_test (networking-test networking-test)/ /g' base/CMakeLists.txt || die + sed -i 's/add_test (util-test util-test)/ /g' boreas/CMakeLists.txt || die + fi +} + +src_configure() { + local mycmakeargs=( + "-DLOCALSTATEDIR=${EPREFIX}/var" + "-DSYSCONFDIR=${EPREFIX}/etc" + "-DGVM_RUN_DIR=${EPREFIX}/var/lib/gvm" + "-DBUILD_TESTS=$(usex test)" + "-DBUILD_WITH_RADIUS=$(usex radius)" + "-DBUILD_WITH_LDAP=$(usex ldap)" + ) + cmake_src_configure +} + +src_compile() { + cmake_src_compile + if use doc; then + cmake_build -C "${BUILD_DIR}" doc + cmake_build doc-full -C "${BUILD_DIR}" doc + fi + cmake_build rebuild_cache + if use test; then + cmake_build tests + fi +} + +src_install() { + if use doc; then + local HTML_DOCS=( "${BUILD_DIR}"/doc/generated/html/. ) + fi + cmake_src_install + + # Set proper permissions on required files/directories + keepdir /var/lib/gvm + if ! use prefix; then + fowners -R gvm:gvm /var/lib/gvm + fi +} diff --git a/net-analyzer/gvm-tools/Manifest b/net-analyzer/gvm-tools/Manifest index aa7ac3dc5280..3bc6024ec7e8 100644 --- a/net-analyzer/gvm-tools/Manifest +++ b/net-analyzer/gvm-tools/Manifest @@ -1 +1,2 @@ DIST gvm-tools-24.1.0.tar.gz 218801 BLAKE2B ddc17406e5253696dca652c5e583fd5cc64505202f81496372d8b26ee7d4dafa1457cf4ae3249e7a183c123b3bd51b2de566ccdb2fa5f251d4edac90175e1b95 SHA512 6138c6c85421c7b011b73c2c857e9481cd46622ad3627a8d85c50563ebbd3c6d5cae80f43118ec85ef243fb965dcbe1cd7c1df29326f1d81b21c56ad117bef28 +DIST gvm-tools-24.3.0.tar.gz 213334 BLAKE2B 0a09dc1e1c637996de306d5ecebed861f6a92caab16d6fa7d437886bc280ad078d3ef8bef019ba19541d9566a2a77ebf3e498b1bc0a6e956a649777cf78c5b6e SHA512 bf482a9bfdb9a65851ecf0ad2b66d773cb3dd3b5a0bace1b8ac7d52add4042134f83d95f41d275a426016d3bf21d2b64d42fcaa1ac84aa87ab6f73a5b0a1237f diff --git a/net-analyzer/gvm-tools/gvm-tools-24.3.0.ebuild b/net-analyzer/gvm-tools/gvm-tools-24.3.0.ebuild new file mode 100644 index 000000000000..aa9122f4606a --- /dev/null +++ b/net-analyzer/gvm-tools/gvm-tools-24.3.0.ebuild @@ -0,0 +1,23 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..12} pypy3 ) +DISTUTILS_USE_PEP517=poetry +inherit distutils-r1 + +DESCRIPTION="Remote control for Greenbone Vulnerability Manager, previously named openvas-cli" +HOMEPAGE="https://www.greenbone.net https://github.com/greenbone/gvm-tools/" +SRC_URI="https://github.com/greenbone/gvm-tools/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="amd64 ~x86" + +RDEPEND=" + >=net-analyzer/python-gvm-23.4.2[${PYTHON_USEDEP}] +" +DEPEND="${RDEPEND}" + +distutils_enable_tests unittest diff --git a/net-analyzer/gvmd/Manifest b/net-analyzer/gvmd/Manifest index 1c4a3025be84..229bbe8bb679 100644 --- a/net-analyzer/gvmd/Manifest +++ b/net-analyzer/gvmd/Manifest @@ -1,2 +1,4 @@ DIST gvmd-23.1.0.tar.gz 1050719 BLAKE2B 9ff3e679ac4c4ff0e4a5eb1ee9ed4c9d243a96b5c4d63934576ec86d70f15f6ff6dee839e29c0de50af3a829e141fa416ac993935f0a683ca135f68f17e1489a SHA512 77d08067a168065bb3b4fd10ba94c48a3207378c9b8c0be42a9570c390c92b985ebf94c53cbbe04f78c2a802de430d599593e1971bc7b93d3f0652bfe59022a4 DIST gvmd-23.4.0.tar.gz 1064194 BLAKE2B a74ed75c69f3f793058133ec6aca93ddba34efc51267b20333916d7291484f1b1eefa5527f3bb34137584a290e4d7d150d799f9f9b0f1473dfa8c3b4d83f9cfb SHA512 0c5b0d933444d25253e234f387e9063ebbeb379d330cab9ca4eaaddc0effe6fbda312b8de51b5f9784141d149f83b6f0069d7e1f72674857b8d041ab9bff6dfd +DIST gvmd-23.5.2.tar.gz 1064064 BLAKE2B 84d2861f274a71b8a681cb1bfff01ee06f6bc9ab8ae0cb430e65b3f36e9f75076365efa9d5b5d6a5954d328fbc5e3aa6b942a4e1e875ca640ac814dbcc8d98be SHA512 4708fe0033d5244a988560ca9cbe8b0d5be0006690cc5c943eec3cd534329d776a556766a57257a07d40132fa5239455b9f71b4d0e9a5a4ba66d63436c2bc9f4 +DIST gvmd-23.6.2.tar.gz 1065818 BLAKE2B 65b999c42628eec4816aea984ba1ab0383a9147ba04f934b21b5763db10dac2679cfab821520e69be42accdaad061fbb0692c9d6cd8f30db592d9466c3cdc351 SHA512 935af9a842d7b82a8467ccbb9edf1c9e8ea05c4f8a4e263c3692a2d8993209312af3d760943e32c77f8c12d2220771b9731b10dba59c89d2570682a3e363767d diff --git a/net-analyzer/gvmd/gvmd-23.5.2.ebuild b/net-analyzer/gvmd/gvmd-23.5.2.ebuild new file mode 100644 index 000000000000..963a13a3b4ad --- /dev/null +++ b/net-analyzer/gvmd/gvmd-23.5.2.ebuild @@ -0,0 +1,128 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake systemd toolchain-funcs + +DESCRIPTION="Greenbone vulnerability manager, previously named openvas-manager" +HOMEPAGE="https://www.greenbone.net https://github.com/greenbone/gvmd/" +SRC_URI="https://github.com/greenbone/gvmd/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +SLOT="0" +LICENSE="AGPL-3+" +KEYWORDS="~amd64 ~x86" +IUSE="doc test" +RESTRICT="!test? ( test )" + +DEPEND=" + acct-user/gvm + app-crypt/gpgme:1= + dev-libs/libbsd + >=dev-db/postgresql-9.6:=[uuid] + >=dev-libs/glib-2.42:2 + >=dev-libs/libical-1.0.0:= + >=net-analyzer/gvm-libs-22.9 + >=net-libs/gnutls-3.2.15:=[tools] +" + +# gvmd (optionally) uses xml_split from XML-Twig at runtime. And texlive +# and xmlstartlet are used for (PDF) report generator at runtime. +RDEPEND=" + ${DEPEND} + app-text/xmlstarlet + dev-perl/XML-Twig + dev-texlive/texlive-latexextra + >=net-analyzer/ospd-openvas-22.4 + >=dev-db/pg-gvm-22.4 +" +BDEPEND=" + app-alternatives/yacc + app-alternatives/lex + virtual/pkgconfig + doc? ( + app-text/doxygen[dot] + app-text/xmltoman + app-text/htmldoc + dev-libs/libxslt + ) + test? ( dev-libs/cgreen ) +" + +src_prepare() { + cmake_src_prepare + # QA-Fix | Use correct FHS/Gentoo policy paths for 9.0.0 + sed -i -e "s*share/doc/gvm/html/*share/doc/${PF}/html/*g" doc/CMakeLists.txt || die + sed -i -e "s*/doc/gvm/*/doc/${PF}/*g" CMakeLists.txt || die + # QA-Fix | Remove !CLANG Doxygen warnings for 9.0.0 + if use doc; then + if ! tc-is-clang; then + local f + for f in doc/*.in + do + sed -i \ + -e "s*CLANG_ASSISTED_PARSING = NO*#CLANG_ASSISTED_PARSING = NO*g" \ + -e "s*CLANG_OPTIONS*#CLANG_OPTIONS*g" \ + "${f}" || die "couldn't disable CLANG parsing" + done + fi + fi +} + +src_configure() { + local mycmakeargs=( + "-DLOCALSTATEDIR=${EPREFIX}/var" + "-DSYSCONFDIR=${EPREFIX}/etc" + "-DLIBDIR=${EPREFIX}/usr/$(get_libdir)" + "-DSBINDIR=${EPREFIX}/usr/bin" + "-DSYSTEMD_SERVICE_DIR=$(systemd_get_systemunitdir)" + "-DGVM_DEFAULT_DROP_USER=gvm" + ) + cmake_src_configure +} + +src_compile() { + cmake_src_compile + if use doc; then + cmake_build -C "${BUILD_DIR}" doc + cmake_build doc-full -C "${BUILD_DIR}" doc + fi + if use test; then + cmake_build tests + fi + cmake_build rebuild_cache +} + +src_install() { + if use doc; then + local HTML_DOCS=( "${BUILD_DIR}"/doc/generated/html/. ) + fi + cmake_src_install + + insinto /etc/gvm/sysconfig + newins "${FILESDIR}/${PN}-daemon-22.conf" "${PN}-daemon.conf" + if ! use prefix; then + fowners -R gvm:gvm /etc/gvm + fi + + newinitd "${FILESDIR}/${PN}-22.init" "${PN}" + newconfd "${FILESDIR}/${PN}-daemon-22.conf" "${PN}" + + # Set proper permissions on required files/directories + keepdir /var/lib/gvm/gvmd + if ! use prefix; then + fowners -R gvm:gvm /var/lib/gvm + fi + + systemd_install_serviced "${FILESDIR}/gvmd.service.conf" \ + ${PN}.service +} + +pkg_postinst() { + elog "If you are upgrading from a previous version, you need to update the database version." + elog "Please, create the running directory and give write permission to the database user" + elog "then run gvmd as the gvm user with --migrate option:" + elog "~# mkdir /run/gvmd" + elog "~# setfacl -m u:gvm:rwx /run/gvmd/" + elog "~# sudo -u gvm gvmd --migrate" +} diff --git a/net-analyzer/gvmd/gvmd-23.6.2.ebuild b/net-analyzer/gvmd/gvmd-23.6.2.ebuild new file mode 100644 index 000000000000..85facb7d6bcb --- /dev/null +++ b/net-analyzer/gvmd/gvmd-23.6.2.ebuild @@ -0,0 +1,128 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake systemd toolchain-funcs + +DESCRIPTION="Greenbone vulnerability manager, previously named openvas-manager" +HOMEPAGE="https://www.greenbone.net https://github.com/greenbone/gvmd/" +SRC_URI="https://github.com/greenbone/gvmd/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="AGPL-3+" +SLOT="0" +KEYWORDS="amd64 ~x86" +IUSE="doc test" +RESTRICT="!test? ( test )" + +DEPEND=" + acct-user/gvm + app-crypt/gpgme:1= + dev-libs/libbsd + >=dev-db/postgresql-9.6:=[uuid] + >=dev-libs/glib-2.42:2 + >=dev-libs/libical-1.0.0:= + >=net-analyzer/gvm-libs-22.9 + >=net-libs/gnutls-3.2.15:=[tools] +" + +# gvmd (optionally) uses xml_split from XML-Twig at runtime. And texlive +# and xmlstartlet are used for (PDF) report generator at runtime. +RDEPEND=" + ${DEPEND} + app-text/xmlstarlet + dev-perl/XML-Twig + dev-texlive/texlive-latexextra + >=net-analyzer/ospd-openvas-22.4 + >=dev-db/pg-gvm-22.4 +" +BDEPEND=" + app-alternatives/yacc + app-alternatives/lex + virtual/pkgconfig + doc? ( + app-text/doxygen[dot] + app-text/xmltoman + app-text/htmldoc + dev-libs/libxslt + ) + test? ( dev-libs/cgreen ) +" + +src_prepare() { + cmake_src_prepare + # QA-Fix | Use correct FHS/Gentoo policy paths for 9.0.0 + sed -i -e "s*share/doc/gvm/html/*share/doc/${PF}/html/*g" doc/CMakeLists.txt || die + sed -i -e "s*/doc/gvm/*/doc/${PF}/*g" CMakeLists.txt || die + # QA-Fix | Remove !CLANG Doxygen warnings for 9.0.0 + if use doc; then + if ! tc-is-clang; then + local f + for f in doc/*.in + do + sed -i \ + -e "s*CLANG_ASSISTED_PARSING = NO*#CLANG_ASSISTED_PARSING = NO*g" \ + -e "s*CLANG_OPTIONS*#CLANG_OPTIONS*g" \ + "${f}" || die "couldn't disable CLANG parsing" + done + fi + fi +} + +src_configure() { + local mycmakeargs=( + "-DLOCALSTATEDIR=${EPREFIX}/var" + "-DSYSCONFDIR=${EPREFIX}/etc" + "-DLIBDIR=${EPREFIX}/usr/$(get_libdir)" + "-DSBINDIR=${EPREFIX}/usr/bin" + "-DSYSTEMD_SERVICE_DIR=$(systemd_get_systemunitdir)" + "-DGVM_DEFAULT_DROP_USER=gvm" + ) + cmake_src_configure +} + +src_compile() { + cmake_src_compile + if use doc; then + cmake_build -C "${BUILD_DIR}" doc + cmake_build doc-full -C "${BUILD_DIR}" doc + fi + if use test; then + cmake_build tests + fi + cmake_build rebuild_cache +} + +src_install() { + if use doc; then + local HTML_DOCS=( "${BUILD_DIR}"/doc/generated/html/. ) + fi + cmake_src_install + + insinto /etc/gvm/sysconfig + newins "${FILESDIR}/${PN}-daemon-22.conf" "${PN}-daemon.conf" + if ! use prefix; then + fowners -R gvm:gvm /etc/gvm + fi + + newinitd "${FILESDIR}/${PN}-22.init" "${PN}" + newconfd "${FILESDIR}/${PN}-daemon-22.conf" "${PN}" + + # Set proper permissions on required files/directories + keepdir /var/lib/gvm/gvmd + if ! use prefix; then + fowners -R gvm:gvm /var/lib/gvm + fi + + systemd_install_serviced "${FILESDIR}/gvmd.service.conf" \ + ${PN}.service +} + +pkg_postinst() { + elog "If you are upgrading from a previous version, you need to update the database version." + elog "Please, create the running directory and give write permission to the database user" + elog "then run gvmd as the gvm user with --migrate option:" + elog "~# mkdir /run/gvmd" + elog "~# setfacl -m u:gvm:rwx /run/gvmd/" + elog "~# sudo -u gvm gvmd --migrate" +} diff --git a/net-analyzer/hexinject/hexinject-1.6-r2.ebuild b/net-analyzer/hexinject/hexinject-1.6-r2.ebuild index bfef01f88b8f..06bb1f199fdf 100644 --- a/net-analyzer/hexinject/hexinject-1.6-r2.ebuild +++ b/net-analyzer/hexinject/hexinject-1.6-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -7,7 +7,7 @@ inherit toolchain-funcs DESCRIPTION="Network packet sniffer and injector" HOMEPAGE="http://hexinject.sourceforge.net/" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" +SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.gz" S="${WORKDIR}/${PN}" LICENSE="BSD" diff --git a/net-analyzer/hping/hping-3_pre20141226.ebuild b/net-analyzer/hping/hping-3_pre20141226.ebuild index 6036cfa7f52a..ea7237270ec2 100644 --- a/net-analyzer/hping/hping-3_pre20141226.ebuild +++ b/net-analyzer/hping/hping-3_pre20141226.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=7 -inherit toolchain-funcs +inherit flag-o-matic toolchain-funcs HPING_COMMIT="3547c7691742c6eaa31f8402e0ccbb81387c1b99" DESCRIPTION="A ping-like TCP/IP packet assembler/analyzer" @@ -36,6 +36,9 @@ PATCHES=( ) src_configure() { + # bug #861161 + filter-lto + tc-export CC # Not an autotools type configure: diff --git a/net-analyzer/hydra/Manifest b/net-analyzer/hydra/Manifest index df629c2399dc..b72f822f43c3 100644 --- a/net-analyzer/hydra/Manifest +++ b/net-analyzer/hydra/Manifest @@ -1,2 +1 @@ -DIST hydra-9.4.tar.gz 833465 BLAKE2B 2ba7f7e4a70c4f6c9dc4ec94d652ab7534cb0fb17b88412dfcf1e651d9f31af573ab9acd2d9cb698da6462f4744f53dfb8f87a437c32bebfa4f9a04f2f9136c0 SHA512 de5a1e73673fdc2f193cfb1aeec337c9d8faad52b06524850f352a797a4a5ef08cba8fc51da96fed1db01d141127e58c2aa874027f51c40a94a474de778d5241 DIST hydra-9.5.tar.gz 833798 BLAKE2B 848c5b34719c2db98b3a3bee1c47e0b2ebeea668f5c387f015c7079f800cf0607a8cb5accba25ef2e253deb44422d51cf6e012c313496942a47468e0503000e8 SHA512 a8fe42d175d184cdb82072f3a963b956d767fa908aaf1cbbc0746b6a67cfd37f8b5e3ecf9be82085a7f6c1ef57e91a8bf05bfeb41e96708899b6c8d7f05eee06 diff --git a/net-analyzer/hydra/files/hydra-9.4-implicit-func-decl.patch b/net-analyzer/hydra/files/hydra-9.4-implicit-func-decl.patch deleted file mode 100644 index bf4dd61e33ce..000000000000 --- a/net-analyzer/hydra/files/hydra-9.4-implicit-func-decl.patch +++ /dev/null @@ -1,33 +0,0 @@ -https://github.com/vanhauser-thc/thc-hydra/pull/786 - -From 613bd02264dcc989eeeb77b83603d4c2f48f0bbc Mon Sep 17 00:00:00 2001 -From: Sam James <sam@gentoo.org> -Date: Fri, 9 Sep 2022 04:32:05 +0100 -Subject: [PATCH] Makefile.am: add -D_GNU_SOURCE for strcasestr -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -strcasestr is not a standard function and per -the man page, needs -D_GNU_SOURCE to be visible. - -Fixes a build error: -``` -hydra-rtsp.c:20:7: error: implicit declaration of function ‘strcasestr’; did you mean ‘strcasecmp’? [-Werror=implicit-function-declaration] - 20 | if (strcasestr(s, "401 Unauthorized") != NULL) { - | ^~~~~~~~~~ - | strcasecmp -``` - -Signed-off-by: Sam James <sam@gentoo.org> ---- a/Makefile.am -+++ b/Makefile.am -@@ -5,6 +5,7 @@ WARN_CLANG=-Wformat-nonliteral -Wstrncat-size -Wformat-security -Wsign-conversio - WARN_GCC=-Wformat=2 -Wformat-overflow=2 -Wformat-nonliteral -Wformat-truncation=2 -Wnull-dereference -Wstrict-overflow=2 -Wstringop-overflow=4 -Walloca-larger-than=4096 -Wtype-limits -Wconversion -Wtrampolines -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -fno-common -Wcast-align - CFLAGS ?= -g - OPTS=-I. -O3 $(CFLAGS) -fcommon -+CPPFLAGS += -D_GNU_SOURCE - # -Wall -g -pedantic - LIBS=-lm - DESTDIR ?= - diff --git a/net-analyzer/hydra/hydra-9.4.ebuild b/net-analyzer/hydra/hydra-9.4.ebuild deleted file mode 100644 index 2eb786561e35..000000000000 --- a/net-analyzer/hydra/hydra-9.4.ebuild +++ /dev/null @@ -1,127 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit edo toolchain-funcs - -DESCRIPTION="Parallelized network login hacker" -HOMEPAGE="https://github.com/vanhauser-thc/thc-hydra" -SRC_URI="https://github.com/vanhauser-thc/thc-hydra/archive/v${PV}.tar.gz -> ${P}.tar.gz" -S="${WORKDIR}"/thc-${P} - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="amd64 ~ppc x86" -IUSE="debug firebird gcrypt gtk idn memcached mongodb mysql ncurses oracle pcre postgres rdp libssh samba subversion zlib" - -RDEPEND=" - dev-libs/openssl:= - gtk? ( - dev-libs/atk - dev-libs/glib:2 - x11-libs/gdk-pixbuf:2 - x11-libs/gtk+:2 - ) - firebird? ( dev-db/firebird ) - gcrypt? ( dev-libs/libgcrypt ) - idn? ( net-dns/libidn:0= ) - memcached? ( dev-libs/libmemcached[sasl] ) - mongodb? ( dev-libs/mongo-c-driver ) - mysql? ( dev-db/mysql-connector-c:0= ) - ncurses? ( sys-libs/ncurses:= ) - oracle? ( dev-db/oracle-instantclient[sdk] ) - pcre? ( dev-libs/libpcre2 ) - postgres? ( dev-db/postgresql:* ) - rdp? ( net-misc/freerdp ) - libssh? ( >=net-libs/libssh-0.4.0 ) - samba? ( net-fs/samba ) - subversion? ( dev-vcs/subversion ) - zlib? ( sys-libs/zlib )" -DEPEND="${RDEPEND}" -BDEPEND="virtual/pkgconfig" - -PATCHES=( - "${FILESDIR}"/${PN}-9.4-implicit-func-decl.patch -) - -src_prepare() { - default - - # None of the settings in Makefile.unix are useful to us - mv Makefile.unix{,.gentoo_unused} || die - touch Makefile.unix || die - - sed -i \ - -e 's:|| echo.*$::' \ - -e '/\t-$(CC)/s:-::' \ - -e '/^OPTS/{s|=|+=|;s| -O3||}' \ - -e '/ -o /s:$(OPTS):& $(LDFLAGS):g' \ - Makefile.am || die - - # Needed to get GTK+ 3 change in configure.in (.in got updated, but - # configure not regen'd.) - #cd hydra-gtk || die - #sed -i -e 's:AC_INIT(configure.in):AC_INIT(configure.ac):' configure.in || die - #eautoreconf -} - -src_configure() { - # Note: the top level configure script is not autoconf-based - tc-export CC PKG_CONFIG - - export OPTS="${CFLAGS}" - - hydra_sed() { - if use ${1}; then - einfo "Enabling ${1}" - if [[ -n "${3}" ]]; then - sed -i 's#'"${2}"'#'"${3}"'#' configure || die - fi - else - einfo "Disabling ${1}" - sed -i 's#'"${2}"'##; s#'"${4}"'##' configure || die - fi - } - - hydra_sed firebird '-lfbclient' '' '-DLIBFIREBIRD' - hydra_sed gcrypt '-lgcrypt' '$( ${CTARGET:-${CHOST}}-libgcrypt-config --libs )' '-DHAVE_GCRYPT' - hydra_sed idn '-lidn' '$( "${PKG_CONFIG}" --libs libidn )' '-DLIBIDN -DHAVE_PR29_H' - hydra_sed libssh '-lssh' '$( "${PKG_CONFIG}" --libs libssh )' '-DLIBSSH' - hydra_sed memcached '-lmemcached' '$( "${PKG_CONFIG}" --libs libmemcached )' '-DLIBMCACHED' - hydra_sed mongodb '-lmongoc-1.0' '$( "${PKG_CONFIG}" --libs libmongoc-1.0 )' '-DLIBMONGODB\|-DLIBBSON' - hydra_sed mysql '-lmysqlclient' '$( ${CTARGET:-${CHOST}}-mysql_config --libs )' '-DLIBMYSQLCLIENT' - hydra_sed ncurses '-lcurses' '$( "${PKG_CONFIG}" --libs ncurses )' '-DLIBNCURSES' - hydra_sed pcre '-lpcre2-8' '$( "${PKG_CONFIG}" --libs libpcre2-8 )' '-DHAVE_PCRE' - hydra_sed postgres '-lpq' '$( "${PKG_CONFIG}" --libs libpq )' '-DLIBPOSTGRES' - hydra_sed oracle '-locci -lclntsh' '' '-DLIBORACLE' - hydra_sed rdp '-lfreerdp2' '$( "${PKG_CONFIG}" --libs freerdp2 )' '-DLIBFREERDP' - # TODO: https://bugs.gentoo.org/686148 - #hydra_sed subversion '-lsvn_client-1 -lapr-1 -laprutil-1 -lsvn_subr-1' '$( "${PKG_CONFIG}" --libs libsvn_client )' '-DLIBSVN' - hydra_sed samba '-lsmbclient' '$( "${PKG_CONFIG}" --libs smbclient )' '-DLIBSMBCLIENT' - hydra_sed subversion '-lsvn_client-1 -lapr-1 -laprutil-1 -lsvn_subr-1' '' '-DLIBSVN' - hydra_sed zlib '-lz' '$( "${PKG_CONFIG}" --libs zlib )' '-DHAVE_ZLIB' - - edo ./configure \ - $(usev !gtk '--disable-xhydra') \ - $(usev debug '--debug') \ - --nostrip \ - --prefix=/usr \ - || die - - if use gtk ; then - pushd hydra-gtk || die - econf - fi -} - -src_compile() { - emake XLIBPATHS='' - use gtk && emake -C hydra-gtk -} - -src_install() { - dobin hydra pw-inspector - use gtk && dobin hydra-gtk/src/xhydra - dodoc CHANGES README -} diff --git a/net-analyzer/hydra/hydra-9.5.ebuild b/net-analyzer/hydra/hydra-9.5-r10.ebuild index da02a32c17e6..0960ae6bf060 100644 --- a/net-analyzer/hydra/hydra-9.5.ebuild +++ b/net-analyzer/hydra/hydra-9.5-r10.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -33,7 +33,7 @@ RDEPEND=" oracle? ( dev-db/oracle-instantclient[sdk] ) pcre? ( dev-libs/libpcre2 ) postgres? ( dev-db/postgresql:* ) - rdp? ( net-misc/freerdp ) + rdp? ( net-misc/freerdp:2= ) libssh? ( >=net-libs/libssh-0.4.0 ) samba? ( net-fs/samba ) subversion? ( dev-vcs/subversion ) diff --git a/net-analyzer/ibmonitor/ibmonitor-1.4-r1.ebuild b/net-analyzer/ibmonitor/ibmonitor-1.4-r1.ebuild index be878eebbd6c..8c4bdc7bbd79 100644 --- a/net-analyzer/ibmonitor/ibmonitor-1.4-r1.ebuild +++ b/net-analyzer/ibmonitor/ibmonitor-1.4-r1.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 DESCRIPTION="Interactive bandwidth monitor" HOMEPAGE="https://ibmonitor.sourceforge.net" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" +SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.gz" S="${WORKDIR}/${PN}" KEYWORDS="~amd64 ~hppa ~ppc ~riscv x86" diff --git a/net-analyzer/icinga2/Manifest b/net-analyzer/icinga2/Manifest index b84ccd3097b8..5e6efce507f8 100644 --- a/net-analyzer/icinga2/Manifest +++ b/net-analyzer/icinga2/Manifest @@ -1,3 +1 @@ -DIST icinga2-2.13.9.tar.gz 9675588 BLAKE2B 3614d28939bbff056ff6d67217b09bb38369d720af36f3038fa6e2cd6b253faa59111e4e5096d4e5ce476ad14e347e0ad9183e77fa395f6f236ea5f555e55265 SHA512 dbdf1fb06b2cf3d7566194ed9f5883f05848cbc3f740a704f76868e985f2ac943389d56943f55bdba2900966c39472c6031bf032d815881fc64890c04de911dd -DIST icinga2-2.14.1.tar.gz 9397272 BLAKE2B 8eae7abb7ce04c33bffc921026a848ac40a305caa17d5805a6ebd731da2b1b6034dc1b7f46d82bd65b0623a71fc432fde60020349090c13a9c9592e71be90418 SHA512 11fd4ecbc92b15e30ff6e477f9750fde4705401a688c27ff761c9483ce8bdab8e3871d1db36a19342a325f0bb6687c3592c5f13b41523c09c814653c0b75622d DIST icinga2-2.14.2.tar.gz 9397382 BLAKE2B f533db06e693f9c9f0627c50615ded591696879b22fe9cb7bab115607d7f25ef3f30732de1e34f7adee594385c21ab2f22fdc925f4be18e8423fa69e94d3e1b9 SHA512 a7574254eed715c32317feaac57d5444a9d2bcccbfe06adbcee4d7d3c2928ecb1f381a5321c219406816bb39120eb9e95ca073399844cbafde274d289f619f57 diff --git a/net-analyzer/icinga2/files/icinga2.initd b/net-analyzer/icinga2/files/icinga2.initd deleted file mode 100644 index 7faff11137d4..000000000000 --- a/net-analyzer/icinga2/files/icinga2.initd +++ /dev/null @@ -1,81 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -extra_started_commands="reload" - -DAEMON="/usr/sbin/icinga2" -ICINGA2_CONFIG_FILE="/etc/icinga2/icinga2.conf" -ICINGA2_RUN_DIR="/run/icinga2" -ICINGA2_STATE_DIR="/var/cache/icinga2" -ICINGA2_CMD_DIR="${ICINGA2_RUN_DIR}/cmd" -ICINGA2_PID_FILE="${ICINGA2_RUN_DIR}/icinga2.pid" -ICINGA2_DAEMON_ARGS="daemon -c $ICINGA2_CONFIG_FILE -e $ICINGA2_ERROR_LOG -d" - -depend() { - need net -} - -checkconfig() { - if [ ! -e "$ICINGA2_CONFIG_FILE" ]; then - ewarn "Config file '$ICINGA2_CONFIG_FILE' does not exist." - eend 1 - fi - - ICINGA2_USER=$($DAEMON variable get --current RunAsUser) - if [ $? != 0 ]; then - eerror "Could not fetch RunAsUser variable: '$ICINGA2_USER'." - return 1 - fi - ICINGA2_GROUP=$($DAEMON variable get --current RunAsGroup) - if [ $? != 0 ]; then - eerror "Could not fetch RunAsGroup variable: '$ICINGA2_GROUP'." - return 1 - fi - - checkpath -d -m 0750 -o $ICINGA2_USER:$ICINGA2_GROUP $ICINGA2_RUN_DIR - checkpath -d -m 0750 -o $ICINGA2_USER:$ICINGA2_GROUP $ICINGA2_STATE_DIR - checkpath -d -m 2750 -o $ICINGA2_USER:$ICINGA2_GROUP $ICINGA2_CMD_DIR - - if ! $DAEMON daemon -c $ICINGA2_CONFIG_FILE -C > $ICINGA2_STARTUP_LOG 2>&1; then - eerror "Icinga2 detected configuration errors. Check '$ICINGA2_STARTUP_LOG' for details." - return 1 - fi -} - -start() { - checkconfig || return 1 - - ebegin "Starting icinga2" - start-stop-daemon --start --exec "${DAEMON}" \ - --pidfile "${ICINGA2_PID_FILE}" \ - -- $ICINGA2_DAEMON_ARGS > $ICINGA2_STARTUP_LOG 2>&1 - local retval=$? - if [ $retval -ne 0 ]; then - ewarn "Error starting icinga2. '$ICINGA2_STARTUP_LOG' for details." - fi - eend $retval -} - -stop() { - ebegin "Stopping icinga2" - start-stop-daemon \ - --stop \ - --pidfile $ICINGA2_PID_FILE \ - --retry "SIGTERM/15 SIGKILL/30" \ - --progress - eend $? -} - -reload() { - checkconfig || return 1 - - ebegin "Reloading icinga2" - start-stop-daemon --signal HUP --pidfile "$ICINGA2_PID_FILE" - - local retval=$? - if [ $retval -ne 0 ]; then - ewarn "Error reloading icinga2." - fi - eend $retval -} diff --git a/net-analyzer/icinga2/icinga2-2.13.9.ebuild b/net-analyzer/icinga2/icinga2-2.13.9.ebuild deleted file mode 100644 index 1ce211b79dc7..000000000000 --- a/net-analyzer/icinga2/icinga2-2.13.9.ebuild +++ /dev/null @@ -1,146 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake systemd - -if [[ ${PV} != 9999 ]]; then - SRC_URI="https://github.com/Icinga/icinga2/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="amd64 ~arm64 x86" -else - inherit git-r3 - EGIT_REPO_URI="https://github.com/Icinga/icinga2.git" -fi - -DESCRIPTION="Distributed, general purpose, network monitoring engine" -HOMEPAGE="https://icinga.com/" - -LICENSE="GPL-2" -SLOT="0" -IUSE="console jumbo-build mail mariadb minimal +mysql nano-syntax +plugins postgres systemd +vim-syntax" - -# Add accounts to DEPEND because of fowners in src_install -DEPEND=" - dev-libs/openssl:0= - dev-libs/boost:=[context] - console? ( dev-libs/libedit ) - mariadb? ( dev-db/mariadb-connector-c:= ) - mysql? ( dev-db/mysql-connector-c:= ) - postgres? ( dev-db/postgresql:= ) - dev-libs/yajl:= - acct-user/icinga - acct-group/icinga - acct-group/icingacmd" -BDEPEND=" - app-alternatives/yacc - app-alternatives/lex" -RDEPEND=" - ${DEPEND} - plugins? ( || ( - net-analyzer/monitoring-plugins - net-analyzer/nagios-plugins - ) ) - mail? ( virtual/mailx ) - acct-group/nagios" - -REQUIRED_USE="!minimal? ( || ( mariadb mysql postgres ) )" - -src_configure() { - local mycmakeargs=( - -DICINGA2_UNITY_BUILD=$(usex jumbo-build) - -DCMAKE_INSTALL_SYSCONFDIR=/etc - -DCMAKE_INSTALL_LOCALSTATEDIR=/var - -DICINGA2_SYSCONFIGFILE=/etc/conf.d/icinga2 - -DICINGA2_PLUGINDIR="/usr/$(get_libdir)/nagios/plugins" - -DICINGA2_USER=icinga - -DICINGA2_GROUP=icingacmd - -DICINGA2_COMMAND_GROUP=icingacmd - -DICINGA2_RUNDIR=/run - -DINSTALL_SYSTEMD_SERVICE_AND_INITSCRIPT=ON - -DUSE_SYSTEMD=$(usex systemd) - -DLOGROTATE_HAS_SU=ON - # only appends -flto - -DICINGA2_LTO_BUILD=OFF - ) - # default to off if minimal, allow the flags to be set otherwise - if use minimal; then - mycmakeargs+=( - -DICINGA2_WITH_MYSQL=OFF - -DICINGA2_WITH_PGSQL=OFF - ) - else - mycmakeargs+=( - -DICINGA2_WITH_PGSQL=$(usex postgres) - -DICINGA2_WITH_MYSQL=$(usex mysql yes $(usex mariadb)) - ) - fi - - cmake_src_configure -} - -src_install() { - cmake_src_install - - newinitd "${FILESDIR}"/icinga2.initd-3 icinga2 - - if use mysql || use mariadb; then - docinto schema - newdoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_mysql/schema/mysql.sql mysql.sql - docinto schema/upgrade - dodoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_mysql/schema/upgrade/* - fi - if use postgres; then - docinto schema - newdoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_pgsql/schema/pgsql.sql pgsql.sql - docinto schema/upgrade - dodoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_pgsql/schema/upgrade/* - fi - - keepdir /etc/icinga2 - keepdir /var/lib/icinga2/api/zones - keepdir /var/lib/icinga2/api/repository - keepdir /var/lib/icinga2/api/log - keepdir /var/spool/icinga2/perfdata - - rm -r "${D}/run" || die "failed to remove /run" - rm -r "${D}/var/cache" || die "failed to remove /var/cache" - - fowners -R icinga:icinga /etc/icinga2 - fperms 0750 /etc/icinga2 - fowners icinga:icinga /var/lib/icinga2 - fowners -R icinga:icingacmd /var/lib/icinga2/api - fowners -R icinga:icingacmd /var/lib/icinga2/certificate-requests - fowners -R icinga:icingacmd /var/lib/icinga2/certs - fowners icinga:icinga /var/spool/icinga2 - fowners icinga:icinga /var/spool/icinga2/perfdata - fowners icinga:icingacmd /var/log/icinga2 - - fperms ug+rwX,o-rwx /etc/icinga2 - fperms ug+rwX,o-rwx /var/lib/icinga2 - fperms ug+rwX,o-rwx /var/spool/icinga2 - fperms ug+rwX,o-rwx /var/log/icinga2 - - if use vim-syntax; then - insinto /usr/share/vim/vimfiles - doins -r "${WORKDIR}"/${P}/tools/syntax/vim/ftdetect - doins -r "${WORKDIR}"/${P}/tools/syntax/vim/syntax - fi - - if use nano-syntax; then - insinto /usr/share/nano - doins "${WORKDIR}"/${P}/tools/syntax/nano/icinga2.nanorc - fi -} - -pkg_postinst() { - if [[ "${PV}" != 9999 ]]; then - local v - for v in ${REPLACING_VERSIONS}; do - if ver_test "${PV}" -gt "${v}"; then - elog "DB IDO schema upgrade may be required." - elog "https://www.icinga.com/docs/icinga2/latest/doc/16-upgrading-icinga-2/" - fi - done - fi -} diff --git a/net-analyzer/icinga2/icinga2-2.14.1.ebuild b/net-analyzer/icinga2/icinga2-2.14.1.ebuild deleted file mode 100644 index 1ce211b79dc7..000000000000 --- a/net-analyzer/icinga2/icinga2-2.14.1.ebuild +++ /dev/null @@ -1,146 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake systemd - -if [[ ${PV} != 9999 ]]; then - SRC_URI="https://github.com/Icinga/icinga2/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="amd64 ~arm64 x86" -else - inherit git-r3 - EGIT_REPO_URI="https://github.com/Icinga/icinga2.git" -fi - -DESCRIPTION="Distributed, general purpose, network monitoring engine" -HOMEPAGE="https://icinga.com/" - -LICENSE="GPL-2" -SLOT="0" -IUSE="console jumbo-build mail mariadb minimal +mysql nano-syntax +plugins postgres systemd +vim-syntax" - -# Add accounts to DEPEND because of fowners in src_install -DEPEND=" - dev-libs/openssl:0= - dev-libs/boost:=[context] - console? ( dev-libs/libedit ) - mariadb? ( dev-db/mariadb-connector-c:= ) - mysql? ( dev-db/mysql-connector-c:= ) - postgres? ( dev-db/postgresql:= ) - dev-libs/yajl:= - acct-user/icinga - acct-group/icinga - acct-group/icingacmd" -BDEPEND=" - app-alternatives/yacc - app-alternatives/lex" -RDEPEND=" - ${DEPEND} - plugins? ( || ( - net-analyzer/monitoring-plugins - net-analyzer/nagios-plugins - ) ) - mail? ( virtual/mailx ) - acct-group/nagios" - -REQUIRED_USE="!minimal? ( || ( mariadb mysql postgres ) )" - -src_configure() { - local mycmakeargs=( - -DICINGA2_UNITY_BUILD=$(usex jumbo-build) - -DCMAKE_INSTALL_SYSCONFDIR=/etc - -DCMAKE_INSTALL_LOCALSTATEDIR=/var - -DICINGA2_SYSCONFIGFILE=/etc/conf.d/icinga2 - -DICINGA2_PLUGINDIR="/usr/$(get_libdir)/nagios/plugins" - -DICINGA2_USER=icinga - -DICINGA2_GROUP=icingacmd - -DICINGA2_COMMAND_GROUP=icingacmd - -DICINGA2_RUNDIR=/run - -DINSTALL_SYSTEMD_SERVICE_AND_INITSCRIPT=ON - -DUSE_SYSTEMD=$(usex systemd) - -DLOGROTATE_HAS_SU=ON - # only appends -flto - -DICINGA2_LTO_BUILD=OFF - ) - # default to off if minimal, allow the flags to be set otherwise - if use minimal; then - mycmakeargs+=( - -DICINGA2_WITH_MYSQL=OFF - -DICINGA2_WITH_PGSQL=OFF - ) - else - mycmakeargs+=( - -DICINGA2_WITH_PGSQL=$(usex postgres) - -DICINGA2_WITH_MYSQL=$(usex mysql yes $(usex mariadb)) - ) - fi - - cmake_src_configure -} - -src_install() { - cmake_src_install - - newinitd "${FILESDIR}"/icinga2.initd-3 icinga2 - - if use mysql || use mariadb; then - docinto schema - newdoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_mysql/schema/mysql.sql mysql.sql - docinto schema/upgrade - dodoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_mysql/schema/upgrade/* - fi - if use postgres; then - docinto schema - newdoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_pgsql/schema/pgsql.sql pgsql.sql - docinto schema/upgrade - dodoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_pgsql/schema/upgrade/* - fi - - keepdir /etc/icinga2 - keepdir /var/lib/icinga2/api/zones - keepdir /var/lib/icinga2/api/repository - keepdir /var/lib/icinga2/api/log - keepdir /var/spool/icinga2/perfdata - - rm -r "${D}/run" || die "failed to remove /run" - rm -r "${D}/var/cache" || die "failed to remove /var/cache" - - fowners -R icinga:icinga /etc/icinga2 - fperms 0750 /etc/icinga2 - fowners icinga:icinga /var/lib/icinga2 - fowners -R icinga:icingacmd /var/lib/icinga2/api - fowners -R icinga:icingacmd /var/lib/icinga2/certificate-requests - fowners -R icinga:icingacmd /var/lib/icinga2/certs - fowners icinga:icinga /var/spool/icinga2 - fowners icinga:icinga /var/spool/icinga2/perfdata - fowners icinga:icingacmd /var/log/icinga2 - - fperms ug+rwX,o-rwx /etc/icinga2 - fperms ug+rwX,o-rwx /var/lib/icinga2 - fperms ug+rwX,o-rwx /var/spool/icinga2 - fperms ug+rwX,o-rwx /var/log/icinga2 - - if use vim-syntax; then - insinto /usr/share/vim/vimfiles - doins -r "${WORKDIR}"/${P}/tools/syntax/vim/ftdetect - doins -r "${WORKDIR}"/${P}/tools/syntax/vim/syntax - fi - - if use nano-syntax; then - insinto /usr/share/nano - doins "${WORKDIR}"/${P}/tools/syntax/nano/icinga2.nanorc - fi -} - -pkg_postinst() { - if [[ "${PV}" != 9999 ]]; then - local v - for v in ${REPLACING_VERSIONS}; do - if ver_test "${PV}" -gt "${v}"; then - elog "DB IDO schema upgrade may be required." - elog "https://www.icinga.com/docs/icinga2/latest/doc/16-upgrading-icinga-2/" - fi - done - fi -} diff --git a/net-analyzer/ifstatus/ifstatus-2.0.0.ebuild b/net-analyzer/ifstatus/ifstatus-2.0.0.ebuild index 8a132f8f389f..ff7c23bd9489 100644 --- a/net-analyzer/ifstatus/ifstatus-2.0.0.ebuild +++ b/net-analyzer/ifstatus/ifstatus-2.0.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -7,7 +7,7 @@ inherit toolchain-funcs DESCRIPTION="Simple CLI program for displaying network statistics in real time" HOMEPAGE="https://ifstatus.sourceforge.io/" -SRC_URI="mirror://sourceforge/${PN}/${PN}-v${PV}.tar.gz" +SRC_URI="https://downloads.sourceforge.net/${PN}/${PN}-v${PV}.tar.gz" S="${WORKDIR}/${PN}-v${PV}" LICENSE="GPL-2+" diff --git a/net-analyzer/ipaudit/ipaudit-1.1.ebuild b/net-analyzer/ipaudit/ipaudit-1.1.ebuild index dc1733d16940..89ed7c971926 100644 --- a/net-analyzer/ipaudit/ipaudit-1.1.ebuild +++ b/net-analyzer/ipaudit/ipaudit-1.1.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 DESCRIPTION="IPAudit monitors network activity on a network by host, protocol and port" HOMEPAGE="https://ipaudit.sourceforge.net/" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" +SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.gz" LICENSE="GPL-2+" SLOT="0" diff --git a/net-analyzer/ipband/ipband-0.8.1-r2.ebuild b/net-analyzer/ipband/ipband-0.8.1-r2.ebuild index 6b90c152be8a..009254fd9076 100644 --- a/net-analyzer/ipband/ipband-0.8.1-r2.ebuild +++ b/net-analyzer/ipband/ipband-0.8.1-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -7,7 +7,7 @@ inherit toolchain-funcs DESCRIPTION="Pcap based IP traffic and bandwidth monitor" HOMEPAGE="https://ipband.sourceforge.net/" -SRC_URI="mirror://sourceforge/${PN}/${P}.tgz" +SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tgz" LICENSE="GPL-2+" SLOT="0" diff --git a/net-analyzer/ipcad/ipcad-3.7.3.ebuild b/net-analyzer/ipcad/ipcad-3.7.3.ebuild index 7c8d36c02083..9cc3e9072ec4 100644 --- a/net-analyzer/ipcad/ipcad-3.7.3.ebuild +++ b/net-analyzer/ipcad/ipcad-3.7.3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -7,7 +7,7 @@ inherit autotools DESCRIPTION="IP Cisco Accounting Daemon" HOMEPAGE="https://sourceforge.net/projects/ipcad/ http://lionet.info/ipcad/" -SRC_URI="mirror://sourceforge/ipcad/${P}.tar.gz" +SRC_URI="https://downloads.sourceforge.net/ipcad/${P}.tar.gz" LICENSE="BSD-2 GPL-2" SLOT="0" diff --git a/net-analyzer/iplog/iplog-2.2.3-r3.ebuild b/net-analyzer/iplog/iplog-2.2.3-r3.ebuild index 67d0f523848a..9e30fda919b0 100644 --- a/net-analyzer/iplog/iplog-2.2.3-r3.ebuild +++ b/net-analyzer/iplog/iplog-2.2.3-r3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -7,7 +7,7 @@ inherit flag-o-matic toolchain-funcs DESCRIPTION="TCP/IP traffic logger" HOMEPAGE="https://ojnk.sourceforge.net/" -SRC_URI="mirror://sourceforge/ojnk/${P}.tar.gz" +SRC_URI="https://downloads.sourceforge.net/ojnk/${P}.tar.gz" LICENSE="|| ( GPL-2 FDL-1.1 )" SLOT="0" diff --git a/net-analyzer/iptraf-ng/metadata.xml b/net-analyzer/iptraf-ng/metadata.xml index dce3f3be66c0..8137ba4f4c5d 100644 --- a/net-analyzer/iptraf-ng/metadata.xml +++ b/net-analyzer/iptraf-ng/metadata.xml @@ -5,4 +5,7 @@ <email>netmon@gentoo.org</email> <name>Gentoo network monitoring and analysis project</name> </maintainer> +<upstream> + <remote-id type="github">iptraf-ng/iptraf-ng</remote-id> +</upstream> </pkgmetadata> diff --git a/net-analyzer/isic/isic-0.07-r2.ebuild b/net-analyzer/isic/isic-0.07-r2.ebuild index 07add2fa0cc9..451a7a75239a 100644 --- a/net-analyzer/isic/isic-0.07-r2.ebuild +++ b/net-analyzer/isic/isic-0.07-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -7,7 +7,7 @@ inherit toolchain-funcs DESCRIPTION="IP Stack Integrity Checker" HOMEPAGE="https://isic.sourceforge.net/" -SRC_URI="mirror://sourceforge/isic/${P}.tgz" +SRC_URI="https://downloads.sourceforge.net/isic/${P}.tgz" LICENSE="BSD" SLOT="0" diff --git a/net-analyzer/jnettop/jnettop-0.13.0-r2.ebuild b/net-analyzer/jnettop/jnettop-0.13.0-r2.ebuild index bfac1d1b3de9..8b2365f79d7b 100644 --- a/net-analyzer/jnettop/jnettop-0.13.0-r2.ebuild +++ b/net-analyzer/jnettop/jnettop-0.13.0-r2.ebuild @@ -1,15 +1,15 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 inherit autotools -DESCRIPTION="A top like console network traffic visualiser" +DESCRIPTION="Top like console network traffic visualiser" HOMEPAGE="https://sourceforge.net/projects/jnettop" SRC_URI="http://jnettop.kubs.info/dist/${P}.tar.gz" -LICENSE="GPL-2" +LICENSE="GPL-2+" SLOT="0" KEYWORDS="amd64 ~arm ~arm64 ~ppc ~sparc x86 ~amd64-linux ~x86-linux" IUSE="berkdb ncurses syslog" diff --git a/net-analyzer/jnettop/metadata.xml b/net-analyzer/jnettop/metadata.xml index dce3f3be66c0..64065c6ebf3a 100644 --- a/net-analyzer/jnettop/metadata.xml +++ b/net-analyzer/jnettop/metadata.xml @@ -5,4 +5,7 @@ <email>netmon@gentoo.org</email> <name>Gentoo network monitoring and analysis project</name> </maintainer> +<upstream> + <remote-id type="sourceforge">jnettop</remote-id> +</upstream> </pkgmetadata> diff --git a/net-analyzer/knocker/knocker-0.8.0.ebuild b/net-analyzer/knocker/knocker-0.8.0.ebuild index e321e9635e5d..069f7a174704 100644 --- a/net-analyzer/knocker/knocker-0.8.0.ebuild +++ b/net-analyzer/knocker/knocker-0.8.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -7,7 +7,7 @@ inherit toolchain-funcs DESCRIPTION="Knocker is an easy to use security port scanner written in C" HOMEPAGE="https://knocker.sourceforge.net" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" +SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" diff --git a/net-analyzer/labrea/labrea-2.5_p1.ebuild b/net-analyzer/labrea/labrea-2.5_p1.ebuild index 2e1cbb89bd39..a2ba90710ea0 100644 --- a/net-analyzer/labrea/labrea-2.5_p1.ebuild +++ b/net-analyzer/labrea/labrea-2.5_p1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -7,7 +7,7 @@ inherit autotools DESCRIPTION="'Sticky' Honeypot and IDS" HOMEPAGE="https://labrea.sourceforge.io" -SRC_URI="mirror://sourceforge/${PN}/${P/_p*}-stable-${PV/*_p}.tar.gz" +SRC_URI="https://downloads.sourceforge.net/${PN}/${P/_p*}-stable-${PV/*_p}.tar.gz" S="${WORKDIR}/${P/_p/-stable-}" LICENSE="GPL-2+" diff --git a/net-analyzer/macchanger/macchanger-1.7.0_p5_p4-r3.ebuild b/net-analyzer/macchanger/macchanger-1.7.0_p5_p4-r3.ebuild index 3797d8ce8d40..bfb18bf3ace8 100644 --- a/net-analyzer/macchanger/macchanger-1.7.0_p5_p4-r3.ebuild +++ b/net-analyzer/macchanger/macchanger-1.7.0_p5_p4-r3.ebuild @@ -12,7 +12,7 @@ SRC_URI=" mirror://debian/pool/main/m/${PN}/${PN}_${PV/_p*}-$(ver_cut 5).$(ver_cut 7).debian.tar.xz " LICENSE="GPL-2" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86" +KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv sparc x86" SLOT="0" PATCHES=( diff --git a/net-analyzer/mbrowse/mbrowse-0.4.3-r1.ebuild b/net-analyzer/mbrowse/mbrowse-0.4.3-r1.ebuild index 4c72d7daca60..457087b6b4a1 100644 --- a/net-analyzer/mbrowse/mbrowse-0.4.3-r1.ebuild +++ b/net-analyzer/mbrowse/mbrowse-0.4.3-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -7,7 +7,7 @@ inherit autotools DESCRIPTION="MBrowse is a graphical MIB browser" HOMEPAGE="https://sourceforge.net/projects/mbrowse/" -SRC_URI="mirror://sourceforge/${PN}/files/${P}.tar.gz" +SRC_URI="https://downloads.sourceforge.net/${PN}/files/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" diff --git a/net-analyzer/monitoring-plugins/Manifest b/net-analyzer/monitoring-plugins/Manifest index 545a0d98a9f7..db1a7cbc1868 100644 --- a/net-analyzer/monitoring-plugins/Manifest +++ b/net-analyzer/monitoring-plugins/Manifest @@ -1,2 +1 @@ -DIST monitoring-plugins-2.3.3.tar.gz 2620192 BLAKE2B 47bd7e71cf470781bb3bd8c8437ebfccdc977e48a3eba1d83ba85c2c1a8c154c7db832e3bb7189bf669083a10069c7fe09c7235a00b35fd9a6d80afcdbb44246 SHA512 502274b47da2ad04d0e2e4e29baa7e5ad8b9a9ece36794dcdf7dfcc087de30e514ff6937eaaa26b93daad329fcd11b72c3c87cad826e6bf6bafffa450077706f DIST monitoring-plugins-2.3.5.tar.gz 2876130 BLAKE2B 7029f6485ef73d29329bcb36e16cbbaa99c57ae20505f554af154b45cc1af6f623dabb35ee5b7f777d728bcae8eafd795f12aabc199cf1f45c9f2335f74b6d41 SHA512 bb04d547584a4aed82bfd605d129b652b45c7356c0610fb1da53a57b2ab889b67afccdd53998e2612ec06571bdc5fc238ef0d378b96e29ec072f657e74eabd55 diff --git a/net-analyzer/monitoring-plugins/files/monitoring-plugins-fix-check-http-segfault.patch b/net-analyzer/monitoring-plugins/files/monitoring-plugins-fix-check-http-segfault.patch deleted file mode 100644 index 34e539f51e2d..000000000000 --- a/net-analyzer/monitoring-plugins/files/monitoring-plugins-fix-check-http-segfault.patch +++ /dev/null @@ -1,23 +0,0 @@ -https://bugs.gentoo.org/893252 -https://github.com/monitoring-plugins/monitoring-plugins/issues/1836 -https://github.com/monitoring-plugins/monitoring-plugins/commit/6d3e44d2d8395076060e9c741e9b173dc5d57b76 - -diff --git a/plugins/check_http.c b/plugins/check_http.c -index 5fa310f5d..8dda046ff 100644 ---- a/plugins/check_http.c -+++ b/plugins/check_http.c -@@ -1462,7 +1462,13 @@ char *unchunk_content(const char *content) { - memcpy(result + (overall_size - size_of_chunk), start_of_chunk, size_of_chunk); - } - -- result[overall_size] = '\0'; -+ if (overall_size == 0 && result == NULL) { -+ // We might just have received the end chunk without previous content, so result is never allocated -+ result = calloc(1, sizeof(char)); -+ // No error handling here, we can only return NULL anyway -+ } else { -+ result[overall_size] = '\0'; -+ } - return result; - } - diff --git a/net-analyzer/monitoring-plugins/files/monitoring-plugins-gnutls.patch b/net-analyzer/monitoring-plugins/files/monitoring-plugins-gnutls.patch deleted file mode 100644 index 00415f0b7111..000000000000 --- a/net-analyzer/monitoring-plugins/files/monitoring-plugins-gnutls.patch +++ /dev/null @@ -1,21 +0,0 @@ -https://bugs.gentoo.org/880211 -https://github.com/monitoring-plugins/monitoring-plugins/issues/1834 -https://github.com/monitoring-plugins/monitoring-plugins/commit/31bdbfce92de2dc7717fe13a8d1ca8e7dbf850d4 - -diff --git a/plugins/sslutils.c b/plugins/sslutils.c -index 286273f6..c26c4fb3 100644 ---- a/plugins/sslutils.c -+++ b/plugins/sslutils.c -@@ -134,7 +134,12 @@ int np_net_ssl_init_with_hostname_version_and_cert(int sd, char *host_name, int - return STATE_CRITICAL; - } - if (cert && privkey) { -+#ifdef USE_GNUTLS -+ SSL_CTX_use_certificate_file(c, cert, SSL_FILETYPE_PEM); -+#endif -+#ifdef USE_OPENSSL - SSL_CTX_use_certificate_chain_file(c, cert); -+#endif - SSL_CTX_use_PrivateKey_file(c, privkey, SSL_FILETYPE_PEM); - #ifdef USE_OPENSSL - if (!SSL_CTX_check_private_key(c)) { diff --git a/net-analyzer/monitoring-plugins/metadata.xml b/net-analyzer/monitoring-plugins/metadata.xml index 37237fb7544c..b8ca2be8aea7 100644 --- a/net-analyzer/monitoring-plugins/metadata.xml +++ b/net-analyzer/monitoring-plugins/metadata.xml @@ -26,6 +26,10 @@ Install <pkg>net-analyzer/fping</pkg> required for fancy ping monitoring. Disabling the flag does not remove any plugins. </flag> + <!-- leave this global flag defined here to avoid a pkgcheck warning --> + <flag name="ipv6"> + Enable ipv6 checks. + </flag> <flag name="ssh"> Install <pkg>net-misc/openssh</pkg> required for monitoring SSH servers. Disabling the flag does not remove any plugins. diff --git a/net-analyzer/monitoring-plugins/monitoring-plugins-2.3.3-r2.ebuild b/net-analyzer/monitoring-plugins/monitoring-plugins-2.3.3-r2.ebuild deleted file mode 100644 index e364f28aa4cc..000000000000 --- a/net-analyzer/monitoring-plugins/monitoring-plugins-2.3.3-r2.ebuild +++ /dev/null @@ -1,110 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="8" - -inherit flag-o-matic - -DESCRIPTION="50+ standard plugins for Icinga, Naemon, Nagios, Shinken, Sensu" -HOMEPAGE="https://www.monitoring-plugins.org/" -SRC_URI="https://www.monitoring-plugins.org/download/${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="amd64 ~arm ~arm64 sparc x86" -IUSE="curl gnutls ipv6 ldap mysql dns fping game postgres radius samba snmp ssh +ssl" - -# Most of the plugins use automagic dependencies, i.e. the plugin will -# get built if the binary it uses is installed. For example, check_snmp -# will be built only if snmpget from net-analyzer/net-snmp[-minimal] is -# installed. End result: most of our runtime dependencies are required -# at build time as well. -# -# REAL_DEPEND contains the dependencies that are actually needed to -# build. DEPEND contains those plus the automagic dependencies. -# -REAL_DEPEND="dev-lang/perl - curl? ( - dev-libs/uriparser - net-misc/curl - ) - ldap? ( net-nds/openldap:= ) - mysql? ( || ( dev-db/mysql-connector-c dev-db/mariadb-connector-c ) ) - postgres? ( dev-db/postgresql:= ) - ssl? ( - !gnutls? ( - dev-libs/openssl:0= - ) - gnutls? ( net-libs/gnutls ) - ) - radius? ( net-dialup/freeradius-client )" - -DEPEND="${REAL_DEPEND} - dns? ( net-dns/bind-tools ) - game? ( games-util/qstat ) - fping? ( net-analyzer/fping ) - samba? ( net-fs/samba ) - ssh? ( virtual/openssh ) - snmp? ( dev-perl/Net-SNMP - net-analyzer/net-snmp[-minimal] )" - -# Basically everything collides with nagios-plugins. -RDEPEND="${DEPEND} - acct-group/nagios - acct-user/nagios - !net-analyzer/nagios-plugins" - -# At least one test is interactive. -RESTRICT="test" - -PATCHES=( - "${FILESDIR}/${PN}-gnutls.patch" #880211 - "${FILESDIR}/${PN}-fix-check-http-segfault.patch" #893252 -) - -src_configure() { - append-flags -fno-strict-aliasing - - # Use an array to prevent econf from mangling the ping args. - local myconf=() - - if use ssl; then - myconf+=( $(use_with !gnutls openssl /usr) - $(use_with gnutls gnutls /usr) ) - else - myconf+=( --without-openssl ) - myconf+=( --without-gnutls ) - fi - - # The autodetection for these two commands can hang if localhost is - # down or ICMP traffic is filtered (bug #468296). But also the path - # likes to move around on us (bug #883729). - myconf+=( --with-ping-command="$(command -v ping) -4 -n -U -w %d -c %d %s" ) - - if use ipv6; then - myconf+=( --with-ping6-command="$(command -v ping) -6 -n -U -w %d -c %d %s" ) - fi - - econf \ - $(use_with curl libcurl) \ - $(use_with curl uriparser) \ - $(use_with mysql) \ - $(use_with ipv6) \ - $(use_with ldap) \ - $(use_with postgres pgsql /usr) \ - $(use_with radius) \ - "${myconf[@]}" \ - --libexecdir="/usr/$(get_libdir)/nagios/plugins" \ - --sysconfdir="/etc/nagios" -} - -DOCS=( ACKNOWLEDGEMENTS AUTHORS CODING ChangeLog FAQ \ - NEWS README REQUIREMENTS SUPPORT THANKS ) - -pkg_postinst() { - elog "This ebuild has a number of USE flags that determine what you" - elog "are able to monitor. Depending on what you want to monitor, some" - elog "or all of these USE flags need to be set." - elog - elog "The plugins are installed in ${EROOT}/usr/$(get_libdir)/nagios/plugins" -} diff --git a/net-analyzer/monitoring-plugins/monitoring-plugins-2.3.5.ebuild b/net-analyzer/monitoring-plugins/monitoring-plugins-2.3.5.ebuild index c09500eb8d38..b7b41a925869 100644 --- a/net-analyzer/monitoring-plugins/monitoring-plugins-2.3.5.ebuild +++ b/net-analyzer/monitoring-plugins/monitoring-plugins-2.3.5.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -57,6 +57,14 @@ RDEPEND="${DEPEND} # At least one test is interactive. RESTRICT="test" +# These all come from gnulib and the ./configure checks are working as +# intended when the functions aren't present. Bug 921190. +QA_CONFIG_IMPL_DECL_SKIP=( + MIN + static_assert + alignof +) + src_configure() { append-flags -fno-strict-aliasing diff --git a/net-analyzer/munin-plugins-zfs/munin-plugins-zfs-0.20170127.ebuild b/net-analyzer/munin-plugins-zfs/munin-plugins-zfs-0.20170127-r1.ebuild index bec89a7e2c74..54b8503c30ee 100644 --- a/net-analyzer/munin-plugins-zfs/munin-plugins-zfs-0.20170127.ebuild +++ b/net-analyzer/munin-plugins-zfs/munin-plugins-zfs-0.20170127-r1.ebuild @@ -1,14 +1,14 @@ # Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 COMMIT="385f9e4cda592ace95b47c69db76553bcb6a42d6" DESCRIPTION="A Munin plugin for monitoring ZFS on Linux" HOMEPAGE="https://github.com/alexclear/ZoL-munin-plugin" SRC_URI="https://github.com/alexclear/ZoL-munin-plugin/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" -S="${WORKDIR}/ZoL-munin-plugin-${COMMIT}" +S=${WORKDIR}/ZoL-munin-plugin-${COMMIT} LICENSE="MIT" SLOT="0" @@ -17,7 +17,6 @@ KEYWORDS="~amd64" DEPEND="net-analyzer/munin" RDEPEND="${DEPEND} app-alternatives/bc - " src_install() { diff --git a/net-analyzer/munin/Manifest b/net-analyzer/munin/Manifest index bce724fcc09e..0cfaff703fd3 100644 --- a/net-analyzer/munin/Manifest +++ b/net-analyzer/munin/Manifest @@ -1,6 +1,2 @@ -DIST munin-2.0.69-gentoo-1.tar.xz 3980 BLAKE2B 5aae9c29befa761f797d362c90d810051a7f3a5dc8250776ab6ae1659197d795dfb87274db66ff0a3deb4e10e14ced5b3765551a3f29357c436968a848f450ea SHA512 b21d6590bb9e1da127066a06818f1f3157362762f80526e2231b926956959e62af575f38235f72326376dc21bba63f9767efa379f1f2558ca9b20ddf5395e851 -DIST munin-2.0.69.tar.gz 2258024 BLAKE2B 2d270f6f67fc9a86a592e2b7cbcf4111d6ae40bf1928b0ad0adb99ad32384810e5768c17019f9163e8b22fd8524b28257df527df023db9c1ba333691b384dd74 SHA512 4976e394e046d3fe1cbb000acdf081060188517e09abcf8b60dd7c55e0e1cdf46e33d1760368cb1423dfb9286e397df2072a2c55ba8b79adeae4ea2303130667 -DIST munin-2.0.73.tar.gz 2259959 BLAKE2B 2d2e4ce00b2df06f083280b9253f875ded100e42c991152f3f8e4b39e85d605367efc18df369e07e18eac38aabd78faa959c367752b153f97246bb47a9732f20 SHA512 4f1d59ff3f163c8fac883973ebba1221619d716c4cde506d9265544c52e73f43e8b587cda3fd00bcf779ceeaf8fef6e7780d9ea4be5b99894f0bb5047f24b935 -DIST munin-2.0.74.tar.gz 2258466 BLAKE2B a993c97d1f2c3aec8c3970e75d0406ce8b5a56eb54c729cdd97c4fbd38190dc474336b9faf06881b4f293a72c4181e8138edefc51da548c179c082869d966f34 SHA512 ad75100576b74d1d75bb7f204975ce683c88aadb668d61feabc6652d5dc0495af4f94a9e8d485a242dbc178f003be91ec72c350b35186d9410035f1c8688f97b DIST munin-2.0.75.tar.gz 2258514 BLAKE2B 689b436913a931c9002757267db236ba4ab1da947552c43ad2b96c2e5b26427499e681d0606d0045cfbbd90b70a69572b8550660a598d672babeba8388feacf5 SHA512 cceb47c27bfb3080980fd6342e805b5b9fecbef7033d6f2a83fe6c78d20f943961c9f1775ef5e464e49c25c9d246606594f2844827b38d34c04016f15dd68613 -DIST munin-remove-Date-Manip-DM5.patch 3587 BLAKE2B fab1fb61607e83aac5cbd699c93015d77ca6e58d9734a5a6bc17af6c3c7695ddf4257104cd69db4d3b3e1d36bb1d66a1893ddb51bfc52d0a1dd2efb3ba32a9c0 SHA512 976d7a50de6437a26fa77917368ab604c1987f686030e097c200fe9ebebd08e5fae10c04640cadbfecef90eda76ba123cf303d2d671cefa78b09752d1f6757af +DIST munin-2.0.76.tar.gz 2258538 BLAKE2B 74d8d055be52f605b2d0f2551328bd425e9550a7dd86740479f7a6efd9a9d8be7a78b4075fe68a9c658981b2089d6277eb51b758fb8ba341c149117457ab4696 SHA512 e43d8f123cb6bf9a1b99dde4fe93440e256b3950ec1f79923998f83b14530bba24dab87ece1d3e7e5bf3afd645eafa6c1055d1119748e76230cfb29136712086 diff --git a/net-analyzer/munin/files/munin-node_init.d_2.0.19 b/net-analyzer/munin/files/munin-node_init.d_2.0.19 deleted file mode 100644 index fca7880692cf..000000000000 --- a/net-analyzer/munin/files/munin-node_init.d_2.0.19 +++ /dev/null @@ -1,26 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -get_munin_config() { - awk '$1 == "'$1'" { s=$2 } END { print s }' "$CFGFILE" -} - -: ${CFGFILE:=/etc/munin/munin-node.conf} - -command=/usr/sbin/munin-node -command_args="--config ${CFGFILE}" -pidfile=$(get_munin_config pid_file) -start_stop_daemon_args="--nicelevel ${NICE_LEVEL:-0} --wait 1500" -extra_started_commands="reload" - -depend() { - config "$CFGFILE" - - before cron - - [ "$(get_munin_config log_file)" = "Sys::Syslog" ] && \ - use logger -} - -# vim: filetype=gentoo-init-d: diff --git a/net-analyzer/munin/files/munin.apache.include b/net-analyzer/munin/files/munin.apache.include deleted file mode 100644 index f8b2df5daa66..000000000000 --- a/net-analyzer/munin/files/munin.apache.include +++ /dev/null @@ -1,31 +0,0 @@ -# -*- apache -*- - -ScriptAlias /munin-cgi/ /usr/libexec/munin/cgi/ -Alias /munin/static /etc/munin/static - -<IfDefine MUNIN_HTML_CGI> -RewriteEngine on - -RewriteCond %{REQUEST_URI} (/|\.html)$ -RewriteCond %{REQUEST_URI} !/static -RewriteRule ^/munin/(.*) /munin-cgi/munin-cgi-html/$1 [PT,L] -</IfDefine> - -<Directory /usr/libexec/munin/cgi/> - Options +ExecCGI - - Order allow,deny - Allow from all - - <IfModule mod_fcgid.c> - SetHandler fcgid-script - </IfModule> - <IfModule !mod_fcgid.c> - SetHandler cgi-script - </IfModule> -</Directory> - -<Directory /etc/munin/static> - Order allow,deny - Allow from all -</Directory> diff --git a/net-analyzer/munin/files/munin.apache.include-2.4 b/net-analyzer/munin/files/munin.apache.include-2.4 deleted file mode 100644 index ec69cbb07b91..000000000000 --- a/net-analyzer/munin/files/munin.apache.include-2.4 +++ /dev/null @@ -1,28 +0,0 @@ -# -*- apache -*- - -ScriptAlias /munin-cgi/ /usr/libexec/munin/cgi/ -Alias /munin/static /etc/munin/static - -<IfDefine MUNIN_HTML_CGI> -RewriteEngine on - -RewriteCond %{REQUEST_URI} (/|\.html)$ -RewriteCond %{REQUEST_URI} !/static -RewriteRule ^/munin/(.*) /munin-cgi/munin-cgi-html/$1 [PT,L] -</IfDefine> - -<Directory /usr/libexec/munin/cgi/> - Options +ExecCGI - Require all granted - - <IfModule mod_fcgid.c> - SetHandler fcgid-script - </IfModule> - <IfModule !mod_fcgid.c> - SetHandler cgi-script - </IfModule> -</Directory> - -<Directory /etc/munin/static> - Require all granted -</Directory> diff --git a/net-analyzer/munin/munin-2.0.69-r1.ebuild b/net-analyzer/munin/munin-2.0.69-r1.ebuild deleted file mode 100644 index a2e3e857ae21..000000000000 --- a/net-analyzer/munin/munin-2.0.69-r1.ebuild +++ /dev/null @@ -1,420 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PATCHSET=1 - -inherit java-pkg-opt-2 systemd tmpfiles - -MY_P=${P/_/-} - -DESCRIPTION="Munin Server Monitoring Tool" -HOMEPAGE="https://munin-monitoring.org/" -SRC_URI=" - https://github.com/munin-monitoring/munin/archive/${PV}.tar.gz -> ${P}.tar.gz - https://dev.gentoo.org/~graaff/munin/${P}-gentoo-${PATCHSET}.tar.xz - https://github.com/munin-monitoring/munin/commit/47a2ea75899a6395a80918d043a21d61fe712b44.patch -> munin-remove-Date-Manip-DM5.patch - " - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 arm arm64 ppc ~ppc64 x86" -IUSE="asterisk irc java ldap memcached minimal mysql postgres selinux ssl test cgi ipv6 syslog ipmi http dhcpd doc apache2" -REQUIRED_USE="cgi? ( !minimal ) apache2? ( cgi )" -RESTRICT="!test? ( test )" - -# Upstream's listing of required modules is NOT correct! -# Some of the postgres plugins use DBD::Pg, while others call psql directly. -# Some of the mysql plugins use DBD::mysql, while others call mysqladmin directly. -# We replace the original ipmi plugins with the freeipmi_ plugin which at least works. -DEPEND_COM=" - acct-user/munin - acct-user/munin-async - acct-group/munin - dev-lang/perl:=[berkdb] - dev-perl/DBI - dev-perl/File-Copy-Recursive - dev-perl/List-MoreUtils - dev-perl/Log-Log4perl - dev-perl/Net-CIDR - dev-perl/Net-DNS - dev-perl/Net-Netmask - dev-perl/Net-SNMP - dev-perl/Net-Server[ipv6(-)?] - dev-perl/TimeDate - virtual/perl-Digest-MD5 - virtual/perl-Getopt-Long - virtual/perl-MIME-Base64 - virtual/perl-Storable - virtual/perl-Text-Balanced - virtual/perl-Time-HiRes - apache2? ( www-servers/apache[apache2_modules_cgi,apache2_modules_cgid,apache2_modules_rewrite] ) - asterisk? ( dev-perl/Net-Telnet ) - cgi? ( - dev-perl/FCGI - dev-perl/CGI-Fast - ) - dhcpd? ( - >=net-misc/dhcp-3[server] - dev-perl/Net-IP - dev-perl/HTTP-Date - ) - doc? ( dev-python/sphinx ) - http? ( dev-perl/libwww-perl ) - irc? ( dev-perl/Net-IRC ) - ldap? ( dev-perl/perl-ldap ) - kernel_linux? ( sys-process/procps ) - memcached? ( dev-perl/Cache-Memcached ) - mysql? ( - virtual/mysql - dev-perl/Cache-Cache - dev-perl/DBD-mysql - ) - postgres? ( dev-perl/DBD-Pg dev-db/postgresql:* ) - ssl? ( dev-perl/Net-SSLeay ) - syslog? ( virtual/perl-Sys-Syslog ) - !minimal? ( - dev-perl/HTML-Template - dev-perl/IO-Socket-INET6 - dev-perl/URI - >=net-analyzer/rrdtool-1.3[graph,perl] - virtual/ssh - ) - " - -# Keep this seperate, as previous versions have had other deps here -DEPEND="${DEPEND_COM} - dev-perl/Module-Build - java? ( >=virtual/jdk-1.8 ) - test? ( - dev-perl/Test-Deep - dev-perl/Test-Exception - dev-perl/Test-LongString - dev-perl/Test-Differences - dev-perl/Test-MockModule - dev-perl/Test-MockObject - dev-perl/File-Slurp - dev-perl/IO-stringy - dev-perl/IO-Socket-INET6 - )" -RDEPEND="${DEPEND_COM} - app-alternatives/awk - ipmi? ( >=sys-libs/freeipmi-1.1.6-r1 ) - java? ( - >=virtual/jre-1.8:* - || ( net-analyzer/netcat net-analyzer/openbsd-netcat ) - ) - !minimal? ( - virtual/cron - media-fonts/dejavu - ) - selinux? ( sec-policy/selinux-munin )" - -S="${WORKDIR}/${MY_P}" - -pkg_setup() { - java-pkg-opt-2_pkg_setup -} - -src_prepare() { - echo ${PV} > RELEASE || die - - eapply "${WORKDIR}"/patches/*.patch - # Quick hack to make the munin-remove-Date-Manip-DM5.patch apply - sed -i -e '/^BEGIN/,/Date::Manip::Backend/{ /no warnings;/d }' "${S}"/master/_bin/munin-cgi-graph.in - eapply "${DISTDIR}"/munin-remove-Date-Manip-DM5.patch - - eapply_user - - java-pkg-opt-2_src_prepare -} - -src_configure() { - local cgidir='$(DESTDIR)/usr/libexec/munin/cgi' - use cgi || cgidir="${T}/useless/cgi-bin" - - local cgiuser=$(usex apache2 apache munin) - - cat >> "${S}"/Makefile.config <<- EOF || die - PREFIX=\$(DESTDIR)/usr - CONFDIR=\$(DESTDIR)/etc/munin - DOCDIR=${T}/useless/doc - MANDIR=\$(PREFIX)/share/man - LIBDIR=\$(PREFIX)/libexec/munin - HTMLDIR=\$(DESTDIR)/var/www/localhost/htdocs/munin - CGIDIR=${cgidir} - CGITMPDIR=\$(DESTDIR)/var/cache/munin-cgi - CGIUSER=${cgiuser} - DBDIR=\$(DESTDIR)/var/lib/munin - DBDIRNODE=\$(DESTDIR)/var/lib/munin-node - SPOOLDIR=\$(DESTDIR)/var/spool/munin-async - LOGDIR=\$(DESTDIR)/var/log/munin - PERLLIB=\$(DESTDIR)$(perl -V:vendorlib | cut -d"'" -f2) - JCVALID=$(usex java yes no) - STATEDIR=\$(DESTDIR)/run/munin - EOF -} - -# parallel make and install need to be fixed before, and I haven't -# gotten around to do so yet. -src_compile() { - emake -j1 - use doc && emake -C doc html -} - -src_test() { - if [[ ${EUID} == 0 ]]; then - eerror "You cannot run tests as root." - eerror "Please enable FEATURES=userpriv before proceeding." - return 1 - fi - - local testtargets="test-common test-node test-plugins" - use minimal || testtargets+=" test-master" - - LC_ALL=C emake -j1 ${testtargets} -} - -src_install() { - local dirs=" - /var/log/munin - /var/lib/munin/plugin-state - /var/lib/munin-node/plugin-state - /var/www/localhost/htdocs/munin - /etc/munin/plugin-conf.d - /etc/munin/plugins" - use minimal || dirs+=" /etc/munin/munin-conf.d/" - - keepdir ${dirs} - fowners munin:munin ${dirs} - - # parallel install doesn't work and it's also pointless to have this - # run in parallel for now (because it uses internal loops). - emake -j1 CHOWN=true DESTDIR="${D}" $(usex minimal "install-minimal install-man" install) - - # we remove /run from the install, as it's not the package's to deal - # with. - rm -rf "${D}"/run || die - - # remove the plugins for non-Gentoo package managers; use -f so that - # it doesn't fail when installing on non-Linux platforms. - rm -f "${D}"/usr/libexec/munin/plugins/{apt{,_all},yum} || die - - insinto /etc/munin/plugin-conf.d/ - newins "${FILESDIR}"/${PN}-1.3.2-plugins.conf munin-node - - newinitd "${FILESDIR}"/munin-node_init.d_2.0.19 munin-node - newconfd "${FILESDIR}"/munin-node_conf.d_1.4.6-r2 munin-node - - newinitd "${FILESDIR}"/munin-asyncd.init.2 munin-asyncd - - newtmpfiles - ${CATEGORY}:${PN}:${SLOT}.conf <<-EOF || die - d /run/munin 0700 munin munin - - - EOF - - systemd_dounit "${FILESDIR}"/munin-async.service - systemd_dounit "${FILESDIR}"/munin-graph.{service,socket} - systemd_dounit "${FILESDIR}"/munin-html.{service,socket} - systemd_dounit "${FILESDIR}"/munin-node.service - - cat >> "${T}"/munin.env <<- EOF - CONFIG_PROTECT=/var/spool/munin-async/.ssh - EOF - newenvd "${T}"/munin.env 50munin - - dodoc README ChangeLog INSTALL - if use doc; then - cd "${S}"/doc/_build/html || die - docinto html - dodoc -r * - cd "${S}" || die - fi - - dodir /etc/logrotate.d/ - sed -e "s:@CGIUSER@:$(usex apache2 apache munin):g" \ - "${FILESDIR}"/logrotate.d-munin.3 > "${D}"/etc/logrotate.d/munin - - dosym ipmi_ /usr/libexec/munin/plugins/ipmi_sensor_ - - if use syslog; then - sed -i -e '/log_file/s| .*| Sys::Syslog|' \ - "${D}"/etc/munin/munin-node.conf || die - fi - - # Use a simpler pid file to avoid trouble with /run in tmpfs. The - # munin-node service is ran as user root, and only later drops - # privileges. - sed -i -e 's:/run/munin/munin-node.pid:/run/munin-node.pid:' \ - "${D}"/etc/munin/munin-node.conf || die - - keepdir /var/spool/munin-async/.ssh - touch "${D}"/var/spool/munin-async/.ssh/authorized_keys - fowners munin-async:munin /var/spool/munin-async{,/.ssh/{,authorized_keys}} - fperms 0750 /var/spool/munin-async{,/.ssh} - fperms 0600 /var/spool/munin-async/.ssh/authorized_keys - - if use minimal; then - # This requires the presence of munin-update, which is part of - # the non-minimal install... - rm "${D}"/usr/libexec/munin/plugins/munin_stats - else - # remove font files so that we don't have to keep them around - rm "${D}"/usr/libexec/${PN}/*.ttf || die - - if use cgi; then - sed -i -e '/#graph_strategy cgi/s:^#::' "${D}"/etc/munin/munin.conf || die - - touch "${D}"/var/log/munin/munin-cgi-{graph,html}.log - fowners $(usex apache2 apache munin) \ - /var/log/munin/munin-cgi-{graph,html}.log - - if use apache2; then - insinto /etc/apache2/vhosts.d - newins "${FILESDIR}"/munin.apache.include munin.include - newins "${FILESDIR}"/munin.apache.include-2.4 munin-2.4.include - fi - else - sed \ - -e '/#graph_strategy cgi/s:#graph_strategy cgi:graph_strategy cron:' \ - -i "${D}"/etc/munin/munin.conf || die - fi - - keepdir /var/lib/munin/.ssh - cat >> "${D}"/var/lib/munin/.ssh/config <<- EOF - IdentityFile /var/lib/munin/.ssh/id_ecdsa - IdentityFile /var/lib/munin/.ssh/id_rsa - EOF - - fowners munin:munin /var/lib/munin/.ssh/{,config} - fperms go-rwx /var/lib/munin/.ssh/{,config} - - dodir /usr/share/${PN} - cat >> "${D}"/usr/share/${PN}/crontab <<- EOF - # Force the shell to bash - SHELL=/bin/bash - # Mail reports to root@, not munin@ - MAILTO=root - - # This runs the munin task every 5 minutes. - */5 * * * * /usr/bin/munin-cron - - # Alternatively, this route works differently - # Update once a minute (for busy sites) - #*/1 * * * * /usr/libexec/munin/munin-update - ## Check for limit excess every 2 minutes - #*/2 * * * * /usr/libexec/munin/munin-limits - ## Update graphs every 5 minutes - #*/5 * * * * nice /usr/libexec/munin/munin-graph - ## Update HTML pages every 15 minutes - #*/15 * * * * nice /usr/libexec/munin/munin-html - EOF - - cat >> "${D}"/usr/share/${PN}/fcrontab <<- EOF - # Mail reports to root@, not munin@, only execute one at a time - !mailto(root),serial(true) - - # This runs the munin task every 5 minutes. - @ 5 /usr/bin/munin-cron - - # Alternatively, this route works differently - # Update once a minute (for busy sites) - #@ 1 /usr/libexec/munin/munin-update - ## Check for limit excess every 2 minutes - #@ 2 /usr/libexec/munin/munin-limits - ## Update graphs every 5 minutes - #@ 5 nice /usr/libexec/munin/munin-graph - ## Update HTML pages every 15 minutes - #@ 15 nice /usr/libexec/munin/munin-html - EOF - - # remove .htaccess file - find "${D}" -name .htaccess -delete || die - fi -} - -pkg_config() { - if use minimal; then - einfo "Nothing to do." - return 0 - fi - - einfo "Press enter to install the default crontab for the munin master" - einfo "installation from /usr/share/${PN}/f?crontab" - einfo "If you have a large site, you may wish to customize it." - read - - ebegin "Setting up cron ..." - if has_version sys-process/fcron; then - fcrontab - -u munin < /usr/share/${PN}/fcrontab - else - # dcron is very fussy about syntax - # the following is the only form that works in BOTH dcron and vixie-cron - crontab - -u munin < /usr/share/${PN}/crontab - fi - eend $? - - einfo "Press enter to set up the SSH keys used for SSH transport" - read - - # generate one rsa (for legacy) and one ecdsa (for new systems) - ssh-keygen -t rsa \ - -f /var/lib/munin/.ssh/id_rsa -N '' \ - -C "created by portage for ${CATEGORY}/${PN}" || die - ssh-keygen -t ecdsa \ - -f /var/lib/munin/.ssh/id_ecdsa -N '' \ - -C "created by portage for ${CATEGORY}/${PN}" || die - chown -R munin:munin /var/lib/munin/.ssh || die - chmod 0600 /var/lib/munin/.ssh/id_{rsa,ecdsa} || die - - einfo "Your public keys are available in " - einfo " /var/lib/munin/.ssh/id_rsa.pub" - einfo " /var/lib/munin/.ssh/id_ecdsa.pub" - einfo "and follows for convenience" - echo - cat /var/lib/munin/.ssh/id_*.pub -} - -pkg_postinst() { - tmpfiles_process ${CATEGORY}:${PN}:${SLOT}.conf - - elog "Please follow the munin documentation to set up the plugins you" - elog "need, afterwards start munin-node." - elog "" - elog "To make use of munin-async, make sure to set up the corresponding" - elog "SSH key in /var/lib/munin-async/.ssh/authorized_keys" - elog "" - if ! use minimal; then - elog "Please run" - elog " emerge --config net-analyzer/munin" - elog "to automatically configure munin's cronjobs as well as generate" - elog "passwordless SSH keys to be used with munin-async." - fi - elog "" - elog "Further information about setting up Munin in Gentoo can be found" - elog "in the Gentoo Wiki: https://wiki.gentoo.org/wiki/Munin" - - if use cgi; then - chown $(usex apache2 apache munin) \ - "${ROOT}"/var/log/munin/munin-cgi-{graph,html}.log - - if use apache2; then - elog "To use Munin with CGI you should include /etc/apache2/vhosts.d/munin.include" - elog "or /etc/apache2/vhosts.d/munin-2.4.include (for Apache 2.4) from the virtual" - elog "host you want it to be served." - elog "If you want to enable CGI-based HTML as well, you have to add to" - elog "/etc/conf.d/apache2 the option -D MUNIN_HTML_CGI." - else - elog "Effective CGI support has just been added in 2.0.7-r6." - elog "Documentation on how to use it is still sparse." - fi - fi - - # we create this here as we don't want Portage to check /run - # symlinks but we still need this to be present before the reboot. - if ! use minimal && ! [[ -d "${ROOT}"/run/munin ]]; then - mkdir "${ROOT}"/run/munin - chown munin:munin "${ROOT}"/run/munin - chmod 0700 "${ROOT}"/run/munin - fi -} diff --git a/net-analyzer/munin/munin-2.0.75.ebuild b/net-analyzer/munin/munin-2.0.75.ebuild index 5163d71d6fe0..3506945a8431 100644 --- a/net-analyzer/munin/munin-2.0.75.ebuild +++ b/net-analyzer/munin/munin-2.0.75.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -17,7 +17,7 @@ SRC_URI=" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86" +KEYWORDS="amd64 arm arm64 ppc ~ppc64 x86" IUSE="asterisk irc java ldap memcached minimal mysql postgres selinux ssl test cgi ipv6 syslog ipmi http dhcpd doc apache2" REQUIRED_USE="cgi? ( !minimal ) apache2? ( cgi )" RESTRICT="!test? ( test )" diff --git a/net-analyzer/munin/munin-2.0.74.ebuild b/net-analyzer/munin/munin-2.0.76-r1.ebuild index d81f16efcec8..b2482152f99b 100644 --- a/net-analyzer/munin/munin-2.0.74.ebuild +++ b/net-analyzer/munin/munin-2.0.76-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -32,7 +32,6 @@ DEPEND_COM=" acct-group/munin dev-lang/perl:=[berkdb] dev-perl/DBI - dev-perl/Date-Manip dev-perl/File-Copy-Recursive dev-perl/List-MoreUtils dev-perl/Log-Log4perl @@ -148,6 +147,7 @@ src_configure() { LOGDIR=\$(DESTDIR)/var/log/munin PERLLIB=\$(DESTDIR)$(perl -V:vendorlib | cut -d"'" -f2) JCVALID=$(usex java yes no) + JFLAGS=-Xlint STATEDIR=\$(DESTDIR)/run/munin EOF } diff --git a/net-analyzer/munin/munin-2.0.73-r4.ebuild b/net-analyzer/munin/munin-2.0.76.ebuild index de992a88997d..947141fc714a 100644 --- a/net-analyzer/munin/munin-2.0.73-r4.ebuild +++ b/net-analyzer/munin/munin-2.0.76.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -17,7 +17,7 @@ SRC_URI=" LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 arm arm64 ppc ~ppc64 x86" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86" IUSE="asterisk irc java ldap memcached minimal mysql postgres selinux ssl test cgi ipv6 syslog ipmi http dhcpd doc apache2" REQUIRED_USE="cgi? ( !minimal ) apache2? ( cgi )" RESTRICT="!test? ( test )" @@ -32,7 +32,6 @@ DEPEND_COM=" acct-group/munin dev-lang/perl:=[berkdb] dev-perl/DBI - dev-perl/Date-Manip dev-perl/File-Copy-Recursive dev-perl/List-MoreUtils dev-perl/Log-Log4perl diff --git a/net-analyzer/nagios-check_multiple/nagios-check_multiple-0.0.1-r2.ebuild b/net-analyzer/nagios-check_multiple/nagios-check_multiple-0.0.1-r3.ebuild index d5e64ac02fa8..8444b98c88c4 100644 --- a/net-analyzer/nagios-check_multiple/nagios-check_multiple-0.0.1-r2.ebuild +++ b/net-analyzer/nagios-check_multiple/nagios-check_multiple-0.0.1-r3.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=( python{3_9,3_10,3_11} ) +PYTHON_COMPAT=( python{3_10,3_11,3_12} ) DISTUTILS_USE_PEP517=setuptools inherit distutils-r1 diff --git a/net-analyzer/nagios-check_mysql_health/nagios-check_mysql_health-2.2.2.ebuild b/net-analyzer/nagios-check_mysql_health/nagios-check_mysql_health-2.2.2-r1.ebuild index 94445a4c903e..666eecff017a 100644 --- a/net-analyzer/nagios-check_mysql_health/nagios-check_mysql_health-2.2.2.ebuild +++ b/net-analyzer/nagios-check_mysql_health/nagios-check_mysql_health-2.2.2-r1.ebuild @@ -1,30 +1,30 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 MY_PN="${PN#nagios-}" MY_P="${MY_PN}-${PV}" -DESCRIPTION="A nagios plugin for checking MySQL server health" +DESCRIPTION="Nagios plugin for checking MySQL server health" HOMEPAGE="https://labs.consol.de/nagios/check_mysql_health/" SRC_URI="https://labs.consol.de/assets/downloads/nagios/${MY_P}.tar.gz" +S="${WORKDIR}/${MY_P}" LICENSE="BSD" SLOT="0" KEYWORDS="amd64 x86" -IUSE="" # Found by grepping for "use " in the built # plugins-scripts/check_mysql_health. -RDEPEND="dev-perl/DBD-mysql +RDEPEND=" + dev-perl/DBD-mysql dev-perl/DBI virtual/perl-Data-Dumper virtual/perl-File-Temp virtual/perl-Net-Ping - virtual/perl-Time-HiRes" - -S="${WORKDIR}/${MY_P}" + virtual/perl-Time-HiRes + " src_configure() { # Should match net-analyzer/{monitoring,nagios}-plugins. diff --git a/net-analyzer/nagios-core/Manifest b/net-analyzer/nagios-core/Manifest index 14f94979bf22..6a4ac48da0dc 100644 --- a/net-analyzer/nagios-core/Manifest +++ b/net-analyzer/nagios-core/Manifest @@ -1,2 +1,3 @@ DIST nagios-4.4.14.tar.gz 11341108 BLAKE2B 254b17fdd90670701d42f4bc90c741592bc21f0813903e5cdcaa671c9b4b7eb32964ae56acf56567198bb8b6d96ce7539bf343b870a4732a46d31557d161a1c1 SHA512 dd7ddaf114ac6451b5f157f36bdba27068e94dcfe583cc217f220162b013341984622828574feda8c3c0990388a03ab886791a3188e56bf2eb6b3f8c777c3641 +DIST nagios-4.5.1.tar.gz 11540195 BLAKE2B 8fa4654a2e7f218d65c8a318418002f09b0e118f44382030900587881d9fac868e8b4416be8e9fb2ae74444aecb9555719ef29bc88fd95067d84aecca4bacf28 SHA512 71b57d4e0bd2971e8e62b7013c406888d0afd40bc23b032ee9bfdb6e2b3cb083746c5259ef997df241249d2ddaafd6ba5a6470527feddf02e03da32cc0c724b9 DIST nagios-core-gentoo-icons-20141125.tar 40960 BLAKE2B 31c1953e1160c7c7b89606b72b1a80407e4c1b7a7938b40bd1c577cd0c309dd88ca6b775d692a9b846dbf67736537fa9c91e56aa15fdd447769608ca525bff09 SHA512 bf109879cddd6136b76baba55d0b60b2596e37431dcf5ce0905d34a9fa292ebf7e4bde82d9a084362c486e8fac344c76d88f9298b1b85541ed70ffd608493766 diff --git a/net-analyzer/nagios-core/files/nagios-core-4.5.1-musl.patch b/net-analyzer/nagios-core/files/nagios-core-4.5.1-musl.patch new file mode 100644 index 000000000000..eda71db9bcd4 --- /dev/null +++ b/net-analyzer/nagios-core/files/nagios-core-4.5.1-musl.patch @@ -0,0 +1,98 @@ +From 19602faf7111203b748a4dc9ccaf3111586a8e96 Mon Sep 17 00:00:00 2001 +From: Sebastian Wolf <swolf@nagios.com> +Date: Fri, 29 Mar 2024 17:01:52 -0400 +Subject: [PATCH 1/2] Fix #952 - s/uint/unsigned int/g + +--- + Changelog | 4 ++++ + lib/t-utils.c | 10 +++++----- + lib/test-dkhash.c | 2 +- + 3 files changed, 10 insertions(+), 6 deletions(-) + +diff --git a/Changelog b/Changelog +index ec3cd64fc..fcf4742f2 100644 +--- a/Changelog ++++ b/Changelog +@@ -2,6 +2,10 @@ + Nagios Core 4 Change Log + ######################## + ++4.5.2 - 2024-04-30 ++------------------ ++* Fix build when compiling against musl libc (#952) (Sebastian Wolf) ++ + 4.5.1 - 2024-02-28 + ------------------- + * Fix text rendering in Configuration -> Command Expansion when the command ends in whitespace (Thanks Joran LEREEC for reporting this issue) (Dylan Anderson) +diff --git a/lib/t-utils.c b/lib/t-utils.c +index badab7c03..123f114c8 100644 +--- a/lib/t-utils.c ++++ b/lib/t-utils.c +@@ -1,8 +1,8 @@ + #include "t-utils.h" + + const char *cyan = "", *red = "", *green = "", *yellow = "", *reset = ""; +-uint passed, failed, t_verbose = 0; +-static uint t_depth; ++unsigned int passed, failed, t_verbose = 0; ++static unsigned int t_depth; + static const char *indent_str = " "; + + /* can't be used when a or b has side-effects, but we don't care here */ +@@ -27,9 +27,9 @@ void t_set_colors(int force) + } + } + +-static void t_indent(uint depth) ++static void t_indent(unsigned int depth) + { +- uint i; ++ unsigned int i; + for (i = 0; i < depth; i++) { + printf("%s", indent_str); + } +@@ -136,7 +136,7 @@ int ok_int(int a, int b, const char *name) + return TEST_FAIL; + } + +-int ok_uint(uint a, uint b, const char *name) ++int ok_unsigned int(unsigned int a, unsigned int b, const char *name) + { + if (a == b) { + t_pass("%s", name); +diff --git a/lib/test-dkhash.c b/lib/test-dkhash.c +index 6db1d7a92..15c2b676c 100644 +--- a/lib/test-dkhash.c ++++ b/lib/test-dkhash.c +@@ -68,7 +68,7 @@ static struct test_data *ddup(int x, int i, int j) + } + + struct dkhash_check { +- uint entries, count, max, added, removed; ++ unsigned int entries, count, max, added, removed; + int ent_delta, addrm_delta; + }; + + +From c4f56318e6ecfab85d592ea302d747c80be5f557 Mon Sep 17 00:00:00 2001 +From: Sebastian Wolf <swolf@nagios.com> +Date: Fri, 29 Mar 2024 17:04:29 -0400 +Subject: [PATCH 2/2] derp + +--- + lib/t-utils.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/lib/t-utils.c b/lib/t-utils.c +index 123f114c8..24098655f 100644 +--- a/lib/t-utils.c ++++ b/lib/t-utils.c +@@ -136,7 +136,7 @@ int ok_int(int a, int b, const char *name) + return TEST_FAIL; + } + +-int ok_unsigned int(unsigned int a, unsigned int b, const char *name) ++int ok_uint(unsigned int a, unsigned int b, const char *name) + { + if (a == b) { + t_pass("%s", name); diff --git a/net-analyzer/nagios-core/nagios-core-4.4.14.ebuild b/net-analyzer/nagios-core/nagios-core-4.4.14.ebuild index 14dbc007802e..fe6f6dd27afe 100644 --- a/net-analyzer/nagios-core/nagios-core-4.4.14.ebuild +++ b/net-analyzer/nagios-core/nagios-core-4.4.14.ebuild @@ -12,7 +12,7 @@ HOMEPAGE="https://www.nagios.org/" # The name of the directory into which our Gentoo icons will be # extracted, and also the basename of the archive containing it. GENTOO_ICONS="${PN}-gentoo-icons-20141125" -SRC_URI="mirror://sourceforge/nagios/${MY_P}.tar.gz +SRC_URI="https://downloads.sourceforge.net/nagios/${MY_P}.tar.gz web? ( https://dev.gentoo.org/~mjo/distfiles/${GENTOO_ICONS}.tar )" LICENSE="GPL-2" diff --git a/net-analyzer/nagios-core/nagios-core-4.5.1.ebuild b/net-analyzer/nagios-core/nagios-core-4.5.1.ebuild new file mode 100644 index 000000000000..8350b6e27910 --- /dev/null +++ b/net-analyzer/nagios-core/nagios-core-4.5.1.ebuild @@ -0,0 +1,268 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit systemd toolchain-funcs + +MY_P="${PN/-core}-${PV}" +DESCRIPTION="Nagios core - monitoring daemon, web GUI, and documentation" +HOMEPAGE="https://www.nagios.org/" + +# The name of the directory into which our Gentoo icons will be +# extracted, and also the basename of the archive containing it. +GENTOO_ICONS="${PN}-gentoo-icons-20141125" +SRC_URI="https://downloads.sourceforge.net/nagios/${MY_P}.tar.gz + web? ( https://dev.gentoo.org/~mjo/distfiles/${GENTOO_ICONS}.tar )" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86" +IUSE="apache2 classicui lighttpd +web vim-syntax" + +# In pkg_postinst(), we change the group of the Nagios configuration +# directory to that of the web server user. It can't belong to both +# apache/lighttpd groups at the same time, so we block this combination +# for our own sanity. +# +# This could be made to work, but we would need a better way to allow +# the web user read-only access to Nagios's configuration directory. +# +REQUIRED_USE="apache2? ( !lighttpd )" + +# +# Note, we require one of the apache2 CGI modules: +# +# * mod_cgi (USE=apache2_modules_cgi) +# * mod_cgid (USE=apache2_modules_cgid) +# * mod_fcgid (www-apache/mod_fcgid) +# +# We just don't care /which/ one. And of course PHP supports both CGI +# (USE=cgi) and FastCGI (USE=fpm). We're pretty lenient with the +# dependencies, and expect the user not to do anything /too/ +# stupid. (For example, installing Apache with only FastCGI support, and +# PHP with only CGI support.) +# +# Another annoyance is that the upstream Makefile uses app-arch/unzip to +# extract a snapshot of AngularJS, but that's only needed when USE=web. +# +MOD_ALIAS=apache2_modules_alias + +# The dependencies checked by the configure script. All of these are +# also runtime dependencies; that's why ./configure checks for them. +CONFIGURE_DEPEND="acct-group/nagios + acct-user/nagios + virtual/mailx + dev-lang/perl:=" + +# In addition to the things that the ./configure script checks for, +# we also need to be able to unzip stuff on the build host. +# +# We need the apache/lighttpd groups in src_install() for the things +# installed as the --with-command-group argument, so they go here too. +# The groups are also needed at runtime, but that is ensured by apache +# and lighttpd themselves being in RDEPEND. +BDEPEND="${CONFIGURE_DEPEND} + apache2? ( acct-group/apache ) + lighttpd? ( acct-group/lighttpd ) + web? ( app-arch/unzip )" + +# This is linked into /usr/bin/nagios{,tats} +DEPEND="dev-libs/libltdl:0" + +RDEPEND="${CONFIGURE_DEPEND} + ${DEPEND} + web? ( + media-libs/gd[jpeg,png] + lighttpd? ( www-servers/lighttpd[php] ) + apache2? ( + || ( + www-servers/apache[${MOD_ALIAS},apache2_modules_cgi] + www-servers/apache[${MOD_ALIAS},apache2_modules_cgid] + ( www-servers/apache[${MOD_ALIAS}] www-apache/mod_fcgid ) ) + || ( + dev-lang/php:*[apache2] + dev-lang/php:*[cgi] + dev-lang/php:*[fpm] ) + ) + ) + vim-syntax? ( app-vim/nagios-syntax )" + +S="${WORKDIR}/${MY_P}" + +PATCHES=( "${FILESDIR}/${P}-musl.patch" ) + +src_configure() { + local myconf + + if use !apache2 && use !lighttpd ; then + myconf="${myconf} --with-command-group=nagios" + else + if use apache2 ; then + myconf="${myconf} --with-command-group=apache" + myconf="${myconf} --with-httpd-conf=/etc/apache2/conf.d" + elif use lighttpd ; then + myconf="${myconf} --with-command-group=lighttpd" + fi + fi + + # We pass "unknown" as the init type because we don't want it to + # guess. Later on, we'll manually install both OpenRC and systemd + # services. + econf ${myconf} \ + --prefix="${EPREFIX}/usr" \ + --bindir="${EPREFIX}/usr/sbin" \ + --localstatedir="${EPREFIX}/var/lib/nagios" \ + --sysconfdir="${EPREFIX}/etc/nagios" \ + --libexecdir="${EPREFIX}/usr/$(get_libdir)/nagios/plugins" \ + --with-cgibindir="${EPREFIX}/usr/$(get_libdir)/nagios/cgi-bin" \ + --with-webdir="${EPREFIX}/usr/share/nagios/htdocs" \ + --with-init-type="unknown" + + # The paths in the web server configuration files need to match + # those passed to econf above. + cp "${FILESDIR}/99_nagios4-r1.conf" \ + "${FILESDIR}/lighttpd_nagios4-r1.conf" \ + "${T}/" || die "failed to create copies of web server conf files" + + sed -e "s|@CGIBINDIR@|${EPREFIX}/usr/$(get_libdir)/nagios/cgi-bin|g" \ + -e "s|@WEBDIR@|${EPREFIX}/usr/share/nagios/htdocs|" \ + -i "${T}/99_nagios4-r1.conf" \ + -i "${T}/lighttpd_nagios4-r1.conf" \ + || die "failed to substitute paths into web server conf files" + +} + +src_compile() { + emake CC="$(tc-getCC)" nagios + + if use web; then + # Only compile the CGIs/HTML when USE=web is set. + emake CC="$(tc-getCC)" cgis html + fi +} + +src_install() { + dodoc Changelog CONTRIBUTING.md README.md THANKS UPGRADING + + # There is no way to install the CGIs unstripped from the top-level + # makefile, so descend into base/ here. The empty INSTALL_OPTS + # ensures that root:root: owns the nagios executables. + cd "${S}/base" || die + emake INSTALL_OPTS="" DESTDIR="${D}" install-unstripped + cd "${S}" || die + + # Otherwise this gets installed as 770 and you get "access denied" + # for some reason or other when starting nagios. The permissions + # on nagiostats are just for consistency (these should both get + # fixed upstream). + fperms 775 /usr/sbin/nagios /usr/sbin/nagiostats + + # INSTALL_OPTS are needed for most of install-basic, but we don't + # want them on the LIBEXECDIR, argh. + emake DESTDIR="${D}" install-basic + fowners root:root /usr/$(get_libdir)/nagios/plugins + + # Don't make the configuration owned by the nagios user, because + # then he can edit nagios.cfg and trick nagios into running as root + # and doing his bidding. + emake INSTALL_OPTS="" DESTDIR="${D}" install-config + + # No INSTALL_OPTS used in install-commandmode, thankfully. + emake DESTDIR="${D}" install-commandmode + + # The build system installs these directories, but portage assumes + # that the build system doesn't know what it's doing so we have to + # keepdir them, too. I guess you'll have to manually re-check the + # upstream build system forever to see if this is still necessary. + keepdir /var/lib/nagios{,/archives,/rw,/spool,/spool/checkresults} + + if use web; then + # There is no way to install the CGIs unstripped from the + # top-level makefile, so descend into cgi/ here. The empty + # INSTALL_OPTS ensures that root:root: owns the CGI executables. + cd "${S}/cgi" || die + emake INSTALL_OPTS="" DESTDIR="${D}" install-unstripped + cd "${S}" || die + + # install-html installs the new exfoliation theme + emake INSTALL_OPTS="" DESTDIR="${D}" install-html + + if use classicui; then + # This overwrites the already-installed exfoliation theme + emake INSTALL_OPTS="" DESTDIR="${D}" install-classicui + fi + + # Install cute Gentoo icons (bug #388323), setting their + # owner, group, and mode to match those of the rest of Nagios's + # images. + insinto /usr/share/nagios/htdocs/images/logos + doins "${WORKDIR}/${GENTOO_ICONS}"/*.* + fi + + # The ./configure script for nagios detects the init system on the + # build host, which is wrong for all sorts of reasons. We've gone + # to great lengths above to avoid running "install-init" -- even + # indirectly -- and so now we must install whatever service files + # we need by hand. + newinitd startup/openrc-init nagios + systemd_newunit startup/default-service nagios.service + + if use web ; then + if use apache2 ; then + # Install the Nagios configuration file for Apache. + insinto "/etc/apache2/modules.d" + newins "${T}/99_nagios4-r1.conf" "99_nagios4.conf" + elif use lighttpd ; then + # Install the Nagios configuration file for Lighttpd. + insinto /etc/lighttpd + newins "${T}/lighttpd_nagios4-r1.conf" nagios.conf + else + ewarn "${CATEGORY}/${PF} only supports apache or lighttpd" + ewarn "out of the box. Since you are not using one of them, you" + ewarn "will have to configure your webserver yourself." + fi + fi +} + +pkg_postinst() { + + if use web; then + if use apache2 || use lighttpd ; then + if use apache2; then + elog "To enable the Nagios web front-end, please edit" + elog "${ROOT}/etc/conf.d/apache2 and add \"-D NAGIOS -D PHP\"" + elog "to APACHE2_OPTS. Then Nagios will be available at," + elog + elif use lighttpd; then + elog "To enable the Nagios web front-end, please add" + elog "'include \"nagios.conf\"' to the lighttpd configuration" + elog "file at ${ROOT}/etc/lighttpd/lighttpd.conf. Then Nagios" + elog "will be available at," + elog + fi + + elog " http://localhost/nagios/" + fi + fi + + elog + elog "If your kernel has /proc protection, nagios" + elog "will not be happy as it relies on accessing the proc" + elog "filesystem. You can fix this by adding nagios into" + elog "the group wheel, but this is not recomended." + elog + + if [ -n "${REPLACING_VERSIONS}" ]; then + ewarn "The local state directory for nagios has changed in v4.4.5," + ewarn "from ${EROOT}/var/nagios to ${EROOT}/var/lib/nagios. If you" + ewarn "wish to migrate your state to the new location, first stop" + ewarn "nagios and then run" + ewarn "" + ewarn " diff --recursive --brief ${EROOT}/var/nagios ${EROOT}/var/lib/nagios" + ewarn "" + ewarn "to identify any files that should be moved to the new" + ewarn "location. They can simply be moved with \"mv\" before" + ewarn "restarting nagios." + fi +} diff --git a/net-analyzer/nagios-icinga-openvpn/nagios-icinga-openvpn-0.0.1-r3.ebuild b/net-analyzer/nagios-icinga-openvpn/nagios-icinga-openvpn-0.0.1-r4.ebuild index 0dc7a05fc33c..f2cd71d9e794 100644 --- a/net-analyzer/nagios-icinga-openvpn/nagios-icinga-openvpn-0.0.1-r3.ebuild +++ b/net-analyzer/nagios-icinga-openvpn/nagios-icinga-openvpn-0.0.1-r4.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 python3_10 python3_11 ) +PYTHON_COMPAT=( python3_10 python3_11 python3_12 ) DISTUTILS_USE_PEP517=setuptools inherit distutils-r1 @@ -15,7 +15,6 @@ SRC_URI="https://github.com/liquidat/nagios-icinga-openvpn/archive/${PV}.tar.gz LICENSE="MIT" SLOT="0" KEYWORDS="amd64" -IUSE="" src_install() { distutils-r1_src_install diff --git a/net-analyzer/nagios-plugins-linux-madrisan/Manifest b/net-analyzer/nagios-plugins-linux-madrisan/Manifest index c5a6cee5a49f..b3b7c1490f2a 100644 --- a/net-analyzer/nagios-plugins-linux-madrisan/Manifest +++ b/net-analyzer/nagios-plugins-linux-madrisan/Manifest @@ -1,2 +1,3 @@ DIST nagios-plugins-linux-madrisan-31.tar.xz 401556 BLAKE2B 5eca1e96f14b518d9ab5304bb2a54ba47f194bf22cea8445d7fef0769c3b14c800e4ed24c5c0ca32f0daf53aa81a0bd52234478c606a8d2d1a12e96abb90179c SHA512 34d8ae400766e9c7ddd246998f004a50c87ec9ad8dc13deb8e31fc6fcfa07fbe5af2f091d0523b93d06b26438d1a25240bd82d60946e5897bc257fff7c1b73d0 DIST nagios-plugins-linux-madrisan-32.tar.xz 402976 BLAKE2B ef66934315f3ddbee1a2d84723477773549c9a5ed731853780ef15b9f44ea462256f730f854d517415dce2b944a4bf0abcbfa0623a7a1faffef4b5bbf162af76 SHA512 42392c123961bb17192344f20973a3d26c74aeef112638384d5b7a687e7117a3378d6efdb07ad15a7309f5db621404602e9c2beb0dcc4e207924d0d3a466ab59 +DIST nagios-plugins-linux-madrisan-33.tar.xz 397516 BLAKE2B 39e428d7b44104e01f8101ec33d250b8317c2ab9a5772bd815baf91c14eb1aeffc2aaaec1696e338d9aa31ebd9cb67d10a2049bc78a1bd8fea813761def36d26 SHA512 9b0df712d799ea5ae1eca8135089e41f167446e40416dbfe090ec855476318b26d8fdc3865470bf6cf54e7dcbce483d1f577a886ef35023e983e2508a307df70 diff --git a/net-analyzer/nagios-plugins-linux-madrisan/files/nagios-plugins-linux-madrisan-32-x86-fixes.patch b/net-analyzer/nagios-plugins-linux-madrisan/files/nagios-plugins-linux-madrisan-32-x86-fixes.patch new file mode 100644 index 000000000000..657cd458f06e --- /dev/null +++ b/net-analyzer/nagios-plugins-linux-madrisan/files/nagios-plugins-linux-madrisan-32-x86-fixes.patch @@ -0,0 +1,148 @@ +https://github.com/madrisan/nagios-plugins-linux/pull/146 + +From d09bfd1b3974743af4b719629f59b5b96e1393a1 Mon Sep 17 00:00:00 2001 +From: Davide Madrisan <d.madrisan@proton.me> +Date: Wed, 27 Mar 2024 09:29:59 +0100 +Subject: [PATCH 1/3] fix: size_t variables on 32 and 64 bits arch have + different type + +Fix the following warning on 32-bits architectures: + + In file included from ../lib/container_docker_count.c:44, + from tslibcontainer_docker_count.c:33: + ../lib/container_docker_count.c: In function 'docker_running_containers': + ../include/logging.h:28:44: warning: format '%lu' expects argument of type 'long unsigned int', + but argument 3 has type 'size_t' {aka 'unsigned int'} [-Wformat=] + 28 | # define dbg(format, ...) fprintf (stdout, "DEBUG: " format, ##__VA_ARGS__) + | ^~~~~~~~~ + ../lib/container_docker_count.c:213:3: note: in expansion of macro 'dbg' + 213 | dbg ("%lu bytes retrieved\n", chunk.size); + | ^~~ + +Signed-off-by: Davide Madrisan <d.madrisan@proton.me> +--- a/lib/container_docker_count.c ++++ b/lib/container_docker_count.c +@@ -1,7 +1,7 @@ + // SPDX-License-Identifier: GPL-3.0-or-later + /* + * License: GPLv3+ +- * Copyright (c) 2018 Davide Madrisan <davide.madrisan@gmail.com> ++ * Copyright (c) 2018,2024 Davide Madrisan <davide.madrisan@gmail.com> + * + * A library for checking for Docker exposed metrics. + * +@@ -210,7 +210,7 @@ docker_running_containers (unsigned int *count, const char *image, + #endif /* NPL_TESTING */ + + assert (chunk.memory); +- dbg ("%lu bytes retrieved\n", chunk.size); ++ dbg ("%zu bytes retrieved\n", chunk.size); + dbg ("json data: %s", chunk.memory); + + hashtable = docker_json_parser (chunk.memory, "Image", 1); + +From 4574e9ed77ebda062279622bb3d8678fa983d272 Mon Sep 17 00:00:00 2001 +From: Davide Madrisan <d.madrisan@proton.me> +Date: Wed, 27 Mar 2024 17:36:04 +0100 +Subject: [PATCH 2/3] fix: workaround for a round issue on 32 bits + +On Gentoo Base System release 2.14 for 32-bits + + (unsigned long)(6.26*100) = 625 + +So the test fails. +As a workaround modify the data file used by the test. + +Signed-off-by: Davide Madrisan <d.madrisan@proton.me> +--- a/tests/ts_procpressurecpu.data ++++ b/tests/ts_procpressurecpu.data +@@ -1 +1 @@ +-some avg10=7.48 avg60=6.26 avg300=6.66 total=200932088 ++some avg10=7.48 avg60=6.25 avg300=6.66 total=200932088 +--- a/tests/tslibpressure.c ++++ b/tests/tslibpressure.c +@@ -103,7 +103,7 @@ mymain (void) + /* we multiply by 100 the averages to somewhat transform + * the double values into integer ones */ + DO_TEST ("cpu some avg10", psi_oneline->avg10 * 100, 748ULL); +- DO_TEST ("cpu some avg60", psi_oneline->avg60 * 100, 626ULL); ++ DO_TEST ("cpu some avg60", psi_oneline->avg60 * 100, 625ULL); + DO_TEST ("cpu some avg300", psi_oneline->avg300 * 100, 666ULL); + DO_TEST ("cpu single total", psi_oneline->total, 200932088ULL); + + +From c90afc02705fd6c32a6764741616b4e17688117b Mon Sep 17 00:00:00 2001 +From: Davide Madrisan <d.madrisan@proton.me> +Date: Wed, 27 Mar 2024 21:06:25 +0100 +Subject: [PATCH 3/3] fix: fix test tslibxstrton_sizetollint on 32-bit arch + +Fix the following errors: + + 1) check function sizetollint with arg 1024b ... OK + 2) check function sizetollint with arg 8k ... OK + 3) check function sizetollint with arg 50m ... OK + 4) check function sizetollint with arg 2g ... OK + 5) check function sizetollint with arg 3t ... FAILED + 6) check function sizetollint with arg 2p ... FAILED + 7) check function sizetollint with arg 1024B ... OK + 8) check function sizetollint with arg 8K ... OK + 9) check function sizetollint with arg 50M ... OK + 10) check function sizetollint with arg 2G ... OK + 11) check function sizetollint with arg 3T ... FAILED + 12) check function sizetollint with arg 2P ... FAILED + +The long int is not large enough on 32-bit architectures. + +Signed-off-by: Davide Madrisan <d.madrisan@proton.me> +--- a/tests/tslibxstrton_sizetoint64.c ++++ b/tests/tslibxstrton_sizetoint64.c +@@ -1,7 +1,7 @@ + // SPDX-License-Identifier: GPL-3.0-or-later + /* + * License: GPLv3+ +- * Copyright (c) 2022 Davide Madrisan <davide.madrisan@gmail.com> ++ * Copyright (c) 2022,2024 Davide Madrisan <davide.madrisan@gmail.com> + * + * Unit test for lib/xstrton.c + * +@@ -29,11 +29,11 @@ + typedef struct test_data + { + char *size; +- int64_t expect_value; ++ long long int expect_value; + } test_data; + + static int +-test_sizetoint64 (const void *tdata) ++test_sizetollint (const void *tdata) + { + const struct test_data *data = tdata; + long long int result; +@@ -57,19 +57,19 @@ mymain (void) + .size = SIZE, \ + .expect_value = EXPECT_VALUE, \ + }; \ +- if (test_run("check function sizetoint64 with arg " SIZE, \ +- test_sizetoint64, (&data)) < 0) \ ++ if (test_run("check function sizetollint with arg " SIZE, \ ++ test_sizetollint, (&data)) < 0) \ + ret = -1; \ + } \ + while (0) + + /* test the function sizetoint64() */ + +-#define ONE_KILOBYTE 1000UL +-#define ONE_MEGABYTE (1000UL * ONE_KILOBYTE) +-#define ONE_GIGABYTE (1000UL * ONE_MEGABYTE) +-#define ONE_TERABYTE (1000UL * ONE_GIGABYTE) +-#define ONE_PETABYTE (1000UL * ONE_TERABYTE) ++#define ONE_KILOBYTE 1000ULL ++#define ONE_MEGABYTE (1000ULL * ONE_KILOBYTE) ++#define ONE_GIGABYTE (1000ULL * ONE_MEGABYTE) ++#define ONE_TERABYTE (1000ULL * ONE_GIGABYTE) ++#define ONE_PETABYTE (1000ULL * ONE_TERABYTE) + + DO_TEST ("1024b", 1024); + DO_TEST ("8k", 8 * ONE_KILOBYTE); diff --git a/net-analyzer/nagios-plugins-linux-madrisan/metadata.xml b/net-analyzer/nagios-plugins-linux-madrisan/metadata.xml index c214125e5675..e1a109026d7c 100644 --- a/net-analyzer/nagios-plugins-linux-madrisan/metadata.xml +++ b/net-analyzer/nagios-plugins-linux-madrisan/metadata.xml @@ -6,7 +6,7 @@ <name>Louis Sautier</name> </maintainer> <use> - <flag name="curl">Build check_docker which requires <pkg>net-misc/curl</pkg></flag> + <flag name="curl">Build check_container which requires <pkg>net-misc/curl</pkg></flag> <flag name="varlink">Build check_podman which requires <pkg>dev-libs/libvarlink</pkg></flag> </use> <upstream> diff --git a/net-analyzer/nagios-plugins-linux-madrisan/nagios-plugins-linux-madrisan-32.ebuild b/net-analyzer/nagios-plugins-linux-madrisan/nagios-plugins-linux-madrisan-32-r1.ebuild index ef628d4e230c..bcd369b7e003 100644 --- a/net-analyzer/nagios-plugins-linux-madrisan/nagios-plugins-linux-madrisan-32.ebuild +++ b/net-analyzer/nagios-plugins-linux-madrisan/nagios-plugins-linux-madrisan-32-r1.ebuild @@ -27,6 +27,7 @@ RDEPEND="${DEPEND}" PATCHES=( "${FILESDIR}/${P}-rename-with-systemd.patch" + "${FILESDIR}/${P}-x86-fixes.patch" ) src_prepare() { diff --git a/net-analyzer/nagios-plugins-linux-madrisan/nagios-plugins-linux-madrisan-33.ebuild b/net-analyzer/nagios-plugins-linux-madrisan/nagios-plugins-linux-madrisan-33.ebuild new file mode 100644 index 000000000000..4cb8f2a417f3 --- /dev/null +++ b/net-analyzer/nagios-plugins-linux-madrisan/nagios-plugins-linux-madrisan-33.ebuild @@ -0,0 +1,48 @@ +# Copyright 2022-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools + +MY_PN="nagios-plugins-linux" +MY_P="${MY_PN}-${PV}" + +DESCRIPTION="Additional and alternative Nagios plugins for Linux" +HOMEPAGE="https://github.com/madrisan/nagios-plugins-linux" +SRC_URI="https://github.com/madrisan/${MY_PN}/releases/download/v${PV}/${MY_P}.tar.xz -> ${P}.tar.xz" +S="${WORKDIR}/${MY_P}" + +LICENSE="GPL-3+" +SLOT="0" +KEYWORDS="~amd64 ~arm64 ~x86" +IUSE="curl systemd" + +DEPEND=" + curl? ( net-misc/curl:0= ) + systemd? ( sys-apps/systemd:= ) +" +RDEPEND="${DEPEND}" + +src_prepare() { + default + # Avoid collision with net-analyzer/monitoring-plugins + # and net-analyzer/nagios-plugins + sed -ri "s/check_(load|swap|uptime|users)/&_madrisan/" plugins/Makefile.am || die + eautoreconf +} + +src_configure() { + local myconf=( + --libexecdir="${EPREFIX}/usr/$(get_libdir)/nagios/plugins" + # Most options are already defaults for Gentoo + --disable-hardening + $(use_enable curl libcurl) + $(use_enable systemd) + ) + econf "${myconf[@]}" +} + +src_test() { + emake check VERBOSE=1 +} diff --git a/net-analyzer/nagios/nagios-4.5.1.ebuild b/net-analyzer/nagios/nagios-4.5.1.ebuild new file mode 100644 index 000000000000..371d0ad43626 --- /dev/null +++ b/net-analyzer/nagios/nagios-4.5.1.ebuild @@ -0,0 +1,14 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DESCRIPTION="The Nagios metapackage" +HOMEPAGE="https://www.nagios.org/" + +LICENSE="metapackage" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86" + +RDEPEND="~net-analyzer/nagios-core-${PV} + || ( net-analyzer/nagios-plugins net-analyzer/monitoring-plugins )" diff --git a/net-analyzer/nagstamon/nagstamon-3.14.0-r1.ebuild b/net-analyzer/nagstamon/nagstamon-3.14.0-r1.ebuild new file mode 100644 index 000000000000..327379d4b63c --- /dev/null +++ b/net-analyzer/nagstamon/nagstamon-3.14.0-r1.ebuild @@ -0,0 +1,72 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..12} ) +DISTUTILS_USE_PEP517=setuptools + +inherit desktop distutils-r1 virtualx + +distutils_enable_tests pytest + +MY_PN="Nagstamon" +MY_P="${MY_PN}-${PV/_p/-}" + +DESCRIPTION="systray monitor for displaying realtime status of several monitoring systems" +HOMEPAGE="https://nagstamon.de" +SRC_URI="https://github.com/HenriWahl/Nagstamon/archive/v${PV}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/${MY_P}" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64" +IUSE="qt6 test" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +RDEPEND="${PYTHON_DEPS} + dev-python/lxml[${PYTHON_USEDEP}] + qt6? ( dev-python/PyQt6[gui,multimedia,svg,widgets,${PYTHON_USEDEP}] ) + !qt6? ( dev-python/PyQt5[gui,multimedia,svg,widgets,${PYTHON_USEDEP}] ) + dev-python/PySocks[${PYTHON_USEDEP}] + dev-python/beautifulsoup4[${PYTHON_USEDEP}] + dev-python/dbus-python[${PYTHON_USEDEP}] + dev-python/keyring[${PYTHON_USEDEP}] + dev-python/requests[${PYTHON_USEDEP}] + dev-python/psutil[${PYTHON_USEDEP}] + dev-python/python-dateutil[${PYTHON_USEDEP}] + dev-python/cryptography[${PYTHON_USEDEP}] + dev-python/secretstorage[${PYTHON_USEDEP}] + >=dev-python/python-xlib-0.19[${PYTHON_USEDEP}] + dev-python/requests-kerberos[${PYTHON_USEDEP}]" +DEPEND="${RDEPEND} + dev-python/setuptools[${PYTHON_USEDEP}] + test? ( dev-python/pylint[${PYTHON_USEDEP}] )" + +PATCHES=( "${FILESDIR}/${PN}-3.14.0-setup.patch" ) + +src_prepare() { + default_src_prepare + + # pre-compressed already + rm Nagstamon/resources/nagstamon.1.gz || die + sed -e 's:\(nagstamon\.1\)\.gz:\1:' \ + -e '/share/ s:^:#:' \ + -i setup.py || die + + mv ${PN}.py ${PN} || die + + rm -rf "${S}/Nagstamon/thirdparty/Xlib/" || die +} + +python_test() { + virtx epytest +} + +distutils-r1_python_install_all() { + default + + doman Nagstamon/resources/nagstamon.1 + domenu Nagstamon/resources/nagstamon.desktop + doicon Nagstamon/resources/nagstamon.svg +} diff --git a/net-analyzer/nast/nast-0.2.0-r3.ebuild b/net-analyzer/nast/nast-0.2.0-r3.ebuild index 9be8146f5f8b..fa2602d1b025 100644 --- a/net-analyzer/nast/nast-0.2.0-r3.ebuild +++ b/net-analyzer/nast/nast-0.2.0-r3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -7,7 +7,7 @@ inherit autotools flag-o-matic DESCRIPTION="NAST - Network Analyzer Sniffer Tool" HOMEPAGE="https://sourceforge.net/projects/nast.berlios/" -SRC_URI="mirror://sourceforge/${PN}.berlios/${P}.tar.gz" +SRC_URI="https://downloads.sourceforge.net/${PN}.berlios/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" diff --git a/net-analyzer/ndoutils/files/secure-install-permissions.patch b/net-analyzer/ndoutils/files/secure-install-permissions.patch new file mode 100644 index 000000000000..a4c50ab6cedc --- /dev/null +++ b/net-analyzer/ndoutils/files/secure-install-permissions.patch @@ -0,0 +1,183 @@ +From 18ef12037f4a68772d6840cbaa08aa2da07d2891 Mon Sep 17 00:00:00 2001 +From: Michael Orlitzky <michael@orlitzky.com> +Date: Sat, 2 Mar 2024 19:30:54 -0500 +Subject: [PATCH 1/2] configure.ac: don't install binaries as + ndo2db_user:ndo2db_group + +In configure.ac we were adding two flags to INSTALL_OPTS that change +the owner:group of all installed files to ndo2db_user:ndo2db_group. +This is often a security vulnerability, since executables (we have a +few) are typically installed into everyone's PATH. If root ever +executes them, the ndo2db_user can take advantage of the situation to +run malicious code as root. + +Fortunately the change in ownership is not really needed. We simply +drop the INSTALL_OPTS, which are used for nothing else, allowing our +files to be installed as the user who is doing the installing. When +installing to one of the system PATHs, that will almost always be +root. +--- + Makefile.in | 9 ++++----- + configure.ac | 2 -- + docs/docbook/en-en/Makefile.in | 1 - + src/Makefile.in | 31 +++++++++++++++---------------- + 4 files changed, 19 insertions(+), 24 deletions(-) + +diff --git a/Makefile.in b/Makefile.in +index 58c9f0f..68774c2 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -37,7 +37,6 @@ INSTALL=@INSTALL@ + GREP=@GREP@ + EGREP=@EGREP@ + +-INSTALL_OPTS=@INSTALL_OPTS@ + OPSYS=@opsys@ + DIST=@dist_type@ + +@@ -98,10 +97,10 @@ install: + @echo "" + + install-config: +- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(CFGDIR) +- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(PIPEDIR) +- $(INSTALL) -m 644 $(INSTALL_OPTS) config/ndo2db.cfg-sample $(DESTDIR)$(CFGDIR) +- $(INSTALL) -m 644 $(INSTALL_OPTS) config/ndomod.cfg-sample $(DESTDIR)$(CFGDIR) ++ $(INSTALL) -m 775 -d $(DESTDIR)$(CFGDIR) ++ $(INSTALL) -m 775 -d $(DESTDIR)$(PIPEDIR) ++ $(INSTALL) -m 644 config/ndo2db.cfg-sample $(DESTDIR)$(CFGDIR) ++ $(INSTALL) -m 644 config/ndomod.cfg-sample $(DESTDIR)$(CFGDIR) + @echo "" + @echo "*** Config files installed ***" + @echo "" +diff --git a/configure.ac b/configure.ac +index 58b47a4..3279397 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -317,8 +317,6 @@ AC_ARG_WITH(ndo2db_user,AC_HELP_STRING([--with-ndo2db-user=<user>],[sets user na + AC_ARG_WITH(ndo2db_group,AC_HELP_STRING([--with-ndo2db-group=<group>],[sets group name to run NDO2DB]),ndo2db_group=$withval,ndo2db_group=nagios) + AC_SUBST(ndo2db_user) + AC_SUBST(ndo2db_group) +-INSTALL_OPTS="-o $ndo2db_user -g $ndo2db_group" +-AC_SUBST(INSTALL_OPTS) + + + dnl Does the user want to check for systemd? +diff --git a/docs/docbook/en-en/Makefile.in b/docs/docbook/en-en/Makefile.in +index d72b68c..29e1e1e 100644 +--- a/docs/docbook/en-en/Makefile.in ++++ b/docs/docbook/en-en/Makefile.in +@@ -13,7 +13,6 @@ BINDIR=@bindir@ + LIBEXECDIR=@libexecdir@
+ DATAROOTDIR=@datarootdir@
+ INSTALL=@INSTALL@
+-INSTALL_OPTS=@INSTALL_OPTS@
+
+
+ all:
+diff --git a/src/Makefile.in b/src/Makefile.in +index 532cc82..352a768 100644 +--- a/src/Makefile.in ++++ b/src/Makefile.in +@@ -26,7 +26,6 @@ exec_prefix=@exec_prefix@ + PIPEDIR=@localstatedir@ + BINDIR=@bindir@ + INSTALL=@INSTALL@ +-INSTALL_OPTS=@INSTALL_OPTS@ + + CC=@CC@ + +@@ -126,9 +125,9 @@ distclean: clean + devclean: distclean + + install: install-4x +- $(INSTALL) -m 774 $(INSTALL_OPTS) file2sock $(DESTDIR)$(BINDIR) +- $(INSTALL) -m 774 $(INSTALL_OPTS) log2ndo $(DESTDIR)$(BINDIR) +- $(INSTALL) -m 774 $(INSTALL_OPTS) sockdebug $(DESTDIR)$(BINDIR) ++ $(INSTALL) -m 774 file2sock $(DESTDIR)$(BINDIR) ++ $(INSTALL) -m 774 log2ndo $(DESTDIR)$(BINDIR) ++ $(INSTALL) -m 774 sockdebug $(DESTDIR)$(BINDIR) + @echo "" + @echo " Hint: NDOUtils Installation against Nagios v4.x" + @echo " completed." +@@ -147,20 +146,20 @@ install: install-4x + @echo "" + + install-2x: +- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(PIPEDIR) +- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(BINDIR) +- $(INSTALL) -m 755 $(INSTALL_OPTS) ndo2db-2x $(DESTDIR)$(BINDIR)/ndo2db +- $(INSTALL) -m 755 $(INSTALL_OPTS) ndomod-2x.o $(DESTDIR)$(BINDIR)/ndomod.o ++ $(INSTALL) -m 775 -d $(DESTDIR)$(PIPEDIR) ++ $(INSTALL) -m 775 -d $(DESTDIR)$(BINDIR) ++ $(INSTALL) -m 755 ndo2db-2x $(DESTDIR)$(BINDIR)/ndo2db ++ $(INSTALL) -m 755 ndomod-2x.o $(DESTDIR)$(BINDIR)/ndomod.o + + install-3x: +- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(PIPEDIR) +- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(BINDIR) +- $(INSTALL) -m 755 $(INSTALL_OPTS) ndo2db-3x $(DESTDIR)$(BINDIR)/ndo2db +- $(INSTALL) -m 755 $(INSTALL_OPTS) ndomod-3x.o $(DESTDIR)$(BINDIR)/ndomod.o ++ $(INSTALL) -m 775 -d $(DESTDIR)$(PIPEDIR) ++ $(INSTALL) -m 775 -d $(DESTDIR)$(BINDIR) ++ $(INSTALL) -m 755 ndo2db-3x $(DESTDIR)$(BINDIR)/ndo2db ++ $(INSTALL) -m 755 ndomod-3x.o $(DESTDIR)$(BINDIR)/ndomod.o + + install-4x: +- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(PIPEDIR) +- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(BINDIR) +- $(INSTALL) -m 755 $(INSTALL_OPTS) ndo2db-4x $(DESTDIR)$(BINDIR)/ndo2db +- $(INSTALL) -m 755 $(INSTALL_OPTS) ndomod-4x.o $(DESTDIR)$(BINDIR)/ndomod.o ++ $(INSTALL) -m 775 -d $(DESTDIR)$(PIPEDIR) ++ $(INSTALL) -m 775 -d $(DESTDIR)$(BINDIR) ++ $(INSTALL) -m 755 ndo2db-4x $(DESTDIR)$(BINDIR)/ndo2db ++ $(INSTALL) -m 755 ndomod-4x.o $(DESTDIR)$(BINDIR)/ndomod.o + +-- +2.43.0 + +From 69a80d6a9bf1196ffcfffa7f756633bb13a62b5f Mon Sep 17 00:00:00 2001 +From: Michael Orlitzky <michael@orlitzky.com> +Date: Sat, 2 Mar 2024 19:52:47 -0500 +Subject: [PATCH 2/2] src/Makefile.in: install all executables with mode 0755 + +Three executables -- file2sock, log2ndo, and sockdebug -- are +currently being installed group-writable but not +world-executable. This is in contrast with the other two executables, +ndo2db and ndomod.o, that are installed mode 0755. + +Having recently removed the INSTALL_OPTS that were altering the +owner:group of these files, there is no longer any security risk to +mode 0774. However, 0755 is more consistent with both the rest of our +executables, and with the typical permissions on /usr/bin that arise +from the (extremely common) umask of 0022. + +We change these three to 0755 for a little bit of extra peace of mind. + +changes. Lines starting # with '#' will be ignored, and an empty +message aborts the commit. # # Date: Sat Mar 2 19:52:47 2024 -0500 # +src/Makefile.in # +--- + src/Makefile.in | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/src/Makefile.in b/src/Makefile.in +index 352a768..e6a1816 100644 +--- a/src/Makefile.in ++++ b/src/Makefile.in +@@ -125,9 +125,9 @@ distclean: clean + devclean: distclean + + install: install-4x +- $(INSTALL) -m 774 file2sock $(DESTDIR)$(BINDIR) +- $(INSTALL) -m 774 log2ndo $(DESTDIR)$(BINDIR) +- $(INSTALL) -m 774 sockdebug $(DESTDIR)$(BINDIR) ++ $(INSTALL) -m 755 file2sock $(DESTDIR)$(BINDIR) ++ $(INSTALL) -m 755 log2ndo $(DESTDIR)$(BINDIR) ++ $(INSTALL) -m 755 sockdebug $(DESTDIR)$(BINDIR) + @echo "" + @echo " Hint: NDOUtils Installation against Nagios v4.x" + @echo " completed." +-- +2.43.0 + diff --git a/net-analyzer/ndoutils/ndoutils-2.1.3-r3.ebuild b/net-analyzer/ndoutils/ndoutils-2.1.3-r4.ebuild index 044cb36975f4..32d8d3bd8c57 100644 --- a/net-analyzer/ndoutils/ndoutils-2.1.3-r3.ebuild +++ b/net-analyzer/ndoutils/ndoutils-2.1.3-r4.ebuild @@ -1,12 +1,12 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -inherit systemd +inherit autotools systemd -DESCRIPTION="Nagios addon to store Nagios data in a MySQL database" -HOMEPAGE="https://www.nagios.org/" +DESCRIPTION="Nagios addon to store Nagios data in a database" +HOMEPAGE="https://github.com/NagiosEnterprises/ndoutils" SRC_URI="https://github.com/NagiosEnterprises/${PN}/archive/${P}.tar.gz" S="${WORKDIR}/${PN}-${P}" @@ -14,14 +14,17 @@ LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~ppc ~x86" -# We require the "nagios" user from net-analyzer/nagios-core at build -# time. DEPEND=" dev-db/mysql-connector-c dev-perl/DBD-mysql - dev-perl/DBI - >=net-analyzer/nagios-core-4.4.5" + dev-perl/DBI" + +# The default value of the --with-ndo2db-{user,group} flag is "nagios". +# For unrelated reasons, we actually patch out the build-time dependency +# on the user/group, but it should still be there at runtime. RDEPEND="${DEPEND} + acct-user/nagios + acct-group/nagios virtual/mysql" PATCHES=( @@ -29,8 +32,14 @@ PATCHES=( "${FILESDIR}"/ndoutils-2.0.0-asprintf.patch "${FILESDIR}"/sample-config-piddir.patch "${FILESDIR}"/openrc-init.patch + "${FILESDIR}"/secure-install-permissions.patch ) +src_prepare() { + default + eautoreconf +} + src_configure() { # The localstatedir is where our socket will be created by the # nagios daemon, so we put it in /var/lib/nagios where the "nagios" @@ -39,6 +48,9 @@ src_configure() { # And normally, we would use /run for the pid file, but the daemon # drops permissions before creating it, so the piddir also needs # to be writable by the nagios user. + # + # Oh, and the build fails without --enable-mysql, so don't try. + # econf --enable-mysql \ --localstatedir=/var/lib/nagios \ --sysconfdir=/etc/nagios \ diff --git a/net-analyzer/ndsad/ndsad-1.33-r2.ebuild b/net-analyzer/ndsad/ndsad-1.33-r2.ebuild index 2b5139cf5689..d60e8c6b7702 100644 --- a/net-analyzer/ndsad/ndsad-1.33-r2.ebuild +++ b/net-analyzer/ndsad/ndsad-1.33-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -6,7 +6,7 @@ inherit autotools DESCRIPTION="Cisco netflow probe from libpcap, ULOG, tee/divert sources" HOMEPAGE="https://sourceforge.net/projects/ndsad" -SRC_URI="mirror://sourceforge/ndsad/ndsad-${PV}.tgz" +SRC_URI="https://downloads.sourceforge.net/ndsad/ndsad-${PV}.tgz" LICENSE="GPL-2" SLOT="0" diff --git a/net-analyzer/nessus-agent-bin/Manifest b/net-analyzer/nessus-agent-bin/Manifest index f3734b298243..e876b1effa5c 100644 --- a/net-analyzer/nessus-agent-bin/Manifest +++ b/net-analyzer/nessus-agent-bin/Manifest @@ -1,2 +1,2 @@ -DIST NessusAgent-10.5.1-el8.aarch64.rpm 18803400 BLAKE2B e30b4a2a43924095fb705e1eff138f8ee01a1bcbdfd16dc02074f6e3846a2de4e14136d29b2cd243f5de303755f99f21b00645a4110a56e668d97be696fae076 SHA512 437d5eb3261cd3fb7b5ed8631628975bc3ef24434c63f3d4fd8b2ac95104e3323b0b0517d58594ea2b53eb3797e80fef27268e50b0009f0d63ba9837ec5d4402 -DIST NessusAgent-10.5.1-el8.x86_64.rpm 20253868 BLAKE2B 01bb1a16ae9c4245035e209fabb89f5f6b22f72260a6691fc3ebacf7671511cb73bede95dfa1d48ef38972806dca9a4cbe27e677edf6ec4b109b6a57e3c250d2 SHA512 4ce62683b40f2ec599216176839226012834654a632c3d164d27df6a0402bc08e6cbe208ebee61f135f8b17d7cebc835f5940513d1ba4c930b2de07ef7f1ce4e +DIST NessusAgent-10.6.4-el8.aarch64.rpm 18910392 BLAKE2B f98c83e7af30b5571cae3f206d9bf96c33b9b06d9d527b2f08cab553a3d91dab3021ab4868fd8e735bd52179842743076e3a6e675d91129d0883a699ad7a66ab SHA512 0fa9dbb27e67320d900872dc2f4067082944f654795a7aa5423a8d0bda72febade2088ef7f0b6b4c1b688e8d81b149f253ee9daa770eb20da248bc1a3bf8dfd1 +DIST NessusAgent-10.6.4-el8.x86_64.rpm 20398348 BLAKE2B 48da8404a08454d9258c8af739db966f317934e58603425f7586ee92b5368da06d99a946a48e3f7d12344baed1a61b34706fa1475608304616d53be6fc9e9bdd SHA512 9600457806817ebda602fe644afbeab5f44ad3e7c2ccd8cb600e8024b5c621b727568f9de3e9530d59b4417b01e0c6e8ea3b3dce0061a0f4756cba3c0cab766c diff --git a/net-analyzer/nessus-agent-bin/metadata.xml b/net-analyzer/nessus-agent-bin/metadata.xml index 8dbe725d1f4e..97eff4632a18 100644 --- a/net-analyzer/nessus-agent-bin/metadata.xml +++ b/net-analyzer/nessus-agent-bin/metadata.xml @@ -2,10 +2,6 @@ <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> - <email>marecki@gentoo.org</email> - <name>Marek Szuba</name> - </maintainer> - <maintainer type="person"> <email>zerochaos@gentoo.org</email> <name>Rick Farina</name> </maintainer> diff --git a/net-analyzer/nessus-agent-bin/nessus-agent-bin-10.5.1.ebuild b/net-analyzer/nessus-agent-bin/nessus-agent-bin-10.6.4.ebuild index fcc153bf0cb4..fcc153bf0cb4 100644 --- a/net-analyzer/nessus-agent-bin/nessus-agent-bin-10.5.1.ebuild +++ b/net-analyzer/nessus-agent-bin/nessus-agent-bin-10.6.4.ebuild diff --git a/net-analyzer/nessus-bin/Manifest b/net-analyzer/nessus-bin/Manifest index 6c22c2ec54ae..1b66b08add5b 100644 --- a/net-analyzer/nessus-bin/Manifest +++ b/net-analyzer/nessus-bin/Manifest @@ -1,2 +1,2 @@ -DIST Nessus-10.7.0-el8.aarch64.rpm 61681144 BLAKE2B 90c4961640f61abc7e185be6cca62f22f1a207005e32eff0300b79556c30b274a59cf80a6515f4d9386851f9fbfd193b2f8150121fd7e1b17f23f9cef5f9f43a SHA512 b44e0fbfc69b9e883ce245a411822701ecab8077d694522583d8927879afc45101d4958bd68795163b64c356b6cad46a96b1bb6897c806148c8a8f5d6aed46bf -DIST Nessus-10.7.0-el8.x86_64.rpm 63122308 BLAKE2B 1555853b241b5a4bd5d8d4ab17b230087a9d3e92715373d9d5e11055800c00841e400650b40b477bfb185c4371bb2e541690d7a298440f34f464bec111f6e5d7 SHA512 81e11c3989e231256400eb21b3a36c6c36f13af199fb87f614df92da7eb156668d6d3942e30f9e6658672184605170855bc2aadcb96056f9104f106f49b436ac +DIST Nessus-10.7.4-el8.aarch64.rpm 62834928 BLAKE2B eccd19b7ee0923b470a64a29b0c636535a72553f7930ff9bad14211eb25194bc52d472f35e7f121e765aea97de92e66ff05eba016bbf0d5fed4e49262db7132f SHA512 53d3a0ddc72a32b5a4cf4334ad625b7a7680112f553551ee89153eb107ef144e4bcb2915d31e8064d712db15d89cbd6d0bab0473078c5a5f9e8d28ac4fcfb216 +DIST Nessus-10.7.4-el8.x86_64.rpm 64268520 BLAKE2B 4f639d665ea09444305c6609a921076bff89a2f0205fb73ad485cd2a122993caa14fa764a02fb19b32092ad19639b21dc7da1d7737ce0873445c422109ff7957 SHA512 ba33fee31c093497852d0aea217603d27e2e92fce9a9894149ae306ded47b2ed940e021b42c8a302d1ecd95cfd52656470ad3a03d2e54ba5dab0edb4fd522a3a diff --git a/net-analyzer/nessus-bin/metadata.xml b/net-analyzer/nessus-bin/metadata.xml index 3a59c704b098..7796c76c375e 100644 --- a/net-analyzer/nessus-bin/metadata.xml +++ b/net-analyzer/nessus-bin/metadata.xml @@ -2,10 +2,6 @@ <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> - <email>marecki@gentoo.org</email> - <name>Marek Szuba</name> -</maintainer> -<maintainer type="person"> <email>zerochaos@gentoo.org</email> <name>Rick Farina</name> </maintainer> diff --git a/net-analyzer/nessus-bin/nessus-bin-10.7.0.ebuild b/net-analyzer/nessus-bin/nessus-bin-10.7.4.ebuild index 3fe24e9b4ae0..3fe24e9b4ae0 100644 --- a/net-analyzer/nessus-bin/nessus-bin-10.7.0.ebuild +++ b/net-analyzer/nessus-bin/nessus-bin-10.7.4.ebuild diff --git a/net-analyzer/net-snmp/files/net-snmp-5.9.4-c99.patch b/net-analyzer/net-snmp/files/net-snmp-5.9.4-c99.patch new file mode 100644 index 000000000000..fd8f16c7b6e2 --- /dev/null +++ b/net-analyzer/net-snmp/files/net-snmp-5.9.4-c99.patch @@ -0,0 +1,30 @@ +https://github.com/net-snmp/net-snmp/issues/815 +https://github.com/net-snmp/net-snmp/commit/d30d63523bfd9ccc85175e484fea821815273237 + +From d30d63523bfd9ccc85175e484fea821815273237 Mon Sep 17 00:00:00 2001 +From: Bart Van Assche <bvanassche@acm.org> +Date: Wed, 15 May 2024 10:08:04 -0600 +Subject: [PATCH] snmptrapd: Fix compilation against recent versions of the + MySQL library +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Fix the following build error: + +snmptrapd_sql.c:541:50: error: assignment to ‘_Bool *’ from incompatible pointer type ‘char *’ [-Wincompatible-pointer-types] +541 | _tbind[TBIND_v3_SECURITY_ENGINE].is_null = &_no_v3; + +Fixes: https://github.com/net-snmp/net-snmp/issues/815 +--- a/apps/snmptrapd_sql.c ++++ b/apps/snmptrapd_sql.c +@@ -201,7 +201,7 @@ typedef struct sql_buf_t { + * static bind structures, plus 2 static buffers to bind to. + */ + static MYSQL_BIND _tbind[TBIND_MAX], _vbind[VBIND_MAX]; +-static char _no_v3; ++static typeof(*((MYSQL_BIND*)NULL)->is_null) _no_v3; + + static void _sql_process_queue(u_int dontcare, void *meeither); + + diff --git a/net-analyzer/net-snmp/net-snmp-5.9.3-r3.ebuild b/net-analyzer/net-snmp/net-snmp-5.9.3-r3.ebuild index 190fd8f58816..a84f5c835dad 100644 --- a/net-analyzer/net-snmp/net-snmp-5.9.3-r3.ebuild +++ b/net-analyzer/net-snmp/net-snmp-5.9.3-r3.ebuild @@ -6,7 +6,7 @@ EAPI=8 DISTUTILS_OPTIONAL=yes DISTUTILS_SINGLE_IMPL=yes GENTOO_DEPEND_ON_PERL=no -PYTHON_COMPAT=( python3_{10..11} ) +PYTHON_COMPAT=( python3_{10..12} ) WANT_AUTOMAKE=none inherit autotools distutils-r1 libtool perl-module systemd @@ -18,7 +18,7 @@ if [[ ${PV} == 9999 ]] ; then inherit git-r3 else # https://github.com/net-snmp/net-snmp/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz - SRC_URI="mirror://sourceforge/${PN}/${PV}/${P}.tar.gz" + SRC_URI="https://downloads.sourceforge.net/${PN}/${PV}/${P}.tar.gz" KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86" fi diff --git a/net-analyzer/net-snmp/net-snmp-5.9.4-r1.ebuild b/net-analyzer/net-snmp/net-snmp-5.9.4-r1.ebuild new file mode 100644 index 000000000000..fd1c5403a8a4 --- /dev/null +++ b/net-analyzer/net-snmp/net-snmp-5.9.4-r1.ebuild @@ -0,0 +1,241 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISTUTILS_OPTIONAL=yes +DISTUTILS_SINGLE_IMPL=yes +GENTOO_DEPEND_ON_PERL=no +PYTHON_COMPAT=( python3_{10..12} ) +WANT_AUTOMAKE=none + +inherit autotools distutils-r1 libtool perl-module systemd + +DESCRIPTION="Software for generating and retrieving SNMP data" +HOMEPAGE="https://www.net-snmp.org/" +if [[ ${PV} == 9999 ]] ; then + EGIT_REPO_URI="https://github.com/net-snmp/net-snmp" + inherit git-r3 +else + # https://github.com/net-snmp/net-snmp/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz + SRC_URI="https://downloads.sourceforge.net/${PN}/${PN}/${PV}/${P}.tar.gz" + + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +fi + +SRC_URI+=" https://dev.gentoo.org/~jsmolic/distfiles/${PN}-5.7.3-patches-3.tar.xz" + +# GPL-2 for the init scripts +LICENSE="HPND BSD GPL-2" +SLOT="0/40" +IUSE=" + X bzip2 doc elf kmem ipv6 lm-sensors mfd-rewrites minimal mysql + netlink pcap pci pcre perl python rpm selinux smux ssl tcpd ucd-compat valgrind zlib +" +REQUIRED_USE=" + python? ( ${PYTHON_REQUIRED_USE} ) + rpm? ( bzip2 zlib ) +" +RESTRICT="test" + +COMMON_DEPEND=" + virtual/libcrypt:= + bzip2? ( app-arch/bzip2 ) + elf? ( dev-libs/elfutils ) + lm-sensors? ( sys-apps/lm-sensors ) + mysql? ( dev-db/mysql-connector-c:0= ) + netlink? ( dev-libs/libnl:3 ) + pcap? ( net-libs/libpcap ) + pci? ( sys-apps/pciutils ) + pcre? ( dev-libs/libpcre ) + perl? ( dev-lang/perl:= ) + python? ( + $(python_gen_cond_dep ' + dev-python/setuptools[${PYTHON_USEDEP}] + ') + ${PYTHON_DEPS} + ) + rpm? ( + app-arch/rpm + dev-libs/popt + ) + ssl? ( + >=dev-libs/openssl-0.9.6d:0= + ) + tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) + zlib? ( >=sys-libs/zlib-1.1.4 ) +" +BDEPEND="doc? ( app-text/doxygen )" +DEPEND=" + ${COMMON_DEPEND} + valgrind? ( dev-debug/valgrind ) +" +RDEPEND=" + ${COMMON_DEPEND} + perl? ( + X? ( dev-perl/Tk ) + !minimal? ( + virtual/perl-Carp + virtual/perl-Data-Dumper + virtual/perl-Getopt-Long + dev-perl/JSON + dev-perl/Mail-Sender + dev-perl/TermReadKey + virtual/perl-Term-ReadLine + ) + ) + selinux? ( sec-policy/selinux-snmp ) +" + +PATCHES=( + "${FILESDIR}"/${PN}-5.8-pcap.patch + "${FILESDIR}"/${PN}-5.8.1-mysqlclient.patch + "${FILESDIR}"/${PN}-5.9-MakeMaker.patch + # https://github.com/net-snmp/net-snmp/pull/493 + "${FILESDIR}"/${PN}-5.9.3-0001-Fix-LDFLAGS-vs-LIBS-ordering.patch + "${FILESDIR}"/${PN}-5.9.3-0002-Tidy-up-net-snmp-config-output.patch + "${FILESDIR}"/${PN}-5.9.3-0003-Prune-Libs.private-entries-in-netsnmp-.pc.in.patch + "${FILESDIR}"/${PN}-5.9.3-0004-Search-for-ltinfo-in-configure-if-needed.patch + "${FILESDIR}"/${PN}-5.9.4-c99.patch +) + +pkg_setup() { + use python && python-single-r1_pkg_setup +} + +src_unpack() { + default + + [[ ${PV} == 9999 ]] && git-r3_src_unpack +} + +src_prepare() { + # snmpconf generates config files with proper selinux context + use selinux && eapply "${FILESDIR}"/${PN}-5.1.2-snmpconf-selinux.patch + + mv "${WORKDIR}"/patches/0001-Fix-toolchain-quadruplet-detection-Gentoo-bug-432004.patch{,.disabled} || die + mv "${WORKDIR}"/patches/0002-Respect-DESTDIR-for-pythoninstall.patch{,.disabled} || die + mv "${WORKDIR}"/patches/0004-Don-t-report-CFLAGS-and-LDFLAGS-in-net-snmp-config.patch{,.disabled} || die + mv "${WORKDIR}"/patches/0005-Respect-LDFLAGS-properly.patch{,.disabled} || die + eapply "${WORKDIR}"/patches/*.patch + + default + + eautoconf + elibtoolize +} + +src_configure() { + # keep this in the same line, configure.ac arguments are passed down to config.h + local mibs="host ucd-snmp/dlmod ucd-snmp/diskio ucd-snmp/extensible mibII/mta_sendmail etherlike-mib/dot3StatsTable" + use lm-sensors && mibs="${mibs} ucd-snmp/lmsensorsMib" + use smux && mibs="${mibs} smux" + + # Assume /etc/mtab is not present with a recent baselayout/openrc (bug #565136) + use kernel_linux && export ac_cv_ETC_MNTTAB=/etc/mtab + + export ac_cv_header_valgrind_{valgrind,memcheck}_h=$(usex valgrind) + + econf \ + $(use_enable !ssl internal-md5) \ + $(use_enable ipv6) \ + $(use_enable mfd-rewrites) \ + $(use_enable perl embedded-perl) \ + $(use_enable ucd-compat ucd-snmp-compatibility) \ + $(use_with bzip2) \ + $(use_with elf) \ + $(use_with kmem kmem-usage) \ + $(use_with mysql) \ + $(use_with netlink nl) \ + $(use_with pcap) \ + $(use_with pci) \ + $(use_with pcre) \ + $(use_with perl perl-modules INSTALLDIRS=vendor) \ + $(use_with python python-modules) \ + $(use_with rpm) \ + $(use_with ssl openssl) \ + $(use_with tcpd libwrap) \ + $(use_with zlib) \ + --enable-shared \ + --with-default-snmp-version="3" \ + --with-ldflags="${LDFLAGS}" \ + --with-logfile="/var/log/net-snmpd.log" \ + --with-mib-modules="${mibs}" \ + --with-persistent-directory="/var/lib/net-snmp" \ + --with-sys-contact="root@unknown" \ + --with-sys-location="Unknown" +} + +src_compile() { + emake sedscript + + local subdir + for subdir in snmplib agent/mibgroup agent apps .; do + emake OTHERLDFLAGS="${LDFLAGS}" -C ${subdir} all + done + + use doc && emake docsdox +} + +src_install() { + # bug #317965 + emake -j1 DESTDIR="${D}" install + + use python && python_optimize + + if use perl ; then + perl_delete_localpod + if ! use X; then + rm "${D}"/usr/bin/tkmib || die + fi + else + rm -f \ + "${D}"/usr/bin/fixproc \ + "${D}"/usr/bin/ipf-mod.pl \ + "${D}"/usr/bin/mib2c \ + "${D}"/usr/bin/net-snmp-cert \ + "${D}"/usr/bin/snmp-bridge-mib \ + "${D}"/usr/bin/snmpcheck \ + "${D}"/usr/bin/snmpconf \ + "${D}"/usr/bin/tkmib \ + "${D}"/usr/bin/traptoemail \ + "${D}"/usr/share/snmp/mib2c.perl.conf \ + "${D}"/usr/share/snmp/snmp_perl_trapd.pl \ + || die + fi + + dodoc AGENT.txt ChangeLog FAQ INSTALL NEWS PORTING README* TODO + newdoc EXAMPLE.conf.def EXAMPLE.conf + + if use doc; then + docinto html + dodoc -r docs/html/* + fi + + keepdir /var/lib/net-snmp + + newinitd "${FILESDIR}"/snmpd.init.2 snmpd + newconfd "${FILESDIR}"/snmpd.conf snmpd + + newinitd "${FILESDIR}"/snmptrapd.init.2 snmptrapd + newconfd "${FILESDIR}"/snmptrapd.conf snmptrapd + + systemd_dounit "${FILESDIR}"/snmpd.service + systemd_dounit "${FILESDIR}"/snmptrapd.service + + insinto /etc/snmp + newins "${S}"/EXAMPLE.conf snmpd.conf.example + + # Remove everything not required for an agent. + # Keep only the snmpd, snmptrapd, MIBs, headers and libraries. + if use minimal; then + rm -rf \ + "${D}"/**/*.pl \ + "${D}"/usr/bin/{encode_keychange,snmp{get,getnext,set,usm,walk,bulkwalk,table,trap,bulkget,translate,status,delta,test,df,vacm,netstat,inform,check,conf},fixproc,traptoemail} \ + "${D}"/usr/share/snmp/*.conf \ + "${D}"/usr/share/snmp/snmpconf-data \ + || die + fi + + find "${ED}" -name '*.la' -delete || die +} diff --git a/net-analyzer/net-snmp/net-snmp-5.9.4.ebuild b/net-analyzer/net-snmp/net-snmp-5.9.4.ebuild index 6ac66018c501..379385b95d4b 100644 --- a/net-analyzer/net-snmp/net-snmp-5.9.4.ebuild +++ b/net-analyzer/net-snmp/net-snmp-5.9.4.ebuild @@ -6,7 +6,7 @@ EAPI=8 DISTUTILS_OPTIONAL=yes DISTUTILS_SINGLE_IMPL=yes GENTOO_DEPEND_ON_PERL=no -PYTHON_COMPAT=( python3_{10..11} ) +PYTHON_COMPAT=( python3_{10..12} ) WANT_AUTOMAKE=none inherit autotools distutils-r1 libtool perl-module systemd @@ -18,9 +18,9 @@ if [[ ${PV} == 9999 ]] ; then inherit git-r3 else # https://github.com/net-snmp/net-snmp/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz - SRC_URI="mirror://sourceforge/${PN}/${PN}/${PV}/${P}.tar.gz" + SRC_URI="https://downloads.sourceforge.net/${PN}/${PN}/${PV}/${P}.tar.gz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" + KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86" fi SRC_URI+=" https://dev.gentoo.org/~jsmolic/distfiles/${PN}-5.7.3-patches-3.tar.xz" diff --git a/net-analyzer/net-snmp/net-snmp-9999.ebuild b/net-analyzer/net-snmp/net-snmp-9999.ebuild index e13d3ad68864..aec71f44cfce 100644 --- a/net-analyzer/net-snmp/net-snmp-9999.ebuild +++ b/net-analyzer/net-snmp/net-snmp-9999.ebuild @@ -6,7 +6,7 @@ EAPI=8 DISTUTILS_OPTIONAL=yes DISTUTILS_SINGLE_IMPL=yes GENTOO_DEPEND_ON_PERL=no -PYTHON_COMPAT=( python3_{10..11} ) +PYTHON_COMPAT=( python3_{10..12} ) WANT_AUTOMAKE=none inherit autotools distutils-r1 perl-module systemd @@ -18,7 +18,7 @@ if [[ ${PV} == 9999 ]] ; then inherit git-r3 else # https://github.com/net-snmp/net-snmp/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz - SRC_URI="mirror://sourceforge/${PN}/${PN}/${PV}/${P}.tar.gz" + SRC_URI="https://downloads.sourceforge.net/${PN}/${PN}/${PV}/${P}.tar.gz" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" fi diff --git a/net-analyzer/netcat/netcat-110-r9.ebuild b/net-analyzer/netcat/netcat-110-r9.ebuild index 5d09841d909d..a187e5c2af2d 100644 --- a/net-analyzer/netcat/netcat-110-r9.ebuild +++ b/net-analyzer/netcat/netcat-110-r9.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -9,7 +9,7 @@ PATCH_VER="1.0" MY_P=nc${PV} DESCRIPTION="The network swiss army knife" HOMEPAGE="https://nc110.sourceforge.io" -SRC_URI="mirror://sourceforge/nc110/${MY_P}.tgz +SRC_URI="https://downloads.sourceforge.net/nc110/${MY_P}.tgz ftp://sith.mimuw.edu.pl/pub/users/baggins/IPv6/nc-v6-20000918.patch.gz mirror://gentoo/${P}-patches-${PATCH_VER}.tar.bz2 " diff --git a/net-analyzer/netcat/netcat-110.20180111-r1.ebuild b/net-analyzer/netcat/netcat-110.20180111-r1.ebuild index aab71e105011..5c9f5c13fe21 100644 --- a/net-analyzer/netcat/netcat-110.20180111-r1.ebuild +++ b/net-analyzer/netcat/netcat-110.20180111-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -8,7 +8,7 @@ inherit toolchain-funcs flag-o-matic MY_P="nc${PV}" DESCRIPTION="The network swiss army knife" HOMEPAGE="https://nc110.sourceforge.io" -SRC_URI="mirror://sourceforge/nc110/${MY_P}.tar.xz" +SRC_URI="https://downloads.sourceforge.net/nc110/${MY_P}.tar.xz" S="${WORKDIR}/nc110" LICENSE="netcat" diff --git a/net-analyzer/netcat/netcat-110.20180111-r2.ebuild b/net-analyzer/netcat/netcat-110.20180111-r2.ebuild index be9afada5592..0137cdf2140a 100644 --- a/net-analyzer/netcat/netcat-110.20180111-r2.ebuild +++ b/net-analyzer/netcat/netcat-110.20180111-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -8,7 +8,7 @@ inherit toolchain-funcs flag-o-matic MY_P="nc${PV}" DESCRIPTION="The network swiss army knife" HOMEPAGE="https://nc110.sourceforge.io" -SRC_URI="mirror://sourceforge/nc110/${MY_P}.tar.xz" +SRC_URI="https://downloads.sourceforge.net/nc110/${MY_P}.tar.xz" S="${WORKDIR}/nc110" LICENSE="netcat" diff --git a/net-analyzer/netdata-go-plugin/Manifest b/net-analyzer/netdata-go-plugin/Manifest index abfa25994ec9..a04419a89f6c 100644 --- a/net-analyzer/netdata-go-plugin/Manifest +++ b/net-analyzer/netdata-go-plugin/Manifest @@ -1,4 +1,2 @@ -DIST go.d.plugin-0.58.0-vendor.tar.gz 11168253 BLAKE2B ac2a612a77410e1495700c99808a24a4a65aa0889c95258f74a64aabf38f3f16f3f719f4a3e5122026245bcf9ccc928298430c7e6d428def9c2bdd5b31717e30 SHA512 81520995e8417f0cb160dc740d9012eb19896786c702b86385525a07ebe84f3cff412c9fb40461fa7223bb2ab408f578362bf9f50623e4fea5219c93b0933d49 -DIST go.d.plugin-0.58.0.tar.gz 1600927 BLAKE2B e0fc2b4dd2652114c428cdeba3ab3a2c62094520ef35c7aa29ef3fa5e3c579e19fcea52e6b0a906872671679bbf84a9238f89af9b0d2c7e214c1495c9609903c SHA512 cab04ea45008b668a6103a6d147e4f96e55a132f13e5ca3054b5ea6cff263dba048a9f7f52f4781495425f9a9cbb9e43786047188b0165ca1071c7c216486e12 DIST go.d.plugin-0.58.1-vendor.tar.gz 11165963 BLAKE2B 43b74ae6120806ee02b9d1d9247cd7b5bb752ebbcb21e2bd5427cad186e0facc5f04cc4484c39994d7a5727ca673610ebaa6dd01d9dd8335e7d0ad39721fe2bc SHA512 23134669204c9c68247077ec12f8789db39736158867587fb24006c2cebd9f1752553a786cc91b97f2ba8b73197987b19dbf69e4669a0f821eb1fb04db0f5034 DIST go.d.plugin-0.58.1.tar.gz 1601702 BLAKE2B d87402542fdac8683dc8a505634f6ce1eb2ebddeedeee6664d250b8774b8d1a76c189020362b1b87477bf21faf9caff28f41e396032d7548d0ec16ad8b5742e0 SHA512 acbfd7ee4a72cee0587936bd2d4e27a2b58894ee72a2218b96643c1fe0866990f9d6bfe1f754cda5f5443bc75e1406a6511300ea265a81e4be89f7f97b17664c diff --git a/net-analyzer/netdata-go-plugin/netdata-go-plugin-0.58.0.ebuild b/net-analyzer/netdata-go-plugin/netdata-go-plugin-0.58.1-r1.ebuild index 70f99d0fda15..6d0271de009c 100644 --- a/net-analyzer/netdata-go-plugin/netdata-go-plugin-0.58.0.ebuild +++ b/net-analyzer/netdata-go-plugin/netdata-go-plugin-0.58.1-r1.ebuild @@ -46,6 +46,6 @@ src_install() { exeinto "/usr/libexec/netdata/plugins.d" newexe godplugin go.d.plugin - insinto "/usr/$(get_libdir)/netdata/conf.d" + insinto "/usr/lib/netdata/conf.d" doins -r config/* } diff --git a/net-analyzer/netdata-go-plugin/netdata-go-plugin-0.58.1.ebuild b/net-analyzer/netdata-go-plugin/netdata-go-plugin-0.58.1.ebuild deleted file mode 100644 index 70f99d0fda15..000000000000 --- a/net-analyzer/netdata-go-plugin/netdata-go-plugin-0.58.1.ebuild +++ /dev/null @@ -1,51 +0,0 @@ -# Copyright 2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit fcaps go-module - -MY_PN=go.d.plugin -MY_P="${MY_PN}-${PV}" -DESCRIPTION="Netdata plugin for collectors written in Go" -HOMEPAGE="https://github.com/netdata/go.d.plugin" -SRC_URI=" - https://github.com/netdata/go.d.plugin/archive/refs/tags/v${PV}.tar.gz - -> ${MY_P}.tar.gz - https://github.com/netdata/go.d.plugin/releases/download/v${PV}/${MY_PN}-vendor-v${PV}.tar.gz - -> ${MY_P}-vendor.tar.gz -" -S="${WORKDIR}/${MY_P}" - -LICENSE="GPL-3+" -# Dependent modules licenses -LICENSE+=" - Apache-2.0 BSD BSD-2 ISC MIT MPL-2.0 -" -SLOT="0" -KEYWORDS="~amd64" - -RDEPEND="net-analyzer/netdata" -BDEPEND=">=dev-lang/go-1.21" - -FILECAPS=( - cap_net_raw /usr/libexec/netdata/plugins.d/go.d.plugin -) - -src_compile() { - LDFLAGS="-w -s -X main.version=${PV}-gentoo" - ego build -ldflags "${LDFLAGS}" "github.com/netdata/go.d.plugin/cmd/godplugin" -} - -src_test() { - ego test ./... -cover -covermode=atomic -} - -src_install() { - einstalldocs - - exeinto "/usr/libexec/netdata/plugins.d" - newexe godplugin go.d.plugin - insinto "/usr/$(get_libdir)/netdata/conf.d" - doins -r config/* -} diff --git a/net-analyzer/netdata/Manifest b/net-analyzer/netdata/Manifest index 943718e2e54b..5056e1fa04e9 100644 --- a/net-analyzer/netdata/Manifest +++ b/net-analyzer/netdata/Manifest @@ -1 +1,3 @@ -DIST netdata-1.44.0.tar.gz 47423685 BLAKE2B 2b430d07abed1e49c5b7a3c24188446e929301eecc849d03ee9c33860f13942dbc06453401d166195b1aadd16e28e19b7533d16fc10e6f3eca51117b52485a85 SHA512 ef3534351504385ac33e18917a839c6506c377a4f25246d8819da916c6e46ae3d2d6f5422e8a685fd3aabbf851829233943abce8a8aeba0ce94db011ed406602 +DIST netdata-1.45.4.tar.gz 74881136 BLAKE2B e6184458a8b7e4430fb3e11543812f00652712c0c78d3ffb2f040adf649ceb4b01b4984165e489dfbea5c2207b702319fd5f3fb0d6d420e8973a20e54f3555b9 SHA512 44ab814c1dfb8c70880a363abbf29115189da366a49df953665dc2831da389e46ac2e33c288ebdbb10478f66180d0243d1b848a2f94043449198a87d9ad06340 +DIST netdata-1.46.1.tar.gz 75135927 BLAKE2B 61ba35b4c61df47fd3aa03f08dc168dd02173b3c1ef0246bdf14555c50e9e573b0fa4b1bbca8b8f89f89a21a076630318acd21969be9060d1e7fba08cea85e22 SHA512 04d9f955129538cdd34175b6586fc548b80da1aa6d7cc7d8ecfb222e36ad184d51ad45c71b173ede7f8c1d948b9dafa3136b71cb47dfd8a73a0412445e6aae51 +DIST netdata-1.46.2.tar.gz 75133899 BLAKE2B 56fedb88071fffd906fbe7bd6eb78baab944e5fe4929e203e0cc29a0397c7ee71bb4718c372d82981d47ecb2caaa38fd071ed619c058a76165a6c02a2165f5cc SHA512 d38951df52638ed8a620e7b271e1ad9fb30b7de1a38b0080c36cdccdb6c64928ff63e6c631d0e762b887d16a94e603a8414eabc0b288cb82e839fadfd38accb3 diff --git a/net-analyzer/netdata/files/netdata-1.44.0-dbengine.patch b/net-analyzer/netdata/files/netdata-1.44.0-dbengine.patch deleted file mode 100644 index 3119094f64bc..000000000000 --- a/net-analyzer/netdata/files/netdata-1.44.0-dbengine.patch +++ /dev/null @@ -1,47 +0,0 @@ -From ee6c0bcb7f0bfe6440dd7c4c52dca87486abc181 Mon Sep 17 00:00:00 2001 -From: Stelios Fragkakis <52996999+stelfrag@users.noreply.github.com> -Date: Wed, 20 Dec 2023 21:54:17 +0200 -Subject: [PATCH] Fix compilation error when using --disable-dbengine - ---- - daemon/global_statistics.c | 2 ++ - daemon/main.c | 2 +- - 2 files changed, 3 insertions(+), 1 deletion(-) - -diff --git a/daemon/global_statistics.c b/daemon/global_statistics.c -index 8392a3c88e08d..6e286b18a7220 100644 ---- a/daemon/global_statistics.c -+++ b/daemon/global_statistics.c -@@ -857,6 +857,7 @@ static void global_statistics_charts(void) { - - // ---------------------------------------------------------------- - -+#ifdef ENABLE_DBENGINE - if (tier_page_type[0] == PAGE_GORILLA_METRICS) - { - static RRDSET *st_tier0_gorilla_pages = NULL; -@@ -918,6 +919,7 @@ static void global_statistics_charts(void) { - - rrdset_done(st_tier0_compression_info); - } -+#endif - } - - // ---------------------------------------------------------------------------- -diff --git a/daemon/main.c b/daemon/main.c -index fc15f0c9dfc52..7c7452c4aa055 100644 ---- a/daemon/main.c -+++ b/daemon/main.c -@@ -1502,11 +1502,11 @@ int main(int argc, char **argv) { - #ifdef ENABLE_DBENGINE - char* createdataset_string = "createdataset="; - char* stresstest_string = "stresstest="; --#endif - - if(strcmp(optarg, "pgd-tests") == 0) { - return pgd_test(argc, argv); - } -+#endif - - if(strcmp(optarg, "sqlite-meta-recover") == 0) { - sql_init_database(DB_CHECK_RECOVER, 0); diff --git a/net-analyzer/netdata/metadata.xml b/net-analyzer/netdata/metadata.xml index ea8a63a7fd26..f8b7fb9f0721 100644 --- a/net-analyzer/netdata/metadata.xml +++ b/net-analyzer/netdata/metadata.xml @@ -9,10 +9,8 @@ <flag name="aclk">Enable Agent-Cloud Link (ACLK) for securely connecting a Netdata Agent to your web browser through Netdata Cloud</flag> <flag name="bpf">Enable the extended Berkeley Packet Filter (eBPF) collector to monitor kernel-level metrics about applications with per-second granularity</flag> <flag name="cloud">Enable Netdata Cloud support</flag> - <flag name="compression">Enable compression via zlib</flag> <flag name="dbengine">Enable the Netdata database engine</flag> <flag name="ipmi">Install <pkg>sys-apps/ipmitool</pkg> required for monitoring IPMI sensors.</flag> - <flag name="jsonc">Enable optimization of JSON using <pkg>dev-libs/json-c</pkg></flag> <flag name="mongodb">Enable support for the mongodb backend</flag> <flag name="nfacct">Enable the nfacct plugin</flag> <flag name="nodejs">Enable use of nodejs (which some plugins use)</flag> diff --git a/net-analyzer/netdata/netdata-1.45.4.ebuild b/net-analyzer/netdata/netdata-1.45.4.ebuild new file mode 100644 index 000000000000..725670699e12 --- /dev/null +++ b/net-analyzer/netdata/netdata-1.45.4.ebuild @@ -0,0 +1,163 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +PYTHON_COMPAT=( python{3_9,3_10,3_11,3_12} ) + +inherit cmake fcaps flag-o-matic linux-info optfeature python-single-r1 systemd + +if [[ ${PV} == *9999 ]] ; then + EGIT_REPO_URI="https://github.com/netdata/${PN}.git" + inherit git-r3 +else + SRC_URI="https://github.com/netdata/${PN}/releases/download/v${PV}/${PN}-v${PV}.tar.gz -> ${P}.tar.gz" + S="${WORKDIR}/${PN}-v${PV}" + KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86" +fi + +DESCRIPTION="Linux real time system monitoring, done right!" +HOMEPAGE="https://github.com/netdata/netdata https://my-netdata.io/" + +LICENSE="GPL-3+ MIT BSD" +SLOT="0" +IUSE="aclk bpf cloud cups +dbengine ipmi mongodb mysql nfacct nodejs postgres prometheus +python systemd tor xen" +REQUIRED_USE=" + mysql? ( python ) + python? ( ${PYTHON_REQUIRED_USE} ) + tor? ( python )" + +# most unconditional dependencies are for plugins.d/charts.d.plugin: +RDEPEND=" + acct-group/netdata + acct-user/netdata + app-misc/jq + >=app-shells/bash-4:0 + || ( + net-analyzer/openbsd-netcat + net-analyzer/netcat + ) + net-libs/libwebsockets + net-misc/curl + net-misc/wget + sys-apps/util-linux + app-alternatives/awk + sys-libs/libcap + cups? ( net-print/cups ) + app-arch/lz4:= + app-arch/zstd:= + app-arch/brotli:= + dbengine? ( + dev-libs/judy + dev-libs/openssl:= + ) + dev-libs/libpcre2:= + dev-libs/libuv:= + dev-libs/libyaml + dev-libs/protobuf:= + bpf? ( virtual/libelf:= ) + sys-libs/zlib + ipmi? ( sys-libs/freeipmi ) + dev-libs/json-c:= + mongodb? ( dev-libs/mongo-c-driver ) + nfacct? ( + net-firewall/nfacct + net-libs/libmnl:= + ) + nodejs? ( net-libs/nodejs ) + prometheus? ( + app-arch/snappy:= + dev-libs/protobuf:= + ) + python? ( + ${PYTHON_DEPS} + $(python_gen_cond_dep 'dev-python/pyyaml[${PYTHON_USEDEP}]') + mysql? ( $(python_gen_cond_dep 'dev-python/mysqlclient[${PYTHON_USEDEP}]') ) + postgres? ( $(python_gen_cond_dep 'dev-python/psycopg:2[${PYTHON_USEDEP}]') ) + tor? ( $(python_gen_cond_dep 'net-libs/stem[${PYTHON_USEDEP}]') ) + ) + xen? ( + app-emulation/xen-tools + dev-libs/yajl + ) + systemd? ( sys-apps/systemd )" +DEPEND="${RDEPEND} + virtual/pkgconfig" + +FILECAPS=( + 'cap_dac_read_search,cap_sys_ptrace+ep' + 'usr/libexec/netdata/plugins.d/apps.plugin' + 'usr/libexec/netdata/plugins.d/debugfs.plugin' +) + +pkg_setup() { + use python && python-single-r1_pkg_setup + linux-info_pkg_setup +} + +src_configure() { + # -Werror=strict-aliasing + # https://bugs.gentoo.org/927174 + # https://github.com/netdata/netdata/issues/17321 + # + # Do not trust with LTO either. + append-flags -fno-strict-aliasing + filter-lto + + local mycmakeargs=( + -DCMAKE_DISABLE_FIND_PACKAGE_Git=TRUE + -DCMAKE_INSTALL_PREFIX=/ + -DENABLE_ACLK=$(usex aclk) + -DENABLE_CLOUD=$(usex cloud) + -DENABLE_DBENGINE=$(usex dbengine) + -DENABLE_PLUGIN_CUPS=$(usex cups) + -DENABLE_PLUGIN_NFACCT=$(usex nfacct) + -DENABLE_PLUGIN_FREEIPMI=$(usex ipmi) + -DENABLE_EXPORTER_MONGODB=$(usex mongodb) + -DENABLE_EXPORTER_PROMETHEUS_REMOTE_WRITE=$(usex prometheus) + -DENABLE_PLUGIN_XENSTAT=$(usex xen) + -DENABLE_PLUGIN_EBPF=$(usex bpf) + -DENABLE_PLUGIN_GO=FALSE + -DENABLE_PLUGIN_SYSTEMD_JOURNAL=$(usex systemd) + ) + cmake_src_configure +} + +src_install() { + cmake_src_install + + rm -rf "${D}/var/cache" || die + rm -rf "${D}/var/run" || die + + keepdir /var/log/netdata + fowners -Rc netdata:netdata /var/log/netdata + keepdir /var/lib/netdata + keepdir /var/lib/netdata/registry + keepdir /var/lib/netdata/cloud.d + fowners -Rc netdata:netdata /var/lib/netdata + + newinitd "${D}/usr/lib/netdata/system/openrc/init.d/netdata" "${PN}" + newconfd "${D}/usr/lib/netdata/system/openrc/conf.d/netdata" "${PN}" + systemd_newunit "${D}/usr/lib/netdata/system/systemd/netdata.service.v235" netdata.service + systemd_dounit "${D}/usr/lib/netdata/system/systemd/netdata-updater.service" + systemd_dounit "${D}/usr/lib/netdata/system/systemd/netdata-updater.timer" + insinto /etc/netdata + doins system/netdata.conf +} + +pkg_postinst() { + fcaps_pkg_postinst + + if use nfacct ; then + fcaps 'cap_net_admin' 'usr/libexec/netdata/plugins.d/nfacct.plugin' + fi + + if use xen ; then + fcaps 'cap_dac_override' 'usr/libexec/netdata/plugins.d/xenstat.plugin' + fi + + if use ipmi ; then + fcaps 'cap_dac_override' 'usr/libexec/netdata/plugins.d/freeipmi.plugin' + fi + + optfeature "go.d external plugin" net-analyzer/netdata-go-plugin +} diff --git a/net-analyzer/netdata/netdata-1.44.0.ebuild b/net-analyzer/netdata/netdata-1.46.1.ebuild index a85bf1232c4b..2f9af0d43617 100644 --- a/net-analyzer/netdata/netdata-1.44.0.ebuild +++ b/net-analyzer/netdata/netdata-1.46.1.ebuild @@ -2,9 +2,9 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python3_{10..11} ) +PYTHON_COMPAT=( python{3_9,3_10,3_11,3_12} ) -inherit autotools fcaps flag-o-matic linux-info optfeature python-single-r1 systemd toolchain-funcs +inherit cmake fcaps linux-info optfeature python-single-r1 systemd if [[ ${PV} == *9999 ]] ; then EGIT_REPO_URI="https://github.com/netdata/${PN}.git" @@ -20,7 +20,7 @@ HOMEPAGE="https://github.com/netdata/netdata https://my-netdata.io/" LICENSE="GPL-3+ MIT BSD" SLOT="0" -IUSE="caps cloud +compression cpu_flags_x86_sse2 cups +dbengine ipmi +jsonc mongodb mysql nfacct nodejs postgres prometheus +python tor xen" +IUSE="aclk bpf cloud cups +dbengine ipmi mongodb mysql nfacct nodejs postgres prometheus +python systemd tor xen" REQUIRED_USE=" mysql? ( python ) python? ( ${PYTHON_REQUIRED_USE} ) @@ -41,19 +41,23 @@ RDEPEND=" net-misc/wget sys-apps/util-linux app-alternatives/awk - caps? ( sys-libs/libcap ) + sys-libs/libcap cups? ( net-print/cups ) + app-arch/lz4:= + app-arch/zstd:= + app-arch/brotli:= dbengine? ( - app-arch/lz4:= dev-libs/judy dev-libs/openssl:= ) + dev-libs/libpcre2:= dev-libs/libuv:= dev-libs/libyaml - cloud? ( dev-libs/protobuf:= ) + dev-libs/protobuf:= + bpf? ( virtual/libelf:= ) sys-libs/zlib ipmi? ( sys-libs/freeipmi ) - jsonc? ( dev-libs/json-c:= ) + dev-libs/json-c:= mongodb? ( dev-libs/mongo-c-driver ) nfacct? ( net-firewall/nfacct @@ -74,7 +78,8 @@ RDEPEND=" xen? ( app-emulation/xen-tools dev-libs/yajl - )" + ) + systemd? ( sys-apps/systemd )" DEPEND="${RDEPEND} virtual/pkgconfig" @@ -84,69 +89,49 @@ FILECAPS=( 'usr/libexec/netdata/plugins.d/debugfs.plugin' ) -PATCHES=( - "${FILESDIR}/${P}-dbengine.patch" -) - pkg_setup() { use python && python-single-r1_pkg_setup linux-info_pkg_setup } -src_prepare() { - default - eautoreconf -} - src_configure() { - if use ppc64; then - # bundled dlib does not support vsx on big-endian - # https://github.com/davisking/dlib/issues/397 - [[ $(tc-endian) == big ]] && append-flags -mno-vsx - fi - - # --enable-lto only appends -flto - econf \ - --localstatedir="${EPREFIX}"/var \ - --with-user=netdata \ - --without-bundled-protobuf \ - $(use_enable cloud) \ - $(use_enable jsonc) \ - $(use_enable cups plugin-cups) \ - $(use_enable dbengine) \ - $(use_enable nfacct plugin-nfacct) \ - $(use_enable ipmi plugin-freeipmi) \ - --disable-exporting-kinesis \ - --disable-lto \ - $(use_enable mongodb exporting-mongodb) \ - $(use_enable prometheus exporting-prometheus-remote-write) \ - $(use_enable xen plugin-xenstat) \ - $(use_enable cpu_flags_x86_sse2 x86-sse) -} - -src_compile() { - emake clean - default + local mycmakeargs=( + -DCMAKE_DISABLE_FIND_PACKAGE_Git=TRUE + -DCMAKE_INSTALL_PREFIX=/ + -DENABLE_ACLK=$(usex aclk) + -DENABLE_CLOUD=$(usex cloud) + -DENABLE_DBENGINE=$(usex dbengine) + -DENABLE_PLUGIN_CUPS=$(usex cups) + -DENABLE_PLUGIN_NFACCT=$(usex nfacct) + -DENABLE_PLUGIN_FREEIPMI=$(usex ipmi) + -DENABLE_EXPORTER_MONGODB=$(usex mongodb) + -DENABLE_EXPORTER_PROMETHEUS_REMOTE_WRITE=$(usex prometheus) + -DENABLE_PLUGIN_XENSTAT=$(usex xen) + -DENABLE_PLUGIN_EBPF=$(usex bpf) + -DENABLE_PLUGIN_GO=FALSE + -DENABLE_PLUGIN_SYSTEMD_JOURNAL=$(usex systemd) + ) + cmake_src_configure } src_install() { - default + cmake_src_install rm -rf "${D}/var/cache" || die + rm -rf "${D}/var/run" || die keepdir /var/log/netdata fowners -Rc netdata:netdata /var/log/netdata keepdir /var/lib/netdata keepdir /var/lib/netdata/registry + keepdir /var/lib/netdata/cloud.d fowners -Rc netdata:netdata /var/lib/netdata - fowners -Rc root:netdata /usr/share/${PN} - - newinitd system/openrc/init.d/netdata ${PN} - newconfd system/openrc/conf.d/netdata ${PN} - systemd_dounit system/systemd/netdata.service - systemd_dounit system/systemd/netdata-updater.service - systemd_dounit system/systemd/netdata-updater.timer + newinitd "${D}/usr/lib/netdata/system/openrc/init.d/netdata" "${PN}" + newconfd "${D}/usr/lib/netdata/system/openrc/conf.d/netdata" "${PN}" + systemd_newunit "${D}/usr/lib/netdata/system/systemd/netdata.service.v235" netdata.service + systemd_dounit "${D}/usr/lib/netdata/system/systemd/netdata-updater.service" + systemd_dounit "${D}/usr/lib/netdata/system/systemd/netdata-updater.timer" insinto /etc/netdata doins system/netdata.conf } diff --git a/net-analyzer/netdata/netdata-1.46.2.ebuild b/net-analyzer/netdata/netdata-1.46.2.ebuild new file mode 100644 index 000000000000..2f9af0d43617 --- /dev/null +++ b/net-analyzer/netdata/netdata-1.46.2.ebuild @@ -0,0 +1,155 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +PYTHON_COMPAT=( python{3_9,3_10,3_11,3_12} ) + +inherit cmake fcaps linux-info optfeature python-single-r1 systemd + +if [[ ${PV} == *9999 ]] ; then + EGIT_REPO_URI="https://github.com/netdata/${PN}.git" + inherit git-r3 +else + SRC_URI="https://github.com/netdata/${PN}/releases/download/v${PV}/${PN}-v${PV}.tar.gz -> ${P}.tar.gz" + S="${WORKDIR}/${PN}-v${PV}" + KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86" +fi + +DESCRIPTION="Linux real time system monitoring, done right!" +HOMEPAGE="https://github.com/netdata/netdata https://my-netdata.io/" + +LICENSE="GPL-3+ MIT BSD" +SLOT="0" +IUSE="aclk bpf cloud cups +dbengine ipmi mongodb mysql nfacct nodejs postgres prometheus +python systemd tor xen" +REQUIRED_USE=" + mysql? ( python ) + python? ( ${PYTHON_REQUIRED_USE} ) + tor? ( python )" + +# most unconditional dependencies are for plugins.d/charts.d.plugin: +RDEPEND=" + acct-group/netdata + acct-user/netdata + app-misc/jq + >=app-shells/bash-4:0 + || ( + net-analyzer/openbsd-netcat + net-analyzer/netcat + ) + net-libs/libwebsockets + net-misc/curl + net-misc/wget + sys-apps/util-linux + app-alternatives/awk + sys-libs/libcap + cups? ( net-print/cups ) + app-arch/lz4:= + app-arch/zstd:= + app-arch/brotli:= + dbengine? ( + dev-libs/judy + dev-libs/openssl:= + ) + dev-libs/libpcre2:= + dev-libs/libuv:= + dev-libs/libyaml + dev-libs/protobuf:= + bpf? ( virtual/libelf:= ) + sys-libs/zlib + ipmi? ( sys-libs/freeipmi ) + dev-libs/json-c:= + mongodb? ( dev-libs/mongo-c-driver ) + nfacct? ( + net-firewall/nfacct + net-libs/libmnl:= + ) + nodejs? ( net-libs/nodejs ) + prometheus? ( + app-arch/snappy:= + dev-libs/protobuf:= + ) + python? ( + ${PYTHON_DEPS} + $(python_gen_cond_dep 'dev-python/pyyaml[${PYTHON_USEDEP}]') + mysql? ( $(python_gen_cond_dep 'dev-python/mysqlclient[${PYTHON_USEDEP}]') ) + postgres? ( $(python_gen_cond_dep 'dev-python/psycopg:2[${PYTHON_USEDEP}]') ) + tor? ( $(python_gen_cond_dep 'net-libs/stem[${PYTHON_USEDEP}]') ) + ) + xen? ( + app-emulation/xen-tools + dev-libs/yajl + ) + systemd? ( sys-apps/systemd )" +DEPEND="${RDEPEND} + virtual/pkgconfig" + +FILECAPS=( + 'cap_dac_read_search,cap_sys_ptrace+ep' + 'usr/libexec/netdata/plugins.d/apps.plugin' + 'usr/libexec/netdata/plugins.d/debugfs.plugin' +) + +pkg_setup() { + use python && python-single-r1_pkg_setup + linux-info_pkg_setup +} + +src_configure() { + local mycmakeargs=( + -DCMAKE_DISABLE_FIND_PACKAGE_Git=TRUE + -DCMAKE_INSTALL_PREFIX=/ + -DENABLE_ACLK=$(usex aclk) + -DENABLE_CLOUD=$(usex cloud) + -DENABLE_DBENGINE=$(usex dbengine) + -DENABLE_PLUGIN_CUPS=$(usex cups) + -DENABLE_PLUGIN_NFACCT=$(usex nfacct) + -DENABLE_PLUGIN_FREEIPMI=$(usex ipmi) + -DENABLE_EXPORTER_MONGODB=$(usex mongodb) + -DENABLE_EXPORTER_PROMETHEUS_REMOTE_WRITE=$(usex prometheus) + -DENABLE_PLUGIN_XENSTAT=$(usex xen) + -DENABLE_PLUGIN_EBPF=$(usex bpf) + -DENABLE_PLUGIN_GO=FALSE + -DENABLE_PLUGIN_SYSTEMD_JOURNAL=$(usex systemd) + ) + cmake_src_configure +} + +src_install() { + cmake_src_install + + rm -rf "${D}/var/cache" || die + rm -rf "${D}/var/run" || die + + keepdir /var/log/netdata + fowners -Rc netdata:netdata /var/log/netdata + keepdir /var/lib/netdata + keepdir /var/lib/netdata/registry + keepdir /var/lib/netdata/cloud.d + fowners -Rc netdata:netdata /var/lib/netdata + + newinitd "${D}/usr/lib/netdata/system/openrc/init.d/netdata" "${PN}" + newconfd "${D}/usr/lib/netdata/system/openrc/conf.d/netdata" "${PN}" + systemd_newunit "${D}/usr/lib/netdata/system/systemd/netdata.service.v235" netdata.service + systemd_dounit "${D}/usr/lib/netdata/system/systemd/netdata-updater.service" + systemd_dounit "${D}/usr/lib/netdata/system/systemd/netdata-updater.timer" + insinto /etc/netdata + doins system/netdata.conf +} + +pkg_postinst() { + fcaps_pkg_postinst + + if use nfacct ; then + fcaps 'cap_net_admin' 'usr/libexec/netdata/plugins.d/nfacct.plugin' + fi + + if use xen ; then + fcaps 'cap_dac_override' 'usr/libexec/netdata/plugins.d/xenstat.plugin' + fi + + if use ipmi ; then + fcaps 'cap_dac_override' 'usr/libexec/netdata/plugins.d/freeipmi.plugin' + fi + + optfeature "go.d external plugin" net-analyzer/netdata-go-plugin +} diff --git a/net-analyzer/netdata/netdata-9999.ebuild b/net-analyzer/netdata/netdata-9999.ebuild index 56ca10202a2c..2f9af0d43617 100644 --- a/net-analyzer/netdata/netdata-9999.ebuild +++ b/net-analyzer/netdata/netdata-9999.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python{3_9,3_10,3_11} ) +PYTHON_COMPAT=( python{3_9,3_10,3_11,3_12} ) inherit cmake fcaps linux-info optfeature python-single-r1 systemd @@ -20,7 +20,7 @@ HOMEPAGE="https://github.com/netdata/netdata https://my-netdata.io/" LICENSE="GPL-3+ MIT BSD" SLOT="0" -IUSE="aclk bpf cloud cups +dbengine ipmi mongodb mysql nfacct nodejs postgres prometheus +python tor xen" +IUSE="aclk bpf cloud cups +dbengine ipmi mongodb mysql nfacct nodejs postgres prometheus +python systemd tor xen" REQUIRED_USE=" mysql? ( python ) python? ( ${PYTHON_REQUIRED_USE} ) @@ -78,7 +78,8 @@ RDEPEND=" xen? ( app-emulation/xen-tools dev-libs/yajl - )" + ) + systemd? ( sys-apps/systemd )" DEPEND="${RDEPEND} virtual/pkgconfig" @@ -108,6 +109,7 @@ src_configure() { -DENABLE_PLUGIN_XENSTAT=$(usex xen) -DENABLE_PLUGIN_EBPF=$(usex bpf) -DENABLE_PLUGIN_GO=FALSE + -DENABLE_PLUGIN_SYSTEMD_JOURNAL=$(usex systemd) ) cmake_src_configure } diff --git a/net-analyzer/netdiscover/metadata.xml b/net-analyzer/netdiscover/metadata.xml index dce3f3be66c0..f15ddc719661 100644 --- a/net-analyzer/netdiscover/metadata.xml +++ b/net-analyzer/netdiscover/metadata.xml @@ -5,4 +5,7 @@ <email>netmon@gentoo.org</email> <name>Gentoo network monitoring and analysis project</name> </maintainer> +<upstream> + <remote-id type="github">netdiscover-scanner/netdiscover</remote-id> +</upstream> </pkgmetadata> diff --git a/net-analyzer/netdiscover/netdiscover-0.7.ebuild b/net-analyzer/netdiscover/netdiscover-0.7.ebuild index 028445fa0e28..b48c92e92656 100644 --- a/net-analyzer/netdiscover/netdiscover-0.7.ebuild +++ b/net-analyzer/netdiscover/netdiscover-0.7.ebuild @@ -1,16 +1,18 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 + inherit autotools flag-o-matic -DESCRIPTION="An active/passive address reconnaissance tool" +DESCRIPTION="Active/passive address reconnaissance tool" HOMEPAGE="https://github.com/netdiscover-scanner/netdiscover" -LICENSE="GPL-2" SRC_URI=" https://github.com/${PN}-scanner/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz " +S="${WORKDIR}/${P/_/-}" +LICENSE="GPL-3+" SLOT="0" KEYWORDS="~amd64 ~sparc ~x86 ~amd64-linux ~x86-linux" @@ -20,7 +22,6 @@ DEPEND=" RDEPEND=" ${DEPEND} " -S=${WORKDIR}/${P/_/-} DOCS=( AUTHORS ChangeLog README TODO ) src_prepare() { diff --git a/net-analyzer/netperf/Manifest b/net-analyzer/netperf/Manifest index f378f80376d4..96ec2d577205 100644 --- a/net-analyzer/netperf/Manifest +++ b/net-analyzer/netperf/Manifest @@ -1 +1,2 @@ DIST netperf-2.7.0.tar.bz2 1024430 BLAKE2B 1263a2b3cee0790e4526245e522d29f8692a5a3e9d3b41468d1010bbee4d606a06904d9e0c4ac0af457bde562a476434be4c62a41e3c0dbf0e5c3aeb2ae5652a SHA512 5fb37945bead831247de9c8ba86b33f134ba39e753b483df72de97f536d0846538dadf61acc2dee57f04ab5d16a92afab4890e79a5d7ffa863afd526267fffad +DIST netperf-2.7.0_p20210121.tar.gz 1914186 BLAKE2B 14d3a769a049443d8bf62b58c93c2b9563a16b69bb151d35926aa8831167b8a31bdd7d820c80a0c0511a78e519742005bdfa2079d403a514e2ec17f41a1b8e7c SHA512 8d9908fe2cd778eae719265b67938ab44e18de960c845f976e80d6b419c08b11ae47d8b4b906c6ccaf280f9f66bcdcb0be2ab379b0dca8d62d86671d57057e20 diff --git a/net-analyzer/netperf/files/netperf-log-dir.patch b/net-analyzer/netperf/files/netperf-log-dir.patch new file mode 100644 index 000000000000..f1d11e7163e0 --- /dev/null +++ b/net-analyzer/netperf/files/netperf-log-dir.patch @@ -0,0 +1,12 @@ +diff -Naur a/src/netserver.c b/src/netserver.c +--- a/src/netserver.c 2021-01-21 16:02:24.000000000 +0000 ++++ b/src/netserver.c 2024-05-31 12:48:38.770331476 +0100 +@@ -153,7 +153,7 @@ + #define FILE_SEP "/" + #else + /* comply with FHS: http://www.pathname.com/fhs/pub/fhs-2.3.html */ +-#define DEBUG_LOG_FILE_DIR "/var/log/" ++#define DEBUG_LOG_FILE_DIR "/var/log/netperf/" + #define NETPERF_NULL "/dev/null" + #define FILE_SEP "/" + #endif diff --git a/net-analyzer/netperf/metadata.xml b/net-analyzer/netperf/metadata.xml index 3e35e2cbd3a3..38f0fed98332 100644 --- a/net-analyzer/netperf/metadata.xml +++ b/net-analyzer/netperf/metadata.xml @@ -1,25 +1,26 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type="project"> -<email>netmon@gentoo.org</email> -<name>Gentoo network monitoring and analysis project</name> -</maintainer> -<longdescription lang="en"> -Netperf is a benchmark that can be used to measure the performance of many -different types of networking. It provides tests for both unidirectional -throughput, and end-to-end latency. The environments currently measureable by -netperf include: + <maintainer type="project"> + <email>netmon@gentoo.org</email> + <name>Gentoo network monitoring and analysis project</name> + </maintainer> + <longdescription lang="en"> + Netperf is a benchmark that can be used to measure the performance of many + different types of networking. It provides tests for both unidirectional + throughput, and end-to-end latency. The environments currently measureable by + netperf include: - - TCP and UDP via BSD Sockets for both IPv4 and IPv6 - - DLPI - - Unix Domain Sockets - - SCTP for both IPv4 and IPv6 -</longdescription> -<use> -<flag name="demo">Emit interim results during the run. May affect results</flag> -</use> -<upstream> -<remote-id type="cpe">cpe:/a:netperf:netperf</remote-id> -</upstream> + - TCP and UDP via BSD Sockets for both IPv4 and IPv6 + - DLPI + - Unix Domain Sockets + - SCTP for both IPv4 and IPv6 + </longdescription> + <use> + <flag name="demo">Emit interim results during the run. May affect results</flag> + </use> + <upstream> + <remote-id type="cpe">cpe:/a:netperf:netperf</remote-id> + <remote-id type="github">HewlettPackard/netperf</remote-id> + </upstream> </pkgmetadata> diff --git a/net-analyzer/netperf/netperf-2.7.0_p20210121.ebuild b/net-analyzer/netperf/netperf-2.7.0_p20210121.ebuild new file mode 100644 index 000000000000..26f455ffdac0 --- /dev/null +++ b/net-analyzer/netperf/netperf-2.7.0_p20210121.ebuild @@ -0,0 +1,79 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools flag-o-matic + +COMMIT="3bc455b23f901dae377ca0a558e1e32aa56b31c4" +DESCRIPTION="Network performance benchmark" +HOMEPAGE="https://github.com/HewlettPackard/netperf" +SRC_URI="https://github.com/HewlettPackard/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/${PN}-${COMMIT}" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86" +IUSE="demo sctp" + +RDEPEND=" + acct-group/netperf + acct-user/netperf +" +BDEPEND=" + ${RDEPEND} + sys-devel/gnuconfig +" + +PATCHES=( + "${FILESDIR}"/${PN}-fix-scripts.patch + "${FILESDIR}"/${PN}-log-dir.patch + "${FILESDIR}"/${PN}-2.7.0-includes.patch + "${FILESDIR}"/${PN}-2.7.0-fcommon.patch +) + +src_prepare() { + # Fixing paths in scripts + sed -i \ + -e "s:^\(NETHOME=\).*:\1\"${EPREFIX}/usr/bin\":" \ + doc/examples/sctp_stream_script \ + doc/examples/tcp_range_script \ + doc/examples/tcp_rr_script \ + doc/examples/tcp_stream_script \ + doc/examples/udp_rr_script \ + doc/examples/udp_stream_script \ + || die + + default + AT_M4DIR=src/missing/m4 eautoreconf +} + +src_configure() { + # netlib.c:2292:5: warning: implicit declaration of function ‘sched_setaffinity’ + # nettest_omni.c:2943:5: warning: implicit declaration of function ‘splice’ + # TODO: drop once https://github.com/HewlettPackard/netperf/pull/73 merged + append-cppflags -D_GNU_SOURCE + + econf \ + $(use_enable demo) \ + $(use_enable sctp) +} + +src_install() { + default + + # init.d / conf.d + newinitd "${FILESDIR}"/${PN}-2.7.0-init netperf + newconfd "${FILESDIR}"/${PN}-2.2-conf netperf + + keepdir /var/log/${PN} + fowners netperf:netperf /var/log/${PN} + fperms 0755 /var/log/${PN} + + # documentation and example scripts + dodoc AUTHORS ChangeLog NEWS README Release_Notes doc/${PN}.txt + docinto html + dodoc doc/${PN}.html + exeinto /usr/share/${PN}/examples + doexe doc/examples/*_script +} diff --git a/net-analyzer/nettop/nettop-0.2.3-r2.ebuild b/net-analyzer/nettop/nettop-0.2.3-r2.ebuild index b77fcdc473e8..b160aea01bdc 100644 --- a/net-analyzer/nettop/nettop-0.2.3-r2.ebuild +++ b/net-analyzer/nettop/nettop-0.2.3-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -6,8 +6,8 @@ EAPI=8 inherit autotools toolchain-funcs DESCRIPTION="top-like program for network activity" -HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage" -SRC_URI="mirror://gentoo/${P}.tar.gz" +HOMEPAGE="https://web.archive.org/web/20060615083852/http://srparish.net/software/" +SRC_URI="https://web.archive.org/web/20060705095248if_/http://srparish.net:80/software/nettop-0.2.3.tar.gz" LICENSE="BSD" SLOT="0" diff --git a/net-analyzer/nipper/nipper-0.12.0.ebuild b/net-analyzer/nipper/nipper-0.12.0.ebuild index cb8d8c2c8668..0c4fd721931c 100644 --- a/net-analyzer/nipper/nipper-0.12.0.ebuild +++ b/net-analyzer/nipper/nipper-0.12.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -9,7 +9,7 @@ MY_P="${PN}-cli-${PV}" DESCRIPTION="Router configuration security analysis tool" HOMEPAGE="http://nipper.titania.co.uk/" -SRC_URI="mirror://sourceforge/nipper/${MY_P}.tgz" +SRC_URI="https://downloads.sourceforge.net/nipper/${MY_P}.tgz" S="${WORKDIR}/${MY_P}" LICENSE="GPL-3" diff --git a/net-analyzer/nload/Manifest b/net-analyzer/nload/Manifest index 2fbee04348d3..492a7ee2de73 100644 --- a/net-analyzer/nload/Manifest +++ b/net-analyzer/nload/Manifest @@ -1,2 +1 @@ -DIST nload-0.7.4.tar.gz 151005 BLAKE2B a98903652e21d2b9b2e446bfc8c8f5fc66559b6663893603f4040c6e80c8c977d305e952dc0108c9efa66490dfba91e42857337095ddb731ececf2e3747e0b97 SHA512 ca3e36d3f77c5a7994a3261042fb65a1458a29c769e6bebbe3b8e49b3045aca6f4d047065d11431b28368e0d881c24c92533fa24f0e54ac270f1f5bccfb5c0af DIST nload-0.7.5_pre20180309.tar.gz 43405 BLAKE2B b5d8aeffc5de52c8574a8d11f133b2c5a38d09fd5a1abb75e2a9ea99551b018947844348ab73a26d806c575a387f1d4a5354144612ac7ea0f45bab5bd7d05115 SHA512 5942d706ac1f8acf57c832ee832a6b96add3c3d80fb45d3a5f6eb2397d20d49c4cc52e754328259bb52b06bd4e4b15e92d86103a531ae4ac546fcb87e3e5131b diff --git a/net-analyzer/nload/files/nload-0.7.4-Eliminate-flicker-on-some-terminals.patch b/net-analyzer/nload/files/nload-0.7.4-Eliminate-flicker-on-some-terminals.patch deleted file mode 100644 index 8d13545c786c..000000000000 --- a/net-analyzer/nload/files/nload-0.7.4-Eliminate-flicker-on-some-terminals.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 8a93886e0fb33a81b8fe32e88ee106a581fedd34 Mon Sep 17 00:00:00 2001 -From: Roland Riegel <roland@roland-riegel.de> -Date: Sun, 28 Jan 2018 16:59:39 +0100 -Subject: [PATCH 1/1] Eliminate flicker on some terminals like rxvt (thanks to - Alex Wilson) - ---- - src/window.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/window.cpp b/src/window.cpp -index bfa7701..2083fd0 100644 ---- a/src/window.cpp -+++ b/src/window.cpp -@@ -108,7 +108,7 @@ void Window::refresh() - void Window::clear() - { - if(m_window) -- wclear(m_window); -+ werase(m_window); - } - - // move and resize window --- -2.16.4 - diff --git a/net-analyzer/nload/files/nload-0.7.4-Makefile-spec-don-t-compress-man-page.patch b/net-analyzer/nload/files/nload-0.7.4-Makefile-spec-don-t-compress-man-page.patch deleted file mode 100644 index 705f92ea0e81..000000000000 --- a/net-analyzer/nload/files/nload-0.7.4-Makefile-spec-don-t-compress-man-page.patch +++ /dev/null @@ -1,65 +0,0 @@ -From 04d5af489f998568553dc54f39c56ef740a27f1b Mon Sep 17 00:00:00 2001 -From: Andrey Mazo <ahippo@yandex.com> -Date: Sun, 26 Aug 2018 00:00:35 +0300 -Subject: [PATCH 1/1] Makefile,spec: don't compress the man-page - -Package managers like to compress man-pages on their own, -because the type of compression for man-pages is user-configurable. -In particular, Gentoo [1] doesn't want packages to compress their man-pages. -Gentoo Portage has workarounds for this, -but this is not specified in Package Manager Specification and -results in extra compression-decompression pass. - -RPM also compresses man-pages itself (in `brp-compress`) -(and similarly recompresses them as needed) -rather than relying on packages to install compressed man-pages. - -Automake can handle installation of man-pages without the explicit "install" target, -so use the standard automake-provided way of installing man-pages. -It's also smart enough to package `nload.1.in` automatically. - -Don't specify an explicit man-page extension in .spec file as recommended by Fedora. - -[1] https://github.com/gentoo/gentoo/pull/9543#issuecomment-415662844 - -(cherry picked from commit 096df0d1282a8c8c535e730d28fe281ea290b58d) - -Upstream: https://github.com/rolandriegel/nload/pull/4 ---- - docs/Makefile.am | 10 +--------- - nload.spec.in | 2 +- - 2 files changed, 2 insertions(+), 10 deletions(-) - -diff --git a/docs/Makefile.am b/docs/Makefile.am -index 646d438..9032a02 100644 ---- a/docs/Makefile.am -+++ b/docs/Makefile.am -@@ -1,11 +1,3 @@ - ## Helder Correia <helder.correia@netcabo.pt> - --man1_MAN = nload.1 -- --install: -- $(mkinstalldirs) $(DESTDIR)$(mandir)/man1 -- $(INSTALL_DATA) $(top_srcdir)/docs/$(PACKAGE).1 $(DESTDIR)$(mandir)/man1 -- gzip -f $(DESTDIR)$(mandir)/man1/$(PACKAGE).1 -- --uninstall: -- rm $(DESTDIR)$(mandir)/man1/$(PACKAGE).1.gz -+man1_MANS = nload.1 -diff --git a/nload.spec.in b/nload.spec.in -index 36496fd..53f6f19 100644 ---- a/nload.spec.in -+++ b/nload.spec.in -@@ -41,7 +41,7 @@ rm -rf %{buildroot} - %defattr(-,root,root) - %doc AUTHORS COPYING ChangeLog NEWS README - %attr(0755,root,root) %{_bindir}/%{name} --%{_mandir}/man1/%{name}.1.gz -+%{_mandir}/man1/%{name}.1* - - - %changelog --- -2.16.4 - diff --git a/net-analyzer/nload/files/nload-0.7.4-tinfo.patch b/net-analyzer/nload/files/nload-0.7.4-tinfo.patch deleted file mode 100644 index dcab6ec324f4..000000000000 --- a/net-analyzer/nload/files/nload-0.7.4-tinfo.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/configure.in -+++ b/configure.in -@@ -70,6 +70,7 @@ - esac - - dnl Checks for libraries. -+PKG_CHECK_MODULES([NCURSES],[ncurses],[LIBS="$LIBS $NCURSES_LIBS"],[AC_MSG_ERROR([ncurses was not found])]) - AC_CHECK_LIB(ncurses, initscr) - AC_CHECK_LIB(form, new_form) - diff --git a/net-analyzer/nload/nload-0.7.4-r1.ebuild b/net-analyzer/nload/nload-0.7.4-r1.ebuild deleted file mode 100644 index fd389da2dfc6..000000000000 --- a/net-analyzer/nload/nload-0.7.4-r1.ebuild +++ /dev/null @@ -1,34 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools - -DESCRIPTION="Real time network traffic monitor for the command line interface" -HOMEPAGE="http://www.roland-riegel.de/nload/index.html" -SRC_URI="http://www.roland-riegel.de/nload/${P}.tar.gz" - -LICENSE="GPL-2+" -SLOT="0" -KEYWORDS="amd64 arm ~mips ppc x86" - -RDEPEND=">=sys-libs/ncurses-5.2:0=" -DEPEND="${RDEPEND}" -BDEPEND="virtual/pkgconfig" - -PATCHES=( - "${FILESDIR}"/${P}-tinfo.patch - "${FILESDIR}"/${P}-Eliminate-flicker-on-some-terminals.patch - "${FILESDIR}"/${P}-Makefile-spec-don-t-compress-man-page.patch -) - -src_prepare() { - default - eautoreconf -} - -src_configure() { - # --enable-debug means do not strip debugging symbols (default no) - econf --enable-debug -} diff --git a/net-analyzer/nload/nload-0.7.5_pre20180309.ebuild b/net-analyzer/nload/nload-0.7.5_pre20180309.ebuild index 6870ab429dd9..0764502dec28 100644 --- a/net-analyzer/nload/nload-0.7.5_pre20180309.ebuild +++ b/net-analyzer/nload/nload-0.7.5_pre20180309.ebuild @@ -13,7 +13,7 @@ SRC_URI="https://github.com/rolandriegel/nload/archive/${GIT_REV}.tar.gz -> ${P} LICENSE="GPL-2+" SLOT="0" -KEYWORDS="~amd64 ~arm ~mips ~ppc ~x86" +KEYWORDS="amd64 arm ~mips ppc x86" RDEPEND=">=sys-libs/ncurses-5.2:0=" DEPEND="${RDEPEND}" diff --git a/net-analyzer/nmap/Manifest b/net-analyzer/nmap/Manifest index 49124d2a35a6..633b02eaf585 100644 --- a/net-analyzer/nmap/Manifest +++ b/net-analyzer/nmap/Manifest @@ -1,4 +1,6 @@ DIST nmap-7.94-patches.tar.xz 4112 BLAKE2B 0720242bf507f2a1502cf854592d94a57a33d5ac1e520c752e548092f91bbffeb0f6f762f4da27ff445419ff3845060242aa43aba53d0161ae2bebccf728cc97 SHA512 d47e2215e1923af65e3a392c3d990d650e68135f139013c311a26d12cfd0b27d9d5c3cbc27bb8583251a353a6284fb9d518373f17624db242be7060b8bfa0ba5 DIST nmap-7.94.tar.bz2 11102195 BLAKE2B 5819b458b50e33f6a507ad3c32a731c13e730c40d31a61731c3cfcd41fad8e3fdfcbb721ef46b05a80e406d0a646d0966d4b645551711144822551ef374a443a SHA512 a55cddf9c1d9272243d01251eb3315b26f232d0596818857083222a385398618b428dc2bd8282c3e832527e135a74aeb020ca8609d83d8337342f5d8a04d7f2c DIST nmap-7.94.tar.bz2.asc 198 BLAKE2B 38a363499fe236f675238ecf015a7e597d66cdd84eef13bed4986b4081c4f1f7a288121e3666e0f31a9282fd84f30cbceb65341f1c173086c7421a8ea719afe9 SHA512 dcbaf88e9ead21f303a7ee5390de0d2bd67477c2628858dc3380b0ac7d73d4d1b330f3b303ff32b0cb9a22eaa37af535bd7aa622531451e404a8c9a256a98eec -DIST nmap-7.95-patches.tar.xz 4144 BLAKE2B d2c6d1b811538ff21c5f4654562a2adaf216f3437c08d4b787892ca2d8b1500376eb7cc794357d0262bf18d23ffd5f356192ba48b6748dc8365cdc601fecdc9c SHA512 3bfc7ba506bc8623c2b62a7ef386621e1b066ed27d3ba1a6909b336c87c6894c9a972fd847ddf5278752c201e905af1deb71f91d264d82b17e3878fd4de1a2a2 +DIST nmap-7.95-patches-2.tar.xz 5740 BLAKE2B 860e7702e2ae1211c4eeeb8f869730de2279a305389f54317f883d2094bfbb1efb9031a761af93bfa8ab56e06bea774dea5807d134dd64f94c2191340a21113b SHA512 e4fb7350ea7e7f2e62f089129c0962652e556fb3bdf272d78c834db299f7f92c3238344c8bd50fea7d1360460ca4768ddad7367ecfcaefdb51125c66cd6981dd +DIST nmap-7.95.tar.bz2 11717069 BLAKE2B 4ab4912468f6c1cf7517090bc94b1bb34e665fe1b3db973e1c7bb2d05cb885545cdf3ca5c7fb548ff0012b800f5dd60ed2f2010fc9fb62ba7d6a28537287193c SHA512 fd95a8bc627a2b8b507353f761dc9fdc8e880a0dd2d75a51b9cb3ec664318796af9bb16a6ff9a1358bd77ad669c2a54e333be630f201f69287692a7d2d41c17e +DIST nmap-7.95.tar.bz2.asc 181 BLAKE2B 31db32cb5ad42be25d4b87d8619e0865d7089618839311ada9a2c1e0c9bc89f82ca6253e8151930f152c3fac7ad820ca747ed8427d008f9b04ad2b9e0a0e2b71 SHA512 ce56893796def1b7e8ae96cce90dda073ad84d657cd15d980ee14562a07f7522d438a40ac58422b6f6de7201a9f2678413018633529cb8dcc4e580cfe678c092 diff --git a/net-analyzer/nmap/files/nmap-7.94-topport.patch b/net-analyzer/nmap/files/nmap-7.94-topport.patch new file mode 100644 index 000000000000..0ba568d317e3 --- /dev/null +++ b/net-analyzer/nmap/files/nmap-7.94-topport.patch @@ -0,0 +1,31 @@ +https://bugs.gentoo.org/918874 +https://github.com/nmap/nmap/issues/2655 +https://github.com/nmap/nmap/issues/2679 +https://github.com/nmap/nmap/commit/edad9c059ca45bccab8c0f41fe6fc6546c60153a + +From edad9c059ca45bccab8c0f41fe6fc6546c60153a Mon Sep 17 00:00:00 2001 +From: dmiller <dmiller@e0a8ed71-7df4-0310-8962-fdc924857419> +Date: Thu, 20 Jul 2023 16:21:23 +0000 +Subject: [PATCH] Add missing braces. Fixes #2679 + +--- + services.cc | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/services.cc b/services.cc +index a0899c7509..2a709dca97 100644 +--- a/services.cc ++++ b/services.cc +@@ -496,9 +496,10 @@ void gettoppts(double level, const char *portlist, struct scan_lists * ports, co + if (sctpmax && strcmp(current->s_proto, "sctp") == 0 + && (!ptsdata_initialized || + is_port_member(ptsdata.sctp_ports, ptsdata.sctp_count, current)) +- ) ++ ) { + ports->sctp_ports[ports->sctp_count++] = current->s_port; +- sctpmax--; ++ sctpmax--; ++ } + break; + default: + break; diff --git a/net-analyzer/nmap/nmap-7.94-r1.ebuild b/net-analyzer/nmap/nmap-7.94-r1.ebuild new file mode 100644 index 000000000000..b7291c14554c --- /dev/null +++ b/net-analyzer/nmap/nmap-7.94-r1.ebuild @@ -0,0 +1,189 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +LUA_COMPAT=( lua5-4 ) +LUA_REQ_USE="deprecated" +PYTHON_COMPAT=( python3_{10..11} ) +PLOCALES="de es fr hi hr hu id it ja pl pt_BR pt_PR ro ru sk zh" +PLOCALE_BACKUP="en" +inherit autotools lua-single plocale python-single-r1 toolchain-funcs + +DESCRIPTION="Network exploration tool and security / port scanner" +HOMEPAGE="https://nmap.org/" +if [[ ${PV} == *9999* ]] ; then + inherit git-r3 + + EGIT_REPO_URI="https://github.com/nmap/nmap" + +else + VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/nmap.asc + inherit verify-sig + + SRC_URI="https://nmap.org/dist/${P}.tar.bz2" + SRC_URI+=" verify-sig? ( https://nmap.org/dist/sigs/${P}.tar.bz2.asc )" + + KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" +fi + +SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-7.94-patches.tar.xz" + +# https://github.com/nmap/nmap/issues/2199 +LICENSE="NPSL-0.95" +SLOT="0" +IUSE="ipv6 libssh2 ncat ndiff nping nls +nse ssl symlink zenmap" +REQUIRED_USE=" + ${PYTHON_REQUIRED_USE} + nse? ( ${LUA_REQUIRED_USE} ) + symlink? ( ncat ) +" + +RDEPEND=" + dev-libs/liblinear:= + dev-libs/libpcre + net-libs/libpcap + ndiff? ( ${PYTHON_DEPS} ) + libssh2? ( + net-libs/libssh2[zlib] + sys-libs/zlib + ) + nls? ( virtual/libintl ) + nse? ( + ${LUA_DEPS} + sys-libs/zlib + ) + ssl? ( dev-libs/openssl:= ) + symlink? ( + ncat? ( + !net-analyzer/netcat + !net-analyzer/openbsd-netcat + ) + ) + zenmap? ( + ${PYTHON_DEPS} + $(python_gen_cond_dep ' + dev-python/pygobject:3[${PYTHON_USEDEP}] + ') + ) +" +DEPEND="${RDEPEND}" +# Python is always needed at build time for some scripts +BDEPEND=" + ${PYTHON_DEPS} + virtual/pkgconfig + nls? ( sys-devel/gettext ) +" + +if [[ ${PV} != *9999* ]] ; then + BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-nmap )" +fi + +PATCHES=( + "${WORKDIR}"/${PN}-7.94-patches + "${FILESDIR}"/${PN}-7.94-autoconf-2.72.patch + "${FILESDIR}"/${PN}-7.94-topport.patch +) + +pkg_setup() { + python-single-r1_pkg_setup + + use nse && lua-single_pkg_setup +} + +src_unpack() { + if [[ ${PV} == *9999 ]] ; then + git-r3_src_unpack + elif use verify-sig ; then + # Needed for downloaded patch (which is unsigned, which is fine) + verify-sig_verify_detached "${DISTDIR}"/${P}.tar.bz2{,.asc} + fi + + default +} + +src_prepare() { + default + + # Drop bundled libraries + rm -r liblinear/ libpcap/ libpcre/ libssh2/ libz/ || die + + cat "${FILESDIR}"/nls.m4 >> "${S}"/acinclude.m4 || die + + delete_disabled_locale() { + # Force here as PLOCALES contains supported locales for man + # pages and zenmap doesn't have all of those + rm -rf zenmap/share/zenmap/locale/${1} || die + rm -f zenmap/share/zenmap/locale/${1}.po || die + } + plocale_for_each_disabled_locale delete_disabled_locale + + sed -i \ + -e '/^ALL_LINGUAS =/{s|$| id|g;s|jp|ja|g}' \ + Makefile.in || die + + cp libdnet-stripped/include/config.h.in{,.nmap-orig} || die + + eautoreconf + + if [[ ${CHOST} == *-darwin* ]] ; then + # We need the original for a Darwin-specific fix, bug #604432 + mv libdnet-stripped/include/config.h.in{.nmap-orig,} || die + fi +} + +src_configure() { + export ac_cv_path_PYTHON="${PYTHON}" + export am_cv_pathless_PYTHON="${EPYTHON}" + + local myeconfargs=( + $(use_enable ipv6) + $(use_enable nls) + $(use_with libssh2) + $(use_with ncat) + $(use_with ndiff) + $(use_with nping) + $(use_with nse liblua) + $(use_with ssl openssl) + $(use_with zenmap) + $(usex libssh2 --with-zlib) + $(usex nse --with-zlib) + --cache-file="${S}"/config.cache + # The bundled libdnet is incompatible with the version available in the + # tree, so we cannot use the system library here. + --with-libdnet=included + --with-pcre="${ESYSROOT}"/usr + --without-dpdk + ) + + econf "${myeconfargs[@]}" +} + +src_compile() { + local directory + for directory in . libnetutil nsock/src $(usev ncat) $(usev nping) ; do + emake -C "${directory}" makefile.dep + done + + emake \ + AR="$(tc-getAR)" \ + RANLIB="$(tc-getRANLIB)" +} + +src_install() { + # See bug #831713 for return of -j1 + LC_ALL=C emake \ + -j1 \ + DESTDIR="${D}" \ + STRIP=: \ + nmapdatadir="${EPREFIX}"/usr/share/nmap \ + install + + dodoc CHANGELOG HACKING docs/README docs/*.txt + + if use ndiff || use zenmap ; then + python_optimize + fi + + use symlink && dosym /usr/bin/ncat /usr/bin/nc +} diff --git a/net-analyzer/nmap/nmap-7.95.ebuild b/net-analyzer/nmap/nmap-7.95.ebuild new file mode 100644 index 000000000000..82218df92303 --- /dev/null +++ b/net-analyzer/nmap/nmap-7.95.ebuild @@ -0,0 +1,206 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +LUA_COMPAT=( lua5-4 ) +LUA_REQ_USE="deprecated" +DISTUTILS_OPTIONAL=1 +DISTUTILS_SINGLE_IMPL=1 +DISTUTILS_USE_PEP517=setuptools +PYTHON_COMPAT=( python3_{10..12} ) +PLOCALES="de es fr hi hr hu id it ja pl pt_BR pt_PR ro ru sk zh" +PLOCALE_BACKUP="en" +inherit autotools distutils-r1 lua-single plocale toolchain-funcs + +DESCRIPTION="Network exploration tool and security / port scanner" +HOMEPAGE="https://nmap.org/" +if [[ ${PV} == *9999* ]] ; then + inherit git-r3 + + EGIT_REPO_URI="https://github.com/nmap/nmap" + +else + VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/nmap.asc + inherit verify-sig + + SRC_URI="https://nmap.org/dist/${P}.tar.bz2" + SRC_URI+=" verify-sig? ( https://nmap.org/dist/sigs/${P}.tar.bz2.asc )" + + KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" +fi + +SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-7.95-patches-2.tar.xz" + +# https://github.com/nmap/nmap/issues/2199 +LICENSE="NPSL-0.95" +SLOT="0" +IUSE="ipv6 libssh2 ncat ndiff nping nls +nse ssl symlink zenmap" +REQUIRED_USE=" + ${PYTHON_REQUIRED_USE} + nse? ( ${LUA_REQUIRED_USE} ) + symlink? ( ncat ) +" + +RDEPEND=" + dev-libs/liblinear:= + dev-libs/libpcre2 + net-libs/libpcap + ndiff? ( ${PYTHON_DEPS} ) + libssh2? ( + net-libs/libssh2[zlib] + sys-libs/zlib + ) + nls? ( virtual/libintl ) + nse? ( + ${LUA_DEPS} + sys-libs/zlib + ) + ssl? ( dev-libs/openssl:= ) + symlink? ( + ncat? ( + !net-analyzer/netcat + !net-analyzer/openbsd-netcat + ) + ) + zenmap? ( + ${PYTHON_DEPS} + $(python_gen_cond_dep ' + dev-python/pygobject:3[${PYTHON_USEDEP}] + ') + ) +" +DEPEND="${RDEPEND}" +# Python is always needed at build time for some scripts +BDEPEND=" + ${PYTHON_DEPS} + virtual/pkgconfig + nls? ( sys-devel/gettext ) + zenmap? ( ${DISTUTILS_DEPS} ) +" + +if [[ ${PV} != *9999* ]] ; then + BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-nmap )" +fi + +PATCHES=( + "${WORKDIR}"/${PN}-7.95-patches-2 +) + +pkg_setup() { + use nse && lua-single_pkg_setup +} + +src_unpack() { + if [[ ${PV} == *9999 ]] ; then + git-r3_src_unpack + elif use verify-sig ; then + # Needed for downloaded patch (which is unsigned, which is fine) + verify-sig_verify_detached "${DISTDIR}"/${P}.tar.bz2{,.asc} + fi + + default +} + +src_prepare() { + default + + # Drop bundled libraries + rm -r liblinear/ libpcap/ libpcre/ libssh2/ libz/ || die + + cat "${FILESDIR}"/nls.m4 >> "${S}"/acinclude.m4 || die + + delete_disabled_locale() { + # Force here as PLOCALES contains supported locales for man + # pages and zenmap doesn't have all of those + rm -rf zenmap/share/zenmap/locale/${1} || die + rm -f zenmap/share/zenmap/locale/${1}.po || die + } + plocale_for_each_disabled_locale delete_disabled_locale + + sed -i \ + -e '/^ALL_LINGUAS =/{s|$| id|g;s|jp|ja|g}' \ + Makefile.in || die + + cp libdnet-stripped/include/config.h.in{,.nmap-orig} || die + + eautoreconf + + if [[ ${CHOST} == *-darwin* ]] ; then + # We need the original for a Darwin-specific fix, bug #604432 + mv libdnet-stripped/include/config.h.in{.nmap-orig,} || die + fi +} + +src_configure() { + export ac_cv_path_PYTHON="${PYTHON}" + export am_cv_pathless_PYTHON="${EPYTHON}" + + python_setup + + local myeconfargs=( + $(use_enable ipv6) + $(use_enable nls) + $(use_with libssh2) + $(use_with ncat) + $(use_with ndiff) + $(use_with nping) + $(use_with nse liblua) + $(use_with ssl openssl) + $(use_with zenmap) + $(usex libssh2 --with-zlib) + $(usex nse --with-zlib) + --cache-file="${S}"/config.cache + # The bundled libdnet is incompatible with the version available in the + # tree, so we cannot use the system library here. + --with-libdnet=included + --with-pcre="${ESYSROOT}"/usr + --without-dpdk + ) + + econf "${myeconfargs[@]}" +} + +src_compile() { + local directory + for directory in . libnetutil nsock/src $(usev ncat) $(usev nping) ; do + emake -C "${directory}" makefile.dep + done + + emake \ + AR="$(tc-getAR)" \ + RANLIB="$(tc-getRANLIB)" + + if use zenmap ; then + cd zenmap || die + distutils-r1_src_compile + fi +} + +src_test() { + local -x PATH="${S}:${PATH}" + + default +} + +src_install() { + # See bug #831713 for return of -j1 + LC_ALL=C emake \ + -j1 \ + DESTDIR="${D}" \ + STRIP=: \ + nmapdatadir="${EPREFIX}"/usr/share/nmap \ + install + + dodoc CHANGELOG HACKING docs/README docs/*.txt + + use symlink && dosym /usr/bin/ncat /usr/bin/nc + + if use ndiff ; then + python_optimize + fi + + if use zenmap ; then + distutils-r1_src_install + fi +} diff --git a/net-analyzer/nmap/nmap-9999.ebuild b/net-analyzer/nmap/nmap-9999.ebuild index 043bcfa6f516..0fa4d25ff5fa 100644 --- a/net-analyzer/nmap/nmap-9999.ebuild +++ b/net-analyzer/nmap/nmap-9999.ebuild @@ -1,14 +1,17 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 LUA_COMPAT=( lua5-4 ) LUA_REQ_USE="deprecated" -PYTHON_COMPAT=( python3_{10..11} ) +DISTUTILS_OPTIONAL=1 +DISTUTILS_SINGLE_IMPL=1 +DISTUTILS_USE_PEP517=setuptools +PYTHON_COMPAT=( python3_{10..12} ) PLOCALES="de es fr hi hr hu id it ja pl pt_BR pt_PR ro ru sk zh" PLOCALE_BACKUP="en" -inherit autotools lua-single plocale python-single-r1 toolchain-funcs +inherit autotools distutils-r1 lua-single plocale toolchain-funcs DESCRIPTION="Network exploration tool and security / port scanner" HOMEPAGE="https://nmap.org/" @@ -27,7 +30,7 @@ else KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" fi -SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-7.95-patches.tar.xz" +SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-7.95-patches-2.tar.xz" # https://github.com/nmap/nmap/issues/2199 LICENSE="NPSL-0.95" @@ -73,6 +76,7 @@ BDEPEND=" ${PYTHON_DEPS} virtual/pkgconfig nls? ( sys-devel/gettext ) + zenmap? ( ${DISTUTILS_DEPS} ) " if [[ ${PV} != *9999* ]] ; then @@ -80,12 +84,10 @@ if [[ ${PV} != *9999* ]] ; then fi PATCHES=( - "${WORKDIR}"/${PN}-7.95-patches + "${WORKDIR}"/${PN}-7.95-patches-2 ) pkg_setup() { - python-single-r1_pkg_setup - use nse && lua-single_pkg_setup } @@ -134,6 +136,8 @@ src_configure() { export ac_cv_path_PYTHON="${PYTHON}" export am_cv_pathless_PYTHON="${EPYTHON}" + python_setup + local myeconfargs=( $(use_enable ipv6) $(use_enable nls) @@ -166,6 +170,17 @@ src_compile() { emake \ AR="$(tc-getAR)" \ RANLIB="$(tc-getRANLIB)" + + if use zenmap ; then + cd zenmap || die + distutils-r1_src_compile + fi +} + +src_test() { + local -x PATH="${S}:${PATH}" + + default } src_install() { @@ -179,9 +194,13 @@ src_install() { dodoc CHANGELOG HACKING docs/README docs/*.txt - if use ndiff || use zenmap ; then + use symlink && dosym /usr/bin/ncat /usr/bin/nc + + if use ndiff ; then python_optimize fi - use symlink && dosym /usr/bin/ncat /usr/bin/nc + if use zenmap ; then + distutils-r1_src_install + fi } diff --git a/net-analyzer/nmapsi/metadata.xml b/net-analyzer/nmapsi/metadata.xml index e3a0017ffab4..381cc3b5fbd8 100644 --- a/net-analyzer/nmapsi/metadata.xml +++ b/net-analyzer/nmapsi/metadata.xml @@ -1,10 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="project"> - <email>qt@gentoo.org</email> - <name>Gentoo Qt Project</name> - </maintainer> + <!-- maintainer-needed --> <upstream> <remote-id type="github">nmapsi4/nmapsi4</remote-id> <remote-id type="sourceforge">nmapsi</remote-id> diff --git a/net-analyzer/notus-scanner/Manifest b/net-analyzer/notus-scanner/Manifest index 79d92d27ff5d..494907c14216 100644 --- a/net-analyzer/notus-scanner/Manifest +++ b/net-analyzer/notus-scanner/Manifest @@ -1 +1,2 @@ DIST notus-scanner-22.6.2.tar.gz 316406 BLAKE2B c24ec5e4fd9f8fc181145d64580d04f7045ccf1a7570f855f0a8a79bcea842fe7a73d91fadecd61c10b94cb3ee68ecae98b0f91b4059b84258765be98c95057f SHA512 ecbbb79950908641c2b83d379d141b189b8e0e27cac17753cbb381a5f4ebf28d7100f60bd24fc284c2681abc889f6fee36a64f469ac0b37323940eaeae7e7522 +DIST notus-scanner-22.6.3.tar.gz 293997 BLAKE2B 889416d2324088dc11f2df5146b3c88b276d1170552f55b2cb7ef49f4d8d855b98d6c0e53a1d49bd725b97b88c12df69a1997a38a614aa941dd699d0efb1de51 SHA512 fc3a05a3a9d61dd0b7a9913cfbbf507fec9dd3797a42a82283d14ab7fa8090fbc847487cf3a1d064f49572dda9acadba4bd7d30003fd32a179f572e327254546 diff --git a/net-analyzer/notus-scanner/notus-scanner-22.6.2.ebuild b/net-analyzer/notus-scanner/notus-scanner-22.6.2.ebuild index 1e63401e469d..f62ecf25aaa3 100644 --- a/net-analyzer/notus-scanner/notus-scanner-22.6.2.ebuild +++ b/net-analyzer/notus-scanner/notus-scanner-22.6.2.ebuild @@ -20,7 +20,7 @@ DEPEND=" net-libs/paho-mqtt-c >=dev-python/psutil-5.9[${PYTHON_USEDEP}] >=dev-python/python-gnupg-0.5.1[${PYTHON_USEDEP}] - <dev-python/packaging-23.3[${PYTHON_USEDEP}] + <dev-python/packaging-24.1[${PYTHON_USEDEP}] >=dev-python/paho-mqtt-1.5.1[${PYTHON_USEDEP}] <dev-python/tomli-3[${PYTHON_USEDEP}] " diff --git a/net-analyzer/notus-scanner/notus-scanner-22.6.3-r1.ebuild b/net-analyzer/notus-scanner/notus-scanner-22.6.3-r1.ebuild new file mode 100644 index 000000000000..9ac39d6372b9 --- /dev/null +++ b/net-analyzer/notus-scanner/notus-scanner-22.6.3-r1.ebuild @@ -0,0 +1,83 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..12} pypy3 ) +DISTUTILS_USE_PEP517=poetry +inherit distutils-r1 readme.gentoo-r1 systemd + +DESCRIPTION="Notus is a vulnerability scanner for creating results from local security checks" +HOMEPAGE="https://github.com/greenbone/notus-scanner" +SRC_URI="https://github.com/greenbone/notus-scanner/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="AGPL-3 AGPL-3+" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +DEPEND=" + acct-user/gvm + net-libs/paho-mqtt-c + >=dev-python/psutil-5.9[${PYTHON_USEDEP}] + >=dev-python/python-gnupg-0.5.1[${PYTHON_USEDEP}] + <dev-python/packaging-24.1[${PYTHON_USEDEP}] + >=dev-python/paho-mqtt-1.5.1[${PYTHON_USEDEP}] + $(python_gen_cond_dep ' + <dev-python/tomli-3[${PYTHON_USEDEP}] + ' 3.10) +" + +RDEPEND=" + ${DEPEND} + app-misc/mosquitto +" + +PATCHES=( + "${FILESDIR}"/notus-scanner-22.6.2-remove-tests.patch +) + +DOC_CONTENTS=" +For validating the feed content, a GnuPG keychain with the Greenbone Community Feed integrity key needs to be created. +Please, read here on how to create it: +https://greenbone.github.io/docs/latest/22.4/source-build/index.html#feed-validation +https://wiki.gentoo.org/wiki/Greenbone_Vulnerability_Management#Notus_Scanner + +To enable feed validation, edit /etc/gvm/${PN}.toml +and set +disable-hashsum-verification = false" +DISABLE_AUTOFORMATTING=true + +distutils_enable_tests unittest + +python_compile() { + distutils-r1_python_compile +} + +python_install() { + distutils-r1_python_install + + insinto /etc/gvm + use prefix || fowners -R gvm:gvm /etc/gvm + newins "${FILESDIR}/${PN}.toml" "${PN}.toml" + use prefix || fowners gvm:gvm "/etc/gvm/${PN}.toml" + + # Set proper permissions on required files/directories + keepdir /var/lib/notus + keepdir /var/lib/notus/products + keepdir /var/lib/notus/advisories + if ! use prefix; then + fowners -R gvm:gvm /var/lib/notus + fi + + newinitd "${FILESDIR}/${PN}.initd" "${PN}" + + systemd_dounit config/${PN}.service + + systemd_install_serviced "${FILESDIR}/notus-scanner.service.conf" \ + ${PN}.service + readme.gentoo_create_doc +} + +pkg_postinst() { + readme.gentoo_print_elog +} diff --git a/net-analyzer/notus-scanner/notus-scanner-22.6.3-r2.ebuild b/net-analyzer/notus-scanner/notus-scanner-22.6.3-r2.ebuild new file mode 100644 index 000000000000..f183e1fe25a1 --- /dev/null +++ b/net-analyzer/notus-scanner/notus-scanner-22.6.3-r2.ebuild @@ -0,0 +1,83 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..12} pypy3 ) +DISTUTILS_USE_PEP517=poetry +inherit distutils-r1 readme.gentoo-r1 systemd + +DESCRIPTION="Notus is a vulnerability scanner for creating results from local security checks" +HOMEPAGE="https://github.com/greenbone/notus-scanner" +SRC_URI="https://github.com/greenbone/notus-scanner/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="AGPL-3 AGPL-3+" +SLOT="0" +KEYWORDS="amd64 ~x86" + +DEPEND=" + acct-user/gvm + net-libs/paho-mqtt-c + >=dev-python/psutil-5.9[${PYTHON_USEDEP}] + >=dev-python/python-gnupg-0.5.1[${PYTHON_USEDEP}] + <dev-python/packaging-24.2[${PYTHON_USEDEP}] + >=dev-python/paho-mqtt-1.5.1[${PYTHON_USEDEP}] + $(python_gen_cond_dep ' + <dev-python/tomli-3[${PYTHON_USEDEP}] + ' 3.10) +" + +RDEPEND=" + ${DEPEND} + app-misc/mosquitto +" + +PATCHES=( + "${FILESDIR}"/notus-scanner-22.6.2-remove-tests.patch +) + +DOC_CONTENTS=" +For validating the feed content, a GnuPG keychain with the Greenbone Community Feed integrity key needs to be created. +Please, read here on how to create it: +https://greenbone.github.io/docs/latest/22.4/source-build/index.html#feed-validation +https://wiki.gentoo.org/wiki/Greenbone_Vulnerability_Management#Notus_Scanner + +To enable feed validation, edit /etc/gvm/${PN}.toml +and set +disable-hashsum-verification = false" +DISABLE_AUTOFORMATTING=true + +distutils_enable_tests unittest + +python_compile() { + distutils-r1_python_compile +} + +python_install() { + distutils-r1_python_install + + insinto /etc/gvm + use prefix || fowners -R gvm:gvm /etc/gvm + newins "${FILESDIR}/${PN}.toml" "${PN}.toml" + use prefix || fowners gvm:gvm "/etc/gvm/${PN}.toml" + + # Set proper permissions on required files/directories + keepdir /var/lib/notus + keepdir /var/lib/notus/products + keepdir /var/lib/notus/advisories + if ! use prefix; then + fowners -R gvm:gvm /var/lib/notus + fi + + newinitd "${FILESDIR}/${PN}.initd" "${PN}" + + systemd_dounit config/${PN}.service + + systemd_install_serviced "${FILESDIR}/notus-scanner.service.conf" \ + ${PN}.service + readme.gentoo_create_doc +} + +pkg_postinst() { + readme.gentoo_print_elog +} diff --git a/net-analyzer/nsat/nsat-1.5-r6.ebuild b/net-analyzer/nsat/nsat-1.5-r6.ebuild index af4492f250c8..47f0c0c1f494 100644 --- a/net-analyzer/nsat/nsat-1.5-r6.ebuild +++ b/net-analyzer/nsat/nsat-1.5-r6.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -7,7 +7,7 @@ inherit autotools toolchain-funcs DESCRIPTION="Network Security Analysis Tool, an application-level network security scanner" HOMEPAGE="https://nsat.sourceforge.net/" -SRC_URI="mirror://sourceforge/nsat/${P}.tgz" +SRC_URI="https://downloads.sourceforge.net/nsat/${P}.tgz" S="${WORKDIR}/${PN}" LICENSE="GPL-2+" diff --git a/net-analyzer/nsca/nsca-2.7.2-r103.ebuild b/net-analyzer/nsca/nsca-2.7.2-r104.ebuild index bb6a49ecfbfa..6138ae9d1680 100644 --- a/net-analyzer/nsca/nsca-2.7.2-r103.ebuild +++ b/net-analyzer/nsca/nsca-2.7.2-r104.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 DESCRIPTION="Nagios Service Check Acceptor" HOMEPAGE="https://www.nagios.org/" -SRC_URI="mirror://sourceforge/nagios/${P}.tar.gz" +SRC_URI="https://downloads.sourceforge.net/nagios/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" @@ -27,7 +27,7 @@ RDEPEND="${DEPEND} net-analyzer/nagios ) ) - sys-apps/openrc" + || ( sys-apps/openrc sys-apps/openrc-navi )" src_configure() { use tcpd || export ac_cv_lib_wrap_main=no diff --git a/net-analyzer/nstats/nstats-0.4-r3.ebuild b/net-analyzer/nstats/nstats-0.4-r4.ebuild index 65b96057aa7b..29ee8957fee9 100644 --- a/net-analyzer/nstats/nstats-0.4-r3.ebuild +++ b/net-analyzer/nstats/nstats-0.4-r4.ebuild @@ -1,14 +1,15 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 + inherit autotools flag-o-matic DESCRIPTION="Displays statistics about ethernet traffic including protocol breakdown" -SRC_URI="http://trash.net/~reeler/nstats/files/${P}.tar.gz" HOMEPAGE="http://trash.net/~reeler/nstats/" -LICENSE="Artistic" +SRC_URI="http://trash.net/~reeler/nstats/files/${P}.tar.gz" +LICENSE="Artistic" SLOT="0" KEYWORDS="amd64 ~ppc x86" @@ -16,15 +17,15 @@ RDEPEND=" net-libs/libpcap sys-libs/ncurses " -DEPEND=" - ${RDEPEND} - virtual/pkgconfig -" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" + PATCHES=( "${FILESDIR}"/${P}-glibc24.patch "${FILESDIR}"/${P}-makefile.patch "${FILESDIR}"/${P}-tinfo.patch ) + DOCS=( BUGS doc/TODO doc/ChangeLog ) src_prepare() { @@ -34,5 +35,7 @@ src_prepare() { src_configure() { append-cflags -fcommon + # Conflicting definitions of quit() (bug #861227) + filter-lto default } diff --git a/net-analyzer/ntopng/Manifest b/net-analyzer/ntopng/Manifest index 88d1b021acfd..b2beb8993ffe 100644 --- a/net-analyzer/ntopng/Manifest +++ b/net-analyzer/ntopng/Manifest @@ -1,3 +1,5 @@ DIST ntopng-5.2.1.tar.gz 60280025 BLAKE2B e7885a1ec9e5d37ee06def83a83c62f41acf87d939d18c33c8d114fe0bed0c973a6146f26fd92343aa7c7e7484970c3e95c33fe76468fe382809daddeed6541b SHA512 01cdf21deac61a3b11e7d0e6b662c911123241332e812bb676cb8c5c003fe1d50a4c61231f9c327d467e89dd1345fc1bdbab5d2599fe04b04a8fe12654c01bdd DIST ntopng-5.6-web-90d81ad0281eb6eb582a683ac321a3959abb1269.tar.gz 2525957 BLAKE2B 5ae068ab4c0bae7c6cde7071dd056d3d717d0ae50ce0fe0f9e71fcbf8ab8ee51cdb2d3b05f095ce96921378361ff013d893a40496f1ce50da8ba4c65dc166fc0 SHA512 cd3f8c660b632bffb2baac4d163b055a64b05f510a0744c8d27689cabb3959d15d5cfa763fcf583e57d23dbcd73857360bae7d25bd9aa66682858e7ca985c21e DIST ntopng-5.6.tar.gz 46318113 BLAKE2B 48702b55c239edca46d6cdecb846ac358c9a829a261eee128444bd994b967c962577a419466f139a2aefdd3a51485d2bb17bf39b8f35a9a31322c40c07203a5d SHA512 c4ab79f98b2dc99218cd0c7ac0ed7275d23e7a161de742632f3ec7a538ea4948ba906d40e7fd2ba36fb4bd9be86ecc69f5df65e7f81607e6da489863947b2da5 +DIST ntopng-6.0-web-34c53388e8da61e6e04b3efd8e98dcd9b9e4fe1b.tar.gz 2890924 BLAKE2B 476ce4ea83fbd1241c12e2cd486f97570457721fd7a7e78e0e7b04ae80c4a69beb37a00e6fb6e47783f9296371cc92b4c9347016bc971d815a3af83d1671eb1d SHA512 f9a1cf583c8d513a543498c9712ab40b9c1978877c5a86c0ec89bd26e9f66b8d90a0700f417bd7166b0b683e5091a3a1d30d4888564ae4220e62a9d82d17bc64 +DIST ntopng-6.0.tar.gz 68289620 BLAKE2B 7edbd1b6231fdd1592f1b6ecca9f96dc79513dce1c53db70fb7b721ea483738dc0e74107ca15629c430e14ca7e461053967abc35de09e303e36ded9ed9994b43 SHA512 d9d27bed0706d36c82a5b22b2b918014fed7d614e11c79cc47ee1033ae5fd2f703a67f3c5205c63c014bbd2839eb7c78616137ee6cc11d09ebcf6fafc7a658d2 diff --git a/net-analyzer/ntopng/files/ntopng-6.0-dont-const-cast-argv.patch b/net-analyzer/ntopng/files/ntopng-6.0-dont-const-cast-argv.patch new file mode 100644 index 000000000000..199db074097e --- /dev/null +++ b/net-analyzer/ntopng/files/ntopng-6.0-dont-const-cast-argv.patch @@ -0,0 +1,34 @@ +The patch is borrowed from upstream https://github.com/ntop/ntopng + +https://github.com/ntop/ntopng/commit/5069aa4a6259bd0830a33f2ece980612dba5ace9 + +commit 5069aa4a6259bd0830a33f2ece980612dba5ace9 (HEAD -> 6.0-stable, origin/6.0-stable) +Author: Denis Pronin <dannftk@yandex.ru> +Date: Sat Jun 8 09:29:51 2024 +0300 + + fix building when rrd_tune() function has const char** as the 2nd param (#8442) + + Signed-off-by: Denis Pronin <dannftk@yandex.ru> + +diff --git a/src/LuaEngineNtop.cpp b/src/LuaEngineNtop.cpp +index 42e41822c..ea8e3769f 100644 +--- a/src/LuaEngineNtop.cpp ++++ b/src/LuaEngineNtop.cpp +@@ -21,6 +21,8 @@ + + #include "ntop_includes.h" + ++#include <type_traits> ++ + extern "C" { + #include "rrd.h" + }; +@@ -6296,7 +6298,7 @@ static int ntop_rrd_tune(lua_State *vm) { + filename = argv[1]; + + reset_rrd_state(); +- status = rrd_tune(argc, (char **)argv); ++ status = rrd_tune(argc, (std::conditional<std::is_same<decltype(rrd_tune), int(int, const char **)>::value, const char **, char **>::type)argv); + + if (status != 0) { + char *err = rrd_get_error(); diff --git a/net-analyzer/ntopng/ntopng-6.0.ebuild b/net-analyzer/ntopng/ntopng-6.0.ebuild new file mode 100644 index 000000000000..1a56defdbdc9 --- /dev/null +++ b/net-analyzer/ntopng/ntopng-6.0.ebuild @@ -0,0 +1,104 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools toolchain-funcs + +# Check this on bumps, get latest commit from the relevant branch (e.g. 6.0-stable) +# See bug #894152 and https://github.com/ntop/ntopng/issues/7203 +NTOPNG_DIST_COMMIT="34c53388e8da61e6e04b3efd8e98dcd9b9e4fe1b" +DESCRIPTION="Network traffic analyzer with web interface" +HOMEPAGE="https://www.ntop.org/" +SRC_URI="https://github.com/ntop/ntopng/archive/${PV}.tar.gz -> ${P}.tar.gz" +SRC_URI+=" https://github.com/ntop/ntopng-dist/archive/${NTOPNG_DIST_COMMIT}.tar.gz -> ${P}-web-${NTOPNG_DIST_COMMIT}.tar.gz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +DEPEND="dev-db/mysql-connector-c:= + dev-db/sqlite:3 + dev-libs/hiredis:= + dev-libs/json-c:= + dev-libs/libmaxminddb + dev-libs/libsodium:= + dev-libs/openssl:= + net-analyzer/rrdtool + net-libs/libpcap + ~net-libs/nDPI-4.8 + >=net-libs/zeromq-3:= + net-misc/curl + sys-libs/libcap + sys-libs/zlib" +RDEPEND="${DEPEND} + acct-user/ntopng + acct-group/ntopng + dev-db/redis" +BDEPEND="virtual/pkgconfig" + +PATCHES=( + "${FILESDIR}"/${PN}-5.2.1-mysqltool.patch + "${FILESDIR}"/${PN}-5.4-ndpi-linking.patch + "${FILESDIR}"/${PN}-6.0-dont-const-cast-argv.patch +) + +src_prepare() { + default + + # Follows upstream's autogen.sh + sed \ + -e "s/@VERSION@/${PV}.$(date +%y%m%d)/g" \ + -e "s/@SHORT_VERSION@/${PV}/g" \ + -e "s/@GIT_DATE@/$(date)/g" \ + -e "s/@GIT_RELEASE@/${PV}.$(date +%y%m%d)/g" \ + -e "s/@GIT_BRANCH@//g" < "${S}/configure.ac.in" \ + > "${S}/configure.ac" || die + + eautoreconf +} + +src_configure() { + tc-export PKG_CONFIG + + # configure.ac.in at least has some bashisms(?) which get lost(?) + # in conversion to configure.ac (like [ -> nothing?) so just force + # bash for now. It's still not quite right but at least upstream will be + # testing with it. TODO: fix this! + CONFIG_SHELL="${BROOT}/bin/bash" econf --with-ndpi-includes="${ESYSROOT}"/usr/include/ndpi +} + +src_compile() { + emake \ + CC="$(tc-getCC)" \ + MYCFLAGS="${CFLAGS}" \ + MYLDFLAGS="${LDFLAGS}" +} + +src_install() { + SHARE_NTOPNG_DIR="${EPREFIX}/usr/share/${PN}" + insinto "${SHARE_NTOPNG_DIR}" + doins -r httpdocs + doins -r scripts + + insinto "${SHARE_NTOPNG_DIR}"/httpdocs/dist + doins -r "${WORKDIR}"/ntopng-dist-${NTOPNG_DIST_COMMIT}/. + + insinto "${SHARE_NTOPNG_DIR}/third-party" + doins -r third-party/i18n.lua-master + doins -r third-party/lua-resty-template-master + + exeinto /usr/bin + doexe "${PN}" + doman "${PN}.8" + + newinitd "${FILESDIR}"/ntopng.init.d ntopng + newconfd "${FILESDIR}"/ntopng.conf.d ntopng + + keepdir /var/lib/ntopng + fowners ntopng /var/lib/ntopng +} + +pkg_postinst() { + elog "ntopng default credentials are user='admin' password='admin'" +} diff --git a/net-analyzer/nuttcp/nuttcp-8.1.4.ebuild b/net-analyzer/nuttcp/nuttcp-8.1.4-r1.ebuild index 97c01c07adc1..e45ea3aabc0a 100644 --- a/net-analyzer/nuttcp/nuttcp-8.1.4.ebuild +++ b/net-analyzer/nuttcp/nuttcp-8.1.4-r1.ebuild @@ -1,18 +1,18 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 inherit readme.gentoo-r1 systemd toolchain-funcs DESCRIPTION="Network performance measurement tool" -HOMEPAGE="http://www.nuttcp.net/" -SRC_URI="http://nuttcp.net/${PN}/${P}.tar.bz2" +HOMEPAGE="https://www.nuttcp.net/" +SRC_URI="https://nuttcp.net/${PN}/${P}.tar.bz2" LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="ipv6 xinetd" +IUSE="xinetd" RDEPEND="xinetd? ( sys-apps/xinetd )" @@ -36,13 +36,13 @@ src_prepare() { } src_compile() { - emake "$(usex ipv6 APPEXT='' NOIPV6=-DNO_IPV6)" CC="$(tc-getCC)" + emake APPEXT='' CC="$(tc-getCC)" } src_install() { einstalldocs doman "${PN}".8 - newbin "${P}$(usex ipv6 '' -noipv6)" "${PN}" + newbin "${P}" "${PN}" newinitd "${FILESDIR}"/"${PN}".initd "${PN}" newconfd "${FILESDIR}"/"${PN}".confd "${PN}" diff --git a/net-analyzer/odhcploc/odhcploc-20111021-r1.ebuild b/net-analyzer/odhcploc/odhcploc-20111021-r1.ebuild deleted file mode 100644 index 5c4e1b3c9e95..000000000000 --- a/net-analyzer/odhcploc/odhcploc-20111021-r1.ebuild +++ /dev/null @@ -1,23 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit toolchain-funcs - -DESCRIPTION="Open DHCP Locator" -HOMEPAGE="https://odhcploc.sourceforge.io" -SRC_URI="mirror://sourceforge/project/${PN}/${PV}/${P}.tar.gz" - -LICENSE="ISC" -SLOT="0" -KEYWORDS="~amd64" - -src_configure() { - tc-export CC -} - -src_install() { - dobin ${PN} - doman ${PN}.8 - dodoc AUTHORS -} diff --git a/net-analyzer/odhcploc/odhcploc-20111021-r2.ebuild b/net-analyzer/odhcploc/odhcploc-20111021-r2.ebuild index 959b386e9a07..24cc8e6c719e 100644 --- a/net-analyzer/odhcploc/odhcploc-20111021-r2.ebuild +++ b/net-analyzer/odhcploc/odhcploc-20111021-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -7,12 +7,16 @@ inherit toolchain-funcs DESCRIPTION="Open DHCP Locator" HOMEPAGE="https://odhcploc.sourceforge.io" -SRC_URI="mirror://sourceforge/project/${PN}/${PV}/${P}.tar.gz" +SRC_URI="https://downloads.sourceforge.net/project/${PN}/${PV}/${P}.tar.gz" LICENSE="ISC" SLOT="0" KEYWORDS="~amd64" +DEPEND=" + elibc_musl? ( sys-libs/queue-standalone ) +" + src_configure() { # Don't clobber toolchain defaults sed -i -e 's:-Wp,-D_FORTIFY_SOURCE=2::' Makefile || die diff --git a/net-analyzer/oinkmaster/oinkmaster-2.0.ebuild b/net-analyzer/oinkmaster/oinkmaster-2.0.ebuild index 121c74ab8df2..30f1a1a8401a 100644 --- a/net-analyzer/oinkmaster/oinkmaster-2.0.ebuild +++ b/net-analyzer/oinkmaster/oinkmaster-2.0.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 DESCRIPTION="Rule management for SNORT" HOMEPAGE="https://oinkmaster.sourceforge.net/" -SRC_URI="mirror://sourceforge/oinkmaster/${P}.tar.gz" +SRC_URI="https://downloads.sourceforge.net/oinkmaster/${P}.tar.gz" LICENSE="BSD" SLOT="0" diff --git a/net-analyzer/openvas-scanner/Manifest b/net-analyzer/openvas-scanner/Manifest index 9d63bbf84110..a8294a39bc80 100644 --- a/net-analyzer/openvas-scanner/Manifest +++ b/net-analyzer/openvas-scanner/Manifest @@ -1,2 +1,4 @@ -DIST openvas-scanner-22.7.8.tar.gz 1069693 BLAKE2B 7b046102efe81092102933d3aa50479e4d3dca3a376d94cef4305519335e4e01add8971485272a0f79cb10ef7cfebf12657b13832e4e6eb7860df3a05c99259f SHA512 acd2dd738f0f5ccda7bea248decaf68e571864666c6749e372dac1f0ec152dcfa2945adb98fad509d4f00dc09f34b91b3dc1760c22f6458ca45eeeb6af2c886b DIST openvas-scanner-22.7.9.tar.gz 1069904 BLAKE2B 908810997880d1267f41df59905acc2ac2d491ab8453001ae8e2cc6881958150e8866b07b4e335888e8e574b5a347b33880bd24c9b8d140edd6c384e498e5dc9 SHA512 279a781fe698496fb88efd28c0ee6ede66a0180237b60c4d7b083fe10c7b7ac054ec04b08c9b33e6dd142f60529faedfef4441421cc04e95eaa08865e47b58dd +DIST openvas-scanner-23.0.1.tar.gz 1387550 BLAKE2B 22f0b7f10fbb8be7d0897ce1895035ec9e330adee2a56d7c724e9e9fd54808ed10de5f05b3bb02918e44e45a7f85035e7d63fdd89345dcdb09d5180740823c74 SHA512 e2107ca762abcbb20d4506d2cc4479d5fbf5efd744a598ec63ea3c66ae6a6f1743deeb4b7aa9863b78c186c8a4d4b5f2212d241cef51b91c6c5bcd0879c45dc7 +DIST openvas-scanner-23.3.0.tar.gz 1416508 BLAKE2B de5864183b19df7b825bb74a5c38493b484494c5ef0f871f83e77efd6f6ce9934fd0a2365c5e7fe2b53e0c3f0c6a0eccd57528571dcd8586cbe5ef575aa5ec4f SHA512 cebe73f376a0b7731ffcb3eb9eb6e223ad490d8c0b708f07f508c562f2cfea956fa61e2bfb9141d2bf826c727be901ef2f455b74c055032f72cd52b7591bd171 +DIST openvas-scanner-23.3.2.tar.gz 1416687 BLAKE2B 6d8b0ba5b0a6f503ef27962fc9007f5538ecc6747aa713baec402acb20c5f7da01743a055173ed736ea90beb6d62f54ad8db8bffc915ce946416553f953b9842 SHA512 045a0811b5480170e52a218c8005d01acf064658aa0c3999ec9c07df9a0da47c53ad3de17565c1542c6f13521153e0477e9fdf92dee5f05e6723e29915cebc15 diff --git a/net-analyzer/openvas-scanner/files/openvas-scanner-23.0.1-link-pcap.patch b/net-analyzer/openvas-scanner/files/openvas-scanner-23.0.1-link-pcap.patch new file mode 100644 index 000000000000..9d7294708360 --- /dev/null +++ b/net-analyzer/openvas-scanner/files/openvas-scanner-23.0.1-link-pcap.patch @@ -0,0 +1,16 @@ +Fixes underlinking pcatp lib in nasl/CMakeLists.txt +Upstream PR: https://github.com/greenbone/openvas-scanner/pull/1611 + +diff --git a/nasl/CMakeLists.txt b/nasl/CMakeLists.txt +index 975154a..dd1b925 100644 +--- a/nasl/CMakeLists.txt ++++ b/nasl/CMakeLists.txt +@@ -188,7 +188,7 @@ set_target_properties (openvas_nasl_shared PROPERTIES CLEAN_DIRECT_OUTPUT 1) + set_target_properties (openvas_nasl_shared PROPERTIES SOVERSION "${PROJECT_VERSION_MAJOR}") + set_target_properties (openvas_nasl_shared PROPERTIES VERSION "${PROJECT_VERSION_STRING}") + # line below is needed so it also works with no-undefined which is e.g. used by Mandriva +-target_link_libraries (openvas_nasl_shared openvas_misc_shared ${GLIB_LDFLAGS} ++target_link_libraries (openvas_nasl_shared openvas_misc_shared pcap ${GLIB_LDFLAGS} + ${LIBOPENVAS_MISC_LDFLAGS} + ${GLIB_JSON_LDFLAGS} + ${GCRYPT_LDFLAGS} ${GPGME_LDFLAGS} m diff --git a/net-analyzer/openvas-scanner/files/openvas-scanner-23.3.0-link-curl.patch b/net-analyzer/openvas-scanner/files/openvas-scanner-23.3.0-link-curl.patch new file mode 100644 index 000000000000..7fc9972a04b7 --- /dev/null +++ b/net-analyzer/openvas-scanner/files/openvas-scanner-23.3.0-link-curl.patch @@ -0,0 +1,69 @@ +Fixes underlinking curl lib in nasl/CMakeLists.txt +Upstream PR: https://github.com/greenbone/openvas-scanner/pull/1647 + +From d070e15547bf8377b90ed660c099c82fb30e2d32 Mon Sep 17 00:00:00 2001 +From: Giuseppe Foti <foti.giuseppe@gmail.com> +Date: Sat, 18 May 2024 18:53:19 +0200 +Subject: [PATCH 1/2] link curl + +Signed-off-by: Giuseppe Foti <foti.giuseppe@gmail.com> +--- a/nasl/CMakeLists.txt ++++ b/nasl/CMakeLists.txt +@@ -188,7 +188,7 @@ set_target_properties (openvas_nasl_shared PROPERTIES CLEAN_DIRECT_OUTPUT 1) + set_target_properties (openvas_nasl_shared PROPERTIES SOVERSION "${PROJECT_VERSION_MAJOR}") + set_target_properties (openvas_nasl_shared PROPERTIES VERSION "${PROJECT_VERSION_STRING}") + # line below is needed so it also works with no-undefined which is e.g. used by Mandriva +-target_link_libraries (openvas_nasl_shared openvas_misc_shared pcap ${GLIB_LDFLAGS} ++target_link_libraries (openvas_nasl_shared openvas_misc_shared curl pcap ${GLIB_LDFLAGS} + ${LIBOPENVAS_MISC_LDFLAGS} + ${GLIB_JSON_LDFLAGS} + ${GCRYPT_LDFLAGS} ${GPGME_LDFLAGS} m +-- +2.43.2 + + +From 17475b6e7e3b0bf4ccc56915b1ea69adadfda0a5 Mon Sep 17 00:00:00 2001 +From: Giuseppe Foti <foti.giuseppe@gmail.com> +Date: Sat, 18 May 2024 18:54:04 +0200 +Subject: [PATCH 2/2] Remove redundant whitespaces + +Signed-off-by: Giuseppe Foti <foti.giuseppe@gmail.com> +--- a/nasl/CMakeLists.txt ++++ b/nasl/CMakeLists.txt +@@ -172,7 +172,7 @@ add_definitions (-DOPENVAS_GPG_BASE_DIR="${OPENVAS_GPG_BASE_DIR}") + + include_directories (${GLIB_INCLUDE_DIRS} + ${LIBOPENVAS_MISC_INCLUDE_DIRS} +- ${GLIB_JSON_INCLUDE_DIRS} ++ ${GLIB_JSON_INCLUDE_DIRS} + ${GPGME_INCLUDE_DIRS} + ${LIBSSH_INCLUDE_DIRS} + ${LIBGVM_BASE_INCLUDE_DIRS} +@@ -181,7 +181,7 @@ include_directories (${GLIB_INCLUDE_DIRS} + ${GCRYPT_INCLUDE_DIRS}) + + +-# Build shared ++# Build shared + add_library (openvas_nasl_shared SHARED ${FILES}) + set_target_properties (openvas_nasl_shared PROPERTIES OUTPUT_NAME "openvas_nasl") + set_target_properties (openvas_nasl_shared PROPERTIES CLEAN_DIRECT_OUTPUT 1) +@@ -190,7 +190,7 @@ set_target_properties (openvas_nasl_shared PROPERTIES VERSION "${PROJECT_VERSION + # line below is needed so it also works with no-undefined which is e.g. used by Mandriva + target_link_libraries (openvas_nasl_shared openvas_misc_shared curl pcap ${GLIB_LDFLAGS} + ${LIBOPENVAS_MISC_LDFLAGS} +- ${GLIB_JSON_LDFLAGS} ++ ${GLIB_JSON_LDFLAGS} + ${GCRYPT_LDFLAGS} ${GPGME_LDFLAGS} m + ${LIBGVM_BASE_LDFLAGS} + ${LIBGVM_UTIL_LDFLAGS} +@@ -219,5 +219,5 @@ install (FILES ${CMAKE_SOURCE_DIR}/doc/man/openvas-nasl.1 + DESTINATION ${DATADIR}/man/man1 ) + + install (FILES ${CMAKE_SOURCE_DIR}/doc/man/openvas-nasl-lint.1 +- DESTINATION ${DATADIR}/man/man1 ) ++ DESTINATION ${DATADIR}/man/man1 ) + ## End +-- +2.43.2 + diff --git a/net-analyzer/openvas-scanner/openvas-scanner-23.0.1.ebuild b/net-analyzer/openvas-scanner/openvas-scanner-23.0.1.ebuild new file mode 100644 index 000000000000..8e66176a615b --- /dev/null +++ b/net-analyzer/openvas-scanner/openvas-scanner-23.0.1.ebuild @@ -0,0 +1,162 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake systemd tmpfiles toolchain-funcs readme.gentoo-r1 optfeature + +MY_DN="openvas" + +DESCRIPTION="Open Vulnerability Assessment Scanner" +HOMEPAGE="https://www.greenbone.net https://github.com/greenbone/openvas-scanner/" +SRC_URI=" + https://github.com/greenbone/openvas-scanner/archive/v${PV}.tar.gz -> ${P}.tar.gz +" + +SLOT="0" +LICENSE="GPL-2 GPL-2+" +KEYWORDS="~amd64 ~x86" +IUSE="doc snmp test" +RESTRICT="!test? ( test )" + +DEPEND=" + acct-user/gvm + app-crypt/gpgme:= + >=dev-db/redis-5.0.3 + >=dev-libs/glib-2.42:2 + >=dev-libs/libgcrypt-1.6:= + dev-libs/libgpg-error + >=dev-libs/libksba-1.0.7 + dev-libs/libbsd + >=net-libs/libssh-0.6.0:= + >=dev-libs/json-glib-1.4.4 + >=net-analyzer/gvm-libs-22.4 + >=net-libs/gnutls-3.6.4:= + net-libs/libpcap + >=net-misc/curl-7.74.0[ssl] + snmp? ( net-analyzer/net-snmp:= ) +" +RDEPEND="${DEPEND}" +BDEPEND=" + >=sys-devel/bison-2.5 + app-alternatives/lex + virtual/pkgconfig + doc? ( + app-text/doxygen[dot] + app-text/xmltoman + app-text/htmldoc + dev-perl/CGI + dev-perl/SQL-Translator + virtual/pandoc + ) + test? ( dev-libs/cgreen ) +" +PATCHES=( + # See https://github.com/greenbone/openvas-scanner/pull/1611 + "${FILESDIR}"/openvas-scanner-23.0.1-link-pcap.patch +) + +src_prepare() { + cmake_src_prepare + # QA-Fix | Remove -Werror compiler flag + sed -i -e "s/-Werror//" "${S}"/CMakeLists.txt || die #909560 + # QA-Fix | Remove !CLANG doxygen warnings for 7.0.0 + if use doc; then + if ! tc-is-clang; then + local f + for f in doc/*.in + do + sed -i \ + -e "s*CLANG_ASSISTED_PARSING = NO*#CLANG_ASSISTED_PARSING = NO*g" \ + -e "s*CLANG_OPTIONS*#CLANG_OPTIONS*g" \ + "${f}" || die "couldn't disable CLANG parsing" + done + fi + fi + + #Remove tests that doesn't work in the network sandbox + if use test; then + sed -i 's/add_test (pcap-test pcap-test)/ /g' misc/CMakeLists.txt || die + fi +} + +src_configure() { + local mycmakeargs=( + "-DLOCALSTATEDIR=${EPREFIX}/var" + "-DSYSCONFDIR=${EPREFIX}/etc" + "-DSBINDIR=${EPREFIX}/usr/bin" + "-DOPENVAS_FEED_LOCK_PATH=${EPREFIX}/var/lib/openvas/feed-update.lock" + "-DOPENVAS_RUN_DIR=/run/ospd" + "-DBUILD_WITH_NETSNMP=$(usex snmp)" + ) + cmake_src_configure +} + +src_compile() { + cmake_src_compile + if use doc; then + cmake_build -C "${BUILD_DIR}" doxygen-full manual + fi + cmake_build rebuild_cache + if use test; then + cmake_build tests + fi +} + +src_install() { + if use doc; then + mv "${BUILD_DIR}"/doc/html "${BUILD_DIR}"/doc/html-manual || die + local HTML_DOCS=( + "${BUILD_DIR}"/doc/generated/html/. + "${BUILD_DIR}"/doc/html-manual + ) + fi + cmake_src_install + + insinto /etc/logrotate.d + newins "${FILESDIR}/${MY_DN}.logrotate" "${MY_DN}" + + # Set proper permissions on required files/directories + keepdir /var/log/gvm + if ! use prefix; then + fowners gvm:gvm /var/log/gvm + fi + + keepdir /var/lib/openvas/{gnupg,plugins} + if ! use prefix; then + fowners -R gvm:gvm /var/lib/openvas + fi + + insinto /etc/openvas + newins "${FILESDIR}/openvas.conf-22" openvas.conf + + systemd_newunit "${FILESDIR}/redis-openvas.service" redis-openvas.service + newtmpfiles "${FILESDIR}/redis-openvas.tmpfiles" redis-openvas.conf + + insinto /etc/gvm + doins config/redis-openvas.conf + if ! use prefix; then + fowners -R gvm:gvm /etc/gvm /etc/gvm/redis-openvas.conf + fi + + fperms 0750 /etc/gvm + fperms 0640 /etc/gvm/redis-openvas.conf + + newconfd "${FILESDIR}/redis-openvas.confd" redis-openvas + newinitd "${FILESDIR}/redis-openvas.initd" redis-openvas + + if use prefix; then + diropts -m0750 + else + diropts -m0750 -o gvm -g gvm + fi + keepdir /var/lib/openvas/redis + + readme.gentoo_create_doc +} + +pkg_postinst() { + tmpfiles_process redis-openvas.conf + optfeature "port scanner" net-analyzer/nmap + readme.gentoo_print_elog +} diff --git a/net-analyzer/openvas-scanner/openvas-scanner-23.3.0.ebuild b/net-analyzer/openvas-scanner/openvas-scanner-23.3.0.ebuild new file mode 100644 index 000000000000..b26024cee8d1 --- /dev/null +++ b/net-analyzer/openvas-scanner/openvas-scanner-23.3.0.ebuild @@ -0,0 +1,161 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake systemd tmpfiles toolchain-funcs readme.gentoo-r1 optfeature + +MY_DN="openvas" + +DESCRIPTION="Open Vulnerability Assessment Scanner" +HOMEPAGE="https://www.greenbone.net https://github.com/greenbone/openvas-scanner/" +SRC_URI=" + https://github.com/greenbone/openvas-scanner/archive/v${PV}.tar.gz -> ${P}.tar.gz +" + +LICENSE="GPL-2 GPL-2+" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="doc snmp test" +RESTRICT="!test? ( test )" + +DEPEND=" + acct-user/gvm + app-crypt/gpgme:= + >=dev-db/redis-5.0.3 + >=dev-libs/glib-2.42:2 + >=dev-libs/libgcrypt-1.6:= + dev-libs/libgpg-error + >=dev-libs/libksba-1.0.7 + dev-libs/libbsd + >=net-libs/libssh-0.6.0:= + >=dev-libs/json-glib-1.4.4 + >=net-analyzer/gvm-libs-22.4 + >=net-libs/gnutls-3.6.4:= + net-libs/libpcap + >=net-misc/curl-7.74.0[ssl] + snmp? ( net-analyzer/net-snmp:= ) +" +RDEPEND="${DEPEND}" +BDEPEND=" + >=sys-devel/bison-2.5 + app-alternatives/lex + virtual/pkgconfig + doc? ( + app-text/doxygen[dot] + app-text/xmltoman + app-text/htmldoc + dev-perl/CGI + dev-perl/SQL-Translator + virtual/pandoc + ) + test? ( dev-libs/cgreen ) +" +PATCHES=( + # See https://github.com/greenbone/openvas-scanner/pull/1647 + "${FILESDIR}"/openvas-scanner-23.3.0-link-curl.patch +) +src_prepare() { + cmake_src_prepare + # QA-Fix | Remove -Werror compiler flag + sed -i -e "s/-Werror//" "${S}"/CMakeLists.txt || die #909560 + # QA-Fix | Remove !CLANG doxygen warnings for 7.0.0 + if use doc; then + if ! tc-is-clang; then + local f + for f in doc/*.in + do + sed -i \ + -e "s*CLANG_ASSISTED_PARSING = NO*#CLANG_ASSISTED_PARSING = NO*g" \ + -e "s*CLANG_OPTIONS*#CLANG_OPTIONS*g" \ + "${f}" || die "couldn't disable CLANG parsing" + done + fi + fi + + #Remove tests that doesn't work in the network sandbox + if use test; then + sed -i 's/add_test (pcap-test pcap-test)/ /g' misc/CMakeLists.txt || die + fi +} + +src_configure() { + local mycmakeargs=( + "-DLOCALSTATEDIR=${EPREFIX}/var" + "-DSYSCONFDIR=${EPREFIX}/etc" + "-DSBINDIR=${EPREFIX}/usr/bin" + "-DOPENVAS_FEED_LOCK_PATH=${EPREFIX}/var/lib/openvas/feed-update.lock" + "-DOPENVAS_RUN_DIR=/run/ospd" + "-DBUILD_WITH_NETSNMP=$(usex snmp)" + ) + cmake_src_configure +} + +src_compile() { + cmake_src_compile + if use doc; then + cmake_build -C "${BUILD_DIR}" doxygen-full manual + fi + cmake_build rebuild_cache + if use test; then + cmake_build tests + fi +} + +src_install() { + if use doc; then + mv "${BUILD_DIR}"/doc/html "${BUILD_DIR}"/doc/html-manual || die + local HTML_DOCS=( + "${BUILD_DIR}"/doc/generated/html/. + "${BUILD_DIR}"/doc/html-manual + ) + fi + cmake_src_install + + insinto /etc/logrotate.d + newins "${FILESDIR}/${MY_DN}.logrotate" "${MY_DN}" + + # Set proper permissions on required files/directories + keepdir /var/log/gvm + if ! use prefix; then + fowners gvm:gvm /var/log/gvm + fi + + keepdir /var/lib/openvas/{gnupg,plugins} + if ! use prefix; then + fowners -R gvm:gvm /var/lib/openvas + fi + + insinto /etc/openvas + newins "${FILESDIR}/openvas.conf-22" openvas.conf + + systemd_newunit "${FILESDIR}/redis-openvas.service" redis-openvas.service + newtmpfiles "${FILESDIR}/redis-openvas.tmpfiles" redis-openvas.conf + + insinto /etc/gvm + doins config/redis-openvas.conf + if ! use prefix; then + fowners -R gvm:gvm /etc/gvm /etc/gvm/redis-openvas.conf + fi + + fperms 0750 /etc/gvm + fperms 0640 /etc/gvm/redis-openvas.conf + + newconfd "${FILESDIR}/redis-openvas.confd" redis-openvas + newinitd "${FILESDIR}/redis-openvas.initd" redis-openvas + + if use prefix; then + diropts -m0750 + else + diropts -m0750 -o gvm -g gvm + fi + keepdir /var/lib/openvas/redis + + readme.gentoo_create_doc +} + +pkg_postinst() { + tmpfiles_process redis-openvas.conf + optfeature "port scanner" net-analyzer/nmap + readme.gentoo_print_elog +} diff --git a/net-analyzer/openvas-scanner/openvas-scanner-22.7.8.ebuild b/net-analyzer/openvas-scanner/openvas-scanner-23.3.2.ebuild index 57daa813f540..b8b26ec02987 100644 --- a/net-analyzer/openvas-scanner/openvas-scanner-22.7.8.ebuild +++ b/net-analyzer/openvas-scanner/openvas-scanner-23.3.2.ebuild @@ -13,26 +13,27 @@ SRC_URI=" https://github.com/greenbone/openvas-scanner/archive/v${PV}.tar.gz -> ${P}.tar.gz " -SLOT="0" LICENSE="GPL-2 GPL-2+" -KEYWORDS="~amd64 ~x86" +SLOT="0" +KEYWORDS="amd64 ~x86" IUSE="doc snmp test" RESTRICT="!test? ( test )" DEPEND=" acct-user/gvm + app-crypt/gpgme:= >=dev-db/redis-5.0.3 >=dev-libs/glib-2.42:2 - >=dev-libs/json-glib-1.4.4 - >=net-libs/gnutls-3.2.15:= - >=net-analyzer/gvm-libs-22.4 - net-libs/libpcap - app-crypt/gpgme:= >=dev-libs/libgcrypt-1.6:= dev-libs/libgpg-error >=dev-libs/libksba-1.0.7 - >=net-libs/libssh-0.6.0:= dev-libs/libbsd + >=net-libs/libssh-0.6.0:= + >=dev-libs/json-glib-1.4.4 + >=net-analyzer/gvm-libs-22.4 + >=net-libs/gnutls-3.6.4:= + net-libs/libpcap + >=net-misc/curl-7.74.0[ssl] snmp? ( net-analyzer/net-snmp:= ) " RDEPEND="${DEPEND}" @@ -82,7 +83,6 @@ src_configure() { "-DSBINDIR=${EPREFIX}/usr/bin" "-DOPENVAS_FEED_LOCK_PATH=${EPREFIX}/var/lib/openvas/feed-update.lock" "-DOPENVAS_RUN_DIR=/run/ospd" - "-DINSTALL_OLD_SYNC_SCRIPT=OFF" "-DBUILD_WITH_NETSNMP=$(usex snmp)" ) cmake_src_configure diff --git a/net-analyzer/opsgenie-lamp/Manifest b/net-analyzer/opsgenie-lamp/Manifest index b0214baa1090..f5e3b547bec3 100644 --- a/net-analyzer/opsgenie-lamp/Manifest +++ b/net-analyzer/opsgenie-lamp/Manifest @@ -1,2 +1 @@ -DIST opsgenie-lamp-2.5.1_p20181102-vendor.tar.gz 204755 BLAKE2B 65c92b5bbbdec8b4bdccad884435273a6aec51c472437de92613dcda76c3a6cff1b84dfe5028713a353b861ff868cb8377e97c9322423b7a887a121a92c9515f SHA512 08f86e1520f2ca6d5208994c5836d511bea13d9e8ccf707a121956e23ff1c6f411d730ab6445ac30158e90d76efcdbbf65a19cef39641493c76b836980b6792a -DIST opsgenie-lamp-2.5.1_p20181102.tar.gz 19259 BLAKE2B 1a4f54b817b0210654f42e4ea1eb9dc29e0416ab37a90ca00ba86788cdcde6a8a7330bd095c238268b7e00525da33a67c4fa0aa68602442887dc81091f802fd2 SHA512 9a2c5d23b530a5c2df99f1b63afcb47d8fb3cdf9a45142f82d52df5c9dd570bad444735d851af3fe03306179076e78ece3be9b1a6b63da04740d0a02752db67a +DIST opsgenie-lamp-3.1.4.tar.gz 994564 BLAKE2B bbc8801b9943eb57bd784ddd7a8f2631e0879c88b6760b9759dc37d95149dbc2c7013544c481f69cd4272bb19eca2df537a5d4a60acd56d5b70a88ad4449fbc8 SHA512 e5770d0188d9e8ef9d9c24f2cc3d160bca75732fff8c6bd1a694f18c604a1c85303b803817c15f461358521eafee029e86475c2f11177c719e173eaf18f4d5c1 diff --git a/net-analyzer/opsgenie-lamp/metadata.xml b/net-analyzer/opsgenie-lamp/metadata.xml index db463f3eeb66..70ad95f30682 100644 --- a/net-analyzer/opsgenie-lamp/metadata.xml +++ b/net-analyzer/opsgenie-lamp/metadata.xml @@ -5,4 +5,7 @@ <email>williamh@gentoo.org</email> <name>William Hubbs</name> </maintainer> + <upstream> + <remote-id type="github">opsgenie/opsgenie-lamp</remote-id> + </upstream> </pkgmetadata> diff --git a/net-analyzer/opsgenie-lamp/opsgenie-lamp-2.5.1_p20181102.ebuild b/net-analyzer/opsgenie-lamp/opsgenie-lamp-2.5.1_p20181102.ebuild deleted file mode 100644 index 8aba54f81df9..000000000000 --- a/net-analyzer/opsgenie-lamp/opsgenie-lamp-2.5.1_p20181102.ebuild +++ /dev/null @@ -1,48 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit vcs-snapshot - -DESCRIPTION="command line client for the opsgenie service" -HOMEPAGE="https://docs.opsgenie.com/docs/lamp-command-line-interface-for-opsgenie" -HASH=062016b -SRC_URI="https://github.com/opsgenie/${PN}/archive/${HASH}.tar.gz -> ${P}.tar.gz - https://dev.gentoo.org/~williamh/dist/${P}-vendor.tar.gz" - -# I followed the following steps to create the vendor tarball: -# -# git clone https://github.com/opsgenie/opsgenie-lamp -# cd opsgenie-lamp -# go mod init # creates go.mod and go.sum -# go mod vendor # updates go.mod/sum and adds vendor directory -# mv -i go.mod go.sum vendor -# tar cf ${P}.tar vendor -# gzip ${P}.tar -# -# Upstream doesn't tag releases, but the most recent version number is -# in the sources, see the lampVersion variable. - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64" - -DEPEND="dev-lang/go:=" - -RESTRICT="strip" - -src_prepare() { - mv ../${P}-vendor vendor || die "mv failed" - mv vendor/go.mod vendor/go.sum . || die "mv failed" - default -} - -src_compile() { - GOCACHE="${T}"/go-cache go build -mod vendor || die "build failed" -} - -src_install() { - newbin ${PN} lamp -dodoc conf/lamp.conf - einstalldocs -} diff --git a/net-analyzer/opsgenie-lamp/opsgenie-lamp-3.1.4.ebuild b/net-analyzer/opsgenie-lamp/opsgenie-lamp-3.1.4.ebuild new file mode 100644 index 000000000000..5f53acd66c72 --- /dev/null +++ b/net-analyzer/opsgenie-lamp/opsgenie-lamp-3.1.4.ebuild @@ -0,0 +1,27 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit go-module + +DESCRIPTION="command line client for the opsgenie service" +HOMEPAGE="https://docs.opsgenie.com/docs/lamp-command-line-interface-for-opsgenie" +SRC_URI="https://github.com/opsgenie/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64" + +# yes, CHANEGLOG.md is a typo in the source +DOCS=( CHANEGLOG.md README.md ) + +src_compile() { + ego build -mod=vendor +} + +src_install() { + newbin ${PN} lamp + dodoc conf/lamp.conf + einstalldocs +} diff --git a/net-analyzer/ospd-openvas/Manifest b/net-analyzer/ospd-openvas/Manifest index bdac8e5c24e7..a4fa3875a5db 100644 --- a/net-analyzer/ospd-openvas/Manifest +++ b/net-analyzer/ospd-openvas/Manifest @@ -1 +1,3 @@ DIST ospd-openvas-22.6.2.tar.gz 246360 BLAKE2B 22c95cafdc6c223465805f30b522d357c28b9da3df74743cdee3cc608215d730da9101c37d2498e9680f506ed1301e12d9af3c8bab1c2a1847c034c7d6c10ca8 SHA512 a405779b9ea89b1300122c39553f8f9bf079b8610dc61ec6244affa9c9273725234a4a556df05e3013045681678646226cf12af66f051def8b042b84bb639ffe +DIST ospd-openvas-22.7.0.tar.gz 246142 BLAKE2B bb5ea9bdc82929958466d2002ce28e63e5ff8c72561758f328c05f0d8c6431f7e305772707027f764fd881334d3c0b993d7f1727f8d7d16da83cc34b9a608895 SHA512 5a2c533589dc7a27a1be1b834243054eaf1bdb250fc41a98b0b35e6e60b8a2793e0e1d7dcd8bbf638bf23da1636efb5a80310df75727990768035743300ca8b1 +DIST ospd-openvas-22.7.1.tar.gz 250148 BLAKE2B 7840376790f451e9316ad33556bac49e9672c7911ac0e3813e4c3a182a06b2c603fa80fa6ac6d2822c87ca35df172d99a3b60d3e16649328387267080572a507 SHA512 ae7fe56a2b825efc33d9e29f2a51ab1034155ee70a5790d98f3b811a29f4b35830afabc27abd14593d74e1bcc5dac0ea1cd33ed46cc3ca459256a4b452e10552 diff --git a/net-analyzer/ospd-openvas/ospd-openvas-22.7.0.ebuild b/net-analyzer/ospd-openvas/ospd-openvas-22.7.0.ebuild new file mode 100644 index 000000000000..99c6e7b40fe7 --- /dev/null +++ b/net-analyzer/ospd-openvas/ospd-openvas-22.7.0.ebuild @@ -0,0 +1,87 @@ +# Copyright 2020-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..12} ) +DISTUTILS_USE_PEP517=poetry +inherit distutils-r1 systemd + +DESCRIPTION="This is an OSP server implementation to allow GVM to remotely control OpenVAS" +HOMEPAGE="https://www.greenbone.net https://github.com/greenbone/ospd-openvas" +SRC_URI="https://github.com/greenbone/ospd-openvas/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="AGPL-3+ GPL-2+" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="doc +notus" + +DEPEND=" + acct-user/gvm + >=dev-python/defusedxml-0.6[${PYTHON_USEDEP}] + <dev-python/defusedxml-0.8[${PYTHON_USEDEP}] + >=dev-python/deprecated-1.2.10[${PYTHON_USEDEP}] + >=dev-python/lxml-4.5.2[${PYTHON_USEDEP}] + <dev-python/lxml-6.0.0[${PYTHON_USEDEP}] + >=dev-python/packaging-20.4[${PYTHON_USEDEP}] + <dev-python/packaging-25.0[${PYTHON_USEDEP}] + >=dev-python/psutil-5.5.1[${PYTHON_USEDEP}] + >=dev-python/redis-4.5.0[${PYTHON_USEDEP}] + >=dev-python/python-gnupg-0.4.8[${PYTHON_USEDEP}] + <dev-python/python-gnupg-0.6.0[${PYTHON_USEDEP}] + >=dev-python/paho-mqtt-1.5.1[${PYTHON_USEDEP}] + >=dev-python/python-gnupg-0.4.8[${PYTHON_USEDEP}] + net-libs/paho-mqtt-c + app-misc/mosquitto +" +RDEPEND=" + ${DEPEND} + app-admin/sudo + >=net-analyzer/openvas-scanner-22.4 + notus? ( >=net-analyzer/notus-scanner-22.4 ) +" + +distutils_enable_tests unittest + +python_compile() { + if use doc; then + bash "${S}"/docs/generate || die + HTML_DOCS=( "${S}"/docs/. ) + fi + distutils-r1_python_compile +} + +python_install() { + distutils-r1_python_install + + insinto /etc/gvm + doins config/${PN}.conf + if ! use prefix; then + fowners -R gvm:gvm /etc/gvm + fi + + newinitd "${FILESDIR}/${PN}-22.initd" "${PN}" + newconfd "${FILESDIR}/${PN}-22.confd" "${PN}" + + systemd_dounit config/${PN}.service + + if use notus; then + systemd_install_serviced "${FILESDIR}/ospd-openvas.service_notus.conf" \ + ${PN}.service + else + systemd_install_serviced "${FILESDIR}/ospd-openvas.service.conf" \ + ${PN}.service + fi + + insinto /etc/logrotate.d + newins "${FILESDIR}/ospd-openvas.logrotate" ospd-openvas + + # OSPD OpenVAS attempts to call openvas via sudo as network security + # scanning often requires priviliged operations. + insinto /etc/sudoers.d + newins - openvas <<-EOF + gvm ALL = NOPASSWD: /usr/bin/openvas +EOF + fperms 0750 /etc/sudoers.d + fperms 0440 /etc/sudoers.d/openvas +} diff --git a/net-analyzer/ospd-openvas/ospd-openvas-22.7.1.ebuild b/net-analyzer/ospd-openvas/ospd-openvas-22.7.1.ebuild new file mode 100644 index 000000000000..11a57ec79a7b --- /dev/null +++ b/net-analyzer/ospd-openvas/ospd-openvas-22.7.1.ebuild @@ -0,0 +1,88 @@ +# Copyright 2020-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..12} pypy3 ) +DISTUTILS_USE_PEP517=poetry +inherit distutils-r1 systemd + +DESCRIPTION="This is an OSP server implementation to allow GVM to remotely control OpenVAS" +HOMEPAGE="https://www.greenbone.net https://github.com/greenbone/ospd-openvas" +SRC_URI="https://github.com/greenbone/ospd-openvas/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="AGPL-3+ GPL-2+" +SLOT="0" +KEYWORDS="amd64 ~x86" +IUSE="doc +notus" + +DEPEND=" + acct-user/gvm + >=dev-python/defusedxml-0.6[${PYTHON_USEDEP}] + <dev-python/defusedxml-0.8[${PYTHON_USEDEP}] + >=dev-python/deprecated-1.2.10[${PYTHON_USEDEP}] + >=dev-python/lxml-4.5.2[${PYTHON_USEDEP}] + <dev-python/lxml-6.0.0[${PYTHON_USEDEP}] + >=dev-python/packaging-20.4[${PYTHON_USEDEP}] + <dev-python/packaging-25.0[${PYTHON_USEDEP}] + >=dev-python/psutil-5.5.1[${PYTHON_USEDEP}] + >=dev-python/redis-4.5.0[${PYTHON_USEDEP}] + >=dev-python/python-gnupg-0.4.8[${PYTHON_USEDEP}] + <dev-python/python-gnupg-0.6.0[${PYTHON_USEDEP}] + >=dev-python/paho-mqtt-1.6[${PYTHON_USEDEP}] + <dev-python/paho-mqtt-3[${PYTHON_USEDEP}] + >=dev-python/python-gnupg-0.4.8[${PYTHON_USEDEP}] + net-libs/paho-mqtt-c + app-misc/mosquitto +" +RDEPEND=" + ${DEPEND} + app-admin/sudo + >=net-analyzer/openvas-scanner-22.4 + notus? ( >=net-analyzer/notus-scanner-22.4 ) +" + +distutils_enable_tests unittest + +python_compile() { + if use doc; then + bash "${S}"/docs/generate || die + HTML_DOCS=( "${S}"/docs/. ) + fi + distutils-r1_python_compile +} + +python_install() { + distutils-r1_python_install + + insinto /etc/gvm + doins config/${PN}.conf + if ! use prefix; then + fowners -R gvm:gvm /etc/gvm + fi + + newinitd "${FILESDIR}/${PN}-22.initd" "${PN}" + newconfd "${FILESDIR}/${PN}-22.confd" "${PN}" + + systemd_dounit config/${PN}.service + + if use notus; then + systemd_install_serviced "${FILESDIR}/ospd-openvas.service_notus.conf" \ + ${PN}.service + else + systemd_install_serviced "${FILESDIR}/ospd-openvas.service.conf" \ + ${PN}.service + fi + + insinto /etc/logrotate.d + newins "${FILESDIR}/ospd-openvas.logrotate" ospd-openvas + + # OSPD OpenVAS attempts to call openvas via sudo as network security + # scanning often requires priviliged operations. + insinto /etc/sudoers.d + newins - openvas <<-EOF + gvm ALL = NOPASSWD: /usr/bin/openvas +EOF + fperms 0750 /etc/sudoers.d + fperms 0440 /etc/sudoers.d/openvas +} diff --git a/net-analyzer/pbnj/pbnj-2.04-r1.ebuild b/net-analyzer/pbnj/pbnj-2.04-r1.ebuild index a2a0e1595cf1..2e661641aa78 100644 --- a/net-analyzer/pbnj/pbnj-2.04-r1.ebuild +++ b/net-analyzer/pbnj/pbnj-2.04-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -6,7 +6,7 @@ inherit perl-module DESCRIPTION="Tool for running Nmap scans and diff'ing the results" HOMEPAGE="https://pbnj.sourceforge.net/" -SRC_URI="mirror://sourceforge/pbnj/${P}.tar.bz2" +SRC_URI="https://downloads.sourceforge.net/pbnj/${P}.tar.bz2" LICENSE="GPL-2" SLOT="0" diff --git a/net-analyzer/pontos/Manifest b/net-analyzer/pontos/Manifest index f15fee7b4ca4..4222dcb9e6c8 100644 --- a/net-analyzer/pontos/Manifest +++ b/net-analyzer/pontos/Manifest @@ -1 +1,2 @@ DIST pontos-24.1.2.tar.gz 379930 BLAKE2B b0c9fd02c17ca0fed7468e34264f8e41e87b4c50f6254d8d4d9ee5c7a8444a7acfbf3c113483e26831be68279d7c08bf412634fff5e3454dc0e7ec5273ddcdd6 SHA512 55fcb768d89b0fd478bbf14a435d7d42c6c9ae2ff2a834ce685e25b105ed071d156d1afbc0231d80dd8d5c844f33b648b08772a0aab943127c58f9a475f267d9 +DIST pontos-24.3.2.tar.gz 378585 BLAKE2B cb6a89a2fbfefe1b038b5886dc7a278657d36a05bab818335efd029d6320b8b60defcd73c3e94df17008ab611434898b565cb7057e1f0198113bd8a7a0600934 SHA512 4ed6a79097197da01d35a660ce13edfa028c11b082626038ea037b99b1f365b054d2c07ae841c739735da057e2d8d9fc64b63f18ad3aa941e14ff725261dde80 diff --git a/net-analyzer/pontos/pontos-24.3.2.ebuild b/net-analyzer/pontos/pontos-24.3.2.ebuild new file mode 100644 index 000000000000..4960ceda8096 --- /dev/null +++ b/net-analyzer/pontos/pontos-24.3.2.ebuild @@ -0,0 +1,44 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..12} pypy3 ) +DISTUTILS_USE_PEP517=poetry + +inherit distutils-r1 + +DESCRIPTION="Common utilities and tools maintained by Greenbone Networks" +HOMEPAGE=" + https://www.greenbone.net + https://github.com/greenbone/pontos/ + https://greenbone.github.io/pontos/ +" + +SRC_URI="https://github.com/greenbone/pontos/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" + +SLOT="0" +LICENSE="GPL-3+" +KEYWORDS="amd64 ~x86" + +RDEPEND=" + >=dev-python/colorful-0.5.4[${PYTHON_USEDEP}] + >=dev-python/tomlkit-0.5.11[${PYTHON_USEDEP}] + >=dev-python/packaging-20.3[${PYTHON_USEDEP}] + >=dev-python/httpx-0.23[${PYTHON_USEDEP}] + >=dev-python/rich-12.4.4[${PYTHON_USEDEP}] + >=dev-python/python-dateutil-2.8.2[${PYTHON_USEDEP}] + >=dev-python/semver-2.13[${PYTHON_USEDEP}] + >=dev-python/lxml-4.9.0[${PYTHON_USEDEP}] + >=dev-python/shtab-1.7.0[${PYTHON_USEDEP}] +" + +DEPEND="${RDEPEND}" + +EPYTEST_DESELECT=( + tests/git/test_git.py::GitExtendedTestCase::test_git_error + tests/version/commands/test_java.py::GetCurrentJavaVersionCommandTestCase::test_getting_version_without_version_config + tests/version/commands/test_java.py::VerifyJavaVersionCommandTestCase::test_verify_version_does_not_match +) + +distutils_enable_tests pytest diff --git a/net-analyzer/portsentry/portsentry-1.2-r1.ebuild b/net-analyzer/portsentry/portsentry-1.2-r1.ebuild index 731cf9e95739..ae9657ed17ad 100644 --- a/net-analyzer/portsentry/portsentry-1.2-r1.ebuild +++ b/net-analyzer/portsentry/portsentry-1.2-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -8,7 +8,7 @@ inherit toolchain-funcs DESCRIPTION="Automated port scan detector and response tool" # Seems like CISCO took the site down? HOMEPAGE="https://sourceforge.net/projects/sentrytools/" -SRC_URI="mirror://sourceforge/sentrytools/${P}.tar.gz" +SRC_URI="https://downloads.sourceforge.net/sentrytools/${P}.tar.gz" S="${WORKDIR}"/${PN}_beta SLOT="0" diff --git a/net-analyzer/python-gvm/Manifest b/net-analyzer/python-gvm/Manifest index 72ac45aa37e9..635607a85a25 100644 --- a/net-analyzer/python-gvm/Manifest +++ b/net-analyzer/python-gvm/Manifest @@ -1 +1,2 @@ DIST python-gvm-24.1.0.tar.gz 287497 BLAKE2B 049154d5a516c56885c06e2a83884736c9e4009e1e69a817e541f1317d4fe0cb886f98ed1572bcb55bcfdd40ed7da6639ba52cc89b113731f24d941de3f6195b SHA512 d70d3c654aefb6e5949e35f68fd1585c243988a41165c9fefb54c8fe6dd24694391553201a95558d3fd4a6e8c88783a1fc4d2205ce9ae1a7d2fc2dafdf19825b +DIST python-gvm-24.3.0.tar.gz 278134 BLAKE2B 0da2b7d33164f7db773b51d917755678639f58f63438c23fac95fc3ebeb0412e470ee834804d327b4b46b379672d8f3fd673e0cfdf93f7fc65fe31393a5f3509 SHA512 d6e9dcaf3e776309b18b11393049e2edd08884241a2d050806d9b82dcc91d12e2a121f532b311a83e8f9bf367694b41efe66a9a8eefbe1bfb7bb7453ce08715c diff --git a/net-analyzer/python-gvm/python-gvm-24.3.0.ebuild b/net-analyzer/python-gvm/python-gvm-24.3.0.ebuild new file mode 100644 index 000000000000..bb9e77bab56b --- /dev/null +++ b/net-analyzer/python-gvm/python-gvm-24.3.0.ebuild @@ -0,0 +1,37 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..12} pypy3 ) +DISTUTILS_USE_PEP517=poetry + +inherit distutils-r1 + +DESCRIPTION="Greenbone Vulnerability Management Python Library" +HOMEPAGE="https://www.greenbone.net https://github.com/greenbone/python-gvm/" +SRC_URI="https://github.com/greenbone/python-gvm/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-3+" +SLOT="0" +KEYWORDS="amd64 ~x86" + +RDEPEND=" + >=dev-python/defusedxml-0.6[${PYTHON_USEDEP}] + >=dev-python/lxml-4.5.0[${PYTHON_USEDEP}] + >=dev-python/paramiko-2.7.1[${PYTHON_USEDEP}] + >=dev-python/typing-extensions-4.9.0[${PYTHON_USEDEP}] + test? ( + >=net-analyzer/pontos-22.7.2[${PYTHON_USEDEP}] + ) +" +DEPEND="${RDEPEND}" + +distutils_enable_tests unittest + +src_prepare() { + distutils-r1_src_prepare + + # drop connection tests + rm -r tests/connections || die +} diff --git a/net-analyzer/raddump/raddump-0.3.1.ebuild b/net-analyzer/raddump/raddump-0.3.1.ebuild index 84b83371d881..b6622a0152e5 100644 --- a/net-analyzer/raddump/raddump-0.3.1.ebuild +++ b/net-analyzer/raddump/raddump-0.3.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -7,7 +7,7 @@ inherit autotools DESCRIPTION="RADIUS packet interpreter" HOMEPAGE="https://sourceforge.net/projects/raddump/" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" +SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.gz" LICENSE="GPL-2+" SLOT="0" diff --git a/net-analyzer/rrdcollect/rrdcollect-0.2.10.ebuild b/net-analyzer/rrdcollect/rrdcollect-0.2.10.ebuild index ef89a773d134..7bd0e454f847 100644 --- a/net-analyzer/rrdcollect/rrdcollect-0.2.10.ebuild +++ b/net-analyzer/rrdcollect/rrdcollect-0.2.10.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -6,7 +6,7 @@ inherit autotools DESCRIPTION="Read system statistical data and feed it to RRDtool" HOMEPAGE="http://rrdcollect.sourceforge.net/" -SRC_URI="mirror://sourceforge/rrdcollect/${P}.tar.bz2" +SRC_URI="https://downloads.sourceforge.net/rrdcollect/${P}.tar.bz2" LICENSE="GPL-2" SLOT="0" diff --git a/net-analyzer/sarg/sarg-2.4.0-r1.ebuild b/net-analyzer/sarg/sarg-2.4.0-r1.ebuild index 083cbcb27245..bd534e774632 100644 --- a/net-analyzer/sarg/sarg-2.4.0-r1.ebuild +++ b/net-analyzer/sarg/sarg-2.4.0-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -6,7 +6,7 @@ inherit autotools flag-o-matic DESCRIPTION="Squid Analysis Report Generator" HOMEPAGE="https://sourceforge.net/projects/sarg/" -SRC_URI="mirror://sourceforge/${PN}/${P/_/-}.tar.gz" +SRC_URI="https://downloads.sourceforge.net/${PN}/${P/_/-}.tar.gz" LICENSE="GPL-2" KEYWORDS="amd64 ppc x86" diff --git a/net-analyzer/scanssh/Manifest b/net-analyzer/scanssh/Manifest index 7ff0d095f83b..fce19ea97a2f 100644 --- a/net-analyzer/scanssh/Manifest +++ b/net-analyzer/scanssh/Manifest @@ -1 +1,2 @@ DIST scanssh-2.1.2.tar.gz 147470 BLAKE2B 4cb31a27dd925f071bcb958fc72bef7b7f0455b7d718a15536dae40cee969739628da64a3972e2c5cc9813ef24c5634ca019571783ea20df87c7df80f32da876 SHA512 af4e705c43156b907d6864b12f5832bb4e43d0ff284e34e96b32bbe7986299954d1175880ffe7588f91a939d140b45592fc72dc2bf397f140aed929dbe44a453 +DIST scanssh-2.1.3.1.tar.gz 147954 BLAKE2B a263eda2d49159e715bb8d2190fc78f8e41d5f3a56e0bf67b70ed716eb787c09cff0ea9e759b5aa62096f75de01d2d5b5980aa66a7c5b14635d835fd3b7c6f07 SHA512 970cbb03aa44fcef62aa03132335e6ecedb083cee98a360b3d781efc8c2d3c169f70c17837b1faaf9ceaa2691a7c619174a9bb185146af50188eaceda5d14adb diff --git a/net-analyzer/scanssh/files/scanssh-2.1.3-libdir.diff b/net-analyzer/scanssh/files/scanssh-2.1.3-libdir.diff new file mode 100644 index 000000000000..c34159b3fca7 --- /dev/null +++ b/net-analyzer/scanssh/files/scanssh-2.1.3-libdir.diff @@ -0,0 +1,191 @@ +--- a/configure.ac ++++ b/configure.ac +@@ -20,8 +20,8 @@ AC_PROG_CC + AC_PROG_INSTALL + + dnl XXX - Solaris sux. +-AC_CHECK_LIB(socket, socket) +-AC_CHECK_LIB(nsl, gethostbyname) ++AC_SEARCH_LIBS(socket, socket) ++AC_SEARCH_LIBS(gethostbyname, nsl) + + dnl XXX - we need WinPcap developer's pack under Cygwin for win32 + +@@ -33,11 +33,11 @@ case $host_os in + if test -d /usr/include/mingw ; then + CPPFLAGS="$CPPFLAGS -mno-cygwin" + CFLAGS="$CFLAGS -mno-cygwin" +- AC_DEFINE(WIN32_LEAN_AND_MEAN, 1, ++ AC_DEFINE(WIN32_LEAN_AND_MEAN, 1, + [Define for faster code generation.]) + AC_CHECK_LIB(ws2_32, main) + AC_CHECK_LIB(iphlpapi, main) +- AC_DEFINE(snprintf, _snprintf, ++ AC_DEFINE(snprintf, _snprintf, + [Use MingW32's internal snprintf]) + else + AC_MSG_ERROR([need MingW32 package to build under Cygwin]) +@@ -84,92 +84,9 @@ if test $neederr = yes; then + AC_LIBOBJ(err) + fi + +-dnl Checks for libpcap +-AC_MSG_CHECKING(for libpcap) +-AC_ARG_WITH(libpcap, +-[ --with-libpcap=DIR use libpcap build directory], +-[ case "$withval" in +- yes|no) +- AC_MSG_RESULT(no) +- ;; +- *) +- AC_MSG_RESULT($withval) +- if test -f $withval/pcap.h -a -f $withval/libpcap.a; then +- owd=`pwd` +- if cd $withval; then withval=`pwd`; cd $owd; fi +- PCAPINC="-I$withval -I$withval/bpf" +- PCAPLIB="-L$withval -lpcap" +- else +- AC_MSG_ERROR(pcap.h or libpcap.a not found in $withval) +- fi +- ;; +- esac ], +-[ if test -f ${prefix}/include/pcap.h; then +- PCAPINC="-I${prefix}/include" +- PCAPLIB="-L${prefix}/lib -lpcap" +- elif test -f /usr/include/pcap/pcap.h; then +- PCAPINC="-I/usr/include/pcap" +- PCAPLIB="-lpcap" +- elif test -f /usr/include/pcap.h; then +- PCAPLIB="-lpcap" +- else +- AC_MSG_RESULT(no) +- AC_MSG_ERROR(libpcap not found) +- fi +- AC_MSG_RESULT(yes) ] +-) + AC_SUBST(PCAPINC) + AC_SUBST(PCAPLIB) + +-dnl Checks for (installed) libdnet +-AC_ARG_WITH(libdnet, +-[ --with-libdnet=DIR use libdnet in DIR], +-[ case "$withval" in +- yes|no) +- AC_MSG_ERROR(Please specify directory containing dnet-config when using --with-libdnet) +- ;; +- *) +- AC_MSG_CHECKING(for libdnet) +- AC_MSG_RESULT($withval) +- if test -f $withval/src/libdnet.a; then +- DNETINC="-I$withval/include" +- DNETLIB="-L$withval/src -ldnet `$withval/dnet-config --libs`" +- elif test -x $withval/bin/dnet-config; then +- DNETINC="`$withval/bin/dnet-config --cflags`" +- DNETLIB="`$withval/bin/dnet-config --libs`" +- else +- AC_MSG_RESULT(no) +- AC_MSG_ERROR(dnet-config not found in $withval/bin) +- fi +- ;; +- esac +- AC_MSG_RESULT(yes) ], +-[ dnl This is the default case so let's just use AC_PATH_PROG! --CPK. +- AC_PATH_PROG(dnetconfig, dnet-config, "no") +- if test "$dnetconfig" = "no"; then +- AC_MSG_ERROR(dnet-config not found) +- else +- DNETINC="`$dnetconfig --cflags`" +- DNETLIB="`$dnetconfig --libs`" +- fi] +-) +- +-dnl We still need to check whether it's dnet or dumbnet as +-dnl for example on Debian. We test by looking at the content +-dnl of DNETLIB and derive from the library name what version +-dnl we're dealing with. If we find a libdumbnet, we prefix +-dnl compat/libdnet to our inclusion path. It provides a dnet.h +-dnl that transparently includes dumbnet.h for those systems. --CPK. +-AC_MSG_CHECKING([whether libdnet is a libdumbnet]) +-if test `echo $DNETLIB | sed -e '/dumb/=;d'`; then +- AC_MSG_RESULT(yes) +- AC_DEFINE(HAVE_DUMBNET, 1, +- [Define if our libdnet is a libdumbnet]) +- DNETCOMPAT="compat/libdnet" +-else +- AC_MSG_RESULT(no) +-fi +- + AC_SUBST(DNETCOMPAT) + AC_SUBST(DNETINC) + AC_SUBST(DNETLIB) +@@ -180,50 +97,16 @@ then + else + CFLAGS="-I$DNETCOMPAT $DNETINC" + fi ++save_LIBS=$LIBS + LIBS=$DNETLIB + +-dnl Checks for libevent +-AC_MSG_CHECKING(for libevent) +-AC_ARG_WITH(libevent, +-[ --with-libevent=DIR use libevent build directory], +-[ case "$withval" in +- yes|no) +- AC_MSG_RESULT(no) +- ;; +- *) +- AC_MSG_RESULT($withval) +- if test -f $withval/event.h -a -f $withval/libevent.a; then +- owd=`pwd` +- if cd $withval; then withval=`pwd`; cd $owd; fi +- EVENTINC="-I$withval" +- EVENTLIB="-L$withval -levent" +- else +- AC_MSG_ERROR(event.h or libevent.a not found in $withval) +- fi +- ;; +- esac ], +-[ if test -f ${prefix}/include/event.h; then +- EVENTINC="-I${prefix}/include" +- EVENTLIB="-L${prefix}/lib -levent" +- elif test -f /usr/include/event/event.h; then +- EVENTINC="-I/usr/include/event" +- EVENTLIB="-levent" +- elif test -f /usr/include/event.h; then +- EVENTLIB="-levent" +- else +- AC_MSG_RESULT(no) +- AC_MSG_ERROR(libevent not found) +- fi +- AC_MSG_RESULT(yes) ] +-) + AC_SUBST(EVENTINC) + AC_SUBST(EVENTLIB) + + CFLAGS=$EVENTINC + LIBS=$EVENTLIB + +-CFLAGS="" +-LIBS="" ++LIBS=$save_LIBS + + AC_HEADER_SYS_WAIT + AC_CHECK_HEADERS(fcntl.h sys/ioctl.h sys/time.h unistd.h) +@@ -271,7 +154,7 @@ AC_EGREP_CPP(yes, + #ifdef BSD4_4 + yes + #endif +-], ++], + AC_EGREP_CPP(yes, + [#include <sys/param.h> + #ifdef OpenBSD +@@ -285,7 +168,7 @@ AC_EGREP_CPP(yes, + ), + AC_MSG_RESULT([good byte order]) + ) +- ++ + AC_MSG_CHECKING([for sin_len in struct sockaddr_in]) + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ + #include <sys/types.h> diff --git a/net-analyzer/scanssh/metadata.xml b/net-analyzer/scanssh/metadata.xml index 3bc16fb5eb75..0bfdf7f5bb7f 100644 --- a/net-analyzer/scanssh/metadata.xml +++ b/net-analyzer/scanssh/metadata.xml @@ -5,5 +5,8 @@ <email>netmon@gentoo.org</email> <name>Gentoo network monitoring and analysis project</name> </maintainer> +<upstream> + <remote-id type="github">ofalk/scanssh</remote-id> +</upstream> <longdescription>Scanssh protocol scanner - scans a list of addresses an networks for running SSH protocol servers and their version numbers.</longdescription> </pkgmetadata> diff --git a/net-analyzer/scanssh/scanssh-2.1.3.1.ebuild b/net-analyzer/scanssh/scanssh-2.1.3.1.ebuild new file mode 100644 index 000000000000..f19ad9605894 --- /dev/null +++ b/net-analyzer/scanssh/scanssh-2.1.3.1.ebuild @@ -0,0 +1,50 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools + +DESCRIPTION="network scanner that gathers info on SSH protocols and versions" +HOMEPAGE="https://github.com/ofalk/scanssh/" +SRC_URI="https://github.com/ofalk/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86" + +DEPEND=" + dev-libs/libdnet + dev-libs/libevent:= + net-libs/libpcap +" +RDEPEND="${DEPEND}" + +PATCHES=( + "${FILESDIR}"/${PN}-2.0-fix-warnings.diff + "${FILESDIR}"/${PN}-2.1.3-libdir.diff +) + +src_prepare() { + default + eautoreconf +} + +src_configure() { + econf \ + DNETINC='' \ + DNETLIB=-ldnet \ + EVENTINC='' \ + EVENTLIB=-levent \ + PCAPINC='' \ + PCAPLIB=-lpcap +} + +src_compile() { + emake CFLAGS="${CFLAGS}" +} + +src_install() { + dobin scanssh + doman scanssh.1 +} diff --git a/net-analyzer/shodan/shodan-1.31.0.ebuild b/net-analyzer/shodan/shodan-1.31.0.ebuild index 3afaf54e6485..be21ef2b1735 100644 --- a/net-analyzer/shodan/shodan-1.31.0.ebuild +++ b/net-analyzer/shodan/shodan-1.31.0.ebuild @@ -17,7 +17,7 @@ if [[ ${PV} = "9999" ]]; then EGIT_REPO_URI="https://github.com/achillean/shodan-python.git" else inherit pypi - KEYWORDS="~amd64 ~loong ~x86" + KEYWORDS="amd64 ~loong x86" fi LICENSE="MIT" diff --git a/net-analyzer/snallygaster/snallygaster-0.0.12-r2.ebuild b/net-analyzer/snallygaster/snallygaster-0.0.12-r2.ebuild new file mode 100644 index 000000000000..d9c89cabbb3b --- /dev/null +++ b/net-analyzer/snallygaster/snallygaster-0.0.12-r2.ebuild @@ -0,0 +1,25 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +PYTHON_COMPAT=( python3_{9,10,11,12} ) +DISTUTILS_SINGLE_IMPL=1 +DISTUTILS_USE_PEP517=setuptools +inherit distutils-r1 pypi + +DESCRIPTION="Finds file leaks and other security problems on HTTP servers" +HOMEPAGE="https://github.com/hannob/snallygaster" + +LICENSE="CC0-1.0" +SLOT="0" +KEYWORDS="~amd64" + +DEPEND="dev-python/dnspython + dev-python/urllib3 + dev-python/beautifulsoup4" +RDEPEND="${DEPEND}" +DOCS=( README.md TESTS.md ) + +# Only codingstyle and similar tests, require dependencies +# not packaged in Gentoo +RESTRICT="test" diff --git a/net-analyzer/sniffit/metadata.xml b/net-analyzer/sniffit/metadata.xml index dce3f3be66c0..b1b6918e47b0 100644 --- a/net-analyzer/sniffit/metadata.xml +++ b/net-analyzer/sniffit/metadata.xml @@ -5,4 +5,7 @@ <email>netmon@gentoo.org</email> <name>Gentoo network monitoring and analysis project</name> </maintainer> +<upstream> + <remote-id type="github">resurrecting-open-source-projects/sniffit</remote-id> +</upstream> </pkgmetadata> diff --git a/net-analyzer/snmptt/snmptt-1.4.2.ebuild b/net-analyzer/snmptt/snmptt-1.4.2.ebuild index 027b00ad2231..075a33df8231 100644 --- a/net-analyzer/snmptt/snmptt-1.4.2.ebuild +++ b/net-analyzer/snmptt/snmptt-1.4.2.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 DESCRIPTION="SNMP Trap Translator" -SRC_URI="mirror://sourceforge/snmptt/${P/-/_}.tgz" +SRC_URI="https://downloads.sourceforge.net/snmptt/${P/-/_}.tgz" HOMEPAGE="http://www.snmptt.org/" LICENSE="GPL-2" diff --git a/net-analyzer/snort/Manifest b/net-analyzer/snort/Manifest index d44ca91e97c3..d74b593f0aeb 100644 --- a/net-analyzer/snort/Manifest +++ b/net-analyzer/snort/Manifest @@ -1 +1 @@ -DIST snort-2.9.17.tar.gz 6983018 BLAKE2B 8a6d5f4311e304b141f705fdcd3f570e88540dc5ce5882887b6fa52ea16e41daac384012badcbbc087693ee631e30477b8af2a6c49efa8230c71b80937597355 SHA512 c1a69e697298b4e85b8b8898e29077f5e74d8e2a8e42c2164a5597b3739204d856a74f30bc7c30b1907ec7b3bd3c6c6d798ead890656386b0c2a2da2c201d006 +DIST snort-2.9.20.tar.gz 7009894 BLAKE2B 0fa1426dce94e2800550691bb433c01371c1688616a528c27803f75837cb5eb430246ee113b2a5a1e374b14b6fd5a57140ce54fe13fb13df94276fbd19aa0a15 SHA512 a9ca37e814baeb978a6db06c3c62256b9e98fdd9fa18ce881a2ce854c0c9a5d92476c3384bec9017b8a67e5d78c6f31ca19956a914f54b817343a159a2a7fced diff --git a/net-analyzer/snort/metadata.xml b/net-analyzer/snort/metadata.xml index 3d18523037cc..39900f601479 100644 --- a/net-analyzer/snort/metadata.xml +++ b/net-analyzer/snort/metadata.xml @@ -14,7 +14,7 @@ system (IDS/IPS) developed by Sourcefire. Combining the benefits of signature, protocol, and anomaly-based inspection, Snort is the most widely deployed IDS/IPS technology worldwide. With millions of downloads - and approximately 300,000 registered users, Snort has become the de facto + and approximately 300,000 registered users, Snort has become the de facto standard for IPS. </longdescription> <upstream> @@ -23,8 +23,8 @@ <name>Snort Team</name> </maintainer> <changelog>http://www.snort.org/snort-downloads</changelog> - <doc>http://www.snort.org/docs</doc> - <bugs-to>http://www.snort.org/snort-downloads/submit-a-bug/</bugs-to> + <doc>https://snort.org/documents#OfficialDocumentation</doc> + <bugs-to>https://snort.org/community#bugs</bugs-to> </upstream> <use> <flag name="control-socket"> @@ -34,7 +34,7 @@ Enables extended file inspection capabilities. </flag> <flag name="gre"> - Enable support for inspecting and processing Generic Routing + Enable support for inspecting and processing Generic Routing Encapsulation (GRE) packet headers. Only needed if you are monitoring GRE tunnels. </flag> @@ -62,12 +62,12 @@ and implement application detection. Requires <pkg>dev-lang/luajit</pkg>. </flag> <flag name="perfprofiling"> - Enables support for preprocessor and rule performance profiling + Enables support for preprocessor and rule performance profiling using the perfmonitor preprocessor. </flag> <flag name="ppm"> Enables support for setting per rule or per packet latency limits. - Helps protect against introducing network latency with inline + Helps protect against introducing network latency with inline deployments. </flag> <flag name="react"> @@ -86,17 +86,17 @@ --enable-perfprofiling and --enable-ppm. </flag> <flag name="reload-error-restart"> - Enables support for completely restarting snort if an error is + Enables support for completely restarting snort if an error is detected during a reload. </flag> <flag name="active-response"> - Enables support for automatically sending TCP resets and ICMP + Enables support for automatically sending TCP resets and ICMP unreachable messages to terminate connections. Used with inline deployments. </flag> <flag name="flexresp3"> Enables support for new flexable response preprocessor for enabling - connection tearing for inline deployments. Replaces flexresp and + connection tearing for inline deployments. Replaces flexresp and flexresp2. </flag> <flag name="large-pcap-64bit"> diff --git a/net-analyzer/snort/snort-2.9.17-r1.ebuild b/net-analyzer/snort/snort-2.9.20.ebuild index ba2c56393269..1bfd9d0de604 100644 --- a/net-analyzer/snort/snort-2.9.17-r1.ebuild +++ b/net-analyzer/snort/snort-2.9.20.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 LUA_COMPAT=( luajit ) -inherit autotools lua-single systemd tmpfiles +inherit autotools flag-o-matic lua-single systemd tmpfiles DESCRIPTION="The de facto standard for intrusion detection/prevention" HOMEPAGE="https://www.snort.org" @@ -52,14 +52,19 @@ src_prepare() { mv configure.{in,ac} || die - # USE=debug exposes a macro whose name apparently wasn't changed - sed -i -e 's/BEFORE_SRV_FAIL/BEFORE_SERVICE_FAIL/' \ - src/dynamic-preprocessors/appid/appInfoTable.c || die - AT_M4DIR=m4 eautoreconf } src_configure() { + # -Werror=strict-aliasing + # https://bugs.gentoo.org/861239 + # + # Upstream does bug mail. Sent an email. + # + # Do not trust with LTO either. + append-flags -fno-strict-aliasing + filter-lto + econf \ $(use_enable gre) \ $(use_enable control-socket) \ diff --git a/net-analyzer/snortalog/snortalog-2.4.3-r1.ebuild b/net-analyzer/snortalog/snortalog-2.4.3-r2.ebuild index 960612b2f88f..2063d0ad5aa0 100644 --- a/net-analyzer/snortalog/snortalog-2.4.3-r1.ebuild +++ b/net-analyzer/snortalog/snortalog-2.4.3-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -18,7 +18,7 @@ KEYWORDS="~amd64 ~arm ~ppc ~sparc ~x86" IUSE="tk" RDEPEND=" - dev-lang/perl[ithreads] + || ( >=dev-lang/perl-5.38.2-r3[perl_features_ithreads] <dev-lang/perl-5.38.2-r3[ithreads] ) dev-perl/GDGraph dev-perl/HTML-HTMLDoc virtual/perl-DB_File diff --git a/net-analyzer/speedtest-cli/speedtest-cli-2.1.3-r2.ebuild b/net-analyzer/speedtest-cli/speedtest-cli-2.1.3-r2.ebuild index a200344f72c7..50fd8d8ef75d 100644 --- a/net-analyzer/speedtest-cli/speedtest-cli-2.1.3-r2.ebuild +++ b/net-analyzer/speedtest-cli/speedtest-cli-2.1.3-r2.ebuild @@ -4,7 +4,7 @@ EAPI=8 DISTUTILS_USE_PEP517="setuptools" -PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_COMPAT=( python3_{10..12} ) inherit distutils-r1 diff --git a/net-analyzer/sqlninja/sqlninja-0.2.6_p1-r1.ebuild b/net-analyzer/sqlninja/sqlninja-0.2.6_p1-r1.ebuild index c6a7a32beb57..60cf228b8201 100644 --- a/net-analyzer/sqlninja/sqlninja-0.2.6_p1-r1.ebuild +++ b/net-analyzer/sqlninja/sqlninja-0.2.6_p1-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -9,7 +9,7 @@ MY_P="${PN}-${MY_PV}" DESCRIPTION="A SQL Server injection & takeover tool" HOMEPAGE="http://sqlninja.sourceforge.net/" -SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tgz" +SRC_URI="https://downloads.sourceforge.net/${PN}/${MY_P}.tgz" S="${WORKDIR}/${MY_P}" LICENSE="GPL-2" diff --git a/net-analyzer/squid-graph/squid-graph-3.2-r2.ebuild b/net-analyzer/squid-graph/squid-graph-3.2-r2.ebuild index 32887b2c15a0..e0e5a19500ef 100644 --- a/net-analyzer/squid-graph/squid-graph-3.2-r2.ebuild +++ b/net-analyzer/squid-graph/squid-graph-3.2-r2.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 DESCRIPTION="Squid logfile analyzer and traffic grapher" HOMEPAGE="http://squid-graph.sourceforge.net/" -SRC_URI="mirror://sourceforge/squid-graph/${P}.tar.gz" +SRC_URI="https://downloads.sourceforge.net/squid-graph/${P}.tar.gz" S="${WORKDIR}"/${PN} LICENSE="GPL-2" diff --git a/net-analyzer/ssh-audit/Manifest b/net-analyzer/ssh-audit/Manifest index b60d8eb669f2..6d0a4850a473 100644 --- a/net-analyzer/ssh-audit/Manifest +++ b/net-analyzer/ssh-audit/Manifest @@ -1,2 +1,3 @@ DIST ssh-audit-3.0.0.tar.gz 151667 BLAKE2B 3d79ee96793634f97d5ee7237189f97ddacd388afbbfb55cc8a8f21b4cb1198d79595694c88bf9f0df1adbe997ec5a9d8caa9b9f07d988d4cff07ae0d6924ea0 SHA512 2fcfc6c8b6737d54894de70dbcf1f800662ca122995c897507c87c73fecad66571b44bc3dfe102ff0dbafd270e537e5e00c7449319f1ee12b90494ee784c0cde DIST ssh-audit-3.1.0.tar.gz 154296 BLAKE2B 8c474ddfa2ceacb5c271eac152d1bb0b1e10132ae46de9da891b445a8a4b2ae70ffc20bb83a2d4ec52fdad8701c13f4777c85bd2e15b8ee5dbc6b021c268e731 SHA512 ea42aa93272cb1881d8c5882b2f68655606fe73f64a708bc0f9f743f14137aab1026eabf10a813f3919de179117c1a9b4c8325d511e25afd60caee273cb32deb +DIST ssh-audit-3.2.0.tar.gz 175715 BLAKE2B 89e9710dae25a05347cfc3f29d69af9f9aaf5c9238c6b7454458bce32db6ce711483b9616ecb9dc20ab2f7de090fc9e724a271c10c8d96fe763cbf4e08c9e443 SHA512 66544b631eee07d02f2c15324016bbe1d6504e70032659f7610fd25aa248285a0ac20d43c4ae8958f434adab079a551baad4f7fabebdde51d0ff7b7047082abe diff --git a/net-analyzer/ssh-audit/ssh-audit-3.2.0.ebuild b/net-analyzer/ssh-audit/ssh-audit-3.2.0.ebuild new file mode 100644 index 000000000000..4db6488898d3 --- /dev/null +++ b/net-analyzer/ssh-audit/ssh-audit-3.2.0.ebuild @@ -0,0 +1,27 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISTUTILS_USE_PEP517=setuptools +PYTHON_COMPAT=(python3_{10,11,12}) + +inherit distutils-r1 + +DESCRIPTION="SSH server auditing (banner, key exchange, encryption, mac, compression, etc)" +HOMEPAGE="https://github.com/jtesta/ssh-audit" +SRC_URI="https://github.com/jtesta/ssh-audit/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~arm64 ~ppc64" +IUSE="test" + +# Tests require prospector which is not packaged +RESTRICT="test" + +src_install() { + distutils-r1_src_install + + doman ssh-audit.1 +} diff --git a/net-analyzer/ssldump/Manifest b/net-analyzer/ssldump/Manifest index eb1f4cb13252..72467a1e428d 100644 --- a/net-analyzer/ssldump/Manifest +++ b/net-analyzer/ssldump/Manifest @@ -1 +1,2 @@ DIST ssldump-1.5.tar.gz 129388 BLAKE2B 9877bf604690911a3680cf4edfe0115a8a8e2ddf14abc260a99fdcc181bd727c5f3bfb0aa8864f502ff560ccab76e27a22266a3ed78eb516f019ed7cb44bef69 SHA512 4eb84744591539fdaf9b2454d23c917f5e97cb2e5f03e0c38393327caecc72dfc77ee7b734519b1f224a5e3a132185b8fccfeb9186fc9f1b586444fc748a3814 +DIST ssldump-1.8.tar.gz 188219 BLAKE2B e6cff9598e6818eb2192450c0958a7f9bf003d79ad74dd9e60b1af2e977b27a6b3667a5d7ed6fdb1fa836a51c4ab7a6dc2f0c5afb1dbd8b3b08af3cd145a872e SHA512 5435187fa851cddd167a5ee7e79f8051752780512873195b215e8695430282338f22719e6ddd32bd4eae3cc9a385abd44a4b369f93dc201908696aaed214b9bc diff --git a/net-analyzer/ssldump/ssldump-1.8.ebuild b/net-analyzer/ssldump/ssldump-1.8.ebuild new file mode 100644 index 000000000000..7cf1c12dd469 --- /dev/null +++ b/net-analyzer/ssldump/ssldump-1.8.ebuild @@ -0,0 +1,26 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake + +DESCRIPTION="An SSLv3/TLS network protocol analyzer" +HOMEPAGE="https://github.com/adulau/ssldump/" +SRC_URI="https://github.com/adulau/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="openssl" +SLOT="0" +KEYWORDS="~amd64 ~arm ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos" + +RDEPEND="dev-libs/json-c:= + dev-libs/openssl:= + net-libs/libnet:1.1 + net-libs/libpcap" +DEPEND="${RDEPEND}" + +src_install() { + dosbin "${BUILD_DIR}"/${PN} + doman ${PN}.1 + einstalldocs +} diff --git a/net-analyzer/sslscan/Manifest b/net-analyzer/sslscan/Manifest index ed9de4f1eecb..1822e8ffaf2c 100644 --- a/net-analyzer/sslscan/Manifest +++ b/net-analyzer/sslscan/Manifest @@ -1,6 +1,8 @@ DIST sslscan-2.1.1.tar.gz 113738 BLAKE2B c31a16e7a174f8c7c476ea525846963cfeff590d92063a7b0c4f2cfd95129517f32d4450e1d839dea648f9f8990fef715692caf331186b0f3cfafe8372927076 SHA512 5178119d67d41cc72afb7d7ae294d7eb8e68b75932038c09bf07936f53807b06bc27b036b105e655be40f025f3afd20c9c4c0d0b2bd28cfa8e6234c5cee53c3d DIST sslscan-2.1.2.tar.gz 113842 BLAKE2B b4c297b9b8619f559bae28debaeab5fae89ba60823b0bd2d043436e73bbafd3ce688e505678bb4d0182c78caa0f4c086f71e40e900e40d4bea93649f4ab8baca SHA512 2d76c1908b64dc291e8e6688746544386823a2e53d61e13a3ea3109d6ccb4f7dc0199b4c4d8a2ac6d420cf85183d9c9ca42051e351531c54eb138ede01a13277 DIST sslscan-2.1.3.tar.gz 113917 BLAKE2B 2c3dd21838bca82035dc4d1c48869d4d2c2a18ea603b947d39040744d2f51c4946e6ca6681d734aafc62cf71b6e380b31f6f29c7164c14c2d75e0d1ab5925245 SHA512 62dbb8c97598cdc5bf22cb8311eaba6cff186f6b874d8eb4165a80d0577cd0a13837222fe6ee4e015c353acef2691ff044f4538c04044869805b5455abf36155 +DIST sslscan-2.1.4.tar.gz 114318 BLAKE2B 4a2473a1fe76f276b6f2656cb9c688e4cb8fb829d76e048ddbf8693287ee50b74e5ba2bf7de44c71f4ae75e73e191c5a52e508c32dfb9cb32678dfbcd5247827 SHA512 2880df01cf4a9d05e151a67d0f7ec078645286ce467bb4ead97592d4aeb0a5d7373d67ce48cef8d211c5519fee88fbede7b90adee5e4da1feece51bf609a4318 DIST sslscan-openssl-3.0.11.tar.gz 15347070 BLAKE2B e9b0d6c53b66fc66b1dfe46b042adb9bad770fa60555eea65748ef59bd7231ea8882f16ddff7e5ebdd1c164a83264a5d7da37a4f0207a3bd88045cabcebe0ea8 SHA512 4dd485720a335879bd52d0045edf65fd8397b6f6b6afb3e2c756230937304975b3bd95f67933cadde175cae81d420a692fcf7e96b9f9d2b059ea387a8d9ac305 DIST sslscan-openssl-3.0.12.tar.gz 15352880 BLAKE2B 55a321609e97636173421e738bfb745b6e9a912744fba6d83bfecba199f8684b5625b8547e29305dacda91735cd329fc4c3f5c1f0f919d362a81995073781796 SHA512 8eb6141c1f3d43aa7dd5a5570c99302910feae0d25ab872c58432e5d11d3e330a069715fd4a0cd03234f3fb3e5e9fba38ef59977f7ecf162a2b048476dbb14c6 DIST sslscan-openssl-3.0.13.tar.gz 15440228 BLAKE2B 00f66b5940b494c36ea8731f05691bf85206c7a93f6313f3ff2cea36d35ce99e71dadc9620188eee8ea0d7be523721af432d7fd74aa59e34634796cd0e4899a6 SHA512 272223fefae76759de40219dd05ff119b99688a807c1af01360470ac5f390426e45463c1445988bf0a6e4cca23a6e0b1649a78121f9d6f69f92563e307a7fd70 +DIST sslscan-openssl-3.0.14.tar.gz 15456760 BLAKE2B 7a7f16466ebe63d81615c67256972e2f5f56ec4c095ff851add388edd872913a41f76f6c17056e13f43896c3b1f3b2f778497c8ecc920fc00dbc90093513aabe SHA512 ebd70c82ef2b8d882858e26333c27b8975e55cc8a350b646c24505cd6feba1e92d4894026ec6b0cefe6d7dcbedb5799bd72df4114c832efb2616b68ad303f5d1 diff --git a/net-analyzer/sslscan/sslscan-2.1.4.ebuild b/net-analyzer/sslscan/sslscan-2.1.4.ebuild new file mode 100644 index 000000000000..10bd693b77bc --- /dev/null +++ b/net-analyzer/sslscan/sslscan-2.1.4.ebuild @@ -0,0 +1,82 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit toolchain-funcs + +# sslscan builds against a static openssl library to allow weak ciphers +# to be enabled so that they can be tested. +OPENSSL_RELEASE_TAG="openssl-3.0.14" + +DESCRIPTION="Fast SSL configuration scanner" +HOMEPAGE="https://github.com/rbsec/sslscan" +SRC_URI="https://github.com/rbsec/sslscan/archive/${PV}.tar.gz -> ${P}.tar.gz + https://github.com/openssl/openssl/archive/${OPENSSL_RELEASE_TAG}.tar.gz -> ${PN}-${OPENSSL_RELEASE_TAG}.tar.gz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86" + +# Requires a docker environment +RESTRICT="test" + +# S="${WORKDIR}/${P}-${MY_FORK}" + +src_prepare() { + ln -s ../openssl-${OPENSSL_RELEASE_TAG} openssl || die + touch .openssl_is_fresh || die + sed -i -e '/openssl\/.git/,/fi/d' \ + -e '/openssl test/d' Makefile || die + + # Copied from dev-libs/openssl + # allow openssl to be cross-compiled + cp "${FILESDIR}"/gentoo.config-1.0.2 gentoo.config || die + chmod a+rx gentoo.config || die + + default +} + +src_configure() { + # Copied from dev-libs/openssl + unset APPS #197996 + unset SCRIPTS #312551 + unset CROSS_COMPILE #311473 + + tc-export CC AR RANLIB RC + + local sslout=$(./gentoo.config) + einfo "Use configuration ${sslout:-(openssl knows best)}" + local config="Configure" + [[ -z ${sslout} ]] && config="config" + + # Clean out hardcoded flags that openssl uses + local DEFAULT_CFLAGS=$(grep ^CFLAGS= Makefile | LC_ALL=C sed \ + -e 's:^CFLAGS=::' \ + -e 's:\(^\| \)-fomit-frame-pointer::g' \ + -e 's:\(^\| \)-O[^ ]*::g' \ + -e 's:\(^\| \)-march=[^ ]*::g' \ + -e 's:\(^\| \)-mcpu=[^ ]*::g' \ + -e 's:\(^\| \)-m[^ ]*::g' \ + -e 's:^ *::' \ + -e 's: *$::' \ + -e 's: \+: :g' \ + -e 's:\\:\\\\:g' + ) + + # Now insert clean default flags with user flags + sed -i \ + -e "/^CFLAGS=/s|=.*|=${DEFAULT_CFLAGS} ${CFLAGS}|" \ + -e "/^LDFLAGS=/s|=[[:space:]]*$|=${LDFLAGS}|" \ + Makefile || die +} + +src_compile() { + emake static +} + +src_install() { + DESTDIR="${D}" emake install + + dodoc Changelog README.md +} diff --git a/net-analyzer/suricata/Manifest b/net-analyzer/suricata/Manifest index 9e0bba5db148..fdaacd396d1e 100644 --- a/net-analyzer/suricata/Manifest +++ b/net-analyzer/suricata/Manifest @@ -1,2 +1,2 @@ -DIST suricata-7.0.3.tar.gz 23599903 BLAKE2B b42044428ae5ac4ecd6b41d083f0f3ac5839bf9a0734c3a64bb5e9a6f1a0ffe0c1f5da262f4e167461836bd26ebf9238ec9c0c213ba61f6419b6af1314f3becb SHA512 5a19a00118b86cd9c9b8a4b8399d8deda23beb19a6a6ed49e82240a1a5d4549490f3ce72743f5990c200850e8a64e3a51f45b8c1b8088bdd16aa12341dbf64aa -DIST suricata-7.0.3.tar.gz.sig 566 BLAKE2B 3befe75463a26493b660dc21721e2628a4889d5397d0ada6aa51bd9c748487130dfb56f3fa25b5514411adeaf0b385ee7e9d664ab0af9b6b0a2bef719bdc904f SHA512 a08274708f3aee891b018da613fa60cf66ca09b41f70ed1e89b57d5e778bf97058d71c6ad8c529926783287ddd0f20337957e03ff59b3500c207a4ef7936bfdf +DIST suricata-7.0.5.tar.gz 23612189 BLAKE2B 9a44e4561edcc8909853b88779aa520a79b684ca9114479a95b2b34f8e34b6a0f5887d4b332dddb9da225335d7642089345e7f245a1ebce68f42f38126eb4b58 SHA512 4eae28a78e1e9595c7f37215e9cccdf417235eadf3c8a9dc4cb531d7dc3fb353c903154ee745df7a44620d299998b84f15d6db95e5f0562744ff7cbaac398d34 +DIST suricata-7.0.5.tar.gz.sig 566 BLAKE2B f1e4885f92d13e3168ae44b2fd2b134e1eee9a71f4d92ee8e60df65af3558f4dfa64919955dc60d597d0ef6c6a92b505ab5974fc2f07cd8dc8b4d889eaa4b4c2 SHA512 5f6c2904441c0cb414990a89a2c5a640da9ef25b572512cb2dbb607c7e469186982299acc98414067f8119c8e7c2d433f1b8cf38d1a3c95235a493311230bfc7 diff --git a/net-analyzer/suricata/files/suricata-7.0.3_fix-build-with-gcc14.patch b/net-analyzer/suricata/files/suricata-7.0.3_fix-build-with-gcc14.patch deleted file mode 100644 index 7ebacf76852c..000000000000 --- a/net-analyzer/suricata/files/suricata-7.0.3_fix-build-with-gcc14.patch +++ /dev/null @@ -1,39 +0,0 @@ -Bug: From b5280929c58559c178415ce199157b5c87171258 Mon Sep 17 00:00:00 2001 -From: Brahmajit Das <brahmajit.xyz@gmail.com> -Date: Tue, 20 Feb 2024 12:05:57 +0530 -Subject: [PATCH 1/1] Fix passing incompatible pointer type with GCC 14 -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -GCC 14 (and newer compilers like Clang 16) enables --Wincompatible-pointer-types by default, along with some other flags. -Thus resulting in build errors such as - -util-host-info.c: In function ‘SCKernelVersionIsAtLeast’: -util-host-info.c:94:31: error: passing argument 1 of ‘pcre2_substring_list_free_8’ from incompatible pointer type [-Wincompatible-pointer-types] - 94 | pcre2_substring_list_free((PCRE2_SPTR *)list); - | ^~~~~~~~~~~~~~~~~~ - | | - | const PCRE2_UCHAR8 ** {aka const unsigned char **} - -Removing the casting make suricata build with GCC 14. - -First discovered on Gentoo Linux with GCC 14 - -Bug: https://bugs.gentoo.org/925011 -Signed-off-by: Brahmajit Das <brahmajit.xyz@gmail.com> ---- a/src/util-host-info.c -+++ b/src/util-host-info.c -@@ -91,7 +91,7 @@ int SCKernelVersionIsAtLeast(int major, int minor) - err = true; - } - -- pcre2_substring_list_free((PCRE2_SPTR *)list); -+ pcre2_substring_list_free(list); - pcre2_match_data_free(version_regex_match); - pcre2_code_free(version_regex); - --- -2.43.2 - diff --git a/net-analyzer/suricata/files/suricata-7.0.5_configure-fortify_source.patch b/net-analyzer/suricata/files/suricata-7.0.5_configure-fortify_source.patch new file mode 100644 index 000000000000..302f9bb382f3 --- /dev/null +++ b/net-analyzer/suricata/files/suricata-7.0.5_configure-fortify_source.patch @@ -0,0 +1,18 @@ +--- a/configure.ac ++++ b/configure.ac +@@ -339,15 +339,6 @@ + [AC_MSG_RESULT(no)]) + CFLAGS="${TMPCFLAGS}" + +- #compile-time best-practices errors for certain libc functions, provides checks of buffer lengths and memory regions +- AC_MSG_CHECKING(for -D_FORTIFY_SOURCE=2) +- TMPCFLAGS="${CFLAGS}" +- CFLAGS="${CFLAGS} -D_FORTIFY_SOURCE=2" +- AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[]])],[SECCFLAGS="${SECCFLAGS} -D_FORTIFY_SOURCE=2" +- AC_MSG_RESULT(yes)], +- [AC_MSG_RESULT(no)]) +- CFLAGS="${TMPCFLAGS}" +- + #compile-time warnings about misuse of format strings + AC_MSG_CHECKING(for -Wformat -Wformat-security) + TMPCFLAGS="${CFLAGS}" diff --git a/net-analyzer/suricata/metadata.xml b/net-analyzer/suricata/metadata.xml index a409aa734d3c..c5c9cb7e4d89 100644 --- a/net-analyzer/suricata/metadata.xml +++ b/net-analyzer/suricata/metadata.xml @@ -1,10 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>marecki@gentoo.org</email> - <name>Marek Szuba</name> - </maintainer> + <!-- maintainer-needed --> <use> <flag name="af-packet">Enable AF_PACKET support</flag> <flag name="af-xdp">Enable AF_XDP support</flag> diff --git a/net-analyzer/suricata/suricata-7.0.3.ebuild b/net-analyzer/suricata/suricata-7.0.5.ebuild index 31a877d45e4f..d6d60eada0b0 100644 --- a/net-analyzer/suricata/suricata-7.0.3.ebuild +++ b/net-analyzer/suricata/suricata-7.0.5.ebuild @@ -39,7 +39,7 @@ RDEPEND="${PYTHON_DEPS} $(python_gen_cond_dep ' dev-python/pyyaml[${PYTHON_USEDEP}] ') - >=net-libs/libhtp-0.5.46 + >=net-libs/libhtp-0.5.48 net-libs/libpcap sys-apps/file sys-libs/libcap-ng @@ -63,7 +63,7 @@ PATCHES=( "${FILESDIR}/${PN}-5.0.7_configure-no-hyperscan-automagic.patch" "${FILESDIR}/${PN}-6.0.0_default-config.patch" "${FILESDIR}/${PN}-7.0.2_configure-no-sphinx-pdflatex-automagic.patch" - "${FILESDIR}/${PN}-7.0.3_fix-build-with-gcc14.patch" + "${FILESDIR}/${PN}-7.0.5_configure-fortify_source.patch" ) pkg_pretend() { diff --git a/net-analyzer/tcping/Manifest b/net-analyzer/tcping/Manifest index 6efff5e7cf56..2da9cb762504 100644 --- a/net-analyzer/tcping/Manifest +++ b/net-analyzer/tcping/Manifest @@ -1 +1,2 @@ DIST tcping-1.3.6.tar.gz 3329 BLAKE2B cd69e259d930532810bf3b19d22db981d644051e472d6356e442df2074ebd6fe675b62540190f465127bdcd0c248f329b3e5c167a6c4408acfef029297b5e181 SHA512 74c65f292d6521dfbf8784ae9e1988a12ad224c81f6575ada1cae55b079cf9c13707be52cb9147abe02c8787ebbedb0d9fca1f2c27fb57c32eea5817c7042992 +DIST tcping-2.1.0.tar.gz 6532 BLAKE2B 8d154b36480180ae6fd2a644b98ee0ed569e1d7491a2fe5a5ced9a3ad2470d8a34cbbed499ba93661816075617cdb00f83c1469866f3bf63871fbbc6f67168ca SHA512 d39c30390a7ab7a345f3b8fc2731afa817b104460a65ad47f1e535d1a5242eed7eb5b8c416b898dd4eedc87cf16af7bbb0630c63731b12513fa4f95eb9dfaed0 diff --git a/net-analyzer/tcping/metadata.xml b/net-analyzer/tcping/metadata.xml index c73b0839b368..821122387993 100644 --- a/net-analyzer/tcping/metadata.xml +++ b/net-analyzer/tcping/metadata.xml @@ -2,6 +2,9 @@ <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> -<email>netmon@gentoo.org</email> + <email>netmon@gentoo.org</email> </maintainer> +<upstream> + <remote-id type="github">mkirchner/tcping</remote-id> +</upstream> </pkgmetadata> diff --git a/net-analyzer/tcping/tcping-2.1.0.ebuild b/net-analyzer/tcping/tcping-2.1.0.ebuild new file mode 100644 index 000000000000..b7f426393c4b --- /dev/null +++ b/net-analyzer/tcping/tcping-2.1.0.ebuild @@ -0,0 +1,29 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit toolchain-funcs + +DESCRIPTION="Check if a desired port is reachable via TCP" +HOMEPAGE="https://github.com/mkirchner/tcping" +SRC_URI="https://github.com/mkirchner/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +src_prepare() { + default + sed -e '/^CC=/s:=:?=:' \ + -e '/^CCFLAGS/s:=:+=:' \ + -e 's/$(CCFLAGS)/$(CCFLAGS) $(LDFLAGS)/' \ + -i Makefile || die + tc-export CC + export CCFLAGS="${CFLAGS}" +} + +src_install() { + dobin tcping + dodoc README +} diff --git a/net-analyzer/tcpslice/Manifest b/net-analyzer/tcpslice/Manifest index a3d471e9d157..39cd37ea07e5 100644 --- a/net-analyzer/tcpslice/Manifest +++ b/net-analyzer/tcpslice/Manifest @@ -1,2 +1,4 @@ DIST tcpslice-1.5.tar.gz 136597 BLAKE2B 04512feb49d905458b06150846ea1ae5439db42567e652afb49ddfca179f60fef425db71c0a1ea0aa8c4863e170385bb0f57599ae50cc2417b2fd16e57bd02da SHA512 b9d8192c6aea60661898633a47679c8890813530c7ef7a331c1e3b711127028ccc90e6748cbf23666d74f1639ce8f71d4d7703aac707821d8abf9b9c73f2402e DIST tcpslice-1.5.tar.gz.sig 442 BLAKE2B c7fb1b09c9fe2c0dbfd9728ff95d2414a583ed95a21c1e0476e0ed2a7b32eff2c8cf848fdb52414162e7c7df480e722f28063905e9e03093814590a474da86bc SHA512 4b948ac72672066ba679aa58b6e7fdb672d5be36ae24a503fe4093b67185d0f9466c7fe820199fb1043e6c21e015be07cf9ed020414ebf0c801aac30e3b84afe +DIST tcpslice-1.7.tar.xz 109272 BLAKE2B 5443afac3a4013ee2794084eb4f3b9e61aa6c3aab5e29b021b4e3e1248dc51a62e0a2ef3e742bc6e90392487fd6cae7888cb3ad031ef3daeaf6ae57dc92aef01 SHA512 9359daf309c962205c7503192a477a8a57f35c527d762c665f6181a0160a0f773cf5f186910ee548787fa0af2489d173872cd3dea05fa2073ea77a03a7d9c7a3 +DIST tcpslice-1.7.tar.xz.sig 442 BLAKE2B 96d77b64bb2a166d6017323a22f110f7015ef5866279ef1b3abb020704a93f98f72f4bb4d8214a57b1e6c782950c8894176c376f49cf0be5419d8874cdf280d3 SHA512 9ea7ec8a2709091d5726210517702fa808d0009a2761a6962a9225cc5598dfd7474f57c36207fdbef0d10ccf2abb4e1c0c6a825eec88445f8e86393cd89a388b diff --git a/net-analyzer/tcpslice/tcpslice-1.7.ebuild b/net-analyzer/tcpslice/tcpslice-1.7.ebuild new file mode 100644 index 000000000000..addd46fe7ec6 --- /dev/null +++ b/net-analyzer/tcpslice/tcpslice-1.7.ebuild @@ -0,0 +1,22 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/tcpdump.asc" +inherit verify-sig + +DESCRIPTION="Extract and concatenate portions of pcap files" +HOMEPAGE="http://www.tcpdump.org/ https://github.com/the-tcpdump-group/tcpslice" +SRC_URI=" + https://www.tcpdump.org/release/${P}.tar.xz + verify-sig? ( https://www.tcpdump.org/release/${P}.tar.xz.sig ) +" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~x86" + +RDEPEND="net-libs/libpcap" +DEPEND="${RDEPEND}" +BDEPEND="verify-sig? ( >=sec-keys/openpgp-keys-tcpdump-20240308 )" diff --git a/net-analyzer/tcpstat/Manifest b/net-analyzer/tcpstat/Manifest deleted file mode 100644 index 1f36deb47008..000000000000 --- a/net-analyzer/tcpstat/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST tcpstat-1.5.tar.gz 93102 BLAKE2B 39a570fe6176fda0e8a6539417ece268183a1ebed6fa956b8ec5556b8bbd2508829e7d0861ef39b551bd6070df70cfdaf3dbf694a42ad00be4ea0f3e5c757ce5 SHA512 f1399365e754e4d9e19657c455a580294a7b4002a0d02ff05791a45574dcb1d0e75dc492157ef595066502b1553702481c67b20ad24267a50d7293766c39a5ab -DIST tcpstat_1.5-8.debian.tar.xz 7844 BLAKE2B d74e3fd6a274d5e4e0963741bcfe870cfa300281706f965ac1c61ab7e6eb9aa2ea06566649fb3ae8d6071464cfa4bc037e58f64bf32f71ad8b3006976a515417 SHA512 f54546a9191feddc5410c7abb6764533ce89de4bd93fdc480e1a8f7473b405ca914482e6b950ead39d78d235caf093aaa663c683df346417070b97fc3e4f5c41 diff --git a/net-analyzer/tcpstat/files/tcpstat-1.5_p8-_DEFAULT_SOURCE.patch b/net-analyzer/tcpstat/files/tcpstat-1.5_p8-_DEFAULT_SOURCE.patch deleted file mode 100644 index 3ea38d7bac02..000000000000 --- a/net-analyzer/tcpstat/files/tcpstat-1.5_p8-_DEFAULT_SOURCE.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/configure.in -+++ b/configure.in -@@ -68,7 +68,7 @@ - case $my_build_os in - aix*) AC_DEFINE(AIX_STRANGENESS, 1, [ defined on AIX systems. ]) ;; - osf1*) AC_DEFINE(TRU64_STRANGENESS, 1, [ defined on OSF systems. ]) ;; -- linux*) AC_DEFINE(_BSD_SOURCE, 1, [ defined usually on linux systems ] ) ;; -+ linux*) AC_DEFINE(_DEFAULT_SOURCE, 1, [ defined usually on linux systems ] ) ;; - gnu/kfreebsd*) AC_DEFINE(_BSD_SOURCE, 1, [ defined usually on debian kfreebsd systems ] ) ;; - bsd/os*) ;; - freebsd*) ;; diff --git a/net-analyzer/tcpstat/files/tcpstat-1.5_p8-ipv6.patch b/net-analyzer/tcpstat/files/tcpstat-1.5_p8-ipv6.patch deleted file mode 100644 index f26268f7a93f..000000000000 --- a/net-analyzer/tcpstat/files/tcpstat-1.5_p8-ipv6.patch +++ /dev/null @@ -1,30 +0,0 @@ ---- a/configure.in -+++ b/configure.in -@@ -84,15 +84,26 @@ - dnl ####################### - dnl Checks for header files - dnl ####################### - AC_HEADER_STDC - AC_HEADER_SYS_WAIT --AC_CHECK_HEADERS(sys/time.h sys/stat.h unistd.h strings.h fcntl.h netinet/ip6.h) -+AC_CHECK_HEADERS(sys/time.h sys/stat.h unistd.h strings.h fcntl.h) - - dnl BSD/OS Seems to not have a good ethernet header, so we gotta wing it - AC_CHECK_HEADERS(net/if.h net/ethernet.h netinet/if_ether.h net/ppp_defs.h) - -+AC_ARG_ENABLE( ipv6, [ AC_HELP_STRING([--enable-ipv6], [s use IPv6?]) ], ip6=$enableval ) -+if test "$ip6" = "yes" -+then -+ AC_CHECK_HEADER(netinet/ip6.h, , [AC_MSG_ERROR([I couldn't find netinet/ip6.h though you asked for ipv6 support.])] ) -+elif test "$ip6" != "no" -+then -+ AC_CHECK_HEADER(netinet/ip6.h) -+ -+fi -+ -+ - dnl ############################################################# - dnl Checks for typedefs, structures, and compiler characteristics - dnl ############################################################# - AC_C_CONST - AC_TYPE_SIZE_T diff --git a/net-analyzer/tcpstat/files/tcpstat-1.5_p8-libpcap.patch b/net-analyzer/tcpstat/files/tcpstat-1.5_p8-libpcap.patch deleted file mode 100644 index 54554890416a..000000000000 --- a/net-analyzer/tcpstat/files/tcpstat-1.5_p8-libpcap.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/configure.in -+++ b/configure.in -@@ -47,7 +47,7 @@ - fi - done - else -- LDFLAGS=" -L${with_pcap_lib} "${LDFLAGS} -+ LDFLAGS="${with_pcap_lib} "${LDFLAGS} - fi - - AC_ARG_ENABLE(fdesc, diff --git a/net-analyzer/tcpstat/files/tcpstat-1.5_p8-off-by-one.patch b/net-analyzer/tcpstat/files/tcpstat-1.5_p8-off-by-one.patch deleted file mode 100644 index 4029ddb7d407..000000000000 --- a/net-analyzer/tcpstat/files/tcpstat-1.5_p8-off-by-one.patch +++ /dev/null @@ -1,50 +0,0 @@ ---- a/src/catpcap.c -+++ b/src/catpcap.c -@@ -156,10 +156,10 @@ - return Usage(1, argv[0]); - break; - case 'f': -- strncpy(filterexpr, optarg, BUF_SIZ); -+ strncpy(filterexpr, optarg, BUF_SIZ - 1); - break; - case 'r': -- strncpy(filename, optarg, BUF_SIZ); -+ strncpy(filename, optarg, BUF_SIZ - 1); - break; - default: - return Usage(1, argv[0]); ---- a/src/dump.c -+++ b/src/dump.c -@@ -109,10 +109,10 @@ - get_tcp_flags |= GET_TCPD_COUNT_LINKSIZE; - break; - case 'f': -- strncpy(filterexpr, optarg, BUF_SIZ); -+ strncpy(filterexpr, optarg, BUF_SIZ - 1); - break; - case 'r': -- strncpy(filename, optarg, BUF_SIZ); -+ strncpy(filename, optarg, BUF_SIZ - 1); - break; - case 's': - what_to_show |= parse_show_types(optarg); ---- a/src/tcpprof.c -+++ b/src/tcpprof.c -@@ -126,14 +126,14 @@ - src_dest_split = 1; - break; - case 'f': -- strncpy(filterexpr, optarg, BUF_SIZ); -+ strncpy(filterexpr, optarg, BUF_SIZ - 1); - break; - case 'i': -- strncpy(filename, optarg, BUF_SIZ); -+ strncpy(filename, optarg, BUF_SIZ - 1); - flags |= GET_TCPD_DO_LIVE; - break; - case 'r': -- strncpy(filename, optarg, BUF_SIZ); -+ strncpy(filename, optarg, BUF_SIZ - 1); - flags &= ~GET_TCPD_DO_LIVE; - break; - case 'n': diff --git a/net-analyzer/tcpstat/files/tcpstat-1.5_p8-unused.patch b/net-analyzer/tcpstat/files/tcpstat-1.5_p8-unused.patch deleted file mode 100644 index c255f52dbe85..000000000000 --- a/net-analyzer/tcpstat/files/tcpstat-1.5_p8-unused.patch +++ /dev/null @@ -1,99 +0,0 @@ ---- a/lib/process.c -+++ b/lib/process.c -@@ -230,12 +230,12 @@ - * calls a user function pointing to the data - * - * XXX: filter is not used. capture_seconds also isn't, but snoop is - * always read from a file. - */ --int get_snoop_data(char *fname, char *filter, int flags, -- Double capture_seconds, void (*hook)(packet_data *, void **), -+int get_snoop_data(char *fname, char *filter __attribute__((unused)), int flags, -+ Double capture_seconds __attribute__((unused)), void (*hook)(packet_data *, void **), - void **args) { - - u_char *packet; - int fd, len, blen, ret = 0; - struct snoop_file_header fh; ---- a/lib/tcpseq.c -+++ b/lib/tcpseq.c -@@ -54,11 +54,10 @@ - u_char flags; - struct tcpseq_ha test_ha; - struct tcphdr *tp = NULL; - struct ip *ip; - #ifdef INET6 -- int is_ip6 = 0; - struct ip6_hdr *ip6; - - ip6 = (struct ip6_hdr *) &pd->data.ip6.hdr; - if (is_ip6_packet(pd)) - tp= &(pd->data.ip6.body.tcphdr); ---- a/src/catpcap.c -+++ b/src/catpcap.c -@@ -52,13 +52,12 @@ - return '.'; - } - --void proc_pcap(u_char *user, const struct pcap_pkthdr *h, const u_char *p) { -+void proc_pcap(u_char *user __attribute__((unused)), const struct pcap_pkthdr *h, const u_char *p) { - u_int length = h->caplen, i, j, k, step; -- u_char *r, *s; -+ u_char *r; - char c; - - r = (u_char *)p; -- s = (u_char *)p; - step = 22; - printf("%u: %lu.%.6lu, caplen %u, len %u\n", - p_number++, -@@ -92,7 +91,7 @@ - * process_file() takes the output of tcpdump, saves packets, and displays - * statistics - */ --void process_file(char *fname, u_int unused) { -+void process_file(char *fname, u_int unused __attribute__((unused))) { - int run = 1, i; - pcap_t *pd; - char ebuf[PCAP_ERRBUF_SIZE]; ---- a/src/dump.c -+++ b/src/dump.c -@@ -37,21 +37,21 @@ - char filterexpr[BUF_SIZ] = ""; - int get_tcp_flags = 0; - int what_to_show = 0; - int packet_number = 0; - --void my_hook(packet_data *pd, void **args) { -+void my_hook(packet_data *pd) { - printf("PACKET NUMBER: %d\n", ++packet_number); - print_packet(pd, what_to_show); - printf("-------------------\n"); - } - - /* - * process_file() takes the output of tcpdump, saves packets, and displays - * statistics - */ --void process_file(char *fname, u_int unused) { -+void process_file(char *fname, u_int unused __attribute__((unused))) { - get_dump_data(fname, filterexpr, get_tcp_flags, - -1.0, my_hook, NULL); - } - - int parse_show_types(char *in) { ---- a/src/tcpstat.c -+++ b/src/tcpstat.c -@@ -421,11 +421,11 @@ - } - - /* - * process_file() gets the data, and then displays the statistics - */ --void process_file(char *fname, u_int unused) { -+void process_file(char *fname, u_int unused __attribute__((unused))) { - void *argv[2]; - statistics stats; - Double x; - - signal(SIGUSR1, catch_signal); diff --git a/net-analyzer/tcpstat/metadata.xml b/net-analyzer/tcpstat/metadata.xml deleted file mode 100644 index dce3f3be66c0..000000000000 --- a/net-analyzer/tcpstat/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> -<maintainer type="project"> - <email>netmon@gentoo.org</email> - <name>Gentoo network monitoring and analysis project</name> -</maintainer> -</pkgmetadata> diff --git a/net-analyzer/tcpstat/tcpstat-1.5_p8.ebuild b/net-analyzer/tcpstat/tcpstat-1.5_p8.ebuild deleted file mode 100644 index 6be8bb24a4b0..000000000000 --- a/net-analyzer/tcpstat/tcpstat-1.5_p8.ebuild +++ /dev/null @@ -1,61 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools flag-o-matic toolchain-funcs - -DESCRIPTION="Reports network interface statistics" -HOMEPAGE="https://www.frenchfries.net/paul/tcpstat/" -SRC_URI=" - https://www.frenchfries.net/paul/tcpstat/${P/_p*}.tar.gz - mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${PV/_p*}-$(ver_cut 4).debian.tar.xz -" -S="${WORKDIR}"/${P/_p*} - -LICENSE="BSD-2" -SLOT="0" -KEYWORDS="amd64 ~ppc ppc64 sparc x86" -IUSE="ipv6" - -DEPEND=" - net-libs/libpcap - sys-libs/db:* -" -RDEPEND="${DEPEND}" -BDEPEND="virtual/pkgconfig" - -DOCS=( AUTHORS ChangeLog NEWS README doc/Tips_and_Tricks.txt ) - -PATCHES=( - "${FILESDIR}"/${P}-_DEFAULT_SOURCE.patch - "${FILESDIR}"/${P}-ipv6.patch - "${FILESDIR}"/${P}-libpcap.patch - "${FILESDIR}"/${P}-off-by-one.patch - "${FILESDIR}"/${P}-unused.patch -) - -src_prepare() { - eapply $( - for patch in $(cat "${WORKDIR}"/debian/patches/series) - do echo "${WORKDIR}"/debian/patches/${patch} - done - ) ${PATCHES[@]} - - eapply_user - eautoreconf -} - -src_configure() { - append-cflags -Wall -Wextra - econf \ - $(use_enable ipv6) \ - --with-pcap-include='' \ - --with-pcap-lib="$( $(tc-getPKG_CONFIG) --libs libpcap)" -} - -src_install() { - default - dobin src/{catpcap,packetdump} - newdoc src/README README.src -} diff --git a/net-analyzer/tcptrace/files/0001-configure.in-fix-implicit-function-declaration-causi.patch b/net-analyzer/tcptrace/files/0001-configure.in-fix-implicit-function-declaration-causi.patch new file mode 100644 index 000000000000..d9158bae6981 --- /dev/null +++ b/net-analyzer/tcptrace/files/0001-configure.in-fix-implicit-function-declaration-causi.patch @@ -0,0 +1,26 @@ +From f199970cdb38259f0748e79ece844dc2cd676cdf Mon Sep 17 00:00:00 2001 +From: Eli Schwartz <eschwartz93@gmail.com> +Date: Tue, 19 Mar 2024 21:39:10 -0400 +Subject: [PATCH] configure.in: fix implicit function declaration causing test + to mistest + +--- + configure.in | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/configure.in b/configure.in +index 38132e0..e973815 100644 +--- a/configure.in ++++ b/configure.in +@@ -51,6 +51,8 @@ dnl If strcmp returns 0, we are on an enironment that uses %llu, otherwise + dnl we are on a MacOSX environment that uses %qu + AC_TRY_RUN([ + #include <stdio.h> ++#include <string.h> ++#include <stdlib.h> + + #define NIX "%llu" + +-- +2.43.2 + diff --git a/net-analyzer/tcptrace/tcptrace-6.6.7_p6-r1.ebuild b/net-analyzer/tcptrace/tcptrace-6.6.7_p6-r1.ebuild index 6757aed273ce..5453f2914699 100644 --- a/net-analyzer/tcptrace/tcptrace-6.6.7_p6-r1.ebuild +++ b/net-analyzer/tcptrace/tcptrace-6.6.7_p6-r1.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -inherit autotools +inherit autotools flag-o-matic DESCRIPTION="A Tool for analyzing network packet dumps" HOMEPAGE="http://www.tcptrace.org/" @@ -38,6 +38,19 @@ src_prepare() { eautoreconf } +src_configure() { + # -Werror=strict-aliasing + # https://bugs.gentoo.org/861260 + # + # Upstream site no longer exists. + # + # Do not trust with LTO either. + append-flags -fno-strict-aliasing + filter-lto + + default +} + src_compile() { emake CCOPT="${CFLAGS}" } diff --git a/net-analyzer/tcptrace/tcptrace-6.6.7_p6-r2.ebuild b/net-analyzer/tcptrace/tcptrace-6.6.7_p6-r2.ebuild new file mode 100644 index 000000000000..c8fbb4f76e81 --- /dev/null +++ b/net-analyzer/tcptrace/tcptrace-6.6.7_p6-r2.ebuild @@ -0,0 +1,74 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +inherit autotools flag-o-matic + +DESCRIPTION="A Tool for analyzing network packet dumps" +HOMEPAGE="http://www.tcptrace.org/" +SRC_URI=" + http://www.tcptrace.org/download/${P/_p*}.tar.gz + http://www.tcptrace.org/download/old/$(ver_cut 1-2)/${P/_p*}.tar.gz + mirror://debian/pool/main/t/${PN}/${PN}_${PV/_p*}-${PV/*_p}.debian.tar.xz +" +S=${WORKDIR}/${P/_p*} + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64 ~ppc ppc64 x86" + +DEPEND=" + net-libs/libpcap +" +RDEPEND=" + ${DEPEND} +" + +PATCHES=( + "${FILESDIR}"/${P/_p*}-cross-compile.patch + "${FILESDIR}"/${P/_p*}-_DEFAULT_SOURCE.patch + "${FILESDIR}"/${P/_p*}-fix-build-clang16.patch + "${FILESDIR}"/0001-configure.in-fix-implicit-function-declaration-causi.patch +) + +src_prepare() { + default + + eapply \ + $(awk '{ print "'"${WORKDIR}"'/debian/patches/" $0; }' < "${WORKDIR}"/debian/patches/series) + + eautoreconf +} + +src_configure() { + # -Werror=strict-aliasing + # https://bugs.gentoo.org/861260 + # + # Upstream site no longer exists. + # + # Do not trust with LTO either. + append-flags -fno-strict-aliasing + filter-lto + + default +} + +src_compile() { + emake CCOPT="${CFLAGS}" +} + +src_install() { + dobin tcptrace xpl2gpl + + newman tcptrace.man tcptrace.1 + dodoc CHANGES COPYRIGHT FAQ README* THANKS WWW +} + +pkg_postinst() { + if ! has_version ${CATEGORY}/${PN}; then + elog "Note: tcptrace outputs its graphs in the xpl (xplot)" + elog "format. Since xplot is unavailable, you will have to" + elog "use the included xpl2gpl utility to convert it to" + elog "the gnuplot format." + fi +} diff --git a/net-analyzer/testssl/Manifest b/net-analyzer/testssl/Manifest index aaca702899cd..744d8087d8c1 100644 --- a/net-analyzer/testssl/Manifest +++ b/net-analyzer/testssl/Manifest @@ -1 +1,2 @@ DIST testssl-3.0.8.tar.gz 9372229 BLAKE2B cf463236fb0812c2bc5fd5673d0d2d395fc405697817827ee8c660c96d789601a090b57febd48400e33fd9f28b23d42d432734b176b23a8e8ddf710c9b275485 SHA512 4634bc5dc57ad8910ca097b22d86511a26e855fb4dc7bef9550a795cb1f53a959b8472008756b40a670d7433ad56236b5a36fe0c88c15de99fdf586e9919b080 +DIST testssl-3.0.9.tar.gz 9381651 BLAKE2B 424569411022b68f105a20ad5b60db7c8994d1170482612ae7aed741230bd3fca43cd853dfb00660d5ba7cfdc717fa887a2fe9b6c59bbcef881f8f6473ccad3e SHA512 006180d175492f1cba6d056a92a57247725d4b68cddbebeea80a5d339d542f5103ddc8226f3a554775cb83bbef836a5d5bfc1bcf4fba7b18b9541473122ff720 diff --git a/net-analyzer/testssl/testssl-3.0.8.ebuild b/net-analyzer/testssl/testssl-3.0.8.ebuild index 895f0662c62e..59df413e58c6 100644 --- a/net-analyzer/testssl/testssl-3.0.8.ebuild +++ b/net-analyzer/testssl/testssl-3.0.8.ebuild @@ -12,7 +12,7 @@ SRC_URI="https://github.com/drwetter/${MY_PN}/archive/v${MY_PV}.tar.gz -> ${P}.t LICENSE="GPL-2 bundled-openssl? ( openssl )" SLOT="0" -KEYWORDS="amd64 ~arm64 ppc64 x86" +KEYWORDS="amd64 arm64 ppc64 x86" IUSE="bundled-openssl kerberos" RDEPEND=" diff --git a/net-analyzer/testssl/testssl-3.0.9.ebuild b/net-analyzer/testssl/testssl-3.0.9.ebuild new file mode 100644 index 000000000000..9912fcbe13ac --- /dev/null +++ b/net-analyzer/testssl/testssl-3.0.9.ebuild @@ -0,0 +1,73 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +MY_PN="${PN}.sh" +MY_PV="${PV/_p/-}" + +DESCRIPTION="Tool to check TLS/SSL cipher support" +HOMEPAGE="https://testssl.sh/" +SRC_URI="https://github.com/drwetter/${MY_PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz" +S=${WORKDIR}/${MY_PN}-${MY_PV} + +LICENSE="GPL-2 bundled-openssl? ( openssl )" +SLOT="0" +KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86" +IUSE="bundled-openssl kerberos" + +RDEPEND=" + app-shells/bash[net] + net-dns/bind-tools + sys-apps/util-linux + sys-libs/ncurses:0 + sys-process/procps + bundled-openssl? ( + kerberos? ( + sys-libs/zlib + virtual/krb5 + ) + ) + !bundled-openssl? ( dev-libs/openssl:0 ) +" + +QA_PREBUILT="opt/${PN}/*" + +pkg_setup() { + if use amd64; then + if use kerberos; then + BUNDLED_OPENSSL="openssl.Linux.x86_64.krb" + else + BUNDLED_OPENSSL="openssl.Linux.x86_64" + fi + elif use x86; then + BUNDLED_OPENSSL="openssl.Linux.i686" + fi +} + +src_prepare() { + default + sed -i ${PN}.sh \ + -e 's|TESTSSL_INSTALL_DIR="${TESTSSL_INSTALL_DIR:-""}"|TESTSSL_INSTALL_DIR="/"|' \ + -e 's|$TESTSSL_INSTALL_DIR/etc/|&testssl/|g' || die + + if use bundled-openssl; then + sed -i ${PN}.sh \ + -e "/find_openssl_binary()/a OPENSSL=\"/opt/${PN}/${BUNDLED_OPENSSL}\"" || die + fi +} + +src_install() { + dodoc CHANGELOG.md CREDITS.md Readme.md + dodoc openssl-iana.mapping.html + + dobin ${PN}.sh + + insinto /etc/${PN} + doins etc/* + + if use bundled-openssl; then + exeinto /opt/${PN} + use amd64 && doexe bin/${BUNDLED_OPENSSL} + fi +} diff --git a/net-analyzer/thc-ipv6/Manifest b/net-analyzer/thc-ipv6/Manifest index 2d19bb77271b..689dcd41d86b 100644 --- a/net-analyzer/thc-ipv6/Manifest +++ b/net-analyzer/thc-ipv6/Manifest @@ -1 +1,2 @@ DIST thc-ipv6-3.2.tar.gz 1595453 BLAKE2B f1bb1cdc31f4cf4d067b39997ca3cc2d6d8c15e7a8c585c7c494f03e229fccbcd65677e382a65f0e650d79278f5ede89173db1cdf313ade7c48dff1566856afa SHA512 648db4618ebb83572e2e318cdbb284fe96a86adf335f7dd9b26fd010c76d12e9137ed7367207c66c93c1961c868d3917d706db9f597289ac47ea3f9b83c03441 +DIST thc-ipv6-3.8.tar.gz 705821 BLAKE2B a2b57e13a47aacf1205b87c6f30cbea2468f47aad7232b92190995bf7ffbb64904d4d0cd187657c12584cd41e66cb0e4db3b6d826d41287aa020398de8ca7f91 SHA512 e3d8c80e1383e4825a3db717192446754d01e8e3098deb3075df0d60f79f014cefbd62a16c04379539e42c74513aa0f8bb97fc59221e100563aa7c6398a8b893 diff --git a/net-analyzer/thc-ipv6/thc-ipv6-3.8.ebuild b/net-analyzer/thc-ipv6/thc-ipv6-3.8.ebuild new file mode 100644 index 000000000000..53f532b0d072 --- /dev/null +++ b/net-analyzer/thc-ipv6/thc-ipv6-3.8.ebuild @@ -0,0 +1,50 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit toolchain-funcs + +DESCRIPTION="Complete tool set to attack the inherent protocol weaknesses of IPV6 and ICMP6" +HOMEPAGE="https://github.com/vanhauser-thc/thc-ipv6" + +if [[ ${PV} == *9999 ]]; then + EGIT_REPO_URI="https://github.com/vanhauser-thc/thc-ipv6.git" + EGIT_BRANCH=master + inherit git-r3 +else + SRC_URI="https://github.com/vanhauser-thc/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~x86" +fi + +LICENSE="AGPL-3 openssl" +SLOT="0" +IUSE="ssl" + +DEPEND=" + net-libs/libnetfilter_queue + net-libs/libpcap + ssl? ( dev-libs/openssl:0= ) +" +RDEPEND="${DEPEND}" + +src_prepare() { + sed -e '/^CFLAGS+=-g/s,CFLAGS+=,CFLAGS?=,' \ + -i Makefile || die + + if ! use ssl; then + sed -e '/^HAVE_SSL/s:^:#:' \ + -i Makefile || die + fi + + default +} + +src_compile() { + emake CC="$(tc-getCC)" +} + +src_install() { + emake DESTDIR="${D}" PREFIX="/usr" STRIP="true" install + dodoc CHANGES HOWTO-INJECT README +} diff --git a/net-analyzer/thc-ipv6/thc-ipv6-9999.ebuild b/net-analyzer/thc-ipv6/thc-ipv6-9999.ebuild index b5817554f26c..d1e5d1c4b80d 100644 --- a/net-analyzer/thc-ipv6/thc-ipv6-9999.ebuild +++ b/net-analyzer/thc-ipv6/thc-ipv6-9999.ebuild @@ -1,12 +1,12 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit toolchain-funcs DESCRIPTION="Complete tool set to attack the inherent protocol weaknesses of IPV6 and ICMP6" -HOMEPAGE="https://www.thc.org/thc-ipv6/" +HOMEPAGE="https://github.com/vanhauser-thc/thc-ipv6" if [[ ${PV} == *9999 ]]; then EGIT_REPO_URI="https://github.com/vanhauser-thc/thc-ipv6.git" @@ -28,10 +28,8 @@ DEPEND=" " RDEPEND="${DEPEND}" -PATCHES=( "${FILESDIR}/${PN}-3.2-stdint.patch" ) - src_prepare() { - sed -e '/^CFLAGS=/s,CFLAGS=,CFLAGS?=,' \ + sed -e '/^CFLAGS+=-g/s,CFLAGS+=,CFLAGS?=,' \ -i Makefile || die if ! use ssl; then @@ -48,5 +46,5 @@ src_compile() { src_install() { emake DESTDIR="${D}" PREFIX="/usr" STRIP="true" install - dodoc CHANGES HOWTO-INJECT README + dodoc CHANGES HOWTO-INJECT README.md } diff --git a/net-analyzer/thrulay/thrulay-0.9-r1.ebuild b/net-analyzer/thrulay/thrulay-0.9-r1.ebuild index 97d1f5c8c503..c5535ff76b1e 100644 --- a/net-analyzer/thrulay/thrulay-0.9-r1.ebuild +++ b/net-analyzer/thrulay/thrulay-0.9-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -9,7 +9,7 @@ DESCRIPTION="Measure the capacity of a network by sending a bulk TCP stream over HOMEPAGE="http://www.internet2.edu/~shalunov/thrulay/" SRC_URI=" http://www.internet2.edu/~shalunov/thrulay/${P}.tar.gz - mirror://sourceforge/${PN}/${P}.tar.gz" + https://downloads.sourceforge.net/${PN}/${P}.tar.gz" # init.d is GPL-2 LICENSE="BSD GPL-2" diff --git a/net-analyzer/tptest/tptest-3.1.7-r2.ebuild b/net-analyzer/tptest/tptest-3.1.7-r2.ebuild index 6187c9661381..5587fcf6e107 100644 --- a/net-analyzer/tptest/tptest-3.1.7-r2.ebuild +++ b/net-analyzer/tptest/tptest-3.1.7-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -9,7 +9,7 @@ MY_PV="${PV/./_}" DESCRIPTION="Internet bandwidth tester" HOMEPAGE="http://tptest.sourceforge.net/" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" +SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" diff --git a/net-analyzer/tptest/tptest-3.1.7-r3.ebuild b/net-analyzer/tptest/tptest-3.1.7-r3.ebuild index 4ebd77d40ee6..58fefcd79cff 100644 --- a/net-analyzer/tptest/tptest-3.1.7-r3.ebuild +++ b/net-analyzer/tptest/tptest-3.1.7-r3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -9,7 +9,7 @@ MY_PV="${PV/./_}" DESCRIPTION="Internet bandwidth tester" HOMEPAGE="http://tptest.sourceforge.net/" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" +SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" diff --git a/net-analyzer/traceroute/traceroute-2.1.1.ebuild b/net-analyzer/traceroute/traceroute-2.1.1.ebuild index 328a9946483f..dc26780317bd 100644 --- a/net-analyzer/traceroute/traceroute-2.1.1.ebuild +++ b/net-analyzer/traceroute/traceroute-2.1.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -7,7 +7,7 @@ inherit flag-o-matic toolchain-funcs DESCRIPTION="Utility to trace the route of IP packets" HOMEPAGE="http://traceroute.sourceforge.net/" -SRC_URI="mirror://sourceforge/traceroute/${P}.tar.gz" +SRC_URI="https://downloads.sourceforge.net/traceroute/${P}.tar.gz" LICENSE="GPL-2 LGPL-2.1" SLOT="0" diff --git a/net-analyzer/traceroute/traceroute-2.1.3.ebuild b/net-analyzer/traceroute/traceroute-2.1.3.ebuild index 704e481d5e1a..4de72a2c3179 100644 --- a/net-analyzer/traceroute/traceroute-2.1.3.ebuild +++ b/net-analyzer/traceroute/traceroute-2.1.3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -7,7 +7,7 @@ inherit flag-o-matic toolchain-funcs DESCRIPTION="Utility to trace the route of IP packets" HOMEPAGE="https://traceroute.sourceforge.net/" -SRC_URI="mirror://sourceforge/traceroute/${P}.tar.gz" +SRC_URI="https://downloads.sourceforge.net/traceroute/${P}.tar.gz" LICENSE="GPL-2 LGPL-2.1" SLOT="0" diff --git a/net-analyzer/traceroute/traceroute-2.1.5.ebuild b/net-analyzer/traceroute/traceroute-2.1.5.ebuild index f7fbff47aa10..4de72a2c3179 100644 --- a/net-analyzer/traceroute/traceroute-2.1.5.ebuild +++ b/net-analyzer/traceroute/traceroute-2.1.5.ebuild @@ -7,7 +7,7 @@ inherit flag-o-matic toolchain-funcs DESCRIPTION="Utility to trace the route of IP packets" HOMEPAGE="https://traceroute.sourceforge.net/" -SRC_URI="mirror://sourceforge/traceroute/${P}.tar.gz" +SRC_URI="https://downloads.sourceforge.net/traceroute/${P}.tar.gz" LICENSE="GPL-2 LGPL-2.1" SLOT="0" diff --git a/net-analyzer/trippy/Manifest b/net-analyzer/trippy/Manifest index 8d5755925b25..5f290c357170 100644 --- a/net-analyzer/trippy/Manifest +++ b/net-analyzer/trippy/Manifest @@ -1,108 +1,179 @@ DIST addr2line-0.21.0.crate 40807 BLAKE2B 9796b9a1177a299797902b7f64247d81d63d3f7e0dcc1256990628e84c5f92e3094ee8d753d9b72187b9aaa73b7ca67c0217899f2226ebd1076f8d25b458475b SHA512 afde7660dda30dee240e79df1fb5b92d4572520bf17a134ef3765e2a077af9e13713952d52e27fae420109b40f6e24dbce1056687dbcbead858ffc21cc7dc69b DIST adler-1.0.2.crate 12778 BLAKE2B a1dc17786adae945ac09d3525e609ed944e6465690787bbb831a1b9d53793cba1989793d0a5606d5d23ee20d36457923d451b1b3530c9ec7072a487aa3e55bbd SHA512 7ab190d31890fc05b0b55d8e2c6527a505e06793d5496be0b3831e0513412f9ba97f8148f6f68ed0770fa9cd980a5092d885e058becf1d5506b7c74b82674aa1 DIST ahash-0.8.6.crate 42780 BLAKE2B ce2fb8201a484715d42bbd9ca1bfe2d5f541d90e3619ebd437c34a018920b679d5a11f9e96be48fbdabd2e98a379c0395d118616f21eb9004724d8fcb04b2b2b SHA512 46428b27e96be1f30058b9383a94988beeb5064dfb4df04d6959b451d0c77ef69fc51f07fdf9511ab9728295eb6beee7783c31a2297f9e473fc537883e722b73 +DIST ahash-0.8.7.crate 42894 BLAKE2B 56f4b2f577eb2752e675fa2b3191c65e0bb88575f92e8d906714296fca1daace46e93256672fce08cc5b4ac11d40a690a06b32a99fb50fd0df4f042773c33b6c SHA512 2c9eaa22f7bda47a781994c769d4a2ef15ba0f511fdd4ec4680c13d4c1809f1ce01adecc3b3776793158062d28ad9e5f0b1d1c0a9429e43dd07cd99540eae7a6 DIST aho-corasick-1.1.2.crate 183136 BLAKE2B 2d4306d8968061b9f7e50190be6a92b3f668169ba1b9f9691de08a57c96185f7a4288d20c64cb8488a260eb18d3ed4b0e8358b0cca47aa44759b2e448049cbaa SHA512 61ef5092673ab5a60bec4e92df28a91fe6171ba59d5829ffe41fc55aff3bfb755533a4ad53dc7bf827a0b789fcce593b17e69d1fcfb3694f06ed3b1bd535d40c DIST allocator-api2-0.2.16.crate 59025 BLAKE2B fda69b52435a7243eb19bc55914a1961e59dbad5ac12c40db39cccdf7a99c742da59c3ef160350808698db24b91e0ce655cd1acedbbcbe20c717604aae23ea5e SHA512 e1eb0df6b44b62115795ebf772f81e9ac0b6d273afd81659dbddb7eb6628b6e5ef6a60ea21413e79ee638afb72e6872ba83a075f6324daf93f2f1eda48daff2f DIST android-tzdata-0.1.1.crate 7674 BLAKE2B 4385a4875aadaacd5284a9ca7d1bf8a7bf14bf8925d1563d52fbabacc3af2c1ea08bfcf77106f3648f4fa052ac295158a21e7a0131d31eb9aecd99ea4ba20055 SHA512 4294024c21ddd0090c42c8eedf708d40d917f55ad5a4cb7aa3e64cfb6551b6df60f2e36bc08620c1d2fc8c7ba7207411518ee5c8635f60ed8ad9efdd458a2077 DIST android_system_properties-0.1.5.crate 5243 BLAKE2B 86f68ec3bdabf8c6ec47881d794970f08a9eefc7417fc8a2bf4fe9faf9bdd2a2024a94adb0cbf96673409f5fbbd4d0111a1ac371339e7a90a277b6cd5003524e SHA512 b09f51339f9772c0e2e4241b36cf51573c6b96b19ffc1fbbc94b1c1d1d2fdfe8eac3134af54174a675ab05d18ef4f6bcb2c7fcc20114bbeef6e17e3692202191 +DIST anstream-0.6.11.crate 30239 BLAKE2B 4ac585ec56a804239d32ad3e64d93936ef9d5c8e0f0e2df17f7b081b6a3b2c4c32ff4ebc09ec02507bbed22b025628029d859610aed90c024e19a3216de73c8b SHA512 f8dd65cc116a1495782a3bfc98edfdd0973ab22ea2fafd292fb4bd3495af7b5ea410f320d3fa05f7f812fa96c2a20f4cd2af9fc58869a1a306f32714cbe45163 DIST anstream-0.6.4.crate 20593 BLAKE2B 2b617c45d351e01222fc50f52551e57b4a8b0ecf84c6ddf44336c7c9d3b9dde15232b1c4f664d567849295bf8f03612b73ded56f1b3937392eb7718f1e0446c3 SHA512 0b983d626c53d1edc184f04cbd2c004eb9c40d14486b23cce86ebf50cbd3d916d32cb0423ae1d67c2b83b966690090af740538538ef846c0b126c686a1ebe159 DIST anstyle-1.0.4.crate 13998 BLAKE2B fb501700855709e53438461c2f4b48d869613e7bb3bb700db8bd0d95082876d3782dc2cfe3ce110bb4a206994de56afe0e90fe89f9ccd07c60fe1c652123ba59 SHA512 671c6f57106198bcfc2f9000aacba98fabacfadfce2329dfe8d0e0a2af9404da483d7a844ca2b08e1fc0249371f574c13d0082c9f7a4ed90ff581308257a52d3 +DIST anstyle-1.0.6.crate 14604 BLAKE2B 0716d0dbb62bf05c63c2bfe1c689896660073a423d26965ce2570f11e1925752a61209d78c2f2fe65ec4eb64ea4ffbb39669e789c0ba5d1b71e75de929153b20 SHA512 dc0e505465be54799b9faad70d0c6f7f0dcf9f5e1aaa43177b826c85dae626b054910244da0499862f066f6723a1560ad12100aec523f28c6198f1ea0d1b78fa DIST anstyle-parse-0.2.2.crate 24696 BLAKE2B 979daa24ccc3ea484445216bddc190f148f0ad83b95c997c1becbadfb641b67834980c413bcf5b7ddc2c6883d5e071a9636fbb44f79680ac42f8b73a797e466a SHA512 28039806f87c2bd8266cea834975939b79fdf0cc95a029654806655c0662520aa497d84eefadcd9edce204986e60b62678e76a09cdb38bcc50c91e9d05c4bee9 +DIST anstyle-parse-0.2.3.crate 24699 BLAKE2B 17e8638187ccc1ca0174a8cec7f7daeee7e0d8b8c430f7e74f9b10d8de4b49fd1c6facfdafde305b7a3e55b1ebf2b4e8ec4975a0cce691514ddae9eb5b5e711e SHA512 4a6d0f706d75c9b3c5144f34efdef3ef8fcd075962c594a23a6209ed56112563a34b3c01e05a08a0868d59204272d06211b2585cb9d06ce075ea875bedb2f399 DIST anstyle-query-1.0.0.crate 8620 BLAKE2B 2d296b5066fd6284a2410923215571e6df650c5ef892d6de7a7088a0996ca30608797feabc84f3c325ff4d07001dac80ac5067d2a9c9d15d9ba59a276b399f53 SHA512 2781be5c82293b7ae338ec5046fbeb130de9eb2dbf2e4dfaa73ca5233032e1e52c133e141b02f33d4bc36d996a0a3f680ac82d42d614a5305005f60547133c7a +DIST anstyle-query-1.0.2.crate 8739 BLAKE2B c06643e8616f1f4469a32f9c0512941ce53ac5db9ebfa7a5b2f19233040cd4438dd2ee69ab89ecbc1c239e92b674dea9df15ed673408c6f3fe21787cc17d76f3 SHA512 f409b624cbeecf58fd87c47f85be28cae1fe48f65d692195fb80854c514e38c40d0e0ffad3a5b388a3929c47bd2060302ebb635aa98dc57329f3a5ed7be3e2dc DIST anstyle-wincon-3.0.1.crate 11279 BLAKE2B 593de9443b4c612526550285a6c156db26a233815e77a748597c6eea509ae511f41eb8ee736010f8be853695c9f1d94b034a77190e612f0a00bf00385d66ced2 SHA512 75ab14081b09e031ee0f559538976f39092aaeb6f561a56de83d12911cc2b45e28eec21068792c86a61e344021921ab55e7139ca79acec78e7d4a796dfa42a2e +DIST anstyle-wincon-3.0.2.crate 11272 BLAKE2B 73e124773f618a744b17017d4680ec6ccc84ff94fbe2e565073fbcc0facecd3cb65356cf27746d07f453bc917cbeb2ade3a618c6b8578d64cff4828c99569868 SHA512 4cc194faacffa01c6989354c1cadbf1134f0945250f67b7020ab5b475e30db34c799176bd335a6265386cb9c5e8b5bcbdf35894ec0c809b140ffe1c406751931 DIST anyhow-1.0.75.crate 43901 BLAKE2B 6353557d7ec2cbfdd001c039fad62c95fea9e02b113149f726fd14bb36b31e637e8609dd5ee20a900e9c11bb783d9958d664b31ba7c467382fa7f51d477ad3aa SHA512 190d6be8ede0af9808210db53e4dc31ce69b126a26b0357220c4705a11e83cab2c2c09c59964a35794f3c434f717eaa6bb669e9e8f16012535c14246b17e8d40 +DIST anyhow-1.0.81.crate 45142 BLAKE2B 9b8678c5336fe5fd2823c58eae827f7aba726e12fb6edfa958c6e3b38a96dc3310bc8d044ee2e9db0bc611548f0be9a7b664b75321bd0b8a7e168d27dd3d7e78 SHA512 3d328c6b45a4780cfb6fc8daa5581cb5e45b230cb5f55837b0fcc8331c8d53630950c281115c06b21e655821a46d360c4aa667cbb24e87f3a534206361b08af5 DIST arrayvec-0.7.4.crate 29856 BLAKE2B 81ffac1db340e919618351819def3880ab1ef70d0acc47d680f15298eb749bcbc3bf7944ba14159be46b1e734c91b4c0f8cbaf774fd864c17caa3c9fb1fc2e9b SHA512 91e8f70330c515c966d78ae235e890594f9607381ac738a2c3586b53f01411e98d1687494f39ccc365948ae60497df3dfb2be18e26ab7e69bc0966b6c250e1ac DIST async-trait-0.1.74.crate 28997 BLAKE2B adef7d3929f7cfb64c9884fdd17871193cc063f935a5540562b1092e85d85ab89527bd353486a219a2f9bb74ada6a0ee765e839435962cb5768f2a65b7a2b1e2 SHA512 2c0880bc3b7863deab06e873b3d5a893545549c1dae922370d629c16cc0ee5cb4df13b30fe9e34d1cee74449d549745ff99894ab0743f805d96a5d4b5ef2dc80 +DIST async-trait-0.1.77.crate 29986 BLAKE2B f678cea4defa1cc7c0f1571e71f87392c0fdca8ba175bd94be68b92adaf2b4afe13fac9020bd27bfbb2af9a7d5f2f7047e3bbd0b080a7213354a8175e6ccd455 SHA512 7ddadfe6c434267cbb22de62f09373ea83ec3c4eceb7781e0bc438ce422266f30193730e0215411f1c7c9c6d5cc589ed9bbbd71c836e440bbcddf8afd3d8950f DIST autocfg-1.1.0.crate 13272 BLAKE2B 7724055c337d562103f191f4e36cab469e578f0c51cc24d33624dea155d108a07578703766341fd6a4cc1ef52acda406e7dba1650d59115f18261281e5b40203 SHA512 df972c09abbdc0b6cb6bb55b1e29c7fed706ece38a62613d9e275bac46a19574a7f96f0152cccb0239efea04ee90083a146b58b15307696c4c81878cd12de28f DIST backtrace-0.3.69.crate 77299 BLAKE2B 594358f1d9171fc369f50cacffab03b8a10a8fe3da5b915611cb74b0dbad0e048c7dc79c53569d89827db583e0f61fb7269147b6258781a1599a811e642414a8 SHA512 6e86de53e1c5003ef68b6a85479cde1e70bf416bdc50e6e32ead9f9f070fa30ad46de22574041c844ddfeabd5d15de01ef746f19f8cb7f257c491ef0bf071244 +DIST base64-0.21.7.crate 82576 BLAKE2B 25cc8761c14220981ff4ed332058f6179948080cbfa2b225ec1d1602e4af14cd470c969e8b7049117e6fc51a5a24e06b1d27bab844486ecb76409d12e0581d5d SHA512 c6986d88dd9aa081d914f35b4174be4ba874848657ac4b5e63b9b45af765d973289c548ccb5a01584edfc0d8d79ff5be25b51365295d6e7a311bd7f0ae3c0cb9 DIST bitflags-1.3.2.crate 23021 BLAKE2B eb990bb27b2bdeb66fd7212ce582cb36e1c616debbac85df642d0c82b25439e6bf9b1e811fac76b59e58ea3c1bbea6170d03a61e8f9a395e4334a0e2e2987eda SHA512 3c698f757b5cc62f815f9a1cce365c3d2dd88e4db71f331dff8bba86c2865f755b81cb4c9bfc59bd86b7643b0943f9e09a7c4f8ad75eb2ab0e714803d0129f62 DIST bitflags-2.4.1.crate 37043 BLAKE2B f61c45b142265e9c2944c7054e01704de47510735e9ee5351cd02b98676cc4eb42d68b1fc4849ad5f54654617a74f20cb533b4207c2fe76516b724ba9318b414 SHA512 d3fd7abc95acc1cb5bf16d6acc12dbb8eadd250f069268df13c2e8dc3d5f5c15a929cd17ca931c77393b64dce0516ef8674c469789ed32d78e315b5faada062b +DIST bitflags-2.5.0.crate 43821 BLAKE2B 2d2a78b0a19dcb39580e6f73ed6c468b0626043010b34661084944c83561fe49db24bee1ab57fd692d57617be6506d529e095aea27b753a77e26d0b1ebf7ed78 SHA512 75d7a89e53e5e7582591932bc430e6a1db7ed0f914ded6dbcf957125be52975598df7fee14ef816f66544432ef0505f0a081f3794d17138ec429e283fe14fcf9 DIST bumpalo-3.14.0.crate 82400 BLAKE2B 13bde02e2e60ea3099f4e46ff679d07b2e8046740c1855bb81fe8d20a4ef0fb26e565da724f628a00c9154ef16ffc9018f67433d2a32544564b66803b5bab223 SHA512 179c116a5320c5f21163c343ed48add36089d806e35bc303318dcfe09ba1d5f02bf8012726d0c2cb76a73fae05a7c887a91e18f9e5ff3b9f9ad8a2f12838757b DIST bytes-1.5.0.crate 58909 BLAKE2B 2931f19e813eff73be407677622fa29e45f9b49434d5b3a04104b56563fc0e941fd8c5f996258a1aa660000ef014668d70b683b751af8e48d28d0aea76890c92 SHA512 6654cf41d8f0d7e19b05fd95044b9a3bfccd81f469c797c6aa763a4dd29e1b34064bed2e094548d147045cca7bc4706059de5bcf9f6579189e6068fbbf1c29a3 +DIST c2rust-bitfields-0.18.0.crate 5883 BLAKE2B 29b43c18a838e49220c6e323f596f7d0985dc554352033c71c148069a18ca87dbac37449d012046d114757d4bd4f8cf9f43f64514301c95942b0cf6f855b8264 SHA512 1629c3b5e6a34a208b48742366cfd3db72b57a38fcf3eb085c4c38177a128e0ed9b583337e682945b049760aa5b83ccd0d7cb4118fbe3f7a54054a8fc1d71015 +DIST c2rust-bitfields-derive-0.18.0.crate 3617 BLAKE2B a38d622bc40e8bd87d908ab88403c4811decdbc7cb5c4807bb092875b42fe0c7218ab0acdeb61642099484f52d31e515d829d0753be01be01a000d151a10dca4 SHA512 71433c8d363b8ec14e567e764181086da19b0f751140166a665f8bb1bbbe3a42996ba2ece954a7c024052c668938b422778922a313babba7b4152b877027f28c DIST caps-0.5.5.crate 17575 BLAKE2B 77d788f936eb36c2f4776ee719cdc138dac4b840ce632190f34ed26e705175209f9905c71d96d54f0c69f4c6d25f0a203a4d490f2034c330480bedd5ffab149e SHA512 866312aa0f3847dc2779570d1466aaae00945d78a2f5f3b05a833c67a2abd04c0380715f61dce79814845e4e57321adde67fea97f99dca56a970c6e6f80aa029 DIST cassowary-0.3.0.crate 22876 BLAKE2B 7e74a08e02050548ade7dd1ebba7ce4e4360d258ea6acf126453889dbf16df433bed7b68789736881c957f4c09eead1f763a0c02f2474157b1650a1e77e6eca9 SHA512 0838c0b79ed31f0c514fe4ac82633976e34b0d6cb08616313cda0e00623514fc6498c6c308cfef54ea029f1fdbaafe2991ca8ac3c38437a113ac62e37f9397f8 +DIST castaway-0.2.2.crate 11091 BLAKE2B 3445e68aaf533caa1df958fb371622ef61c7778d515fd1efe39a12588e24fe07480738daba008e414a95e72af10d5ea29702425e5b91ebb277fe346ff74bc43b SHA512 dbce2a61a429eda7a8f21b4a35dced729267298be9793310afaff58843211a7177a9bb932a4bd9dfcedaaf1a2570b90261d4c1047c62474450ea835dcfc325a4 DIST cc-1.0.83.crate 68343 BLAKE2B 33245b33fa845ea2f36da36e3830ec835f937e4319865b357ee9d5ea29a0f9f8392eadb38bf1d95e3c15ed201e561acaa87aedcef744f8db3dabff87a96c7f02 SHA512 742a248c3a7547bb220a0b9c97b67a831fab9b4ac21daa08c85a3966b9fe576088def33e16132fcabec9a2828a6fc437088bb045bfc98b2cea829df6742565a7 DIST cfg-if-1.0.0.crate 7934 BLAKE2B e99a5589c11d79d77a4537b34ce0a45d37b981c123b79b807cea836c89fc3926d693458893baca2882448d3d44e3f64e06141f6d916b748daa10b8cc1ae16d1b SHA512 0fb16a8882fd30e86b62c5143b1cb18ab564e84e75bd1f28fd12f24ffdc4a42e0d2e012a99abb606c12efe3c11061ff5bf8e24ab053e550ae083f7d90f6576ff +DIST cfg_aliases-0.1.1.crate 6009 BLAKE2B 6acfae9a89d3479f7ce1f0b5dbb13bfe27c006b936a96685606a61a06f69d17ab754a8a0d96c54213f758281c2fb32ac74d03a34e0f836dc7e438387955aac37 SHA512 238828445c5b48ca41ff88825af0a1ad30494e423bb6f89b6d5e4d26042afaa1ceb0e32041f7cddd79c3e15c6c82a1ddb9469c4b63a1ac52d4bcc1174900f880 DIST chrono-0.4.31.crate 214513 BLAKE2B 2ac43852ea14cb7b129adf68ff62adac1763b3f4802dd3d23c43cb131377b501b4adb22aa93818d7ceded8eb10c17f94a7836257ce2876d0513b063276129c54 SHA512 23276daa2c1bc3b7b2327dc84200fb40cc995a8b599d1a537e92e08138ab8a0d1548a510a8155dcdda18820120d7204e89a4686c866fc3a8d2460cdb30ac6089 +DIST chrono-0.4.37.crate 234441 BLAKE2B d1c10bcdf33324f1dbe9a79cd8c5a70b8223ca289753446aef778c93bf18863714ab2ade88f1e67432d1451b0d408065325a7d8dd3578211a0e39caae733ceee SHA512 46d77f291c7c60a25d0c06ebbd89935ef3ae1b736d504b8faf39aad8210a9fc68b45b5afb024763979f666308750b1a662afdabc36c59974567cadadfc17fcbf +DIST clap-4.4.18.crate 55269 BLAKE2B cb5d4b093bb7958d013b28ee25f9cbf0479ada392b81265834d75a5fa2e6a4a687f8d4a71520d5bdce05785a874ffaa09beb5707766d59e70928dab00bc122ad SHA512 1f151864b92dcfcc69a66c2a8aa8310ce28171895698d82e2e69e19a6b51ed8780e5eaa77410df9aae2d17c9b45117b913a4c23ef879106c1b7a96182656ebb9 DIST clap-4.4.8.crate 54609 BLAKE2B a975094e91d9aa9ccde5e79d6b46fad451dd80a1765a116a3c94e3523bc0383e51a5ce7383021b10776654e1252eb08302d9a5761bca903b154e1a0a1f5164e5 SHA512 579cee9b0b582d23c3b78fffcbef4c33ce47a67f511276922daee838aa5ad26134ba81a454bfdfb72d7e23df69b78227f0b60e57d2ca7455402d37dbbf099dbc +DIST clap_builder-4.4.18.crate 163538 BLAKE2B 9991c1a8aba5feda466fc878f9415ad9b5922ea1835c17e1dd6c640234ee85e623bc556ba0e4edd84100a0879ae462028c74304465310d69f9d58e333c2ba8a3 SHA512 ff04ce8e700d8df4a0ae94e8341c3bcc1ebd415312e3b21d56e6beadf604aa5576641861506fa1c901a615a013e4f30bf8e6467889d637b34fa37ef22e2a15c2 DIST clap_builder-4.4.8.crate 163164 BLAKE2B 1d7ea3e3bedbe44f8bfb80014bc8de1057749b3e94506a83c3da6e475a67e44911bcdc6f08c3af02fb908059a745dcc2268d03fbb58d010841a2bf41645356d4 SHA512 83a3a4c81bcfd769a787b4f91b29488e65cb3d4e9e5160ab7b7289e5860a7d4058aa08077b62b9e8d10e4c1cc7c949439b677444d94c8ae00a7bebb2e0e8af8b +DIST clap_complete-4.4.10.crate 37761 BLAKE2B 41364c37c96e82bfdbf0fde377512e894ff720542ded85fe49da4e305ebfdf39a2d511a48d6662c0ff2e3d191ea95c59704dbfe89e7531a969be42de9409e82c SHA512 d0f541bd167c9f755f149e5ab3171a4b5a9e4a37dba2de62ed51eeaa20691eb7602ef0061392cc7e4ca3594a0a69a7eeec75bf65f14e92fa6bc45285725c3f1b DIST clap_complete-4.4.4.crate 37405 BLAKE2B fd43c668a29b8e8329f94153a5e5ce19e27437f60d88ea0a59573456c50a475e6dca659588d137909659a05b04ba5b4b412fd33d3daca20ee317a9890eadc8e8 SHA512 880b3022105d4ca68846e35e359a1613e177ce0be2b5f75b15bb3c4630bba93f8ebb4c7832205783f8bbe84dcd49d756468ac10c48d0e803d644a158f1163991 DIST clap_derive-4.4.7.crate 29046 BLAKE2B 96ca919b8f9901b2e89c58ee8cf8bd3881ff715ac27999c03c867b317321e4839d9e923f68d411a05b45c34d54557af12b8a173f2445732fb6de16f30dad8e2b SHA512 4be40460468f7ce22906cdc9eea8d01bb07cb206d4ce0c3df2abd929d6925b175a49cf63907925ca16ae6297d6f4d933087fa5b35958e551117ec7ae050be167 DIST clap_lex-0.6.0.crate 12272 BLAKE2B 22aa04997fffa15a2efc7013ae27fd223c3247cd31f8fe96aafb4e87e3224f075e887df10a95a2da80b468d4e16088ae9f171ba6551c0ae06d77bf3b8920ff9d SHA512 3651aa5e27ed35b6b75b1d25fd9c20c26a2a6039116e54d84c51469087732a4f0fd71754326456b367e341b017d03749e9a6774cb7b62250ca8745f5af46574e DIST colorchoice-1.0.0.crate 6857 BLAKE2B a0818be1299717461ffc1bcfb6fc53a0b3b645aa8c45fb72e045cf2d876fa207948610e58d6a837aad24838ea9616e80b0558ca3eae03fdf9bc4c03a8e5ba52f SHA512 53363f2889cd8e8a3b3ed10c48356896c0daa72f3c12c9c7804707ab0dbc07c0e34ef52fa4f0fb1647311ce5913168c1bf62c2407ff86a33f765a9e6fccad551 DIST comfy-table-7.1.0.crate 72879 BLAKE2B ff80ac3047eb28e331f04fe8df97105f87dc7b88de1a97effdc0daef94a9c9650c819a9f6b9d91e610bcd4e94c58377c8b087c4ea75849ef0288b87bf7d0b69d SHA512 f71b4f03e6ff088fec86aede0a891b4c002b9590444b3398adb6cf5865765976c95e3eb378f87e0a00feb2b16699a20165563fff77d99a68baef23096649a5e5 +DIST compact_str-0.7.1.crate 57246 BLAKE2B 2da5cfdc91d417294ca87ce834e8006d3426aff4cb22945e6744ace7d22c940f0181a75f25e6acc41efb5d83bf6ba4ee0876db3ce5cc05b9524a9868dcb8c7c9 SHA512 29ed591024f8f1b478722384664f5700fbde97b44af82fa32a8d1ccdedca9dc425555f9e5a4431a6c954d58cd90d60a25a9ed7f18773ede13edfc68094a23275 DIST core-foundation-sys-0.8.4.crate 17725 BLAKE2B 8afe47838dc91c8848c0d6a96a604149e5f0762228dbc10c17b85e4e9cd2c3928712bd0b28e1071f5fd6fd76d4ef972cb86c6c929246fb6e84577776933a8ac7 SHA512 15da472316d6decc213e4e5f08ecd22a108ebefe427b890741de4f9199614f19123e64329da76de5e8b4c9ff74ffc31738fd929acc1460fc757b4aa1fd3fdbb6 +DIST core-foundation-sys-0.8.6.crate 37629 BLAKE2B 683d5a84b6a3816317f87359532a8339f08bb4043f1d70a8588636eb5dbe6ebb3843e2a12d9a7e5fd1637a912c52a5aefbb8d44796330b09593e7adefd3babd8 SHA512 24a8958cb16b081862a9000affb0147b8b3be1a664b834c3dbddbff03e709de3f4060ff4800e5a35453f4392ccf33168e8b864be71b17be38cb264a39b915100 DIST crossbeam-0.8.2.crate 10502 BLAKE2B 487a7a5f197898ebea0fd41a413647db0fc3380790cfdfc6cb7cf3caef48197bb7c2498579ce676d3c5796480a8541ae37ae03f009d768a6157246b1f7d63a33 SHA512 bd2e54372595daeaddcaa26802780959465bd571cac64f23256b7ecc68ff5c0161a36740a51386ee54abe7c509ad1ff870b6f6877a7921f4335661f2c554c3a0 +DIST crossbeam-0.8.4.crate 10500 BLAKE2B 03212d9789a66c1eee7d1f4c7883eec1267089ab9d652ba5d7d59a22e04ab878e5defeccf8cff4587a34d976488ffa689bffde596588057d814b633ab3d67d1d SHA512 63650fe2d46ff2e593342b398c153facd3cb7cd72dac9b057ee0aac5ef5e9dd9df0e71536d66879676c0edaa89787d1f365eea35c82604ca46090e527749f994 +DIST crossbeam-channel-0.5.11.crate 90434 BLAKE2B 8666f039a0e4ac6f0f8be2d08ce3349d8ad4aa7d0f38c638dfa6dc6a7f30a1629e42f87757d9e054e836941dff6a8efa53b5337706bc5958d33dee61f38e7bcd SHA512 1d37bae1c946d402c1fce37f22a82037d68896770757aa91d209387f947d39c514df52e0ce94317141513784511ac626482f16099cc3b62ca28a52f387b69c71 DIST crossbeam-channel-0.5.8.crate 90455 BLAKE2B 017132056f1b40e55fbc7a09b75509d72b0a6123a0e5ea5d6104fe822f73b3ccce670d711d3b84b5ce743dcab5f10445297a6701b71213b77c0d56e2c3fd7160 SHA512 47677d6fe63050c51393e4a0537a3c65d7055c9eae118ebe60c5d716b4f47f23c2b1947b1e1b66bfb34a57c4db3a44631d323e996dd545565fe4f58c25863ff4 DIST crossbeam-deque-0.8.3.crate 21746 BLAKE2B c24025c65d7c1c98e442af95491749dd4f777af0509636ed66886dcf656359ec50dc2a5e26327559c6659f6b355d2b0b992dafa691a36571c99637cb47372d0f SHA512 f3201c9afef7d2d119702696f7e5e7997a104b8f7d67c7adebd1cbed84d3a3415636ff674f1ccdfd95d0dc162384e46c6138c8203ede69577b0d5359a4b44672 +DIST crossbeam-deque-0.8.5.crate 21726 BLAKE2B d97b35e8e8858deaa7fa9a836e836d02914aad29e5c34ab121f52ed65e95213cb2574df82273277365889ea771f04eb40bb2439347c259979f1dd6d5e9853bcf SHA512 0f0c9745763ab156136227cf1415de514952a3f8282ffe413cc249f9f4b345b029940e6a6c87b3be8331a7c783655a35b89c7a2547360ea5ae10aa64ba7ae864 DIST crossbeam-epoch-0.9.15.crate 48553 BLAKE2B 23aa0532d3126e22efc779859478098e505b4ec895c643530a3f7e8dba0543df3d8ffcb6825b1d3869a4418e17d798d464b3e1bb51522435d50f53ac224e22c8 SHA512 d9292c059ef1d156da52950137b2b3ea5eab66c4cc2f763d02078d0b0106980839ebed2ae2aec53e026ee7b3ddc37c4b51370d925ada1ad13d9981934daa7bde +DIST crossbeam-epoch-0.9.18.crate 46875 BLAKE2B 200c256cad6011a3a14c4664bea6b150fce72d561c4fffc387fa561b08c0480e8756bf51c14874c5fb19f427424547f72d2cd7dd6f56fb8b6666a85f8d52bfd1 SHA512 0a8a199b9d77f4e28e91fe0a0cbff7e0dec58cac283631fd972477fa912d2f6ddfddaed2c695e4978b01cb5440b702822af6333e7c3dfbcb9a2c2086999516b2 +DIST crossbeam-queue-0.3.11.crate 15581 BLAKE2B 91b9797f985af06c854c38b8124cb67864bdb47979d2e253928678118515fbc1257108c7102bad66e1f65fd6f324a93749dde86b4ea28f3bb5a16491f3f56ed2 SHA512 c6007307ef9d219889e6244805ae759998396e1d0548e3664ce9ab366ea78917dee75251c4265b0e3ef4ab15b5c6d42d6a5e9b286d17ad42ec169e7fcddb8ffe DIST crossbeam-queue-0.3.8.crate 16731 BLAKE2B 80a8647bf491adc1a5dc736f662c01e77bcceb4bb2b876eaf684cb2a742a2f46d09e1221f6ca8b19340ddc9ed3a10bf07a08305a5bf069338d00873b1296ad96 SHA512 3c4e855184f8e2656305a59463f0170aab99f9c2df1001f54341b62e05e533864f384477a7a9cbc2b8b1a36bbe4b8076531c11b1492485029ef81ade6e7cbf8b DIST crossbeam-utils-0.8.16.crate 42508 BLAKE2B dfaf9e7cade2cb5a2de90dc622e58a69c5b28fe9f69d3cbb945431683cf48fb409565190e3414a815563afb12631d990476919890fc482ce6b5792fdc25536a7 SHA512 4b8d599a8b93015eea2fd404cdf1526fbb94662fffc7c64d2f0659aeef349e4ad682f61b2b85d075c7f3fbbc4d8106cd7caf6e65dae117ba982f31262df3f831 +DIST crossbeam-utils-0.8.19.crate 42328 BLAKE2B b2846f569555818fe7a3ef4aa29f68c638f933ee0251713c2c92624bee5f8013def5527027022963f572815991abb98d5e68d0fa00f478b2762133f84ffc84c0 SHA512 6e742fbb0d2a6371db87e81f8ac583259530a288237d0e8347394581c60004703a822318ec945936c410bb44001b115d8d986bb264e5b2d8091bb63a8edd93a9 DIST crossterm-0.27.0.crate 125311 BLAKE2B 93724dddcfcce9249db721213985fbd9b30eeabf0e8c1c8626744eae3a15f181cc2bb871a77fdefdb2b1a7139453b1c81081c6d82a62233f3574ccadcef18686 SHA512 b7b2b7d8affd845902e0dfa06edbcba9c7794e0839895998f39ea1b118de5251fb87c6b5de27e85c490a436b04943ff51d609cecb780674c3768c12ec401d2eb DIST crossterm_winapi-0.9.1.crate 16027 BLAKE2B ea63abf751aeab203f326e77260cfbd1de286be26acf714a083ae1262b0cc2a35b5cb6d0bd54f45b33c1942eb22f916141c5870aab34149fdb30faccf4d4642e SHA512 48eee242f477f43b69c00e3a5d4d255de2ce1774f6e73d869c5472b35d85af0b63f3a607097da8ace437b1e52a524ded4106767b83d4ec53c30c2e37ac4b46a7 DIST csv-1.3.0.crate 888212 BLAKE2B df05956223c50cde32f4ae6df922fbdedd8b50008a8898dd49bcc8bb7430d25727a03430c32ec23cc44ced043709de1f80f4d750e335bd12b22d0b06050881c6 SHA512 1b9e870c433e4d37e61cd604d2712c59ccd392cab55b8c88596a7094245072dcae02ecc80d3ee7cdaaa083ec2c2865b71712330c55e93715917a86106a2230ed DIST csv-core-0.1.11.crate 25852 BLAKE2B 9f56cea786b5b35f6fd5c4f41fc3cc06d777f6d643d939ca7d57b1f1a24d4ee16ae3a4de629e484b0e4cf87009abf4911dc4d1bc199968ef5c7f4100cd238d1a SHA512 0445c8a4d4d0f90f03e5d6507c26454aaeac0b355fb39d19e1676a7cb27b4372db3541367ce838d38151862b7bfbf19750cb550e24e74ab5e07ae9bb4edeedee +DIST darling-0.20.5.crate 27737 BLAKE2B f3b5dfcb8313e8eb74edbd49322d45ed814ef63df642b27c27c1e464c8db155b536fb6d53133f070f3edea749cf6f15d465908119cc1c30156a2acfd4b93d536 SHA512 394bccf43738ce63d7d0647e828f6606daa1d1b2be85ac2839fd5ed22450e93191c33e25bd32e61ab9b82a4546a3f84acc6b376cc0029b9a236db31a38923a5a +DIST darling_core-0.20.5.crate 61089 BLAKE2B 00dffe93c0bfd97c856f8f4e070c2cec02928389fed26b3680ed6505e1618688f76438c4ea85ed68ea01f8f574cde375fc7f227a6510361e1727510960fa0531 SHA512 9179e08ada4e4871242d3be176109c8c6a94e1ce2451ab18e553061b40f004d1d725c50eb7f91668a43a90b548a0ba6a2a05728ef631c857a53116ff7dec08b7 +DIST darling_macro-0.20.5.crate 1857 BLAKE2B 540369edd7ae25f16024008b0e6c8d0ee2d338cc1e28edfbfde1b72449e4f4b40dc6a8e12ac19851eadcf97e620bdfcb5e8877c6b05c190a4116728143f6d073 SHA512 ef8d3433d4020decd186f842a0c590b6c44778252afadda0a6dab840f874bb0d7aaabaf3bdfa28f66f19ee8108930b5605a7f733a516b9c0c53955f229c5d4cc DIST data-encoding-2.5.0.crate 20632 BLAKE2B 16ea08dd12f09f2e6f8ba2910b3db07d4e7c9916e6a70d41420ef1a0e5393284b49787c47af0868bceb7f5d3f1fadf203f5a547dc8cb97713d5225dc9181fdef SHA512 b1de8bcfd7cfbfb988091fdb550eb98dfa5739ff58c4b789663e5db0d539c9acf145ccd72d87f7e1cdefd09d5771772d131d2b2e2589ac8f0bc6972c801ee0ae +DIST deranged-0.3.11.crate 18043 BLAKE2B 738d5a88732e227bb0e0d33c04ab8248a699c7c499100666ffcd78673d1f38ad2d740222ab405e3eaa7a0a6f4596cfef90bd581a1baf77c954dca830c22e74f9 SHA512 48485666d3e50eb7976e91bed36bddbaea80fac4ac664723130069bd7d17893b6d1a2b82a4c3dd61677162e4305ba5ea8aec7bc2793d1b8b92dd1666c204fc43 DIST derive_more-0.99.17.crate 55771 BLAKE2B b290bfbf06119018206be0f8ad4c92508be4cbc443f1a937c38961e207fc3f433d8a87b2b5a17e72aa1735520799540557d9dd9e49e26b8eb7cc80289afd44bd SHA512 0bb5a94e56d35a17ff4deed61c437ba75c9063694032ba98b58be1b072d33f2fb170d51bd262a17ff1beed2110b334528de75d5315ac627202ccb13d8c490baf DIST diff-0.1.13.crate 46216 BLAKE2B 27ceeafb7afd45eabbbe22d1f05667f513a6062762e6b77122e267282a8f2a0bf96384989508bf10c9e13af4856bc9f58f09b10055d6fc2c32681e288ffa9f9e SHA512 45e259c9fe7c23bd9e9454891b42d4aef6d681d35ee039d21fdb05ae9ed5856161a40f29889e7880ac2a2daf85f1b7d752d213b4a99a1a74ed2682c18a3ae7fb DIST dns-lookup-2.0.4.crate 13733 BLAKE2B c28840a97de70192d337d078d0e04db5da0b0c01781bc245036dbd2931092c3e381a3792086fc0e84c6a1a0f92d0adf0366f41d4f48479a331a6de1e69af267c SHA512 4b2be29b927a8bc83e983b7caf24f3391dd1046b1d6b255e11edcc69338cec9d04fe5935bd01bed30fe2b551ed7f93585e92fac066e67479fe597acc6bdd87eb +DIST downcast-0.11.0.crate 5976 BLAKE2B 4ca0e66dbd8dbc86920d4184de8b37ab41954cb1560c7727334c990b97ad9544b098f7ce50759d10cac8b9cb955893805aed3bac5849c8b44a965e24d2ac7653 SHA512 11b037a09829e3e93eabff69f02b608725e6e348a191b1b6c8bb044b8d820a6ebf46eaea2f8bf5eb1c156f20d3e97be9b581e1b5fccebbfe76d94157d6bccd53 +DIST either-1.10.0.crate 18334 BLAKE2B ac5d81e0822132846e29f8959671b14ac6047330d54020ea7d4ad790ef985ecb4ddcb96ec7e327b1a66b9c89d37b112dae33c9ac35232c136f60ad9baab7d5a2 SHA512 2de38a37b7f3e61effa89648acadbf220eacfda1ca7c82fb77484e45577769b724f7dbaa297e73e3d355d6b1bd5109373c3e96e4c1a13a918176162b33ea2432 DIST either-1.9.0.crate 16660 BLAKE2B ad61038bfacb16f678fff5dd9ccf8f345e1bef18bd7aa0aa9c99d44abf8428939362f32fc8dbb1b60ac56016e0096201071d0bf8c0431b660605d0dfa97da466 SHA512 4978d50842386f51e31a47ad037d5e491106a668bc701bb833e6ec3998afe3ebd80efddc47756b2f300f534b39b26fc01386dc878d3b02cc8c1fec6a474c2177 +DIST encoding_rs-0.8.33.crate 1370071 BLAKE2B 0e81419086ca6e18f2aba5194b87eaba49ddf20493fd6ee09d479db86306e39dff9b23f399594afc42f1fdb33855e070beaa1871794dc0b0371c35d296a6369a SHA512 20d28a4c0ff0710f911f510be56c2bc5e7514b76d370493d2b89b7f25d1c0cd46ffa64862e54fc472f07f928a2cc24cf9d790a37751cafafc81f263705aac4bc +DIST encoding_rs_io-0.1.7.crate 16969 BLAKE2B 8d51835dc0882d0e0512f0a177f10da3a1c384f38cb4eb163f957cc134ef5b7aee65d951cf65c99cc80b087e0e92ca4dae431e3a8987fe6b86bbf0dd1bfa8ef8 SHA512 0c7d33616e96fcdf225599dbf469232d150fa4bef5809346c4003ff7fa0362a1cded8f3392fb5945f4950e2b2cd71b60c93025d73ecfdd2ba4fda5e03a16902c DIST enum-as-inner-0.6.0.crate 12079 BLAKE2B fea251b187470b6204f686eede8d9d2fc3869a396d50051a45c72e3628b4d893a2393760afdbe14676cf505b1892ff67846226ffdc4a23f59a18b2cda1a2629c SHA512 c06e0bbc43068161a07a8b34bf1382311273cfc5390f3fb4c90b758d47cf49baf648f6bb277770a983942f7d2effd242bf1f6eaa4eab77e7f6f4fe9ef6ce188b DIST equivalent-1.0.1.crate 6615 BLAKE2B 302d78069d9df05e78b53f0488a9e4eb98fa2bc1e21893dc8a0acf2234347ba7c4df4b9d6b380ae77d8ffb1074b9c790460fe2dae47318aa1c4fe4208244540a SHA512 b2bc60e804c1b02c461dcefcfd60fc37145af710d183ebe65f9a4d63f2b2072d23193f98dc550a9213c7fdc6a2a837af23b04a89294ebbb681a4aaf5d5031140 DIST errno-0.3.7.crate 10712 BLAKE2B 1ac3a3084673791fc31e228ea3f49d334eea106f1bb6de3f9548882167d8982153e0d9cd9dbb4bde68fb9a12ea8eced99a4a128c507fe8a6ca90caf849cda1dd SHA512 ba4cd3919fefff84bd5ae473392ecdbaaec52ccaa9d1d93ae06ea5962523054d0fa1c5866787e36114a00d449a60df811a110f89c923a6acf7430d3668c2f54e +DIST errno-0.3.8.crate 10645 BLAKE2B 4a7af10845f11b3d8f177a75a692be468e8ef0ee53fb84a4d212335f1499456b6739a59af260894b5c3853d3bf21ef3490d1e3a613305561203ca334a636c3b3 SHA512 29753c421c6f929760cd7565f8171696e4f70e677654a7507253f4fc495edbcf214ace27be46bdfe5c1a0d782f4b688f591476e56f4a1096471cb353c643328d DIST etcetera-0.8.0.crate 13295 BLAKE2B 33069c496eb846bc3e602812cd2ed182c660ae06b8a33ecea294a5ec9e37a1fc15391cadc9fde23f3e885e506031cbfb6b7d036b94cc4f94d42b8dfa8ad0ec7b SHA512 857151a9af143c7149feff2aecee8fceec45a7a2ff64a8c1a482aef89ce2f91de05123afd7d22d67cd664d9ec3800652c7800affdde4ec317437f5d925883b3a DIST fixedbitset-0.4.2.crate 15954 BLAKE2B 91270883db5ad0e999ebbca1123d8729d3040eb936034ab8da3cda72a830e45fcb977b3fe3c2b94e870c1fbc366ee8602357bb77e8b9a40cc41a04afad1b266b SHA512 57c5d756b0a202b2506270f0d5e890f7617a1e0c015b6059ea23fab49cf7af47fd06927eb56feb03b37cb2b6c467e326b3f0da1e32cfcb6339cf11a130a3ccab +DIST fnv-1.0.7.crate 11266 BLAKE2B 81da85889c91b6567e0f555e37dd915f1bd919719d1ca10c31a6861d7aec29a49ae9c1e8bc500791bf9d6b8dbb318c096d04872c5872a4b1f7d45fbd8e12842d SHA512 2195a4b34a78e2dd9838caf0ee556bf87cbb4a8ef5505aac663b614eb59dcfc0c40f432463ede41ecca57bfe7711f72673d39a85fe03d426f1324097d5628334 DIST form_urlencoded-1.2.1.crate 8969 BLAKE2B 383d3a197b73fba199220b7708e16d770591ac16725faf4efc1a8c230c569c381870d4a11b8fba623e761e68f9d318630b22101d461e67dd26c67e13a73358a1 SHA512 c65104e2dc08fad572bb31f981700fd43dd29fcff42b01c7ccdbd3d4c23dec12360aed3f1b5fc4766fee386d418a65349b2941b8735f788cb0d35d631a6a8dd1 +DIST fragile-2.0.0.crate 14668 BLAKE2B 2e589b312d7409a1a550a676303b9b2adf2e28b0d4cd02c7fb22b48a88d1f88a04e55c4405078e2c43b13ccada890a33bcacfe179abd12236c23f219d275c4df SHA512 a48fee7c13ad800142a9ef1f355b2200b904ad9bf97b3601e310bad2b6ad90ea235b9704964c54be1d9c415c9c95fbc5f49e8ba5d7c6ee3488573f3404912608 DIST futures-channel-0.3.29.crate 32432 BLAKE2B fa89fb7bb14e5d23e19636de6116fcad23668e320a4c75409ef232f83d473e3c6db89a44b640cae969a0a7210df6ad6e5f7886e284481e0c2a816ef01e0c3d93 SHA512 f04574f9e88b5d56570ae0aeab082c6c1e4382e1594d83646c1899416e7403bdd7537282bdb20146b5df4fe24b550dcf35c497af04c2210575413d6c8018dff0 +DIST futures-channel-0.3.30.crate 31736 BLAKE2B 57461dbb723fd53daa07b2fe6164125508cc3901e0138d2a60da5c814ade415a3611baa45c71487f1853812282ef358c132785ff40c630408e8544d57eee3483 SHA512 689531748821529c528772a6dd0f27362078ff5803d2e0b431ee5a0ecf8787b5a15262d65d52f48486ded46b88f7a9c477ad95cc2c5a3e8f5f9b9f53f367832c DIST futures-core-0.3.29.crate 14808 BLAKE2B f1ebfc7c1c7a8a212ed7e6c5c72d973f7dafe8b4635c8d42070d6842bd4920fd39775195571dec2f6395c5002d8ac02af889581fdbf878a45e0eb27dc6c5f0b9 SHA512 ae10dc9c1473e4625bee4db902ab3833bb047bd159a40e4fc4cfdc3a266d1ab99e85aa3db4f8dd867e08926d8dc733760b3258884ab890db1fd69f1520715592 +DIST futures-core-0.3.30.crate 14071 BLAKE2B 76a9fa5aedd0d4ae8dd9db9639839b6b342125759c1b9f9bbf58aacb4ecca316ff1f24ff8f3c15f559ffbf974e4c2cd02a5418cb4c4d7612dac8449c8234eeb8 SHA512 3c7259ddacbe02e47a84178b75e5f13523bd0c8f8bc0b2375f7ecca60b7075695ee0a5cc4e1c1de26665cf250271173be803661e2f2f53e2a3b96380a8efe7c4 DIST futures-io-0.3.29.crate 8908 BLAKE2B 909bd5dadadbf726dba3943dcec930c7409e20d8d324a52444f4145f5972e30ee4b1e48b7c2d9982fbea62ed5f3288e68e8920e99cf83d7cb81b9de1e8d81246 SHA512 869862f8728d94f0f0e71f9b24d0bd26b8bcafe70a80dd1dde4cefce73d91dc0cca80fb22e891f66024a77dcf28e8858e815bd436eb17d4c3119a7e68fefbaec +DIST futures-io-0.3.30.crate 8910 BLAKE2B c9af4290f45a9fd0839e107fbdfa4abff4f9077ff45b61054670419076f1c4508d7d560d4d86f8cd7ce146e436e531b9f5e0abfed2c4f2406c57be209cfdd498 SHA512 077acf5eab1101917b5b4b4b83347d30d533110d9a34c2de6db1411ffae0f0530f457033c5a5c14249119e89375c9f12127790b46e486dcd003a12a6fad48bc2 +DIST futures-sink-0.3.30.crate 7852 BLAKE2B dc768e4ec4c9f9dfb22a20c1c977401d859072b9222e6f77978332f495cbd0f764b175a679c9d7c77028d7b56cda5e2d86188ee979c7f323187defa6a0485ce3 SHA512 1c198da8f4118d9a9ab2b597e3f7b4e1ac7094dfa547bb81f3c4148c45216ef55b309255849174a517ebddba6c874283425f1df6e56e2ba5150af091bacf46a3 DIST futures-task-0.3.29.crate 11853 BLAKE2B 050df023d7942207ea11cbe5e1cb5316a255763948b0c07d479828a3245ca34b82a71d1854ddbb13e01e853bd4ce424b319b2182346c36122d0246649390961e SHA512 6f8da7141899cceaa498c857a81c69330c093cf518e101dc53ee1e37123fae918536fcb1dde038e06c08f05c5f378a50970265a35229fb31c2377146cf94be39 +DIST futures-task-0.3.30.crate 11126 BLAKE2B c2ded9b9b709fc10c44cfeaa72d4e7477e43331b14f3e72433b25126fef93f2812a09b4fdc3c246b7379d41d3764ba17fa87c3e9c131095864cbb5f54771a204 SHA512 c190fa0acf7ff15fa67fe172911cfae803b2a8c08168570a5518a40767d08134f147259a413ab25c45cac5dbf2f601a9753c77ab0eb2c180cad2fe48cfe3867d DIST futures-util-0.3.29.crate 160207 BLAKE2B 2f545d3387d5ca21c13bc157eb219ef767b7b0c9957329f3ccf247e6402295f5384e01121a1e1ed062223568f6d7db13602b38878a280f19d26c26cf184508d7 SHA512 48fae22d9b5f38aa85b423ade3022dc693775aad5c3e6988d35e4d529b9395c0f35ceeb394492e0f3ec96719cc3f3fe4ed3811df045b840b63231921e42fd65a +DIST futures-util-0.3.30.crate 159977 BLAKE2B 9012edf76336952dab02cb61db48dfc74b6cfc17c137c36372709e8d575b306a4d7c4da89328067c9482a645aceb7b44ef57deb21a0c25964a5515e738a039d0 SHA512 7faae5aa35641d858d0f5430e4a69acd4ba9037852ad73c5a890bffeed411d28820883e18bad4ca8f7b0a765f9f4c5dbeaf5d0cfaaf90c2c69846434ae091951 DIST getrandom-0.2.11.crate 35391 BLAKE2B cc3af20769f8effebcd6fe4f48bb762211f78cfad016b796ce4b6b83a25d0a758ecee4352af18ef97e84c17fb4efb0c7bf113b53d2dd30eaa32067fed97978fa SHA512 2230c219e1080b4b13f207bdfd54b1acff37d9e5fec5263ec9952df9c0279939b231c722b54524deab85002caf1047a471f3fba8090428d918e99d53edf82345 +DIST getrandom-0.2.12.crate 36163 BLAKE2B 0afef8504932ea0ea051cde1d14bd5b79edde68d6ebae6fe88fa4aaa532605a16f466d0d9c0d0aa619eaa105600b6d5ee4e191865a3fa041549a78f78ca82396 SHA512 dd97d7dae1a7ba653abdaf2db719e1a9c8eb721b08b4af0f1c45b1ed5079069d1b57e4f6d9d879e7fae3a890763f4b6aea9bc2d945392b98e811e7b348589bee DIST gimli-0.28.1.crate 270497 BLAKE2B 4089e0f871295d464e548610ab5f0c2fd863825416109cf58ca827e482897f00eab23b795295758f1e3af16167b52c77c91df6f707f1f445984a6c4bcd68c6ef SHA512 695e46471fc07813dc4a47744458729b097f6efbfceeb57eb3db4165654e99bebb98dde2d73230b90bb5dd7c0ca0c6e77c7c3dc6f2abf70058b830a2fb386d25 +DIST hashbrown-0.12.3.crate 102968 BLAKE2B 492072f27eaec45abd2c5d7405c614c0c6a8221425e901bb6174bfa1688ee524408a618650126d6c683b7285b9bf0a21dcdbff7347e4d8f97bf7111defa1b7e5 SHA512 b3700fcd659a21a6b9b3777c18b37a83bf25542b4e8f2b963779a122f5d22e1742c064cfc03e649583e7dd5c6e90ca8407f8c51a0e8755f6a108682853022f76 DIST hashbrown-0.14.3.crate 141425 BLAKE2B 23c63a99c6c6b7a6b9b9e8bbbc7f1e342e1eb9d7582fc9eb408d3eec50c99f34502d450170bcfef4da7f2b1e743e1d1619875ec879e4753dffcb84f3c10dc3b2 SHA512 4d344e5c89ce58e04668b80ef10e4e110a3a5daf4d610c52d980577795d0e2050c7d0b151d8ba97128117665e27b92ab0300f85b88bd6e1de943c62d49249356 DIST heck-0.4.1.crate 11567 BLAKE2B 520aeea740cfa30b0cca12f73594ffa655f32959673b1c9caaca1ea0162e455546ae3033881394c0ba0516bcd5c9a997da02162e1585522d665813b9096eabd9 SHA512 8c80e959d2f10a2893f9a71994720f90747742bb5b61fc0a539eed3ea5679b140c48fd7f7690d7122cd6af5f7f20a19d412e3569fe741c6d31f6b2ce1e0b80e8 DIST hermit-abi-0.3.3.crate 14253 BLAKE2B 9ed8b40a1cc894addcba2a45562d74359ba55156e2c3a547afce139324b1345df2f158f58978ccd7d343fac5e5d2cda86e2e0a9dafc77af36d4cd8aa0a6d4c03 SHA512 eb162d085e8e0db72571aca925fdb6094d1e5d091766dd62d6a116957459bfadc8d51f1acc67f4da3cf6a8802c0ff445f3ad2516c1df8fcdca0b751632e150a1 +DIST hermit-abi-0.3.5.crate 14437 BLAKE2B 62b2d2d7d2d5d63ee79d98d3604e79705b34c3e50a107e36f06d56783f7df22debba00b135c3d9cecdd5ecdde6bb5e1e052ab7e843dfd791dd9f8eedf931f96e SHA512 28256ece8ed613bb789a194ab44dd071e48c16ce9f8d4622f828b5ffb83fdee18cd7fa939b40987060a43d76d4b76b3b78cc1109ab15c75880517661b8843bc5 +DIST hex-0.4.3.crate 13299 BLAKE2B deab49bf3d97f6fd7c0a0855b50232422443b226362bc7a4a19e57c2e662fff2cb046d4c5bd7618ddd523045f3d8c78754508f862f9a8ca29ca9247da6d6ec79 SHA512 fd8ff33b68eea2d6f2c6b02a6d82a2807cbcdc209ca5a76e3e3e5d006917ee151f236b6d18e2646cc9a9674bcdda1d6ce6ee363a89cadd99bef00d0eea9989e6 DIST hex-literal-0.4.1.crate 8559 BLAKE2B ca88420383532a2f2c09e188bc0950cedf74e8335c1e5b3f640dc80607d57bab0aa6967a536a458d149a074f8bc1025a3de99a9081787e7ac80dd8308fa0e5e6 SHA512 8894e48485be7e1d7a16d2e061086c524b039a1be24a4c20126d3f175e12aa87d6d65ae295da6dea88f19708f3f3a051c3c3e334196c094ace68a249ad57fbb6 DIST hickory-proto-0.24.0.crate 374416 BLAKE2B 9dcd982073ca2d4d7ed64c0b4a88ef206fcd739dd32d89cf6eaa6d24c71f0e2f24ac11361b1a1579214871af4cddc53b938af57ca322365f055ea1f8c8f939a0 SHA512 de27c186548baae47965f450aea53a140fa66b98285239411accc83c0f00f485dffa3a255e8402362e5fe3952a4fdc11f780782a876db46202930b84370017b4 DIST hickory-resolver-0.24.0.crate 90666 BLAKE2B 367f71f8558f4ef7f376dff7e3b57bcf3f5dffa51aa61568511c886a2d81e45bffa2de0e9a98ccd67c3ea97ad560268f814a95c3fe3e022845abf206447931a2 SHA512 b3bbbb193d4c4e2e32f7a5d59f0c63bd808c31b840b814f771e483613feb70dd31aee17391206e99f6156431b64085edf6cf6d7d7f8bff5b931589ee2ad78c27 DIST home-0.5.5.crate 8557 BLAKE2B b14225f6e967ccd37fa734f50991a50065047f3814c4e526f3b4605ceb9206d4d12e189b4033ab85792ffea34a30f2b0267b10b9b0ed88df52c37f6ae1ecea4d SHA512 4ba97149d8f70e9b6eefc930292c7e62fab6ad03d5e4e6bf93d40209d3a65e40932c6f3d14ca579ed19ba33195977c60fc52b3d3788629fc760f41ce90fa1e58 +DIST home-0.5.9.crate 8760 BLAKE2B 02277a6d0e54a88e62a50ceb5b50b08cd5dc1ca5ddc17a799db0f49a17fee8560df53f616ae22cd16020ae2a89ce7c6ec22e5e2c0d513405bc2859a6e3ec61f9 SHA512 3f1f7b619f1a47694cda92321a11d66ebbb2dc0b0c33446a7a4b886f547ee88231b61c038de04bb82acd50e617f19b5085893b8401206d32cd54502033e04bf1 DIST hostname-0.3.1.crate 9272 BLAKE2B cafcae4bbfadd51d058e3daba3e63d897bc3418723d8e843fd941d9663dbc89dba131c77d14ce7a5da552650ea3c40c4e418c88d465f1bab2fa20c178596852d SHA512 a90407996353c9bcf5b76be03713e3a0455ac80a50892e77a508744cf436a938ddb87ef97d8cc91ec7dc4353cfb7bca0fd28c90a72f8a9ecd4f29220d174edf2 DIST humantime-2.1.0.crate 16749 BLAKE2B e2ae8325b037fb175b9200cc5c1944ce579056c6662cce307beb6701894552362a25e371aad65f8fb9384945b48815ca74bb8b544a32e0a5845b7edd30b918c9 SHA512 3bf29ddd1391d82897c22baa0ff3ed58ef6d6959859f1f8ed54d324caba5b6fb4422e56790511ce82f902cd11467f93c8ab7fc7b0e0bdb719308a4d0a446ae0c DIST iana-time-zone-0.1.58.crate 27020 BLAKE2B 3e62ae3876e181e6ce4be1ca2417363298c0b83fe7d66d1e1dcb5ec308e9342871306387ca0c5fb3aa7ebf8f16968094d4c7b4a497fb792171fd400fe23e6a50 SHA512 9e55f17e08f371c476394ac2db9b447ff7f2a5e37e2cd3e84ec3e2b77980bd9de7eb81e8618695367d708e69156628a2e4ed80c4b7343aa71ce0d75a41e24b75 +DIST iana-time-zone-0.1.60.crate 27074 BLAKE2B 6f534056e220e2f721fc7c7f3ed24152eea7f07d1f4cb3609ca734ade32a2d6b18fd0164ed831170cdff192cbe48653b2c4eb0903fb6f157292b3b5bf47299bb SHA512 5619b994d3277f56e65322a7903e4c5e03928a87bdb72831cbef88788aaf5573b8460abc0a4d5488c5df7052bb978531d973dd66002b0ec4a3af468928c9b722 DIST iana-time-zone-haiku-0.1.2.crate 7185 BLAKE2B 37fa14b589ff092377b9271c414d4e584c5a531f13f70ac48df26df3cc03353db635b4630ba192fc65b800cce11823e91b91f03dfad85e4bed55aa18398156cb SHA512 448224ecafa935472ff6f0aab7cb71f9dabdbe71569c4b94fcc65baea925ef48841577687c9a31106a1826c2105e8dd73c748e9d27fd002648e5b0ce838af6b2 +DIST ident_case-1.0.1.crate 3492 BLAKE2B bc79ebeefbb7e3ed1139e3f41d8d20fb175786bb123bdb9c1a92ea70effb4a0e5e798f24b068cd66a1bf20d53eea4bf24de495b5568c2d649ea804389a1327ab SHA512 81003a43f18da5997d644319274502e2066af9f9fd1400afda7cf2986b3ae0b7355b932302723cd3bda2d46b264340434d9279dea58425bad13785698d5808a9 DIST idna-0.4.0.crate 271429 BLAKE2B 8b81bc4535d2e8a1100ddeaf6f43c043fd601ee3b37eb109a9dff01630a81603223407bd5c2f1a1b108d741c811781b205c10148a0122b8125c237a5d5ba8a58 SHA512 b4133c5f73bd9c4ccc05245a9edcc5c980714129ce4f6eb7851eea7e509617ff972fadefe6ac78db6b4106667d9d6070de52c4d42414c95921e3d9fe1b7a76cb DIST idna-0.5.0.crate 271940 BLAKE2B 0b781c2e9bf717af429efb53bdfd18244f2b8c58e5111c3bd3bee50c8a01cc747513fe20db75c38b6b771d5845647bf6c1849ae6667766c9623e018c1f399a9b SHA512 bee6cfbfc99859b113aa8c7b487429a836dabc4e317980f132d28ff8333336f33480bf9f8b186a07115eff33024cd855bc85d346fce85e17c4132e886769c54c +DIST indexmap-1.9.3.crate 54653 BLAKE2B 7bc1768589e74020dc15d3dd064009edaaef39b7aeb682d0ca8e49944e3f020b9c04d64feb102e88b22feb40863479dfaf4722d6a77b5d19e7ca553f4bf64c1b SHA512 2aa8069eb07a814c8fa3e11296c9f032ef60963520d7786ad20cca5cb7e73b8f76d97722a994d65295bb713020aadce5008cd3df5e99d8bd968ef1979f910a37 DIST indexmap-2.1.0.crate 68224 BLAKE2B 9d833570cbb63ecae138ca234b998bd0e5b11b1a7e3d5ef4a21212bb32d0998395f1fc609f66860bdbab198081687630f583f5a2e495fac1afa40ff48bee8a0f SHA512 9d303eef918b9264b9fe326cc1d71f4095f7ed5639ed8696efa3e9be65dff2c50ada4495409e109e7718997db51ae1fd865cf8e88978107d7823faba14380600 +DIST indexmap-2.2.6.crate 82420 BLAKE2B fac5cf6339dc3c0a40b100035a5c874cc7b2efeafeb31c51488d25156e392dc9db86a497e76eead351d2126f69d060422faa9c55d73407a0de9f5be18d234123 SHA512 53211c4a9003d751feb6dcdf1a76495764cbf32d24bbfe2be7023946622ef4f2b07a6de57109e5d24ee01892f4b2be0e0692e10cd31fd39c4ffdff4d37abe9ea DIST indoc-2.0.4.crate 14311 BLAKE2B 8d604e20825ae64530014081c627abe4ecec6447e1e214408743aca79ed217531baad4bd7021137ae6628555d769a248f06acc556cc3254d2626074aab110a44 SHA512 ef1b8d19d89d848c1133f2865247e0ce23cbe5552454805910ed0478ac4acb11b11629aa4a5ce8756d0ed5cbc0644abedeac0246f433166c68f47cf58cf4487a DIST ipconfig-0.3.2.crate 24468 BLAKE2B dbaedc8f4ec23fbbe48a8c79f16fa1575b8374f055237447d12eb009694067a82bd54b503f73f9520e9b731dbf2b7797ee2d6fe2c07ad3946146b32cdc68ad0e SHA512 6029a7d453db77bcf397580fd44c5c777ce6c288c251376cb591174e9fe0aa66b49925764050cc9bcb2d656a8f6c4af0cbcd6685b2ea4616c2d2cf8de9bd67bf DIST ipnet-2.9.0.crate 27627 BLAKE2B e7e1c74815b965e9cec1cd37cc3dca76671168feb689620d44d5e635f3a5fa92a7276cb3022f25a9512ffbaaa11b0a8719cc1b838a7dacda71a5beb1a992ecc0 SHA512 8ce429ba2bae53cfdaf8a7d6bf980e10b9dd515446ef3ed4e4e11432043a18e09454260567419818f523bc589fc367194bc345660f2cc808d281db235d3e0b54 DIST ipnetwork-0.18.0.crate 15515 BLAKE2B b3c67fbf16575a865c8f2156695d1e9d156c877c6974aaccdeb643f3f94654a1df0c00dabf512da09275c17462d18916b645139e00c11fe9542a489d802576ab SHA512 f5898e31c40937ee9789531c6e0c695dc9d50e32019c8f411f27aebedb70f2b22b8e48844d34583b4425adb4a77b0029f28f7a941142cb0a2231b7aa8a7525c3 +DIST ipnetwork-0.20.0.crate 16556 BLAKE2B f6da9b2283241101279ba510c641a287107b2c27ebfc425af183ca342e4c049915aae2a2107bcd7e8349a47e07ca1dae118194acb71b7b756a36f498a6c67f8b SHA512 a8746f25abb73820cdbaf758f537c726bc9f48afa82417361d54c41bf3b86077e5901135ac5e305e2f669f093690ca518c811c89793d107b3deb139861462978 DIST itertools-0.11.0.crate 125074 BLAKE2B 8e686f176764e92e4da3697eb781e1bc30d6c57ac61d97343b4fc3a48e4febf669d5771fa8620005c620cce52c236760ee2e1bc344cf602e878bc168a2e69cab SHA512 8ece00ba0a7cf481ad4586da24385a6f0b1719b9c3f0c25b9b5b373dd1a0ca7b9687a77cd179853392890b7bf4d31e0356a4e5fd540465b4ac62bd74ef717fd8 DIST itertools-0.12.0.crate 133620 BLAKE2B 73c09adab9b9a621b556d0e9ca0deb9967f25f5f7cd082a65208ada2639e8154704d1df4be06505c8a6697c51b438781ce9921f70ae826a80597d5a682b99c99 SHA512 8f4c1239aa185ba21740dfda7a0c7cd47d62430db21724acdd580a8cd62df6c0adbb11fb8ffa691acd5f1b20a143d57dbf7e30d9596c38a07b5a4b3405e31ce0 +DIST itertools-0.12.1.crate 137761 BLAKE2B d7db67feb7418d6a779dc17d8a2f33481114cd81a4d53a10cffe08e13f0d3cf4525a5ef43368fe979d5a3ce230872eaf993f7065885531aeb5a6479351857708 SHA512 0d9c1849dcc0ddf7555b0aeb7e4f2ef3b101cfc6f03310ce1b6072d70ac8c8d3387ef4c726146102012e75171e0b0bf13465704b6edfc02752e349dc6af7cf68 +DIST itoa-1.0.10.crate 10534 BLAKE2B 8ffcb345d07070cc01651fd44c19f3e0659185eda733c407fd4be0955a301879ae1272dae7f425279dae8dcb7f7dc954465c9a09b5c521938a503d34fecfe2a7 SHA512 fc496be0873e31afa6ddf7f2958030f8fcb517cadb86a48280a0c50ce50460afda189af1e6c26e5ff6f85c750d772c21503864c32b526c4fe4bcdb5b07918538 DIST itoa-1.0.9.crate 10492 BLAKE2B 0d5acef9ae72d3f4b5a387d231952e6025def69da81d38269b4882bc534be7acadc073e526fd8bebdca898a98b2c741735c541e0b6a35ed0f8f8799b906b65b1 SHA512 95f7906edb7d6a2690389167f8c4d01bc37827205bca87d527f2eb33722419ed2f2e8afaa559cc5a0a7e7fac76515c9c44c71c42b536aa34b0e2858c40946b6d DIST js-sys-0.3.65.crate 80725 BLAKE2B 9abf4a2e9678b2b2e6648f07ea879ac372a20b4ec34a271b93dea1ed57d25c8fefb6c9a2cad93b4c8d008987d98bd9c50a45614419fbde11659e5515261ccc69 SHA512 ffc14e62a936a93eb6b71317a0d00529dc9b3d45994aeaa79fc21b5fad93a6a02da52e1dbb5fbc439da66f693e8a04b39c8a03381494d355443a425412ced267 +DIST js-sys-0.3.68.crate 80764 BLAKE2B 961f58c181f060af37c00e99f55906140a4c8f1729847d6dd7da7e29b715d69ff822853dc6affb185195347e3d3bfeed392b8969c9d15a5ee28e9f01febbc148 SHA512 9b1b59f1688f95f9bd5031f68c18c0bbb8c16519c7b09aa3042e08e57921a3807d86f15407bb4d9d63c49747ac4847aa963f83373fd0d778a7e7962ea6551b6b DIST lazy_static-1.4.0.crate 10443 BLAKE2B 25b2e61bbac48f0dcbc79c81d7bf01f2403d8269ecb6be3ea6147bd00f7a588df15a91f44dfc18ada19b21faa71de4637c7d493a8628cbecd0e547d74e616a23 SHA512 e124c0521ec7c950f3c4a066821918da7a9c6e711115d98009ae7c351928fdddead852e7596fea5937a9c30e4e4ce8eee7099b20248b5d6e3b2494b6a6d88cb8 DIST libc-0.2.150.crate 719359 BLAKE2B d08e17fb29992c76337bb5862cbc1cdaf7b9d7749cd65021f145fcf49fa7954d6251c8c2f3c9a796b46283c3bc014bccfd259ea52824459841911ad847fd7f5a SHA512 7ae8fe6a1db38ac6d951c0b4880d25a02f064f5e61d6057c20f7208dec8395d58efd085e41857bcf5f4da2b014d2952dc4ddaf18ac4acd3a23675bb659e70385 +DIST libc-0.2.153.crate 740614 BLAKE2B 523a41bc8cff4ebcba0edbbe9e6a2286ec7cb3ba5e90ca5926c972b68e4b34188bc077d20c22376238c3cd91b7455898a95c505ace4ededea88cc496edb4c5a7 SHA512 3f99e3a192974fffdc053ef21e9ad5fb54b7cdbd4755df176704a95dba38047138ccab76763e89c6b565f37f98fd549fe368749f84f6d1638b3209cb07eae9b4 +DIST libloading-0.8.1.crate 27893 BLAKE2B afabb6e07ecd390918344388b5fa63e5aa9223bf3ce513d1ed94cf02b1defe9909d94f0fa05e1516a39dfe4f41636834d3de0386b3c58212103263f2b1423f76 SHA512 f17ca367ef8e62fe80f43e5f3e2d1585be7b78b0fe4a733d80acdde38c20f9f72e710cff082442de6afa323aaafa17eda4491c4430b2d12f398d420e057cadab DIST linked-hash-map-0.5.6.crate 15049 BLAKE2B 0f30e388633c60433dcbee353507f1c6857bd210f0b61a4d166a9b95067bdadaebe49d5fca4fa6ce13072e26037c6f75d46cc30cf8dc3c9cfcb3f33b33630093 SHA512 031a87645381c96beff33572e4bac1a9877e52fd2f99d39918fbede17d72291b35e2eb69e07edec20c3058554c35cc38fe85b8f175c2a3c69366136fcc71f707 DIST linux-raw-sys-0.4.11.crate 1413981 BLAKE2B 45172cc348e758bf87831b47d2d52ea43e781a738a59654dffc04cd5f1726efdd8d1e2376cdc247019b64d82d756f4739815422c353f54f081a2c539df02b5f4 SHA512 befe18ab06e5248ee89f0cb8fbc192a5564c15c9873672fea62754322d3c197563d9133b839d5222e6baa522ec1fafc48176ee605ec7954c5d93e52dfb6d9772 +DIST linux-raw-sys-0.4.13.crate 1493855 BLAKE2B 1298a038276e2424eda9873c642fb43d864b343b03b7962446122d2dbea94d58d9fb2b93e890769e6fe4092378755413ed6afba81ce56fd61e512146e44148a3 SHA512 3918da6b667a08ef8a51aa0b087129e2dc5ab101669cbba7690fc98ae2659a36861bf9410a3b87d18522a7549d43ac169b995ea192d3073f7249305a809cac62 DIST lock_api-0.4.11.crate 27487 BLAKE2B 87116cf908f7f1f9c300cedded989df305f855883e3df5a482de2c76814c48739582d3079d76a2bdd14a6999204b7fd31dcd8fd06d1dc7f9418f0e2f70a1450e SHA512 9946adf313a5c67a0dd87a1b679b7d9d16a86149fb95974d3f28aa57a9a1a3932e4a5ee1d332097559329c5e3b2295be2e4b655b115d9f75269f33a758b17fb3 DIST log-0.4.20.crate 38307 BLAKE2B cb9c9a401b49bd68c18d5e42f2ed94446f1aeb184caa23cefacad4ce54a2a357143af54a5595c45d6f3c3d20b054c451d9e6ccdc09c19cca99ffffdaf8bbfc72 SHA512 8661b0c71d3b7fc0d679aa3d7f06910e6d3da1c53862aa06526000e1bcaa0b0b068415a1a9ab317c318f00d15346dba8a4f5d2a60d8850790bed9cfaaf757b3e DIST lru-0.12.1.crate 14583 BLAKE2B 4fdaa9c2a8773f474d45d26ec1c4d4c82719ae531ccd4082affb64bdacc40e6414cf16e40158604868331c593c47ac4c20955ac27f66c71b8b26f982bbcaf4b5 SHA512 3e66e8967d1c35bee0a5fa17863cb9f987ccbaab3cace4cf618e7be4e8503a0dabfefdee040e0aa53c0dee3307faba550b46eafa42ffa20bb3cd0473ecbe94e2 +DIST lru-0.12.2.crate 14826 BLAKE2B 67c2defae452e05c91a8f5af70ef7c07856112f81603a3f5df5d1f45c1a48d0295355b1d1f69b172b571ac54763a9990b8abe46bec49cf22d9404af0efa074ee SHA512 b4df8c6b090d5399dba0270f229d633f872caae91861356743db3b66b1c98c89683a130c56489dc9f38b1ac8d703fe4f15a085b71687ce8425a5370fca748c6f DIST lru-cache-0.1.2.crate 9307 BLAKE2B 606072bc5390a13cf24b4c64c77ba7f84c4c2b1a73c4abe8ead4e1d19067b063888d5cbe478dc9108d193f0a66aa5fb2ddc073f3edfac466de34f85a52a15ef2 SHA512 ecc67b4b2ed8d3596816c47e9c6aa242c7bdd1ee8087646e90c27a60d59175f661ec3ef82058c196bef2abdd302d429b7ea4279169689254a9f322dfd5697bf1 DIST match_cfg-0.1.0.crate 7153 BLAKE2B d3f40e5b16761fed337ed18dfa9db9e46aa2ad84ca8cfdc7cf7c72bea7cff8d084d95214ce013b3515bbe5b1ad4b8527bfce692569551e4588fe6f396a8a96ee SHA512 fd36f2b128d70a0f278e708bcb3274d90380229f754aed7ce9b808138b0189d5e1a07e0ba732216f788a530cecddcdd980559b3f71efa371d8805a213ff8f2d6 DIST matchers-0.1.0.crate 6948 BLAKE2B ec3a5d01d2fedbb4dbf5bb185afbb9401410463a61f51674e0df6a571db352b2bbabfb99cdbdcfb4e511ae783165bf0258f5163f240a229b9087f9edbd0df41a SHA512 84214c1a84952d85631aa1ab5115df7cda223ac64e2acf055b6129ba1aa26ddc87615a8b51ca890ce3fee0419053fa7fe1599ae128f1d211b58c07b0c4af3b19 DIST maxminddb-0.23.0.crate 19350 BLAKE2B 56dc030f29a245919c225eb25d9d62d4666bc5a834f9ab402cf73e27bda8b8d71e8ddc8c6102bff80377eca27eeb2ed47f0b313349b694070d8fecc44b9ab02f SHA512 28251e78cf0129a800718186a99b3f6686d7c7681d7a40aaa447bc48114307bb3c0cb33a271fcd5d1604b1e5476e5cd942229a10c98a7c8528919e0647ce768f +DIST maxminddb-0.24.0.crate 20232 BLAKE2B d2f688399c81b047fdab1c0b87bbc2448f46f5a7c53ad365c8f8e1af3dbd5dd931c78661e6585feacd99ca9cc87646f1f95805c1dfeebbc5d185a7f632d837ba SHA512 bde9daab1e103c4c2990d103e65a05be68572c49e6b994a4326ab46e7d11de77a0f5291258fabd0daa6893964e9079d403ed3557c4c1cec3b1ad4b730f9ba358 DIST memchr-2.6.4.crate 94439 BLAKE2B d1136f7105a33565214fdeecdc5a95e74d7fc7cf45997f81bf3cf389f3015fa561ab326433ddcff2db0b7259246eb6d26fc7b4e3c90c3af8b9b7ed7e8ec56ba0 SHA512 1065a67e04ec9210c70e430288e0a8d39f36ce6414722099553e99112ea2f8f710eae44bf39f8775b9850e6c8a50e634a1b1b084a8eb4f6b2eae6697dcf5b5f4 +DIST memchr-2.7.1.crate 96307 BLAKE2B f1a008fbdbfe84852a8ae1d9d9574306b1bf120dd5087903adbcca6af342c9abbb296496eb9bf6cb58915c4444b3edd6ca4e27131ac7d8aed8849815df87a944 SHA512 5120496faa31fc427c8b4178461a262b3a34d70eddb7ad17a19d6db8b9969c9e113d3625b5e6dc677087fc80907377b00ba0421aba9a92cf73ca2849d932f473 DIST memoffset-0.9.0.crate 9033 BLAKE2B 19090c1af8b8cf54a2cf7593748aff4d3dc685ec7080aa476139c1721ef71555495e1bc513b1efaddc7e7702f83e0e1c2a8f71ff40009d266539484c9297e0ed SHA512 2f04f9b6fed31e94388c18162ad275897a835df7b9ac827f4df0f4b0ecf71064ef247f7ad11dbc27d7a6d448984a0f29d1c000e3c8d5fa6e121fa9571770ec55 DIST miniz_oxide-0.7.1.crate 55194 BLAKE2B 56afbe0c0b3eca98105ae2d507493f365353cce29a6b04910ff26bc75899400fdbd067756cbda7b3d86f047fb8f3d737de00043a4a7348a813cc43e45824e33f SHA512 5eb6ffe34a866403273ff0267ff7838aeb50722ca57a03d5a1d842a5f19a3b4af570b133a3b9d64d78eafe49e4b9732b92dd63fd9c6b0ce59b3295daf10f6a3c +DIST miniz_oxide-0.7.2.crate 55731 BLAKE2B e3cbf5983025bee879b8a735fa2912db8975cb60f0499498a73ce4375e7d452c9ed62d4b0b6f6a4fa591aab55e5d7ff20033baa007fd6c839b9d74b31142c0b1 SHA512 2f8f09d7afdb9d78bfc80a228ded85a215fea05e577e907921f1808f84aae30ab118048d7b53295f11aeb5de70ab6cbdec892f3a2417bedf6f53a4576d095432 +DIST mio-0.8.11.crate 102983 BLAKE2B 913a8e0e4843b3b19cce3eeaaff0a0024eaf1bdb4784a710e54ee95b6631edbd763e37669ec7d269e45157907663dd2eb6c9279db850fa47ef4c1eee867ea24a SHA512 9a2806ea78b0637d0cf92448abcd50bc5d09bd80da0f37752c847bc98d014baae7a5cc4d929de98be6283c76d82ccab1f1467aa6ab583a4e782d97d5592b0bb1 DIST mio-0.8.9.crate 102227 BLAKE2B d21e886817c57adf6ff255c26c82f6a7eda3a036a78b75f676710307e9fe338756c87a290a9dc42dd536e4c9bec680589424d6d199db7e2bc2498b5634abd30a SHA512 a078b1db6140d77452c24647aa91ec6563d00bc3516fb44c34b79797fdc953493cf844f1ab84d226582e9d61c383f4a743fd93853d71e362fb9dfc8dc6529808 +DIST mockall-0.12.1.crate 22845 BLAKE2B b2299c6060b609732b041c66f58437e1a52228016ecef33f9d2d6a9e017b86f35079ef69ec7bf511d4fdec309c60bb4dd9cb2570c7a3e079a37366c5c1a0877f SHA512 8681eb1b1ae2fa00bd2b73269a0b493361d0003da4080da79ff047692c75c34359621923b06906046218acddecb1fd49186fb7b4e752c70657dc9becb8f20c6f +DIST mockall_derive-0.12.1.crate 45330 BLAKE2B 6593becbb7eb3393a8f05ca4d5d6fa8ed9d0ff00c1b53a218b39889a6f8e14259e29334f36b0fa926610296d5f46f17e627284cecf8dcd3689334d589078b394 SHA512 5a99f5f9cc0bb1383edc3d2eebfabbe520436154e39cc4a4556f03826493ba888a54127f40ec70df66cf9c83262cecae3ffab03de9cbdac2716c431e7ccd39b5 DIST nix-0.27.1.crate 286494 BLAKE2B 63fbe347360ad4b7a86f30bf2f1b27ff1ec581145a90c34160f4d143e9c297a34a2ee72e9de3a48bd3418657fbc9bafd09b704ec15a42b16b3a4187d5304ce77 SHA512 7b35a0f87427eb1b5e1480d7daedafea4609b7f3a4fcf48ca99bdbc2f150865996539f2c51c7ae6a6a13169614681fc838efb306994b020d44b45735a7380010 +DIST nix-0.28.0.crate 311086 BLAKE2B a07023566f04896fdb3ef8b2a1ae8dd64adaa5eb48217c58588e1b41733642e03e0637350c0ee83ac47e663c02b24d5668be751f8d199aa773de6df8b2213894 SHA512 73c0c94b360f4fc81ff07a13692b2a5b5ceda3a7203bdf1e526facabd36cdf160f0ae8fa479e31a4e4237c09bde11e9bf821aa496311cac8614f9c5626f8d69a DIST nu-ansi-term-0.46.0.crate 24311 BLAKE2B d2e678e0eab5ad48534e686b1a4af344996d1b07a0fa40839072df3061bd7e5bc9341363403ea3ef8d19c7725ba3b7a8ed540c63e2209123b1b93f69418288b6 SHA512 b4f37786dc85e0596e2b7b261a5a9fe0265bf1651c39efb358dd649b926b12c3093f307b98bf0c4df3899f0a7cb1854f2596bd5c3e22fbbef42f912ab2eb5043 +DIST num-conv-0.1.0.crate 7444 BLAKE2B 4f5c4695006aa3ae77aaf5c55999a07d8ddfab294584fe10d73eb6abbb3f551846646156581599f966a28c74d80d3ac4373c49d2099991f7ed9edb56d36feec4 SHA512 7884c0c6599c66e40b9a79435e1bbcec60aa7e68b59686922dfab19ccbcac6a6e54f208cfb3d5a8a12e86e4dd67e09977d60b69ef6940e308a28256733f36100 DIST num-traits-0.2.17.crate 50190 BLAKE2B a549ef00c749dc7f276c4817477d1f9dab70cba01b6a3afa5743f16f16353bc50d992d7446a54859cf750a410d66c8cd3440708a6b91fd89d3b8889f8fff1668 SHA512 4d47d3e2f5a31019e038e609897cb0cef1ba061b35cee7e2a02e65179dcdd4960bd5b9bc759b5c013d699b3fbd9b014940a15e36658f7d4fd12cb0c7841c5b4e +DIST num-traits-0.2.18.crate 51930 BLAKE2B 6c40e155d7a52267a7183d8030ef34245492d33f103cc24551b10da3eaa18e3db485062ff87057dc23e6b55e381e5c5d2a2633aaf6f4763c06677a0a0c524f02 SHA512 e395ad9f3b21b0dd1d3a94cefe0d68a42d1b1d429ddb2823696f9cd75042568a635d93d133ddb9497ed357e5b3be5caddb8e4a4af87b65882bbdc60b05c74ebc DIST num_cpus-1.16.0.crate 15713 BLAKE2B 11b432fc7c7496d48918f09ed0954e0f1d0845596301266321293b374392898853fb7c313a0b0fd9d22d9dbfe3ccc5cc1e38f38407c89b2e5906eb76caa6ad68 SHA512 a75863afc4a563e63c64d06471c7921615355d98011ea9497b1f1a7dac2bdfc876509136018e8062ac38575ccf476a196d1fd9231e09e90017333bbf2df4615d DIST object-0.32.1.crate 275463 BLAKE2B df88d37427c2741931ab0ef24a482755168c7348ccc280f8264e94e5f8548c608799868e0bc5984632ee02aa84313fc5e222b7cd7ebc6829729ea49544f13416 SHA512 5bfd3b8960fd80bb48691fdef35d7a9fc3d752a1cf5f29cb4e146a17d427e878d972d208e8aefe5015b3c62d065ed9a66f2f9f790b4743d1a4a3f9c0b8e581e3 +DIST object-0.32.2.crate 286994 BLAKE2B b9085200fe0107ab0f8ddd5c5ac82bc681dc6266c6503e4a803ae4dbdec775ae84ca4a736754b770d858ebb058342af45d485d4c9a41f57966ca1466de40a4c5 SHA512 5d03d998f06dc592c3be141f7163bd72a0e73396f95d22ef1e0ffbfc66489bf727a6f6fb813a32739609b619b8e34a471974b2231dcfa23df8bff52007c25a96 DIST once_cell-1.18.0.crate 32969 BLAKE2B a08d5beee50a7add28bd9e50b18709e7b34574f0f55f80909d5efb7ac5917e5f30bdcf3fb43ddd0a4f420a427390c7ffe1cc1c7191a3a1d939bc6e3139e6eef7 SHA512 9328968afdf3535b2d9e0113d75afa725259d76994ef2e1948ad7efa4ec8a65bac7cfdc31b749d5cd55ad4e28d2e28ac57b871e3067b89182453c7e2413a13b8 +DIST once_cell-1.19.0.crate 33046 BLAKE2B c14b374eaf4ac0f60acc2e02f7bba270a0e8e0a6978d749cd3cb0ab3eb26907e4fbea70dd5132982f90290381ed18ff8a87fd530f1415fabffac864f157ea380 SHA512 4154876afd34a699ee650d1a8a1c5ee5a25f0ebd9388b8bef2564e33629fae68f113d7507488c68abbe7ea1acf9bbc41813cbbf3ef3e464e3f3b9cc7a51d870c DIST overload-0.1.1.crate 24439 BLAKE2B acb2dfa6c6c22ea95cf58079f6ec56a2bb5e297a055ce717d40633b789b0d005be2bfd6616448cac61bd032e74aa6eed212f1677461907cea2f7f7cf536c157f SHA512 f79bc3321f45df5e3d0e5fa9c4e60524e4e28dd3729a09956766738adcf99ca42c187a01d48701ebe23d39aee00a19d4a07da798edc781b942e866b339613532 DIST parking_lot-0.12.1.crate 40967 BLAKE2B 940a112a066e3cbd15e2f6df89bfff37e4ece2194118618a96fa14871813c91798f93181ab0f768d3e1f3d60805508f216724013afb7e3da95678d0d951a42d4 SHA512 07327d3b737a913508dffb66023766348ce7f9d555c224a099cabb05baefd16a28e15fec638e3a148a5169dbd980c4541b0f8820ae9d06dfe0704482838fbd5c DIST parking_lot_core-0.9.9.crate 32445 BLAKE2B 811d8de671bf6e0911cf0df7dcaee4fb03a3b223173a3bb8cee65a28724eeb7bac87f62aa7b1df5ea3fc93af3cee3ef30b83d06c6773d6b856a7e6fa5fa197ea SHA512 7f0df70f9f1ca8d3da0b9dcc96e49daf05d95c3a995289266b5333f68818d686d32b0c733dfe3a0f62da78fa45caa843a963923b2d0c80899c33413dc749c032 @@ -111,83 +182,133 @@ DIST percent-encoding-2.3.1.crate 10235 BLAKE2B cf8e2fd7b359a05b7bdaf731f9ae84c7 DIST petgraph-0.6.4.crate 185895 BLAKE2B 9ddfb2796c461d2820db8227753113b02024e5dcb694a0bb2826bc1f375f028d8b98a3bd67555485db7fab88eb86043f5b768585dbe0c60703cc655976030a2c SHA512 b5a21572526387af3151dd4f864bd95c94f65eaf0612d96f99926faf646214df205bcc652b98d3b281f2e270779a4c1fdd6a32614ed60b3612e5d594b2bf3f20 DIST pin-project-lite-0.2.13.crate 29141 BLAKE2B c434a336716c9cdd16ebc297fed393e9106ef167a693c4aa0b12c681e03141b8ba3cdf64c310916cb7d5cc43cbbfcaaeb39bb5fb1e8b3efb9e94a3f72af914eb SHA512 7f12595d751d315de6c0d380e2f501b74154661eb676987d2cab6fdc956091a68c9cac658df45dbff73615e982e6ae2ea138c09ebb708cd6c351f0d18dbbdbee DIST pin-utils-0.1.0.crate 7580 BLAKE2B 457e1287202f16d1873b24bf4f1de1828300128c4ba3131758e64f9784d36d47365f22d85493c3a85d854f0d8dbb4c6cef3a0f5b064014dc03943e58b7ba9178 SHA512 828422b8440cc82ac6b0743e0112fa7540d437aed457564999092b1462cd7672cd6b1f0201b67075431aeedd3d9c5127468a3dd028744109944f7f023c82fd70 +DIST powerfmt-0.2.0.crate 15165 BLAKE2B a3e1ce63f5866f75526eeb749bec6607e42cb495bbb953082cde7e98e6aa429ecaa41889d98ff7ed4cf5031258b4f7e0553ff8fc435b3b6f8b4ef2b6d53d9b61 SHA512 0623f92e4d6ab284b3f6dae58220d79d9185df4a738999d68040c50d72fe0380d70358cb622f079c629bab53bb03c6e085e165d5bddfbeea84245864fed90029 DIST ppv-lite86-0.2.17.crate 22242 BLAKE2B 48c4a31a3b555fa37072c4de083580bb769747c7668748541af472778b5b58c3e7ab2b5e178760f542f973774f09910bdd4058ae5fb9d6b10c103eb76cfd0d3d SHA512 539d916e7e5869d832045c1aa88aec519bd000227f9b01d4dd0bfc9ffb640d5f5eb21b05eba718174773c97192a655ad3cb31b53ceb914dd19179a6699b3583a +DIST predicates-3.1.0.crate 23090 BLAKE2B 6c51fa390f3335501df604afda47ff1d2a69322d928a1412bcc4829f16c3ff5d345ae52f54d797c9698b0eb7b26495e594d8c21f04fdd77c8119ad4635184adb SHA512 1ee38c715b4b55038497a4a4996e12de91d356d53173d3a034d6a1f56859cb3a4a61a82d016fbefdd6ff291519097ce9cef950547d3d437035cd7093d965dbf0 +DIST predicates-core-1.0.6.crate 8084 BLAKE2B 337cbb155bc2859c5a8b891c21d352e998cd1eaaf606cf46c003c9c499a42f12268b071e7a4cca65d50cdfdfd4267f023076e078a0a3eb401ad836755d65298e SHA512 afeb1de4275c76bb1c5950f42bce2f83a21ab217ec60130336286cb48b15f36bf2a1ca346bd652c10a65a1f9e3310d16b23b8333a3e0f7e20fe874c3f728e702 +DIST predicates-tree-1.0.9.crate 7960 BLAKE2B b758c52dcdd0ea237ce25f0a092200604765bc83c5edcaea646c6b1db49431296b61aebddea3b325e62f0ba9bbd5edba7ec92fd031cb597e7e8d642b966b401a SHA512 1fd5d9a84ca8fdd1b3c4759d5e6fb16e3d8fe8b0dfe5afbd16bb509c8558b0750705fff47701c95f7a8df1a222f639116a1b9ba4d89775bf03b06daf34f249a3 DIST pretty_assertions-1.4.0.crate 78846 BLAKE2B 68583c49f81ab0cf5b90f6de10ef3aae9b525288fec25f9d006f2eed0877c0fa742dad5f878fc78233b54c0cd32dda7ac1f7161bfb475288d8858e8e40aa9e1f SHA512 f76d38c787e91b3739272e3bebeb9763d312b85a43cda5e1311ba8d6b0e4da1ef25bd66208e772b1cf56a34553ee560482b5ad19c5290608b2aaf9c0d0f0e995 DIST proc-macro2-1.0.70.crate 44343 BLAKE2B fff0dec06b21e391783cc136790238acb783780eaedcf14875a350e7ceb46fdc100c8b9e3f09fb7f4c2196c25d4c6b61e574c0dad762d94533b628faab68cf5c SHA512 ae9366856853f7d96caf7a7581843d36bfc7843f8683897b19ffc666c03b0b1eff502ddb18ca4c1c1a239a368f03f6cc258b0e2795f64b61c6a31404462eec5f +DIST proc-macro2-1.0.78.crate 47158 BLAKE2B c56a24fce3faca9e04db7965cab552d2a976c3764df0a84179b5a89d1230ab355c777a82b4c982e3945414f1f0478473a88821dd176c32d6de394d73a26adb9a SHA512 11956fe03a2e77a925cdff2c3c8bc8804dffab4fa1de963a128fa23f4189976fd2e2102bd346b92c33524beae320b71dadaa5213695a3ec638404196e14fa769 DIST quick-error-1.2.3.crate 15066 BLAKE2B 1c61525d383f3588c1c5017f016f60b484bbf2035e7f63c553bd9a49b638ab0c6106ac3676a41072b24da4e13dde78706e0f99fd1ec9ee329d5be81d45a85866 SHA512 f8aaf9024d20ccd42b706c756eed8320aee339f8776392b47a41cc82ca06b03df1a5b1f00854cea96689c5af261b4d8c5d2b1a242d10f2755e7e33dc41be35b9 DIST quote-1.0.33.crate 28090 BLAKE2B 77c4b166f1200e1ee2ab94a5014acd334c1fe4b7d72851d73768d491c56c6779a0882a304c1f30c88732a6168351f0f786b10516ae537cff993892a749175848 SHA512 c1e76c3c017e8554eebe309f8167fd56fce931981c06798aa85a0cc6d64a9cba6ab103f5a1324e69c6f9ca5dc47a8e31ff2e847850542748697afcd265b5939c +DIST quote-1.0.35.crate 28136 BLAKE2B 81424245e1e2b94459df68bb3a9a866c6a364102b5e1d010ede9c5f8278f8406d7b651957d091c5914e936b494b0f6e9a6a1dd8b7d35cd7d7100f86dee4ec12e SHA512 f5314fb6af17cf36c228e1970c569c29ec248954a450a5f90ba9e2896d04f74904c9cec5a1f74325f2489295a94491eee4ce8fb461e22cd4b34e53f1f881efd2 DIST rand-0.8.5.crate 87113 BLAKE2B 516f26bb2a969d0d79e957818133f35d2c0b4d9f1b401098ea23c5b80d27599e842b9298c0c5e46e2a6cb6953857bf8a9fb71ec9366c5ce6708cf17df14f179c SHA512 8b33a8988906ba5e2057a9a84bdd11f867a5536c22f5056eec59ed4ec4e3a6da2fd773da4c0510d343762e5a4ea0f007db4c4a7cef87a47f90e36c1a84d86fb2 DIST rand_chacha-0.3.1.crate 15251 BLAKE2B 645771b2c3e274f085e0837a20306b1d59f6e9032fba8eb38a6d1b30180d15e2f89ffa2a162bf6358da41e030098242d81e71dab4321980d0a4f6ddfc2974ce3 SHA512 8198c580b1b9b0429758ffa49cd8138fa3ce724f0dcf73c767ea7e55611d6a2e4c7cad9950896510def500ce4062b594386c947ac3d89425b4e5c9b04d0b8075 DIST rand_core-0.6.4.crate 22666 BLAKE2B 8b6b66d50aade877f2779c006f8038db450f808c66d73d79efa66c4178dc03db06f12201bf0e7930181c4b0f4030c49b20cce6eb7839763cf2217cad9710789a SHA512 36c67eb845aa2ccca49d6d680f28d418229bbc5a050729e487fe6b9f9f384fdd7b8d67fc6508b90b79ffb3c26688e72feceb3ecae57d3d7f59338aeb62296f79 DIST ratatui-0.24.0.crate 305082 BLAKE2B bac968363aadfb24f8c66960fe67241f6f20505a966b4432e859797ed13ace924825678caef12fa768e1a7bd56a6c4ebf29a5c163ce2ba3be92628d8f189492a SHA512 cac2e17a1a8b8c5a873fb3eb2812871715e83caf1437db5be0fc94078bad18e645c8b68b146c2ca470dbdd3eb58d1533af870f8f0ebf55703563db8bdf44bc12 +DIST ratatui-0.26.1.crate 443050 BLAKE2B de2ed7a7d08582c40ebbc1c5f43332fb617ddacb91adccefd2de16c1f7d675a72d4230c1fd7c3d3519c5d19a60202b5ece188072045687722f46eaf08b5f5b42 SHA512 999cff05fdcc0971abb8ade14dee69be910032ba214ce3ea8c7b2bdc79591f396aff1bc146083b4dd5af44bbf960887f3416faf789921b960d5bb98dff508539 DIST redox_syscall-0.4.1.crate 24858 BLAKE2B c3301137a0b84e03b09d28dfa377ab3bea74d574a08cee21d35713b278d8b5b30ca2a1d73a0981baeb4644cbb88c86c8eb15ab3bb2692e38b93e6b35fab4e0da SHA512 073ed9d96090cf46eab9877742277a013c62d8da86d9caf2310b4fa868af306511936553579e01309f27067d344226cc8dc5e3aef01d9b900da2febd33848f8d DIST regex-1.10.2.crate 252839 BLAKE2B 4be7bede72d41634c52eea25566fb13337a84a055aae6fb73d3b18ab9168085ed04ffbfd5b6f87c2f85c9922893b9c9a253a8c874eae9185b2100850443b1517 SHA512 e594f70cc540586e4039e7b905ede9e507757b531f22a94aae185e47732ae0d54bceb2c6aceb815819a9652c01ccf697798d372631f2f864c04ca2eec59759d3 +DIST regex-1.10.3.crate 253101 BLAKE2B 390ebb00bf5430048412883b672d80737e783fd36f40895343cb38ef2e26e2713418c2fb4d66792bfd3be4c990b4518ba120de229a72cbeb7fd5c2af325fbcaf SHA512 d090898465013b0975a6de87fbdcdf76b4896578056f4da83424bd5e7832547a3d8ace643c379c4f14700a0a88dc95950a38645508d1675306c377879a90cf5d DIST regex-automata-0.1.10.crate 114533 BLAKE2B 0e357229f6825f14339b1d7c40730b83e62bba12115d01ed20313320766e769a653a2fcd2c9d19af51a82c38e9e42c1a31d005e1f44f5b6fbb3ead7c9c74027f SHA512 56d64da361afce82c6cb49e70b99ce1fca3e1969c54bba5f9971db135f8544c65f49feb8827789947b3d1dcefc9c49a7a434a7ffe0d09c5900345a1733723c5f DIST regex-automata-0.4.3.crate 617011 BLAKE2B e685724eb037411c1a73d6d355c76e9e32c40f1c9029acaf86477796d3f5ad092b0c5619f4df2fc1ce34243f2ad8af147aa31f83a435e5b5adf55b4c9c8a9359 SHA512 4fc82fe3556f829956c3172447589555ef286fd66ee9a445cbdcdbe57970655e35b6eb0895ba02c344d826609257e0c95d3f7f51858aa260103bed7b08d8c1a8 +DIST regex-automata-0.4.5.crate 617406 BLAKE2B 21826731ed5439a12cdda5a1ef217dc3239a0884d038170855985bf830f2782bdf4dbfd1b1a8812812db3a2399dadf8c173e75db635dfabc97382fda0561bba3 SHA512 0e9681d5c4529d49ff2555b7b73cf234b1f321a7fc634beccdf76c2bce5094e8501403e8caee2b3a16ac299cbe4701d891f1efa380b54f9dc2d92bbacd4de611 DIST regex-syntax-0.6.29.crate 299752 BLAKE2B 2408ebfe5f0dd6578c33f18e8ea9a0a7a84388420c5b67adcaedde477f3f67fb3e39ba9fab1f6892c7ae7fff754c4aca51314601529cabc6a8fc43af38a11f88 SHA512 28a58950d15df1f0ac4ff4185c05b535e8f5bf0b75f79fad24e40e17a02570d1c9bd9cfc919eed8756a1069bc489c5fdccfd04f6b8266c83e3412b7b4bdc262e DIST regex-syntax-0.8.2.crate 347228 BLAKE2B 211fd1c35ad0f28874d4b4d276e0fb0a27e5a1608f2f16ba2333641b154624e378419daf8d1c955f21ff5f40f6d49c89569b7e11ea5649850846d0fe447a675c SHA512 301dde555f300298f2594490ccd8b92033e4917fe9b8671b8a97db6c827793c73969be85a92999964dcaf3177edda51abeb576811ad6cab9772964dc0a77e728 DIST resolv-conf-0.7.0.crate 17352 BLAKE2B 32b565a11d5d752e2cce2ac7b44e483b8a682220c99a9ca34d0a440d87cb5a874c407d474e47757f128bc5d78ea57940452eb099ea6fa433d8f6d1fe881f4302 SHA512 538b97f88fee8b82f15845f9a596e09757e3c2869c4e8708ddff97e19348e9f88d4bcf75e810d2aee47113fa64d550a9fe2deac6fc38d95242ebc20228e9b5f4 DIST rustc-demangle-0.1.23.crate 28970 BLAKE2B 611d2e41a8a9799db2f8bcb8fc8fefcda361d055a417d2bfaaf2dedcce9d6f388c69d905a28c65e6691b4d408d7922ccdc97ce524c87c3cccb8467e314bc87b9 SHA512 8cd29800254b1305ad50f1fc008838c52d9659f97a51a68e9f2bd6d0a60126f3ebdd1c79760f96445b3bf998d0773526ddf663b174acca81babdc0b423247247 DIST rustix-0.38.25.crate 362735 BLAKE2B 8d368458850d031d63c76c75e716d8e580a763fa365aaf3f065de7f6f28fa314cd57c558286b0322438b9a8fe5475ebc709b02dc804862e02ebf02ad8fd2f30b SHA512 f14d3112f82e254ee01059a845062e305b5386b84e2de14fd89443606b37c5640322258cac91dda3be79b11cd72de60557515649ee266bfe7a796a284afe6a11 +DIST rustix-0.38.31.crate 375443 BLAKE2B 9e8ba6bb4eb4fdf0bacfbc719124f745f383abbabfeb161bff9908d1948942d358f46191377b90c180a2793a88bb01be20dab556cfabc8da8efa2533af8e460b SHA512 593e0395a7bc5bba949e6f2a5ed9e39ae13140970a598def32ab7d6d91b4ec100752fb05abda407ee2e5e420d950b19e607f963f3974213637423c751df75960 DIST rustversion-1.0.14.crate 17261 BLAKE2B db30d01914059a893bdb4c448ed0bf04852085c2d948bfbed8819a1d2317c34133cf609abdd806ad628b86974a9c1ab9d09f79743cb8e13257ef32cd444f49c6 SHA512 466d753c28c4899ab3da3e9f3366f7ecc435d484f51e0c07acfa5f3367af0de27ea3bc75efda22159b4990c976b1466a27e7c31c834c72a87d8234318357454b DIST ryu-1.0.15.crate 46906 BLAKE2B 6d6949e43aaa27fba0ec6002fa11ba859af8d867f87c90d88413267186abbf6302b817985bca3d577ab3fab2e319e11756f144473a16330dfd8fc7b604cdc4b3 SHA512 4655b5647f919082a9b84b889539ae7fb23a1201057cf280efe79c58cb5f040864efb7812cda5021bf6d34838a15d173ac8bdb0fb9fa2dba85173d3efa5a826b +DIST ryu-1.0.16.crate 47351 BLAKE2B 13c72ec8aa608f6c53cf27c95d06b90839c5bec5e54b0441e9c4f779af3dece30d01a2276c717a733f92406a5a02b09c045b2b5f92714fe492d7263b6c6808e6 SHA512 89e3e18346ae6e4035787766f286a6eb62f5294e39ad902cc29e95c53781c4e5dd629f567f22ecc7e9fe9d1c273323da9b867aadc9cd8a066727c58330b51b10 DIST scopeguard-1.2.0.crate 11619 BLAKE2B 8b7e9ed6cefef9ee55407fb9690d57a2a98bb93e5105aeebdb475a52485e9e185255249e1dce8f83cd80534e7402d485aac3efa7e8493b13135de27550cd4bc4 SHA512 6247719a15fe1e4e2d179127b9a934bd2f99367724f41175ed9522f58824b6bc69b35002eae66b35880375ff61d77ac43ddaa78cbde7160a35183a1da32d3fbb DIST serde-1.0.193.crate 76863 BLAKE2B 163097e85b5542451896d7381607aa297e3b0342a2641887a01689b13122c6c1ca566fcb7f32f51bb0ecc861aed014f1467edfe21338223d5361555f870425a3 SHA512 82259ca302f42116ecffca3c88bc1212785ce5430f9d29390a9041d4e5943c13b13de119fde644a583960102c4b6e850a16f962d36dc76ac69fc2297ed65a506 +DIST serde-1.0.197.crate 77087 BLAKE2B 4a4e04ededf5fefaabfcc4e17457db823239e8eeee7631a905ed47800ca10d26a93632e3a9d1b784b83f84168d0d649cfa2e6f5f1e68ab15a68e837cd5b6c699 SHA512 69e42825fce6a0a5d109979785daceacfd6afc5641e202fe83da32e2b1f968416557cce97fa014839e873e65f85c27494c8f8e20e6e9e4fbedf20d0291880410 DIST serde_derive-1.0.193.crate 55692 BLAKE2B eeb2a2fbcd0daf5fee1bd6a4f584fed330db58cbd786073311d6a94308c63dfc6b7c2dfbc4b8980064ed66509f0127525b79d99aa96ca0134226fe21715999bb SHA512 05efb144aeee293a0e7dc7540106eb8c4920b2d8dfc25771d73afa8ffcba330104643430a6e396ea2adabbed4ccb23591251479b75449b9c8322799f91d38c41 +DIST serde_derive-1.0.197.crate 55771 BLAKE2B 73708908b6d1e104af4c63b498bd25c5a728e07e22afdf92f15754c0f17636efe44c0560c1f0df1b9a30708e8e8894a62f1ea57c234b6dd861cb9c8dc044eb4b SHA512 669376e248b76a5ee8b9c93fd9fe6d35372e7267fbabc14730539ef28a94e405ee5e9c2cc2846897d59d6153742cdc6799f9e2c87f20b9dad119bd3a86c28994 DIST serde_json-1.0.108.crate 146476 BLAKE2B 9c0ceae5566a4e0ce7a6264939862f9dd920bb47d18acebb179798b036c376d97a4e9b0717092903ab90cfbf6fb73d37518e3cc25f3217af010296f5644de396 SHA512 7d8d1b74515388d99983ffbc5696cba022305cf4c797d3ff5d2959fc8fc8f4ce01cc4c9e7ccae7097b06b5acf5307027f6b7315df1fd8f58e681cc5968e79fb6 +DIST serde_json-1.0.115.crate 147100 BLAKE2B baa2dce9d85e331d1308f2ece9dbeff24bcc70e37be3f06c7e819ad9f4eb59fb1f00658736fd336a41a65e3616d1bf75a0c9adb359eb606e1418159a9455132f SHA512 d1a60e20af770fdfe0585853c87c5631e56944a3c1bbdf9e1e91003af8e924a8076335bd37563d167c760aad10d4c08fe59ebd47fc52e461bc3586b835808d22 DIST serde_spanned-0.6.4.crate 7756 BLAKE2B 58b8bfa3b39368f4bec795bf1bf1b0e19554efa9cbf44a8f5deaef79c926c8cafb4eabd6230b56acd77c75b924b8642a141e3f7827a5fea16633edb764b54124 SHA512 10a71df5cf84abd5c658de0321a4813ce582735fa5cc349694d979acd8c8228fcf69b3c65bba803d706089b49b053c15a8b1c4fc4c19a586596b8cc58cc2ce04 +DIST serde_spanned-0.6.5.crate 8349 BLAKE2B f4f8f798ae3a02c0d5178aa12a94bd1bc08fef88b6a81d782ba07ba36fb0d89927ecf621087faf376b6e53de12f6a96e0880ce0cd01ecc31c5dab7dadc6f3ff4 SHA512 bffe2398629ae5a5a5bb6d5fc2fa0f4b94d02c96e25d1be2fb9ad95d8ca2fa9bfdeb3af11049ee9c050e497f3beca108f03020f88f6de29b208063c3898af354 +DIST serde_with-3.7.0.crate 140905 BLAKE2B fa749055ab1b1f271d46f68a169b18c7e670640e937002ee6f59814c4ed7a7dcee13340ec4a4bc116c57224472f919dad85ac64270441987d3cb0110162d6b05 SHA512 a923993d3ebf1543de6f73e264f436849de6d9a292668ca5508e20c1231b78105307f62140d06bd401fa7001d83a46b56a14f3ad95a2360a55e276ec7b94e142 +DIST serde_with_macros-3.7.0.crate 30834 BLAKE2B 2da5db01fbbbc9e3ad94531c4947bab966e7284c3867f1bb2520cfad23f5a7f5dabe58b821ecfd8bd1f89041e57ee388910636479faea2506fad232c5c7aeafe SHA512 43d666624e6216de285aa3ff8435bc01bfacb675544f63922d1113c4d1a37e8556c61d19807558e002aa05888f8a5d19e7ff8b339b50c4b9c54f0a2cdfc4e9b0 +DIST serde_yaml-0.9.33.crate 65165 BLAKE2B d72edc6e5fe569d20bd909d079d3f8a3db0aa85bf016eeee755923c5f4dcb4dbf896cc6c15920d9b2c1ccde909a6d8733b63843dd2f8149ce34ef4a09889dee1 SHA512 cd41feeabc886b1f02a240d1234f31ea0a67b787e9888e5d8d4397dd5bd389cb5c920bc6dc72f44c5b25e1cb4434e410d8c0b01559f1338e8b1a3f90505f6e02 DIST sharded-slab-0.1.7.crate 58227 BLAKE2B 9b4c4e4849ed324cf48c2b905f21139d1d65aa5ab13e7fb11817cac9a32ad09f8dbb1e50a93d40cafa0aba872792bc92f7bd2e219f62f80695409e949c07978b SHA512 3be7438d4a75debb14463477f34de6db1ac38abe958ada5d5dae7ae8d5993e245da69fcb989d91aaaffda5f2b085d4bcc88d10e07ec567b7f40a21437de6d4cb DIST signal-hook-0.3.17.crate 50296 BLAKE2B 5469a11485362b4a76f99c06071c69f6cc083bf4cceea93fce0b43385163ac3621b7a3c98d18ea1fb9e1439460ea37f470a29bfde9dea199e60a12b248be5d25 SHA512 045ac6268e504c5561d3884610a48c930dfd936086f793839f42602e92e4a8cef289955776e8eba8a5ca1a91b5f27ccb3724f49b32091f8f06c8bde984d82298 DIST signal-hook-mio-0.2.3.crate 9064 BLAKE2B 2bd11d0fad02fab92871e0129fc4ea3a609a43cee5d33737d82a624018eaa90077f2c92fec88f7b19d3ada619b8618f9d33fbd2cf6b7c63d3175dc57fb0341a7 SHA512 98429330c109dacbeca5f0788d993d1ec2830b6f95886a433592b2096508dfef2027d62a99b985654dfcd927f7f3f93fbfc19361f8efaef5efe84cbacfc1ab08 DIST signal-hook-registry-1.4.1.crate 17987 BLAKE2B f1df8bba55c72a506b9210347f9dcac4d158948e73f6d1e60f43340ddfae368aff1bbb6a109af326af47246d9738d49f76d380c52208efc3c6f79ea0acd31f0b SHA512 e83acec2b0083967555f6c659dfaacc32d851a9485c9f6f4b4cf257742ae3ffba8c14708c75f1a5520e9d132ea9e21d6eb65aba492eec481e8492af8b798c5d1 DIST slab-0.4.9.crate 17108 BLAKE2B 8e5288c4d00efa915e7be27b55f2204850968624f0d8101c091a357131106bceeea7a63c98007420c12f67893dd2228b15d3f23508108c3a0ceaa605474bc7a9 SHA512 b6b5423ae026472920f7c9a4abe0962314140a36dc562c0a9e3fa60725b2b8b7a8b343110d9d4c0e18fb318b0103e14c0ccbc9ae350d5563a5ac80c35f228c40 DIST smallvec-1.11.2.crate 34801 BLAKE2B 58645e99db8f02db64d02c75860c7ea41836c427c03ee3b0b23365e73a406e4fd6ac312bf13fc5faef8bb6111c10fcfd5f839d5b3686e9b34d1626f8469fc327 SHA512 5cfb427c3b99b0dbd71f6154ed899abcde9d7d2992977ac7b2ef3a4c3ff51e4efafd133071a69609b4ed6cb269bdc26b79eb72e1988f10dfcaef8185d950cd1d +DIST smallvec-1.13.1.crate 34952 BLAKE2B e0dcf1d26883564cd4f5d20a588562404e193075b1ae011f7f7542009a9466e5df3ade7768e1a8feb8806774b2cee5f15d31779928f83714e7d4b6ed46af9ab9 SHA512 1259ef947400470b8c9e74c5582dbc1a49753aa46420883c1f7d66f320f67bebe733a15a23cd57ba461020fad4ff337a5b298de82754602a78f5e6cec969652d DIST socket2-0.5.5.crate 54863 BLAKE2B 4237b540dfaa96d3f8a8b9178519e5ea37b6b96480a2aed5287f462845231427a18f5add26756c7b03c18d4d4aa617a5a36c5462258ebd8be326e8fed1c48641 SHA512 afa8df546234d4e8f89289622448aa42d8c2ba74a0a3a4b13c0ff7bc30fa435a7d6d6e8c9e2a6933cfa23ebdfb4908c865e82c657611defbc16e1f1bf66f9f8c +DIST socket2-0.5.6.crate 55270 BLAKE2B 10eb32486b9a2908e05ab24620ad7a79243e59c2c2db5a7793f87f32765745b21746423d5b3896ef37d3dc9e76410fba97826cc64cafb7dd45adb485900c2282 SHA512 10f14ce7bcb9fabac56f98bd34ccd6368dcf4ca245ba2df80fe0f1157e177056eeffc6fcfb1d1fea6e89c0eaafb99d8056fbd10101031d3ccabb98950ec563dc +DIST stability-0.1.1.crate 4753 BLAKE2B 67599628835f9e8d27f10cefd44eb306a57b5cc8807a9e2f63e918664fde5a7e45f678736aebe3899474176b80e825d172ac30f88ef549b7e0c347a43428c55d SHA512 6e993b5ee74a4557c8d828d6ed6c1ec0dccd16878e3f36db07d8b8051d6d9cd8e9cf6c717d22c2f431954c31053c2ca21829988b090bc4ae6d6932c5c3243bcf +DIST static_assertions-1.1.0.crate 18480 BLAKE2B 358dd5ac413d06f62da0388e2016c5fcb8ec68fd7dceb0dbbcb97665c032b7509b7e083c20701648b6a9174485f117c02682ae4bde7ef037e80a85cdf6a0c86e SHA512 46d0e35f77941dee6f60f574c130472248063dc38494c1c4f84f7c048244cc2a58a86fe17c0990e3f0f01406b75ed385a13d00058612b27cf0e867c8d31c92ee +DIST strsim-0.10.0.crate 11355 BLAKE2B bcb25ad0a7284e24e4f17ebe0ccb621bdc4118e499b50b094d98aa7e8fcc0b96716c9953c3516ce7ea78309d41d424892ded595259696a5bbffdcb07802b5c2f SHA512 78b318532addfcf5c1ccc1e14539e258aab9d3cd893cc45d82342549bde838c177d90f13c560671f8f32929af47d0b467db35e6876bd7697d8b3f9e055aeeac1 DIST strum-0.25.0.crate 5539 BLAKE2B 9c031e5ce19e2ecaa63e63118197c740ae9295b8881f6280ad92847b99fca6fb08b0d395ab1b2a66e25c8374cd18866d8436540538e3c0f1f047fd2235971b40 SHA512 a3522df79547e94518f25a0e29248f67f1d7e2586a7a424d7d996cb6bfe5d98fcc4fc44da7ddcd4e35a1127b2816bee55107f30cb2a559f5b9bbb1346139544a +DIST strum-0.26.2.crate 7189 BLAKE2B 7582fe304551e98b121d3a386af22bc022d7d11323b81ed9c2d600c8d2496077c09bdc8dfd78a636c18b9f522808b2ea54cf8b669419b0c89fcb6b232eade617 SHA512 819cfddb3028d5267842cdeaf17d37569eb18c957cb78a055b25d9ee1b8461026dab9bd980da4a89ac7b2858ff22880e40b46a72d7695a5135b84c4b7e5026f3 DIST strum_macros-0.25.3.crate 22570 BLAKE2B 511af0d1f0f76df7ad1528c79987b6e09390bfb33e1c34078fb5450171aca7f169afb83fa2f2338a861ded6842c8535ea6e4cdb0d31f341edab0a06d7eeac16c SHA512 e6ebc00943d9f88104815a5bd6a302a391a06fb0ed5ff836e01d341150628684e00e5e2e5b3f6466ece92d376985246f818243a0d1d775cfa55d1c50c0ec0c62 +DIST strum_macros-0.26.1.crate 25326 BLAKE2B 2f52389676e1581abf42995a54d7725b0ece50ba8da2ecba700c359a4bc3dfa3c48440908a57d8f25334a1ab6a844093e131dc351182ecec1cab9bff1b04c407 SHA512 f41fc17aaf84385437605ffa751a9f03d19d230780855f86d60b53de4bd1891519a3550c41a31d44312f44b59c3c184286d9181e40c3fdda3aec0c2806385455 DIST syn-1.0.109.crate 237611 BLAKE2B e827445d00c79a8eeb91eacde472f1987addd6ce9e1df95d7abf6446a77ff4173a8006845f3ae71c1da47193cfb72e0ead9a6d6bad2573be12c17e90735d9ad9 SHA512 12816b9e8cf984024b2fbce9f0ae14cf94d4d2c06f08cc54fb793ce78770bb4cc1288eb7df0ba5e8e937756e1e8e295c53fe07a0c5dde1ea8ddba03b6203b37d DIST syn-2.0.39.crate 244129 BLAKE2B 2cff6626624d03f70f1662af45a8644c28a9f92e2dfe38999bef3ba4a4c1ce825ae598277e9cb7abd5585eebfb17b239effc8d0bbf1c6ac196499f0d288e5e01 SHA512 96cc347cfdb0f9ca0b6c7289279a1cad8fc401625783742292564f7ceca8237ced8d9a3f62069696f6132ed06092dff2baaf4be09ef53b21260d93785b0e27c3 +DIST syn-2.0.48.crate 250566 BLAKE2B e46b0863af76c3116c84d01b654a9820b7edc51f75c9c5301a7967d12284f78da602409f34fc40524728350dc6b998a4d738f08b8868f95236b3e5d24c460580 SHA512 926c0ad55cc743df20f9166b6d71fd44421aeb1f073fd86b6ddb53e13cd508b539c0360ce64b07b65597bb14639c8f33acf7e60951e1e9128624517aa3aee325 DIST terminal_size-0.3.0.crate 10096 BLAKE2B 097ef50a85945128dcfa36d8ea0fb15f11142c206462a32980dbbba4fe2872abd214823fe3c75e804f3159a97d6e929ec338860e9c89587da509fb9e6da5d339 SHA512 f3bc9144aa8a87556543584a2495df6267ce3bb017f3ed3d00fa43e89b5de783e1285ca62dbad9dd9c3b37e3a476a6f3ab0804eba2411cb594a569bbdb310681 +DIST termtree-0.4.1.crate 4557 BLAKE2B d4300b0e6e908c519a0a76f5e08167f4467f428b2926e7739614cef5d3e294dfac15ae8576f7011a852745713c16da93346660ff96520a2bb90a4dd4c23d889c SHA512 ddbe0d3ddd79b182732359f47958ca32aa351d10b1e7d5f6456700b851aa2b5314ce005e1fd120a248b676f219fbd68039cefc071d92c5b5477d053bb6e29062 DIST test-case-3.3.1.crate 8797 BLAKE2B bad61b52f7865882cf6f1ad9448335a8c2eb725629858d62675ed5c10e3a160f5b2cf28cea1179a0c1fea1b33668a70f294b8a2252db460490f3c0bdb705e7d9 SHA512 9d6836759dcd71a61ab4e395db7c1a75a14ac3102a36c39b09868ba96d28a2265d8ded385942e55cf95dafc7f4b53fc498b30b6473cedc9b558977878e831b3c DIST test-case-core-3.3.1.crate 14327 BLAKE2B cdca628ed77b8d7bbdf50c775268f733e125fdcdb4425d228691d9650558c3797876f5d8e900a7afc330f61c2be588452ced646248bd676fe4da1a4f8000decd SHA512 2c58aa3c9051b99c269168d5d321c73314188501fd33170a8a5d44e860354f5a399545abbdf50478a43d13e15ee9ed53d4a9c800b263a5e42b97416f96e2c0e3 DIST test-case-macros-3.3.1.crate 4961 BLAKE2B c3cab2832fbcf3deab12b13bfbb32bbe73528df4d98e84de589a39cd9f3540e308e307148eeedfef4822e3f6820e1b1ba93b102851c7792c5abda25f735b9abb SHA512 3383ad7fa23f09b3289e2beefb2a2ea6bb7f7f48d71339b4c1e613c4807e83e4ab816b1c36369524d65aec7929064d2951c758d9c88164e7792a0a46fbf2d933 DIST thiserror-1.0.50.crate 19414 BLAKE2B a093f66ad191a8c4b15356f8d29578273b36f9f11b5843195eaa15b70bd4c8eaf6dffb631564386acf35a9ddf856e05055b419af52d4e008f582ae444f3dd5d2 SHA512 65605a9cfbc43447a50980739259a45d933f1eb315926dce909892f7162c79bd04bfcee7b38b5a9fa71b24fbe4416d050ae8e2443932577541513a23ebeeac46 +DIST thiserror-1.0.58.crate 21025 BLAKE2B 2915ed6ab691fe94e97a834ce5874d37a388c3240499889cff633ee6c67d46a2ca88098ba40c225ca0e2e3c1ac7bdcfafcfde3dcefc50867e299dc49505d6fc0 SHA512 3cba2d1f4965bc56bac8fc70540d8cd442ab6b8c7d25d328bde7f4cc108535d83c75f293316d730bbd86eb247400b6e35107d610c7caf47f43a28b1f52fed578 DIST thiserror-impl-1.0.50.crate 15357 BLAKE2B 41309507014a2c628b7e91d250335070e4cca6c6c452c90ee7e6173bed049df83ca197b37c16537cf15415550919c248e0f6c798aead760e7bbcd25eab701d50 SHA512 8555e010f94390e93ba757bce9ef25d066ed542f23b843db431a66fbab722584ea0ce6c9d4b6f4d92cea3d91c190336abd567c4a0aa4a27893db25720c5b89c9 +DIST thiserror-impl-1.0.58.crate 15645 BLAKE2B 9c6f643a582666ee4eb43330340888e7141f0dd89d927e3345268c3eaca02fa42b018514ef38b3db3ff9722b25ebdd43c36b11ecfc7bcb36950ce2c204ff78e1 SHA512 9bbc623f54c71595e48b33bdb3e4f12eb2e48074b15ebe400d6faab43410b363e5af94df071aaa324c59dc6958173e3c301fd51b216969f095e19cb98a27292b DIST thread_local-1.1.7.crate 13585 BLAKE2B f497dbcdfaf7dbc8b4b0dd97f77ba93df15b63303e7894c9032c9822a5b8111e0a21db2fa8cfdce5a503f70959ac9cdf48c840b925bdd850dc15e8436ba72379 SHA512 3772452c2a349fb564d29bb06e13c8ae64807db27c3ee217fa04fd0e9847e94adeea582b82ffc2d9116f31ff478eb088550caf1346c263de49b55fa17b431c31 +DIST time-0.3.34.crate 118430 BLAKE2B 6d04a20596c9b0961ca104748d9d360f07b16059719d7410fdf1a7a0d5f2aa02aaebf640999464835964bbded2d3257d79c4b0ca3080fbecf13dd2d0aa6962fc SHA512 3997e1b8d9be2f54184ebc9e1355d4b65f0b7bc9439b2b29e4a4acd86ad3a3aa019261112a24d998d76a7f66b266a86536fa50412279911b14d4d7aa7078c116 +DIST time-core-0.1.2.crate 7191 BLAKE2B c477ad3410ff29f3bf4a38fc6ac4a043d49b6d2bdf5cf309ffcd2eec3bb6e4c4b62156ee7f069f0b37ea31c163bc75ccbf35abc1db2833cdd4912135e60ddfc9 SHA512 3861724c23cb806829a01186deb5217ae8252c20af622975264e6670cff528f42155039e4937756a9eb312a5580ffab07949437d5504d684a0e70755046cac52 +DIST time-macros-0.2.17.crate 24443 BLAKE2B 5045af9352961db0c97cae2f6ca3e8d2c4f89a129c7ac2ec1d8d20804292aa9f2901a61f910a564954614b68f39311bd381deeb66fed8bdac423227d077f3d14 SHA512 c81747f0b74e68d3b3f36d378ac5911dece8c6b511e5ac793807f854cc31c812b927d0df941f55ff90d3d67512d0ac6a5f63f2de4322c81b05da42f46b4a661c DIST tinyvec-1.6.0.crate 45991 BLAKE2B e9699d4d80a78978f0ebfd049f5b33d7f23d401cf4f4439ccb168e8c0e322473ad0ea7e2ff0ff69e9aac3e5c4c9ae5a7102185533bfbf96dbe77b3526e700bc9 SHA512 e5acaf353c58c60ae5556130a934f1048abb79cf6668ae467d308bac44b689d8a9997227ea879f4b5fe50f29cde8761801b088d7149bcd063b973056c381921c DIST tinyvec_macros-0.1.1.crate 5865 BLAKE2B 2bf4f68ca11dc19c72232951605a4c809b34ff38ee365ee4f592a3c41360e23c9330cfba961e2692a0ad568fef4aaaac51c40808d491178cf7a0c4b5a1c5d484 SHA512 10008c7b3a3d50c94b9c370015b76ee082f5dfb6dcacf014dc2f2dbe92f903618d10d0202b21f48fcf98a94ae76fb712db55a5e8ad353645d378cf0e6ec74f7e DIST tokio-1.34.0.crate 736847 BLAKE2B de011340be791897f7aff72e80e4516379b666ab143dc58bc47f900b2276eb5ba5dda855534d649bbfa2735ea0581a12432207b7ebc040f5ddf0600779492448 SHA512 8749f5eb1a96bb13ffc6a431aafa618cc116a59be96700298ca52c7b129b48a087641f60e91c051f78dec61eafd9b5f1cb4de041e0a1abaab4509ffb81d02689 +DIST tokio-1.37.0.crate 764297 BLAKE2B 725f3b62c52ae962623df84c690db7c54438581b8d2108dda76f05bfabdf1688f2de8b4fed2ab0db5c04c7659af8d95a7e19702654a12fd498d85a1d030c7a45 SHA512 fc3c070ed0c09e57205b76618a93b8b00f4d74c2ad89df3295254ec2a984f4fdfa9ed5472ff935e1644e89cf2abc44354742603c0e006f14861deab2b873cd85 +DIST tokio-macros-2.2.0.crate 11520 BLAKE2B b688669f8bcb44967fe0d3db51fc5d5f86da3cd0c7eb7b5803feb250ea3444d134ecc7f79345f0b947cd3479a46659f3a158a04e0edaaa52deb8d343deac4761 SHA512 7e33fa62e0cf4b829638553a51f849242788d217264437444b3bf478fb40be26800d5cfd954b1bcdca1e5191b3c6c60879050f0f7e707461f7b090ae5025e0c6 +DIST tokio-util-0.7.10.crate 110508 BLAKE2B 073b25e1484d54911bc15fc2a4b3fb7658f24f7f77a2382f9f84c5122871cf8c5d6097d5c784cd75b17a79aa63eca80644ff54bb496b52e53bb89650ce35cab0 SHA512 d77db36cfa5a2ace3090874d8996b9e94058ac31648308da8dd92a7bdc9b9b61adb703dbd2131adfef0b428cd61b4de76fbdb674f718e89b297f762af11ec50c +DIST toml-0.8.12.crate 51145 BLAKE2B bbd5b7c536c16b23f26bc520298172a61a61cf72195191d1d3eddcf54ef0ceef781902ad2c0033fab5aed11229400ec537e3cf86c24645a6d111b387ca8d54c7 SHA512 dd8054e20aac5320a2a6a7d47640cc56e48c2b6db01069786382fe5ae19e9b307fe7f4811ce5b8fd283a307c0aabb2b7f57101e05edadf79636785128b5cc265 DIST toml-0.8.8.crate 50451 BLAKE2B 96d5411e8806c9021409ce232a11fd6d81269ef2f56b2a64d7217c9af8d0b31258b8c650e2bce9ca1d561a5fc58d1e556493d06199842a4d81884085622ae3c9 SHA512 6a583ce29d8179b480d29ca5e4624a4d6a8212cc741cd0c27c88ce46526f664a2f32eafd322b648f145f5ee5024d522a126f56befab5f1d68c32f2fb9866c7e5 DIST toml_datetime-0.6.5.crate 10910 BLAKE2B 93a21ab2784e96ee2e6b56c7b4f733f6ac4c68c1e7d7dac3fbd8aceedb3580e25b4a9c7d9c3f9b5ed152560353b3e80906e37824956dc4ea90bc6f039768f6cb SHA512 502bdedbcbd2ac9fbaa5f4b51f2e409af185f3633f01f8845de5e3b007f2400215ddeb82ac588bc915ed5a5f9d7251ccf93fe2a57cd40fca2927f4c0966357e6 DIST toml_edit-0.21.0.crate 101265 BLAKE2B 8cf4fcd93fdc99082c3c43e6629348b67c1e2bb4a3605ea119816b4b3c473bb3b9bf9baed8b189a0dda6d92ff5f08ec58e3cce19fe2667bcdb2ca3dee88d06ec SHA512 6889b7c3b6679db874b9ef099e3bfbce75b7f15cf47860e542af42d449d0795113bf7dc84a7f2d394ee0fe037d7f4c0857c3eeba6902a8b42bb9cbfc96f0f324 +DIST toml_edit-0.22.8.crate 104016 BLAKE2B 6dcdc076e7662bfbf21096baed32b6a7859311670824eef01b5df21c543f9a7c30c6d17a77a9b2708ba62c9a7d147cb1ab37043deb82817b28480064d3cf6014 SHA512 36f1fab6dd0c7e0d20171cb556b59c683e29aa8fe1bd50d4e745593217bdae467e01ca51a8122623f44bdf0d6fecd24c0f1b4b648e9c48d3985b77f907b54f0e DIST tracing-0.1.40.crate 79459 BLAKE2B 33693ee71564fe5925a63dca351e838dfd8612b4b1e49a33a70095e56ca63287c13c772661ace0e540d08c92942d7cbdc51ff2cce4f4b372164d9aa20ec05dee SHA512 5622188a45dddc0d6d3a8244a9b12db6221f4180944ce1019d18f4e613e4bd113dae5d45fb57dd0754f6e8e153b047cdf00c8f200782bb2b868bc2d423d99275 DIST tracing-attributes-0.1.27.crate 32241 BLAKE2B a20af0f50a90dcd64e5318e55779142da294ba18d1cd40059a8aa964fd3c92834e03ee563e41caaeef71a30e3f027e5c8d167d90e2844da79e0774b267e179b4 SHA512 7dc59f4234c3bf3434fb352baed2b81db4e931eeb3ed207c4a204e480da734be40847b167b808058d2807b5583815625bcd5153e2bbe79804cfa6f069a74ffa0 DIST tracing-chrome-0.7.1.crate 13796 BLAKE2B dc2aa03525031a305bb1a4d0fe4941febd54427b031a3f939805a0c59ea12a36809ef2ad94561e2a19688437eec942529a09f4c875ea865b7490ae125afb39e5 SHA512 608e8af7cb28109dcc3039b3253dc02321bddb535f5eb5de2f922b993d5e79d2425dd2ed9327b7e8df531a4fb58d60ed1b6c64eda224d00573c3f412c3460cb8 +DIST tracing-chrome-0.7.2.crate 14030 BLAKE2B 6ffe58c4b60244d10e41addd7fe1532849a0ae56747bfebb18565e362c727b7199592ffd524c39b4d478da7dfea2dc03b1be47a1908f91abff7d5edef67ca410 SHA512 0ea9fe590f648a193714890da388183305d4084696926f5694eebd3c1da8cae922df335500cafdd60ba16ee5ce59a59e4fa292b97ccf739a19c2fe7fe145b0b3 DIST tracing-core-0.1.32.crate 61221 BLAKE2B a7815c46af9852ce62498083103c6d359351f4d33609b4291330073b6abf4b63f5e1bb1a7dfed3bbf4d6913ad5217e96999416261af8a70609408a29109e4db6 SHA512 164f79cacfcca533a53b7dbbdc2015aaf851a16e00c72fbc4e5f515b6a6dedfa464e964810009b54f08cbcdc5a314e50245ac7b1b01a71fce4c63db135bf5521 DIST tracing-log-0.2.0.crate 17561 BLAKE2B 701bdadd40f1343f3c4901bd8dd188f1dbc0afcdf50807bd0f6df7539635e239b5095696872103125a4d4cfec24af6336fce6f3931363dd5be4f53a09fa584f2 SHA512 0c1f060e8ffb9ff24cee7b85cc2d7d42c69b2f7623a7faecd7422b23b11ae8d5c7691e4635bae76861d444c369d9701ccb147904668023642b223e442e3c8285 DIST tracing-serde-0.1.3.crate 7329 BLAKE2B 55d924fc3acfd496abca8b42bf3fa4a2511340cf2ebb060fb31bc0b5d81dcbbaa299daef3cddc3647625afd124b9c83efc1ef104f55dc6d4cd4d91e0e667c160 SHA512 3822ac747df404c33573ad2a5c722f9708066a72c2893dbf507563ef29bebcab79cec17515fa87c0fa64be8a08073c38ab57ccc463c74df8caf3df69c72e131b DIST tracing-subscriber-0.3.18.crate 196312 BLAKE2B bc2f04da63b0313d26073eb4a39b549ae37701e4dbf1fe06a2483279a03d9dde981f0efea6ceb5cd441ab313bfe7eaf812971c3ca60dfd4b5d9cf0d2eb7bacd4 SHA512 72f91855637aa476f03077d5f523cbc94989d40b12d7328167f88b081869ed096e6370450831f6cd5f0686cae5628f14eed4696c06a2ec75f56808b64445e0c1 +DIST trippy-0.10.0.tar.gz 15288046 BLAKE2B 08cc2bc288b78fa205954db245c89fd5ce1966ac497dd8108feb816b737035f010ab5b92dda733962408ec039f4afff2d2c07505ed7f9ffe2577c545c5f0d161 SHA512 888812ba578c53403769df7c1192577e8e7e23fbcd529a21edba7fa2e0ac7f9463ca40e5f4137aa732bec8407d7b5252d485e4a5b2d29ef4a9da41e20eaa5bee DIST trippy-0.9.0.tar.gz 13867271 BLAKE2B 92135376948ad710f14a2c8326e938f5ae0fa47563aea588b678dc0e55752c73d56d0468623345e0240b5f6061ebf11efea0b309f33dc738b2895901fc422d4a SHA512 1ca5d6e2ac17213c665616957bb98e2771efea4332dbdf8383c93e39573d8243ac880b8df2998c607fe92babe49a52608931da18aad6373022680757f310787d +DIST tun2-1.2.7.crate 30692 BLAKE2B 4200932f2fafbcb79dcd54ac177566c156d8bf9cfcdbaa9ed74010a0655fa48cf477b3b918e1a0c4e5fd00bfba8874a78bbfc0110f9fac6a070c5c7aa363423c SHA512 5156970a5779b13446aeec9da884ea74c48bced3a277cb84ccd80cf0b3b22f73e45f76f48e7d5ff94e772fa255a5dec30c729fcda95d4b169550954d3ee71eb4 DIST unicode-bidi-0.3.13.crate 44477 BLAKE2B 90d80e7c57e93aa9aaa83e7c3c1a93bb6e4d51047803e61ed3f7c80361987947b2029a2b679bd301e8a0766ee8ea7f080e9b9b6ebcbb4354e19813a0f7da2abc SHA512 fb094fcfd907d90fa7232432aca0143209446e4c5c73d8a0fe6d2dc44b9dbb5b8b926c59b5e3f9a5a0a36f91c04613509b6e430c9c4adf526e7445e6e8d7a3d9 +DIST unicode-bidi-0.3.15.crate 56811 BLAKE2B 1f1d372c86ec7444f13eb32baf13dfc8699b52156b265a2b53f40c0d771064876405451120fe54739a2679e6991caaf4f63e0644f03729cab814079fef4868c8 SHA512 7a21d5eb05ea8d691dfd54ce4cf7d3693d08067f7a88ef17b8c3044634f46411176b1bde1516c442577910b254007b247f5e40f9932eb601cd96cd574f9d9db8 DIST unicode-ident-1.0.12.crate 42168 BLAKE2B 4cede03c08758ccd6bf53a0d0057d7542dfdd0c93d342e89f3b90460be85518a9fd24958d8b1da2b5a09b5ddbee8a4263982194158e171c2bba3e394d88d6dac SHA512 bc1824e1e4452a40732fc69874d7e1a66f7803717a314790dcf48867eba34bc9441331ef031e386912e52c385645c25b6ed39d4f149973b5b97371b1b96b1920 DIST unicode-normalization-0.1.22.crate 122604 BLAKE2B 3f3430b279cc0ce1595392c869442ce676ab097154c688779ebcf726e10c497df59be2cd7bb2f84f99499a9df0654760a10ac92224c17d74775aeebe291241e1 SHA512 a5810d5e9cd93dbb80e013997aa9d38e60834619483a6623eb2859ec5d59a5aec3fc4db123dc7f4e2fe9f2b8799cf6af48bdff22d69a00a23707240e8bf3bb3c DIST unicode-segmentation-1.10.1.crate 98416 BLAKE2B 4c391ad34c5f8a00096ce89793b15212555f2d8a367f3ae78f26a36c5897b69f3efcd280a1bd3eb3f61c87b8a26061804b1cd56e1c1500cbcd62e8bc74520014 SHA512 e96224bba73fe9a167bbf226bb13fe5bea085765a90f7232cb20b42f3c584242b7291aeba1eb8edbe2ae40e5bee2f4714f434324f79316b22e8437c77a50e86b +DIST unicode-segmentation-1.11.0.crate 102740 BLAKE2B 6ab5de53073ff56da4924e8c6ecbfa4bbd72a66b8d86f2c32b2f0ccfefee8064997a6b5311af5de2b71943089c9f52862e3cb13cf366cd645f57c96f2ac8673a SHA512 4914543cf022680f341c4a235f6d9204b3ac9a9098f34a80ee8c94e3d8ccbb82e78af016978eda910987533044593ac629a35286dc80707d349b33e405e86bef DIST unicode-width-0.1.11.crate 19187 BLAKE2B 6baf7f3b32eb838925e591792abfe11968206d177facefb89ef51daf44c18f3fef1e41c19a47b88b81be50667af626af2024ccc540b240fb6e1d83fdea57076f SHA512 ee06f4144525424327a17578642565f396802f0eea539b3bebc8d9627376a8bc6c5376d83a6ee577068e99fe75815bd765e6d49fb9ab9b253d00594bb15a5ffe +DIST unsafe-libyaml-0.2.11.crate 62101 BLAKE2B 7ba17f2c19d96fc8999448594ba67bfc0eceaff47a39e560f856d13229ad5e69a9c8ba8794ec814e6b7c3cb7d597b7c7a366c8e880f17c0efc6a03a5677d82bf SHA512 a42c95eaed1ae2e438d3ba19ccd92337327c34f6174a43db80e1f37c507154249c7510e93f81726890c6032c89fe21b1876582afb7fbb811e3931480c4727712 DIST url-2.5.0.crate 78605 BLAKE2B f3fec3477248cbbe67866577eebb03f517c284a5e5cb783132b11ef3ad156a03524f4730f188d822dec85169d7474e265099296d6bdd4adf5ffaa0a118821617 SHA512 4aedbc48b85bcc2853189f5fe8265a01c76516b5507f4e958d8d0b860fe2590c69c95f0f4b9fd6fac9b8d5911bcb0a5e9ab7f8e8b600f37a12db1438976ee5c3 DIST utf8parse-0.2.1.crate 13435 BLAKE2B a1c111d7ffc60690f2aaa86f034c66ba1abe4e126f1774a4377d41eba3269369862f57515af387ea785d69a8adf46338b5e53761b5ee6f4f4380473f4d9cab0a SHA512 51fba8f1e7eb74b7020fd831e30a67fc8353ac2ee07335c8c3374a5570ac8117f165f6905d4b7f0360095b7b5ed3e739001d02a8cc3c89195baf2cd679136050 DIST valuable-0.1.0.crate 27718 BLAKE2B ef5ded994c9a6dd302bed27f0d757447b0c86dfefa499c1ef0d25c3a6745ce61cfa2c926826534c9f605f9b89b4a19f91f06f94ae7c03f1ddc4c58fab3ae58bb SHA512 a97f65db1f1c5049a276dbb0e45e25c6fc6ce9d27ac1fcd77c945324cd8216ef60344065c79799ca04e338455e4f7422c44078eea32d5fc359dd0211ee7eb387 DIST version_check-0.9.4.crate 14895 BLAKE2B fa1fa4008af165bfc1fdbe560488afd9d232cfafee94104fbcc4cbc52f234849bff9ddfa88109a1ac682f6d9c1d86b0459893d223f64e65adc08966aaf93dc89 SHA512 b172dc9a3759a4a683ffc39b9a40b03b9974b626a088217de87090466cef695226557c226cf3e469b2b25ee7297b7eb0d7719878cab42457f80146a81943c0c8 DIST wasi-0.11.0+wasi-snapshot-preview1.crate 28131 BLAKE2B fe501889f25d65e2d032f885cc50c4f8bf7dd70fd5cbc438de349838370d8699e9627b0a4fc76030ea9fe6d508f41d0c9928a875fdbc47e73bfb17241cf7b155 SHA512 043500ab28cd9cb779475255da5d109ebab7fccca72b64873dc28d77bc5a157ba8d96b9e8f05223b5b36c7089bb7b4ba87657fc69bac16b78972f897294a865f DIST wasm-bindgen-0.2.88.crate 181311 BLAKE2B 94be99405e6f8d821aabed65928d03b3f5c7062afb923cac6088e56272fce4b928a03ca693b9e3bc2c7ac5b61052a3b2c1b9f75400c95814f29504c0f255f2e7 SHA512 21c50fa3ba6947e53fb56a57850350b9f5ef11d7281e015bbd564fa07a702b9e58b9ccd22bc6d870092e73ae51a9350f4c7f5a019b279f1cae2fb85a1f4ce80b +DIST wasm-bindgen-0.2.91.crate 182689 BLAKE2B 4ee85709546462be3da2a6f1caa02448fa903c7411eb264894aac402979afae4a0d7f3dbb486266b05d8caa911893ae9bfe9921cd36e03eb5147a8d75d6c17d2 SHA512 80e91e5b6094eddadbafd842a4a1b3284de7bb51bbd795e8716a0adac354dc14ceee0593d7c33090de06aadc8bc61b8eeab8851d066cc4ef4661e64adff1988a DIST wasm-bindgen-backend-0.2.88.crate 28181 BLAKE2B 791e6bdc0702631dbb959e788db0f6dc2675f48c6d9e15f1362f153dd32a6df85b598a8a415143626dacdc17c2d447d0147c885f373ee6e0503446d96af243ce SHA512 717a62c8ed07adb29cbdbb1edf6f47d47eef2ad6fd9ad1264b09189d785bf525a6f09d1cf362d6a337d5be0a2ae8614e30843a33da73c2d22b6d233b76fabab4 +DIST wasm-bindgen-backend-0.2.91.crate 28345 BLAKE2B 912a0471ac64d61f18d1c1749a3614ab70d08f330fd90b903ce5ef51f18288c7d4ef153f1d8100671c02de8fc499928cf925bdab4da4f0352789268dfae87457 SHA512 7d3c8db4503982fae9c86620c964e8f9a4ce542a79c56f21d9f82d26bb9418e78b7fa9922901663bf78516d58652dc3255ef48d1e1f042d8a3c69210f5804204 DIST wasm-bindgen-macro-0.2.88.crate 13908 BLAKE2B 49baa77009d60e05464d438a97bf4c72a5357f79a2995b88bd2a9c73823b01940b23d90b9b0d7e01bcf3c1c31988b015ba029df09aa1595bcf560000fededc33 SHA512 df45cac130bf787d08640045839d8e9fb1b10720c0e7def84862fc6f6f8df1a3c775870570c210279488eeb1700dcb6b778ee22fd23e5a2ae5572603c2fa3d1b +DIST wasm-bindgen-macro-0.2.91.crate 13898 BLAKE2B dda8dd5d77dc57324b633f056805bf7892c39c5e70257b6d048c2f8cf885f7306f91f3f17de1b63dc740db66d52fe2250ba981077e03dcc731dcf7c80c047c9d SHA512 6b05e0a2657e7e4f313089787b52cc7f59f5a94be6f716ba007fcbc3bf7c38561225ba3f39245d779e28dd30630b2d4c6be12baa6ea1e6cb47e562ccff48372f DIST wasm-bindgen-macro-support-0.2.88.crate 20008 BLAKE2B ce90104bb631d00c4a1c0e056c688c6b88f95d9a4d58d474185313c5b38d0b81a660bc4c6684d8b70215140fe6eafd90fe9448e56154ded423616449ec30c750 SHA512 46aa40e5bd55f8ed3a576b1973c6ba7743675f20623397421fdd56b1f5d43159f7e7b3ce4acec0fe5b04a6fba8cf7744cb041e98844b0bc9e6542b06671076c2 +DIST wasm-bindgen-macro-support-0.2.91.crate 20091 BLAKE2B 337b1b2a9e9e9c1350267df0d9f041291a847cf4faa3bcd6fcc8a96e66fda54685da72f6e64e57cde0d4609409ebdc7851e96781f599470f8b0545018bdc2166 SHA512 1277682520d88cb9529adbc054590a732a8890debe33d1d64ebce332c66c02f84065c0f643fa45c01de8b80534b2daf8333979601323b3ed50dc49553233c39c DIST wasm-bindgen-shared-0.2.88.crate 7264 BLAKE2B d1934b4af13257b9be90a26d90e0a13927efd4ff794ac1e90cba4133bab58f4941045e17e2b240489bfbf6e35107ffd5c7cfc4c9c37f2112d4a7ad78fec435db SHA512 eaffae8a98a1b6bbb186fc5f6535654171c19a763bc9ac2a79758e5ad2710537ca4de92228b99c7186322f94205f9623155f20d039fcc2d56452340c3bb9330b +DIST wasm-bindgen-shared-0.2.91.crate 7267 BLAKE2B a9dca2db84a33c650a7abbb6dc552bc4bab1446e66aace751d3709d2c63b878b127748a83cb174aae3ff8c5f5ec017b97623e5e9294e6ebf92d669efc618c357 SHA512 97072a8bdfadde104f6e9e760e1ac5ec665fdaff38a93a0bf601c95e652b35403e58a99fa8c0fefea6e47b38fb97f2e1ffcf52736f9ab890b0b9632efb26cb4b DIST widestring-1.0.2.crate 79706 BLAKE2B 64423d0c485d1596015e9fcee691222a2a69b85a1b13a91651c50c1e3c5ec61c5105232904c6239bb442a2b3f2e808379d802856b93bb62ec8779cbf3db77655 SHA512 cbebac37d87808e791d7839ad69e0b86af49b0e8a354a22e11797915c719937ed5b0cb638e5afc9d710cd1e073eaa9f7db76cd3ca1ec35a71b565f0b8f55407b DIST winapi-0.3.9.crate 1200382 BLAKE2B cb5799749ccd935ea2d7068d953cecf19f543d9db7dc16ad4584bb7005373ada34937a3ced7225544d8bc765da599911c7a3190efefb3a25b7c1bb7123b4f673 SHA512 ff8b7b78065f3d8999ec03c725a0460ebc059771bf071c7a3df3f0ecd733edf3b0a2450024d4e24e1aedddaecd9038ce1376c0d8bbf45132068cf45cf4a53a97 DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f9552972170d65b9a5358b69c46a3e772fe05efc22f3d4ffc1caeeaad7aacdc7abd503a7ad0545f8bd7d22bf351dcb6df76f812fa4d45c34d65df0 SHA512 a672ccefd0730a8166fef1d4e39f9034d9ae426a3f5e28d1f4169fa5c5790767693f281d890e7804773b34acdb0ae1febac33cde8c50c0044a5a6152c7209ec2 DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513 +DIST windows-0.52.0.crate 11843715 BLAKE2B 0d35225f5d61f71b0cb768f03825031101e05c83d7f12e05cb17b14ba28e6bc6a3d5aaee5ba07e54c1a773b6eadde4ce3523ab87e8e313e5578e2de01a3dcdc7 SHA512 8a9d443cfae3b44ab50bdffd70b70ea3b3d536f464e4beb7cfa9e15eb4e4505cbac20266b44d589bb7231790a87f473ead6d2160b8cd18d62f31b78bf61417da DIST windows-core-0.51.1.crate 42364 BLAKE2B 0227e8cc033f40b644879ce4a86f17b9552076378eb6cc6c8cedaa15602ef3ce0deb1ca48c6a7b4276af2bc2e0434e76193649051d7a2f78695f60400d00ccff SHA512 90615ed84f11fdfe0725a4a8b112e45f93ae6cb7e65c16636f85217369fd8b708553ae5bd28aff66e18b180ffa3c0f6820a94022fc5eb202b4f8358f8926fde6 +DIST windows-core-0.52.0.crate 42154 BLAKE2B 9670bf02261b4ab2a24eff97dad11e305deac823cacfae286965b62b11bc035f19a55ca710eaa4359c8a4905433a94fe62a836b77ddd68f244ad6ac2c9657f58 SHA512 0c8f1c7e63c11bdcf1361150ecc83abbfba8da2c6d28523799bd286bf8aa1df61ffed19175e8cb3ef516a9afb6248b640c2101a2e0c09a99bfd7a18c6741bd36 DIST windows-sys-0.48.0.crate 2628884 BLAKE2B 551e900de4f67187ef034b60df9fd0e0d8f82a3100ef28e1eabd543ac129d882dc86ffcc1714071aba09e4cb2ae2d2f07ace1a32b99fd989ce525cf05991edab SHA512 bdf534bcf3face31e9ebe11427a911a53f89f4ff5eaea8cccd094e139bfe14b2aec602b1cab1df774794d999477439d9adc6b627a8e33c20334fc348ba2c47ed DIST windows-sys-0.52.0.crate 2576877 BLAKE2B 69d6b560ccfc8f679e2678663ba606060d71fa28efa82c8aef8cceaa2c63b06f2052764d60163964f939649a26bbec6361ee4b094555e941fae92070db566980 SHA512 24ee0df246c2b456a4987a9124786a28acd358768cc7d1305bccd81bc5bb8822b81a03fb18d35174a520b911c6d9b685f81a34ab319fee13da3b985273584f03 DIST windows-targets-0.48.5.crate 6904 BLAKE2B 7396bb210f37bd51da86f39fca3425c8f6610721d5c4e94f9fafa0a8a8046303b3fcc6979146bcfaa32f4406d242a0455f6cbb220f84c6ff84650e755acf5223 SHA512 e079eeef255a046be7f8e6a31c14f7b230254ebcf05eed2944827bb3d2a0dc30940d87593cf544d5e7ef35f6312b99430efcfb01421d91b02bb9c4bef7d98709 @@ -207,7 +328,11 @@ DIST windows_x86_64_gnullvm-0.52.0.crate 430165 BLAKE2B af9345a1f6e0ed1392ca1534 DIST windows_x86_64_msvc-0.48.5.crate 798412 BLAKE2B 8abc0721e2fb337fe17c91d278947d36122d9045b839ba0cf3e690202d242265b676f23cc301da5f9d98c56ca4ecb76f7d6f072ee71bf986a1deca87020b90e5 SHA512 fa1c5cd14ca2ff0082e2504cf59d317dc4dc6f7138d35c12f95d4476a9c13d8b7f5537d0ee251eee7c99411ad31b22263171b7fbd391daa5d3ea3488ceaa61a0 DIST windows_x86_64_msvc-0.52.0.crate 821600 BLAKE2B cc448b65f98fc0fc4949ae622b7020d2dae927ae45310649f6ef71809740eda9d3db0fc035676c201fd9ab9639e9e7f21e2e992b4c789542f12b419d2c752179 SHA512 3aaee31533a1a48a6ab5cd15b3cadfbd906a93a153e53919d0aa74e440d11e29830554e4e014c215f5b88a475bb733fa8ba4ce9d773d3e23a40ea9ad37ddd0a7 DIST winnow-0.5.19.crate 147982 BLAKE2B 99b9625ee4c8b6236b1acfd29c267ac4d17c5f911e291d39f71f85a097222a4fbe48606c02acab6d70eccab710852782096bcda90ebe6cefb44ed9d48923ce0b SHA512 dee415c9e901d91d2a4646d1198c5b959c8e7a9ee5b3bfcb5c78159d57fc3905dda80e1c5b45a8a18e024a3e2394022772fecbdb8158ea1513a953c93f48d9a0 +DIST winnow-0.6.5.crate 159316 BLAKE2B d28c6a069e3d557335c09ae04f1d90a9086b1744d711e259da230c031a0302e270e304f8f9e8bc690c01cedcf07b46e05938ab3468b3e388ae8c51ac361b6408 SHA512 5395db16797beb158e9458099279abf53c5ea62c65584bbb9e0111213ab21c88cd0b0674062757e57ceb6c762a349f22db6ef60deef866fe15ebb0818287ab99 DIST winreg-0.50.0.crate 29703 BLAKE2B db9a968ef96cc07bc1088831affc4627e09c7ab8170a54fdf70a599c2d6180a8a9ac46b6304b61fdd2fac96e01bb004ebd8051940300c7b52c5b7b7975732d11 SHA512 2f52a9e3ab794665263499c88dfdf06009c6477d180a90ebbe86e786ae7f5003c9dc8b3c26224024e79450f3b94688000458f2ea8b1ae1c3691453c3d4df4787 +DIST wintun-0.4.0.crate 782893 BLAKE2B 73e80eba286644f855e0e910644f66da9b5c06876ef3266959fce91a11705f7c990ad79a99dcbe5a0b9f4346d1c4769a685de329f2cdc4d5a14edaac183a0447 SHA512 cb0c4e1793ccfb585217549e959df00e2b137aeaa7957b8f72d17951a184281557e097eba6a1cf5b3c7aa47761cf1011cd6d4ae8fff7961ffc4a4b5c1a4c6f31 DIST yansi-0.5.1.crate 16525 BLAKE2B 3b5a93b98293daae72f53bf3f13bfc05feba8d5b27921f79595f7448fbcb9a0dfa6cd70f467c5735b914c46b7d3592e6cce080c540a458a904308525eb3aa839 SHA512 7b33005a066cc612408a65df6533e8718d1de43efc0fd57416a19dc2b811497570e6e18f100fb26073565e395e711518c27de7d644ae64777713f1a102eb16d2 DIST zerocopy-0.7.26.crate 128648 BLAKE2B cd26ca75197d2f74e091359f72743b8b0c92774ce4466ee47bd23854dd7c5fdf09be89ee2412bdb0e52b3c73a169b8d5c172c13285a8931c74f106970deafa60 SHA512 3789e845ec87beaf84ff9cf8d72e9968a2c7ed2350cca24836b24c16b791867db0d9a580fdb7aa2187b35ac88723932498c44d10eccc756ae92f31a97ac6771b +DIST zerocopy-0.7.32.crate 151096 BLAKE2B 12c7c329ec0e0865467af08306ff4b55ce1e39fd77b094ee48ed9c6e266dfa807bda9ea72a3f7ea989916327f4d9e803d8868995728bfe2fb1c2dc1e5ecff78e SHA512 6729b05eb88029555b88c75feff4f8bc28ad9675edb02b07486381f775c8650c95e2e59612906bd9c34c5e390fd339857ca91573ee9f9ca7948572cff4171c82 DIST zerocopy-derive-0.7.26.crate 528381 BLAKE2B 4be2168e3af5a5c541be49159f7d37405eceaa9e914d670899c814076e7240781d580007d906f8433e469ffad8e7abed3e18dc8b5e80ec09837f13a28976af57 SHA512 1e28e957d1a9cb5164bc839750ecad26ccd280dc9f5ee58a02a09d2135dc097991be2755d7b87f360863f1ab030f772963677d61861f7d33699a631eb9026829 +DIST zerocopy-derive-0.7.32.crate 37623 BLAKE2B 8b583d39d7bf9c3dbbba578120751c664f87363c5ba3fc45f6506a4059b9e599c43d9fc7bd498a257ff7c9d872af77d39bebdb0e65fb8009eaa2ae9903dece46 SHA512 3ce8528871fd18d6abe92b98503927451d25791c9c4af0ba39a3b6ba2006030bdc137084d080e9b1ac8b5ddf5f2121e0a3ef34bb2033a040f2c72c8149a9fc0d diff --git a/net-analyzer/trippy/trippy-0.10.0.ebuild b/net-analyzer/trippy/trippy-0.10.0.ebuild new file mode 100644 index 000000000000..a8d923a31031 --- /dev/null +++ b/net-analyzer/trippy/trippy-0.10.0.ebuild @@ -0,0 +1,296 @@ +# Copyright 2023-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +CRATES=" + addr2line@0.21.0 + adler@1.0.2 + ahash@0.8.7 + aho-corasick@1.1.2 + allocator-api2@0.2.16 + android-tzdata@0.1.1 + android_system_properties@0.1.5 + anstream@0.6.11 + anstyle-parse@0.2.3 + anstyle-query@1.0.2 + anstyle-wincon@3.0.2 + anstyle@1.0.6 + anyhow@1.0.81 + arrayvec@0.7.4 + async-trait@0.1.77 + autocfg@1.1.0 + backtrace@0.3.69 + base64@0.21.7 + bitflags@1.3.2 + bitflags@2.5.0 + bumpalo@3.14.0 + bytes@1.5.0 + c2rust-bitfields-derive@0.18.0 + c2rust-bitfields@0.18.0 + caps@0.5.5 + cassowary@0.3.0 + castaway@0.2.2 + cc@1.0.83 + cfg-if@1.0.0 + cfg_aliases@0.1.1 + chrono@0.4.37 + clap@4.4.18 + clap_builder@4.4.18 + clap_complete@4.4.10 + clap_derive@4.4.7 + clap_lex@0.6.0 + colorchoice@1.0.0 + comfy-table@7.1.0 + compact_str@0.7.1 + core-foundation-sys@0.8.6 + crossbeam-channel@0.5.11 + crossbeam-deque@0.8.5 + crossbeam-epoch@0.9.18 + crossbeam-queue@0.3.11 + crossbeam-utils@0.8.19 + crossbeam@0.8.4 + crossterm@0.27.0 + crossterm_winapi@0.9.1 + csv-core@0.1.11 + csv@1.3.0 + darling@0.20.5 + darling_core@0.20.5 + darling_macro@0.20.5 + data-encoding@2.5.0 + deranged@0.3.11 + derive_more@0.99.17 + diff@0.1.13 + dns-lookup@2.0.4 + downcast@0.11.0 + either@1.10.0 + encoding_rs@0.8.33 + encoding_rs_io@0.1.7 + enum-as-inner@0.6.0 + equivalent@1.0.1 + errno@0.3.8 + etcetera@0.8.0 + fixedbitset@0.4.2 + fnv@1.0.7 + form_urlencoded@1.2.1 + fragile@2.0.0 + futures-channel@0.3.30 + futures-core@0.3.30 + futures-io@0.3.30 + futures-sink@0.3.30 + futures-task@0.3.30 + futures-util@0.3.30 + getrandom@0.2.12 + gimli@0.28.1 + hashbrown@0.12.3 + hashbrown@0.14.3 + heck@0.4.1 + hermit-abi@0.3.5 + hex-literal@0.4.1 + hex@0.4.3 + hickory-proto@0.24.0 + hickory-resolver@0.24.0 + home@0.5.9 + hostname@0.3.1 + humantime@2.1.0 + iana-time-zone-haiku@0.1.2 + iana-time-zone@0.1.60 + ident_case@1.0.1 + idna@0.4.0 + idna@0.5.0 + indexmap@1.9.3 + indexmap@2.2.6 + indoc@2.0.4 + ipconfig@0.3.2 + ipnet@2.9.0 + ipnetwork@0.20.0 + itertools@0.12.1 + itoa@1.0.10 + js-sys@0.3.68 + lazy_static@1.4.0 + libc@0.2.153 + libloading@0.8.1 + linked-hash-map@0.5.6 + linux-raw-sys@0.4.13 + lock_api@0.4.11 + log@0.4.20 + lru-cache@0.1.2 + lru@0.12.2 + match_cfg@0.1.0 + matchers@0.1.0 + maxminddb@0.24.0 + memchr@2.7.1 + memoffset@0.9.0 + miniz_oxide@0.7.2 + mio@0.8.11 + mockall@0.12.1 + mockall_derive@0.12.1 + nix@0.28.0 + nu-ansi-term@0.46.0 + num-conv@0.1.0 + num-traits@0.2.18 + num_cpus@1.16.0 + object@0.32.2 + once_cell@1.19.0 + overload@0.1.1 + parking_lot@0.12.1 + parking_lot_core@0.9.9 + paste@1.0.14 + percent-encoding@2.3.1 + petgraph@0.6.4 + pin-project-lite@0.2.13 + pin-utils@0.1.0 + powerfmt@0.2.0 + ppv-lite86@0.2.17 + predicates-core@1.0.6 + predicates-tree@1.0.9 + predicates@3.1.0 + pretty_assertions@1.4.0 + proc-macro2@1.0.78 + quick-error@1.2.3 + quote@1.0.35 + rand@0.8.5 + rand_chacha@0.3.1 + rand_core@0.6.4 + ratatui@0.26.1 + redox_syscall@0.4.1 + regex-automata@0.1.10 + regex-automata@0.4.5 + regex-syntax@0.6.29 + regex-syntax@0.8.2 + regex@1.10.3 + resolv-conf@0.7.0 + rustc-demangle@0.1.23 + rustix@0.38.31 + rustversion@1.0.14 + ryu@1.0.16 + scopeguard@1.2.0 + serde@1.0.197 + serde_derive@1.0.197 + serde_json@1.0.115 + serde_spanned@0.6.5 + serde_with@3.7.0 + serde_with_macros@3.7.0 + serde_yaml@0.9.33 + sharded-slab@0.1.7 + signal-hook-mio@0.2.3 + signal-hook-registry@1.4.1 + signal-hook@0.3.17 + slab@0.4.9 + smallvec@1.13.1 + socket2@0.5.6 + stability@0.1.1 + static_assertions@1.1.0 + strsim@0.10.0 + strum@0.25.0 + strum@0.26.2 + strum_macros@0.25.3 + strum_macros@0.26.1 + syn@1.0.109 + syn@2.0.48 + terminal_size@0.3.0 + termtree@0.4.1 + test-case-core@3.3.1 + test-case-macros@3.3.1 + test-case@3.3.1 + thiserror-impl@1.0.58 + thiserror@1.0.58 + thread_local@1.1.7 + time-core@0.1.2 + time-macros@0.2.17 + time@0.3.34 + tinyvec@1.6.0 + tinyvec_macros@0.1.1 + tokio-macros@2.2.0 + tokio-util@0.7.10 + tokio@1.37.0 + toml@0.8.12 + toml_datetime@0.6.5 + toml_edit@0.22.8 + tracing-attributes@0.1.27 + tracing-chrome@0.7.2 + tracing-core@0.1.32 + tracing-log@0.2.0 + tracing-serde@0.1.3 + tracing-subscriber@0.3.18 + tracing@0.1.40 + tun2@1.2.7 + unicode-bidi@0.3.15 + unicode-ident@1.0.12 + unicode-normalization@0.1.22 + unicode-segmentation@1.11.0 + unicode-width@0.1.11 + unsafe-libyaml@0.2.11 + url@2.5.0 + utf8parse@0.2.1 + valuable@0.1.0 + version_check@0.9.4 + wasi@0.11.0+wasi-snapshot-preview1 + wasm-bindgen-backend@0.2.91 + wasm-bindgen-macro-support@0.2.91 + wasm-bindgen-macro@0.2.91 + wasm-bindgen-shared@0.2.91 + wasm-bindgen@0.2.91 + widestring@1.0.2 + winapi-i686-pc-windows-gnu@0.4.0 + winapi-x86_64-pc-windows-gnu@0.4.0 + winapi@0.3.9 + windows-core@0.52.0 + windows-sys@0.48.0 + windows-sys@0.52.0 + windows-targets@0.48.5 + windows-targets@0.52.0 + windows@0.52.0 + windows_aarch64_gnullvm@0.48.5 + windows_aarch64_gnullvm@0.52.0 + windows_aarch64_msvc@0.48.5 + windows_aarch64_msvc@0.52.0 + windows_i686_gnu@0.48.5 + windows_i686_gnu@0.52.0 + windows_i686_msvc@0.48.5 + windows_i686_msvc@0.52.0 + windows_x86_64_gnu@0.48.5 + windows_x86_64_gnu@0.52.0 + windows_x86_64_gnullvm@0.48.5 + windows_x86_64_gnullvm@0.52.0 + windows_x86_64_msvc@0.48.5 + windows_x86_64_msvc@0.52.0 + winnow@0.6.5 + winreg@0.50.0 + wintun@0.4.0 + yansi@0.5.1 + zerocopy-derive@0.7.32 + zerocopy@0.7.32 +" + +inherit cargo fcaps + +DESCRIPTION="A network diagnostic tool" +HOMEPAGE="https://trippy.cli.rs/ https://github.com/fujiapple852/trippy" +SRC_URI=" + https://github.com/fujiapple852/trippy/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz + ${CARGO_CRATE_URIS} +" + +LICENSE="Apache-2.0" +# Dependent crate licenses +LICENSE+=" + ISC MIT Unicode-DFS-2016 WTFPL-2 +" +SLOT="0" +KEYWORDS="~amd64" +IUSE="suid" + +FILECAPS=( cap_net_raw+p usr/bin/trip ) + +QA_FLAGS_IGNORED="usr/bin/trip" + +src_install() { + cargo_src_install + + dodoc README.md CHANGELOG.md + + if use suid; then + fperms u+s usr/bin/trip + fi +} diff --git a/net-analyzer/trippy/trippy-0.9.0.ebuild b/net-analyzer/trippy/trippy-0.9.0.ebuild index c6c9f913eefe..e1dfbdbbc957 100644 --- a/net-analyzer/trippy/trippy-0.9.0.ebuild +++ b/net-analyzer/trippy/trippy-0.9.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 2023 Gentoo Authors +# Copyright 2023-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -234,7 +234,7 @@ LICENSE+=" || ( Apache-2.0 Boost-1.0 ) " SLOT="0" -KEYWORDS="~amd64" +KEYWORDS="amd64" IUSE="suid" FILECAPS=( cap_net_raw+p usr/bin/trip ) diff --git a/net-analyzer/vnstat/Manifest b/net-analyzer/vnstat/Manifest index f0f9856c1819..97f5f0da7a9d 100644 --- a/net-analyzer/vnstat/Manifest +++ b/net-analyzer/vnstat/Manifest @@ -1,4 +1,2 @@ -DIST vnstat-2.11.tar.gz 312821 BLAKE2B 6eeed45d628641c9d88cf33ae1fc14871109b1e9fd0ac4a46fe8e2c194bb4600878b69408ed177bcde38ca859d0a3165d0095cab9b0bb6c036f7788fbfcb47e6 SHA512 d1ec9fd7e57598712df50601247c9904a371b7a2e5cb33efab2d44d330294d8ea3facf914de3d8d3a0381061b14642c613948478bf0c8d7f5e599a83321aad34 -DIST vnstat-2.11.tar.gz.asc 833 BLAKE2B ded1462ee51dc6fde349ae6e21a6b45bdab268ff024804394268f515b618beead7d4582721ffa26d3f9cc7a8434a0f7145d31dcf9c95c575145e4903bdbd5460 SHA512 8b15f73d412e05c50e2e5a514bc96daa2dceae49af95ed7f09e742f3bbc8b34b856bb2d0a33a7146a8b19f714d47863388cfcb63821dac670c9e020ca60f4785 DIST vnstat-2.12.tar.gz 325227 BLAKE2B af6982bc6da66ed2cebfe99e1b46a540528886d1c6e7a5174a3083a315804cb42c2395f3a0f5df552e8fd6b7823a01873fc5f9fb2178529c53481a67552dab35 SHA512 68f8b7d8f30338fdd444621bf68a9157dd7b9be04b2156e27399f2a8b7ef67b5015067bf71370994da1b3aeaf88264205e797926e18a6e51fa9b963dcdd6d969 DIST vnstat-2.12.tar.gz.asc 833 BLAKE2B 8397785826fe885c6ca74b09d81f57e5142dd4c73362c7e54af6d9c9c74e1e3dc8c58df39c30e31198029a95b3fea5a09ec703773f48958ed1d8f59fed8f0696 SHA512 4d0c4c0b2a0d55fbd15f3842a4900ed6cacff2b9437c371973bb053fc69320fbec51564fd480000a437d13edb0c8bb33c16acff9212a4c3ca960fc7bd2940f54 diff --git a/net-analyzer/vnstat/vnstat-2.11.ebuild b/net-analyzer/vnstat/vnstat-2.11.ebuild deleted file mode 100644 index 812aa69dbc7a..000000000000 --- a/net-analyzer/vnstat/vnstat-2.11.ebuild +++ /dev/null @@ -1,90 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit systemd tmpfiles - -DESCRIPTION="Console-based network traffic monitor that keeps statistics of network usage" -HOMEPAGE="https://humdi.net/vnstat/" - -if [[ ${PV} == *9999 ]] ; then - EGIT_REPO_URI="https://github.com/vergoh/vnstat" - inherit git-r3 -else - VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/teemutoivola.asc - inherit verify-sig - - SRC_URI=" - https://humdi.net/vnstat/${P}.tar.gz - https://github.com/vergoh/vnstat/releases/download/v${PV}/${P}.tar.gz - verify-sig? ( - https://humdi.net/vnstat/${P}.tar.gz.asc - https://github.com/vergoh/vnstat/releases/download/v${PV}/${P}.tar.gz.asc - ) - " - - KEYWORDS="amd64 arm arm64 hppa ~mips ppc ppc64 ~riscv sparc x86" - - BDEPEND="verify-sig? ( sec-keys/openpgp-keys-teemutoivola )" -fi - -LICENSE="GPL-2" -SLOT="0" -IUSE="gd selinux test" -RESTRICT="!test? ( test )" - -RDEPEND=" - acct-group/vnstat - acct-user/vnstat - dev-db/sqlite - gd? ( media-libs/gd[png] ) -" -DEPEND=" - ${RDEPEND} - test? ( dev-libs/check ) -" -RDEPEND+=" selinux? ( sec-policy/selinux-vnstatd )" - -PATCHES=( - "${FILESDIR}"/${PN}-2.9-conf.patch -) - -src_compile() { - emake \ - ${PN} \ - ${PN}d \ - $(usev gd ${PN}i) -} - -src_install() { - use gd && dobin vnstati - dobin vnstat vnstatd - - exeinto /usr/share/${PN} - newexe "${FILESDIR}"/vnstat.cron-r1 vnstat.cron - - insinto /etc - doins cfg/vnstat.conf - fowners root:vnstat /etc/vnstat.conf - - keepdir /var/lib/vnstat - fowners vnstat:vnstat /var/lib/vnstat - - newconfd "${FILESDIR}"/vnstatd.confd-r1 vnstatd - newinitd "${FILESDIR}"/vnstatd.initd-r2 vnstatd - - systemd_newunit "${FILESDIR}"/vnstatd.systemd vnstatd.service - newtmpfiles "${FILESDIR}"/vnstatd.tmpfile vnstatd.conf - - use gd && doman man/vnstati.1 - - doman man/vnstat.1 man/vnstatd.8 - - newdoc INSTALL README.setup - dodoc CHANGES README UPGRADE FAQ examples/vnstat.cgi -} - -pkg_postinst() { - tmpfiles_process vnstatd.conf -} diff --git a/net-analyzer/vnstat/vnstat-2.12.ebuild b/net-analyzer/vnstat/vnstat-2.12.ebuild index a5d5e163077a..7403fef778be 100644 --- a/net-analyzer/vnstat/vnstat-2.12.ebuild +++ b/net-analyzer/vnstat/vnstat-2.12.ebuild @@ -24,7 +24,7 @@ else ) " - KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86" + KEYWORDS="amd64 arm arm64 hppa ~mips ppc ppc64 ~riscv sparc x86" BDEPEND="verify-sig? ( sec-keys/openpgp-keys-teemutoivola )" fi diff --git a/net-analyzer/wapiti/Manifest b/net-analyzer/wapiti/Manifest index cbb696ce4d8b..4ca8b3c31830 100644 --- a/net-analyzer/wapiti/Manifest +++ b/net-analyzer/wapiti/Manifest @@ -1 +1,2 @@ DIST wapiti3-3.1.6.tar.gz 538064 BLAKE2B fca98e05af7e4979ce5cc1360c565748b720f84e640accc9abd6d60017696827fb119228fec37bcf905e6e9f29c07ad5b9041a16fb49a6204777df07dd642bbd SHA512 8017d88c35a232f20f97297f5955154bead777a1b3d3937d29e6a39d2eeb5167764aa81286bfca5b9d200a29c25a6173052ddd8cbfebc1cb18aa84c0e2bb0e22 +DIST wapiti3-3.1.7.tar.gz 537866 BLAKE2B 2c58e20b5f754d5c461103a457aa18cfeb93b4ee7ca4c7525e29642f9cd027ece6f64a547b43b4c257c9cf27ae562ef9cb130e5635f1c13c9fdcda6b3f0a4ebf SHA512 d5a49a0f4c361f699f792b2b0c19a3ca65131534e5b244a8692137d1c63f120d33c47de41a6e4639316b63dd301396ae4f0b26f41259077ca34fba5065a36857 diff --git a/net-analyzer/wapiti/wapiti-3.1.6.ebuild b/net-analyzer/wapiti/wapiti-3.1.6.ebuild index e8ed137b349e..cf4e1d331985 100644 --- a/net-analyzer/wapiti/wapiti-3.1.6.ebuild +++ b/net-analyzer/wapiti/wapiti-3.1.6.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 DISTUTILS_USE_PEP517=setuptools # No 3.11 in loguru -PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_COMPAT=( python3_{10..11} ) PYTHON_REQ_USE='xml(+)' inherit distutils-r1 @@ -13,7 +13,7 @@ inherit distutils-r1 MY_P=${PN}3-${PV} DESCRIPTION="Web-application vulnerability scanner" HOMEPAGE="https://wapiti.sourceforge.net/" -SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz" +SRC_URI="https://downloads.sourceforge.net/${PN}/${MY_P}.tar.gz" LICENSE="GPL-2" SLOT="0" diff --git a/net-analyzer/wapiti/wapiti-3.1.7.ebuild b/net-analyzer/wapiti/wapiti-3.1.7.ebuild new file mode 100644 index 000000000000..bc4e1553cee3 --- /dev/null +++ b/net-analyzer/wapiti/wapiti-3.1.7.ebuild @@ -0,0 +1,68 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISTUTILS_USE_PEP517=setuptools +# Deps missing for 3.12 +PYTHON_COMPAT=( python3_{10..11} ) +PYTHON_REQ_USE='xml(+)' + +inherit distutils-r1 + +MY_P=${PN}3-${PV} +DESCRIPTION="Web-application vulnerability scanner" +HOMEPAGE="https://wapiti.sourceforge.net/" +SRC_URI="https://downloads.sourceforge.net/${PN}/${MY_P}.tar.gz" +S=${WORKDIR}/${MY_P} + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64" +# Requires httpx-ntlm (to package) +#IUSE="ntlm" +IUSE="test" + +# httpx requires brotli and socks, so depending on +# dev-python/socksio and dev-python/brotlicffi +RDEPEND=" + >=dev-python/aiocache-0.12.0[${PYTHON_USEDEP}] + >=dev-python/aiohttp-3.8.4[${PYTHON_USEDEP}] + >=dev-python/aiosqlite-0.17.0[${PYTHON_USEDEP}] + >=dev-python/arsenic-21.8[${PYTHON_USEDEP}] + >=dev-python/beautifulsoup4-4.10.0[${PYTHON_USEDEP}] + dev-python/brotlicffi[${PYTHON_USEDEP}] + >=dev-python/browser-cookie3-0.16.2[${PYTHON_USEDEP}] + >=dev-python/dnspython-2.1.0[${PYTHON_USEDEP}] + >=dev-python/h11-0.14[${PYTHON_USEDEP}] + >=dev-python/httpx-0.23.3[${PYTHON_USEDEP}] + >=dev-python/loguru-0.5.3[${PYTHON_USEDEP}] + >=dev-python/mako-1.1.4[${PYTHON_USEDEP}] + >=dev-python/markupsafe-2.1.1[${PYTHON_USEDEP}] + >=dev-python/pyasn1-0.4.8[${PYTHON_USEDEP}] + >=dev-python/requests-1.2.3[${PYTHON_USEDEP}] + dev-python/socksio[${PYTHON_USEDEP}] + >=dev-python/sqlalchemy-1.4.26[${PYTHON_USEDEP}] + >=dev-python/tld-0.12.5[${PYTHON_USEDEP}] + >=dev-python/typing-extensions-4.4.0[${PYTHON_USEDEP}] + >=dev-python/yaswfp-0.9.3[${PYTHON_USEDEP}] + >=net-proxy/mitmproxy-9.0.0[${PYTHON_USEDEP}]" + +distutils_enable_tests pytest +# Tests also require unpackaged respx +BDEPEND+=" test? ( + dev-python/pytest-asyncio[${PYTHON_USEDEP}] + dev-python/pytest-cov[${PYTHON_USEDEP}] + dev-python/responses[${PYTHON_USEDEP}] + )" +# Many tests require execution of local test php server +RESTRICT="test" + +PATCHES=( "${FILESDIR}"/${PN}-3.1.6-setup_scripts.patch ) + +python_prepare_all() { + sed -e 's/"pytest-runner"//' \ + -e "/DOC_DIR =/s/wapiti/${PF}/" \ + -i setup.py || die + distutils-r1_python_prepare_all +} diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest index d6827f8a458e..90f0c130154f 100644 --- a/net-analyzer/wireshark/Manifest +++ b/net-analyzer/wireshark/Manifest @@ -1,4 +1,10 @@ DIST wireshark-4.0.11-signatures.txt 2521 BLAKE2B 3fce906f2050fb990d80b912919c46d0e6e087c66a36bc18e8c57fa19d7ef7e966a26842770370e1211c4e4644deed31091ec929c53c80bfcdb1e472b149bd7c SHA512 d9b15d14b8e061bf2f4aaf0121c295db1992b7cbbb56e67b48fff4110e897f4f0d40304bdeaced2031bc802796a6f3ea7ba62a730f82d7469658924313f301a4 DIST wireshark-4.0.11.tar.xz 43153680 BLAKE2B 1a90b9c20773758dbcfad85ea9a5c180e846307701ce75a471699544507b6dcf7cab611b5d71056d68ec1646a951729d7df416ef1a9a473bf96d9bf5a7066ebc SHA512 c027b279f9bc761c5c701131df9e57d3f2568129f63c919cd744f6626843eb0e000caebc3e01c9a10eedad35874c01c880d2c736b62f8e841da35c375a37c53f -DIST wireshark-4.1.0-signatures.txt 2706 BLAKE2B bcc55c14a68aead0061041e39114a04531440d98b24e271d731ff6baa0047adac7871f0e089b326d29273bad71f8fa9fa482ebac21ba7635e9a251831d387a34 SHA512 ae0eb7a36f554d27fecd47cb471f3c85b8bd53030a6dc872f74b33a46eee004910a3c095c16d8eed56a7c2e6104084e632580b555f29e77a4b8c04c50b53019a -DIST wireshark-4.1.0.tar.xz 44601140 BLAKE2B c20a0a917c94554d593986e9058cee7f10c68a0e73a3b8a69e87c40f5932d4f33da1d3ba8ed5177094058bd43ba9942b21a2f3fe6e04a751ffb75e9e9b524627 SHA512 d3253d26d53dbeaa14f7d7dd0956124de3f7fe1d683f2041c6d1420271ba9601248c904a0927160194ca54aa8752526bd5de643d553e55ded8478caa54cd9bb0 +DIST wireshark-4.0.15-signatures.txt 2521 BLAKE2B 2ca4163fff33708288b355978220014707fa8ba84ea2237a9a4dcb9da8cd7986811ee3805416cd82d348968edc9d873fa63b5fd121f40e623f0099ab1fd01716 SHA512 e47ad252b260016d7cce60f53c6d308a36c1ae8c194359212fa38ec934d961bba6e1ace53d1ff3c909c5c5cad09ff8c1ded39d9ce7cac10b1b987eeee594c565 +DIST wireshark-4.0.15.tar.xz 43197644 BLAKE2B 6720ee6c879a0005c37452da32bc8e99051baf3eadd53d42b5e93a7f7e2c3cf63657393fd2d4e2d245f1b33ffc10b52c6e5af9fd527e78497dc8d1ad9405473b SHA512 6f1915c48860f79c25df8ac753aac4391393db9cf6d4b3d4ba11499fafb5cae8c1e56b7f735ea14b9f18560cb4156a3cbb65c567102db52b40e5d1f53e00be7a +DIST wireshark-4.2.4-signatures.txt 2706 BLAKE2B 169c7eea2d89f4eedc58e833512cf813dfe76cbb76eb505d47153c1dc55f6d838b7a0187fdee4dae214ea04a3e062dd13f64df460fb16c042a889aac28e4428e SHA512 273182a2364b46bdbe89928e4776cf61ff70b91fcea9cc730ace6cd3501b51388ca9a85552b2ee26a68da42d033fdc8b2cfa279f0c52cc4cdd5278fbccaa8fb9 +DIST wireshark-4.2.4.tar.xz 44986232 BLAKE2B 03806a167a4b055409fadbc54ba338c9d2790df3ac2b9fb547c640c67d7bee6a3f8f19d30549228e494cabf8d303cef42ff098a9e1f45b092589643e568632f5 SHA512 963ac6938c08c6526240c270977057eeff7814686e11d1f3c6641a4838eb66f8d4349e48aa7373d25a8ca8911ad12eb8162f1c55af043f571d74979ddf4fd9a6 +DIST wireshark-4.2.5-signatures.txt 2706 BLAKE2B d10f6e9b4d8bcd8f0a30501bbbfee9ee696d82c7ca95957532f6614905e7836e5865d1b7093ca6aab2ebc1da5365648803f8b20508c95cdf5b42e8ac8e288f65 SHA512 050cb90e8958b73428fc7dc6c9801ba3b361f8cf4df8f22505789d759edf7967867915a0cbf351fa251d4d28b211920a3fb34e8fa209d475a10b4bcd2957fcc0 +DIST wireshark-4.2.5.tar.xz 45014156 BLAKE2B 536743a7e402f7a511d7612454d9770f0e67a0f2ebc1ab49912b12965e605f2082eff37f41f7642b89859257926ce13d88728194b79cbe5dcf6b15d72516c5fc SHA512 92a8fb08af5a1da30ca469fa45bd982638069907d289fa716068ac71141b7d9726ca0b01adc2910da4c928db23760da75a1c6a7c2eb795ac66ba003a90abb87b +DIST wireshark-4.2.6-signatures.txt 2706 BLAKE2B b9666d6aaef774e08ec903bbda90067adaa357cee65cdd6b711b6caef7b1cd540290a93d80d2f3f29c861d212c97793303e51fc8f297d7945c379a237acfa3f8 SHA512 287342d1ccb36326a9bab5e50c48442a41b599e258611e9046eedb078a84f2840d16f29f91b1259b3b4d37486e48d85596192ea5c6b9d1fa7ad3e78543193e0b +DIST wireshark-4.2.6.tar.xz 45015272 BLAKE2B 880acf82c7e535b89ce8b41293c90197825ffe1132720337e77b3dcee0eaf476cb3faa6f9b42d3864e9f6892e624d0b286afdaf6bbe7e6b60483296d087a4bc3 SHA512 265bbc50787ba15646a8a4602e2598bb58494aee496b14a2392293862725320674f7084c7c00de5f9db41dbfc2eb23d88fd8e6b72f3c4036067192b44da22516 diff --git a/net-analyzer/wireshark/files/wireshark-4.2.5-http2-test.patch b/net-analyzer/wireshark/files/wireshark-4.2.5-http2-test.patch new file mode 100644 index 000000000000..f32109237d6d --- /dev/null +++ b/net-analyzer/wireshark/files/wireshark-4.2.5-http2-test.patch @@ -0,0 +1,31 @@ +https://gitlab.com/wireshark/wireshark/-/merge_requests/15824 + +From cc8264d68f638c72ada1e94a9913902462c1a25a Mon Sep 17 00:00:00 2001 +From: Sam James <sam@gentoo.org> +Date: Sat, 1 Jun 2024 02:25:05 +0100 +Subject: [PATCH] test: skip test_sharkd_req_follow_http2 test if no http2 + support + +Originally reported downstream in Gentoo at https://bugs.gentoo.org/933290. + +This is the same kind of thing as https://gitlab.com/wireshark/wireshark/-/merge_requests/9029. +--- a/test/suite_sharkd.py ++++ b/test/suite_sharkd.py +@@ -1174,7 +1174,13 @@ class TestSharkd: + }, + )) + +- def test_sharkd_req_follow_http2(self, check_sharkd_session, capture_file): ++ def test_sharkd_req_follow_http2(self, check_sharkd_session, capture_file, features): ++ # If we don't have nghttp2, we output the compressed headers. ++ # We could test against the expected output in that case, but ++ # just skip for now. ++ if not features.have_nghttp2: ++ pytest.skip('Requires nghttp2.') ++ + check_sharkd_session(( + {"jsonrpc":"2.0", "id":1, "method":"load", + "params":{"file": capture_file('quic-with-secrets.pcapng')} +-- +2.45.1 + diff --git a/net-analyzer/wireshark/metadata.xml b/net-analyzer/wireshark/metadata.xml index c9327b01fd97..50ce497801f7 100644 --- a/net-analyzer/wireshark/metadata.xml +++ b/net-analyzer/wireshark/metadata.xml @@ -36,6 +36,7 @@ <flag name="dpauxmon">Install dpauxmon, an external capture interface (extcap) that captures DisplayPort AUX channel data from linux kernel drivers</flag> <flag name="dumpcap">Install dumpcap, to dump network traffic from inside wireshark</flag> <flag name="editcap">Install editcap, to edit and/or translate the format of capture files</flag> + <flag name="http3">Install <pkg>net-libs/nghttp3</pkg> for enhanced HTTP3 analysis</flag> <flag name="ilbc">Build with iLBC support in RTP Player using <pkg>media-libs/libilbc</pkg></flag> <flag name="libxml2">Use <pkg>dev-libs/libxml2</pkg> for handling XML configuration in dissectors</flag> <flag name="maxminddb">Use <pkg>dev-libs/libmaxminddb</pkg> for IP address geolocation</flag> diff --git a/net-analyzer/wireshark/wireshark-4.0.15.ebuild b/net-analyzer/wireshark/wireshark-4.0.15.ebuild new file mode 100644 index 000000000000..f3715b72f3e7 --- /dev/null +++ b/net-analyzer/wireshark/wireshark-4.0.15.ebuild @@ -0,0 +1,344 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +LUA_COMPAT=( lua5-{1..2} ) +PYTHON_COMPAT=( python3_{10..11} ) + +inherit fcaps flag-o-matic readme.gentoo-r1 lua-single python-any-r1 qmake-utils xdg cmake + +DESCRIPTION="Network protocol analyzer (sniffer)" +HOMEPAGE="https://www.wireshark.org/" + +if [[ ${PV} == *9999* ]] ; then + EGIT_REPO_URI="https://gitlab.com/wireshark/wireshark" + inherit git-r3 +else + VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/wireshark.asc + inherit verify-sig + + SRC_URI="https://www.wireshark.org/download/src/all-versions/${P/_/}.tar.xz" + SRC_URI+=" verify-sig? ( https://www.wireshark.org/download/SIGNATURES-${PV}.txt -> ${P}-signatures.txt )" + S="${WORKDIR}/${P/_/}" + + if [[ ${PV} != *_rc* ]] ; then + KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc64 ~riscv x86" + fi +fi + +LICENSE="GPL-2" +SLOT="0/${PV}" +IUSE="androiddump bcg729 brotli +capinfos +captype ciscodump +dftest doc dpauxmon" +IUSE+=" +dumpcap +editcap +gui http2 ilbc kerberos libxml2 lua lz4 maxminddb" +IUSE+=" +mergecap +minizip +netlink opus +plugins +pcap qt6 +randpkt" +IUSE+=" +randpktdump +reordercap sbc selinux +sharkd smi snappy spandsp sshdump ssl" +IUSE+=" sdjournal test +text2pcap tfshark +tshark +udpdump wifi zlib +zstd" + +REQUIRED_USE=" + lua? ( ${LUA_REQUIRED_USE} ) +" + +# Tests restricted for now because rely on pytest internals w/ >=3.11 +# See bug #897078 and https://gitlab.com/wireshark/wireshark/-/issues/18740. +RESTRICT="!test? ( test ) test" + +# bug #753062 for speexdsp +RDEPEND=" + acct-group/pcap + >=dev-libs/glib-2.50.0:2 + dev-libs/libpcre2 + >=net-dns/c-ares-1.13.0:= + >=dev-libs/libgcrypt-1.8.0:= + media-libs/speexdsp + bcg729? ( media-libs/bcg729 ) + brotli? ( app-arch/brotli:= ) + ciscodump? ( >=net-libs/libssh-0.6:= ) + filecaps? ( sys-libs/libcap ) + http2? ( >=net-libs/nghttp2-1.11.0:= ) + ilbc? ( media-libs/libilbc:= ) + kerberos? ( virtual/krb5 ) + libxml2? ( dev-libs/libxml2 ) + lua? ( ${LUA_DEPS} ) + lz4? ( app-arch/lz4:= ) + maxminddb? ( dev-libs/libmaxminddb:= ) + minizip? ( sys-libs/zlib[minizip] ) + netlink? ( dev-libs/libnl:3 ) + opus? ( media-libs/opus ) + pcap? ( net-libs/libpcap ) + gui? ( + x11-misc/xdg-utils + qt6? ( + dev-qt/qtbase:6[concurrent,dbus,gui,widgets] + dev-qt/qt5compat:6 + dev-qt/qtmultimedia:6 + ) + !qt6? ( + dev-qt/qtcore:5 + dev-qt/qtconcurrent:5 + dev-qt/qtgui:5 + dev-qt/qtmultimedia:5 + dev-qt/qtprintsupport:5 + dev-qt/qtwidgets:5 + ) + ) + sbc? ( media-libs/sbc ) + sdjournal? ( sys-apps/systemd:= ) + smi? ( net-libs/libsmi ) + snappy? ( app-arch/snappy:= ) + spandsp? ( media-libs/spandsp:= ) + sshdump? ( >=net-libs/libssh-0.6:= ) + ssl? ( >=net-libs/gnutls-3.5.8:= ) + wifi? ( >=net-libs/libssh-0.6:= ) + zlib? ( sys-libs/zlib ) + zstd? ( app-arch/zstd:= ) +" +DEPEND=" + ${RDEPEND} + gui? ( + !qt6? ( + dev-qt/qtdeclarative:5 + ) + ) +" +# TODO: 4.0.0_rc1 release notes say: +# "Perl is no longer required to build Wireshark, but may be required to build some source code files and run code analysis checks." +BDEPEND=" + ${PYTHON_DEPS} + dev-lang/perl + app-alternatives/lex + sys-devel/gettext + virtual/pkgconfig + doc? ( + app-text/doxygen + dev-ruby/asciidoctor + ) + gui? ( + qt6? ( + dev-qt/qttools:6[linguist] + ) + !qt6? ( + dev-qt/linguist-tools:5 + ) + ) + test? ( + $(python_gen_any_dep ' + dev-python/pytest[${PYTHON_USEDEP}] + dev-python/pytest-xdist[${PYTHON_USEDEP}] + ') + ) +" +RDEPEND=" + ${RDEPEND} + gui? ( virtual/freedesktop-icon-theme ) + selinux? ( sec-policy/selinux-wireshark ) +" + +if [[ ${PV} != *9999* ]] ; then + BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-wireshark )" +fi + +PATCHES=( + "${FILESDIR}"/${PN}-2.6.0-redhat.patch + "${FILESDIR}"/${PN}-3.4.2-cmake-lua-version.patch +) + +python_check_deps() { + use test || return 0 + + python_has_version -b "dev-python/pytest[${PYTHON_USEDEP}]" && + python_has_version -b "dev-python/pytest-xdist[${PYTHON_USEDEP}]" +} + +pkg_setup() { + use lua && lua-single_pkg_setup + + python-any-r1_pkg_setup +} + +src_unpack() { + if [[ ${PV} == *9999* ]] ; then + git-r3_src_unpack + else + if use verify-sig ; then + cd "${DISTDIR}" || die + verify-sig_verify_signed_checksums \ + ${P}-signatures.txt \ + openssl-dgst \ + ${P}.tar.xz + cd "${WORKDIR}" || die + fi + + default + fi +} + +src_configure() { + local mycmakeargs + + python_setup + + # Workaround bug #213705. If krb5-config --libs has -lcrypto then pass + # --with-ssl to ./configure. (Mimics code from acinclude.m4). + if use kerberos ; then + case $(krb5-config --libs) in + *-lcrypto*) + ewarn "Kerberos was built with ssl support: linkage with openssl is enabled." + ewarn "Note there are annoying license incompatibilities between the OpenSSL" + ewarn "license and the GPL, so do your check before distributing such package." + mycmakeargs+=( -DENABLE_GNUTLS=$(usex ssl) ) + ;; + esac + fi + + if use gui ; then + append-cxxflags -fPIC -DPIC + fi + + # crashes at runtime + # https://bugs.gentoo.org/754021 + filter-lto + + mycmakeargs+=( + -DPython3_EXECUTABLE="${PYTHON}" + -DCMAKE_DISABLE_FIND_PACKAGE_{Asciidoctor,DOXYGEN}=$(usex !doc) + + $(use androiddump && use pcap && echo -DEXTCAP_ANDROIDDUMP_LIBPCAP=yes) + $(usex gui LRELEASE=$(qt5_get_bindir)/lrelease '') + $(usex gui MOC=$(qt5_get_bindir)/moc '') + $(usex gui RCC=$(qt5_get_bindir)/rcc '') + $(usex gui UIC=$(qt5_get_bindir)/uic '') + + -DBUILD_androiddump=$(usex androiddump) + -DBUILD_capinfos=$(usex capinfos) + -DBUILD_captype=$(usex captype) + -DBUILD_ciscodump=$(usex ciscodump) + -DBUILD_dftest=$(usex dftest) + -DBUILD_dpauxmon=$(usex dpauxmon) + -DBUILD_dumpcap=$(usex dumpcap) + -DBUILD_editcap=$(usex editcap) + -DBUILD_mergecap=$(usex mergecap) + -DBUILD_mmdbresolve=$(usex maxminddb) + -DBUILD_randpkt=$(usex randpkt) + -DBUILD_randpktdump=$(usex randpktdump) + -DBUILD_reordercap=$(usex reordercap) + -DBUILD_sdjournal=$(usex sdjournal) + -DBUILD_sharkd=$(usex sharkd) + -DBUILD_sshdump=$(usex sshdump) + -DBUILD_text2pcap=$(usex text2pcap) + -DBUILD_tfshark=$(usex tfshark) + -DBUILD_tshark=$(usex tshark) + -DBUILD_udpdump=$(usex udpdump) + + -DBUILD_wireshark=$(usex gui) + -DUSE_qt6=$(usex qt6) + + -DENABLE_WERROR=OFF + -DENABLE_BCG729=$(usex bcg729) + -DENABLE_BROTLI=$(usex brotli) + -DENABLE_CAP=$(usex filecaps caps) + -DENABLE_GNUTLS=$(usex ssl) + -DENABLE_ILBC=$(usex ilbc) + -DENABLE_KERBEROS=$(usex kerberos) + -DENABLE_LIBXML2=$(usex libxml2) + # only appends -flto + -DENABLE_LTO=OFF + -DENABLE_LUA=$(usex lua) + -DENABLE_LZ4=$(usex lz4) + -DENABLE_MINIZIP=$(usex minizip) + -DENABLE_NETLINK=$(usex netlink) + -DENABLE_NGHTTP2=$(usex http2) + -DENABLE_OPUS=$(usex opus) + -DENABLE_PCAP=$(usex pcap) + -DENABLE_PLUGINS=$(usex plugins) + -DENABLE_PLUGIN_IFDEMO=OFF + -DENABLE_SBC=$(usex sbc) + -DENABLE_SMI=$(usex smi) + -DENABLE_SNAPPY=$(usex snappy) + -DENABLE_SPANDSP=$(usex spandsp) + -DBUILD_wifidump=$(usex wifi) + -DENABLE_ZLIB=$(usex zlib) + -DENABLE_ZSTD=$(usex zstd) + ) + + cmake_src_configure +} + +src_test() { + cmake_build test-programs + + EPYTEST_DESELECT=( + # TODO: investigate + suite_follow_multistream.py::case_follow_multistream::test_follow_http2_multistream + ) + + # https://www.wireshark.org/docs/wsdg_html_chunked/ChTestsRunPytest.html + epytest \ + --disable-capture \ + --skip-missing-programs=all \ + --program-path "${BUILD_DIR}"/run +} + +src_install() { + cmake_src_install + + # FAQ is not required as is installed from help/faq.txt + dodoc AUTHORS ChangeLog NEWS README* doc/randpkt.txt doc/README* + + # install headers + insinto /usr/include/wireshark + doins "${BUILD_DIR}"/config.h + + # If trying to remove this, try build e.g. libvirt first! + # At last check, Fedora is still doing this too. + local dir dirs=( + epan + epan/crypt + epan/dfilter + epan/dissectors + epan/ftypes + wiretap + wsutil + wsutil/wmem + ) + + for dir in "${dirs[@]}" ; do + insinto /usr/include/wireshark/${dir} + doins ${dir}/*.h + done + + if use gui ; then + local s + + for s in 16 32 48 64 128 256 512 1024 ; do + insinto /usr/share/icons/hicolor/${s}x${s}/apps + newins resources/icons/wsicon${s}.png wireshark.png + done + + for s in 16 24 32 48 64 128 256 ; do + insinto /usr/share/icons/hicolor/${s}x${s}/mimetypes + newins resources/icons//WiresharkDoc-${s}.png application-vnd.tcpdump.pcap.png + done + fi + + if [[ -d "${ED}"/usr/share/appdata ]] ; then + rm -r "${ED}"/usr/share/appdata || die + fi + + readme.gentoo_create_doc +} + +pkg_postinst() { + xdg_pkg_postinst + + # Add group for users allowed to sniff. + chgrp pcap "${EROOT}"/usr/bin/dumpcap + + if use dumpcap && use pcap ; then + fcaps -o 0 -g pcap -m 4710 -M 0710 \ + cap_dac_read_search,cap_net_raw,cap_net_admin \ + "${EROOT}"/usr/bin/dumpcap + fi + + readme.gentoo_print_elog +} diff --git a/net-analyzer/wireshark/wireshark-4.1.0.ebuild b/net-analyzer/wireshark/wireshark-4.2.4-r1.ebuild index 17400f26949a..4b5688aeff54 100644 --- a/net-analyzer/wireshark/wireshark-4.1.0.ebuild +++ b/net-analyzer/wireshark/wireshark-4.2.4-r1.ebuild @@ -23,16 +23,15 @@ else SRC_URI+=" verify-sig? ( https://www.wireshark.org/download/SIGNATURES-${PV}.txt -> ${P}-signatures.txt )" S="${WORKDIR}/${P/_/}" - # 4.1.x is an experimental release until 4.2 - #if [[ ${PV} != *_rc* ]] ; then - # KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~riscv ~x86" - #fi + if [[ ${PV} != *_rc* ]] ; then + KEYWORDS="amd64 arm64 ~hppa" + fi fi LICENSE="GPL-2" SLOT="0/${PV}" IUSE="androiddump bcg729 brotli +capinfos +captype ciscodump +dftest doc dpauxmon" -IUSE+=" +dumpcap +editcap +gui http2 ilbc kerberos libxml2 lua lz4 maxminddb" +IUSE+=" +dumpcap +editcap +gui http2 http3 ilbc kerberos libxml2 lua lz4 maxminddb" IUSE+=" +mergecap +minizip +netlink opus +plugins +pcap qt6 +randpkt" IUSE+=" +randpktdump +reordercap sbc selinux +sharkd smi snappy spandsp sshdump ssl" IUSE+=" sdjournal test +text2pcap tfshark +tshark +udpdump wifi zlib +zstd" @@ -56,6 +55,7 @@ RDEPEND=" ciscodump? ( >=net-libs/libssh-0.6:= ) filecaps? ( sys-libs/libcap ) http2? ( >=net-libs/nghttp2-1.11.0:= ) + http3? ( net-libs/nghttp3 ) ilbc? ( media-libs/libilbc:= ) kerberos? ( virtual/krb5 ) libxml2? ( dev-libs/libxml2 ) @@ -112,6 +112,7 @@ BDEPEND=" doc? ( app-text/doxygen dev-ruby/asciidoctor + dev-libs/libxslt ) gui? ( qt6? ( @@ -202,6 +203,9 @@ src_configure() { -DPython3_EXECUTABLE="${PYTHON}" -DCMAKE_DISABLE_FIND_PACKAGE_{Asciidoctor,DOXYGEN}=$(usex !doc) + # Force bundled lemon (bug 933119) + -DLEMON_EXECUTABLE= + $(use androiddump && use pcap && echo -DEXTCAP_ANDROIDDUMP_LIBPCAP=yes) $(usex gui LRELEASE=$(qt5_get_bindir)/lrelease '') $(usex gui MOC=$(qt5_get_bindir)/moc '') @@ -248,6 +252,7 @@ src_configure() { -DENABLE_MINIZIP=$(usex minizip) -DENABLE_NETLINK=$(usex netlink) -DENABLE_NGHTTP2=$(usex http2) + -DENABLE_NGHTTP3=$(usex http3) -DENABLE_OPUS=$(usex opus) -DENABLE_PCAP=$(usex pcap) -DENABLE_PLUGINS=$(usex plugins) @@ -280,7 +285,9 @@ src_test() { } src_install() { - cmake_src_install + # bug #928577 + # https://gitlab.com/wireshark/wireshark/-/commit/fe7bfdf6caac9204ab5f34eeba7b0f4a0314d3cd + cmake_src_install install-headers # FAQ is not required as is installed from help/faq.txt dodoc AUTHORS ChangeLog NEWS README* doc/randpkt.txt doc/README* diff --git a/net-analyzer/wireshark/wireshark-4.2.5.ebuild b/net-analyzer/wireshark/wireshark-4.2.5.ebuild new file mode 100644 index 000000000000..e7a7b090bf6d --- /dev/null +++ b/net-analyzer/wireshark/wireshark-4.2.5.ebuild @@ -0,0 +1,347 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +LUA_COMPAT=( lua5-{1..2} ) +# TODO: check cmake/modules/UseAsn2Wrs.cmake for 3.12 +PYTHON_COMPAT=( python3_{10..12} ) + +inherit fcaps flag-o-matic lua-single python-any-r1 qmake-utils xdg cmake + +DESCRIPTION="Network protocol analyzer (sniffer)" +HOMEPAGE="https://www.wireshark.org/" + +if [[ ${PV} == *9999* ]] ; then + EGIT_REPO_URI="https://gitlab.com/wireshark/wireshark" + inherit git-r3 +else + VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/wireshark.asc + inherit verify-sig + + SRC_URI="https://www.wireshark.org/download/src/all-versions/${P/_/}.tar.xz" + SRC_URI+=" verify-sig? ( https://www.wireshark.org/download/SIGNATURES-${PV}.txt -> ${P}-signatures.txt )" + S="${WORKDIR}/${P/_/}" + + if [[ ${PV} != *_rc* ]] ; then + KEYWORDS="amd64 ~arm arm64 ~hppa ~ia64 ~riscv ~x86" + fi +fi + +LICENSE="GPL-2" +SLOT="0/${PV}" +IUSE="androiddump bcg729 brotli +capinfos +captype ciscodump +dftest doc dpauxmon" +IUSE+=" +dumpcap +editcap +gui http2 http3 ilbc kerberos libxml2 lua lz4 maxminddb" +IUSE+=" +mergecap +minizip +netlink opus +plugins +pcap qt6 +randpkt" +IUSE+=" +randpktdump +reordercap sbc selinux +sharkd smi snappy spandsp sshdump ssl" +IUSE+=" sdjournal test +text2pcap tfshark +tshark +udpdump wifi zlib +zstd" + +REQUIRED_USE=" + lua? ( ${LUA_REQUIRED_USE} ) +" + +RESTRICT="!test? ( test )" + +# bug #753062 for speexdsp +RDEPEND=" + acct-group/pcap + >=dev-libs/glib-2.50.0:2 + dev-libs/libpcre2 + >=net-dns/c-ares-1.13.0:= + >=dev-libs/libgcrypt-1.8.0:= + media-libs/speexdsp + bcg729? ( media-libs/bcg729 ) + brotli? ( app-arch/brotli:= ) + ciscodump? ( >=net-libs/libssh-0.6:= ) + filecaps? ( sys-libs/libcap ) + http2? ( >=net-libs/nghttp2-1.11.0:= ) + http3? ( net-libs/nghttp3 ) + ilbc? ( media-libs/libilbc:= ) + kerberos? ( virtual/krb5 ) + libxml2? ( dev-libs/libxml2 ) + lua? ( ${LUA_DEPS} ) + lz4? ( app-arch/lz4:= ) + maxminddb? ( dev-libs/libmaxminddb:= ) + minizip? ( sys-libs/zlib[minizip] ) + netlink? ( dev-libs/libnl:3 ) + opus? ( media-libs/opus ) + pcap? ( net-libs/libpcap ) + gui? ( + x11-misc/xdg-utils + qt6? ( + dev-qt/qtbase:6[concurrent,dbus,gui,widgets] + dev-qt/qt5compat:6 + dev-qt/qtmultimedia:6 + ) + !qt6? ( + dev-qt/qtcore:5 + dev-qt/qtconcurrent:5 + dev-qt/qtgui:5 + dev-qt/qtmultimedia:5 + dev-qt/qtprintsupport:5 + dev-qt/qtwidgets:5 + ) + ) + sbc? ( media-libs/sbc ) + sdjournal? ( sys-apps/systemd:= ) + smi? ( net-libs/libsmi ) + snappy? ( app-arch/snappy:= ) + spandsp? ( media-libs/spandsp:= ) + sshdump? ( >=net-libs/libssh-0.6:= ) + ssl? ( >=net-libs/gnutls-3.5.8:= ) + wifi? ( >=net-libs/libssh-0.6:= ) + zlib? ( sys-libs/zlib ) + zstd? ( app-arch/zstd:= ) +" +DEPEND=" + ${RDEPEND} + gui? ( + !qt6? ( + dev-qt/qtdeclarative:5 + ) + ) +" +# TODO: 4.0.0_rc1 release notes say: +# "Perl is no longer required to build Wireshark, but may be required to build some source code files and run code analysis checks." +BDEPEND=" + ${PYTHON_DEPS} + dev-lang/perl + app-alternatives/lex + sys-devel/gettext + virtual/pkgconfig + doc? ( + app-text/doxygen + dev-ruby/asciidoctor + dev-libs/libxslt + ) + gui? ( + qt6? ( + dev-qt/qttools:6[linguist] + ) + !qt6? ( + dev-qt/linguist-tools:5 + ) + ) + test? ( + $(python_gen_any_dep ' + dev-python/pytest[${PYTHON_USEDEP}] + dev-python/pytest-xdist[${PYTHON_USEDEP}] + ') + ) +" +RDEPEND=" + ${RDEPEND} + gui? ( virtual/freedesktop-icon-theme ) + selinux? ( sec-policy/selinux-wireshark ) +" + +if [[ ${PV} != *9999* ]] ; then + BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-wireshark )" +fi + +PATCHES=( + "${FILESDIR}"/${PN}-2.6.0-redhat.patch + "${FILESDIR}"/${PN}-4.2.5-http2-test.patch +) + +python_check_deps() { + use test || return 0 + + python_has_version -b "dev-python/pytest[${PYTHON_USEDEP}]" && + python_has_version -b "dev-python/pytest-xdist[${PYTHON_USEDEP}]" +} + +pkg_setup() { + use lua && lua-single_pkg_setup + + python-any-r1_pkg_setup +} + +src_unpack() { + if [[ ${PV} == *9999* ]] ; then + git-r3_src_unpack + else + if use verify-sig ; then + cd "${DISTDIR}" || die + verify-sig_verify_signed_checksums \ + ${P}-signatures.txt \ + openssl-dgst \ + ${P}.tar.xz + cd "${WORKDIR}" || die + fi + + default + fi +} + +src_configure() { + local mycmakeargs + + python_setup + + # Workaround bug #213705. If krb5-config --libs has -lcrypto then pass + # --with-ssl to ./configure. (Mimics code from acinclude.m4). + if use kerberos ; then + case $(krb5-config --libs) in + *-lcrypto*) + ewarn "Kerberos was built with ssl support: linkage with openssl is enabled." + ewarn "Note there are annoying license incompatibilities between the OpenSSL" + ewarn "license and the GPL, so do your check before distributing such package." + mycmakeargs+=( -DENABLE_GNUTLS=$(usex ssl) ) + ;; + esac + fi + + if use gui ; then + append-cxxflags -fPIC -DPIC + fi + + # crashes at runtime + # https://bugs.gentoo.org/754021 + filter-lto + + mycmakeargs+=( + -DPython3_EXECUTABLE="${PYTHON}" + -DCMAKE_DISABLE_FIND_PACKAGE_{Asciidoctor,DOXYGEN}=$(usex !doc) + + # Force bundled lemon (bug 933119) + -DLEMON_EXECUTABLE= + + $(use androiddump && use pcap && echo -DEXTCAP_ANDROIDDUMP_LIBPCAP=yes) + $(usex gui LRELEASE=$(qt5_get_bindir)/lrelease '') + $(usex gui MOC=$(qt5_get_bindir)/moc '') + $(usex gui RCC=$(qt5_get_bindir)/rcc '') + $(usex gui UIC=$(qt5_get_bindir)/uic '') + + -DBUILD_androiddump=$(usex androiddump) + -DBUILD_capinfos=$(usex capinfos) + -DBUILD_captype=$(usex captype) + -DBUILD_ciscodump=$(usex ciscodump) + -DBUILD_dftest=$(usex dftest) + -DBUILD_dpauxmon=$(usex dpauxmon) + -DBUILD_dumpcap=$(usex dumpcap) + -DBUILD_editcap=$(usex editcap) + -DBUILD_mergecap=$(usex mergecap) + -DBUILD_mmdbresolve=$(usex maxminddb) + -DBUILD_randpkt=$(usex randpkt) + -DBUILD_randpktdump=$(usex randpktdump) + -DBUILD_reordercap=$(usex reordercap) + -DBUILD_sdjournal=$(usex sdjournal) + -DBUILD_sharkd=$(usex sharkd) + -DBUILD_sshdump=$(usex sshdump) + -DBUILD_text2pcap=$(usex text2pcap) + -DBUILD_tfshark=$(usex tfshark) + -DBUILD_tshark=$(usex tshark) + -DBUILD_udpdump=$(usex udpdump) + + -DBUILD_wireshark=$(usex gui) + -DUSE_qt6=$(usex qt6) + + -DENABLE_WERROR=OFF + -DENABLE_BCG729=$(usex bcg729) + -DENABLE_BROTLI=$(usex brotli) + -DENABLE_CAP=$(usex filecaps caps) + -DENABLE_GNUTLS=$(usex ssl) + -DENABLE_ILBC=$(usex ilbc) + -DENABLE_KERBEROS=$(usex kerberos) + -DENABLE_LIBXML2=$(usex libxml2) + # only appends -flto + -DENABLE_LTO=OFF + -DENABLE_LUA=$(usex lua) + -DLUA_FIND_VERSIONS="${ELUA#lua}" + -DENABLE_LZ4=$(usex lz4) + -DENABLE_MINIZIP=$(usex minizip) + -DENABLE_NETLINK=$(usex netlink) + -DENABLE_NGHTTP2=$(usex http2) + -DENABLE_NGHTTP3=$(usex http3) + -DENABLE_OPUS=$(usex opus) + -DENABLE_PCAP=$(usex pcap) + -DENABLE_PLUGINS=$(usex plugins) + -DENABLE_PLUGIN_IFDEMO=OFF + -DENABLE_SBC=$(usex sbc) + -DENABLE_SMI=$(usex smi) + -DENABLE_SNAPPY=$(usex snappy) + -DENABLE_SPANDSP=$(usex spandsp) + -DBUILD_wifidump=$(usex wifi) + -DENABLE_ZLIB=$(usex zlib) + -DENABLE_ZSTD=$(usex zstd) + ) + + cmake_src_configure +} + +src_test() { + cmake_build test-programs + + # https://www.wireshark.org/docs/wsdg_html_chunked/ChTestsRunPytest.html + epytest \ + --disable-capture \ + --skip-missing-programs=all \ + --program-path "${BUILD_DIR}"/run +} + +src_install() { + # bug #928577 + # https://gitlab.com/wireshark/wireshark/-/commit/fe7bfdf6caac9204ab5f34eeba7b0f4a0314d3cd + cmake_src_install install-headers + + # FAQ is not required as is installed from help/faq.txt + dodoc AUTHORS ChangeLog NEWS README* doc/randpkt.txt doc/README* + + # install headers + insinto /usr/include/wireshark + doins "${BUILD_DIR}"/config.h + + # If trying to remove this, try build e.g. libvirt first! + # At last check, Fedora is still doing this too. + local dir dirs=( + epan + epan/crypt + epan/dfilter + epan/dissectors + epan/ftypes + wiretap + wsutil + wsutil/wmem + ) + + for dir in "${dirs[@]}" ; do + insinto /usr/include/wireshark/${dir} + doins ${dir}/*.h + done + + if use gui ; then + local s + + for s in 16 32 48 64 128 256 512 1024 ; do + insinto /usr/share/icons/hicolor/${s}x${s}/apps + newins resources/icons/wsicon${s}.png wireshark.png + done + + for s in 16 24 32 48 64 128 256 ; do + insinto /usr/share/icons/hicolor/${s}x${s}/mimetypes + newins resources/icons//WiresharkDoc-${s}.png application-vnd.tcpdump.pcap.png + done + fi + + if [[ -d "${ED}"/usr/share/appdata ]] ; then + rm -r "${ED}"/usr/share/appdata || die + fi +} + +pkg_postinst() { + xdg_pkg_postinst + + # Add group for users allowed to sniff. + chgrp pcap "${EROOT}"/usr/bin/dumpcap + + if use dumpcap && use pcap ; then + fcaps -o 0 -g pcap -m 4710 -M 0710 \ + cap_dac_read_search,cap_net_raw,cap_net_admin \ + "${EROOT}"/usr/bin/dumpcap + fi + + ewarn "NOTE: To capture traffic with wireshark as normal user you have to" + ewarn "add yourself to the pcap group. This security measure ensures" + ewarn "that only trusted users are allowed to sniff your traffic." +} diff --git a/net-analyzer/wireshark/wireshark-4.2.6.ebuild b/net-analyzer/wireshark/wireshark-4.2.6.ebuild new file mode 100644 index 000000000000..63bc4eeebbb0 --- /dev/null +++ b/net-analyzer/wireshark/wireshark-4.2.6.ebuild @@ -0,0 +1,346 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +LUA_COMPAT=( lua5-{1..2} ) +# TODO: check cmake/modules/UseAsn2Wrs.cmake for 3.12 +PYTHON_COMPAT=( python3_{10..13} ) + +inherit fcaps flag-o-matic lua-single python-any-r1 qmake-utils xdg cmake + +DESCRIPTION="Network protocol analyzer (sniffer)" +HOMEPAGE="https://www.wireshark.org/" + +if [[ ${PV} == *9999* ]] ; then + EGIT_REPO_URI="https://gitlab.com/wireshark/wireshark" + inherit git-r3 +else + VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/wireshark.asc + inherit verify-sig + + SRC_URI="https://www.wireshark.org/download/src/all-versions/${P/_/}.tar.xz" + SRC_URI+=" verify-sig? ( https://www.wireshark.org/download/SIGNATURES-${PV}.txt -> ${P}-signatures.txt )" + S="${WORKDIR}/${P/_/}" + + if [[ ${PV} != *_rc* ]] ; then + KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~riscv ~x86" + fi +fi + +LICENSE="GPL-2" +SLOT="0/${PV}" +IUSE="androiddump bcg729 brotli +capinfos +captype ciscodump +dftest doc dpauxmon" +IUSE+=" +dumpcap +editcap +gui http2 http3 ilbc kerberos libxml2 lua lz4 maxminddb" +IUSE+=" +mergecap +minizip +netlink opus +plugins +pcap qt6 +randpkt" +IUSE+=" +randpktdump +reordercap sbc selinux +sharkd smi snappy spandsp sshdump ssl" +IUSE+=" sdjournal test +text2pcap tfshark +tshark +udpdump wifi zlib +zstd" + +REQUIRED_USE=" + lua? ( ${LUA_REQUIRED_USE} ) +" + +RESTRICT="!test? ( test )" + +# bug #753062 for speexdsp +RDEPEND=" + acct-group/pcap + >=dev-libs/glib-2.50.0:2 + dev-libs/libpcre2 + >=net-dns/c-ares-1.13.0:= + >=dev-libs/libgcrypt-1.8.0:= + media-libs/speexdsp + bcg729? ( media-libs/bcg729 ) + brotli? ( app-arch/brotli:= ) + ciscodump? ( >=net-libs/libssh-0.6:= ) + filecaps? ( sys-libs/libcap ) + http2? ( >=net-libs/nghttp2-1.11.0:= ) + http3? ( net-libs/nghttp3 ) + ilbc? ( media-libs/libilbc:= ) + kerberos? ( virtual/krb5 ) + libxml2? ( dev-libs/libxml2 ) + lua? ( ${LUA_DEPS} ) + lz4? ( app-arch/lz4:= ) + maxminddb? ( dev-libs/libmaxminddb:= ) + minizip? ( sys-libs/zlib[minizip] ) + netlink? ( dev-libs/libnl:3 ) + opus? ( media-libs/opus ) + pcap? ( net-libs/libpcap ) + gui? ( + x11-misc/xdg-utils + qt6? ( + dev-qt/qtbase:6[concurrent,dbus,gui,widgets] + dev-qt/qt5compat:6 + dev-qt/qtmultimedia:6 + ) + !qt6? ( + dev-qt/qtcore:5 + dev-qt/qtconcurrent:5 + dev-qt/qtgui:5 + dev-qt/qtmultimedia:5 + dev-qt/qtprintsupport:5 + dev-qt/qtwidgets:5 + ) + ) + sbc? ( media-libs/sbc ) + sdjournal? ( sys-apps/systemd:= ) + smi? ( net-libs/libsmi ) + snappy? ( app-arch/snappy:= ) + spandsp? ( media-libs/spandsp:= ) + sshdump? ( >=net-libs/libssh-0.6:= ) + ssl? ( >=net-libs/gnutls-3.5.8:= ) + wifi? ( >=net-libs/libssh-0.6:= ) + zlib? ( sys-libs/zlib ) + zstd? ( app-arch/zstd:= ) +" +DEPEND=" + ${RDEPEND} + gui? ( + !qt6? ( + dev-qt/qtdeclarative:5 + ) + ) +" +# TODO: 4.0.0_rc1 release notes say: +# "Perl is no longer required to build Wireshark, but may be required to build some source code files and run code analysis checks." +BDEPEND=" + ${PYTHON_DEPS} + dev-lang/perl + app-alternatives/lex + sys-devel/gettext + virtual/pkgconfig + doc? ( + app-text/doxygen + dev-ruby/asciidoctor + dev-libs/libxslt + ) + gui? ( + qt6? ( + dev-qt/qttools:6[linguist] + ) + !qt6? ( + dev-qt/linguist-tools:5 + ) + ) + test? ( + $(python_gen_any_dep ' + dev-python/pytest[${PYTHON_USEDEP}] + dev-python/pytest-xdist[${PYTHON_USEDEP}] + ') + ) +" +RDEPEND=" + ${RDEPEND} + gui? ( virtual/freedesktop-icon-theme ) + selinux? ( sec-policy/selinux-wireshark ) +" + +if [[ ${PV} != *9999* ]] ; then + BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-wireshark )" +fi + +python_check_deps() { + use test || return 0 + + python_has_version -b "dev-python/pytest[${PYTHON_USEDEP}]" && + python_has_version -b "dev-python/pytest-xdist[${PYTHON_USEDEP}]" +} + +pkg_setup() { + use lua && lua-single_pkg_setup + + python-any-r1_pkg_setup +} + +src_unpack() { + if [[ ${PV} == *9999* ]] ; then + git-r3_src_unpack + else + if use verify-sig ; then + cd "${DISTDIR}" || die + verify-sig_verify_signed_checksums \ + ${P}-signatures.txt \ + openssl-dgst \ + ${P}.tar.xz + cd "${WORKDIR}" || die + fi + + default + fi +} + +src_configure() { + local mycmakeargs + + python_setup + + # Workaround bug #213705. If krb5-config --libs has -lcrypto then pass + # --with-ssl to ./configure. (Mimics code from acinclude.m4). + if use kerberos ; then + case $(krb5-config --libs) in + *-lcrypto*) + ewarn "Kerberos was built with ssl support: linkage with openssl is enabled." + ewarn "Note there are annoying license incompatibilities between the OpenSSL" + ewarn "license and the GPL, so do your check before distributing such package." + mycmakeargs+=( -DENABLE_GNUTLS=$(usex ssl) ) + ;; + esac + fi + + if use gui ; then + append-cxxflags -fPIC -DPIC + fi + + # crashes at runtime + # https://bugs.gentoo.org/754021 + filter-lto + + mycmakeargs+=( + -DPython3_EXECUTABLE="${PYTHON}" + -DCMAKE_DISABLE_FIND_PACKAGE_{Asciidoctor,DOXYGEN}=$(usex !doc) + + # Force bundled lemon (bug 933119) + -DLEMON_EXECUTABLE= + + -DRPMBUILD_EXECUTABLE= + -DGIT_EXECUTABLE= + -DENABLE_CCACHE=OFF + + $(use androiddump && use pcap && echo -DEXTCAP_ANDROIDDUMP_LIBPCAP=yes) + $(usex gui LRELEASE=$(qt5_get_bindir)/lrelease '') + $(usex gui MOC=$(qt5_get_bindir)/moc '') + $(usex gui RCC=$(qt5_get_bindir)/rcc '') + $(usex gui UIC=$(qt5_get_bindir)/uic '') + + -DBUILD_androiddump=$(usex androiddump) + -DBUILD_capinfos=$(usex capinfos) + -DBUILD_captype=$(usex captype) + -DBUILD_ciscodump=$(usex ciscodump) + -DBUILD_dftest=$(usex dftest) + -DBUILD_dpauxmon=$(usex dpauxmon) + -DBUILD_dumpcap=$(usex dumpcap) + -DBUILD_editcap=$(usex editcap) + -DBUILD_mergecap=$(usex mergecap) + -DBUILD_mmdbresolve=$(usex maxminddb) + -DBUILD_randpkt=$(usex randpkt) + -DBUILD_randpktdump=$(usex randpktdump) + -DBUILD_reordercap=$(usex reordercap) + -DBUILD_sdjournal=$(usex sdjournal) + -DBUILD_sharkd=$(usex sharkd) + -DBUILD_sshdump=$(usex sshdump) + -DBUILD_text2pcap=$(usex text2pcap) + -DBUILD_tfshark=$(usex tfshark) + -DBUILD_tshark=$(usex tshark) + -DBUILD_udpdump=$(usex udpdump) + + -DBUILD_wireshark=$(usex gui) + -DUSE_qt6=$(usex qt6) + + -DENABLE_WERROR=OFF + -DENABLE_BCG729=$(usex bcg729) + -DENABLE_BROTLI=$(usex brotli) + -DENABLE_CAP=$(usex filecaps caps) + -DENABLE_GNUTLS=$(usex ssl) + -DENABLE_ILBC=$(usex ilbc) + -DENABLE_KERBEROS=$(usex kerberos) + -DENABLE_LIBXML2=$(usex libxml2) + # only appends -flto + -DENABLE_LTO=OFF + -DENABLE_LUA=$(usex lua) + -DLUA_FIND_VERSIONS="${ELUA#lua}" + -DENABLE_LZ4=$(usex lz4) + -DENABLE_MINIZIP=$(usex minizip) + -DENABLE_NETLINK=$(usex netlink) + -DENABLE_NGHTTP2=$(usex http2) + -DENABLE_NGHTTP3=$(usex http3) + -DENABLE_OPUS=$(usex opus) + -DENABLE_PCAP=$(usex pcap) + -DENABLE_PLUGINS=$(usex plugins) + -DENABLE_PLUGIN_IFDEMO=OFF + -DENABLE_SBC=$(usex sbc) + -DENABLE_SMI=$(usex smi) + -DENABLE_SNAPPY=$(usex snappy) + -DENABLE_SPANDSP=$(usex spandsp) + -DBUILD_wifidump=$(usex wifi) + -DENABLE_ZLIB=$(usex zlib) + -DENABLE_ZSTD=$(usex zstd) + ) + + cmake_src_configure +} + +src_test() { + cmake_build test-programs + + # https://www.wireshark.org/docs/wsdg_html_chunked/ChTestsRunPytest.html + epytest \ + --disable-capture \ + --skip-missing-programs=all \ + --program-path "${BUILD_DIR}"/run +} + +src_install() { + # bug #928577 + # https://gitlab.com/wireshark/wireshark/-/commit/fe7bfdf6caac9204ab5f34eeba7b0f4a0314d3cd + cmake_src_install install-headers + + # FAQ is not required as is installed from help/faq.txt + dodoc AUTHORS ChangeLog NEWS README* doc/randpkt.txt doc/README* + + # install headers + insinto /usr/include/wireshark + doins "${BUILD_DIR}"/config.h + + # If trying to remove this, try build e.g. libvirt first! + # At last check, Fedora is still doing this too. + local dir dirs=( + epan + epan/crypt + epan/dfilter + epan/dissectors + epan/ftypes + wiretap + wsutil + wsutil/wmem + ) + + for dir in "${dirs[@]}" ; do + insinto /usr/include/wireshark/${dir} + doins ${dir}/*.h + done + + if use gui ; then + local s + + for s in 16 32 48 64 128 256 512 1024 ; do + insinto /usr/share/icons/hicolor/${s}x${s}/apps + newins resources/icons/wsicon${s}.png wireshark.png + done + + for s in 16 24 32 48 64 128 256 ; do + insinto /usr/share/icons/hicolor/${s}x${s}/mimetypes + newins resources/icons//WiresharkDoc-${s}.png application-vnd.tcpdump.pcap.png + done + fi + + if [[ -d "${ED}"/usr/share/appdata ]] ; then + rm -r "${ED}"/usr/share/appdata || die + fi +} + +pkg_postinst() { + xdg_pkg_postinst + + # Add group for users allowed to sniff. + chgrp pcap "${EROOT}"/usr/bin/dumpcap + + if use dumpcap && use pcap ; then + fcaps -o 0 -g pcap -m 4710 -M 0710 \ + cap_dac_read_search,cap_net_raw,cap_net_admin \ + "${EROOT}"/usr/bin/dumpcap + fi + + ewarn "NOTE: To capture traffic with wireshark as normal user you have to" + ewarn "add yourself to the pcap group. This security measure ensures" + ewarn "that only trusted users are allowed to sniff your traffic." +} diff --git a/net-analyzer/wireshark/wireshark-9999.ebuild b/net-analyzer/wireshark/wireshark-9999.ebuild index 17400f26949a..63bc4eeebbb0 100644 --- a/net-analyzer/wireshark/wireshark-9999.ebuild +++ b/net-analyzer/wireshark/wireshark-9999.ebuild @@ -5,7 +5,7 @@ EAPI=8 LUA_COMPAT=( lua5-{1..2} ) # TODO: check cmake/modules/UseAsn2Wrs.cmake for 3.12 -PYTHON_COMPAT=( python3_{10..12} ) +PYTHON_COMPAT=( python3_{10..13} ) inherit fcaps flag-o-matic lua-single python-any-r1 qmake-utils xdg cmake @@ -23,16 +23,15 @@ else SRC_URI+=" verify-sig? ( https://www.wireshark.org/download/SIGNATURES-${PV}.txt -> ${P}-signatures.txt )" S="${WORKDIR}/${P/_/}" - # 4.1.x is an experimental release until 4.2 - #if [[ ${PV} != *_rc* ]] ; then - # KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~riscv ~x86" - #fi + if [[ ${PV} != *_rc* ]] ; then + KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~riscv ~x86" + fi fi LICENSE="GPL-2" SLOT="0/${PV}" IUSE="androiddump bcg729 brotli +capinfos +captype ciscodump +dftest doc dpauxmon" -IUSE+=" +dumpcap +editcap +gui http2 ilbc kerberos libxml2 lua lz4 maxminddb" +IUSE+=" +dumpcap +editcap +gui http2 http3 ilbc kerberos libxml2 lua lz4 maxminddb" IUSE+=" +mergecap +minizip +netlink opus +plugins +pcap qt6 +randpkt" IUSE+=" +randpktdump +reordercap sbc selinux +sharkd smi snappy spandsp sshdump ssl" IUSE+=" sdjournal test +text2pcap tfshark +tshark +udpdump wifi zlib +zstd" @@ -56,6 +55,7 @@ RDEPEND=" ciscodump? ( >=net-libs/libssh-0.6:= ) filecaps? ( sys-libs/libcap ) http2? ( >=net-libs/nghttp2-1.11.0:= ) + http3? ( net-libs/nghttp3 ) ilbc? ( media-libs/libilbc:= ) kerberos? ( virtual/krb5 ) libxml2? ( dev-libs/libxml2 ) @@ -112,6 +112,7 @@ BDEPEND=" doc? ( app-text/doxygen dev-ruby/asciidoctor + dev-libs/libxslt ) gui? ( qt6? ( @@ -138,10 +139,6 @@ if [[ ${PV} != *9999* ]] ; then BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-wireshark )" fi -PATCHES=( - "${FILESDIR}"/${PN}-2.6.0-redhat.patch -) - python_check_deps() { use test || return 0 @@ -202,6 +199,13 @@ src_configure() { -DPython3_EXECUTABLE="${PYTHON}" -DCMAKE_DISABLE_FIND_PACKAGE_{Asciidoctor,DOXYGEN}=$(usex !doc) + # Force bundled lemon (bug 933119) + -DLEMON_EXECUTABLE= + + -DRPMBUILD_EXECUTABLE= + -DGIT_EXECUTABLE= + -DENABLE_CCACHE=OFF + $(use androiddump && use pcap && echo -DEXTCAP_ANDROIDDUMP_LIBPCAP=yes) $(usex gui LRELEASE=$(qt5_get_bindir)/lrelease '') $(usex gui MOC=$(qt5_get_bindir)/moc '') @@ -248,6 +252,7 @@ src_configure() { -DENABLE_MINIZIP=$(usex minizip) -DENABLE_NETLINK=$(usex netlink) -DENABLE_NGHTTP2=$(usex http2) + -DENABLE_NGHTTP3=$(usex http3) -DENABLE_OPUS=$(usex opus) -DENABLE_PCAP=$(usex pcap) -DENABLE_PLUGINS=$(usex plugins) @@ -267,11 +272,6 @@ src_configure() { src_test() { cmake_build test-programs - EPYTEST_DESELECT=( - # TODO: investigate - suite_follow_multistream.py::case_follow_multistream::test_follow_http2_multistream - ) - # https://www.wireshark.org/docs/wsdg_html_chunked/ChTestsRunPytest.html epytest \ --disable-capture \ @@ -280,7 +280,9 @@ src_test() { } src_install() { - cmake_src_install + # bug #928577 + # https://gitlab.com/wireshark/wireshark/-/commit/fe7bfdf6caac9204ab5f34eeba7b0f4a0314d3cd + cmake_src_install install-headers # FAQ is not required as is installed from help/faq.txt dodoc AUTHORS ChangeLog NEWS README* doc/randpkt.txt doc/README* diff --git a/net-analyzer/wtfis/Manifest b/net-analyzer/wtfis/Manifest index be735c0292bc..170f1a8b7008 100644 --- a/net-analyzer/wtfis/Manifest +++ b/net-analyzer/wtfis/Manifest @@ -1 +1,3 @@ -DIST wtfis-0.7.1.gh.tar.gz 548395 BLAKE2B fbcc19358a0a357fdc9f4b5f27d4bda60e20a118c3c3b7cdfd90fad956d2ef0375efe4f0c8a3a94bfa8a6657d5bb710eaacb403b8c3d446921b963e3e8909442 SHA512 9a77c17e1e922e6d17aba9c6cc7364c8b65bc401cbca311280a4eef958056238aef87c2a8891c1bce5848083d1a7e5e00b0b63ead5ffefdea80ae7baee40c845 +DIST wtfis-0.10.0.gh.tar.gz 591068 BLAKE2B 6d47ed65c8d215a29e81c74050fb4b2b30f9d55f96709779ac1c52e1031813fda56c5ef35956a6bdc0bbd295ac15b23f601553d3156dc773aa4da6238adb3bc3 SHA512 95f544a752fb836b45511dd4fb8f8bbde3ba1edba1f4bd5a90a29c5ae25d94f2ca7ed2dc400274cdb5fa7c2e2734574d496889501ab56ea761d7c20c64e737c8 +DIST wtfis-0.8.0.gh.tar.gz 576810 BLAKE2B ac4573893aacc2533fe9ed3248613d3bf5ffb390a2dcbf01fd0590093a7bf753ee8da6e67b60142111726d55928a7913bb3f7ae1a22474876dec1cb3d81d3a3c SHA512 b709948d0ccd75472d9ccc0bfc4cec943700e57eccc42cc486075b8b89516fff054b6df92d6b23999987bab97b80db755de575cba4b56e2bd01a6bf24f058798 +DIST wtfis-0.9.1.gh.tar.gz 590558 BLAKE2B e4d1b70bd979b1cdf5c09e9adcf2e9484eb15a8986dc4c1f88d29af830f18a6974a6f5ec5cbb808c039df85aad708dec822ccdd8c765507c1a62084d6173e1c0 SHA512 72b6725c62d7345440021e57144c637e0c5503cfd870a8626707508428dc0ba24ae183b11836c726a58de6f2103e57cb7a3be4d132f7c8b758f88463d195dcc2 diff --git a/net-analyzer/wtfis/wtfis-0.10.0.ebuild b/net-analyzer/wtfis/wtfis-0.10.0.ebuild new file mode 100644 index 000000000000..a105c7bc0d6e --- /dev/null +++ b/net-analyzer/wtfis/wtfis-0.10.0.ebuild @@ -0,0 +1,38 @@ +# Copyright 2022-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISTUTILS_USE_PEP517=hatchling +PYTHON_COMPAT=( python3_{10..12} ) +inherit distutils-r1 + +DESCRIPTION="Passive hostname, domain and IP lookup tool for non-robots" +HOMEPAGE="https://github.com/pirxthepilot/wtfis" + +if [[ ${PV} = "9999" ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/pirxthepilot/wtfis.git" +else + SRC_URI="https://github.com/pirxthepilot/wtfis/archive/refs/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz" + KEYWORDS="~amd64 ~loong ~x86" +fi + +LICENSE="MIT" +SLOT="0" + +RDEPEND=" + >=dev-python/pydantic-2.7.2[${PYTHON_USEDEP}] + >=dev-python/python-dotenv-1.0.1[${PYTHON_USEDEP}] + >=dev-python/requests-2.32.3[${PYTHON_USEDEP}] + >=dev-python/rich-13.7.1[${PYTHON_USEDEP}] + >=net-analyzer/shodan-1.31.0[${PYTHON_USEDEP}] +" +BDEPEND=" + test? ( + dev-python/freezegun[${PYTHON_USEDEP}] + dev-python/rich[${PYTHON_USEDEP}] + ) +" + +distutils_enable_tests pytest diff --git a/net-analyzer/wtfis/wtfis-0.7.1.ebuild b/net-analyzer/wtfis/wtfis-0.8.0.ebuild index b95434bd9279..08106d305363 100644 --- a/net-analyzer/wtfis/wtfis-0.7.1.ebuild +++ b/net-analyzer/wtfis/wtfis-0.8.0.ebuild @@ -1,10 +1,10 @@ -# Copyright 2022-2023 Gentoo Authors +# Copyright 2022-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 DISTUTILS_USE_PEP517=hatchling -PYTHON_COMPAT=( python3_{10..11} ) +PYTHON_COMPAT=( python3_{10..12} ) inherit distutils-r1 DESCRIPTION="Passive hostname, domain and IP lookup tool for non-robots" diff --git a/net-analyzer/wtfis/wtfis-0.9.1.ebuild b/net-analyzer/wtfis/wtfis-0.9.1.ebuild new file mode 100644 index 000000000000..15b2076adcb5 --- /dev/null +++ b/net-analyzer/wtfis/wtfis-0.9.1.ebuild @@ -0,0 +1,38 @@ +# Copyright 2022-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISTUTILS_USE_PEP517=hatchling +PYTHON_COMPAT=( python3_{10..12} ) +inherit distutils-r1 + +DESCRIPTION="Passive hostname, domain and IP lookup tool for non-robots" +HOMEPAGE="https://github.com/pirxthepilot/wtfis" + +if [[ ${PV} = "9999" ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/pirxthepilot/wtfis.git" +else + SRC_URI="https://github.com/pirxthepilot/wtfis/archive/refs/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz" + KEYWORDS="amd64 ~loong x86" +fi + +LICENSE="MIT" +SLOT="0" + +RDEPEND=" + >=dev-python/pydantic-2.7.1[${PYTHON_USEDEP}] + >=dev-python/python-dotenv-1.0.1[${PYTHON_USEDEP}] + >=dev-python/requests-2.31.0[${PYTHON_USEDEP}] + >=dev-python/rich-13.7.1[${PYTHON_USEDEP}] + >=net-analyzer/shodan-1.31.0[${PYTHON_USEDEP}] +" +BDEPEND=" + test? ( + dev-python/freezegun[${PYTHON_USEDEP}] + dev-python/rich[${PYTHON_USEDEP}] + ) +" + +distutils_enable_tests pytest diff --git a/net-analyzer/wtfis/wtfis-9999.ebuild b/net-analyzer/wtfis/wtfis-9999.ebuild index 2d1aacc2f992..a105c7bc0d6e 100644 --- a/net-analyzer/wtfis/wtfis-9999.ebuild +++ b/net-analyzer/wtfis/wtfis-9999.ebuild @@ -1,10 +1,10 @@ -# Copyright 2022-2023 Gentoo Authors +# Copyright 2022-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 DISTUTILS_USE_PEP517=hatchling -PYTHON_COMPAT=( python3_{10..11} ) +PYTHON_COMPAT=( python3_{10..12} ) inherit distutils-r1 DESCRIPTION="Passive hostname, domain and IP lookup tool for non-robots" @@ -22,12 +22,11 @@ LICENSE="MIT" SLOT="0" RDEPEND=" - >=dev-python/pydantic-2.0.3[${PYTHON_USEDEP}] - >=dev-python/python-dotenv-1.0.0[${PYTHON_USEDEP}] - >=dev-python/requests-2.31.0[${PYTHON_USEDEP}] - >=dev-python/rich-13.4.2[${PYTHON_USEDEP}] - <dev-python/rich-13.5.0[${PYTHON_USEDEP}] - >=net-analyzer/shodan-1.29.1[${PYTHON_USEDEP}] + >=dev-python/pydantic-2.7.2[${PYTHON_USEDEP}] + >=dev-python/python-dotenv-1.0.1[${PYTHON_USEDEP}] + >=dev-python/requests-2.32.3[${PYTHON_USEDEP}] + >=dev-python/rich-13.7.1[${PYTHON_USEDEP}] + >=net-analyzer/shodan-1.31.0[${PYTHON_USEDEP}] " BDEPEND=" test? ( diff --git a/net-analyzer/xprobe/xprobe-0.3-r1.ebuild b/net-analyzer/xprobe/xprobe-0.3-r1.ebuild index d630b7fd1214..8416f8e294ac 100644 --- a/net-analyzer/xprobe/xprobe-0.3-r1.ebuild +++ b/net-analyzer/xprobe/xprobe-0.3-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -9,7 +9,7 @@ MY_P=${PN}2-${PV} DESCRIPTION="Active OS fingerprinting tool - this is Xprobe2" HOMEPAGE="http://sys-security.com/blog/xprobe2" -SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz" +SRC_URI="https://downloads.sourceforge.net/${PN}/${MY_P}.tar.gz" S="${WORKDIR}"/${MY_P} LICENSE="GPL-2" diff --git a/net-analyzer/zabbix/Manifest b/net-analyzer/zabbix/Manifest index fad4f8a00c82..4fbbdc78579d 100644 --- a/net-analyzer/zabbix/Manifest +++ b/net-analyzer/zabbix/Manifest @@ -1,10 +1,18 @@ -DIST zabbix-5.0.41-go-deps.tar.xz 27617232 BLAKE2B 0a9685346da40df4cdf2f27e17fdc87311794e5af583d043ee07d75ab7847ea7169135c16f2add736e02ec98055394d9fddf140cada71bbcd5b82f3ca7a842ba SHA512 f16e2735c78e5f3c3d6dda613f5729557ac3e089bf26d670554fbe57eb2489ec0bd7c074c601e856f919ed0e06cba2f1a75e116cde359514fff204633d721a5d -DIST zabbix-5.0.41.tar.gz 21828342 BLAKE2B a2edf10623603a12e3302e332232c6c70100aa8610b9ad5a510c8fa4efc7a75d190bb0b628aa77d29e1c7cd5c7e3e3c17af5a102f17cc515ef63c7a3b247bb20 SHA512 b47eec8925a55e2ceabe98cffc0975d4026c3a2d77ff7016c05b01ed3ffc0ff08c826c8673673396f9d48cf53cb861163d1e1e8a4cdaa44e439aaad0c3e4e78a -DIST zabbix-6.0.26-go-deps.tar.xz 30730540 BLAKE2B e4c94cf6a649f76059bd6cf8590fa1673571d1c3a0086d1b6ebd264bf92f7091c72b75d494a1eff2f17e40c627f18b2a7cdcfda77f6198b22dd3d7367f8d0bce SHA512 a5cdb84a7fe1b85d7877b5465aa8834480db137f5670c462f04ab50f68018fd44882f11ef47d7c43e6aeb946490a6579de84e36b7d9dc11a5edde4d37d34043c -DIST zabbix-6.0.26.tar.gz 44305733 BLAKE2B 06d2b012c63aa51e62ddd807e1ab902dbeeab9271edac89b428d0c9ad997ddebeca2e68fd77da838ebc3cd6a9ded43d9c435cc8054ece9e8c6ead4704706ec40 SHA512 d9e5335288d171d8c21a054d009d93439bb6090195cd853be750ca9245a43ec5db02ac45a953a9c62f0bf1b84ff7b618f24733a547dd376110a41ad96d13d4d1 -DIST zabbix-6.0.27-go-deps.tar.xz 31178788 BLAKE2B fe6334a8a593395c3cdbbb0cb3185ea13d12a3f66cb95613a2f3ab2b935b26ea9d4aa5ee1df1fad34605b652dae672b40d158c18967d4623ad845f6073aabb8b SHA512 d56abee27ad544636e9077315239e9b960eb3eb97ed6e26f57c40ca70bb31806b2eee685c3860ebdcbd545f8ced96bcd19469c1dc0330564165d8ed80b835748 -DIST zabbix-6.0.27.tar.gz 44522147 BLAKE2B 793bb887bd8f0d3c2f3d15a4ed9bb5b1fcfb13fcf80ea077672744a1bd8524e213eaf53291e0f9eecb9eb055fee6f1e29e91f890b54698906beac21ca54db4e9 SHA512 d459f44eca300eb4de9bbf1bc6655f065b50f9a7a1247cebd987e3ccbb8b5cb62847c63dadcb289b837e80a9af609e0a42b110152831de8d4f7398b921783daf -DIST zabbix-6.4.11-go-deps.tar.xz 33078704 BLAKE2B 36c1f5e7a86171b10c065e6f25ec92e24bcb6aadae4aeb3eb8403be070ec25bbfb16188aa8df7ee511a5eb592b855a20da3190b06f360f4796874d060d3cdd94 SHA512 7b13f2842933c525de4e8d72c2d2dc7e39856198a8982e568b817b898df18431a4fef9f1ef12d680e9ee5cd30ec244df6c7efb3bde471e27bc512b548d4c2c2f -DIST zabbix-6.4.11.tar.gz 45805334 BLAKE2B bb3ecd5bbfcbb4c9725635313859d69df17b073e2c71b58579cf530efe43c0165534aa9c4d3882f3d3d166e0693bf3490f4359fd78a7cb4bade89bd76b4b2339 SHA512 a65e59c26a1f235f9e923eb51150297d5c8fce3af86967ae5c2244c9f96a056a3fa60c84c18f4d35f7319b33143878d49e3c79a88dfdcb2e9b678a24e17028bc -DIST zabbix-6.4.12-go-deps.tar.xz 33295596 BLAKE2B cec43d1b236dac32d504169a0aaa293429f4da1a6ad412a02cb9e87942c47a3b66a13dd52b36116d5e522ef1be8a3fa2d6e102dc1c7398d80fd5e0003eb0cd5e SHA512 5a12d563c2ae5beadf6976f15289fc17e9d289e6f9c0b7cfa196905da79f3ecc177132423bc2e8d08f44248ca0c7ff5316d3e801e5030264094121b51e265642 -DIST zabbix-6.4.12.tar.gz 45960734 BLAKE2B ef05e1be30a68f2394108e8ea10f75604060531791d49e20e59704e020a9aac99bb5a80cd276837b327e7f3dbc2f6ea0f85066a0e3eccd0b3f538a00e083b55c SHA512 f2da55ddd165ad1f126ddc65368bbcbe1cc36a057fc297f7c804bed7e6afc7688289f9e03d3f81962d6ae5c7b05d97389161aeca835cfd2abcbdec52ca7ef106 +DIST zabbix-5.0.42-go-deps.tar.xz 27792520 BLAKE2B 900f47dd211d761204d9b47ad386974512a9d51761407893b5be986b3a8f577a8bc12fb8f3d7b7c6c2cd2af1170080901875f6fdb5697089d08f6843d5af6eb0 SHA512 eee469e4b638c50a375fc6802676c76d138295545b41118cd6cd36d8dbec626ae16b05844f74d3ea7f4e3f96d48653a53c4332cc7bc668154c060da0e07b7d07 +DIST zabbix-5.0.42.tar.gz 21825176 BLAKE2B 378b740ec70d29156b4a9cf4b67436ff63057513bcd9ad596f3da2c2737cff16a5b88e84763f94c621e549a8749ef8995b4d51d578e533d62b9e07842bbe4dea SHA512 305b2d1873aad091aeb893e82f5c9aeb253c71683a1a95f7711c824fe0b9b29c7c6e96a17a727f9eb0f512d0983bb7d62bfb32e9a50b7ff2e7b0e9bf7d9ff42e +DIST zabbix-6.0.30-go-deps.tar.xz 30833644 BLAKE2B 0b15f210c16dd8ab6bef0fbcb1926dee99aa73716ebe2285c69e9630723c5a85d1083c380c192707cf56c5ff04d3064320eda12d568c08e104f629dc256d696c SHA512 c5074ed89a60b5491a823015126a15d4e58f1964887d15b5e7ca9ecaea3ff2c026f4e2554db25bb26367a66adfc981a7debb89c08fb90927241e7f018fd2ab11 +DIST zabbix-6.0.30.tar.gz 45039653 BLAKE2B 5446a15c5fa3400d78eef47cced6cbd0bc884b6b1f14e267321f562b5891e21de41179bb615a733b49ee0ae334aadede32d931db400b9148ec9bc6636ac71e5a SHA512 8e49b53a30d4c9450ea00600144542cc1c709b2a11f3716462eefedee4d47b59c99334002bfd6644c6c49afaba0a268c86f9824ac7d45305c95b55681fd82eee +DIST zabbix-6.0.31-go-deps.tar.xz 31203888 BLAKE2B e4b2a8a0f505f01b58dc0dd6baf5ea243cbba0fe996aa022a64248a1b698f8919aead95540e05dad71c7b3610cc86ba40dcb685960a0f234d1dc04739ed69f38 SHA512 ef6813f7e29aaf5b2361952fe5373fdbbb2b9a9c39a2314cd3daf8e4f8233f8ded31f29c3efe1f8a9fecb79c4872d5fb7ffdc846c7dd6bbdfb95f683f936e48a +DIST zabbix-6.0.31.tar.gz 45176869 BLAKE2B d00a02d764f3f8800a87ef5763fff3cd27b5e6c8ed57bd07b23da809e9b4dd61a1b575c7717ff39311b16bba4906256a48ab01e8f2b4b594bcfde25ae003ed73 SHA512 75488e47ac32758f41ebe76d2e6a0e7f165e3921e04b9ac8304dc72a97718739aef06c42baa3d474066bd6f10c944547131c25ef4d553df9cbd13b797ea3d586 +DIST zabbix-6.0.32-go-deps.tar.xz 31197844 BLAKE2B 91d99f94ed189c0e8f08d01c5b88835588c7797d33c54b0c60d593afe8d6f14aa481a6036db840ca7b2782ac4440dcaf757306a52ef11fce1408714c8face139 SHA512 63d9804563c12aac7fed4de28b6c1726f1bdfe338170a5d6c82413736920b082287dbb1fd7d64b7db84d013403dde2f5518783135495ff7e2563e927e6e213f9 +DIST zabbix-6.0.32.tar.gz 45340574 BLAKE2B 7b6b7db112184691e9584a7017776c14023ee94f6228c21b9b2c4a1e6e822454e8c1847d51ba4ac71b984e40d4d80e64b77155c64ea2fe45f00c2b02dcc6a215 SHA512 f19fe303b5377fbdc78c63016e7af1395a07e96b1ae394afe73fc9c7669b6eccb599942e9aebe7e173d827bc3c48284c918e9867dded00f4f0da74cb60653221 +DIST zabbix-6.4.15-go-deps.tar.xz 33572368 BLAKE2B 2065ede50e7682b180387e08b2b2e9893fde4dd5316d2087aa7931a0e08b100558a47b49e9e5204f60ad9e0ce480dce9787e7a43d3841a67b9ea96db80fd1703 SHA512 347b51492147e203a2d7966fd8fe8f2b044fecd45948a767fcf4f79c96cebe8774643a1d0940a76103d25eecf852770a3a7c156d371a3de2cfef2121de5c076a +DIST zabbix-6.4.15.tar.gz 46631895 BLAKE2B 3f9c23db6e8d0895b1fb5566b2cd9877d1e219c17ebea7dc5057621313c9b6f7ecd5cf1bedd3f759dfa4a429a87b50b06b97bb663d756817027c2f04ce3a625a SHA512 2fb032a02e3c507807dde140fdb17ad453ba199c724f3eb7e0e053d64df3c4f57bbc63b794eedfb3b5000f23bcabb5d6aa89039fa6f1a118c70f5cd44fd5ff02 +DIST zabbix-6.4.16-go-deps.tar.xz 33766756 BLAKE2B 24ce0f3febbdeaf16f54eb351861ba8adbd59e9a54ab898882eab80741f34b7f255d226f4a61df2f8b5c4ac9e36160fa14ce872ab0c55c811eb4f5529c5213db SHA512 925344d69da4cadf9ea4fd27a1f991c14a6b77d0c58f3884e4c4e0b29f5ab2427507d2cce3d81085feafc88b87e6c1c1885813cd97543af28b0c0cf4246b5988 +DIST zabbix-6.4.16.tar.gz 46717893 BLAKE2B 69212ba902195cabc38a14c9c0865d3f613662b58c5d21b654f030e888d9a33eec8c2149478b1e28af2bcfae07c9f34d5bc2531d17fd15f095916dfb64d76e64 SHA512 1688ac2fa6f3361f866f93e39b38c898e2460c510b982301b67899bcf42fb3949c843918fd0b566c5c1126ef8cb39407d5b73d22c6a0fd7a8404506df0544e33 +DIST zabbix-6.4.17-go-deps.tar.xz 34014892 BLAKE2B d3e4710fb1cb86a8842cef4fb66a9d68df6738cf6cf4c9a9d219f6af16e4829627c668fefca79d7face897b529b76182f0068629f4278ed68af8c97e49a204a7 SHA512 96b58aba2b14b5f9c89aeb65efbc30304fab1e276d2cb2b23cac90510b71ab6ce7dec4520ebe5c1dc244e95475dfa259e320390078b10aaaf8042d8039342bdb +DIST zabbix-6.4.17.tar.gz 46879401 BLAKE2B 957ae298e09debeb962d6b902569eb083cd3b6f93371984c7adb4464e4c1547292bf9df6ced5440c775b81e7b3276d8ec124f844de7d3bc68639a7bab1e41c2a SHA512 ef0840427c1814c6292debbabaa0754f377d1b4ad8c36474acabfd5d474cc3d0ceef36daccf2aa545ccda66e42b674ca3fe038eea9569127adc08cbfacf87b55 +DIST zabbix-7.0.0-go-deps.tar.xz 33347940 BLAKE2B 7da8c3ff2bb74c31c551d61fa3d5ffc6d6a330361eea178dffc5379412da2fce9330acfe35bef2ae1c515a47ecef3ff24f54f17692cb32226d928b4f1d2072e8 SHA512 a365da2fb5dc3ecdaa2a4c4ee53aa022b298ded16e150814cc0cbd3b9dbaa12d5f163130724ba2ac6a129acc99386b7fd81ca3834d69fb856bdc805d90c0d3c2 +DIST zabbix-7.0.0.tar.gz 47919968 BLAKE2B dc6736a1e433b5f0d742ec9e908b47a0094da77f69103d566b7476379a28819e46d9327d53e388b9ccfeb7b3b4d976fb47ba94a02057ab62ef8294e19af00188 SHA512 3302f6f7b8731e25c87d1582f897d25b8e9b5eeeddb3632aea57e39bb7a47acbaa5e74e175e83166ea3476e7e932f3282b6cc353104cdfc87dea3d4976fbc703 +DIST zabbix-7.0.1-go-deps.tar.xz 33725452 BLAKE2B fb30e17b149e259554f0677654dca3be6b0ec5d5751fda5ed31fcb41233e108fa2e115c86be960a1e2719be6e4573d0bf38f5d4e86b39da377526af84281bd4a SHA512 ef4d7e79f0642517e6f50e3b62cdf585e77e82bf0587707f7729412ac3c8ac58582a2e4ce510b4e77e559495473d6830180000ca30f249fb609dfdef55e2bcda +DIST zabbix-7.0.1.tar.gz 48130576 BLAKE2B faf40ccfd2e1ebf7044611aa6e7f64d8fd17aa65c612602adb1716596949a1113fa07c2871d5f6f259c638fe21ff872a745d69ebf48fdfda664456caee2f4fb9 SHA512 c3aa03cca53f1711c4f60c925c804a0ae97a4d422392aca0142cff305e28b5eaa1e431b28f99f8926ae95e119417d20ef0d56afc8673fbcee2ffbca28269590b diff --git a/net-analyzer/zabbix/zabbix-5.0.41.ebuild b/net-analyzer/zabbix/zabbix-5.0.42-r1.ebuild index 4922de26cbb4..825621954fe2 100644 --- a/net-analyzer/zabbix/zabbix-5.0.41.ebuild +++ b/net-analyzer/zabbix/zabbix-5.0.42-r1.ebuild @@ -21,6 +21,8 @@ SRC_URI="https://cdn.zabbix.com/${PN}/sources/stable/$(ver_cut 1-2)/${P}.tar.gz agent2? ( https://dev.gentoo.org/~fordfrog/distfiles/${P}-go-deps.tar.xz ) " +S=${WORKDIR}/${MY_P} + LICENSE="GPL-2" SLOT="0/$(ver_cut 1-2)" WEBAPP_MANUAL_SLOT="yes" @@ -84,7 +86,6 @@ RDEPEND="${COMMON_DEPEND} virtual/httpd-php:* mysql? ( dev-lang/php[mysqli] ) odbc? ( dev-lang/php[odbc] ) - oracle? ( dev-lang/php[oci8-instant-client] ) postgres? ( dev-lang/php[postgres] ) sqlite? ( dev-lang/php[sqlite] ) ) @@ -122,8 +123,6 @@ PATCHES=( "${FILESDIR}/${PN}-5.0.22-system.sw.packages.patch" ) -S=${WORKDIR}/${MY_P} - ZABBIXJAVA_BASE="opt/zabbix_java" pkg_setup() { @@ -229,6 +228,14 @@ src_install() { newtmpfiles "${FILESDIR}"/zabbix-proxy.tmpfiles zabbix-proxy.conf fi + if use oracle; then + ewarn + ewarn "Support for Oracle database has been dropped from PHP" + ewarn "so to make the web frontend work, you need to install" + ewarn "PECL extension for Oracle database." + ewarn "For details see https://bugs.gentoo.org/928386" + fi + if use agent; then insinto /etc/zabbix doins "${S}"/conf/zabbix_agentd.conf diff --git a/net-analyzer/zabbix/zabbix-6.0.26.ebuild b/net-analyzer/zabbix/zabbix-6.0.30.ebuild index de9271b01335..7cbc451d3735 100644 --- a/net-analyzer/zabbix/zabbix-6.0.26.ebuild +++ b/net-analyzer/zabbix/zabbix-6.0.30.ebuild @@ -4,7 +4,7 @@ # To create the go modules tarball: # cd src/go # GOMODCACHE="${PWD}"/go-mod go mod download -modcacherw -# tar -acf zabbix-${PV}-go-deps.tar.xz go-mod +# tar -acf $(pwd | grep -Eo 'zabbix-[0-9.]+')-go-deps.tar.xz go-mod EAPI=8 @@ -21,6 +21,8 @@ SRC_URI="https://cdn.zabbix.com/${PN}/sources/stable/$(ver_cut 1-2)/${P}.tar.gz agent2? ( https://dev.gentoo.org/~fordfrog/distfiles/${P}-go-deps.tar.xz ) " +S=${WORKDIR}/${MY_P} + LICENSE="GPL-2" SLOT="0/$(ver_cut 1-2)" WEBAPP_MANUAL_SLOT="yes" @@ -84,7 +86,6 @@ RDEPEND="${COMMON_DEPEND} virtual/httpd-php:* mysql? ( dev-lang/php[mysqli] ) odbc? ( dev-lang/php[odbc] ) - oracle? ( dev-lang/php[oci8-instant-client] ) postgres? ( dev-lang/php[postgres] ) sqlite? ( dev-lang/php[sqlite] ) ) @@ -122,8 +123,6 @@ PATCHES=( "${FILESDIR}/${PN}-6.0.3-system.sw.packages.patch" ) -S=${WORKDIR}/${MY_P} - ZABBIXJAVA_BASE="opt/zabbix_java" pkg_setup() { @@ -354,6 +353,14 @@ pkg_postinst() { elog fi + if use oracle; then + ewarn + ewarn "Support for Oracle database has been dropped from PHP" + ewarn "so to make the web frontend work, you need to install" + ewarn "PECL extension for Oracle database." + ewarn "For details see https://bugs.gentoo.org/928386" + fi + if use proxy; then tmpfiles_process zabbix-proxy.conf fi diff --git a/net-analyzer/zabbix/zabbix-6.0.27.ebuild b/net-analyzer/zabbix/zabbix-6.0.31.ebuild index 1d7887fa3842..44884d9f45ff 100644 --- a/net-analyzer/zabbix/zabbix-6.0.27.ebuild +++ b/net-analyzer/zabbix/zabbix-6.0.31.ebuild @@ -4,7 +4,7 @@ # To create the go modules tarball: # cd src/go # GOMODCACHE="${PWD}"/go-mod go mod download -modcacherw -# tar -acf zabbix-${PV}-go-deps.tar.xz go-mod +# tar -acf $(pwd | grep -Eo 'zabbix-[0-9.]+')-go-deps.tar.xz go-mod EAPI=8 @@ -21,6 +21,8 @@ SRC_URI="https://cdn.zabbix.com/${PN}/sources/stable/$(ver_cut 1-2)/${P}.tar.gz agent2? ( https://dev.gentoo.org/~fordfrog/distfiles/${P}-go-deps.tar.xz ) " +S=${WORKDIR}/${MY_P} + LICENSE="GPL-2" SLOT="0/$(ver_cut 1-2)" WEBAPP_MANUAL_SLOT="yes" @@ -84,7 +86,6 @@ RDEPEND="${COMMON_DEPEND} virtual/httpd-php:* mysql? ( dev-lang/php[mysqli] ) odbc? ( dev-lang/php[odbc] ) - oracle? ( dev-lang/php[oci8-instant-client] ) postgres? ( dev-lang/php[postgres] ) sqlite? ( dev-lang/php[sqlite] ) ) @@ -122,8 +123,6 @@ PATCHES=( "${FILESDIR}/${PN}-6.0.3-system.sw.packages.patch" ) -S=${WORKDIR}/${MY_P} - ZABBIXJAVA_BASE="opt/zabbix_java" pkg_setup() { @@ -354,6 +353,14 @@ pkg_postinst() { elog fi + if use oracle; then + ewarn + ewarn "Support for Oracle database has been dropped from PHP" + ewarn "so to make the web frontend work, you need to install" + ewarn "PECL extension for Oracle database." + ewarn "For details see https://bugs.gentoo.org/928386" + fi + if use proxy; then tmpfiles_process zabbix-proxy.conf fi diff --git a/net-analyzer/zabbix/zabbix-6.0.32.ebuild b/net-analyzer/zabbix/zabbix-6.0.32.ebuild new file mode 100644 index 000000000000..44884d9f45ff --- /dev/null +++ b/net-analyzer/zabbix/zabbix-6.0.32.ebuild @@ -0,0 +1,389 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +# To create the go modules tarball: +# cd src/go +# GOMODCACHE="${PWD}"/go-mod go mod download -modcacherw +# tar -acf $(pwd | grep -Eo 'zabbix-[0-9.]+')-go-deps.tar.xz go-mod + +EAPI=8 + +GO_OPTIONAL="yes" +# needed to make webapp-config dep optional +WEBAPP_OPTIONAL="yes" +inherit webapp java-pkg-opt-2 systemd tmpfiles toolchain-funcs go-module user-info + +DESCRIPTION="ZABBIX is software for monitoring of your applications, network and servers" +HOMEPAGE="https://www.zabbix.com/" +MY_P=${P/_/} +MY_PV=${PV/_/} +SRC_URI="https://cdn.zabbix.com/${PN}/sources/stable/$(ver_cut 1-2)/${P}.tar.gz + agent2? ( https://dev.gentoo.org/~fordfrog/distfiles/${P}-go-deps.tar.xz ) +" + +S=${WORKDIR}/${MY_P} + +LICENSE="GPL-2" +SLOT="0/$(ver_cut 1-2)" +WEBAPP_MANUAL_SLOT="yes" +KEYWORDS="~amd64 ~x86" +IUSE="agent +agent2 curl frontend gnutls ipv6 java ldap libxml2 mysql odbc openipmi +openssl oracle +postgres proxy selinux server snmp sqlite ssh static" +REQUIRED_USE="|| ( agent agent2 frontend proxy server ) + ?? ( gnutls openssl ) + agent2? ( !gnutls ) + proxy? ( ^^ ( mysql oracle postgres sqlite ) ) + server? ( ^^ ( mysql oracle postgres ) !sqlite ) + static? ( !oracle !snmp )" + +COMMON_DEPEND=" + curl? ( net-misc/curl ) + gnutls? ( net-libs/gnutls:0= ) + java? ( >=virtual/jdk-1.8:* ) + ldap? ( + =dev-libs/cyrus-sasl-2* + net-libs/gnutls:= + net-nds/openldap:= + ) + libxml2? ( dev-libs/libxml2 ) + mysql? ( dev-db/mysql-connector-c:= ) + odbc? ( dev-db/unixODBC ) + openipmi? ( sys-libs/openipmi ) + openssl? ( dev-libs/openssl:=[-bindist(-)] ) + oracle? ( dev-db/oracle-instantclient[odbc,sdk] ) + postgres? ( dev-db/postgresql:* ) + proxy? ( + dev-libs/libevent:= + sys-libs/zlib + ) + server? ( + dev-libs/libevent:= + sys-libs/zlib + ) + snmp? ( net-analyzer/net-snmp:= ) + sqlite? ( dev-db/sqlite ) + ssh? ( net-libs/libssh2 ) +" + +RDEPEND="${COMMON_DEPEND} + acct-group/zabbix + acct-user/zabbix + java? ( >=virtual/jre-1.8:* ) + mysql? ( virtual/mysql ) + proxy? ( + dev-libs/libpcre2:= + net-analyzer/fping[suid] + ) + selinux? ( sec-policy/selinux-zabbix ) + server? ( + app-admin/webapp-config + dev-libs/libpcre2:= + net-analyzer/fping[suid] + ) + frontend? ( + app-admin/webapp-config + dev-lang/php:*[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode] + media-libs/gd[png] + virtual/httpd-php:* + mysql? ( dev-lang/php[mysqli] ) + odbc? ( dev-lang/php[odbc] ) + postgres? ( dev-lang/php[postgres] ) + sqlite? ( dev-lang/php[sqlite] ) + ) +" +DEPEND="${COMMON_DEPEND} + static? ( + curl? ( net-misc/curl[static-libs] ) + ldap? ( + =dev-libs/cyrus-sasl-2*[static-libs] + net-libs/gnutls[static-libs] + net-nds/openldap[static-libs] + ) + libxml2? ( dev-libs/libxml2[static-libs] ) + mysql? ( dev-db/mysql-connector-c[static-libs] ) + odbc? ( dev-db/unixODBC[static-libs] ) + postgres? ( dev-db/postgresql:*[static-libs] ) + sqlite? ( dev-db/sqlite[static-libs] ) + ssh? ( net-libs/libssh2 ) + ) +" +BDEPEND=" + virtual/pkgconfig + agent2? ( + >=dev-lang/go-1.12 + app-arch/unzip + ) +" + +# upstream tests fail for agent2 +RESTRICT="test" + +PATCHES=( + "${FILESDIR}/${PN}-4.0.18-modulepathfix.patch" + "${FILESDIR}/${PN}-3.0.30-security-disable-PidFile.patch" + "${FILESDIR}/${PN}-6.0.3-system.sw.packages.patch" +) + +ZABBIXJAVA_BASE="opt/zabbix_java" + +pkg_setup() { + if use oracle; then + if [ -z "${ORACLE_HOME}" ]; then + eerror + eerror "The environment variable ORACLE_HOME must be set" + eerror "and point to the correct location." + eerror "It looks like you don't have Oracle installed." + eerror + die "Environment variable ORACLE_HOME is not set" + fi + fi + + if use frontend; then + webapp_pkg_setup + fi + + java-pkg-opt-2_pkg_setup +} + +src_prepare() { + default +} + +src_configure() { + local econf_args=( + --with-libpcre2 + "$(use_enable agent)" + "$(use_enable agent2)" + "$(use_enable ipv6)" + "$(use_enable java)" + "$(use_enable proxy)" + "$(use_enable server)" + "$(use_enable static)" + "$(use_with curl libcurl)" + "$(use_with gnutls)" + "$(use_with ldap)" + "$(use_with libxml2)" + "$(use_with mysql)" + "$(use_with odbc unixodbc)" + "$(use_with openipmi openipmi)" + "$(use_with openssl)" + "$(use_with oracle)" + "$(use_with postgres postgresql)" + "$(use_with snmp net-snmp)" + "$(use_with sqlite sqlite3)" + "$(use_with ssh ssh2)" + ) + + econf ${econf_args[@]} +} + +src_compile() { + if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]; then + emake AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" + fi +} + +src_install() { + local dirs=( + /etc/zabbix + /var/lib/zabbix + /var/lib/zabbix/home + /var/lib/zabbix/scripts + /var/lib/zabbix/alertscripts + /var/lib/zabbix/externalscripts + /var/log/zabbix + ) + + for dir in "${dirs[@]}"; do + keepdir "${dir}" + done + + if use server; then + insinto /etc/zabbix + doins "${S}"/conf/zabbix_server.conf + fperms 0640 /etc/zabbix/zabbix_server.conf + fowners root:zabbix /etc/zabbix/zabbix_server.conf + + newinitd "${FILESDIR}"/zabbix-server-r1.init zabbix-server + + dosbin src/zabbix_server/zabbix_server + + insinto /usr/share/zabbix + doins -r "${S}"/database/ + + systemd_dounit "${FILESDIR}"/zabbix-server.service + newtmpfiles "${FILESDIR}"/zabbix-server.tmpfiles zabbix-server.conf + fi + + if use proxy; then + insinto /etc/zabbix + doins "${S}"/conf/zabbix_proxy.conf + fperms 0640 /etc/zabbix/zabbix_proxy.conf + fowners root:zabbix /etc/zabbix/zabbix_proxy.conf + + newinitd "${FILESDIR}"/zabbix-proxy.init zabbix-proxy + + dosbin src/zabbix_proxy/zabbix_proxy + + insinto /usr/share/zabbix + doins -r "${S}"/database/ + + systemd_dounit "${FILESDIR}"/zabbix-proxy.service + newtmpfiles "${FILESDIR}"/zabbix-proxy.tmpfiles zabbix-proxy.conf + fi + + if use agent; then + insinto /etc/zabbix + doins "${S}"/conf/zabbix_agentd.conf + fperms 0640 /etc/zabbix/zabbix_agentd.conf + fowners root:zabbix /etc/zabbix/zabbix_agentd.conf + + newinitd "${FILESDIR}"/zabbix-agentd.init zabbix-agentd + + dosbin src/zabbix_agent/zabbix_agentd + dobin \ + src/zabbix_sender/zabbix_sender \ + src/zabbix_get/zabbix_get + + systemd_dounit "${FILESDIR}"/zabbix-agentd.service + newtmpfiles "${FILESDIR}"/zabbix-agentd.tmpfiles zabbix-agentd.conf + fi + if use agent2; then + insinto /etc/zabbix + doins "${S}"/src/go/conf/zabbix_agent2.conf + fperms 0640 /etc/zabbix/zabbix_agent2.conf + fowners root:zabbix /etc/zabbix/zabbix_agent2.conf + keepdir /etc/zabbix/zabbix_agent2.d/plugins.d + + newinitd "${FILESDIR}"/zabbix-agent2.init zabbix-agent2 + + dosbin src/go/bin/zabbix_agent2 + + systemd_dounit "${FILESDIR}"/zabbix-agent2.service + newtmpfiles "${FILESDIR}"/zabbix-agent2.tmpfiles zabbix-agent2.conf + fi + + fowners root:zabbix /etc/zabbix + fowners zabbix:zabbix \ + /var/lib/zabbix \ + /var/lib/zabbix/home \ + /var/lib/zabbix/scripts \ + /var/lib/zabbix/alertscripts \ + /var/lib/zabbix/externalscripts \ + /var/log/zabbix + fperms 0750 \ + /etc/zabbix \ + /var/lib/zabbix \ + /var/lib/zabbix/home \ + /var/lib/zabbix/scripts \ + /var/lib/zabbix/alertscripts \ + /var/lib/zabbix/externalscripts \ + /var/log/zabbix + + dodoc README INSTALL NEWS ChangeLog \ + conf/zabbix_agentd.conf \ + conf/zabbix_proxy.conf \ + conf/zabbix_agentd/userparameter_examples.conf \ + conf/zabbix_agentd/userparameter_mysql.conf \ + conf/zabbix_server.conf + + if use frontend; then + webapp_src_preinst + cp -R ui/* "${D}/${MY_HTDOCSDIR}" + webapp_configfile \ + "${MY_HTDOCSDIR}"/include/db.inc.php \ + "${MY_HTDOCSDIR}"/include/config.inc.php + webapp_src_install + fi + + if use java; then + dodir \ + /${ZABBIXJAVA_BASE} \ + /${ZABBIXJAVA_BASE}/bin \ + /${ZABBIXJAVA_BASE}/lib + keepdir /${ZABBIXJAVA_BASE} + exeinto /${ZABBIXJAVA_BASE}/bin + doexe src/zabbix_java/bin/zabbix-java-gateway-"${MY_PV}".jar + exeinto /${ZABBIXJAVA_BASE}/lib + doexe \ + src/zabbix_java/lib/logback-classic-1.2.9.jar \ + src/zabbix_java/lib/logback-console.xml \ + src/zabbix_java/lib/logback-core-1.2.9.jar \ + src/zabbix_java/lib/logback.xml \ + src/zabbix_java/lib/android-json-4.3_r3.1.jar \ + src/zabbix_java/lib/slf4j-api-1.7.32.jar + newinitd "${FILESDIR}"/zabbix-jmx-proxy.init zabbix-jmx-proxy + newconfd "${FILESDIR}"/zabbix-jmx-proxy.conf zabbix-jmx-proxy + fi +} + +pkg_postinst() { + if use server || use proxy ; then + elog + elog "You may need to configure your database for Zabbix" + elog "if you have not already done so." + elog + + zabbix_homedir=$(egethome zabbix) + if [ -n "${zabbix_homedir}" ] && \ + [ "${zabbix_homedir}" != "/var/lib/zabbix/home" ]; then + ewarn + ewarn "The user 'zabbix' should have his homedir changed" + ewarn "to /var/lib/zabbix/home if you want to use" + ewarn "custom alert scripts." + ewarn + ewarn "A real homedir might be needed for configfiles" + ewarn "for custom alert scripts." + ewarn + ewarn "To change the homedir use:" + ewarn " usermod -d /var/lib/zabbix/home zabbix" + ewarn + fi + fi + + if use server; then + tmpfiles_process zabbix-server.conf + + elog + elog "For distributed monitoring you have to run:" + elog + elog "zabbix_server -n <nodeid>" + elog + elog "This will convert database data for use with Node ID" + elog "and also adds a local node." + elog + fi + + if use oracle; then + ewarn + ewarn "Support for Oracle database has been dropped from PHP" + ewarn "so to make the web frontend work, you need to install" + ewarn "PECL extension for Oracle database." + ewarn "For details see https://bugs.gentoo.org/928386" + fi + + if use proxy; then + tmpfiles_process zabbix-proxy.conf + fi + + if use agent; then + tmpfiles_process zabbix-agentd.conf + fi + + if use agent2; then + tmpfiles_process zabbix-agent2.conf + fi + + elog "--" + elog + elog "You may need to add these lines to /etc/services:" + elog + elog "zabbix-agent 10050/tcp Zabbix Agent" + elog "zabbix-agent 10050/udp Zabbix Agent" + elog "zabbix-trapper 10051/tcp Zabbix Trapper" + elog "zabbix-trapper 10051/udp Zabbix Trapper" + elog +} + +pkg_prerm() { + (use frontend || use server) && webapp_pkg_prerm +} diff --git a/net-analyzer/zabbix/zabbix-6.4.11.ebuild b/net-analyzer/zabbix/zabbix-6.4.15.ebuild index 1134c7d2321f..44b5abc0f52e 100644 --- a/net-analyzer/zabbix/zabbix-6.4.11.ebuild +++ b/net-analyzer/zabbix/zabbix-6.4.15.ebuild @@ -4,7 +4,7 @@ # To create the go modules tarball: # cd src/go # GOMODCACHE="${PWD}"/go-mod go mod download -modcacherw -# tar -acf zabbix-${PV}-go-deps.tar.xz go-mod +# tar -acf $(pwd | grep -Eo 'zabbix-[0-9.]+')-go-deps.tar.xz go-mod EAPI=8 @@ -21,6 +21,8 @@ SRC_URI="https://cdn.zabbix.com/${PN}/sources/stable/$(ver_cut 1-2)/${P}.tar.gz agent2? ( https://dev.gentoo.org/~fordfrog/distfiles/${P}-go-deps.tar.xz ) " +S=${WORKDIR}/${MY_P} + LICENSE="GPL-2" SLOT="0/$(ver_cut 1-2)" WEBAPP_MANUAL_SLOT="yes" @@ -84,7 +86,6 @@ RDEPEND="${COMMON_DEPEND} virtual/httpd-php:* mysql? ( dev-lang/php[mysqli] ) odbc? ( dev-lang/php[odbc] ) - oracle? ( dev-lang/php[oci8-instant-client] ) postgres? ( dev-lang/php[postgres] ) sqlite? ( dev-lang/php[sqlite] ) ) @@ -123,8 +124,6 @@ PATCHES=( "${FILESDIR}/${PN}-6.4.6-clang16-build-fix.patch" ) -S=${WORKDIR}/${MY_P} - ZABBIXJAVA_BASE="opt/zabbix_java" pkg_setup() { @@ -358,6 +357,14 @@ pkg_postinst() { elog fi + if use oracle; then + ewarn + ewarn "Support for Oracle database has been dropped from PHP" + ewarn "so to make the web frontend work, you need to install" + ewarn "PECL extension for Oracle database." + ewarn "For details see https://bugs.gentoo.org/928386" + fi + if use proxy; then tmpfiles_process zabbix-proxy.conf fi diff --git a/net-analyzer/zabbix/zabbix-6.4.12.ebuild b/net-analyzer/zabbix/zabbix-6.4.16.ebuild index 99012ac90daf..1f01c04f346d 100644 --- a/net-analyzer/zabbix/zabbix-6.4.12.ebuild +++ b/net-analyzer/zabbix/zabbix-6.4.16.ebuild @@ -4,7 +4,7 @@ # To create the go modules tarball: # cd src/go # GOMODCACHE="${PWD}"/go-mod go mod download -modcacherw -# tar -acf zabbix-${PV}-go-deps.tar.xz go-mod +# tar -acf $(pwd | grep -Eo 'zabbix-[0-9.]+')-go-deps.tar.xz go-mod EAPI=8 @@ -21,6 +21,8 @@ SRC_URI="https://cdn.zabbix.com/${PN}/sources/stable/$(ver_cut 1-2)/${P}.tar.gz agent2? ( https://dev.gentoo.org/~fordfrog/distfiles/${P}-go-deps.tar.xz ) " +S=${WORKDIR}/${MY_P} + LICENSE="GPL-2" SLOT="0/$(ver_cut 1-2)" WEBAPP_MANUAL_SLOT="yes" @@ -84,7 +86,6 @@ RDEPEND="${COMMON_DEPEND} virtual/httpd-php:* mysql? ( dev-lang/php[mysqli] ) odbc? ( dev-lang/php[odbc] ) - oracle? ( dev-lang/php[oci8-instant-client] ) postgres? ( dev-lang/php[postgres] ) sqlite? ( dev-lang/php[sqlite] ) ) @@ -123,8 +124,6 @@ PATCHES=( "${FILESDIR}/${PN}-6.4.6-clang16-build-fix.patch" ) -S=${WORKDIR}/${MY_P} - ZABBIXJAVA_BASE="opt/zabbix_java" pkg_setup() { @@ -358,6 +357,14 @@ pkg_postinst() { elog fi + if use oracle; then + ewarn + ewarn "Support for Oracle database has been dropped from PHP" + ewarn "so to make the web frontend work, you need to install" + ewarn "PECL extension for Oracle database." + ewarn "For details see https://bugs.gentoo.org/928386" + fi + if use proxy; then tmpfiles_process zabbix-proxy.conf fi diff --git a/net-analyzer/zabbix/zabbix-6.4.17.ebuild b/net-analyzer/zabbix/zabbix-6.4.17.ebuild new file mode 100644 index 000000000000..1cf14aab3662 --- /dev/null +++ b/net-analyzer/zabbix/zabbix-6.4.17.ebuild @@ -0,0 +1,392 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +# To create the go modules tarball: +# cd src/go +# GOMODCACHE="${PWD}"/go-mod go mod download -modcacherw +# tar -acf $(pwd | grep -Eo 'zabbix-[0-9.]+')-go-deps.tar.xz go-mod + +EAPI=8 + +GO_OPTIONAL="yes" +# needed to make webapp-config dep optional +WEBAPP_OPTIONAL="yes" +inherit autotools webapp java-pkg-opt-2 systemd tmpfiles toolchain-funcs go-module user-info + +DESCRIPTION="ZABBIX is software for monitoring of your applications, network and servers" +HOMEPAGE="https://www.zabbix.com/" +MY_P=${P/_/} +MY_PV=${PV/_/} +SRC_URI="https://cdn.zabbix.com/${PN}/sources/stable/$(ver_cut 1-2)/${P}.tar.gz + agent2? ( https://dev.gentoo.org/~fordfrog/distfiles/${P}-go-deps.tar.xz ) +" + +S=${WORKDIR}/${MY_P} + +LICENSE="GPL-2" +SLOT="0/$(ver_cut 1-2)" +WEBAPP_MANUAL_SLOT="yes" +KEYWORDS="~amd64 ~x86" +IUSE="agent +agent2 curl frontend gnutls ipv6 java ldap libxml2 mysql odbc openipmi +openssl oracle +postgres proxy selinux server snmp sqlite ssh static" +REQUIRED_USE="|| ( agent agent2 frontend proxy server ) + ?? ( gnutls openssl ) + agent2? ( !gnutls ) + proxy? ( ^^ ( mysql oracle postgres sqlite ) ) + server? ( ^^ ( mysql oracle postgres ) !sqlite ) + static? ( !oracle !snmp )" + +COMMON_DEPEND=" + curl? ( net-misc/curl ) + gnutls? ( net-libs/gnutls:0= ) + java? ( >=virtual/jdk-1.8:* ) + ldap? ( + =dev-libs/cyrus-sasl-2* + net-libs/gnutls:= + net-nds/openldap:= + ) + libxml2? ( dev-libs/libxml2 ) + mysql? ( dev-db/mysql-connector-c:= ) + odbc? ( dev-db/unixODBC ) + openipmi? ( sys-libs/openipmi ) + openssl? ( dev-libs/openssl:=[-bindist(-)] ) + oracle? ( dev-db/oracle-instantclient[odbc,sdk] ) + postgres? ( dev-db/postgresql:* ) + proxy? ( + dev-libs/libevent:= + sys-libs/zlib + ) + server? ( + dev-libs/libevent:= + sys-libs/zlib + ) + snmp? ( net-analyzer/net-snmp:= ) + sqlite? ( dev-db/sqlite ) + ssh? ( net-libs/libssh2 ) +" + +RDEPEND="${COMMON_DEPEND} + acct-group/zabbix + acct-user/zabbix + java? ( >=virtual/jre-1.8:* ) + mysql? ( virtual/mysql ) + proxy? ( + dev-libs/libpcre2:= + net-analyzer/fping[suid] + ) + selinux? ( sec-policy/selinux-zabbix ) + server? ( + app-admin/webapp-config + dev-libs/libpcre2:= + net-analyzer/fping[suid] + ) + frontend? ( + app-admin/webapp-config + dev-lang/php:*[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode] + media-libs/gd[png] + virtual/httpd-php:* + mysql? ( dev-lang/php[mysqli] ) + odbc? ( dev-lang/php[odbc] ) + postgres? ( dev-lang/php[postgres] ) + sqlite? ( dev-lang/php[sqlite] ) + ) +" +DEPEND="${COMMON_DEPEND} + static? ( + curl? ( net-misc/curl[static-libs] ) + ldap? ( + =dev-libs/cyrus-sasl-2*[static-libs] + net-libs/gnutls[static-libs] + net-nds/openldap[static-libs] + ) + libxml2? ( dev-libs/libxml2[static-libs] ) + mysql? ( dev-db/mysql-connector-c[static-libs] ) + odbc? ( dev-db/unixODBC[static-libs] ) + postgres? ( dev-db/postgresql:*[static-libs] ) + sqlite? ( dev-db/sqlite[static-libs] ) + ssh? ( net-libs/libssh2 ) + ) +" +BDEPEND=" + virtual/pkgconfig + agent2? ( + >=dev-lang/go-1.12 + app-arch/unzip + ) +" + +# upstream tests fail for agent2 +RESTRICT="test" + +PATCHES=( + "${FILESDIR}/${PN}-4.0.18-modulepathfix.patch" + "${FILESDIR}/${PN}-3.0.30-security-disable-PidFile.patch" + "${FILESDIR}/${PN}-6.4.0-configure-sscanf.patch" +) + +ZABBIXJAVA_BASE="opt/zabbix_java" + +pkg_setup() { + if use oracle; then + if [ -z "${ORACLE_HOME}" ]; then + eerror + eerror "The environment variable ORACLE_HOME must be set" + eerror "and point to the correct location." + eerror "It looks like you don't have Oracle installed." + eerror + die "Environment variable ORACLE_HOME is not set" + fi + fi + + if use frontend; then + webapp_pkg_setup + fi + + java-pkg-opt-2_pkg_setup +} + +src_prepare() { + default + + # Since we patch configure.ac with e.g., ${PN}-6.4.0-configure-sscanf.patch". + eautoreconf +} + +src_configure() { + local econf_args=( + --with-libpcre2 + "$(use_enable agent)" + "$(use_enable agent2)" + "$(use_enable ipv6)" + "$(use_enable java)" + "$(use_enable proxy)" + "$(use_enable server)" + "$(use_enable static)" + "$(use_with curl libcurl)" + "$(use_with gnutls)" + "$(use_with ldap)" + "$(use_with libxml2)" + "$(use_with mysql)" + "$(use_with odbc unixodbc)" + "$(use_with openipmi openipmi)" + "$(use_with openssl)" + "$(use_with oracle)" + "$(use_with postgres postgresql)" + "$(use_with snmp net-snmp)" + "$(use_with sqlite sqlite3)" + "$(use_with ssh ssh2)" + ) + + econf ${econf_args[@]} +} + +src_compile() { + if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]; then + emake AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" + fi +} + +src_install() { + local dirs=( + /etc/zabbix + /var/lib/zabbix + /var/lib/zabbix/home + /var/lib/zabbix/scripts + /var/lib/zabbix/alertscripts + /var/lib/zabbix/externalscripts + /var/log/zabbix + ) + + for dir in "${dirs[@]}"; do + keepdir "${dir}" + done + + if use server; then + insinto /etc/zabbix + doins "${S}"/conf/zabbix_server.conf + fperms 0640 /etc/zabbix/zabbix_server.conf + fowners root:zabbix /etc/zabbix/zabbix_server.conf + + newinitd "${FILESDIR}"/zabbix-server-r1.init zabbix-server + + dosbin src/zabbix_server/zabbix_server + + insinto /usr/share/zabbix + doins -r "${S}"/database/ + + systemd_dounit "${FILESDIR}"/zabbix-server.service + newtmpfiles "${FILESDIR}"/zabbix-server.tmpfiles zabbix-server.conf + fi + + if use proxy; then + insinto /etc/zabbix + doins "${S}"/conf/zabbix_proxy.conf + fperms 0640 /etc/zabbix/zabbix_proxy.conf + fowners root:zabbix /etc/zabbix/zabbix_proxy.conf + + newinitd "${FILESDIR}"/zabbix-proxy.init zabbix-proxy + + dosbin src/zabbix_proxy/zabbix_proxy + + insinto /usr/share/zabbix + doins -r "${S}"/database/ + + systemd_dounit "${FILESDIR}"/zabbix-proxy.service + newtmpfiles "${FILESDIR}"/zabbix-proxy.tmpfiles zabbix-proxy.conf + fi + + if use agent; then + insinto /etc/zabbix + doins "${S}"/conf/zabbix_agentd.conf + fperms 0640 /etc/zabbix/zabbix_agentd.conf + fowners root:zabbix /etc/zabbix/zabbix_agentd.conf + + newinitd "${FILESDIR}"/zabbix-agentd.init zabbix-agentd + + dosbin src/zabbix_agent/zabbix_agentd + dobin \ + src/zabbix_sender/zabbix_sender \ + src/zabbix_get/zabbix_get + + systemd_dounit "${FILESDIR}"/zabbix-agentd.service + newtmpfiles "${FILESDIR}"/zabbix-agentd.tmpfiles zabbix-agentd.conf + fi + if use agent2; then + insinto /etc/zabbix + doins "${S}"/src/go/conf/zabbix_agent2.conf + fperms 0640 /etc/zabbix/zabbix_agent2.conf + fowners root:zabbix /etc/zabbix/zabbix_agent2.conf + keepdir /etc/zabbix/zabbix_agent2.d/plugins.d + + newinitd "${FILESDIR}"/zabbix-agent2.init zabbix-agent2 + + dosbin src/go/bin/zabbix_agent2 + + systemd_dounit "${FILESDIR}"/zabbix-agent2.service + newtmpfiles "${FILESDIR}"/zabbix-agent2.tmpfiles zabbix-agent2.conf + fi + + fowners root:zabbix /etc/zabbix + fowners zabbix:zabbix \ + /var/lib/zabbix \ + /var/lib/zabbix/home \ + /var/lib/zabbix/scripts \ + /var/lib/zabbix/alertscripts \ + /var/lib/zabbix/externalscripts \ + /var/log/zabbix + fperms 0750 \ + /etc/zabbix \ + /var/lib/zabbix \ + /var/lib/zabbix/home \ + /var/lib/zabbix/scripts \ + /var/lib/zabbix/alertscripts \ + /var/lib/zabbix/externalscripts \ + /var/log/zabbix + + dodoc README INSTALL NEWS ChangeLog \ + conf/zabbix_agentd.conf \ + conf/zabbix_proxy.conf \ + conf/zabbix_agentd/userparameter_examples.conf \ + conf/zabbix_agentd/userparameter_mysql.conf \ + conf/zabbix_server.conf + + if use frontend; then + webapp_src_preinst + cp -R ui/* "${D}/${MY_HTDOCSDIR}" + webapp_configfile \ + "${MY_HTDOCSDIR}"/include/db.inc.php \ + "${MY_HTDOCSDIR}"/include/config.inc.php + webapp_src_install + fi + + if use java; then + dodir \ + /${ZABBIXJAVA_BASE} \ + /${ZABBIXJAVA_BASE}/bin \ + /${ZABBIXJAVA_BASE}/lib + keepdir /${ZABBIXJAVA_BASE} + exeinto /${ZABBIXJAVA_BASE}/bin + doexe src/zabbix_java/bin/zabbix-java-gateway-"${MY_PV}".jar + exeinto /${ZABBIXJAVA_BASE}/lib + doexe \ + src/zabbix_java/lib/logback-classic-1.2.9.jar \ + src/zabbix_java/lib/logback-console.xml \ + src/zabbix_java/lib/logback-core-1.2.9.jar \ + src/zabbix_java/lib/logback.xml \ + src/zabbix_java/lib/android-json-4.3_r3.1.jar \ + src/zabbix_java/lib/slf4j-api-1.7.32.jar + newinitd "${FILESDIR}"/zabbix-jmx-proxy.init zabbix-jmx-proxy + newconfd "${FILESDIR}"/zabbix-jmx-proxy.conf zabbix-jmx-proxy + fi +} + +pkg_postinst() { + if use server || use proxy ; then + elog + elog "You may need to configure your database for Zabbix" + elog "if you have not already done so." + elog + + zabbix_homedir=$(egethome zabbix) + if [ -n "${zabbix_homedir}" ] && \ + [ "${zabbix_homedir}" != "/var/lib/zabbix/home" ]; then + ewarn + ewarn "The user 'zabbix' should have his homedir changed" + ewarn "to /var/lib/zabbix/home if you want to use" + ewarn "custom alert scripts." + ewarn + ewarn "A real homedir might be needed for configfiles" + ewarn "for custom alert scripts." + ewarn + ewarn "To change the homedir use:" + ewarn " usermod -d /var/lib/zabbix/home zabbix" + ewarn + fi + fi + + if use server; then + tmpfiles_process zabbix-server.conf + + elog + elog "For distributed monitoring you have to run:" + elog + elog "zabbix_server -n <nodeid>" + elog + elog "This will convert database data for use with Node ID" + elog "and also adds a local node." + elog + fi + + if use oracle; then + ewarn + ewarn "Support for Oracle database has been dropped from PHP" + ewarn "so to make the web frontend work, you need to install" + ewarn "PECL extension for Oracle database." + ewarn "For details see https://bugs.gentoo.org/928386" + fi + + if use proxy; then + tmpfiles_process zabbix-proxy.conf + fi + + if use agent; then + tmpfiles_process zabbix-agentd.conf + fi + + if use agent2; then + tmpfiles_process zabbix-agent2.conf + fi + + elog "--" + elog + elog "You may need to add these lines to /etc/services:" + elog + elog "zabbix-agent 10050/tcp Zabbix Agent" + elog "zabbix-agent 10050/udp Zabbix Agent" + elog "zabbix-trapper 10051/tcp Zabbix Trapper" + elog "zabbix-trapper 10051/udp Zabbix Trapper" + elog +} + +pkg_prerm() { + (use frontend || use server) && webapp_pkg_prerm +} diff --git a/net-analyzer/zabbix/zabbix-7.0.0.ebuild b/net-analyzer/zabbix/zabbix-7.0.0.ebuild new file mode 100644 index 000000000000..77e7e44907a5 --- /dev/null +++ b/net-analyzer/zabbix/zabbix-7.0.0.ebuild @@ -0,0 +1,372 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +# To create the go modules tarball: +# cd src/go +# GOMODCACHE="${PWD}"/go-mod go mod download -modcacherw +# tar -acf $(pwd | grep -Eo 'zabbix-[0-9.]+')-go-deps.tar.xz go-mod + +EAPI=8 + +GO_OPTIONAL="yes" +# needed to make webapp-config dep optional +WEBAPP_OPTIONAL="yes" +inherit autotools webapp java-pkg-opt-2 systemd tmpfiles toolchain-funcs go-module user-info + +DESCRIPTION="ZABBIX is software for monitoring of your applications, network and servers" +HOMEPAGE="https://www.zabbix.com/" +MY_P=${P/_/} +MY_PV=${PV/_/} +SRC_URI="https://cdn.zabbix.com/${PN}/sources/stable/$(ver_cut 1-2)/${P}.tar.gz + agent2? ( https://dev.gentoo.org/~fordfrog/distfiles/${P}-go-deps.tar.xz ) +" + +S=${WORKDIR}/${MY_P} + +LICENSE="AGPL-3" +SLOT="0/$(ver_cut 1-2)" +WEBAPP_MANUAL_SLOT="yes" +KEYWORDS="amd64 ~arm64 ~x86" +IUSE="agent +agent2 curl frontend gnutls ipv6 java ldap libxml2 mysql odbc openipmi +openssl +postgres proxy selinux server snmp sqlite ssh static" +REQUIRED_USE="|| ( agent agent2 frontend proxy server ) + ?? ( gnutls openssl ) + agent2? ( !gnutls ) + proxy? ( ^^ ( mysql postgres sqlite ) ) + server? ( ^^ ( mysql postgres ) !sqlite ) + static? ( !snmp )" + +COMMON_DEPEND=" + curl? ( net-misc/curl ) + gnutls? ( net-libs/gnutls:0= ) + java? ( >=virtual/jdk-1.8:* ) + ldap? ( + =dev-libs/cyrus-sasl-2* + net-libs/gnutls:= + net-nds/openldap:= + ) + libxml2? ( dev-libs/libxml2 ) + mysql? ( dev-db/mysql-connector-c:= ) + odbc? ( dev-db/unixODBC ) + openipmi? ( sys-libs/openipmi ) + openssl? ( dev-libs/openssl:=[-bindist(-)] ) + postgres? ( dev-db/postgresql:* ) + proxy? ( + dev-libs/libevent:= + sys-libs/zlib + ) + server? ( + dev-libs/libevent:= + sys-libs/zlib + ) + snmp? ( net-analyzer/net-snmp:= ) + sqlite? ( dev-db/sqlite ) + ssh? ( net-libs/libssh2 ) +" + +RDEPEND="${COMMON_DEPEND} + acct-group/zabbix + acct-user/zabbix + java? ( >=virtual/jre-1.8:* ) + mysql? ( virtual/mysql ) + proxy? ( + dev-libs/libpcre2:= + net-analyzer/fping[suid] + ) + selinux? ( sec-policy/selinux-zabbix ) + server? ( + app-admin/webapp-config + dev-libs/libpcre2:= + net-analyzer/fping[suid] + ) + frontend? ( + app-admin/webapp-config + dev-lang/php:*[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode] + media-libs/gd[png] + virtual/httpd-php:* + mysql? ( dev-lang/php[mysqli] ) + odbc? ( dev-lang/php[odbc] ) + postgres? ( dev-lang/php[postgres] ) + sqlite? ( dev-lang/php[sqlite] ) + ) +" +DEPEND="${COMMON_DEPEND} + static? ( + curl? ( net-misc/curl[static-libs] ) + ldap? ( + =dev-libs/cyrus-sasl-2*[static-libs] + net-libs/gnutls[static-libs] + net-nds/openldap[static-libs] + ) + libxml2? ( dev-libs/libxml2[static-libs] ) + mysql? ( dev-db/mysql-connector-c[static-libs] ) + odbc? ( dev-db/unixODBC[static-libs] ) + postgres? ( dev-db/postgresql:*[static-libs] ) + sqlite? ( dev-db/sqlite[static-libs] ) + ssh? ( net-libs/libssh2 ) + ) +" +BDEPEND=" + virtual/pkgconfig + agent2? ( + >=dev-lang/go-1.12 + app-arch/unzip + ) +" + +# upstream tests fail for agent2 +RESTRICT="test" + +PATCHES=( + "${FILESDIR}/${PN}-4.0.18-modulepathfix.patch" + "${FILESDIR}/${PN}-3.0.30-security-disable-PidFile.patch" + "${FILESDIR}/${PN}-6.4.0-configure-sscanf.patch" + "${FILESDIR}/${PN}-6.4.6-clang16-build-fix.patch" +) + +ZABBIXJAVA_BASE="opt/zabbix_java" + +pkg_setup() { + if use frontend; then + webapp_pkg_setup + fi + + java-pkg-opt-2_pkg_setup +} + +src_prepare() { + default + + # Since we patch configure.ac with e.g., ${PN}-6.4.0-configure-sscanf.patch". + eautoreconf +} + +src_configure() { + local econf_args=( + --with-libpcre2 + "$(use_enable agent)" + "$(use_enable agent2)" + "$(use_enable ipv6)" + "$(use_enable java)" + "$(use_enable proxy)" + "$(use_enable server)" + "$(use_enable static)" + "$(use_with curl libcurl)" + "$(use_with gnutls)" + "$(use_with ldap)" + "$(use_with libxml2)" + "$(use_with mysql)" + "$(use_with odbc unixodbc)" + "$(use_with openipmi openipmi)" + "$(use_with openssl)" + "$(use_with postgres postgresql)" + "$(use_with snmp net-snmp)" + "$(use_with sqlite sqlite3)" + "$(use_with ssh ssh2)" + ) + + econf ${econf_args[@]} +} + +src_compile() { + if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]; then + emake AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" + fi +} + +src_install() { + local dirs=( + /etc/zabbix + /var/lib/zabbix + /var/lib/zabbix/home + /var/lib/zabbix/scripts + /var/lib/zabbix/alertscripts + /var/lib/zabbix/externalscripts + /var/log/zabbix + ) + + for dir in "${dirs[@]}"; do + keepdir "${dir}" + done + + if use server; then + insinto /etc/zabbix + doins "${S}"/conf/zabbix_server.conf + fperms 0640 /etc/zabbix/zabbix_server.conf + fowners root:zabbix /etc/zabbix/zabbix_server.conf + + newinitd "${FILESDIR}"/zabbix-server-r1.init zabbix-server + + dosbin src/zabbix_server/zabbix_server + + insinto /usr/share/zabbix + doins -r "${S}"/database/ + + systemd_dounit "${FILESDIR}"/zabbix-server.service + newtmpfiles "${FILESDIR}"/zabbix-server.tmpfiles zabbix-server.conf + fi + + if use proxy; then + insinto /etc/zabbix + doins "${S}"/conf/zabbix_proxy.conf + fperms 0640 /etc/zabbix/zabbix_proxy.conf + fowners root:zabbix /etc/zabbix/zabbix_proxy.conf + + newinitd "${FILESDIR}"/zabbix-proxy.init zabbix-proxy + + dosbin src/zabbix_proxy/zabbix_proxy + + insinto /usr/share/zabbix + doins -r "${S}"/database/ + + systemd_dounit "${FILESDIR}"/zabbix-proxy.service + newtmpfiles "${FILESDIR}"/zabbix-proxy.tmpfiles zabbix-proxy.conf + fi + + if use agent; then + insinto /etc/zabbix + doins "${S}"/conf/zabbix_agentd.conf + fperms 0640 /etc/zabbix/zabbix_agentd.conf + fowners root:zabbix /etc/zabbix/zabbix_agentd.conf + + newinitd "${FILESDIR}"/zabbix-agentd.init zabbix-agentd + + dosbin src/zabbix_agent/zabbix_agentd + dobin \ + src/zabbix_sender/zabbix_sender \ + src/zabbix_get/zabbix_get + + systemd_dounit "${FILESDIR}"/zabbix-agentd.service + newtmpfiles "${FILESDIR}"/zabbix-agentd.tmpfiles zabbix-agentd.conf + fi + if use agent2; then + insinto /etc/zabbix + doins "${S}"/src/go/conf/zabbix_agent2.conf + fperms 0640 /etc/zabbix/zabbix_agent2.conf + fowners root:zabbix /etc/zabbix/zabbix_agent2.conf + keepdir /etc/zabbix/zabbix_agent2.d/plugins.d + + newinitd "${FILESDIR}"/zabbix-agent2.init zabbix-agent2 + + dosbin src/go/bin/zabbix_agent2 + + systemd_dounit "${FILESDIR}"/zabbix-agent2.service + newtmpfiles "${FILESDIR}"/zabbix-agent2.tmpfiles zabbix-agent2.conf + fi + + fowners root:zabbix /etc/zabbix + fowners zabbix:zabbix \ + /var/lib/zabbix \ + /var/lib/zabbix/home \ + /var/lib/zabbix/scripts \ + /var/lib/zabbix/alertscripts \ + /var/lib/zabbix/externalscripts \ + /var/log/zabbix + fperms 0750 \ + /etc/zabbix \ + /var/lib/zabbix \ + /var/lib/zabbix/home \ + /var/lib/zabbix/scripts \ + /var/lib/zabbix/alertscripts \ + /var/lib/zabbix/externalscripts \ + /var/log/zabbix + + dodoc README INSTALL NEWS ChangeLog \ + conf/zabbix_agentd.conf \ + conf/zabbix_proxy.conf \ + conf/zabbix_agentd/userparameter_examples.conf \ + conf/zabbix_agentd/userparameter_mysql.conf \ + conf/zabbix_server.conf + + if use frontend; then + webapp_src_preinst + cp -R ui/* "${D}/${MY_HTDOCSDIR}" + webapp_configfile \ + "${MY_HTDOCSDIR}"/include/db.inc.php \ + "${MY_HTDOCSDIR}"/include/config.inc.php + webapp_src_install + fi + + if use java; then + dodir \ + /${ZABBIXJAVA_BASE} \ + /${ZABBIXJAVA_BASE}/bin \ + /${ZABBIXJAVA_BASE}/lib + keepdir /${ZABBIXJAVA_BASE} + exeinto /${ZABBIXJAVA_BASE}/bin + doexe src/zabbix_java/bin/zabbix-java-gateway-"${MY_PV}".jar + exeinto /${ZABBIXJAVA_BASE}/lib + doexe \ + src/zabbix_java/lib/logback-classic-1.2.9.jar \ + src/zabbix_java/lib/logback-console.xml \ + src/zabbix_java/lib/logback-core-1.2.9.jar \ + src/zabbix_java/lib/logback.xml \ + src/zabbix_java/lib/android-json-4.3_r3.1.jar \ + src/zabbix_java/lib/slf4j-api-1.7.32.jar + newinitd "${FILESDIR}"/zabbix-jmx-proxy.init zabbix-jmx-proxy + newconfd "${FILESDIR}"/zabbix-jmx-proxy.conf zabbix-jmx-proxy + fi +} + +pkg_postinst() { + if use server || use proxy ; then + elog + elog "You may need to configure your database for Zabbix" + elog "if you have not already done so." + elog + + zabbix_homedir=$(egethome zabbix) + if [ -n "${zabbix_homedir}" ] && \ + [ "${zabbix_homedir}" != "/var/lib/zabbix/home" ]; then + ewarn + ewarn "The user 'zabbix' should have his homedir changed" + ewarn "to /var/lib/zabbix/home if you want to use" + ewarn "custom alert scripts." + ewarn + ewarn "A real homedir might be needed for configfiles" + ewarn "for custom alert scripts." + ewarn + ewarn "To change the homedir use:" + ewarn " usermod -d /var/lib/zabbix/home zabbix" + ewarn + fi + fi + + if use server; then + tmpfiles_process zabbix-server.conf + + elog + elog "For distributed monitoring you have to run:" + elog + elog "zabbix_server -n <nodeid>" + elog + elog "This will convert database data for use with Node ID" + elog "and also adds a local node." + elog + fi + + if use proxy; then + tmpfiles_process zabbix-proxy.conf + fi + + if use agent; then + tmpfiles_process zabbix-agentd.conf + fi + + if use agent2; then + tmpfiles_process zabbix-agent2.conf + fi + + elog "--" + elog + elog "You may need to add these lines to /etc/services:" + elog + elog "zabbix-agent 10050/tcp Zabbix Agent" + elog "zabbix-agent 10050/udp Zabbix Agent" + elog "zabbix-trapper 10051/tcp Zabbix Trapper" + elog "zabbix-trapper 10051/udp Zabbix Trapper" + elog +} + +pkg_prerm() { + (use frontend || use server) && webapp_pkg_prerm +} diff --git a/net-analyzer/zabbix/zabbix-7.0.1.ebuild b/net-analyzer/zabbix/zabbix-7.0.1.ebuild new file mode 100644 index 000000000000..f90e2783580f --- /dev/null +++ b/net-analyzer/zabbix/zabbix-7.0.1.ebuild @@ -0,0 +1,371 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +# To create the go modules tarball: +# cd src/go +# GOMODCACHE="${PWD}"/go-mod go mod download -modcacherw +# tar -acf $(pwd | grep -Eo 'zabbix-[0-9.]+')-go-deps.tar.xz go-mod + +EAPI=8 + +GO_OPTIONAL="yes" +# needed to make webapp-config dep optional +WEBAPP_OPTIONAL="yes" +inherit autotools webapp java-pkg-opt-2 systemd tmpfiles toolchain-funcs go-module user-info + +DESCRIPTION="ZABBIX is software for monitoring of your applications, network and servers" +HOMEPAGE="https://www.zabbix.com/" +MY_P=${P/_/} +MY_PV=${PV/_/} +SRC_URI="https://cdn.zabbix.com/${PN}/sources/stable/$(ver_cut 1-2)/${P}.tar.gz + agent2? ( https://dev.gentoo.org/~fordfrog/distfiles/${P}-go-deps.tar.xz ) +" + +S=${WORKDIR}/${MY_P} + +LICENSE="AGPL-3" +SLOT="0/$(ver_cut 1-2)" +WEBAPP_MANUAL_SLOT="yes" +KEYWORDS="~amd64 ~arm64 ~x86" +IUSE="agent +agent2 curl frontend gnutls ipv6 java ldap libxml2 mysql odbc openipmi +openssl +postgres proxy selinux server snmp sqlite ssh static" +REQUIRED_USE="|| ( agent agent2 frontend proxy server ) + ?? ( gnutls openssl ) + agent2? ( !gnutls ) + proxy? ( ^^ ( mysql postgres sqlite ) ) + server? ( ^^ ( mysql postgres ) !sqlite ) + static? ( !snmp )" + +COMMON_DEPEND=" + curl? ( net-misc/curl ) + gnutls? ( net-libs/gnutls:0= ) + java? ( >=virtual/jdk-1.8:* ) + ldap? ( + =dev-libs/cyrus-sasl-2* + net-libs/gnutls:= + net-nds/openldap:= + ) + libxml2? ( dev-libs/libxml2 ) + mysql? ( dev-db/mysql-connector-c:= ) + odbc? ( dev-db/unixODBC ) + openipmi? ( sys-libs/openipmi ) + openssl? ( dev-libs/openssl:=[-bindist(-)] ) + postgres? ( dev-db/postgresql:* ) + proxy? ( + dev-libs/libevent:= + sys-libs/zlib + ) + server? ( + dev-libs/libevent:= + sys-libs/zlib + ) + snmp? ( net-analyzer/net-snmp:= ) + sqlite? ( dev-db/sqlite ) + ssh? ( net-libs/libssh2 ) +" + +RDEPEND="${COMMON_DEPEND} + acct-group/zabbix + acct-user/zabbix + java? ( >=virtual/jre-1.8:* ) + mysql? ( virtual/mysql ) + proxy? ( + dev-libs/libpcre2:= + net-analyzer/fping[suid] + ) + selinux? ( sec-policy/selinux-zabbix ) + server? ( + app-admin/webapp-config + dev-libs/libpcre2:= + net-analyzer/fping[suid] + ) + frontend? ( + app-admin/webapp-config + dev-lang/php:*[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode] + media-libs/gd[png] + virtual/httpd-php:* + mysql? ( dev-lang/php[mysqli] ) + odbc? ( dev-lang/php[odbc] ) + postgres? ( dev-lang/php[postgres] ) + sqlite? ( dev-lang/php[sqlite] ) + ) +" +DEPEND="${COMMON_DEPEND} + static? ( + curl? ( net-misc/curl[static-libs] ) + ldap? ( + =dev-libs/cyrus-sasl-2*[static-libs] + net-libs/gnutls[static-libs] + net-nds/openldap[static-libs] + ) + libxml2? ( dev-libs/libxml2[static-libs] ) + mysql? ( dev-db/mysql-connector-c[static-libs] ) + odbc? ( dev-db/unixODBC[static-libs] ) + postgres? ( dev-db/postgresql:*[static-libs] ) + sqlite? ( dev-db/sqlite[static-libs] ) + ssh? ( net-libs/libssh2 ) + ) +" +BDEPEND=" + virtual/pkgconfig + agent2? ( + >=dev-lang/go-1.12 + app-arch/unzip + ) +" + +# upstream tests fail for agent2 +RESTRICT="test" + +PATCHES=( + "${FILESDIR}/${PN}-4.0.18-modulepathfix.patch" + "${FILESDIR}/${PN}-3.0.30-security-disable-PidFile.patch" + "${FILESDIR}/${PN}-6.4.0-configure-sscanf.patch" +) + +ZABBIXJAVA_BASE="opt/zabbix_java" + +pkg_setup() { + if use frontend; then + webapp_pkg_setup + fi + + java-pkg-opt-2_pkg_setup +} + +src_prepare() { + default + + # Since we patch configure.ac with e.g., ${PN}-6.4.0-configure-sscanf.patch". + eautoreconf +} + +src_configure() { + local econf_args=( + --with-libpcre2 + "$(use_enable agent)" + "$(use_enable agent2)" + "$(use_enable ipv6)" + "$(use_enable java)" + "$(use_enable proxy)" + "$(use_enable server)" + "$(use_enable static)" + "$(use_with curl libcurl)" + "$(use_with gnutls)" + "$(use_with ldap)" + "$(use_with libxml2)" + "$(use_with mysql)" + "$(use_with odbc unixodbc)" + "$(use_with openipmi openipmi)" + "$(use_with openssl)" + "$(use_with postgres postgresql)" + "$(use_with snmp net-snmp)" + "$(use_with sqlite sqlite3)" + "$(use_with ssh ssh2)" + ) + + econf ${econf_args[@]} +} + +src_compile() { + if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]; then + emake AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" + fi +} + +src_install() { + local dirs=( + /etc/zabbix + /var/lib/zabbix + /var/lib/zabbix/home + /var/lib/zabbix/scripts + /var/lib/zabbix/alertscripts + /var/lib/zabbix/externalscripts + /var/log/zabbix + ) + + for dir in "${dirs[@]}"; do + keepdir "${dir}" + done + + if use server; then + insinto /etc/zabbix + doins "${S}"/conf/zabbix_server.conf + fperms 0640 /etc/zabbix/zabbix_server.conf + fowners root:zabbix /etc/zabbix/zabbix_server.conf + + newinitd "${FILESDIR}"/zabbix-server-r1.init zabbix-server + + dosbin src/zabbix_server/zabbix_server + + insinto /usr/share/zabbix + doins -r "${S}"/database/ + + systemd_dounit "${FILESDIR}"/zabbix-server.service + newtmpfiles "${FILESDIR}"/zabbix-server.tmpfiles zabbix-server.conf + fi + + if use proxy; then + insinto /etc/zabbix + doins "${S}"/conf/zabbix_proxy.conf + fperms 0640 /etc/zabbix/zabbix_proxy.conf + fowners root:zabbix /etc/zabbix/zabbix_proxy.conf + + newinitd "${FILESDIR}"/zabbix-proxy.init zabbix-proxy + + dosbin src/zabbix_proxy/zabbix_proxy + + insinto /usr/share/zabbix + doins -r "${S}"/database/ + + systemd_dounit "${FILESDIR}"/zabbix-proxy.service + newtmpfiles "${FILESDIR}"/zabbix-proxy.tmpfiles zabbix-proxy.conf + fi + + if use agent; then + insinto /etc/zabbix + doins "${S}"/conf/zabbix_agentd.conf + fperms 0640 /etc/zabbix/zabbix_agentd.conf + fowners root:zabbix /etc/zabbix/zabbix_agentd.conf + + newinitd "${FILESDIR}"/zabbix-agentd.init zabbix-agentd + + dosbin src/zabbix_agent/zabbix_agentd + dobin \ + src/zabbix_sender/zabbix_sender \ + src/zabbix_get/zabbix_get + + systemd_dounit "${FILESDIR}"/zabbix-agentd.service + newtmpfiles "${FILESDIR}"/zabbix-agentd.tmpfiles zabbix-agentd.conf + fi + if use agent2; then + insinto /etc/zabbix + doins "${S}"/src/go/conf/zabbix_agent2.conf + fperms 0640 /etc/zabbix/zabbix_agent2.conf + fowners root:zabbix /etc/zabbix/zabbix_agent2.conf + keepdir /etc/zabbix/zabbix_agent2.d/plugins.d + + newinitd "${FILESDIR}"/zabbix-agent2.init zabbix-agent2 + + dosbin src/go/bin/zabbix_agent2 + + systemd_dounit "${FILESDIR}"/zabbix-agent2.service + newtmpfiles "${FILESDIR}"/zabbix-agent2.tmpfiles zabbix-agent2.conf + fi + + fowners root:zabbix /etc/zabbix + fowners zabbix:zabbix \ + /var/lib/zabbix \ + /var/lib/zabbix/home \ + /var/lib/zabbix/scripts \ + /var/lib/zabbix/alertscripts \ + /var/lib/zabbix/externalscripts \ + /var/log/zabbix + fperms 0750 \ + /etc/zabbix \ + /var/lib/zabbix \ + /var/lib/zabbix/home \ + /var/lib/zabbix/scripts \ + /var/lib/zabbix/alertscripts \ + /var/lib/zabbix/externalscripts \ + /var/log/zabbix + + dodoc README INSTALL NEWS ChangeLog \ + conf/zabbix_agentd.conf \ + conf/zabbix_proxy.conf \ + conf/zabbix_agentd/userparameter_examples.conf \ + conf/zabbix_agentd/userparameter_mysql.conf \ + conf/zabbix_server.conf + + if use frontend; then + webapp_src_preinst + cp -R ui/* "${D}/${MY_HTDOCSDIR}" + webapp_configfile \ + "${MY_HTDOCSDIR}"/include/db.inc.php \ + "${MY_HTDOCSDIR}"/include/config.inc.php + webapp_src_install + fi + + if use java; then + dodir \ + /${ZABBIXJAVA_BASE} \ + /${ZABBIXJAVA_BASE}/bin \ + /${ZABBIXJAVA_BASE}/lib + keepdir /${ZABBIXJAVA_BASE} + exeinto /${ZABBIXJAVA_BASE}/bin + doexe src/zabbix_java/bin/zabbix-java-gateway-"${MY_PV}".jar + exeinto /${ZABBIXJAVA_BASE}/lib + doexe \ + src/zabbix_java/lib/logback-classic-1.2.9.jar \ + src/zabbix_java/lib/logback-console.xml \ + src/zabbix_java/lib/logback-core-1.2.9.jar \ + src/zabbix_java/lib/logback.xml \ + src/zabbix_java/lib/android-json-4.3_r3.1.jar \ + src/zabbix_java/lib/slf4j-api-1.7.32.jar + newinitd "${FILESDIR}"/zabbix-jmx-proxy.init zabbix-jmx-proxy + newconfd "${FILESDIR}"/zabbix-jmx-proxy.conf zabbix-jmx-proxy + fi +} + +pkg_postinst() { + if use server || use proxy ; then + elog + elog "You may need to configure your database for Zabbix" + elog "if you have not already done so." + elog + + zabbix_homedir=$(egethome zabbix) + if [ -n "${zabbix_homedir}" ] && \ + [ "${zabbix_homedir}" != "/var/lib/zabbix/home" ]; then + ewarn + ewarn "The user 'zabbix' should have his homedir changed" + ewarn "to /var/lib/zabbix/home if you want to use" + ewarn "custom alert scripts." + ewarn + ewarn "A real homedir might be needed for configfiles" + ewarn "for custom alert scripts." + ewarn + ewarn "To change the homedir use:" + ewarn " usermod -d /var/lib/zabbix/home zabbix" + ewarn + fi + fi + + if use server; then + tmpfiles_process zabbix-server.conf + + elog + elog "For distributed monitoring you have to run:" + elog + elog "zabbix_server -n <nodeid>" + elog + elog "This will convert database data for use with Node ID" + elog "and also adds a local node." + elog + fi + + if use proxy; then + tmpfiles_process zabbix-proxy.conf + fi + + if use agent; then + tmpfiles_process zabbix-agentd.conf + fi + + if use agent2; then + tmpfiles_process zabbix-agent2.conf + fi + + elog "--" + elog + elog "You may need to add these lines to /etc/services:" + elog + elog "zabbix-agent 10050/tcp Zabbix Agent" + elog "zabbix-agent 10050/udp Zabbix Agent" + elog "zabbix-trapper 10051/tcp Zabbix Trapper" + elog "zabbix-trapper 10051/udp Zabbix Trapper" + elog +} + +pkg_prerm() { + (use frontend || use server) && webapp_pkg_prerm +} diff --git a/net-analyzer/zmap/Manifest b/net-analyzer/zmap/Manifest index c31ac5b49776..0706d5d7fd6b 100644 --- a/net-analyzer/zmap/Manifest +++ b/net-analyzer/zmap/Manifest @@ -1 +1,2 @@ DIST zmap-2.1.1.tar.gz 131689 BLAKE2B c4bcea835b080dca879c227691230ad135d1822db0b81245ea60963b0a78ac71fd64df7ddca5d5a762c3d7dc67f2d689fd9d0d13e0ee9be21033de75c61ebd1f SHA512 9d62dceff77fa20ff5945516b0766340366175947130bb844f19c11dac7676e658bcdedd6be29ffc945706aa3cdc0e4ac207bd127b618592769a4d3e75892857 +DIST zmap-4.1.1.tar.gz 202697 BLAKE2B 35bc21e4d4c4c452deb2e34ac837ee4ae728b3adf97aefb5b88f55dde719bd78787b8a2826a89eaff92170b3eb2e5003194e3dc636616a845efef82bea663114 SHA512 eff32c9bda7b28a48fce85e3acb598c6adc8dc952ffec21cd4d581462e481a3cf61a6285a71c16741d8e9deedf7c8e3b71d4f375a931244b96acc8779c225929 diff --git a/net-analyzer/zmap/files/zmap-2.1.1-json-c.patch b/net-analyzer/zmap/files/zmap-2.1.1-json-c.patch new file mode 100644 index 000000000000..78a80b801218 --- /dev/null +++ b/net-analyzer/zmap/files/zmap-2.1.1-json-c.patch @@ -0,0 +1,31 @@ +From 5473b6a907ff47e813e8ac3509a0f63d1253023b Mon Sep 17 00:00:00 2001 +From: Martin Milata <martin@martinmilata.cz> +Date: Wed, 1 Jul 2020 16:47:18 +0200 +Subject: [PATCH] Fix build against json-c-0.14 (#609) + +The new pkgconfig file contains two include directories: + + Cflags: -I${includedir} -I${includedir}/json-c + +Apparently pkg_check_modules returns them as a semicolon-separated +string ("CMake list"), which causes the build to fail when appended +directly to CMAKE_C_FLAGS. + +Origin: backport, https://github.com/zmap/zmap/commit/5473b6a907ff47e813e8ac3509a0f63d1253023b +Applied-Upstream: 3.0 +--- + CMakeLists.txt | 1 + + 1 file changed, 1 insertion(+) + +Index: zmap-2.1.1/CMakeLists.txt +=================================================================== +--- zmap-2.1.1.orig/CMakeLists.txt 2024-01-23 15:29:55.436869754 -0500 ++++ zmap-2.1.1/CMakeLists.txt 2024-01-23 15:30:32.505023070 -0500 +@@ -72,6 +72,7 @@ + endif() + + add_definitions("-DJSON") ++ string(REPLACE ";" " " JSON_CFLAGS "${JSON_CFLAGS}") + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${JSON_CFLAGS}") + endif() + diff --git a/net-analyzer/zmap/metadata.xml b/net-analyzer/zmap/metadata.xml index 378248ac6c65..741c091de292 100644 --- a/net-analyzer/zmap/metadata.xml +++ b/net-analyzer/zmap/metadata.xml @@ -1,10 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>jsmolic@gentoo.org</email> - <name>Jakov Smolić</name> - </maintainer> + <!-- maintainer-needed --> <longdescription> ZMap is an open-source network scanner that enables researchers to easily perform Internet-wide network studies. With a single machine and a well diff --git a/net-analyzer/zmap/zmap-2.1.1-r5.ebuild b/net-analyzer/zmap/zmap-2.1.1-r5.ebuild index b413d47fc165..2a7eb5b56829 100644 --- a/net-analyzer/zmap/zmap-2.1.1-r5.ebuild +++ b/net-analyzer/zmap/zmap-2.1.1-r5.ebuild @@ -33,6 +33,7 @@ BDEPEND=" PATCHES=( "${FILESDIR}"/${PN}-2.1.1-always-install-config.patch + "${FILESDIR}"/${PN}-2.1.1-json-c.patch ) FILECAPS=( cap_net_raw=ep usr/sbin/zmap ) diff --git a/net-analyzer/zmap/zmap-4.1.1.ebuild b/net-analyzer/zmap/zmap-4.1.1.ebuild new file mode 100644 index 000000000000..2ffbd683d165 --- /dev/null +++ b/net-analyzer/zmap/zmap-4.1.1.ebuild @@ -0,0 +1,49 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake fcaps + +DESCRIPTION="Fast network scanner designed for Internet-wide network surveys" +HOMEPAGE="https://zmap.io/" +SRC_URI="https://github.com/zmap/zmap/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~x86" +IUSE="mongo redis" + +RDEPEND=" + dev-libs/gmp:= + dev-libs/judy + dev-util/gengetopt + net-libs/libpcap + dev-libs/json-c:= + redis? ( dev-libs/hiredis:= ) +" +DEPEND="${RDEPEND}" +BDEPEND=" + app-alternatives/lex + dev-util/gengetopt + dev-util/byacc + virtual/pkgconfig +" + +FILECAPS=( cap_net_raw=ep usr/sbin/zmap ) + +src_prepare() { + sed \ + -e '/ggo/s:CMAKE_CURRENT_SOURCE_DIR}:CMAKE_BINARY_DIR}/src:g' \ + -i src/CMakeLists.txt || die + cmake_src_prepare +} + +src_configure() { + local mycmakeargs=( + -DENABLE_DEVELOPMENT=OFF + -DWITH_WERROR=OFF + ) + + cmake_src_configure +} |