diff options
Diffstat (limited to 'net-analyzer')
1485 files changed, 31499 insertions, 36993 deletions
diff --git a/net-analyzer/2ping/2ping-4.4.1.ebuild b/net-analyzer/2ping/2ping-4.4.1.ebuild deleted file mode 100644 index 9d31cd1228f9..000000000000 --- a/net-analyzer/2ping/2ping-4.4.1.ebuild +++ /dev/null @@ -1,27 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" - -PYTHON_COMPAT=( python3_{7,8} ) - -inherit distutils-r1 - -DESCRIPTION="A bi-directional ping utility" -HOMEPAGE="https://www.finnie.org/software/2ping/" -SRC_URI="https://www.finnie.org/software/2ping/${P}.tar.gz" - -LICENSE="GPL-2+" -SLOT="0" -KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86" -IUSE="server" - -src_install() { - distutils-r1_src_install - doman doc/2ping.1 - dodoc doc/{2ping-protocol-examples.py,2ping-protocol.md} - use server && { - doinitd "${FILESDIR}"/2pingd - newconfd "${FILESDIR}"/2pingd.conf 2pingd - } -} diff --git a/net-analyzer/2ping/2ping-4.5.1-r1.ebuild b/net-analyzer/2ping/2ping-4.5.1-r1.ebuild new file mode 100644 index 000000000000..e26ab3b49f42 --- /dev/null +++ b/net-analyzer/2ping/2ping-4.5.1-r1.ebuild @@ -0,0 +1,34 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISTUTILS_USE_PEP517=setuptools +PYTHON_COMPAT=( python3_{9..11} ) +inherit bash-completion-r1 distutils-r1 + +DESCRIPTION="A bi-directional ping utility" +HOMEPAGE="https://www.finnie.org/software/2ping/" +SRC_URI="https://www.finnie.org/software/2ping/${P}.tar.gz" + +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~riscv ~x86" +IUSE="server" + +distutils_enable_tests pytest + +src_install() { + distutils-r1_src_install + + doman doc/2ping.1 + dodoc doc/{2ping-protocol-examples.py,2ping-protocol.md} + + newbashcomp 2ping.bash_completion 2ping + dosym 2ping $(get_bashcompdir)/2ping6 + + use server && { + doinitd "${FILESDIR}"/2pingd + newconfd "${FILESDIR}"/2pingd.conf 2pingd + } +} diff --git a/net-analyzer/2ping/2ping-4.5.ebuild b/net-analyzer/2ping/2ping-4.5.ebuild deleted file mode 100644 index 9d31cd1228f9..000000000000 --- a/net-analyzer/2ping/2ping-4.5.ebuild +++ /dev/null @@ -1,27 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" - -PYTHON_COMPAT=( python3_{7,8} ) - -inherit distutils-r1 - -DESCRIPTION="A bi-directional ping utility" -HOMEPAGE="https://www.finnie.org/software/2ping/" -SRC_URI="https://www.finnie.org/software/2ping/${P}.tar.gz" - -LICENSE="GPL-2+" -SLOT="0" -KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86" -IUSE="server" - -src_install() { - distutils-r1_src_install - doman doc/2ping.1 - dodoc doc/{2ping-protocol-examples.py,2ping-protocol.md} - use server && { - doinitd "${FILESDIR}"/2pingd - newconfd "${FILESDIR}"/2pingd.conf 2pingd - } -} diff --git a/net-analyzer/2ping/Manifest b/net-analyzer/2ping/Manifest index a9c91c99119c..8bb597955867 100644 --- a/net-analyzer/2ping/Manifest +++ b/net-analyzer/2ping/Manifest @@ -1,2 +1 @@ -DIST 2ping-4.4.1.tar.gz 75284 BLAKE2B 29240c9710417f735acbeb61e948634c7dd3b608084f4499cae97172f25a0951eab81db92743d452ce679d171107925cf35b9fa9fea82fb5551b11d83a23fcb1 SHA512 b40698488bd067a50be171566a0920920edb6bd0baea65999f2226fe66771770a1ebb3c1078bf8d633c555af3297e8f9925f5c42a3e9aa7cd48b59d6cb59e10b -DIST 2ping-4.5.tar.gz 77771 BLAKE2B 6471d06dede592e3161755d18fb08ae1d593dec0017cf7757ef1bcfcf9df7d4d7993edc14d44aaad7d7d683584906869ba957ef8096e38f362f8fd060c4f4e36 SHA512 0b1ac1c882becf1dda7207004b186d8052b21be4f842ac2b3a252c32a5610867761feadc12e237e4ed3e1da59b3cdebd8b8f8025ec3d0375193b2594f17215f0 +DIST 2ping-4.5.1.tar.gz 77053 BLAKE2B e1255264dde4e0deb2d064e0acbaf96270e64a057334a0c0eea4e413e472cd52ffdf2181718dca4309eb8843791ef2bef866b7cf5642f9ff41e9916c3d7180e0 SHA512 13ab8c34d6b4e8d53bc0f1c33afa1c71bf61313d29350d2211a44557b244062cb090cf5d66cc6eed58f9f4c41a667bb24a8c1155243864e8343c741770b60cd6 diff --git a/net-analyzer/2ping/metadata.xml b/net-analyzer/2ping/metadata.xml index de17b7a0b3c1..6a2729c60132 100644 --- a/net-analyzer/2ping/metadata.xml +++ b/net-analyzer/2ping/metadata.xml @@ -1,11 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>blueness@gentoo.org</email> - <name>Anthony G. Basile</name> - </maintainer> + <!-- maintainer-needed --> <use> <flag name="server">Install the server init scripts.</flag> </use> + <stabilize-allarches/> + <upstream> + <remote-id type="github">rfinnie/2ping</remote-id> + </upstream> </pkgmetadata> diff --git a/net-analyzer/alive/Manifest b/net-analyzer/alive/Manifest index f4bb81d3f630..bb460f83ecf4 100644 --- a/net-analyzer/alive/Manifest +++ b/net-analyzer/alive/Manifest @@ -1 +1 @@ -DIST alive-2.0.2.tar.xz 174936 BLAKE2B f3998d1cbf81d77be449cf1157bc570837b87fd15a860041273059de69536ff9cab8d00b8cb1191b2d6d692b41fb3fa5863248267a86ad542326f48c8ab43730 SHA512 7e9c88f62ab5c0248d1e42b81e2106f43fc9587543782623e8a564ab99fd1d4a55058a175dc46d25520454c07f732101c7e62248ce992d1a8a615f531b1c090e +DIST alive-2.0.5.tar.lz 186304 BLAKE2B 8528d7b86030ff0b54cd391a7cd7b42be974d5f605c66c6340468855959d2adf31940312d6693580839e9180813a3e96c2fe86a3842f3abd00af0e08b7f301ee SHA512 f760f9386019ddeac8690eec9119d557d4e288cc8698ce69adc8d9915eb0bc27fcf4015e9c4710411321d21c11731e61be754e9b827dceceab6463e531ed4240 diff --git a/net-analyzer/alive/alive-2.0.2-r1.ebuild b/net-analyzer/alive/alive-2.0.2-r1.ebuild deleted file mode 100644 index 9ee866d5fd4c..000000000000 --- a/net-analyzer/alive/alive-2.0.2-r1.ebuild +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit autotools - -DESCRIPTION="a periodic ping program" -HOMEPAGE="https://www.gnu.org/software/alive/" -SRC_URI="mirror://gnu/${PN}/${P}.tar.xz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~hppa ~x86" - -COMMON_DEPEND=" - net-misc/iputils -" -DEPEND=" - app-arch/xz-utils - ${COMMON_DEPEND} -" -RDEPEND=" - dev-scheme/guile - ${COMMON_DEPEND} -" -PATCHES=( - "${FILESDIR}"/${P}-ping-test.patch -) - -src_prepare() { - default - eautoreconf -} diff --git a/net-analyzer/alive/alive-2.0.5-r1.ebuild b/net-analyzer/alive/alive-2.0.5-r1.ebuild new file mode 100644 index 000000000000..bfa83a170f30 --- /dev/null +++ b/net-analyzer/alive/alive-2.0.5-r1.ebuild @@ -0,0 +1,30 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools unpacker + +DESCRIPTION="Periodic ping program" +HOMEPAGE="https://www.gnu.org/software/alive/" +SRC_URI="mirror://gnu/${PN}/${P}.tar.lz" + +LICENSE="GPL-3+" +SLOT="0" +KEYWORDS="~amd64 ~hppa ~x86" + +DEPEND="dev-scheme/guile" +RDEPEND="${DEPEND} + dev-scheme/xdgdirs + net-misc/iputils" +BDEPEND="$(unpacker_src_uri_depends)" + +PATCHES=( + "${FILESDIR}"/${PN}-2.0.2-ping-test.patch +) + +src_prepare() { + default + + eautoreconf +} diff --git a/net-analyzer/alive/metadata.xml b/net-analyzer/alive/metadata.xml index 74c2baebb4ec..69f19320e112 100644 --- a/net-analyzer/alive/metadata.xml +++ b/net-analyzer/alive/metadata.xml @@ -1,8 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!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> + <maintainer type="project"> + <email>netmon@gentoo.org</email> + <name>Gentoo network monitoring and analysis project</name> + </maintainer> + <upstream> + <remote-id type="savannah">alive</remote-id> + </upstream> </pkgmetadata> diff --git a/net-analyzer/amap/Manifest b/net-analyzer/amap/Manifest deleted file mode 100644 index df01ea68a292..000000000000 --- a/net-analyzer/amap/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST amap-5.4.tar.gz 263331 BLAKE2B 683bcdd1ebb22dcd74c2ac20147ec5e5fe2bafb2452abda22a9a95c4d8fe1955394067b9a3765344674b48979cd56a99251d6359cd0247ac623da756a017a220 SHA512 e1a9f03940eded3eedad0028786f4ea6c18077072d52eb2f843ef0b4ff736bf1766c4bdb4eff52d3a8f6038d8f795e39be1c15bcae8283ddae8f40a7fff8647d diff --git a/net-analyzer/amap/amap-5.4-r1.ebuild b/net-analyzer/amap/amap-5.4-r1.ebuild deleted file mode 100644 index 9848a4c18f2d..000000000000 --- a/net-analyzer/amap/amap-5.4-r1.ebuild +++ /dev/null @@ -1,75 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit eutils toolchain-funcs - -DESCRIPTION="A network scanning tool for pentesters" -HOMEPAGE="https://www.thc.org/thc-amap/" -SRC_URI="https://www.thc.org/releases/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" -IUSE="libressl ssl" - -DEPEND=" - dev-libs/libpcre - ssl? ( - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) - ) -" -RDEPEND=" - ${DEPEND} - !sci-biology/amap -" - -src_prepare() { - rm -r pcre-3.9 || die - sed -i -e "s:etc/:share/amap/:g" amap-lib.c || die - # Above change requires below change. See sources... - sed -i '/strlen(AMAP_PREFIX/s: 5 : 12 :' amap-lib.c || die - sed -i 's:/usr/local:/usr:' amap.h || die - # Files to be updated are at different location, bug 207839. - sed -i '/AMAP_RESOURCE/s:www:freeworld:' amap.h || die - - sed -i '/DATADIR/s:/etc:/share/amap:' Makefile.am || die - - epatch "${FILESDIR}"/4.8-system-pcre.patch -} - -src_configure() { - # non-autotools configure script - ./configure || die - sed -i \ - -e '/^XDEFINES=/s:=.*:=:' \ - -e '/^XLIBS=/s:=.*:=:' \ - -e '/^XLIBPATHS/s:=.*:=:' \ - -e '/^XIPATHS=/s:=.*:=:' \ - -e "/^CC=/d" \ - Makefile || die - if use ssl ; then - sed -i \ - -e '/^XDEFINES=/s:=:=-DOPENSSL:' \ - -e '/^XLIBS=/s:=:=-lcrypto -lssl:' \ - Makefile || die - fi - sed -i Makefile \ - -e '/-o amap/{s|(OPT) |(OPT) $(LDFLAGS) |g}' \ - || die -} - -src_compile() { - emake CC=$(tc-getCC) OPT="${CFLAGS}" -} - -src_install() { - dobin amap amapcrap - insinto /usr/share/amap - doins appdefs.* - - doman ${PN}.1 - dodoc README TODO CHANGES -} diff --git a/net-analyzer/amap/amap-5.4.ebuild b/net-analyzer/amap/amap-5.4.ebuild deleted file mode 100644 index ef97cd2aec15..000000000000 --- a/net-analyzer/amap/amap-5.4.ebuild +++ /dev/null @@ -1,72 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit eutils toolchain-funcs - -DESCRIPTION="A network scanning tool for pentesters" -HOMEPAGE="https://www.thc.org/thc-amap/" -SRC_URI="https://www.thc.org/releases/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ppc ppc64 x86" -IUSE="ssl" - -DEPEND=" - dev-libs/libpcre - ssl? ( >=dev-libs/openssl-0.9.6j ) -" -RDEPEND=" - ${DEPEND} - !sci-biology/amap -" - -src_prepare() { - rm -r pcre-3.9 || die - sed -i -e "s:etc/:share/amap/:g" amap-lib.c || die - # Above change requires below change. See sources... - sed -i '/strlen(AMAP_PREFIX/s: 5 : 12 :' amap-lib.c || die - sed -i 's:/usr/local:/usr:' amap.h || die - # Files to be updated are at different location, bug 207839. - sed -i '/AMAP_RESOURCE/s:www:freeworld:' amap.h || die - - sed -i '/DATADIR/s:/etc:/share/amap:' Makefile.am || die - - epatch "${FILESDIR}"/4.8-system-pcre.patch -} - -src_configure() { - # non-autotools configure script - ./configure || die - sed -i \ - -e '/^XDEFINES=/s:=.*:=:' \ - -e '/^XLIBS=/s:=.*:=:' \ - -e '/^XLIBPATHS/s:=.*:=:' \ - -e '/^XIPATHS=/s:=.*:=:' \ - -e "/^CC=/d" \ - Makefile || die - if use ssl ; then - sed -i \ - -e '/^XDEFINES=/s:=:=-DOPENSSL:' \ - -e '/^XLIBS=/s:=:=-lcrypto -lssl:' \ - Makefile || die - fi - sed -i Makefile \ - -e '/-o amap/{s|(OPT) |(OPT) $(LDFLAGS) |g}' \ - || die -} - -src_compile() { - emake CC=$(tc-getCC) OPT="${CFLAGS}" -} - -src_install() { - dobin amap amapcrap - insinto /usr/share/amap - doins appdefs.* - - doman ${PN}.1 - dodoc README TODO CHANGES -} diff --git a/net-analyzer/amap/files/4.8-system-pcre.patch b/net-analyzer/amap/files/4.8-system-pcre.patch deleted file mode 100644 index 097bfbf45eb5..000000000000 --- a/net-analyzer/amap/files/4.8-system-pcre.patch +++ /dev/null @@ -1,45 +0,0 @@ -diff --exclude='*~' -urN amap-4.8.orig/amap-inc.h amap-4.8/amap-inc.h ---- amap-4.8.orig/amap-inc.h 2005-02-21 21:47:47.251638320 -0500 -+++ amap-4.8/amap-inc.h 2005-02-21 21:48:27.774477912 -0500 -@@ -20,7 +20,7 @@ - #include <errno.h> - #include <sys/resource.h> - #include <sys/wait.h> --#include "pcre-3.9/pcre.h" -+#include <pcre.h> - #ifdef OPENSSL - #include <openssl/ssl.h> - #include <openssl/err.h> -diff --exclude='*~' -urN amap-4.8.orig/configure amap-4.8/configure ---- amap-4.8.orig/configure 2005-02-21 21:47:47.240639992 -0500 -+++ amap-4.8/configure 2005-02-21 21:48:41.379409648 -0500 -@@ -13,10 +13,6 @@ - exit 0 - fi - --cd pcre-3.9 || exit 1 --./configure || exit 1 --cd .. -- - echo - echo - echo "Starting amap auto configuration ..." -diff --exclude='*~' -urN amap-4.8.orig/Makefile.am amap-4.8/Makefile.am ---- amap-4.8.orig/Makefile.am 2005-02-21 21:47:47.242639688 -0500 -+++ amap-4.8/Makefile.am 2005-02-21 21:49:16.070135856 -0500 -@@ -1,5 +1,5 @@ - CC=gcc --LIB=-lpcre -L./pcre-3.9/ -I./pcre-3.9/ -+LIB=-lpcre - OPT=-O2 - OPT_DEBUG=-ggdb -Wall -lefence - BINDIR=/bin -@@ -7,7 +7,7 @@ - MANDIR=/man/man1 - SCRIPTS=appdefs.trig appdefs.resp appdefs.rpc - MANPAGE=amap.1 --all: pcre strip -+all: amap amapcrap - - pcre: - cd pcre-3.9 && make diff --git a/net-analyzer/amap/metadata.xml b/net-analyzer/amap/metadata.xml deleted file mode 100644 index 74c2baebb4ec..000000000000 --- a/net-analyzer/amap/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://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/angst/Manifest b/net-analyzer/angst/Manifest deleted file mode 100644 index 7b9db686f0fe..000000000000 --- a/net-analyzer/angst/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST angst-0.4b.tar.gz 13909 BLAKE2B f08b9e489eaec5e2006ad8d84dc7586c6fb57c3d8585fb5cd769591ed56f4e5a4c2e0bdaf0ba02b40370ea99146ebfa02611d64b043949b27f6dfcbbdd2b16e5 SHA512 5584b1dd01d781cd34b594fcc8970764874599a1f15b1185066ee21c11cde23af148270c178d6a0b3436d71955aaf1cd904703f9dfb0c75d0b70c04d394fb449 diff --git a/net-analyzer/angst/angst-0.4b-r3.ebuild b/net-analyzer/angst/angst-0.4b-r3.ebuild deleted file mode 100644 index 42a093440109..000000000000 --- a/net-analyzer/angst/angst-0.4b-r3.ebuild +++ /dev/null @@ -1,46 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit flag-o-matic toolchain-funcs - -DESCRIPTION="an active sniffer that provides methods for aggressive sniffing on switched LANs" -HOMEPAGE="http://angst.sourceforge.net/" -SRC_URI="http://angst.sourceforge.net/${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~ppc x86" -IUSE="debug" - -DEPEND=" - net-libs/libpcap - net-libs/libnet:1.0 -" -RDEPEND=" - ${DEPEND} -" -PATCHES=( - "${FILESDIR}"/${PV}-flags.patch - "${FILESDIR}"/${PV}-libnet-1.0.patch - "${FILESDIR}"/${PV}-sysctl.h.patch -) - -src_configure() { - append-cflags -fcommon - use debug && append-cppflags -DDEBUG -} - -src_compile() { - emake \ - CFLAGS="${CFLAGS}" \ - LDFLAGS="${LDFLAGS}" \ - CC="$(tc-getCC)" \ - -f Makefile.linux -} - -src_install() { - dosbin angst - doman angst.8 - dodoc README TODO ChangeLog -} diff --git a/net-analyzer/angst/files/0.4b-flags.patch b/net-analyzer/angst/files/0.4b-flags.patch deleted file mode 100644 index 1021faa5b539..000000000000 --- a/net-analyzer/angst/files/0.4b-flags.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- a/Makefile.linux -+++ b/Makefile.linux -@@ -5,7 +5,7 @@ - # - # $Id: Makefile.linux,v 1.6 2001/02/08 13:44:12 argp Exp $ - --CC = gcc -+CC ?= gcc - INSTALL_DIR = /usr/bin/install -c -o root -g bin - INSTALL_SBIN = /usr/bin/install -c -s -o root -g bin -m 555 - INSTALL_MAN = /usr/bin/install -c -o root -g bin -m 444 -@@ -21,7 +21,7 @@ - all: angst - - angst: $(OBJS) -- $(CC) $(CFLAGS) -o angst $(DEFINE) $(OBJS) $(INCLUDE) $(LIBS) -+ $(CC) $(CFLAGS) -o angst $(DEFINE) $(LDFLAGS) $(OBJS) $(INCLUDE) $(LIBS) - - clean: - rm -f angst *.o missing/*.o *.core core diff --git a/net-analyzer/angst/files/0.4b-libnet-1.0.patch b/net-analyzer/angst/files/0.4b-libnet-1.0.patch deleted file mode 100644 index a2bcf1a18696..000000000000 --- a/net-analyzer/angst/files/0.4b-libnet-1.0.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- a/Makefile.linux -+++ b/Makefile.linux -@@ -14,2 +14,2 @@ --LIBS = -L/usr/local/lib `libnet-config --libs` -lpcap --DEFINE = `libnet-config --defines` -DLINUX #-DDEBUG -+LIBS = -L/usr/local/lib `libnet-1.0-config --libs` -lpcap -+DEFINE = `libnet-1.0-config --defines` -DLINUX #-DDEBUG ---- a/angst.h -+++ b/angst.h -@@ -12 +12 @@ --#include <libnet.h> -+#include <libnet-1.0.h> diff --git a/net-analyzer/angst/files/0.4b-sysctl.h.patch b/net-analyzer/angst/files/0.4b-sysctl.h.patch deleted file mode 100644 index 16d8b53b6a3f..000000000000 --- a/net-analyzer/angst/files/0.4b-sysctl.h.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- angst.h -+++ b/angst.h -@@ -8,7 +8,9 @@ - - #include <stdarg.h> - #include <sys/param.h> -+#ifndef LINUX - #include <sys/sysctl.h> -+#endif - #include <libnet-1.0.h> - #include <pcap.h> - diff --git a/net-analyzer/angst/metadata.xml b/net-analyzer/angst/metadata.xml deleted file mode 100644 index 5502664f5ae2..000000000000 --- a/net-analyzer/angst/metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>netmon@gentoo.org</email> - <name>Gentoo network monitoring and analysis project</name> - </maintainer> - <upstream> - <remote-id type="sourceforge">angst</remote-id> - </upstream> -</pkgmetadata> diff --git a/net-analyzer/apinger/apinger-0.6.1.ebuild b/net-analyzer/apinger/apinger-0.6.1.ebuild index 46661a8ba3e7..98e7484f48b9 100644 --- a/net-analyzer/apinger/apinger-0.6.1.ebuild +++ b/net-analyzer/apinger/apinger-0.6.1.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 @@ -7,7 +7,7 @@ inherit autotools DESCRIPTION="Alarm Pinger" HOMEPAGE="https://github.com/Jajcus/apinger/" SRC_URI=" - https://dev.gentoo.org/~jer/${P}.tar.gz + https://dev.gentoo.org/~jsmolic/distfiles/${P}.tar.gz " LICENSE="GPL-2" @@ -15,8 +15,8 @@ SLOT="0" KEYWORDS="~amd64" DEPEND=" - sys-devel/flex - virtual/yacc + app-alternatives/lex + app-alternatives/yacc " DOCS=( AUTHORS ChangeLog NEWS README TODO ) PATCHES=( diff --git a/net-analyzer/apinger/metadata.xml b/net-analyzer/apinger/metadata.xml index 6aec7233ff54..a74dc89a2dab 100644 --- a/net-analyzer/apinger/metadata.xml +++ b/net-analyzer/apinger/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>netmon@gentoo.org</email> diff --git a/net-analyzer/argus-clients/Manifest b/net-analyzer/argus-clients/Manifest index 86af1c6d491b..e8b59fc9f84c 100644 --- a/net-analyzer/argus-clients/Manifest +++ b/net-analyzer/argus-clients/Manifest @@ -1,3 +1 @@ -DIST argus-clients-3.0.8.2.tar.gz 2776072 BLAKE2B 429a12d63f38ce1c5dae343be28543f3c8b6dd746661a893a0108db100762d60dec619cdccfff525b84c0843f0bb61c7e5d96df561a369e6df0d1e6a821d938a SHA512 20aac16bd6474b8f98c8fc86b21ad0b43aca62264c6de2f7f26eea876a90f7276cdaf2241a510a19ae445f40f5d0d05ec6a5869980b6889e6eb5937dbff0f855 -DIST argus-clients-3.0.8.3.tar.gz 2753929 BLAKE2B 561b945ce5beb8d8d016579921417f405f421fd2afe2369ff0a4c5b8aaed44eca7591b43e64db00396cf963cc550753207c9b0e8d21d6b99d8c1ea0faaddb0e9 SHA512 ce6f6aaa21452f60c72498b5410cdc650eed6eec6d949daf7226e93f22d193db175e8051073cbfd258c127ed7cb445d6673ae38f386982dc19632ac55539960e -DIST argus-clients-3.0.8.tar.gz 2627515 BLAKE2B e7753ce1a65f24639c0c36d694033b038abb7cf835b89a1020edf72829f9196cad2a1be5958a28a51884c169ff7b4e295381501e61cf1e1eb1ee1557fccb6d8f SHA512 79022b3c3e472ebc526b27c20c25ae97abdb9a363a91ebbe3baf405f2aba9bdd80fbc0250b444d3d7ab4488e3c1325389a4719e92d9aded7598a91c3309369c2 +DIST argus-clients-3.0.8.4.tar.gz 2773840 BLAKE2B 0b5a24bc6a5c3163a0ac19a3a354e6573491e130c4b854bc4c9b19e6dfa1d27acea8338a88e589043b839994182756b04e205d9ef6815b2f7dc347fb51405c88 SHA512 5b6a03528c31b534d56370b4b8189d223691bb0d8f465349e7850bf54b4663e9851bddb54060a8bc263be3b80f4eab829413a7ff4da312e6640e2f7191d65473 diff --git a/net-analyzer/argus-clients/argus-clients-3.0.8.2-r2.ebuild b/net-analyzer/argus-clients/argus-clients-3.0.8.2-r2.ebuild deleted file mode 100644 index d87060d87bec..000000000000 --- a/net-analyzer/argus-clients/argus-clients-3.0.8.2-r2.ebuild +++ /dev/null @@ -1,74 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit autotools toolchain-funcs - -DESCRIPTION="Clients for net-analyzer/argus" -HOMEPAGE="https://www.qosient.com/argus/" -SRC_URI="https://qosient.com/argus/dev/${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" -IUSE="debug ft geoip mysql sasl tcpd" - -ARGUS_CDEPEND=" - net-analyzer/rrdtool[perl] - net-libs/libpcap - net-libs/libtirpc:= - sys-libs/ncurses:= - sys-libs/readline:= - sys-libs/zlib - ft? ( net-analyzer/flow-tools ) - geoip? ( dev-libs/geoip ) - mysql? ( dev-db/mysql-connector-c:0= ) - sasl? ( dev-libs/cyrus-sasl ) -" -RDEPEND=" - ${ARGUS_CDEPEND} -" -DEPEND=" - ${ARGUS_CDEPEND} - sys-devel/bison - sys-devel/flex - virtual/pkgconfig -" -PATCHES=( - "${FILESDIR}"/${PN}-3.0.4.1-disable-tcp-wrappers-automagic.patch - "${FILESDIR}"/${PN}-3.0.7.21-curses-readline.patch - "${FILESDIR}"/${PN}-3.0.8.2-rpc.patch - "${FILESDIR}"/${PN}-3.0.8.2-ar.patch - "${FILESDIR}"/${PN}-3.0.8.2-curses-readline.patch -) - -src_prepare() { - default - - eautoreconf -} - -src_configure() { - tc-export AR RANLIB - - use debug && touch .debug - econf \ - $(use_with ft libft) \ - $(use_with geoip GeoIP /usr/) \ - $(use_with sasl) \ - $(use_with tcpd wrappers) \ - $(use_with mysql mysql /usr) -} - -src_compile() { - emake \ - CCOPT="${CFLAGS} ${LDFLAGS}" \ - RANLIB=$(tc-getRANLIB) \ - CURSESLIB="$( $(tc-getPKG_CONFIG) --libs ncurses)" -} - -src_install() { - dobin bin/ra* - dodoc ChangeLog CREDITS README CHANGES - doman man/man{1,5}/* -} diff --git a/net-analyzer/argus-clients/argus-clients-3.0.8.2-r3.ebuild b/net-analyzer/argus-clients/argus-clients-3.0.8.2-r3.ebuild deleted file mode 100644 index 637ef50ad05a..000000000000 --- a/net-analyzer/argus-clients/argus-clients-3.0.8.2-r3.ebuild +++ /dev/null @@ -1,75 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit autotools toolchain-funcs - -DESCRIPTION="Clients for net-analyzer/argus" -HOMEPAGE="https://www.qosient.com/argus/" -SRC_URI="https://qosient.com/argus/dev/${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" -IUSE="debug ft geoip mysql sasl tcpd" - -ARGUS_CDEPEND=" - net-analyzer/rrdtool[perl] - net-libs/libpcap - net-libs/libtirpc:= - sys-libs/ncurses:= - sys-libs/readline:= - sys-libs/zlib - ft? ( net-analyzer/flow-tools ) - geoip? ( dev-libs/geoip ) - mysql? ( dev-db/mysql-connector-c:0= ) - sasl? ( dev-libs/cyrus-sasl ) -" -RDEPEND=" - ${ARGUS_CDEPEND} -" -DEPEND=" - ${ARGUS_CDEPEND} - sys-devel/bison - sys-devel/flex - virtual/pkgconfig -" -PATCHES=( - "${FILESDIR}"/${PN}-3.0.4.1-disable-tcp-wrappers-automagic.patch - "${FILESDIR}"/${PN}-3.0.7.21-curses-readline.patch - "${FILESDIR}"/${PN}-3.0.8.2-ar.patch - "${FILESDIR}"/${PN}-3.0.8.2-curses-readline.patch - "${FILESDIR}"/${PN}-3.0.8.2-my_bool.patch - "${FILESDIR}"/${PN}-3.0.8.2-rpc.patch -) - -src_prepare() { - default - - eautoreconf -} - -src_configure() { - tc-export AR RANLIB - - use debug && touch .debug - econf \ - $(use_with ft libft) \ - $(use_with geoip GeoIP /usr/) \ - $(use_with sasl) \ - $(use_with tcpd wrappers) \ - $(use_with mysql mysql /usr) -} - -src_compile() { - emake \ - CCOPT="${CFLAGS} ${LDFLAGS}" \ - RANLIB=$(tc-getRANLIB) \ - CURSESLIB="$( $(tc-getPKG_CONFIG) --libs ncurses)" -} - -src_install() { - dobin bin/ra* - dodoc ChangeLog CREDITS README CHANGES - doman man/man{1,5}/* -} diff --git a/net-analyzer/argus-clients/argus-clients-3.0.8.2.ebuild b/net-analyzer/argus-clients/argus-clients-3.0.8.2.ebuild deleted file mode 100644 index d16c7f6422a6..000000000000 --- a/net-analyzer/argus-clients/argus-clients-3.0.8.2.ebuild +++ /dev/null @@ -1,72 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit autotools eutils toolchain-funcs - -DESCRIPTION="Clients for net-analyzer/argus" -HOMEPAGE="https://www.qosient.com/argus/" -SRC_URI="https://qosient.com/argus/dev/${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" -IUSE="debug ft geoip mysql sasl tcpd" - -MY_CDEPEND=" - net-analyzer/rrdtool[perl] - net-libs/libpcap - sys-libs/ncurses:= - sys-libs/readline:= - sys-libs/zlib - ft? ( net-analyzer/flow-tools ) - geoip? ( dev-libs/geoip ) - mysql? ( virtual/mysql ) - sasl? ( dev-libs/cyrus-sasl ) -" - -RDEPEND=" - ${MY_CDEPEND} -" - -DEPEND=" - ${MY_CDEPEND} - sys-devel/bison - sys-devel/flex - virtual/pkgconfig -" - -src_prepare() { - epatch \ - "${FILESDIR}"/${PN}-3.0.4.1-disable-tcp-wrappers-automagic.patch \ - "${FILESDIR}"/${PN}-3.0.7.21-curses-readline.patch - - sed -i -e 's| ar | $(AR) |g' common/Makefile.in || die - tc-export AR RANLIB - - eautoreconf -} - -src_configure() { - use debug && touch .debug - econf \ - $(use_with ft libft) \ - $(use_with geoip GeoIP /usr/) \ - $(use_with sasl) \ - $(use_with tcpd wrappers) \ - $(use_with mysql) -} - -src_compile() { - # racurses uses both libncurses and libtinfo, if present - emake \ - CCOPT="${CFLAGS} ${LDFLAGS}" \ - RANLIB=$(tc-getRANLIB) \ - CURSESLIB="$( $(tc-getPKG_CONFIG) --libs ncurses)" -} - -src_install() { - dobin bin/ra* - dodoc ChangeLog CREDITS README CHANGES - doman man/man{1,5}/* -} diff --git a/net-analyzer/argus-clients/argus-clients-3.0.8.3.ebuild b/net-analyzer/argus-clients/argus-clients-3.0.8.3.ebuild deleted file mode 100644 index da05b0364a68..000000000000 --- a/net-analyzer/argus-clients/argus-clients-3.0.8.3.ebuild +++ /dev/null @@ -1,74 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit autotools toolchain-funcs - -DESCRIPTION="Clients for net-analyzer/argus" -HOMEPAGE="https://openargus.org/" -SRC_URI="https://qosient.com/argus/dev/${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" -IUSE="debug ft geoip mysql sasl tcpd" - -ARGUS_CDEPEND=" - net-analyzer/rrdtool[perl] - net-libs/libpcap - net-libs/libtirpc:= - sys-libs/ncurses:= - sys-libs/readline:= - sys-libs/zlib - ft? ( net-analyzer/flow-tools ) - geoip? ( dev-libs/geoip ) - mysql? ( dev-db/mysql-connector-c:0= ) - sasl? ( dev-libs/cyrus-sasl ) -" -RDEPEND=" - ${ARGUS_CDEPEND} -" -DEPEND=" - ${ARGUS_CDEPEND} - sys-devel/bison - sys-devel/flex - virtual/pkgconfig -" -PATCHES=( - "${FILESDIR}"/${PN}-3.0.4.1-disable-tcp-wrappers-automagic.patch - "${FILESDIR}"/${PN}-3.0.7.21-curses-readline.patch - "${FILESDIR}"/${PN}-3.0.8.2-ar.patch - "${FILESDIR}"/${PN}-3.0.8.2-curses-readline.patch - "${FILESDIR}"/${PN}-3.0.8.2-my_bool.patch -) - -src_prepare() { - default - - eautoreconf -} - -src_configure() { - tc-export AR RANLIB - - use debug && touch .debug - econf \ - $(use_with ft libft) \ - $(use_with geoip GeoIP /usr/) \ - $(use_with sasl) \ - $(use_with tcpd wrappers) \ - $(use_with mysql mysql /usr) -} - -src_compile() { - emake \ - CCOPT="${CFLAGS} ${LDFLAGS}" \ - RANLIB=$(tc-getRANLIB) \ - CURSESLIB="$( $(tc-getPKG_CONFIG) --libs ncurses)" -} - -src_install() { - dobin bin/ra* - dodoc ChangeLog CREDITS README CHANGES - doman man/man{1,5}/* -} diff --git a/net-analyzer/argus-clients/argus-clients-3.0.8.4.ebuild b/net-analyzer/argus-clients/argus-clients-3.0.8.4.ebuild new file mode 100644 index 000000000000..e86bfbb510dd --- /dev/null +++ b/net-analyzer/argus-clients/argus-clients-3.0.8.4.ebuild @@ -0,0 +1,76 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools toolchain-funcs + +DESCRIPTION="Clients for net-analyzer/argus" +HOMEPAGE="https://openargus.org/" +SRC_URI="https://github.com/openargus/clients/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}"/clients-${PV} + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="amd64 ~ppc x86" +IUSE="debug ft geoip mysql sasl tcpd" + +RDEPEND=" + net-analyzer/rrdtool[perl] + net-libs/libpcap + net-libs/libtirpc:= + sys-libs/ncurses:= + sys-libs/readline:= + sys-libs/zlib + ft? ( net-analyzer/flow-tools ) + geoip? ( dev-libs/geoip ) + mysql? ( dev-db/mysql-connector-c:0= ) + sasl? ( dev-libs/cyrus-sasl ) +" +DEPEND="${RDEPEND}" +BDEPEND=" + app-alternatives/yacc + app-alternatives/lex + virtual/pkgconfig +" + +PATCHES=( + "${FILESDIR}"/${PN}-3.0.4.1-disable-tcp-wrappers-automagic.patch + "${FILESDIR}"/${PN}-3.0.7.21-curses-readline.patch + "${FILESDIR}"/${PN}-3.0.8.2-ar.patch + "${FILESDIR}"/${PN}-3.0.8.2-curses-readline.patch + "${FILESDIR}"/${PN}-3.0.8.2-my_bool.patch + "${FILESDIR}"/${PN}-3.0.8.3-configure-clang16.patch + "${FILESDIR}"/${PN}-3.0.8.4-autoconf-2.70.patch +) + +src_prepare() { + default + + eautoreconf +} + +src_configure() { + tc-export AR RANLIB + + use debug && touch .debug + econf \ + $(use_with ft libft) \ + $(use_with geoip GeoIP /usr/) \ + $(use_with sasl) \ + $(use_with tcpd wrappers) \ + $(use_with mysql mysql /usr) +} + +src_compile() { + emake \ + CCOPT="${CFLAGS} ${LDFLAGS}" \ + RANLIB="$(tc-getRANLIB)" \ + CURSESLIB="$( $(tc-getPKG_CONFIG) --libs ncurses)" +} + +src_install() { + dobin bin/ra* + dodoc ChangeLog CREDITS README CHANGES + doman man/man{1,5}/* +} diff --git a/net-analyzer/argus-clients/argus-clients-3.0.8.ebuild b/net-analyzer/argus-clients/argus-clients-3.0.8.ebuild deleted file mode 100644 index 742c6cbebee7..000000000000 --- a/net-analyzer/argus-clients/argus-clients-3.0.8.ebuild +++ /dev/null @@ -1,72 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit autotools eutils toolchain-funcs - -DESCRIPTION="Clients for net-analyzer/argus" -HOMEPAGE="https://www.qosient.com/argus/" -SRC_URI="https://qosient.com/argus/dev/${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="amd64 ppc x86" -IUSE="debug ft geoip mysql sasl tcpd" - -MY_CDEPEND=" - net-analyzer/rrdtool[perl] - net-libs/libpcap - sys-libs/ncurses - sys-libs/readline - sys-libs/zlib - ft? ( net-analyzer/flow-tools ) - geoip? ( dev-libs/geoip ) - mysql? ( virtual/mysql ) - sasl? ( dev-libs/cyrus-sasl ) -" - -RDEPEND=" - ${MY_CDEPEND} -" - -DEPEND=" - ${MY_CDEPEND} - sys-devel/bison - sys-devel/flex - virtual/pkgconfig -" - -src_prepare() { - epatch \ - "${FILESDIR}"/${PN}-3.0.4.1-disable-tcp-wrappers-automagic.patch \ - "${FILESDIR}"/${PN}-3.0.7.21-curses-readline.patch - - sed -i -e 's| ar | $(AR) |g' common/Makefile.in || die - tc-export AR RANLIB - - eautoreconf -} - -src_configure() { - use debug && touch .debug - econf \ - $(use_with ft libft) \ - $(use_with geoip GeoIP /usr/) \ - $(use_with sasl) \ - $(use_with tcpd wrappers) \ - $(use_with mysql) -} - -src_compile() { - # racurses uses both libncurses and libtinfo, if present - emake \ - CCOPT="${CFLAGS} ${LDFLAGS}" \ - RANLIB=$(tc-getRANLIB) \ - CURSESLIB="$( $(tc-getPKG_CONFIG) --libs ncurses)" -} - -src_install() { - dobin bin/ra* - dodoc ChangeLog CREDITS README CHANGES - doman man/man{1,5}/* -} diff --git a/net-analyzer/argus-clients/files/argus-clients-3.0.8.2-rpc.patch b/net-analyzer/argus-clients/files/argus-clients-3.0.8.2-rpc.patch deleted file mode 100644 index e140fa96b2a3..000000000000 --- a/net-analyzer/argus-clients/files/argus-clients-3.0.8.2-rpc.patch +++ /dev/null @@ -1,34 +0,0 @@ ---- a/configure.ac -+++ b/configure.ac -@@ -40,6 +40,7 @@ - AC_PROG_INSTALL - AC_PROG_RANLIB - AC_PROG_YACC -+PKG_PROG_PKG_CONFIG - - AC_CHECK_PROGS(V_RANLIB, ranlib, @true) - AC_QOSIENT_LEX_AND_YACC(V_LEX, V_YACC, argus_) -@@ -82,6 +83,12 @@ - AC_CHECK_HEADERS([stdlib.h stddef.h string.h strings.h sys/file.h sys/ioctl.h sys/param.h sys/socket.h]) - AC_CHECK_HEADERS([sys/mount.h sys/time.h sys/vfs.h syslog.h termios.h unistd.h values.h ifaddrs.h]) - -+PKG_CHECK_MODULES(libtirpc, libtirpc, -+ [LIBS="${LIBS} ${libtirpc_LIBS}"], -+[AC_CHECK_HEADER([rpc/types.h],, -+ [AC_MSG_ERROR([Cannot find <rpc/types.h>])])] -+) -+ - # Checks for typedefs, structures, and compiler characteristics. - AC_C_CONST - AC_C_INLINE ---- a/common/Makefile.in -+++ b/common/Makefile.in -@@ -48,7 +48,7 @@ - - CC = @CC@ - CCOPT = @V_CCOPT@ --INCLS = -I. -I../include @V_INCLS@ @MYSQL_INCLS@ -+INCLS = -I. -I../include @V_INCLS@ @MYSQL_INCLS@ @libtirpc_CFLAGS@ - DEFS = @DEFS@ -DARGUS_SYSLOG - - # Standard CFLAGS diff --git a/net-analyzer/argus-clients/files/argus-clients-3.0.8.3-configure-clang16.patch b/net-analyzer/argus-clients/files/argus-clients-3.0.8.3-configure-clang16.patch new file mode 100644 index 000000000000..ac974dbdf395 --- /dev/null +++ b/net-analyzer/argus-clients/files/argus-clients-3.0.8.3-configure-clang16.patch @@ -0,0 +1,41 @@ +https://github.com/openargus/clients/pull/7 + +From 00264608bad9655d72927f31a2b2744b5e2e2e31 Mon Sep 17 00:00:00 2001 +From: Florian Weimer <fweimer@redhat.com> +Date: Fri, 25 Nov 2022 19:03:24 +0100 +Subject: [PATCH] configure (AC_LBL_UNALIGNED_ACCESS): Avoid implicit function + decls + +Implicit function declarations were removed from the C language +in 1999. Include the relevant header files to ensure that the +check still works with future compilers. C99 also requires +to declare the return types of all functions. +--- a/acsite.m4 ++++ b/acsite.m4 +@@ -298,8 +298,10 @@ AC_DEFUN([AC_LBL_UNALIGNED_ACCESS], + # include <sys/types.h> + # include <sys/wait.h> + # include <stdio.h> ++# include <stdlib.h> ++# include <unistd.h> + unsigned char a[[5]] = { 1, 2, 3, 4, 5 }; +- main() { ++ int main() { + unsigned int i; + pid_t pid; + int status; +--- a/configure ++++ b/configure +@@ -6711,8 +6711,10 @@ else + # include <sys/types.h> + # include <sys/wait.h> + # include <stdio.h> ++# include <stdlib.h> ++# include <unistd.h> + unsigned char a[5] = { 1, 2, 3, 4, 5 }; +- main() { ++ int main() { + unsigned int i; + pid_t pid; + int status; + diff --git a/net-analyzer/argus-clients/files/argus-clients-3.0.8.4-autoconf-2.70.patch b/net-analyzer/argus-clients/files/argus-clients-3.0.8.4-autoconf-2.70.patch new file mode 100644 index 000000000000..b6a322fb6913 --- /dev/null +++ b/net-analyzer/argus-clients/files/argus-clients-3.0.8.4-autoconf-2.70.patch @@ -0,0 +1,55 @@ +https://sources.debian.org/patches/argus-clients/1:3.0.8.2-6.1/0007-Fix-autoconf-2.70-build.patch/ +https://bugs.gentoo.org/808861 + +From: Boyuan Yang <byang@debian.org> +Date: Fri, 1 Oct 2021 16:13:38 -0400 +Subject: Fix autoconf 2.70 build + +Bug-Debian: https://bugs.debian.org/978769 +--- a/acsite.m4 ++++ b/acsite.m4 +@@ -715,13 +715,13 @@ AC_DEFUN([AC_QOSIENT_READLINE], [ + esac + fi + +- AC_CHECK_HEADERS(readline/readline.h, +- AC_CHECK_DECLS([rl_event_hook, rl_catch_signals, rl_done, rl_set_keyboard_input_timeout, rl_replace_line, rl_delete_text, rl_resize_terminal, rl_save_prompt ], [] , [] , +- [ ++ AC_CHECK_HEADERS([readline/readline.h], ++ [AC_CHECK_DECLS([rl_event_hook, rl_catch_signals, rl_done, rl_set_keyboard_input_timeout, rl_replace_line, rl_delete_text, rl_resize_terminal, rl_save_prompt ], [] , [] , ++ [[ + #include <stdlib.h> + #include <stdio.h> + #include <readline/readline.h> +- ]), ac_cv_found_readline=no) ++ ]])], [ac_cv_found_readline=no]) + + if test "$ac_cv_found_readline" != no; then + $1="-lreadline" +--- a/configure.ac ++++ b/configure.ac +@@ -41,17 +41,17 @@ AC_PROG_INSTALL + AC_PROG_RANLIB + AC_PROG_YACC + +-AC_CHECK_PROGS(V_RANLIB, ranlib, @true) +-AC_QOSIENT_LEX_AND_YACC(V_LEX, V_YACC, argus_) ++AC_CHECK_PROGS([V_RANLIB], [ranlib], [@true]) ++AC_QOSIENT_LEX_AND_YACC([V_LEX], [V_YACC], [argus_]) + + # Checks for libraries. +-AC_QOSIENT_READLINE(V_READLINE, V_INCLS) ++AC_QOSIENT_READLINE([V_READLINE], [V_INCLS]) + +-CMU_SASL2(V_INCLS) ++CMU_SASL2([V_INCLS]) + AC_CMU_MYSQL + +-AC_CHECK_HEADERS(zlib.h, [AC_CHECK_LIB(z, uncompress, ZLIB="-lz")]) +-AC_QOSIENT_FLOWTOOLS(V_FLOWTOOLS, V_INCLS) ++AC_CHECK_HEADERS([zlib.h], [AC_CHECK_LIB([z], [uncompress], [ZLIB="-lz"])]) ++AC_QOSIENT_FLOWTOOLS([V_FLOWTOOLS], [V_INCLS]) + + if test ! -z "$V_FLOWTOOLS"; then + AC_DEFINE([ARGUS_FLOWTOOLS], [], [Using Flow Tools library]) + diff --git a/net-analyzer/argus-clients/metadata.xml b/net-analyzer/argus-clients/metadata.xml index f94ded5e56fe..08109ceb82f0 100644 --- a/net-analyzer/argus-clients/metadata.xml +++ b/net-analyzer/argus-clients/metadata.xml @@ -1,10 +1,14 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!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> -<use><flag name="ft">Enable support for flow packets through -<pkg>net-analyzer/flow-tools</pkg></flag></use> + <maintainer type="project"> + <email>netmon@gentoo.org</email> + <name>Gentoo network monitoring and analysis project</name> + </maintainer> + <use> + <flag name="ft">Enable support for flow packets through <pkg>net-analyzer/flow-tools</pkg></flag> + </use> + <upstream> + <remote-id type="github">openargus/clients</remote-id> + </upstream> </pkgmetadata> diff --git a/net-analyzer/argus/Manifest b/net-analyzer/argus/Manifest index 960cce267b55..196e3c621939 100644 --- a/net-analyzer/argus/Manifest +++ b/net-analyzer/argus/Manifest @@ -1,2 +1 @@ -DIST argus-3.0.8.2.tar.gz 524749 BLAKE2B 4d93fd8acd71b198da712961d75f0e813f5ed3fde841e77b8a10c3a9b89571902b7597969a4be12437c97ffc69ba5ebefaee8b684c5d2d4ce4f1309c1cfd1199 SHA512 146795880d8697e065ed23d2fbab226846d55db0b71945c5a4cab2896e48ceb6e1671ccb4e00dc3b0f984525bac4ced3773f3b9e70c3ea5f7c6972fe9bd94313 DIST argus-3.0.8.3.tar.gz 524549 BLAKE2B f905784c12d28d4440a7a6954441ce4f0865125a87e3d740edd5785e729f8b5b45967d97aef4f72802d2166b76176e15c6f15ec99b87ae1d14849ae92c65ad76 SHA512 f66db5b3bb1305825b76a7eda413d5805d65182aabef647e27716cfd629327b3aab8c299bc8af419199ac655cef4ac3bfcb83c059080e98b042e09f79f01d82a diff --git a/net-analyzer/argus/argus-3.0.8.2-r3.ebuild b/net-analyzer/argus/argus-3.0.8.2-r3.ebuild deleted file mode 100644 index 47656c47be5d..000000000000 --- a/net-analyzer/argus/argus-3.0.8.2-r3.ebuild +++ /dev/null @@ -1,84 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit autotools epatch - -DESCRIPTION="network Audit Record Generation and Utilization System" -HOMEPAGE="https://www.qosient.com/argus/" -SRC_URI="https://www.qosient.com/argus/dev/${P/_rc/.rc.}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos" -IUSE="debug +libtirpc sasl tcpd" - -RDEPEND=" - acct-group/argus - acct-user/argus - net-libs/libnsl:= - net-libs/libpcap - sys-libs/zlib - !libtirpc? ( sys-libs/glibc[rpc(-)] ) - libtirpc? ( net-libs/libtirpc ) - sasl? ( dev-libs/cyrus-sasl ) - tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) -" -DEPEND=" - ${RDEPEND} - >=sys-devel/bison-1.28 - >=sys-devel/flex-2.4.6 -" - -S=${WORKDIR}/${P/_rc/.rc.} - -src_prepare() { - find . -type f -execdir chmod +w {} \; #561360 - sed -e 's:/etc/argus.conf:/etc/argus/argus.conf:' \ - -i argus/argus.c \ - -i support/Config/argus.conf \ - -i man/man8/argus.8 \ - -i man/man5/argus.conf.5 || die - - sed -e 's:#\(ARGUS_SETUSER_ID=\).*:\1argus:' \ - -e 's:#\(ARGUS_SETGROUP_ID=\).*:\1argus:' \ - -e 's:\(#ARGUS_CHROOT_DIR=\).*:\1/var/lib/argus:' \ - -i support/Config/argus.conf || die - epatch \ - "${FILESDIR}"/${PN}-3.0.8.1-disable-tcp-wrappers-automagic.patch \ - "${FILESDIR}"/${PN}-3.0.5-Makefile.patch \ - "${FILESDIR}"/${PN}-3.0.7.3-DLT_IPNET.patch \ - "${FILESDIR}"/${PN}-3.0.8.2-rpc.patch - - epatch_user - eautoreconf -} - -src_configure() { - use debug && touch .debug # enable debugging - econf $(use_with libtirpc) $(use_with tcpd wrappers) $(use_with sasl) -} - -src_compile() { - emake CCOPT="${CFLAGS} ${LDFLAGS}" -} - -src_install() { - doman man/man5/*.5 man/man8/*.8 - - dosbin bin/argus{,bug} - - dodoc ChangeLog CREDITS README - - insinto /etc/argus - doins support/Config/argus.conf - - newinitd "${FILESDIR}/argus.initd" argus - keepdir /var/lib/argus -} - -pkg_postinst() { - elog "Note, if you modify ARGUS_DAEMON value in argus.conf it's quite" - elog "possible that the init script will fail to work." -} diff --git a/net-analyzer/argus/argus-3.0.8.2-r4.ebuild b/net-analyzer/argus/argus-3.0.8.2-r4.ebuild deleted file mode 100644 index dd6e555ef544..000000000000 --- a/net-analyzer/argus/argus-3.0.8.2-r4.ebuild +++ /dev/null @@ -1,85 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools - -DESCRIPTION="network Audit Record Generation and Utilization System" -HOMEPAGE="https://openargus.org/" -SRC_URI="https://www.qosient.com/argus/dev/${P/_rc/.rc.}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos" -IUSE="debug +libtirpc sasl tcpd" - -RDEPEND=" - acct-group/argus - acct-user/argus - net-libs/libnsl:= - net-libs/libpcap - sys-libs/zlib - !libtirpc? ( sys-libs/glibc[rpc(-)] ) - libtirpc? ( net-libs/libtirpc ) - sasl? ( dev-libs/cyrus-sasl ) - tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) -" -DEPEND="${RDEPEND}" -BDEPEND=" - >=sys-devel/bison-1.28 - >=sys-devel/flex-2.4.6 -" -PATCHES=( - "${FILESDIR}"/${PN}-3.0.8.1-disable-tcp-wrappers-automagic.patch - "${FILESDIR}"/${PN}-3.0.5-Makefile.patch - "${FILESDIR}"/${PN}-3.0.7.3-DLT_IPNET.patch - "${FILESDIR}"/${PN}-3.0.8.2-rpc.patch - "${FILESDIR}"/${PN}-3.0.8.2-fno-common.patch -) -S=${WORKDIR}/${P/_rc/.rc.} - -src_prepare() { - find . -type f -execdir chmod +w {} \; #561360 - sed -e 's:/etc/argus.conf:/etc/argus/argus.conf:' \ - -i argus/argus.c \ - -i support/Config/argus.conf \ - -i man/man8/argus.8 \ - -i man/man5/argus.conf.5 || die - - sed -e 's:#\(ARGUS_SETUSER_ID=\).*:\1argus:' \ - -e 's:#\(ARGUS_SETGROUP_ID=\).*:\1argus:' \ - -e 's:\(#ARGUS_CHROOT_DIR=\).*:\1/var/lib/argus:' \ - -i support/Config/argus.conf || die - - default - eautoreconf -} - -src_configure() { - use debug && touch .debug # enable debugging - econf $(use_with libtirpc) $(use_with tcpd wrappers) $(use_with sasl) -} - -src_compile() { - emake CCOPT="${CFLAGS} ${LDFLAGS}" -} - -src_install() { - doman man/man5/*.5 man/man8/*.8 - - dosbin bin/argus{,bug} - - dodoc ChangeLog CREDITS README - - insinto /etc/argus - doins support/Config/argus.conf - - newinitd "${FILESDIR}/argus.initd" argus - keepdir /var/lib/argus -} - -pkg_postinst() { - elog "Note, if you modify ARGUS_DAEMON value in argus.conf it's quite" - elog "possible that the init script will fail to work." -} diff --git a/net-analyzer/argus/argus-3.0.8.3-r1.ebuild b/net-analyzer/argus/argus-3.0.8.3-r1.ebuild deleted file mode 100644 index 9dc4905b07a7..000000000000 --- a/net-analyzer/argus/argus-3.0.8.3-r1.ebuild +++ /dev/null @@ -1,90 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools toolchain-funcs - -DESCRIPTION="network Audit Record Generation and Utilization System" -HOMEPAGE="https://openargus.org/" -SRC_URI="https://www.qosient.com/argus/dev/${P/_rc/.rc.}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos" -IUSE="debug sasl tcpd" - -RDEPEND=" - acct-group/argus - acct-user/argus - net-libs/libnsl:= - net-libs/libpcap - net-libs/libtirpc - sys-libs/zlib - sasl? ( dev-libs/cyrus-sasl ) - tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) -" -DEPEND="${RDEPEND}" -BDEPEND=" - >=sys-devel/bison-1.28 - >=sys-devel/flex-2.4.6 -" -PATCHES=( - "${FILESDIR}"/${PN}-3.0.8.1-disable-tcp-wrappers-automagic.patch - "${FILESDIR}"/${PN}-3.0.5-Makefile.patch - "${FILESDIR}"/${PN}-3.0.7.3-DLT_IPNET.patch - "${FILESDIR}"/${PN}-3.0.8.3-ar.patch - "${FILESDIR}"/${PN}-3.0.8.3-as-needed.patch -) -S=${WORKDIR}/${P/_rc/.rc.} - -src_prepare() { - find . -type f -execdir chmod +w {} \; #561360 - sed -e 's:/etc/argus.conf:/etc/argus/argus.conf:' \ - -i argus/argus.c \ - -i support/Config/argus.conf \ - -i man/man8/argus.8 \ - -i man/man5/argus.conf.5 || die - - sed -e 's:#\(ARGUS_SETUSER_ID=\).*:\1argus:' \ - -e 's:#\(ARGUS_SETGROUP_ID=\).*:\1argus:' \ - -e 's:\(#ARGUS_CHROOT_DIR=\).*:\1/var/lib/argus:' \ - -i support/Config/argus.conf || die - - default - eautoreconf -} - -src_configure() { - use debug && touch .debug # enable debugging - - econf \ - $(use_with sasl) \ - $(use_with tcpd wrappers) -} - -src_compile() { - emake \ - CCOPT="${CFLAGS} ${LDFLAGS}" \ - AR="$(tc-getAR)" \ - RANLIB="$(tc-getRANLIB)" -} - -src_install() { - doman man/man5/*.5 man/man8/*.8 - - dosbin bin/argus{,bug} - - dodoc ChangeLog CREDITS README - - insinto /etc/argus - doins support/Config/argus.conf - - newinitd "${FILESDIR}/argus.initd" argus - keepdir /var/lib/argus -} - -pkg_postinst() { - elog "Note, if you modify ARGUS_DAEMON value in argus.conf it's quite" - elog "possible that the init script will fail to work." -} diff --git a/net-analyzer/argus/argus-3.0.8.3-r2.ebuild b/net-analyzer/argus/argus-3.0.8.3-r2.ebuild new file mode 100644 index 000000000000..c366c9a7af03 --- /dev/null +++ b/net-analyzer/argus/argus-3.0.8.3-r2.ebuild @@ -0,0 +1,99 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools flag-o-matic toolchain-funcs + +DESCRIPTION="network Audit Record Generation and Utilization System" +HOMEPAGE="https://openargus.org/" +SRC_URI="https://www.qosient.com/argus/dev/${P/_rc/.rc.}.tar.gz" +S="${WORKDIR}"/${P/_rc/.rc.} + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos" +IUSE="debug sasl tcpd" + +DEPEND=" + net-libs/libnsl:= + net-libs/libpcap + net-libs/libtirpc + sys-libs/zlib + sasl? ( dev-libs/cyrus-sasl ) + tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) +" +RDEPEND=" + acct-group/argus + acct-user/argus + ${DEPEND} +" +BDEPEND=" + >=sys-devel/bison-1.28 + app-alternatives/lex +" +PATCHES=( + "${FILESDIR}"/${PN}-3.0.8.1-disable-tcp-wrappers-automagic.patch + "${FILESDIR}"/${PN}-3.0.5-Makefile.patch + "${FILESDIR}"/${PN}-3.0.7.3-DLT_IPNET.patch + "${FILESDIR}"/${PN}-3.0.8.3-ar.patch + "${FILESDIR}"/${PN}-3.0.8.3-as-needed.patch + "${FILESDIR}"/${PN}-3.0.8.3-configure-clang16.patch +) + +src_prepare() { + find . -type f -execdir chmod +w {} \; #561360 + sed -e 's:/etc/argus.conf:/etc/argus/argus.conf:' \ + -i argus/argus.c \ + -i support/Config/argus.conf \ + -i man/man8/argus.8 \ + -i man/man5/argus.conf.5 || die + + sed -e 's:#\(ARGUS_SETUSER_ID=\).*:\1argus:' \ + -e 's:#\(ARGUS_SETGROUP_ID=\).*:\1argus:' \ + -e 's:\(#ARGUS_CHROOT_DIR=\).*:\1/var/lib/argus:' \ + -i support/Config/argus.conf || die + + default + eautoreconf +} + +src_configure() { + # -Werror=strict-aliasing + # https://bugs.gentoo.org/861146 + # https://github.com/openargus/argus/issues/8 + append-flags -fno-strict-aliasing + filter-lto + + use debug && touch .debug # enable debugging + + econf \ + $(use_with sasl) \ + $(use_with tcpd wrappers) +} + +src_compile() { + emake \ + CCOPT="${CFLAGS} ${LDFLAGS}" \ + AR="$(tc-getAR)" \ + RANLIB="$(tc-getRANLIB)" +} + +src_install() { + doman man/man5/*.5 man/man8/*.8 + + dosbin bin/argus{,bug} + + dodoc ChangeLog CREDITS README + + insinto /etc/argus + doins support/Config/argus.conf + + newinitd "${FILESDIR}/argus.initd" argus + keepdir /var/lib/argus +} + +pkg_postinst() { + elog "Note, if you modify ARGUS_DAEMON value in argus.conf it's quite" + elog "possible that the init script will fail to work." +} diff --git a/net-analyzer/argus/files/argus-3.0.8.2-fno-common.patch b/net-analyzer/argus/files/argus-3.0.8.2-fno-common.patch deleted file mode 100644 index 66f950d0c04d..000000000000 --- a/net-analyzer/argus/files/argus-3.0.8.2-fno-common.patch +++ /dev/null @@ -1,45 +0,0 @@ ---- a/include/argus/bootp.h -+++ b/include/argus/bootp.h -@@ -45,6 +45,8 @@ - unsigned char bp_vend[64]; /* vendor-specific area */ - }; - -+extern struct bootp *bp; -+ - /* - * UDP port numbers, server and client. - */ ---- a/argus/ArgusUdp.c -+++ b/argus/ArgusUdp.c -@@ -40,9 +40,6 @@ - #include <argus_compat.h> - #include <ArgusModeler.h> - --#include <argus/bootp.h> --struct bootp *bp; -- - void ArgusUpdateUDPState (struct ArgusModelerStruct *, struct ArgusFlowStruct *, unsigned char *); - - void ---- a/argus/ArgusUdt.c -+++ b/argus/ArgusUdt.c -@@ -40,9 +40,6 @@ - #include <argus_compat.h> - #include <ArgusModeler.h> - --#include <argus/bootp.h> --struct bootp *bp; -- - struct ArgusSystemFlow * - ArgusCreateUDTFlow (struct ArgusModelerStruct *model, struct udt_header *udt) - { ---- a/argus/ArgusModeler.c -+++ b/argus/ArgusModeler.c -@@ -43,7 +43,6 @@ - - #include <argus.h> - --#include <argus/bootp.h> - #include <signal.h> - - #include <sched.h> diff --git a/net-analyzer/argus/files/argus-3.0.8.2-rpc.patch b/net-analyzer/argus/files/argus-3.0.8.2-rpc.patch deleted file mode 100644 index 96af0caf140e..000000000000 --- a/net-analyzer/argus/files/argus-3.0.8.2-rpc.patch +++ /dev/null @@ -1,45 +0,0 @@ ---- a/common/Makefile.in -+++ b/common/Makefile.in -@@ -35,12 +35,12 @@ - - CC = @CC@ - CCOPT = @V_CCOPT@ --INCLS = -I$(srcdir) @V_INCLS@ -I$(srcdir)/../include -I$(srcdir)/../argus -+INCLS = -I$(srcdir) @V_INCLS@ @RPC_CFLAGS@ -I$(srcdir)/../include -I$(srcdir)/../argus - DEFS = @DEFS@ - - # Standard CFLAGS - CFLAGS = $(CCOPT) $(INCLS) $(DEFS) --LDFLAGS = @LDFLAGS@ -+LDFLAGS = @LDFLAGS@ @RPC_LIBS@ - - INSTALL = @INSTALL@ - RANLIB = @V_RANLIB@ ---- a/configure.ac -+++ b/configure.ac -@@ -120,6 +120,25 @@ - AC_CHECK_FUNCS(floorf remainderf) - AC_CHECK_FUNCS(timegm) - -+AC_ARG_WITH([libtirpc], -+ AS_HELP_STRING([--with-libtirpc], [Use libtirpc as RPC implementation (instead of sunrpc)]), -+ [], [ with_libtirpc=no ]) -+ -+AS_IF([test "x$with_libtirpc" != xno], -+ [PKG_CHECK_MODULES([TIRPC], -+ [libtirpc], -+ [RPC_CFLAGS=$TIRPC_CFLAGS; RPC_LIBS=$TIRPC_LIBS;], -+ [AC_MSG_ERROR([libtirpc requested, but library not found.])] -+ )], -+ [AC_CHECK_HEADER(rpc/rpc.h, -+ [RPC_CFLAGS=""; RPC_LIBS="";], -+ [AC_MSG_ERROR([sunrpc requested, but headers are not present.])] -+ )] -+) -+ -+AC_SUBST(RPC_CFLAGS) -+AC_SUBST(RPC_LIBS) -+ - AC_CHECK_FUNCS(xdrmem_create) - if test "$ac_cv_func_xdrmem_create" = yes ; then - AC_DEFINE([HAVE_XDR], [], [Using system XDR library]) diff --git a/net-analyzer/argus/files/argus-3.0.8.3-configure-clang16.patch b/net-analyzer/argus/files/argus-3.0.8.3-configure-clang16.patch new file mode 100644 index 000000000000..2e9720c04326 --- /dev/null +++ b/net-analyzer/argus/files/argus-3.0.8.3-configure-clang16.patch @@ -0,0 +1,41 @@ +https://github.com/openargus/argus/pull/5 + +From dd987328bd2b99977a1a686a1a6b36d1a3155ff7 Mon Sep 17 00:00:00 2001 +From: Florian Weimer <fweimer@redhat.com> +Date: Fri, 25 Nov 2022 19:03:24 +0100 +Subject: [PATCH] configure (AC_LBL_UNALIGNED_ACCESS): Avoid implicit function + decls + +Implicit function declarations were removed from the C language +in 1999. Include the relevant header files to ensure that the +check still works with future compilers. C99 also requires +to declare the return types of all functions. +--- a/acsite.m4 ++++ b/acsite.m4 +@@ -298,8 +298,10 @@ AC_DEFUN([AC_LBL_UNALIGNED_ACCESS], + # include <sys/types.h> + # include <sys/wait.h> + # include <stdio.h> ++# include <stdlib.h> ++# include <unistd.h> + unsigned char a[[5]] = { 1, 2, 3, 4, 5 }; +- main() { ++ int main() { + unsigned int i; + pid_t pid; + int status; +--- a/configure ++++ b/configure +@@ -5791,8 +5791,10 @@ else + # include <sys/types.h> + # include <sys/wait.h> + # include <stdio.h> ++# include <stdlib.h> ++# include <unistd.h> + unsigned char a[5] = { 1, 2, 3, 4, 5 }; +- main() { ++ int main() { + unsigned int i; + pid_t pid; + int status; + diff --git a/net-analyzer/argus/metadata.xml b/net-analyzer/argus/metadata.xml index 025cfc82ece2..3d34f5bdfded 100644 --- a/net-analyzer/argus/metadata.xml +++ b/net-analyzer/argus/metadata.xml @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!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> -<use> - <flag name="libtirpc">Build against <pkg>net-libs/libtirpc</pkg> for RPC support</flag> -</use> + <maintainer type="project"> + <email>netmon@gentoo.org</email> + <name>Gentoo network monitoring and analysis project</name> + </maintainer> + <upstream> + <remote-id type="github">openargus/argus</remote-id> + </upstream> </pkgmetadata> diff --git a/net-analyzer/arp-scan/Manifest b/net-analyzer/arp-scan/Manifest index 54ac63d77097..c8b282d0ff65 100644 --- a/net-analyzer/arp-scan/Manifest +++ b/net-analyzer/arp-scan/Manifest @@ -1,2 +1,2 @@ -DIST arp-scan-1.9.6.tar.gz 462479 BLAKE2B 21383167d83ba1cd9792f0a8d569c51ff196186fb59a2161c00d6963bcedecb706a419b08aeef2956bad72563f56a9a58b4231715b472a8ab083229b333d2e8f SHA512 c2d56ab8c6e1a046919892f6c2750593d6fbb3a539c3e1736184bd37ff7ae6033f84b62a3d2b4f56c0f2cdc1752002cb010ce77f701ee2f87b6f14b2e1753fe6 +DIST arp-scan-1.10.0.tar.gz 653900 BLAKE2B 618a8201a2c7f425dce5b4260857542956caa4beed61fde9d85cf763076c12ef24eb5a059a5d332b739f1e5b2b3d18db922e6299ff46f7e02ddfb54562b3fc3e SHA512 716c7727597bdecf9fd3f064fe1715148c246c223c2adeb01a26417865e4d82b9ca47e7fe4a555e510e0ae65f23f8310f0dbdffdb7c3fd969e3b81d0c6e4ae2a DIST arp-scan-1.9.7.tar.gz 459544 BLAKE2B bd70b2dd9e005096ce80fca07b8f2d8482b1073d25a2a9f82e8f5c1206148dbeab095046292cb46b5823aa18b56c208a5e86d0b7252d8566ddee5cd714b78cc6 SHA512 2aa808521a64cd3e2a6a270c6725f2cffa4cfce5c251e5483053c8ea9f56fb1368dd9aae2afcf8fffe1030fe2fc37723f0701c9eafa7cd1d52df459c07a80870 diff --git a/net-analyzer/arp-scan/arp-scan-1.10.0.ebuild b/net-analyzer/arp-scan/arp-scan-1.10.0.ebuild new file mode 100644 index 000000000000..5d4ae629eb22 --- /dev/null +++ b/net-analyzer/arp-scan/arp-scan-1.10.0.ebuild @@ -0,0 +1,34 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools + +DESCRIPTION="ARP scanning and fingerprinting tool" +HOMEPAGE="https://github.com/royhills/arp-scan" +SRC_URI="https://github.com/royhills/arp-scan/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86" + +DEPEND=" + net-libs/libpcap + sys-libs/libcap +" +RDEPEND=" + ${DEPEND} + dev-lang/perl +" +# Needed for _F_S patch +BDEPEND="dev-build/autoconf-archive" + +PATCHES=( + "${FILESDIR}"/${PN}-1.10.0-dont-clobber-fortify-source.patch +) + +src_prepare() { + default + eautoreconf +} diff --git a/net-analyzer/arp-scan/arp-scan-1.9.6.ebuild b/net-analyzer/arp-scan/arp-scan-1.9.6.ebuild deleted file mode 100644 index 96432c7a989f..000000000000 --- a/net-analyzer/arp-scan/arp-scan-1.9.6.ebuild +++ /dev/null @@ -1,26 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit autotools - -DESCRIPTION="ARP scanning and fingerprinting tool" -HOMEPAGE="https://github.com/royhills/arp-scan" -SRC_URI="https://github.com/royhills/arp-scan/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64" - -DEPEND=" - net-libs/libpcap -" -RDEPEND=" - ${DEPEND} - dev-lang/perl -" - -src_prepare() { - default - eautoreconf -} diff --git a/net-analyzer/arp-scan/arp-scan-1.9.7.ebuild b/net-analyzer/arp-scan/arp-scan-1.9.7.ebuild index 96432c7a989f..477073db97b9 100644 --- a/net-analyzer/arp-scan/arp-scan-1.9.7.ebuild +++ b/net-analyzer/arp-scan/arp-scan-1.9.7.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -10,7 +10,7 @@ SRC_URI="https://github.com/royhills/arp-scan/archive/${PV}.tar.gz -> ${P}.tar.g LICENSE="GPL-3" SLOT="0" -KEYWORDS="~amd64" +KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86" DEPEND=" net-libs/libpcap diff --git a/net-analyzer/arp-scan/arp-scan-99999.ebuild b/net-analyzer/arp-scan/arp-scan-99999.ebuild deleted file mode 100644 index c0d127582510..000000000000 --- a/net-analyzer/arp-scan/arp-scan-99999.ebuild +++ /dev/null @@ -1,26 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit autotools git-r3 - -DESCRIPTION="ARP scanning and fingerprinting tool" -HOMEPAGE="https://github.com/royhills/arp-scan" -EGIT_REPO_URI="https://github.com/royhills/arp-scan" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="" - -DEPEND=" - net-libs/libpcap -" -RDEPEND=" - ${DEPEND} - dev-lang/perl -" - -src_prepare() { - default - eautoreconf -} diff --git a/net-analyzer/arp-scan/files/arp-scan-1.10.0-dont-clobber-fortify-source.patch b/net-analyzer/arp-scan/files/arp-scan-1.10.0-dont-clobber-fortify-source.patch new file mode 100644 index 000000000000..f933e965893b --- /dev/null +++ b/net-analyzer/arp-scan/files/arp-scan-1.10.0-dont-clobber-fortify-source.patch @@ -0,0 +1,25 @@ +Don't clobber toolchain defaults. + +(TODO: Fix upstream's GCC_FORTIFY_SOURCE macro or just replace it with the +autoconf-archive one (AX_ADD_FORTIFY_SOURCE)). + +https://bugs.gentoo.org/895522 +--- a/configure.ac ++++ b/configure.ac +@@ -37,7 +37,6 @@ if test -n "$GCC"; then + CFLAGS="$CFLAGS -Wall -Wshadow -Wwrite-strings" + GCC_WEXTRA + GCC_STACK_PROTECT_CC +- GCC_FORTIFY_SOURCE + GCC_FORMAT_SECURITY + dnl Uncomment the line below to compile with additional warnings enabled. + dnl CFLAGS="$CFLAGS -pedantic -Wpointer-arith -Wcast-qual -Wcast-align -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wnested-externs" +@@ -49,6 +48,8 @@ else + fi + AC_PROG_INSTALL + ++AX_ADD_FORTIFY_SOURCE ++ + dnl Checks for libraries. + dnl Solaris 10 needs -lnsl for gethostbyname() and -lsocket for socket(). + dnl Linux, {Free,Open,Net,Dragonfly}BSD and MacOS X do not. diff --git a/net-analyzer/arp-scan/metadata.xml b/net-analyzer/arp-scan/metadata.xml index 2c12d90c2aae..b869ec95a57a 100644 --- a/net-analyzer/arp-scan/metadata.xml +++ b/net-analyzer/arp-scan/metadata.xml @@ -1,5 +1,5 @@ -<?xml version='1.0' encoding='UTF-8'?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<?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> diff --git a/net-analyzer/arp-sk/arp-sk-0.0.16-r2.ebuild b/net-analyzer/arp-sk/arp-sk-0.0.16-r2.ebuild index 773e349fc87b..6b9187db0bbd 100644 --- a/net-analyzer/arp-sk/arp-sk-0.0.16-r2.ebuild +++ b/net-analyzer/arp-sk/arp-sk-0.0.16-r2.ebuild @@ -1,26 +1,31 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 -inherit autotools eutils multilib +EAPI=8 + +inherit autotools DESCRIPTION="A swiss knife tool for ARP" HOMEPAGE="http://sid.rstack.org/arp-sk/" SRC_URI="http://sid.rstack.org/arp-sk/files/${P}.tgz" + LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 ppc x86" +KEYWORDS="amd64 ppc ~riscv x86" DEPEND=">=net-libs/libnet-1.1" RDEPEND="${DEPEND}" DOCS=( ARP AUTHORS CONTRIB ChangeLog README TODO ) +PATCHES=( + "${FILESDIR}"/${P}-libnet1_2.patch +) + src_prepare() { - epatch "${FILESDIR}"/${P}-libnet1_2.patch + default sed -i configure.in -e 's|AM_CONFIG_HEADER|AC_CONFIG_HEADERS|g' || die rm missing || die - epatch_user eautoreconf } @@ -29,5 +34,5 @@ src_install() { default # We don't need libcompat as it has a potential to clash with other packages. - rm -fr "${D}"/usr/$(get_libdir) + rm -r "${ED}"/usr/$(get_libdir) || die } diff --git a/net-analyzer/arp-sk/metadata.xml b/net-analyzer/arp-sk/metadata.xml index 74c2baebb4ec..dce3f3be66c0 100644 --- a/net-analyzer/arp-sk/metadata.xml +++ b/net-analyzer/arp-sk/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>netmon@gentoo.org</email> diff --git a/net-analyzer/arping/Manifest b/net-analyzer/arping/Manifest index a1a7c2923a68..710a8d7184d9 100644 --- a/net-analyzer/arping/Manifest +++ b/net-analyzer/arping/Manifest @@ -1,3 +1,2 @@ -DIST arping-2.17.tar.gz 174346 BLAKE2B b0a095ff4e39e8f08b25a10db828e4ab9f60299043fbefc353b9df14e5bae839a93be20724ab9758b5bfc830c211e5f9bdfd606e321db508dbce9886b5903b09 SHA512 062026f522ab3d3b96c05c97aa3133995bce808a25a470207359a1236886da0300368ddac7d76568201510c0bcc2ac4ef6b34b2284c8d367c1be41972f0ee1c2 -DIST arping-2.20.tar.gz 48102 BLAKE2B ce08c68e5d76db89f4f9ecb31bcee3316064cfd8ffd9615964677db33f214b856300de0dd2619430ce934b19f260cd38c8fa892636787ae4de82022301274a06 SHA512 c5fac3b43a9be8c63ee7707a7df1cef2d75c6f7944cc6e580450a6558fb7e72b0d97d09b5c9b4a3aa86a59f49faba94b39bd634c93917c11ae20ac59e8635282 -DIST arping-2.21.tar.gz 50067 BLAKE2B 67b76cc48e9717117dbf43702df7f422634ed40196ec44d273a773610618922ddf7de47ffdf32cb7296db1dbce0a696c57b7992e6ad11f6fddf52a16212154fc SHA512 e976ce1a3ec0e4f57bbded09c6a07934e21df66ce7931422c420f5335dafcd88968f03ba6987d192dcdf51cca89180c86337aff50806713c7b04cb13e3e83504 +DIST arping-2.22.tar.gz 50152 BLAKE2B 2215773b922219537339550e8034bb6eca82974469ebd0e399c73bd259ef4ff7a4510d9a5ff108cef3dac492477c54fc2517c2dfd4035158d0269f03c0e2a0b5 SHA512 0b36fff2c14c1ff89453ba63eea04de3343fcb19da7dbc1c8749bc926e441c54915cd628d54171d449e66e92663e31f12e057c30a80cd49c4412650e2cd00ef3 +DIST arping-2.23.tar.gz 51911 BLAKE2B 8b0d34522957a83d0a66b47576fa0ecbd1e4fc86537df6d2737510bdb1a4ea3d30feb664077790a8f70be9cf2cdcdc30a648261e9a6a30401ce85274c45ccf12 SHA512 45295fd68717379d18fcff4270c70e0d9df3cae175f0c2a9f1e8e88e3046f5109e7a95bb717be329af8d6002c9a2338efd39831a652c0b425b75058287fa35df diff --git a/net-analyzer/arping/arping-2.17.ebuild b/net-analyzer/arping/arping-2.17.ebuild deleted file mode 100644 index 7e92c98a37a5..000000000000 --- a/net-analyzer/arping/arping-2.17.ebuild +++ /dev/null @@ -1,30 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit fcaps - -DESCRIPTION="A utility to see if a specific IP address is taken and what MAC address owns it" -HOMEPAGE="http://www.habets.pp.se/synscan/programs.php?prog=arping" -SRC_URI="http://www.habets.pp.se/synscan/files/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="2" -KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux" -IUSE="test" -RESTRICT="!test? ( test )" - -CDEPEND=" - net-libs/libpcap - net-libs/libnet:1.1 -" -DEPEND=" - ${CDEPEND} - test? ( dev-libs/check ) -" -RDEPEND=" - ${CDEPEND} - !net-misc/iputils[arping(+)] -" - -FILECAPS=( cap_net_raw /usr/sbin/arping ) diff --git a/net-analyzer/arping/arping-2.20.ebuild b/net-analyzer/arping/arping-2.20.ebuild deleted file mode 100644 index 889b70b2de49..000000000000 --- a/net-analyzer/arping/arping-2.20.ebuild +++ /dev/null @@ -1,35 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit autotools fcaps - -DESCRIPTION="A utility to see if a specific IP address is taken and what MAC address owns it" -HOMEPAGE="http://www.habets.pp.se/synscan/programs.php?prog=arping" -SRC_URI="https://github.com/ThomasHabets/${PN}/archive/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="2" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" -IUSE="test" -RESTRICT="!test? ( test )" - -CDEPEND=" - net-libs/libpcap - net-libs/libnet:1.1 -" -DEPEND=" - ${CDEPEND} - test? ( dev-libs/check ) -" -RDEPEND=" - ${CDEPEND} - !net-misc/iputils[arping(+)] -" -FILECAPS=( cap_net_raw /usr/sbin/arping ) -S=${WORKDIR}/${PN}-${P} - -src_prepare() { - default - eautoreconf -} diff --git a/net-analyzer/arping/arping-2.21.ebuild b/net-analyzer/arping/arping-2.21.ebuild deleted file mode 100644 index 889b70b2de49..000000000000 --- a/net-analyzer/arping/arping-2.21.ebuild +++ /dev/null @@ -1,35 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit autotools fcaps - -DESCRIPTION="A utility to see if a specific IP address is taken and what MAC address owns it" -HOMEPAGE="http://www.habets.pp.se/synscan/programs.php?prog=arping" -SRC_URI="https://github.com/ThomasHabets/${PN}/archive/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="2" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" -IUSE="test" -RESTRICT="!test? ( test )" - -CDEPEND=" - net-libs/libpcap - net-libs/libnet:1.1 -" -DEPEND=" - ${CDEPEND} - test? ( dev-libs/check ) -" -RDEPEND=" - ${CDEPEND} - !net-misc/iputils[arping(+)] -" -FILECAPS=( cap_net_raw /usr/sbin/arping ) -S=${WORKDIR}/${PN}-${P} - -src_prepare() { - default - eautoreconf -} diff --git a/net-analyzer/arping/arping-2.22.ebuild b/net-analyzer/arping/arping-2.22.ebuild new file mode 100644 index 000000000000..b93acc1ea777 --- /dev/null +++ b/net-analyzer/arping/arping-2.22.ebuild @@ -0,0 +1,37 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit autotools fcaps + +DESCRIPTION="Utility to see if a specific IP is taken and what MAC owns it" +HOMEPAGE="https://www.habets.pp.se/synscan/programs.php?prog=arping" +SRC_URI="https://github.com/ThomasHabets/${PN}/archive/${P}.tar.gz" +S="${WORKDIR}/${PN}-${P}" + +LICENSE="GPL-2+" +SLOT="2" +KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux" +IUSE="test" +RESTRICT="!test? ( test )" + +RDEPEND=" + net-libs/libpcap + net-libs/libnet:1.1 + !net-misc/iputils[arping(+)] +" +DEPEND=" + ${RDEPEND} + test? ( + dev-libs/check + dev-python/subunit + ) +" + +FILECAPS=( cap_net_raw usr/sbin/arping ) + +src_prepare() { + default + eautoreconf +} diff --git a/net-analyzer/arping/arping-2.23.ebuild b/net-analyzer/arping/arping-2.23.ebuild new file mode 100644 index 000000000000..0db92a1acf65 --- /dev/null +++ b/net-analyzer/arping/arping-2.23.ebuild @@ -0,0 +1,60 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools fcaps + +DESCRIPTION="Utility to see if a specific IP is taken and what MAC owns it" +HOMEPAGE="https://www.habets.pp.se/synscan/programs.php?prog=arping" +if [[ ${PV} == 9999 ]] ; then + EGIT_REPO_URI="https://github.com/ThomasHabets/arping" + inherit git-r3 +else + SRC_URI="https://github.com/ThomasHabets/${PN}/archive/${P}.tar.gz" + KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux" + + S="${WORKDIR}/${PN}-${P}" +fi + +LICENSE="GPL-2+" +SLOT="2" +IUSE="+seccomp test" +RESTRICT="!test? ( test )" + +RDEPEND="net-libs/libpcap + net-libs/libnet:1.1 + sys-libs/libcap + seccomp? ( sys-libs/libseccomp ) + !net-misc/iputils[arping(+)]" +DEPEND="${RDEPEND} + test? ( + dev-libs/check + dev-python/subunit + )" + +FILECAPS=( cap_net_raw usr/sbin/arping ) + +PATCHES=( + "${FILESDIR}"/${PN}-2.23-configure.ac-seccomp-disable.patch +) + +src_prepare() { + default + + eautoreconf +} + +src_configure() { + local myeconfargs=( + # Controls whether seccomp is used by default + $(use_enable seccomp) + ) + + # Needed to actually make it optional and not automagic + # (and we want it optional for the non-seccomp arches, like sparc) + export ac_cv_lib_seccomp_seccomp_init=$(usex seccomp) + export ac_cv_header_seccomp_h=$(usex seccomp) + + econf "${myeconfargs[@]}" +} diff --git a/net-analyzer/arping/arping-9999.ebuild b/net-analyzer/arping/arping-9999.ebuild index 20b7fc882067..4f51c78957d6 100644 --- a/net-analyzer/arping/arping-9999.ebuild +++ b/net-analyzer/arping/arping-9999.ebuild @@ -1,33 +1,56 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 -inherit autotools fcaps git-r3 +EAPI=8 -DESCRIPTION="A utility to see if a specific IP address is taken and what MAC address owns it" -HOMEPAGE="http://www.habets.pp.se/synscan/programs.php?prog=arping" -EGIT_REPO_URI="https://github.com/ThomasHabets/arping" +inherit autotools fcaps -LICENSE="GPL-2" +DESCRIPTION="Utility to see if a specific IP is taken and what MAC owns it" +HOMEPAGE="https://www.habets.pp.se/synscan/programs.php?prog=arping" +if [[ ${PV} == 9999 ]] ; then + EGIT_REPO_URI="https://github.com/ThomasHabets/arping" + inherit git-r3 +else + SRC_URI="https://github.com/ThomasHabets/${PN}/archive/${P}.tar.gz" + KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" + + S="${WORKDIR}/${PN}-${P}" +fi + +LICENSE="GPL-2+" SLOT="2" -KEYWORDS="" +IUSE="+seccomp test" +RESTRICT="!test? ( test )" -CDEPEND=" - net-libs/libpcap +RDEPEND="net-libs/libpcap net-libs/libnet:1.1 -" -DEPEND=" - ${CDEPEND} - dev-libs/check -" -RDEPEND=" - ${CDEPEND} - !net-misc/iputils[arping(+)] -" - -FILECAPS=( cap_net_raw /usr/sbin/arping ) + sys-libs/libcap + seccomp? ( sys-libs/libseccomp ) + !net-misc/iputils[arping(+)]" +DEPEND="${RDEPEND} + test? ( + dev-libs/check + dev-python/subunit + )" + +FILECAPS=( cap_net_raw usr/sbin/arping ) src_prepare() { default + eautoreconf } + +src_configure() { + local myeconfargs=( + # Controls whether seccomp is used by default + $(use_enable seccomp) + ) + + # Needed to actually make it optional and not automagic + # (and we want it optional for the non-seccomp arches, like sparc) + export ac_cv_lib_seccomp_seccomp_init=$(usex seccomp) + export ac_cv_header_seccomp_h=$(usex seccomp) + + econf "${myeconfargs[@]}" +} diff --git a/net-analyzer/arping/files/arping-2.23-configure.ac-seccomp-disable.patch b/net-analyzer/arping/files/arping-2.23-configure.ac-seccomp-disable.patch new file mode 100644 index 000000000000..53b59da1a961 --- /dev/null +++ b/net-analyzer/arping/files/arping-2.23-configure.ac-seccomp-disable.patch @@ -0,0 +1,31 @@ +https://github.com/ThomasHabets/arping/pull/51 + +From 47622ccc97591f55899f8fff325af241b89df09f Mon Sep 17 00:00:00 2001 +From: Sam James <sam@gentoo.org> +Date: Mon, 16 May 2022 06:24:27 +0000 +Subject: [PATCH] configure.ac: make --disable-seccomp work + +The first branch ("[action-if-given]") is taken even if --disable-seccomp +is passed. So, in that branch, check whether the user disabled it or not. + +Without this, we'd get a failure when seccomp is detected but we want +to disable it: +``` +./configure --disable-seccomp +[...] +checking for library containing clock_gettime... none required +configure: error: --enable-seccomp given but seccomp libraries not present +``` + +Signed-off-by: Sam James <sam@gentoo.org> +--- a/configure.ac ++++ b/configure.ac +@@ -35,7 +35,7 @@ AC_CHECK_LIB([pcap], [pcap_open_live], ,[AC_MSG_ERROR([libpcap not found])]) + AC_SEARCH_LIBS([clock_gettime], [rt]) + + AC_ARG_ENABLE([seccomp], [Enable seccomp priv drops by default (-z to turn on, -Z for off)], [ +- if test "$ac_cv_lib_seccomp_seccomp_init" = "no"; then ++ if test x"$enableval" != x"no" && test "$ac_cv_lib_seccomp_seccomp_init" = "no"; then + AC_MSG_ERROR([--enable-seccomp given but seccomp libraries not present]) + fi + AC_DEFINE([DEFAULT_SECCOMP], [1], [Enable seccomp by default]) diff --git a/net-analyzer/arping/metadata.xml b/net-analyzer/arping/metadata.xml index 74c2baebb4ec..cac7673fbbfb 100644 --- a/net-analyzer/arping/metadata.xml +++ b/net-analyzer/arping/metadata.xml @@ -1,8 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!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> + <maintainer type="project"> + <email>netmon@gentoo.org</email> + <name>Gentoo network monitoring and analysis project</name> + </maintainer> + <upstream> + <remote-id type="github">ThomasHabets/arping</remote-id> + </upstream> </pkgmetadata> diff --git a/net-analyzer/arpoison/arpoison-0.7-r1.ebuild b/net-analyzer/arpoison/arpoison-0.7-r1.ebuild new file mode 100644 index 000000000000..9cf32953387a --- /dev/null +++ b/net-analyzer/arpoison/arpoison-0.7-r1.ebuild @@ -0,0 +1,28 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit toolchain-funcs edo + +DESCRIPTION="Utility to poison ARP caches" +HOMEPAGE="https://arpoison.sourceforge.net/ http://www.arpoison.net/" +SRC_URI="https://dev.gentoo.org/~jsmolic/distfiles/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64 ~arm ppc ~riscv x86" + +RDEPEND="net-libs/libnet:1.1" +DEPEND="${RDEPEND}" +BDEPEND="${RDEPEND}" + +src_compile() { + edo "$(tc-getCC)" "${PN}.c" -o "${PN}" ${CFLAGS} ${LDFLAGS} $("${BROOT}/usr/bin/libnet-config" --cflags --libs) +} + +src_install() { + dosbin arpoison + doman arpoison.8 + dodoc README +} diff --git a/net-analyzer/arpoison/arpoison-0.7.ebuild b/net-analyzer/arpoison/arpoison-0.7.ebuild index 811f1ecb2690..adb0567ef881 100644 --- a/net-analyzer/arpoison/arpoison-0.7.ebuild +++ b/net-analyzer/arpoison/arpoison-0.7.ebuild @@ -1,16 +1,16 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 inherit toolchain-funcs -DESCRIPTION="A utility to poison ARP caches" -HOMEPAGE="http://arpoison.sourceforge.net/ http://www.arpoison.net/" -SRC_URI="https://dev.gentoo.org/~jer/${P}.tar.gz" +DESCRIPTION="Utility to poison ARP caches" +HOMEPAGE="https://arpoison.sourceforge.net/ http://www.arpoison.net/" +SRC_URI="https://dev.gentoo.org/~jsmolic/distfiles/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 ~arm ppc x86" +KEYWORDS="amd64 ~arm ppc ~riscv x86" RDEPEND=" net-libs/libnet:1.1 diff --git a/net-analyzer/arpoison/metadata.xml b/net-analyzer/arpoison/metadata.xml index 22b19a014fbc..31be40099802 100644 --- a/net-analyzer/arpoison/metadata.xml +++ b/net-analyzer/arpoison/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>netmon@gentoo.org</email> diff --git a/net-analyzer/arpon/Manifest b/net-analyzer/arpon/Manifest index 032e98bce0d5..6b1fc7d0e9f1 100644 --- a/net-analyzer/arpon/Manifest +++ b/net-analyzer/arpon/Manifest @@ -1,2 +1 @@ -DIST ArpON-2.7.2.tar.gz 2780607 BLAKE2B 58d7a0db475658d90112441508d4c4d9babd601533a6ab9a22b24f07e037b6f3debcbe0f3c1f09a87b7e0cdf9217a38f52b85431db023d12b0f1ee58765e0bfb SHA512 7518f8f8920817725c9b3e0a6420190dcc101b1c0c7cd9eec50870b3f893fe2322eddc90cb71e9c3c35326b4e1730aa02797ca51775caa9401807da3978628b4 DIST ArpON-3.0-ng.tar.gz 8795979 BLAKE2B 81b1fe9a426b5b0960911cbbac984482aeea15a957fac72a10e7dd9a45a609da90ca14163957cc008541be4cfaf426f07fa9c64ac4dff933f568b20284c5211d SHA512 e6338018d65f3f8300958e168a9eb6f6be85cba21ae0aee4b03e9838a29a06afbf2448c2f104367aa18389cc549e4489bcf8dad384ad46eadf2884a0908238af diff --git a/net-analyzer/arpon/arpon-2.7.2-r1.ebuild b/net-analyzer/arpon/arpon-2.7.2-r1.ebuild deleted file mode 100644 index f2bc485b6fd2..000000000000 --- a/net-analyzer/arpon/arpon-2.7.2-r1.ebuild +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit cmake - -DESCRIPTION="ArpON (Arp handler inspectiON) is a portable Arp handler" - -MY_PN="ArpON" -MY_P="${MY_PN}-${PV}" -HOMEPAGE="http://arpon.sourceforge.net/" -SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -DEPEND=" - dev-libs/libdnet - net-libs/libnet:1.1 - net-libs/libpcap -" -RDEPEND=" - ${DEPEND} -" -PATCHES=( - "${FILESDIR}"/${PN}-2.7.2-CFLAGS.patch - "${FILESDIR}"/${PN}-2.7.2-etc.patch -) -DOCS=( AUTHOR CHANGELOG ) -S="${WORKDIR}"/${MY_P} - -src_install() { - cmake_src_install - newinitd "${FILESDIR}"/${PN}.initd ${PN} - newconfd "${FILESDIR}"/${PN}.confd ${PN} -} diff --git a/net-analyzer/arpon/arpon-2.7.2.ebuild b/net-analyzer/arpon/arpon-2.7.2.ebuild deleted file mode 100644 index a79e9de5e0fa..000000000000 --- a/net-analyzer/arpon/arpon-2.7.2.ebuild +++ /dev/null @@ -1,41 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit cmake-utils readme.gentoo-r1 - -DESCRIPTION="ArpON (Arp handler inspectiON) is a portable Arp handler" - -MY_PN="ArpON" -MY_P="${MY_PN}-${PV}" -HOMEPAGE="http://arpon.sourceforge.net/" -SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="" - -DEPEND="dev-libs/libdnet - net-libs/libnet:1.1 - net-libs/libpcap" - -RDEPEND=${DEPEND} - -S="${WORKDIR}"/${MY_P} - -src_prepare() { - sed -i -e "/set(CMAKE_C_FLAGS/d" CMakeLists.txt || die - - DOC_CONTENTS="${PN} now installs an init script. Please edit - the /etc/conf.d/arpon file to match your needs" - - cmake-utils_src_prepare -} - -src_install() { - cmake-utils_src_install - newinitd "${FILESDIR}"/${PN}.initd ${PN} - newconfd "${FILESDIR}"/${PN}.confd ${PN} - readme.gentoo_create_doc -} diff --git a/net-analyzer/arpon/arpon-3.0.ebuild b/net-analyzer/arpon/arpon-3.0.ebuild index 6d1866670e89..6e995a6e9f1a 100644 --- a/net-analyzer/arpon/arpon-3.0.ebuild +++ b/net-analyzer/arpon/arpon-3.0.ebuild @@ -1,37 +1,39 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 -inherit cmake +EAPI=8 -DESCRIPTION="ArpON (Arp handler inspectiON) is a portable Arp handler" +inherit cmake MY_PN="ArpON" MY_P="${MY_PN}-${PV}" -HOMEPAGE="http://arpon.sourceforge.net/" + +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" +S="${WORKDIR}/${MY_P}-ng" LICENSE="BSD-2" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" DEPEND=" dev-libs/libdnet net-libs/libnet:1.1 net-libs/libpcap " -RDEPEND=" - ${DEPEND} -" +RDEPEND="${DEPEND}" + PATCHES=( "${FILESDIR}"/${PN}-3.0-CFLAGS.patch "${FILESDIR}"/${PN}-3.0-gentoo.patch ) + DOCS=( AUTHOR CHANGELOG README THANKS ) -S="${WORKDIR}"/${MY_P}-ng src_install() { cmake_src_install + newinitd "${FILESDIR}"/${PN}.initd-3 ${PN} newconfd "${FILESDIR}"/${PN}.confd-3 ${PN} diff --git a/net-analyzer/arpon/files/arpon-2.7.2-CFLAGS.patch b/net-analyzer/arpon/files/arpon-2.7.2-CFLAGS.patch deleted file mode 100644 index 525f03740dd9..000000000000 --- a/net-analyzer/arpon/files/arpon-2.7.2-CFLAGS.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -51,11 +51,9 @@ - if(cmake_build_type_tolower STREQUAL "debug") - message(STATUS "Build Type: Debug") - set(CMAKE_BUILD_TYPE "Debug") -- set(CMAKE_C_FLAGS "-Wall -Werror -pedantic -O0 -g") - else() - message(STATUS "Build Type: Release") - set(CMAKE_BUILD_TYPE "Release") -- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Werror") - endif() - - include_directories( diff --git a/net-analyzer/arpon/files/arpon-2.7.2-etc.patch b/net-analyzer/arpon/files/arpon-2.7.2-etc.patch deleted file mode 100644 index 03e80f9d5955..000000000000 --- a/net-analyzer/arpon/files/arpon-2.7.2-etc.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/etc/CMakeLists.txt -+++ b/etc/CMakeLists.txt -@@ -14,7 +14,7 @@ - COMPONENT Etcfile) - else(${CMAKE_INSTALL_PREFIX} STREQUAL "/") - install(FILES ${arpon_etc_src} -- DESTINATION ${CMAKE_INSTALL_PREFIX}/etc -+ DESTINATION /etc - PERMISSIONS OWNER_READ GROUP_READ WORLD_READ - COMPONENT Etcfile) - endif(${CMAKE_INSTALL_PREFIX} STREQUAL "/") diff --git a/net-analyzer/arpon/files/arpon.confd b/net-analyzer/arpon/files/arpon.confd deleted file mode 100644 index d1ce050fa4cb..000000000000 --- a/net-analyzer/arpon/files/arpon.confd +++ /dev/null @@ -1,5 +0,0 @@ -METHOD="--darpi" -IFACE="eth0" -LOGFILE="/var/log/arpon.log" - -ARPON_OPTS="${METHOD} --iface ${IFACE} --log-file ${LOGFILE} --log" diff --git a/net-analyzer/arpon/files/arpon.initd b/net-analyzer/arpon/files/arpon.initd deleted file mode 100644 index dc69135c26e3..000000000000 --- a/net-analyzer/arpon/files/arpon.initd +++ /dev/null @@ -1,19 +0,0 @@ -#!/sbin/openrc-run -# Distributed under the terms of the GNU General Public License v2 - -depend() { - need net -} - -start() { - ebegin "Starting arpon" - start-stop-daemon --start --background --make-pidfile --pidfile "/var/run/arpon.pid" \ - --exec /usr/sbin/arpon -- ${ARPON_OPTS} >/dev/null 2>&1 - eend $? -} - -stop() { - ebegin "Stopping arpon" - start-stop-daemon --stop --pidfile "/var/run/arpon.pid" - eend $? -} diff --git a/net-analyzer/arpon/metadata.xml b/net-analyzer/arpon/metadata.xml index 68ff631bb172..e87be124548c 100644 --- a/net-analyzer/arpon/metadata.xml +++ b/net-analyzer/arpon/metadata.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type='project'> +<maintainer type="project"> <email>netmon@gentoo.org</email> </maintainer> <upstream> diff --git a/net-analyzer/arptools/arptools-1.0.2-r1.ebuild b/net-analyzer/arptools/arptools-1.0.2-r1.ebuild new file mode 100644 index 000000000000..6b1d50d07a27 --- /dev/null +++ b/net-analyzer/arptools/arptools-1.0.2-r1.ebuild @@ -0,0 +1,20 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +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+" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~riscv ~x86" + +DEPEND=" + net-libs/libnet:1.1 + net-libs/libpcap +" +RDEPEND="${DEPEND}" + +DOCS=( AUTHORS ChangeLog NEWS README TODO ) diff --git a/net-analyzer/arptools/arptools-1.0.2.ebuild b/net-analyzer/arptools/arptools-1.0.2.ebuild deleted file mode 100644 index 44c7fa89a834..000000000000 --- a/net-analyzer/arptools/arptools-1.0.2.ebuild +++ /dev/null @@ -1,20 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -DESCRIPTION="a 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" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" - -DEPEND=" - net-libs/libnet:1.1 - net-libs/libpcap -" -RDEPEND="${DEPEND}" - -DOCS=( AUTHORS ChangeLog NEWS README TODO ) diff --git a/net-analyzer/arptools/metadata.xml b/net-analyzer/arptools/metadata.xml index ab242cac92e7..2b6b33a1fea3 100644 --- a/net-analyzer/arptools/metadata.xml +++ b/net-analyzer/arptools/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> <email>robbat2@gentoo.org</email> @@ -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/arpwatch/Manifest b/net-analyzer/arpwatch/Manifest index 11122304499e..53e3f2db8fe8 100644 --- a/net-analyzer/arpwatch/Manifest +++ b/net-analyzer/arpwatch/Manifest @@ -1,4 +1,3 @@ -DIST arpwatch-2.1a15.tar.gz 202729 BLAKE2B b583dea83c57a55b8705f0265c1324de270571468dc9f2e1d5351fd53340f7636f1d00e3de24caa9747384697721e6227e5e6de4b3827e5ac7adef4ce524fffd SHA512 f770b5b7954afe910dafb016e6e886a4e785564bcdc0ea0de9d7b1ca6a9a0b219a9d1b50b6f42a67afc2f836e782e8ff85ba5780583015d62c9694ac53f0bf90 DIST arpwatch-3.1.tar.gz 117196 BLAKE2B 35afd3dc563ebbc8136000d5c2d53da85b9615df5cbe8a3da5b77f20da7cbee706f6fd404c2bda6f3626aaa496d9ec9439596acbdfd559c01b8c0d01d6703e46 SHA512 2e6f6e388e1828e34626e36356a89f3bc95d268b9242955d6636ac05041bcf533e7625ed73b37b6ea5eab8cfed54b8c483547556c98664efff63c18639efa282 -DIST arpwatch-patchset-0.8.tar.xz 131692 BLAKE2B 8db242f7c74c8fee0700e12e8ff028fcaa336e5feb61514b44a892a132779c11d1ca3ce2fabee3cbcbbdcb0dae0ed470daa786a91619c18e24066f11da126bc4 SHA512 3e8f1c043f09fbeacadb40c1db47fb907314ed18bb3fb506c6c510977fd0e6dd9950becc830cf7c10911a7eec97e56e0af8c8c3d7df811e8ab820290973ea0b0 +DIST arpwatch-3.5.tar.gz 117594 BLAKE2B 73b979ec279e5bf5baaeac05949e1bddf08cd9c3c7afcd29b37991ba55ba2bb8968b57b407eb571ec52871017372f479e586ba84b0f1aee67331ce7617309fb8 SHA512 e46b350c483f0e7c873eb177be337f238b2db3d859d8b305df5a74d9d97ca449750f9ed50a99c5d4c51618e22747731d70ceb3f13aae39c39d258b960258fb88 DIST ethercodes.dat-20200628.xz 239028 BLAKE2B e702b9109ef3ccce73e2637f96126bf19e7dfa533774c0bd623042b3609f147981263b84397ec155a65ae12fa57247c32644e1e7e57c2c749ef768156d853027 SHA512 2edc05d384f387e6b43d07da99038625f9c55c8044b5a48d1bcf9f657df691bf413a97fb9ca915f04dbdafab23f919edd15d906c4ce8bff12be0b255a6717f07 diff --git a/net-analyzer/arpwatch/arpwatch-2.1.15-r11.ebuild b/net-analyzer/arpwatch/arpwatch-2.1.15-r11.ebuild deleted file mode 100644 index b11099a93145..000000000000 --- a/net-analyzer/arpwatch/arpwatch-2.1.15-r11.ebuild +++ /dev/null @@ -1,86 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit user versionator - -PATCH_VER="0.8" -MY_P="${PN}-$(replace_version_separator 2 'a')" - -DESCRIPTION="An ethernet monitor program that keeps track of ethernet/IP address pairings" -HOMEPAGE="https://ee.lbl.gov/" -SRC_URI=" - https://ee.lbl.gov/downloads/arpwatch/${MY_P}.tar.gz - https://dev.gentoo.org/~jer/arpwatch-patchset-${PATCH_VER}.tar.xz -" - -LICENSE="BSD GPL-2" -SLOT="0" -KEYWORDS="amd64 ~hppa ppc sparc x86" -IUSE="selinux" - -DEPEND=" - net-libs/libpcap - sys-libs/ncurses:* -" -RDEPEND=" - ${DEPEND} - selinux? ( sec-policy/selinux-arpwatch ) -" - -S="${WORKDIR}/${MY_P}" - -pkg_setup() { - # We need to create /var/lib/arpwatch with this group, so it must - # exist during src_install. - enewgroup arpwatch -} - -pkg_postinst() { - # The user, however, is not needed until runtime. - enewuser arpwatch -1 -1 -1 arpwatch -} - -src_prepare() { - local patchdir="${WORKDIR}/arpwatch-patchset" - - eapply "${patchdir}"/*.patch - eapply_user - - cp "${patchdir}"/*.8 ./ || die "failed to copy man pages from ${patchdir}" -} - -src_install() { - dosbin arpwatch arpsnmp arp2ethers massagevendor arpfetch bihourly.sh - doman arpwatch.8 arpsnmp.8 arp2ethers.8 massagevendor.8 arpfetch.8 bihourly.8 - - insinto /usr/share/arpwatch - doins ethercodes.dat - - insinto /usr/share/arpwatch/awk - doins duplicates.awk euppertolower.awk p.awk e.awk d.awk - - diropts --group=arpwatch --mode=770 - keepdir /var/lib/arpwatch - dodoc README CHANGES - - newinitd "${FILESDIR}"/arpwatch.initd-r1 arpwatch - newconfd "${FILESDIR}"/arpwatch.confd-r1 arpwatch -} - -pkg_postinst() { - # Previous revisions installed /var/lib/arpwatch with the wrong - # ownership. Instead of the intended arpwatch:root, it was left as - # root:root. If we find any such mis-owned directories, we fix them, - # and then set the permission bits how we want them in *this* - # revision. - # - # The "--from" flag ensures that we only fix directories that need - # fixing, and the "&& chmod" ensures that we only adjust the - # permissions if the owner also needed fixing. - chown --from=root:root \ - --no-dereference \ - :arpwatch \ - "${ROOT}"/var/lib/arpwatch && \ - chmod 770 "${ROOT}"/var/lib/arpwatch -} diff --git a/net-analyzer/arpwatch/arpwatch-3.1-r4.ebuild b/net-analyzer/arpwatch/arpwatch-3.1-r4.ebuild new file mode 100644 index 000000000000..880939a9d30f --- /dev/null +++ b/net-analyzer/arpwatch/arpwatch-3.1-r4.ebuild @@ -0,0 +1,72 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit systemd + +DESCRIPTION="An ethernet monitor program that keeps track of ethernet/IP address pairings" +HOMEPAGE="https://ee.lbl.gov/" +LICENSE="BSD GPL-2" +SLOT="0" + +ETHERCODES_DATE=20200628 +SRC_URI=" + https://ee.lbl.gov/downloads/${PN}/${P}.tar.gz + https://dev.gentoo.org/~jsmolic/distfiles/ethercodes.dat-${ETHERCODES_DATE}.xz +" + +KEYWORDS="amd64 ~hppa ppc ~riscv sparc x86" +IUSE="selinux" + +DEPEND=" + acct-group/arpwatch + net-libs/libpcap + sys-libs/ncurses:= +" + +RDEPEND=" + ${DEPEND} + acct-user/arpwatch + selinux? ( sec-policy/selinux-arpwatch ) + virtual/mta +" + +src_install() { + dosbin arp2ethers arpfetch arpsnmp arpwatch bihourly.sh massagevendor.py update-ethercodes.sh + doman arpsnmp.8 arpwatch.8 + + insinto /usr/share/arpwatch + newins "${WORKDIR}"/ethercodes.dat-${ETHERCODES_DATE} ethercodes.dat + + insinto /usr/share/arpwatch/awk + doins d.awk duplicates.awk e.awk euppertolower.awk p.awk + + diropts --group=arpwatch --mode=770 + keepdir /var/lib/arpwatch + dodoc README CHANGES + + newconfd "${FILESDIR}"/arpwatch.confd-r2 arpwatch + newinitd "${FILESDIR}"/arpwatch.initd-r2 arpwatch + + systemd_dounit "${FILESDIR}/arpwatch.service" + systemd_install_serviced "${FILESDIR}/arpwatch.conf" +} + +pkg_postinst() { + # Previous revisions installed /var/lib/arpwatch with the wrong + # ownership. Instead of the intended arpwatch:root, it was left as + # root:root. If we find any such mis-owned directories, we fix them, + # and then set the permission bits how we want them in *this* + # revision. + # + # The "--from" flag ensures that we only fix directories that need + # fixing, and the "&& chmod" ensures that we only adjust the + # permissions if the owner also needed fixing. + chown \ + --from=root:root \ + --no-dereference \ + :arpwatch \ + "${ROOT}"/var/lib/arpwatch && \ + chmod 770 "${ROOT}"/var/lib/arpwatch +} diff --git a/net-analyzer/arpwatch/arpwatch-3.1.ebuild b/net-analyzer/arpwatch/arpwatch-3.1.ebuild deleted file mode 100644 index 64ae0f6ef45b..000000000000 --- a/net-analyzer/arpwatch/arpwatch-3.1.ebuild +++ /dev/null @@ -1,81 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit user - -DESCRIPTION="An ethernet monitor program that keeps track of ethernet/IP address pairings" -HOMEPAGE="https://ee.lbl.gov/" -LICENSE="BSD GPL-2" -SLOT="0" - -ETHERCODES_DATE=20200628 -SRC_URI=" - https://ee.lbl.gov/downloads/${PN}/${P}.tar.gz - https://dev.gentoo.org/~jer/ethercodes.dat-${ETHERCODES_DATE}.xz -" - -KEYWORDS="~amd64 ~hppa ~ppc ~sparc ~x86" -IUSE="selinux" - -DEPEND=" - net-libs/libpcap - sys-libs/ncurses:* -" -RDEPEND=" - ${DEPEND} - selinux? ( sec-policy/selinux-arpwatch ) - virtual/mta -" - -pkg_setup() { - # We need to create /var/lib/arpwatch with this group, so it must - # exist during src_install. - enewgroup arpwatch -} - -pkg_postinst() { - # The user, however, is not needed until runtime. - enewuser arpwatch -1 -1 -1 arpwatch -} - -src_configure() { - econf \ - ac_cv_path_V_SENDMAIL=sendmail -} - -src_install() { - dosbin arp2ethers arpfetch arpsnmp arpwatch bihourly.sh massagevendor.py update-ethercodes.sh - doman arpsnmp.8 arpwatch.8 - - insinto /usr/share/arpwatch - newins "${WORKDIR}"/ethercodes.dat-${ETHERCODES_DATE} ethercodes.dat - - insinto /usr/share/arpwatch/awk - doins d.awk duplicates.awk e.awk euppertolower.awk p.awk - - diropts --group=arpwatch --mode=770 - keepdir /var/lib/arpwatch - dodoc README CHANGES - - newconfd "${FILESDIR}"/arpwatch.confd-r2 arpwatch - newinitd "${FILESDIR}"/arpwatch.initd-r2 arpwatch -} - -pkg_postinst() { - # Previous revisions installed /var/lib/arpwatch with the wrong - # ownership. Instead of the intended arpwatch:root, it was left as - # root:root. If we find any such mis-owned directories, we fix them, - # and then set the permission bits how we want them in *this* - # revision. - # - # The "--from" flag ensures that we only fix directories that need - # fixing, and the "&& chmod" ensures that we only adjust the - # permissions if the owner also needed fixing. - chown \ - --from=root:root \ - --no-dereference \ - :arpwatch \ - "${ROOT}"/var/lib/arpwatch && \ - chmod 770 "${ROOT}"/var/lib/arpwatch -} diff --git a/net-analyzer/arpwatch/arpwatch-3.5.ebuild b/net-analyzer/arpwatch/arpwatch-3.5.ebuild new file mode 100644 index 000000000000..8356cbac4ff1 --- /dev/null +++ b/net-analyzer/arpwatch/arpwatch-3.5.ebuild @@ -0,0 +1,83 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools systemd + +ETHERCODES_DATE=20200628 +DESCRIPTION="An ethernet monitor program that keeps track of ethernet/IP address pairings" +HOMEPAGE="https://ee.lbl.gov/" +SRC_URI=" + https://ee.lbl.gov/downloads/${PN}/${P}.tar.gz + https://dev.gentoo.org/~jsmolic/distfiles/ethercodes.dat-${ETHERCODES_DATE}.xz +" + +LICENSE="BSD GPL-2" +SLOT="0" +KEYWORDS="amd64 ~hppa ppc ~riscv sparc x86" +IUSE="selinux" + +DEPEND=" + acct-group/arpwatch + net-libs/libpcap + sys-libs/ncurses:= +" +RDEPEND=" + ${DEPEND} + acct-user/arpwatch + virtual/mta + selinux? ( sec-policy/selinux-arpwatch ) +" + +PATCHES=( + # sent upstream on 2023-12-05 + "${FILESDIR}"/0001-Fix-configure-check-for-time.h.patch + "${FILESDIR}"/0002-Avoid-using-undocumented-internals-for-DNS.patch +) + +src_prepare() { + default + + # Temporary for 0001-Fix-configure-check-for-time.h.patch + eautoreconf +} + +src_install() { + dosbin arp2ethers arpfetch arpsnmp arpwatch bihourly.sh massagevendor.py update-ethercodes.sh + doman arpsnmp.8 arpwatch.8 + + insinto /usr/share/arpwatch + newins "${WORKDIR}"/ethercodes.dat-${ETHERCODES_DATE} ethercodes.dat + + insinto /usr/share/arpwatch/awk + doins d.awk duplicates.awk e.awk euppertolower.awk p.awk + + diropts --group=arpwatch --mode=770 + keepdir /var/lib/arpwatch + dodoc README CHANGES + + newconfd "${FILESDIR}"/arpwatch.confd-r2 arpwatch + newinitd "${FILESDIR}"/arpwatch.initd-r2 arpwatch + + systemd_dounit "${FILESDIR}/arpwatch.service" + systemd_install_serviced "${FILESDIR}/arpwatch.conf" +} + +pkg_postinst() { + # Previous revisions installed /var/lib/arpwatch with the wrong + # ownership. Instead of the intended arpwatch:root, it was left as + # root:root. If we find any such mis-owned directories, we fix them, + # and then set the permission bits how we want them in *this* + # revision. + # + # The "--from" flag ensures that we only fix directories that need + # fixing, and the "&& chmod" ensures that we only adjust the + # permissions if the owner also needed fixing. + chown \ + --from=root:root \ + --no-dereference \ + :arpwatch \ + "${ROOT}"/var/lib/arpwatch && \ + chmod 770 "${ROOT}"/var/lib/arpwatch +} diff --git a/net-analyzer/arpwatch/files/0001-Fix-configure-check-for-time.h.patch b/net-analyzer/arpwatch/files/0001-Fix-configure-check-for-time.h.patch new file mode 100644 index 000000000000..4c6b1466a452 --- /dev/null +++ b/net-analyzer/arpwatch/files/0001-Fix-configure-check-for-time.h.patch @@ -0,0 +1,36 @@ +sent upstream on 2023-12-05 + +From ea63ce2240a9be492086a56921c644533c740924 Mon Sep 17 00:00:00 2001 +From: Sam James <sam@gentoo.org> +Date: Tue, 5 Dec 2023 08:39:39 +0000 +Subject: [PATCH 1/2] Fix configure check for time.h + +Otherwise, we get an implicit function declaration warning/error (with Clang 16, +GCC 14) for localtime. + +Signed-off-by: Sam James <sam@gentoo.org> +--- a/configure.in ++++ b/configure.in +@@ -21,7 +21,7 @@ fi + AC_LBL_C_INIT(V_CCOPT, V_INCLS) + AC_PROG_INSTALL + +-AC_CHECK_HEADERS(fcntl.h memory.h) ++AC_CHECK_HEADERS(fcntl.h memory.h time.h) + + dnl + dnl Install rc.d script on FreeBSD +--- a/report.c ++++ b/report.c +@@ -59,7 +59,7 @@ struct rtentry; + #include <stdlib.h> + #include <string.h> + #include <syslog.h> +-#ifdef TIME_WITH_SYS_TIME ++#ifdef HAVE_TIME_H + #include <time.h> + #endif + #include <unistd.h> +-- +2.43.0 + diff --git a/net-analyzer/arpwatch/files/0002-Avoid-using-undocumented-internals-for-DNS.patch b/net-analyzer/arpwatch/files/0002-Avoid-using-undocumented-internals-for-DNS.patch new file mode 100644 index 000000000000..127c46c67abf --- /dev/null +++ b/net-analyzer/arpwatch/files/0002-Avoid-using-undocumented-internals-for-DNS.patch @@ -0,0 +1,35 @@ +sent upstream on 2023-12-05 + +From 957425ec7ca2714a4c31431f4746da7644a7f4e9 Mon Sep 17 00:00:00 2001 +From: Sam James <sam@gentoo.org> +Date: Tue, 5 Dec 2023 08:40:31 +0000 +Subject: [PATCH 2/2] Avoid using undocumented internals for DNS + +_getshort is a reserved internal function and is deprecated per +glibc's resolv.h at least. + +Use ns_get32 instead as recommended by the deprecation warning. + +This also fixes an implicit function declaration warning/error with +Clang 16 / GCC 14. + +Bug: https://bugs.gentoo.org/829633 +Signed-off-by: Sam James <sam@gentoo.org> +--- a/dns.c ++++ b/dns.c +@@ -115,10 +115,10 @@ gethinfo(char *hostname, char *cpu, int cpulen, char *os, int oslen) + (u_char *)cp, (char *)bp, buflen)) < 0) + break; + cp += n; +- type = _getshort(cp); ++ type = ns_get32(cp); + cp += sizeof(u_short); /* class */ + cp += sizeof(u_short) + sizeof(u_int32_t); +- n = _getshort(cp); ++ n = ns_get32(cp); + cp += sizeof(u_short); + if (type == T_HINFO) { + /* Unpack */ +-- +2.43.0 + diff --git a/net-analyzer/arpwatch/files/arpwatch.conf b/net-analyzer/arpwatch/files/arpwatch.conf new file mode 100644 index 000000000000..070f0edad80b --- /dev/null +++ b/net-analyzer/arpwatch/files/arpwatch.conf @@ -0,0 +1,16 @@ +# Config file for /etc/systemd/system/arpwatch +# see arpwatch.8 for more information + +IFACES=-i eno1 + +# Location of the PID file +PIDFILE=-P /run/arpwatch.pid + +# Additional options to pass to arpwatch. +OPTIONS=-N -p -Q -D + +# Where to store the data (default is /usr/share/arpwatch) +DATA=-f /var/log/arpwatch/eno1.dat + +# Comment this line if you wish arpwatch to run as root user (not recommended) +RUNUSER=-u arpwatch diff --git a/net-analyzer/arpwatch/files/arpwatch.confd-r1 b/net-analyzer/arpwatch/files/arpwatch.confd-r1 deleted file mode 100644 index a4da503406a2..000000000000 --- a/net-analyzer/arpwatch/files/arpwatch.confd-r1 +++ /dev/null @@ -1,17 +0,0 @@ -# See arpwatch.8 for more information - -# Specify the interface for arpwatch to listen on here (default: lo). -# If you need to listen on more than one interface, you should -# run multiple arpwatch services; for example "arpwatch" and -# "arpwatch.eth1". These additional services can be configured by -# symlinking to the "arpwatch" service script, and by creating a new -# conf.d file whose name matches the new service (symlink) name. -# -# Example: -# -# ARPWATCH_IFACE="eth0" -# -ARPWATCH_IFACE="lo" - -# Additional options to pass to arpwatch. -ARPWATCH_OPTS="-N -p" diff --git a/net-analyzer/arpwatch/files/arpwatch.initd-r1 b/net-analyzer/arpwatch/files/arpwatch.initd-r1 deleted file mode 100644 index ffe165205c6a..000000000000 --- a/net-analyzer/arpwatch/files/arpwatch.initd-r1 +++ /dev/null @@ -1,27 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -# Default to "lo" for the interface, so that the init script will work -# out-of-the-box. -: ${ARPWATCH_IFACE:=lo} - -ARPWATCH_DATAFILE="/var/lib/arpwatch/${RC_SVCNAME}.dat" - -command="/usr/sbin/arpwatch" -pidfile="/run/${RC_SVCNAME}.pid" -command_args="-i ${ARPWATCH_IFACE} - -u arpwatch - -f ${ARPWATCH_DATAFILE} - -P ${pidfile} - ${ARPWATCH_OPTS}" - -depend() { - need "net.${ARPWATCH_IFACE}" -} - -start_pre() { - # The "arpwatch" user must be a member of the "arpwatch" group for - # this to work. - checkpath --file --owner root:arpwatch --mode 0660 "${ARPWATCH_DATAFILE}" -} diff --git a/net-analyzer/arpwatch/files/arpwatch.service b/net-analyzer/arpwatch/files/arpwatch.service new file mode 100644 index 000000000000..943e3146f8df --- /dev/null +++ b/net-analyzer/arpwatch/files/arpwatch.service @@ -0,0 +1,16 @@ +[Unit] +Description=Ethernet monitoring program that tracks net/IP pairings +Documentation=man:arpwatch(8) +Conflicts= +After=systemd-networkd.service + +PIDFILE=/run/arpwatch.pid + +[Service] +Type=forking +ExecStartPre=/bin/rm -f /run/arpwatch.pid +ExecStart=/usr/sbin/arpwatch $IFACES $PIDFILE $RUNUSER $OPTIONS $DATA +Restart=on-abort + +[Install] +Alias=arpwatchd.service diff --git a/net-analyzer/arpwatch/metadata.xml b/net-analyzer/arpwatch/metadata.xml index 45a63182fe02..916a2ab22333 100644 --- a/net-analyzer/arpwatch/metadata.xml +++ b/net-analyzer/arpwatch/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>netmon@gentoo.org</email> diff --git a/net-analyzer/authforce/authforce-0.9.9-r2.ebuild b/net-analyzer/authforce/authforce-0.9.9-r2.ebuild deleted file mode 100644 index 09d3520a5b40..000000000000 --- a/net-analyzer/authforce/authforce-0.9.9-r2.ebuild +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DESCRIPTION="An HTTP authentication brute forcer" -HOMEPAGE="http://www.divineinvasion.net/authforce/" -SRC_URI="http://www.divineinvasion.net/${PN}/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ~ppc x86" -IUSE="curl nls" - -RDEPEND="sys-libs/readline:0= - curl? ( net-misc/curl )" -DEPEND="${RDEPEND}" -BDEPEND="nls? ( sys-devel/gettext )" - -DOCS=( AUTHORS BUGS NEWS README THANKS TODO ) - -PATCHES=( - "${FILESDIR}"/${P}-curl.patch - "${FILESDIR}"/${P}-locale.patch -) - -src_prepare() { - default - gunzip doc/${PN}.1.gz - sed -i -e "s/${PN}.1.gz/${PN}.1/g" \ - -e "s/\/mang/\/man1/g" doc/Makefile* || die -} - -src_configure() { - econf \ - $(use_with curl) \ - $(use_enable nls) \ - --with-path=/usr/share/${PN}/data:. -} - -src_install() { - default - doman doc/${PN}.1 -} diff --git a/net-analyzer/authforce/authforce-0.9.9-r3.ebuild b/net-analyzer/authforce/authforce-0.9.9-r3.ebuild deleted file mode 100644 index 556c3128dad6..000000000000 --- a/net-analyzer/authforce/authforce-0.9.9-r3.ebuild +++ /dev/null @@ -1,47 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DESCRIPTION="An HTTP authentication brute forcer" -HOMEPAGE="http://www.divineinvasion.net/authforce/" -SRC_URI="http://www.divineinvasion.net/${PN}/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ~ppc x86" -IUSE="curl nls" - -RDEPEND="sys-libs/readline:0= - curl? ( net-misc/curl )" -DEPEND="${RDEPEND}" -BDEPEND="nls? ( sys-devel/gettext )" - -DOCS=( AUTHORS BUGS NEWS README THANKS TODO ) - -PATCHES=( - "${FILESDIR}"/${P}-curl.patch - "${FILESDIR}"/${P}-locale.patch - "${FILESDIR}"/${P}-fixes-for-Wall-warnings.patch - "${FILESDIR}"/${P}-fix-parsing-of-sample-config-file.patch - "${FILESDIR}"/${P}-fix-submit_dummy_list-re-declaration.patch -) - -src_prepare() { - default - gunzip doc/${PN}.1.gz - sed -i -e "s/${PN}.1.gz/${PN}.1/g" \ - -e "s/\/mang/\/man1/g" doc/Makefile* || die -} - -src_configure() { - econf \ - $(use_with curl) \ - $(use_enable nls) \ - --with-path=/usr/share/${PN}/data:. -} - -src_install() { - default - doman doc/${PN}.1 -} diff --git a/net-analyzer/authforce/authforce-0.9.9-r4.ebuild b/net-analyzer/authforce/authforce-0.9.9-r4.ebuild new file mode 100644 index 000000000000..1c3be5b08d76 --- /dev/null +++ b/net-analyzer/authforce/authforce-0.9.9-r4.ebuild @@ -0,0 +1,50 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +DESCRIPTION="An HTTP authentication brute forcer" +HOMEPAGE="http://www.divineinvasion.net/authforce/" +SRC_URI="http://www.divineinvasion.net/${PN}/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64 ~ppc x86" +IUSE="curl nls" + +RDEPEND="sys-libs/readline:= + curl? ( net-misc/curl )" +DEPEND="${RDEPEND}" +BDEPEND="nls? ( sys-devel/gettext )" + +DOCS=( AUTHORS BUGS NEWS README THANKS TODO ) + +PATCHES=( + "${FILESDIR}"/${P}-curl.patch + "${FILESDIR}"/${P}-locale.patch + "${FILESDIR}"/${P}-fixes-for-Wall-warnings.patch + "${FILESDIR}"/${P}-fix-parsing-of-sample-config-file.patch + "${FILESDIR}"/${P}-fix-submit_dummy_list-re-declaration.patch + "${FILESDIR}"/${PN}-0.9.9-Include-stdlib.h-for-free.patch +) + +src_prepare() { + default + + gunzip doc/${PN}.1.gz || die + + sed -i -e "s/${PN}.1.gz/${PN}.1/g" \ + -e "s/\/mang/\/man1/g" doc/Makefile* || die +} + +src_configure() { + econf \ + $(use_with curl) \ + $(use_enable nls) \ + --with-path=/usr/share/${PN}/data:. +} + +src_install() { + default + doman doc/${PN}.1 +} diff --git a/net-analyzer/authforce/files/authforce-0.9.9-Include-stdlib.h-for-free.patch b/net-analyzer/authforce/files/authforce-0.9.9-Include-stdlib.h-for-free.patch new file mode 100644 index 000000000000..fec77215435c --- /dev/null +++ b/net-analyzer/authforce/files/authforce-0.9.9-Include-stdlib.h-for-free.patch @@ -0,0 +1,16 @@ +From e5e62f92c53f5f8cca9380ad3225c84be5eec04f Mon Sep 17 00:00:00 2001 +From: Sam James <sam@gentoo.org> +Date: Wed, 19 Oct 2022 03:33:51 +0100 +Subject: [PATCH] Include <stdlib.h> for free() + +Bug: https://bugs.gentoo.org/871222 +--- a/src/debug.c ++++ b/src/debug.c +@@ -3,6 +3,7 @@ + #include <config.h> + #include <stdio.h> + #include <stdarg.h> ++#include <stdlib.h> + #ifdef MEMWATCH + #include "memwatch.h" + #endif /* MEMWATCH*/ diff --git a/net-analyzer/authforce/metadata.xml b/net-analyzer/authforce/metadata.xml index 78e1c2f9528e..115e9d64a669 100644 --- a/net-analyzer/authforce/metadata.xml +++ b/net-analyzer/authforce/metadata.xml @@ -1,12 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>mmk@levelnine.at</email> - <name>Michael Mair-Keimberger</name> - </maintainer> - <maintainer type="project"> - <email>proxy-maint@gentoo.org</email> - <name>Proxy Maintainers</name> - </maintainer> + <!-- maintainer-needed --> </pkgmetadata> diff --git a/net-analyzer/barnyard/barnyard-0.2.0-r6.ebuild b/net-analyzer/barnyard/barnyard-0.2.0-r6.ebuild deleted file mode 100644 index 6786fba3781f..000000000000 --- a/net-analyzer/barnyard/barnyard-0.2.0-r6.ebuild +++ /dev/null @@ -1,96 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=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://dev.gentoo.org/~jer/${P}-patches.tar.xz -" - -SLOT="0" -LICENSE="QPL GPL-2" -KEYWORDS="~amd64 -sparc ~x86" -IUSE="mysql postgres sguil" - -DEPEND=" - net-libs/libpcap - mysql? ( dev-db/mysql-connector-c:0= ) - postgres? ( dev-db/postgresql:*[server] ) - sguil? ( dev-lang/tcl:0 ) -" -RDEPEND=" - ${DEPEND} - net-analyzer/snort -" - -S=${WORKDIR}/${P/_/-} - -DOCS="AUTHORS README docs/*" -PATCHES=( - "${WORKDIR}"/${P}-64bit.patch - "${WORKDIR}"/${P}-canonical-ar.patch - "${WORKDIR}"/${P}-configure-in.patch -) -SGUIL_PATCHES=( - "${WORKDIR}"/${P}-op_plugbase.c.patch - "${WORKDIR}"/${P}-sguil_files.patch -) - -src_prepare() { - use sguil && PATCHES+=( "${SGUIL_PATCHES[@]}" ) - default - - eautoreconf -} - -src_configure() { - tc-export AR - - econf \ - $(use_enable mysql) \ - $(use_enable postgres) \ - $(use_enable sguil tcl) \ - --sysconfdir=/etc/snort -} - -src_install() { - default - - keepdir /var/log/snort - keepdir /var/log/snort/archive - - insinto /etc/snort - newins etc/barnyard.conf barnyard.conf - newconfd "${FILESDIR}"/barnyard.confd barnyard - newinitd "${FILESDIR}"/barnyard.rc6 barnyard - - if use sguil ; then - sed -i -e "/config hostname:/s%snorthost%$(hostname)%" \ - -e "/config interface/s:fxp0:eth0:" \ - -e "s:output alert_fast:#output alert_fast:" \ - -e "s:output log_dump:#output log_dump:" \ - "${D}/etc/snort/barnyard.conf" || die "sed failed" - - sed -i -e s:/var/log/snort:/var/lib/sguil/$(hostname): \ - -e s:/var/run/barnyard.pid:/var/run/sguil/barnyard.pid: \ - "${D}/etc/conf.d/barnyard" || die "sed failed" - - sed -i -e "/start-stop-daemon --start/s:--exec:-c sguil --exec:" \ - "${D}/etc/init.d/barnyard" || die "sed failed" - fi -} - -pkg_postinst() { - if use sguil ; then - elog - elog "Make sure to edit /etc/snort/barnyard.conf and uncomment the" - elog "sguil section along with supplying the appropriate database" - elog "information." - elog - fi -} diff --git a/net-analyzer/barnyard/barnyard-0.2.0-r7.ebuild b/net-analyzer/barnyard/barnyard-0.2.0-r7.ebuild new file mode 100644 index 000000000000..94966b420485 --- /dev/null +++ b/net-analyzer/barnyard/barnyard-0.2.0-r7.ebuild @@ -0,0 +1,96 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=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://dev.gentoo.org/~jsmolic/distfiles/${P}-patches.tar.xz +" + +SLOT="0" +LICENSE="QPL-1.0 GPL-2" # GPL-2 for init script +KEYWORDS="~amd64 -sparc ~x86" +IUSE="mysql postgres sguil" + +DEPEND=" + net-libs/libpcap + mysql? ( dev-db/mysql-connector-c:0= ) + postgres? ( dev-db/postgresql:*[server] ) + sguil? ( dev-lang/tcl:0 ) +" +RDEPEND=" + ${DEPEND} + net-analyzer/snort +" + +S=${WORKDIR}/${P/_/-} + +DOCS="AUTHORS README docs/*" +PATCHES=( + "${WORKDIR}"/${P}-64bit.patch + "${WORKDIR}"/${P}-canonical-ar.patch + "${WORKDIR}"/${P}-configure-in.patch +) +SGUIL_PATCHES=( + "${WORKDIR}"/${P}-op_plugbase.c.patch + "${WORKDIR}"/${P}-sguil_files.patch +) + +src_prepare() { + use sguil && PATCHES+=( "${SGUIL_PATCHES[@]}" ) + default + + eautoreconf +} + +src_configure() { + tc-export AR + + econf \ + $(use_enable mysql) \ + $(use_enable postgres) \ + $(use_enable sguil tcl) \ + --sysconfdir=/etc/snort +} + +src_install() { + default + + keepdir /var/log/snort + keepdir /var/log/snort/archive + + insinto /etc/snort + newins etc/barnyard.conf barnyard.conf + newconfd "${FILESDIR}"/barnyard.confd barnyard + newinitd "${FILESDIR}"/barnyard.rc6 barnyard + + if use sguil ; then + sed -i -e "/config hostname:/s%snorthost%$(hostname)%" \ + -e "/config interface/s:fxp0:eth0:" \ + -e "s:output alert_fast:#output alert_fast:" \ + -e "s:output log_dump:#output log_dump:" \ + "${D}/etc/snort/barnyard.conf" || die "sed failed" + + sed -i -e s:/var/log/snort:/var/lib/sguil/$(hostname): \ + -e s:/var/run/barnyard.pid:/var/run/sguil/barnyard.pid: \ + "${D}/etc/conf.d/barnyard" || die "sed failed" + + sed -i -e "/start-stop-daemon --start/s:--exec:-c sguil --exec:" \ + "${D}/etc/init.d/barnyard" || die "sed failed" + fi +} + +pkg_postinst() { + if use sguil ; then + elog + elog "Make sure to edit /etc/snort/barnyard.conf and uncomment the" + elog "sguil section along with supplying the appropriate database" + elog "information." + elog + fi +} diff --git a/net-analyzer/barnyard/metadata.xml b/net-analyzer/barnyard/metadata.xml index f6d8c687a3c5..51903ed00c3f 100644 --- a/net-analyzer/barnyard/metadata.xml +++ b/net-analyzer/barnyard/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>netmon@gentoo.org</email> diff --git a/net-analyzer/barnyard2/Manifest b/net-analyzer/barnyard2/Manifest index 32132ade52b6..f01457705401 100644 --- a/net-analyzer/barnyard2/Manifest +++ b/net-analyzer/barnyard2/Manifest @@ -1,2 +1 @@ DIST barnyard2-1.13-github.tar.gz 435017 BLAKE2B 2bfd6b038f4691cd9b40128c48db89cdb0cdefd9c779cbae4f6a86246507849f8faf73e10c986d9a48d45d608b02cbb8486bd731ebe1c78be115fe65c5a97704 SHA512 b9cf42ff3cb066493a3a6e8d095f6af1c59815ebb19725374a75977294620fe825cdbc6650d3600d3f8525860c39d3580aa1d6ef773cd31fbc28d500d6c75246 -DIST barnyard2-1.9-github.tar.gz 344672 BLAKE2B 720d55170eaf66d2fac7a73990f00dab6faf27c5fcfbcd2f3fa5bad8fa028880fc257a78b60660eaaa5cea3cd8ab04aea2ad173d2135757d7a1f93a80e049d06 SHA512 eb10e4333e862ba6d708e7956b86f9da5da8c52b2756724e821ac5f5ba064791cf84125942bf76e7c563f62c83558aff90219ccc694884e213f6571428849666 diff --git a/net-analyzer/barnyard2/barnyard2-1.13.ebuild b/net-analyzer/barnyard2/barnyard2-1.13.ebuild index 377952066866..a6c5e14eee5c 100644 --- a/net-analyzer/barnyard2/barnyard2-1.13.ebuild +++ b/net-analyzer/barnyard2/barnyard2-1.13.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 @@ -7,10 +7,11 @@ 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" -KEYWORDS="~amd64 ~x86" +SLOT="0" +KEYWORDS="amd64 x86" IUSE="debug gre mpls mysql odbc postgres sguil" DEPEND=" @@ -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/barnyard2-1.9-r2.ebuild b/net-analyzer/barnyard2/barnyard2-1.9-r2.ebuild deleted file mode 100644 index 7a9d865754c7..000000000000 --- a/net-analyzer/barnyard2/barnyard2-1.9-r2.ebuild +++ /dev/null @@ -1,72 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -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" - -SLOT="0" -LICENSE="GPL-2" -KEYWORDS="~amd64 ~x86" -IUSE="debug gre mpls mysql odbc postgres static" - -DEPEND="net-libs/libpcap - mysql? ( dev-db/mysql-connector-c:0= ) - odbc? ( dev-db/unixODBC ) - postgres? ( dev-db/postgresql:*[server] )" -RDEPEND="${DEPEND}" - -DOCS="RELEASE.NOTES etc/barnyard2.conf doc/README* schemas/create_*" - -S="${WORKDIR}/${PN}-2-${PV}" - -src_prepare() { - default - sed -i -e "s:^#config interface:config interface:" \ - "etc/barnyard2.conf" || die - sed -i -e "s:^output alert_fast:#output alert_fast:" \ - "etc/barnyard2.conf" || die - - AT_M4DIR="m4" eautoreconf -} - -src_configure() { - econf \ - $(use_enable !static shared) \ - $(use_enable static) \ - $(use_enable debug) \ - $(use_enable gre) \ - $(use_enable mpls) \ - $(use_with mysql) \ - $(use_with odbc) \ - $(use_with postgres postgresql) \ - --disable-ipv6 \ - --disable-prelude \ - --disable-mysql-ssl-support \ - --disable-aruba \ - --without-tcl \ - --without-oracle -} - -src_install() { - default - - newconfd "${FILESDIR}/barnyard2.confd" barnyard2 - newinitd "${FILESDIR}/barnyard2.initd" barnyard2 - - dodir /etc/barnyard2 - keepdir /var/log/barnyard2 - keepdir /var/log/snort/archive - - rm "${D}"/etc/barnyard2.conf || die -} - -pkg_postinst() { - elog "Configuration options can be set in /etc/conf.d/barnyard2." - elog - elog "An example configuration file can be found in /usr/share/doc/${PF}." -} diff --git a/net-analyzer/barnyard2/metadata.xml b/net-analyzer/barnyard2/metadata.xml index d6bf89e69a2c..4bf528f8851c 100644 --- a/net-analyzer/barnyard2/metadata.xml +++ b/net-analyzer/barnyard2/metadata.xml @@ -1,10 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>patrick@gentoo.org</email> - <name>Patrick Lauer</name> - </maintainer> <maintainer type="project"> <email>netmon@gentoo.org</email> <name>Gentoo network monitoring and analysis project</name> @@ -24,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/bigeye/Manifest b/net-analyzer/bigeye/Manifest deleted file mode 100644 index bcd16714fd0d..000000000000 --- a/net-analyzer/bigeye/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST bigeye-0.3-gcc34.patch.xz 2564 BLAKE2B 17508c780f339aa2409616aa2bd4e37c3e9f8ba48626e9a3782ea60da2989d4a8543c8a97cecef34554265385b13019d3bc04a05c8809870e0cba20c72a76bf8 SHA512 c7005975a7b798521f0d8f7b646f168ff215c1b5a760e303f7cad8bb78e2324e8303f77a724bc6902ef7ee525d7e6dd5ccfdf366c39abcc436fc6edf503205af -DIST bigeye-0.3.tgz 32462 BLAKE2B 509e958852d958f5fbb7197e567f8ebd1d7004027e4d8f3fe868d3af6719f76e445890a241d4438609b12695bd403fa246cec03b382a2c339d23c1456aa198e0 SHA512 73a146fd2f5df86a3d16dec05cf3f278393347f341a5cc319feccf6d23e1f2fe9d29070ac154a5b2336ade146843ab163e3545e9aefad1a0fa8903928d9b1ed0 diff --git a/net-analyzer/bigeye/bigeye-0.3-r4.ebuild b/net-analyzer/bigeye/bigeye-0.3-r4.ebuild deleted file mode 100644 index e9382d08ec47..000000000000 --- a/net-analyzer/bigeye/bigeye-0.3-r4.ebuild +++ /dev/null @@ -1,42 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit flag-o-matic toolchain-funcs - -DESCRIPTION="network utility dump and simple honeypot utility" -HOMEPAGE="http://violating.us/projects/bigeye/" -SRC_URI=" - http://violating.us/projects/bigeye/download/${P}.tgz - https://dev.gentoo.org/~jer/${P}-gcc34.patch.xz -" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ~ppc x86" -PATCHES=( - "${WORKDIR}"/${P}-gcc34.patch - "${FILESDIR}"/${P}-overflow.patch -) - -src_prepare() { - default - sed -i README \ - -e "s|-- /messages/|-- /usr/share/bigeye/messages/|g" \ - || die "sed README" -} - -src_compile() { - append-cflags -fcommon - $(tc-getCC) ${CFLAGS} ${LDFLAGS} src/bigeye.c src/emulate.c -o src/bigeye || die -} - -src_install() { - dobin src/bigeye - - insinto /usr/share/bigeye - doins sig.file - doins -r messages - - dodoc README -} diff --git a/net-analyzer/bigeye/files/bigeye-0.3-overflow.patch b/net-analyzer/bigeye/files/bigeye-0.3-overflow.patch deleted file mode 100644 index 1ca159a65b79..000000000000 --- a/net-analyzer/bigeye/files/bigeye-0.3-overflow.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/src/bigeye.c -+++ b/src/bigeye.c -@@ -787,7 +787,7 @@ - local.sin_family = AF_INET; - local.sin_port = htons(porta); - local.sin_addr.s_addr = INADDR_ANY; -- bzero(&(local.sin_zero),sizeof(local)); -+ memset(&(local.sin_zero), "\0", sizeof(local.sin_zero)); - - if(setsockopt(sock_a, SOL_SOCKET, SO_REUSEADDR, &on, sizeof(on)) < 0) { - perror("setsockopt"); diff --git a/net-analyzer/bigeye/metadata.xml b/net-analyzer/bigeye/metadata.xml deleted file mode 100644 index 74c2baebb4ec..000000000000 --- a/net-analyzer/bigeye/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://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/bing/Manifest b/net-analyzer/bing/Manifest index 52c4ade6d53a..77b3d8d308a9 100644 --- a/net-analyzer/bing/Manifest +++ b/net-analyzer/bing/Manifest @@ -1 +1 @@ -DIST bing_1.1.3.orig.tar.gz 38847 BLAKE2B ba01ff0e9a53fa8e9cd44ee085d78ae8d8891cc5478697a0d8fb13917c9a4104a672dcc7aba0c6c91e7f0084ac4254b6f565cf44486b6162225c5a21cb1614a7 SHA512 df56f93047454a02b305154b12898b063c340e96778db9e11114ac4598446648b3ed5fe4304e0f3e33f612069b0f0e4e231396ee878655683f923ad5418d6242 +DIST bing_1.3.5.orig.tar.gz 81083 BLAKE2B b6d7b9de4181cbe5054e2260482d6d2f6026e433815924fc5a8c74e4bb2d2da465a57e31e588b4d30f7e7b1c577440c4018b463df46278e8dc90f01e9d710ea6 SHA512 187c0dd8aff289943d044402cb072a64f9eb8470295ab4d3e94e78f1f8388c6737929b8ed6c11b551fc866bba4c45c3fbb1aa7b5ca1a6c798f313db9902d003f diff --git a/net-analyzer/bing/bing-1.1.3-r2.ebuild b/net-analyzer/bing/bing-1.1.3-r2.ebuild deleted file mode 100644 index 565ed702e870..000000000000 --- a/net-analyzer/bing/bing-1.1.3-r2.ebuild +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit toolchain-funcs - -DESCRIPTION="A point-to-point bandwidth measurement tool" -SRC_URI="mirror://debian/pool/main/b/bing/${PN}_${PV}.orig.tar.gz" -HOMEPAGE="http://fgouget.free.fr/bing/index-en.shtml" - -LICENSE="BSD-4" -SLOT="0" -KEYWORDS="amd64 ~arm ~ia64 ppc sparc x86" - -src_prepare() { - default - sed -i -e "s|#COPTIM = -g| COPTIM = ${CFLAGS}|" Makefile || die -} - -src_compile() { - emake CC="$(tc-getCC)" -} - -src_install() { - dobin bing - doman unix/bing.8 - dodoc ChangeLog Readme.{1st,txt} -} diff --git a/net-analyzer/bing/bing-1.3.5.ebuild b/net-analyzer/bing/bing-1.3.5.ebuild new file mode 100644 index 000000000000..b3449c8b8071 --- /dev/null +++ b/net-analyzer/bing/bing-1.3.5.ebuild @@ -0,0 +1,33 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit toolchain-funcs + +DESCRIPTION="A point-to-point bandwidth measurement tool" +HOMEPAGE="http://fgouget.free.fr/bing/index-en.shtml" +SRC_URI="mirror://debian/pool/main/b/bing/${PN}_${PV}.orig.tar.gz" + +LICENSE="BSD-4" +SLOT="0" +KEYWORDS="amd64 ~arm ~ia64 ppc sparc x86" + +PATCHES=( + "${FILESDIR}"/${PN}-1.3.5-Add-missing-string.h-for-memcpy.patch +) + +src_prepare() { + default + sed -i -e "s|#COPTIM = -g| COPTIM = ${CFLAGS}|" Makefile || die +} + +src_compile() { + emake CC="$(tc-getCC)" +} + +src_install() { + dobin bing + doman unix/bing.8 + dodoc ChangeLog Readme.{1st,txt} +} diff --git a/net-analyzer/bing/files/bing-1.3.5-Add-missing-string.h-for-memcpy.patch b/net-analyzer/bing/files/bing-1.3.5-Add-missing-string.h-for-memcpy.patch new file mode 100644 index 000000000000..424a591c1548 --- /dev/null +++ b/net-analyzer/bing/files/bing-1.3.5-Add-missing-string.h-for-memcpy.patch @@ -0,0 +1,17 @@ +https://bugs.gentoo.org/874057 + +From dafa483ba52e334cdc138a4f9e5999d2d5cc5d9b Mon Sep 17 00:00:00 2001 +From: Sam James <sam@gentoo.org> +Date: Wed, 19 Oct 2022 02:58:47 +0100 +Subject: [PATCH] Add missing <string.h> for memcpy + +--- a/bing_probes.c ++++ b/bing_probes.c +@@ -10,6 +10,7 @@ + #include <errno.h> + #include <malloc.h> + #include <stdlib.h> ++#include <string.h> + + /* types.h provides u_short on HPUX10 and Solaris */ + #include <sys/types.h> diff --git a/net-analyzer/bing/metadata.xml b/net-analyzer/bing/metadata.xml index 7a38bb900964..115e9d64a669 100644 --- a/net-analyzer/bing/metadata.xml +++ b/net-analyzer/bing/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <!-- maintainer-needed --> </pkgmetadata> diff --git a/net-analyzer/bmon/bmon-4.0-r1.ebuild b/net-analyzer/bmon/bmon-4.0-r1.ebuild new file mode 100644 index 000000000000..ce8d5207b86a --- /dev/null +++ b/net-analyzer/bmon/bmon-4.0-r1.ebuild @@ -0,0 +1,43 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools linux-info toolchain-funcs + +DESCRIPTION="Interface bandwidth monitor" +HOMEPAGE="https://github.com/tgraf/bmon/" +SRC_URI="https://codeload.github.com/tgraf/${PN}/tar.gz/v${PV} -> ${P}.tar.gz" + +LICENSE="BSD-2 MIT" +SLOT="0" +KEYWORDS="amd64 ~arm ~hppa ~ppc ppc64 ~riscv ~sparc x86" + +RDEPEND=" + >=sys-libs/ncurses-5.3-r2:0= + dev-libs/confuse:= + dev-libs/libnl:3 +" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" + +DOCS=( ChangeLog NEWS README.md ) + +CONFIG_CHECK="~NET_SCHED" +ERROR_NET_SCHED=" + CONFIG_NET_SCHED is not set when it should be. + Run ${PN} -i proc to use the deprecated proc interface instead. +" + +PATCHES=( + "${FILESDIR}"/${PN}-3.6-docdir-examples.patch +) + +src_prepare() { + default + eautoreconf +} + +src_configure() { + econf CURSES_LIB="$("$(tc-getPKG_CONFIG)" --libs ncurses)" +} diff --git a/net-analyzer/bmon/bmon-4.0.ebuild b/net-analyzer/bmon/bmon-4.0.ebuild index ce39ebbf63e0..d8f7ff125c40 100644 --- a/net-analyzer/bmon/bmon-4.0.ebuild +++ b/net-analyzer/bmon/bmon-4.0.ebuild @@ -1,28 +1,25 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 -inherit autotools eutils linux-info toolchain-funcs +EAPI=7 -DESCRIPTION="interface bandwidth monitor" -HOMEPAGE="http://www.infradead.org/~tgr/bmon/ https://github.com/tgraf/bmon/" -SRC_URI=" - https://codeload.github.com/tgraf/${PN}/tar.gz/v${PV} -> ${P}.tar.gz -" +inherit autotools linux-info toolchain-funcs + +DESCRIPTION="Interface bandwidth monitor" +HOMEPAGE="https://github.com/tgraf/bmon/" +SRC_URI="https://codeload.github.com/tgraf/${PN}/tar.gz/v${PV} -> ${P}.tar.gz" LICENSE="BSD-2 MIT" SLOT="0" -KEYWORDS="amd64 ~arm ~hppa ~ppc ppc64 ~sparc x86" +KEYWORDS="amd64 ~arm ~hppa ~ppc ppc64 ~riscv ~sparc x86" RDEPEND=" >=sys-libs/ncurses-5.3-r2:0= dev-libs/confuse:= dev-libs/libnl:3 " -DEPEND=" - ${RDEPEND} - virtual/pkgconfig -" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" DOCS=( ChangeLog ) @@ -32,12 +29,12 @@ ERROR_NET_SCHED=" Run ${PN} -i proc to use the deprecated proc interface instead. " -src_prepare() { - eapply \ - "${FILESDIR}"/${PN}-3.6-docdir-examples.patch - - eapply_user +PATCHES=( + "${FILESDIR}"/${PN}-3.6-docdir-examples.patch +) +src_prepare() { + default eautoreconf } diff --git a/net-analyzer/bmon/bmon-999.ebuild b/net-analyzer/bmon/bmon-999.ebuild deleted file mode 100644 index 1939b19057ed..000000000000 --- a/net-analyzer/bmon/bmon-999.ebuild +++ /dev/null @@ -1,43 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit autotools git-r3 linux-info toolchain-funcs - -DESCRIPTION="interface bandwidth monitor" -HOMEPAGE="http://www.infradead.org/~tgr/bmon/ https://github.com/tgraf/bmon/" -EGIT_REPO_URI="https://github.com/tgraf/bmon/" - -LICENSE="BSD-2 MIT" -SLOT="0" -KEYWORDS="" - -RDEPEND=" - >=sys-libs/ncurses-5.3-r2:0= - dev-libs/confuse:= - dev-libs/libnl:3 -" -DEPEND=" - ${RDEPEND} - virtual/pkgconfig -" - -DOCS=( ChangeLog ) - -CONFIG_CHECK="~NET_SCHED" -ERROR_NET_SCHED=" - CONFIG_NET_SCHED is not set when it should be. - Run ${PN} -i proc to use the deprecated proc interface instead. -" -PATCHES=( - "${FILESDIR}"/${PN}-3.6-docdir-examples.patch -) - -src_prepare() { - default - eautoreconf -} - -src_configure() { - econf CURSES_LIB="$("$(tc-getPKG_CONFIG)" --libs ncurses)" -} diff --git a/net-analyzer/bmon/bmon-9999.ebuild b/net-analyzer/bmon/bmon-9999.ebuild new file mode 100644 index 000000000000..8fb8ce7ac06f --- /dev/null +++ b/net-analyzer/bmon/bmon-9999.ebuild @@ -0,0 +1,41 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools git-r3 linux-info toolchain-funcs + +DESCRIPTION="Interface bandwidth monitor" +HOMEPAGE="https://github.com/tgraf/bmon/" +EGIT_REPO_URI="https://github.com/tgraf/bmon/" + +LICENSE="BSD-2 MIT" +SLOT="0" + +RDEPEND=" + >=sys-libs/ncurses-5.3-r2:0= + dev-libs/confuse:= + dev-libs/libnl:3 +" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" + +DOCS=( NEWS README.md ) + +CONFIG_CHECK="~NET_SCHED" +ERROR_NET_SCHED=" + CONFIG_NET_SCHED is not set when it should be. + Run ${PN} -i proc to use the deprecated proc interface instead. +" +PATCHES=( + "${FILESDIR}"/${PN}-3.6-docdir-examples.patch +) + +src_prepare() { + default + eautoreconf +} + +src_configure() { + econf CURSES_LIB="$("$(tc-getPKG_CONFIG)" --libs ncurses)" +} diff --git a/net-analyzer/bmon/metadata.xml b/net-analyzer/bmon/metadata.xml index df5705b8008d..ff3ea4ec8466 100644 --- a/net-analyzer/bmon/metadata.xml +++ b/net-analyzer/bmon/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>netmon@gentoo.org</email> diff --git a/net-analyzer/braa/metadata.xml b/net-analyzer/braa/metadata.xml index 2c2a7923cfc8..d5af4bcfaf13 100644 --- a/net-analyzer/braa/metadata.xml +++ b/net-analyzer/braa/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>netmon@gentoo.org</email> diff --git a/net-analyzer/bwbar/bwbar-1.2.3.ebuild b/net-analyzer/bwbar/bwbar-1.2.3.ebuild index 89b0d4b0da7e..6837e519f3ca 100644 --- a/net-analyzer/bwbar/bwbar-1.2.3.ebuild +++ b/net-analyzer/bwbar/bwbar-1.2.3.ebuild @@ -1,8 +1,7 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 -inherit eutils +EAPI=7 DESCRIPTION="The kernel.org \"Current bandwidth utilization\" bar" HOMEPAGE="https://www.kernel.org/pub/software/web/bwbar/" @@ -15,9 +14,9 @@ KEYWORDS="amd64 x86" RDEPEND=">=media-libs/libpng-1.2" DEPEND="${RDEPEND}" -src_prepare() { - epatch "${FILESDIR}"/${P}-libpng15.patch -} +PATCHES=( + "${FILESDIR}"/${P}-libpng15.patch +) src_install() { dobin bwbar diff --git a/net-analyzer/bwbar/metadata.xml b/net-analyzer/bwbar/metadata.xml index 74c2baebb4ec..dce3f3be66c0 100644 --- a/net-analyzer/bwbar/metadata.xml +++ b/net-analyzer/bwbar/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>netmon@gentoo.org</email> diff --git a/net-analyzer/bwm-ng/Manifest b/net-analyzer/bwm-ng/Manifest index 44c35c9cce13..76957d9f40c0 100644 --- a/net-analyzer/bwm-ng/Manifest +++ b/net-analyzer/bwm-ng/Manifest @@ -1,2 +1 @@ -DIST bwm-ng-0.6.1.tar.gz 162620 BLAKE2B 28e201ac681fcb1d79afead8a7d2c31d52bfa9ee1ebc132d3cd1080a7edd8ddcc8c0cd6df1897d23a1c79a4a5d9157214a8f3224bd5f8f2c1a12cad96ec188bd SHA512 3f8d4a10f5cbf743d6aee9c6170f334c4274224a2f1886f04338c9a1bf0cf13af5be4aaea0445c9e5b5d361915cc3a93bbfe7c4abf69a0d24e42bc414d8056cd -DIST bwm-ng-0.6.2.tar.gz 70079 BLAKE2B 4e0c5dd73bdcaabf5138ce842e5ce50709ba3bc0792f11ebee2640b6246f5bd740fcf8ad79b7dcffabdbc8f44c5ec2d925b20cf28609f8735e537f6920f92aba SHA512 4a7f141692f96dfab0c1729a7df36f5213a75ddb891b967b2cf951419daea7b84354c276705a0ee7c09f4ed26948ca068f65a04b8f9d18b2b8ed2df97b5e3b0a +DIST bwm-ng-0.6.3.tar.gz 70094 BLAKE2B bfc5007470a2e4d7f50dc43dc33898f5bcb34a0eaeeb0f53ed74029299ac2b732d343eaf725144a05b778ad8a204c5d546f0ea0b6aaf997995e2e7a6bc3c6cf6 SHA512 85ce29e6ffa9643b4e7c1d731f4e928ddca8cfdc71c86b65ec4e55058b951eb8da9ab80139145300518223589d5fece5bdc11ede91a1ea394d569993ccdb0ab8 diff --git a/net-analyzer/bwm-ng/bwm-ng-0.6.1-r1.ebuild b/net-analyzer/bwm-ng/bwm-ng-0.6.1-r1.ebuild deleted file mode 100644 index 51311ad80550..000000000000 --- a/net-analyzer/bwm-ng/bwm-ng-0.6.1-r1.ebuild +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit autotools - -DESCRIPTION="Bandwidth Monitor NG is a small and simple console-based bandwidth monitor" -SRC_URI="http://www.gropp.org/bwm-ng/${P}.tar.gz" -HOMEPAGE="http://www.gropp.org/" - -KEYWORDS="amd64 ~arm ppc x86" -LICENSE="GPL-2" -SLOT="0" -IUSE="csv html" - -RDEPEND="sys-libs/ncurses:0= - >=sys-apps/net-tools-1.60-r1" -DEPEND="${RDEPEND}" - -PATCHES=( - "${FILESDIR}"/${P}-fix-buildsystem.patch - "${FILESDIR}"/${P}-static-inline.patch -) - -src_prepare() { - default - mv configure.{in,ac} || die - eautoreconf -} - -src_configure() { - econf \ - $(use_enable csv) \ - $(use_enable html) \ - --enable-ncurses \ - --with-procnetdev -} diff --git a/net-analyzer/bwm-ng/bwm-ng-0.6.2.ebuild b/net-analyzer/bwm-ng/bwm-ng-0.6.2.ebuild deleted file mode 100644 index 23c71582d272..000000000000 --- a/net-analyzer/bwm-ng/bwm-ng-0.6.2.ebuild +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit autotools - -DESCRIPTION="Bandwidth Monitor NG is a small and simple console-based bandwidth monitor" -HOMEPAGE="http://www.gropp.org/" -SRC_URI="https://github.com/vgropp/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -KEYWORDS="~amd64 ~arm ~ppc ~x86" -LICENSE="GPL-2" -SLOT="0" -IUSE="+csv +html" - -RDEPEND=" - >=sys-apps/net-tools-1.60-r1 - sys-libs/ncurses:0= -" -DEPEND=" - ${RDEPEND} -" -PATCHES=( - "${FILESDIR}"/${PN}-0.6.2-tinfo.patch -) - -src_prepare() { - default - eautoreconf -} - -src_configure() { - econf \ - $(use_enable csv) \ - $(use_enable html) \ - --with-ncurses \ - --with-procnetdev -} diff --git a/net-analyzer/bwm-ng/bwm-ng-0.6.3.ebuild b/net-analyzer/bwm-ng/bwm-ng-0.6.3.ebuild new file mode 100644 index 000000000000..0e94224d5bbf --- /dev/null +++ b/net-analyzer/bwm-ng/bwm-ng-0.6.3.ebuild @@ -0,0 +1,38 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit autotools + +DESCRIPTION="Bandwidth Monitor NG is a small and simple console-based bandwidth monitor" +HOMEPAGE="http://www.gropp.org/" +SRC_URI="https://github.com/vgropp/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +KEYWORDS="amd64 ~arm ppc x86" +LICENSE="GPL-2" +SLOT="0" +IUSE="+csv +html" + +RDEPEND=" + >=sys-apps/net-tools-1.60-r1 + sys-libs/ncurses:0= +" +DEPEND="${RDEPEND}" + +PATCHES=( + "${FILESDIR}"/${PN}-0.6.2-tinfo.patch +) + +src_prepare() { + default + eautoreconf +} + +src_configure() { + econf \ + $(use_enable csv) \ + $(use_enable html) \ + --with-ncurses \ + --with-procnetdev +} diff --git a/net-analyzer/bwm-ng/files/bwm-ng-0.6.1-fix-buildsystem.patch b/net-analyzer/bwm-ng/files/bwm-ng-0.6.1-fix-buildsystem.patch deleted file mode 100644 index 04c14392d66a..000000000000 --- a/net-analyzer/bwm-ng/files/bwm-ng-0.6.1-fix-buildsystem.patch +++ /dev/null @@ -1,93 +0,0 @@ -* Fix broken buildsystem -* Fix ncurses underlinking caused by missing "-ltinfo" in $LIBS -https://bugs.gentoo.org/show_bug.cgi?id=561718 - ---- a/configure.in -+++ b/configure.in -@@ -3,7 +3,7 @@ - - AC_INIT([bwm-ng],[0.6.1],[bwmng@gropp.org],[bwm-ng]) - AC_CONFIG_SRCDIR(src/bwm-ng.c) --AM_INIT_AUTOMAKE([gnu]) -+AM_INIT_AUTOMAKE([gnu subdir-objects]) - AC_CONFIG_HEADERS(config.h) - AC_CONFIG_MACRO_DIR(./) - AC_LANG([C]) -@@ -28,44 +28,12 @@ - AC_CHECK_TYPES(unsigned long long) - - # Checks for libraries. --CURSES_CHECKED="0" -+AC_ARG_ENABLE([ncurses], -+ AS_HELP_STRING([--enable-ncurses], [Enable feature ncurses])) - --AC_ARG_WITH([curses],AS_HELP_STRING([--with-curses],[with curses (ARG=PATH)]),[ --if [ test $withval != "no" ]; then -- OLD_CPPFLAGS=$CPPFLAGS -- if [ test $withval != "yes" ]; then -- CPPFLAGS="$CPPFLAGS -I$withval" -- fi -- AC_CHECK_LIB([curses],[newterm,timeout],,[ CPPFLAGS=$OLD_CPPFLAGS ]) -- CURSES_CHECKED="1" --else -- CURSES_CHECKED="1" --fi --]) -- -- --if [ test $CURSES_CHECKED != "1" ]; then --AC_ARG_WITH([ncurses],AS_HELP_STRING([--with-ncurses],[prefer ncurses over curses (ARG=PATH)]),[ --if [ test $withval != "no" ]; then -- OLD_CPPFLAGS=$CPPFLAGS -- if [ test $withval != "yes" ]; then -- CPPFLAGS="$CPPFLAGS -I$withval" -- fi -- AC_CHECK_LIB([ncurses],[newterm,timeout],,[ CPPFLAGS=$OLD_CPPFLAGS ]) -- CURSES_CHECKED="1" --else -- CURSES_CHECKED="1" --fi -+AS_IF([test "x$enable_ncurses" != "xno"], [ -+ PKG_CHECK_MODULES([NCURSES], [ncurses], [AC_DEFINE([HAVE_LIBNCURSES], [1], [Define to 1 if you have the `ncurses' library (-lncurses).])]) - ]) --fi -- -- -- --if [ test $CURSES_CHECKED != "1" ]; then --AC_CHECK_LIB([curses],[initscr,timeout],,[ -- AC_CHECK_LIB([ncurses],[newterm,timeout]) --]) --fi - - AC_CHECK_FUNCS([wattron]) - AC_CHECK_FUNCS([curs_set]) ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -2,12 +2,10 @@ - - bin_PROGRAMS = bwm-ng - --bwm_ng_SOURCES = bwm-ng.c process.c output.c options.c help.c curses_tools.c -+bwm_ng_SOURCES = bwm-ng.c process.c output.c options.c help.c curses_tools.c input/retrieve.c input/devstat.c input/libkstat.c input/netstat.c input/proc_net_dev.c input/sysctl.c input/ioservice.c input/libstatgrab.c input/proc_diskstats.c input/win32.c input/getifaddrs.c - --EXTRA_bwm_ng_SOURCES = input/retrieve.c input/devstat.c input/libkstat.c input/netstat.c input/proc_net_dev.c input/sysctl.c input/ioservice.c input/libstatgrab.c input/proc_diskstats.c input/win32.c input/getifaddrs.c -- --bwm_ng_LDADD = retrieve.$(OBJEXT) $(INPUT_SYSTEM) --bwm_ng_DEPENDENCIES = retrieve.$(OBJEXT) $(INPUT_SYSTEM) -+bwm_ng_CPPFLAGS = @NCURSES_CFLAGS@ -+bwm_ng_LDADD = @NCURSES_LIBS@ - - noinst_HEADERS = bwm-ng.h process.h output.h options.h help.h curses_tools.h types.h defines.h global_vars.h input/devstat.h input/libkstat.h input/netstat.h input/proc_net_dev.h input/sysctl.h input/ioservice.h input/libstatgrab.h input/proc_diskstats.h input/retrieve.h input/win32.h input/getifaddrs.h - ---- a/src/defines.h -+++ b/src/defines.h -@@ -48,7 +48,7 @@ - #define LIBSTATGRAB - #endif - --#if HAVE_LIBCURSES || HAVE_LIBNCURSES -+#if defined(HAVE_LIBCURSES) || defined(HAVE_LIBNCURSES) - #define HAVE_CURSES - #endif - diff --git a/net-analyzer/bwm-ng/files/bwm-ng-0.6.1-static-inline.patch b/net-analyzer/bwm-ng/files/bwm-ng-0.6.1-static-inline.patch deleted file mode 100644 index 88e15ecefe3f..000000000000 --- a/net-analyzer/bwm-ng/files/bwm-ng-0.6.1-static-inline.patch +++ /dev/null @@ -1,256 +0,0 @@ -Make all 'inline' functions 'static inline' such that -the compiler can emit definitions when needed. -http://www.greenend.org.uk/rjk/tech/inline.html - ---- a/src/bwm-ng.c -+++ b/src/bwm-ng.c -@@ -26,7 +26,7 @@ - - /* handle interrupt signal */ - void sigint(int sig) FUNCATTR_NORETURN; --inline void init(void); -+static inline void init(void); - - /* clear stuff and exit */ - #ifdef __STDC__ -@@ -98,7 +98,7 @@ - deinit(0, NULL); - } - --inline void init(void) { -+static inline void init(void) { - if_count=0; - delay=500; - #if EXTENDED_STATS ---- a/src/help.c -+++ b/src/help.c -@@ -24,9 +24,9 @@ - #include "global_vars.h" - #include "help.h" - --inline void print_help_line(const char *short_c,const char * long_c,const char *descr); -+static inline void print_help_line(const char *short_c,const char * long_c,const char *descr); - --inline void print_help_line(const char *short_c,const char * long_c,const char *descr) { -+static inline void print_help_line(const char *short_c,const char * long_c,const char *descr) { - #ifdef LONG_OPTIONS - printf(" %-23s",long_c); - #else ---- a/src/options.c -+++ b/src/options.c -@@ -30,12 +30,12 @@ - char *trim_whitespace(char *str); - int read_config(const char *config_file); - #endif --inline int str2output_unit(char *optarg); -+static inline int str2output_unit(char *optarg); - #if EXTENDED_STATS --inline int str2output_type(char *optarg); -+static inline int str2output_type(char *optarg); - #endif --inline int str2out_method(char *optarg); --inline int str2in_method(char *optarg); -+static inline int str2out_method(char *optarg); -+static inline int str2in_method(char *optarg); - - #ifdef CONFIG_FILE - /****************************************************************************** -@@ -65,7 +65,7 @@ - /******************************************************************************/ - #endif - --inline int str2output_unit(char *optarg) { -+static inline int str2output_unit(char *optarg) { - if (optarg) { - if (!strcasecmp(optarg,"bytes")) return BYTES_OUT; - if (!strcasecmp(optarg,"bits")) return BITS_OUT; -@@ -76,7 +76,7 @@ - } - - #if EXTENDED_STATS --inline int str2output_type(char *optarg) { -+static inline int str2output_type(char *optarg) { - if (optarg) { - if (!strcasecmp(optarg,"rate")) return RATE_OUT; - if (!strcasecmp(optarg,"max")) return MAX_OUT; -@@ -87,7 +87,7 @@ - } - #endif - --inline int str2out_method(char *optarg) { -+static inline int str2out_method(char *optarg) { - if (optarg) { - if (!strcasecmp(optarg,"plain")) return PLAIN_OUT; - #ifdef HAVE_CURSES -@@ -109,7 +109,7 @@ - } - - --inline int str2in_method(char *optarg) { -+static inline int str2in_method(char *optarg) { - if (optarg) { - #ifdef PROC_NET_DEV - if (!strcasecmp(optarg,"proc")) return PROC_IN; ---- a/src/output.c -+++ b/src/output.c -@@ -25,13 +25,13 @@ - #include "output.h" - - inline static const char *output_type2str(void); --inline const char *input2str(void); --inline const char *show_all_if2str(void); --inline ullong direction2value(char mode,struct inout_long stats); -+static inline const char *input2str(void); -+static inline const char *show_all_if2str(void); -+static inline ullong direction2value(char mode,struct inout_long stats); - #if EXTENDED_STATS --inline double direction_max2value(char mode,struct inouttotal_double stats,int items); -+static inline double direction_max2value(char mode,struct inouttotal_double stats,int items); - #endif --inline char *dyn_byte_value2str(double value,char *str,int buf_size); -+static inline char *dyn_byte_value2str(double value,char *str,int buf_size); - char *values2str(char mode,t_iface_speed_stats stats,t_iface_stats full_stats,float multiplier,char *str,int buf_size); - - inline static const char *output_type2str(void) { -@@ -59,7 +59,7 @@ - } - - --inline const char *input2str(void) { -+static inline const char *input2str(void) { - switch (input_method) { - #ifdef SYSCTL - case SYSCTL_IN: -@@ -121,7 +121,7 @@ - return ""; - } - --inline const char *show_all_if2str(void) { -+static inline const char *show_all_if2str(void) { - switch (show_all_if) { - case 1: - return " (all)"; -@@ -262,7 +262,7 @@ - } - - --inline ullong direction2value(char mode,struct inout_long stats) { -+static inline ullong direction2value(char mode,struct inout_long stats) { - switch (mode) { - case 0: - return stats.in; -@@ -275,7 +275,7 @@ - } - - #if EXTENDED_STATS --inline double direction_max2value(char mode,struct inouttotal_double stats,int items) { -+static inline double direction_max2value(char mode,struct inouttotal_double stats,int items) { - switch (mode) { - case 0: - return (double)(stats.in/items); -@@ -288,7 +288,7 @@ - } - #endif - --inline char *dyn_byte_value2str(double value,char *str,int buf_size) { -+static inline char *dyn_byte_value2str(double value,char *str,int buf_size) { - if (dynamic) { - if (value<1024) - snprintf(str,buf_size,"%15.2f ",value); -@@ -306,7 +306,7 @@ - return str; - } - --inline char *dyn_bit_value2str(double value,char *str,int buf_size) { -+static inline char *dyn_bit_value2str(double value,char *str,int buf_size) { - if (dynamic) { - if (value<1000) - snprintf(str,buf_size,"%15.2f ",value); ---- a/src/process.c -+++ b/src/process.c -@@ -26,19 +26,19 @@ - - short show_iface(char *instr, char *searchstr,char iface_is_up); - #if HAVE_GETTIMEOFDAY --inline long tvdiff(struct timeval newer, struct timeval older); -+static inline long tvdiff(struct timeval newer, struct timeval older); - float get_time_delay(int iface_num); - #endif --inline ullong calc_new_values(ullong new, ullong old); -+static inline ullong calc_new_values(ullong new, ullong old); - t_iface_speed_stats convert2calced_values(t_iface_speed_stats new, t_iface_speed_stats old); - t_iface_speed_stats convert2calced_disk_values(t_iface_speed_stats new, t_iface_speed_stats old); - #if EXTENDED_STATS --inline void sub_avg_values(struct inouttotal_double *values,struct inouttotal_double data); --inline void add_avg_values(struct inouttotal_double *values,struct inouttotal_double data); --inline void save_avg_values(struct inouttotal_double *values,struct inouttotal_double *data,struct inout_long calced_stats,float multiplier); -+static inline void sub_avg_values(struct inouttotal_double *values,struct inouttotal_double data); -+static inline void add_avg_values(struct inouttotal_double *values,struct inouttotal_double data); -+static inline void save_avg_values(struct inouttotal_double *values,struct inouttotal_double *data,struct inout_long calced_stats,float multiplier); - void save_avg(struct t_avg *avg,struct iface_speed_stats calced_stats,float multiplier); --inline void save_sum(struct inout_long *stats,struct inout_long new_stats_values); --inline void save_max(struct inouttotal_double *stats,struct inout_long calced_stats,float multiplier); -+static inline void save_sum(struct inout_long *stats,struct inout_long new_stats_values); -+static inline void save_max(struct inouttotal_double *stats,struct inout_long calced_stats,float multiplier); - #endif - - /* returns the whether to show the iface or not -@@ -74,7 +74,7 @@ - - #if HAVE_GETTIMEOFDAY - /* Returns: the time difference in milliseconds. */ --inline long tvdiff(struct timeval newer, struct timeval older) { -+static inline long tvdiff(struct timeval newer, struct timeval older) { - return labs((newer.tv_sec-older.tv_sec)*1000+ - (newer.tv_usec-older.tv_usec)/1000); - } -@@ -92,7 +92,7 @@ - #endif - - /* basically new-old, but handles "overflow" of source aswell */ --inline ullong calc_new_values(ullong new, ullong old) { -+static inline ullong calc_new_values(ullong new, ullong old) { - /* FIXME: WRAP_AROUND _might_ be wrong for libstatgrab, where the type is always long long */ - return (new>=old) ? (ullong)(new-old) : (ullong)(( - #ifdef HAVE_LIBKSTAT -@@ -133,13 +133,13 @@ - - #if EXTENDED_STATS - /* sub old values from cached for avg stats */ --inline void sub_avg_values(struct inouttotal_double *values,struct inouttotal_double data) { -+static inline void sub_avg_values(struct inouttotal_double *values,struct inouttotal_double data) { - values->in-=data.in; - values->out-=data.out; - values->total-=data.total; - } - --inline void add_avg_values(struct inouttotal_double *values,struct inouttotal_double data) { -+static inline void add_avg_values(struct inouttotal_double *values,struct inouttotal_double data) { - values->in+=data.in; - values->out+=data.out; - values->total+=data.total; -@@ -148,7 +148,7 @@ - - /* put new-old bytes in inout_long struct into a inouttotal_double struct - * and add values to cached .value struct */ --inline void save_avg_values(struct inouttotal_double *values,struct inouttotal_double *data,struct inout_long calced_stats,float multiplier) { -+static inline void save_avg_values(struct inouttotal_double *values,struct inouttotal_double *data,struct inout_long calced_stats,float multiplier) { - data->in=calced_stats.in*multiplier; - data->out=calced_stats.out*multiplier; - data->total=(calced_stats.in+calced_stats.out)*multiplier; -@@ -198,13 +198,13 @@ - } - - /* add current in and out bytes to totals struct */ --inline void save_sum(struct inout_long *stats,struct inout_long new_stats_values) { -+static inline void save_sum(struct inout_long *stats,struct inout_long new_stats_values) { - stats->in+=new_stats_values.in; - stats->out+=new_stats_values.out; - } - - /* lookup old max values and save new if higher */ --inline void save_max(struct inouttotal_double *stats,struct inout_long calced_stats,float multiplier) { -+static inline void save_max(struct inouttotal_double *stats,struct inout_long calced_stats,float multiplier) { - if (multiplier*calced_stats.in > stats->in) - stats->in=multiplier*calced_stats.in; - if (multiplier*calced_stats.out>stats->out) diff --git a/net-analyzer/bwm-ng/metadata.xml b/net-analyzer/bwm-ng/metadata.xml index 7d30b17df0f1..d2b0d3760b1b 100644 --- a/net-analyzer/bwm-ng/metadata.xml +++ b/net-analyzer/bwm-ng/metadata.xml @@ -1,12 +1,15 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!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> -<use> -<flag name="csv">Enable csv output</flag> -<flag name="html">Enable html output</flag> -</use> + <maintainer type="project"> + <email>netmon@gentoo.org</email> + <name>Gentoo network monitoring and analysis project</name> + </maintainer> + <use> + <flag name="csv">Enable csv output</flag> + <flag name="html">Enable html output</flag> + </use> + <upstream> + <remote-id type="github">vgropp/bwm-ng</remote-id> + </upstream> </pkgmetadata> diff --git a/net-analyzer/bwmon/bwmon-1.3-r2.ebuild b/net-analyzer/bwmon/bwmon-1.3-r2.ebuild index 56fb924c673c..af95094201d5 100644 --- a/net-analyzer/bwmon/bwmon-1.3-r2.ebuild +++ b/net-analyzer/bwmon/bwmon-1.3-r2.ebuild @@ -1,30 +1,28 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 -inherit eutils toolchain-funcs +EAPI=7 + +inherit toolchain-funcs DESCRIPTION="Simple ncurses bandwidth monitor" -HOMEPAGE="http://bwmon.sourceforge.net/" +HOMEPAGE="https://bwmon.sourceforge.net/" SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" +BDEPEND="virtual/pkgconfig" RDEPEND="sys-libs/ncurses" -DEPEND=" - ${RDEPEND} - virtual/pkgconfig -" +DEPEND="${RDEPEND}" SLOT="0" LICENSE="GPL-2 public-domain" KEYWORDS="amd64 ~hppa ppc sparc x86" -src_prepare() { - epatch \ - "${FILESDIR}"/${P}-build.patch \ - "${FILESDIR}"/${P}-typo-fix.patch \ - "${FILESDIR}"/${P}-overflow.patch \ +PATCHES=( + "${FILESDIR}"/${P}-build.patch + "${FILESDIR}"/${P}-typo-fix.patch + "${FILESDIR}"/${P}-overflow.patch "${FILESDIR}"/${P}-tinfo.patch -} +) src_compile() { emake -C src CC="$(tc-getCC)" PKG_CONFIG="$(tc-getPKG_CONFIG)" diff --git a/net-analyzer/bwmon/metadata.xml b/net-analyzer/bwmon/metadata.xml index 731e2cf5c5c6..b9c34036ee8f 100644 --- a/net-analyzer/bwmon/metadata.xml +++ b/net-analyzer/bwmon/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>netmon@gentoo.org</email> diff --git a/net-analyzer/bwping/Manifest b/net-analyzer/bwping/Manifest index 0713b67fc618..e0f5b0fe3dae 100644 --- a/net-analyzer/bwping/Manifest +++ b/net-analyzer/bwping/Manifest @@ -1,2 +1 @@ -DIST bwping-2.1.tar.gz 110702 BLAKE2B 3bbd5f7b57e3afa29aaf7015609fe472457713651e1d1532ad1cdcbf5b39d4c556bb6d3e675ddb8fd97ef289942fe11e5334f04ef46f489fde2785cbd80f3a3e SHA512 bf2a17e7b5d073f462b5090591550347e65c2748b3460f0126bc4dc78c930237cece3e67957d4c73161ce58107856187c24d401dda3f13b40b97bc01b2cfa1df -DIST bwping-2.2.tar.gz 119688 BLAKE2B e30afc404f73aeff28e2775349eed9e6a113a7c0ef33798de9dc983f2ecb08ea1dc0838067aa83bd83e513fa9640bf38fd04a924c382bf770779892dcc39f8ab SHA512 4c0338359fce039357d763a0bdb8ea133a8c63f0e7eb2cbdc294454cad97b6e9010bf8898948aa2572418e4ae667d25dd54475a162f029c052b9611795ff4230 +DIST bwping-2.5.tar.gz 113076 BLAKE2B c2a01b1d1d9fb83c2f0e40e2b1967d0e1e5a939d912372637558aa84cea0bca08f080cc8d980906d346ca44b39b7f37b54b0d6e18f834928bd59ddd056af43ac SHA512 2c271215476c8f1e0758aaae0e1730c526a326eeb3c7ffac3d8fac5783dbbe84d97fbb6732bfa7199ea8e4caf81a8dc9bd54ee36b63ece46dd2286880c734371 diff --git a/net-analyzer/bwping/bwping-2.1.ebuild b/net-analyzer/bwping/bwping-2.1.ebuild deleted file mode 100644 index 4743efcd1e43..000000000000 --- a/net-analyzer/bwping/bwping-2.1.ebuild +++ /dev/null @@ -1,16 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DESCRIPTION="A tool to measure bandwidth and RTT between two hosts using ICMP" -HOMEPAGE="https://bwping.sourceforge.io/" -SRC_URI="mirror://sourceforge/${PN}/${PV}/${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="amd64 ~sparc x86" - -src_test() { - [[ ${UID} = 0 ]] && default -} diff --git a/net-analyzer/bwping/bwping-2.2.ebuild b/net-analyzer/bwping/bwping-2.2.ebuild deleted file mode 100644 index 34866c961db0..000000000000 --- a/net-analyzer/bwping/bwping-2.2.ebuild +++ /dev/null @@ -1,17 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DESCRIPTION="A tool to measure bandwidth and RTT between two hosts using ICMP" -HOMEPAGE="https://bwping.sourceforge.io/" -SRC_URI="https://github.com/oleg-derevenetz/bwping/archive/RELEASE_${PV}.tar.gz -> ${P}.tar.gz" -S="${WORKDIR}/${PN}-RELEASE_${PV}" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~sparc ~x86" - -src_test() { - [[ ${UID} = 0 ]] && default -} diff --git a/net-analyzer/bwping/bwping-2.5.ebuild b/net-analyzer/bwping/bwping-2.5.ebuild new file mode 100644 index 000000000000..bb17cbaa8b50 --- /dev/null +++ b/net-analyzer/bwping/bwping-2.5.ebuild @@ -0,0 +1,16 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DESCRIPTION="A tool to measure bandwidth and RTT between two hosts using ICMP" +HOMEPAGE="https://bwping.sourceforge.io/" +SRC_URI="https://github.com/oleg-derevenetz/bwping/releases/download/RELEASE_${PV}/${P}.tar.gz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="amd64 ~sparc x86" + +src_test() { + [[ ${UID} = 0 ]] && default +} diff --git a/net-analyzer/bwping/metadata.xml b/net-analyzer/bwping/metadata.xml index 529ddfb22ddd..616d3d5f37bd 100644 --- a/net-analyzer/bwping/metadata.xml +++ b/net-analyzer/bwping/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>netmon@gentoo.org</email> diff --git a/net-analyzer/cacti-spine/Manifest b/net-analyzer/cacti-spine/Manifest index 9f8ae426ed58..8686e9b07669 100644 --- a/net-analyzer/cacti-spine/Manifest +++ b/net-analyzer/cacti-spine/Manifest @@ -1,3 +1 @@ -DIST cacti-spine-1.2.13.tar.gz 107543 BLAKE2B e0de75688334d27604a76c00a09ac53587a1e57f45df925e30a1a88a5e0449df803dfad901328c65b55484bc9022bf81d53880f17d4bd4efd9214315f01f7e92 SHA512 86d44195847c7b3acb1f6aed2bd6a57f562645b20724560d6b4bf7962707be4eb2f5326731453937b64420b5d51b714aecbd8dbea58d95f29ef4341515df8b00 -DIST cacti-spine-1.2.14.tar.gz 107577 BLAKE2B 5865d93ffefeeafac1d2245000467deac79f8008e81b66de310bf08e7aa31f17299a82fc107ad49c3741bc2f183bdbc9554f814bf9e3e4b1dc85e267e4f16112 SHA512 44dec1077b419dfc987a1d423f2df597bf2026ca7f39aaafabfc7de9e6fdc616f505b86ace43bb2ad628f220cf8d8cf136a04f00c4fd23ab73da75068f804999 -DIST cacti-spine-1.2.16.tar.gz 108252 BLAKE2B ba0349cff7f4e82a5dc1d90c216cf7a4e0f939e28ab20d008b1725c948a85a00e2594f8997c8bbd69c305e3e58d944858c8439210956f45220b67229bc6df13d SHA512 0259084d70f9c8d20a8b19daf61e525228f99fba3eac4e2e5c9865114a5f1231b18389ca955fc4644c71c6c48cc45dda9b17e969a02c80552b84f98ad8945951 +DIST cacti-spine-1.2.20.tar.gz 115258 BLAKE2B 78a9ed8a9e7e69e98bfa9971134dd6f34f540a93b0b1a2aababb66781f3c9787712d57d86b81d7f409487c4cc4447d4f84bd7292890b7eb70ec4137d97248793 SHA512 d7e129f7b42542d7ecc78d55cebc6d9ce481834342d3f3da1fce5538d8e42bc194a825795053d5e3a065b54574e2a3b9413725f1bc0562e55f1db213f9a94d0c diff --git a/net-analyzer/cacti-spine/cacti-spine-1.2.13.ebuild b/net-analyzer/cacti-spine/cacti-spine-1.2.13.ebuild deleted file mode 100644 index c78a19983352..000000000000 --- a/net-analyzer/cacti-spine/cacti-spine-1.2.13.ebuild +++ /dev/null @@ -1,51 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit autotools - -MY_P=${PN}-${PV/_p/-} - -DESCRIPTION="Spine is a fast poller for Cacti (formerly known as Cactid)" -HOMEPAGE="https://cacti.net/spine_info.php" -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" -IUSE="libressl" - -CDEPEND=" - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) - net-analyzer/net-snmp:= - dev-db/mysql-connector-c:0= -" -DEPEND=" - ${CDEPEND} - sys-apps/help2man -" -RDEPEND=" - ${CDEPEND} - >net-analyzer/cacti-0.8.8 -" -PATCHES=( - "${FILESDIR}"/${PN}-0.8.8g-net-snmp.patch -) - -src_prepare() { - default - - eautoreconf -} - -src_install() { - dosbin spine - - insinto /etc/ - insopts -m0640 -o root - newins spine.conf{.dist,} - - doman spine.1 - dodoc CHANGELOG -} diff --git a/net-analyzer/cacti-spine/cacti-spine-1.2.14.ebuild b/net-analyzer/cacti-spine/cacti-spine-1.2.14.ebuild deleted file mode 100644 index a5c1da23c064..000000000000 --- a/net-analyzer/cacti-spine/cacti-spine-1.2.14.ebuild +++ /dev/null @@ -1,51 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit autotools - -MY_P=${PN}-${PV/_p/-} - -DESCRIPTION="Spine is a fast poller for Cacti (formerly known as Cactid)" -HOMEPAGE="https://cacti.net/spine_info.php" -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" -IUSE="libressl" - -CDEPEND=" - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) - net-analyzer/net-snmp:= - dev-db/mysql-connector-c:0= -" -DEPEND=" - ${CDEPEND} - sys-apps/help2man -" -RDEPEND=" - ${CDEPEND} - >net-analyzer/cacti-0.8.8 -" -PATCHES=( - "${FILESDIR}"/${PN}-0.8.8g-net-snmp.patch -) - -src_prepare() { - default - - eautoreconf -} - -src_install() { - dosbin spine - - insinto /etc/ - insopts -m0640 -o root - newins spine.conf{.dist,} - - doman spine.1 - dodoc CHANGELOG -} diff --git a/net-analyzer/cacti-spine/cacti-spine-1.2.16.ebuild b/net-analyzer/cacti-spine/cacti-spine-1.2.16.ebuild deleted file mode 100644 index 86a76185c475..000000000000 --- a/net-analyzer/cacti-spine/cacti-spine-1.2.16.ebuild +++ /dev/null @@ -1,49 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools - -MY_P=${PN}-${PV/_p/-} - -DESCRIPTION="Spine is a fast poller for Cacti (formerly known as Cactid)" -HOMEPAGE="https://cacti.net/spine_info.php" -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" -IUSE="libressl" - -BDEPEND="sys-apps/help2man" -DEPEND=" - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) - net-analyzer/net-snmp:= - dev-db/mysql-connector-c:0= -" -RDEPEND=" - ${DEPEND} - >net-analyzer/cacti-0.8.8 -" - -PATCHES=( - "${FILESDIR}"/${PN}-0.8.8g-net-snmp.patch -) - -src_prepare() { - default - eautoreconf -} - -src_install() { - dosbin spine - - insinto /etc/ - insopts -m0640 -o root - newins spine.conf{.dist,} - - doman spine.1 - dodoc CHANGELOG -} diff --git a/net-analyzer/cacti-spine/cacti-spine-1.2.20.ebuild b/net-analyzer/cacti-spine/cacti-spine-1.2.20.ebuild new file mode 100644 index 000000000000..8cadbd1d2cb0 --- /dev/null +++ b/net-analyzer/cacti-spine/cacti-spine-1.2.20.ebuild @@ -0,0 +1,45 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools + +MY_P=${PN}-${PV/_p/-} + +DESCRIPTION="Spine is a fast poller for Cacti (formerly known as Cactid)" +HOMEPAGE="https://cacti.net/spine_info.php" +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" + +DEPEND="dev-db/mysql-connector-c:= + dev-libs/openssl:= + net-analyzer/net-snmp:=" +RDEPEND="${DEPEND} + >net-analyzer/cacti-0.8.8" +BDEPEND="sys-apps/help2man" + +src_prepare() { + default + + eautoreconf +} + +src_configure() { + # Drop CONFIG_SHELL after 1.2.x (fix is on develop branch) + CONFIG_SHELL="${BROOT}"/bin/bash econf +} + +src_install() { + dosbin spine + + insinto /etc/ + insopts -m0640 -o root + newins spine.conf{.dist,} + + doman spine.1 + dodoc CHANGELOG +} diff --git a/net-analyzer/cacti-spine/cacti-spine-9999.ebuild b/net-analyzer/cacti-spine/cacti-spine-9999.ebuild new file mode 100644 index 000000000000..cfc27aa3907f --- /dev/null +++ b/net-analyzer/cacti-spine/cacti-spine-9999.ebuild @@ -0,0 +1,43 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools git-r3 + +MY_P=${PN}-${PV/_p/-} + +DESCRIPTION="Spine is a fast poller for Cacti (formerly known as Cactid)" +HOMEPAGE="https://cacti.net/spine_info.php" +EGIT_REPO_URI="https://github.com/Cacti/spine" + +LICENSE="LGPL-2.1" +SLOT="0" + +BDEPEND="sys-apps/help2man" +DEPEND="dev-libs/openssl:= + net-analyzer/net-snmp:= + dev-db/mysql-connector-c:0=" +RDEPEND="${DEPEND} + >net-analyzer/cacti-0.8.8" + +PATCHES=( + "${FILESDIR}"/${PN}-0.8.8g-net-snmp.patch +) + +src_prepare() { + default + + eautoreconf +} + +src_install() { + dosbin spine + + insinto /etc/ + insopts -m0640 -o root + newins spine.conf{.dist,} + + doman spine.1 + dodoc CHANGELOG +} diff --git a/net-analyzer/cacti-spine/cacti-spine-99999.ebuild b/net-analyzer/cacti-spine/cacti-spine-99999.ebuild deleted file mode 100644 index 1367debdc14e..000000000000 --- a/net-analyzer/cacti-spine/cacti-spine-99999.ebuild +++ /dev/null @@ -1,49 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools git-r3 - -MY_P=${PN}-${PV/_p/-} - -DESCRIPTION="Spine is a fast poller for Cacti (formerly known as Cactid)" -HOMEPAGE="https://cacti.net/spine_info.php" -EGIT_REPO_URI="https://github.com/Cacti/spine" - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="" -IUSE="libressl" - -BDEPEND="sys-apps/help2man" -DEPEND=" - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) - net-analyzer/net-snmp:= - dev-db/mysql-connector-c:0= -" -RDEPEND=" - ${DEPEND} - >net-analyzer/cacti-0.8.8 -" - -PATCHES=( - "${FILESDIR}"/${PN}-0.8.8g-net-snmp.patch -) - -src_prepare() { - default - eautoreconf -} - -src_install() { - dosbin spine - - insinto /etc/ - insopts -m0640 -o root - newins spine.conf{.dist,} - - doman spine.1 - dodoc CHANGELOG -} diff --git a/net-analyzer/cacti-spine/metadata.xml b/net-analyzer/cacti-spine/metadata.xml index 4a1f31008219..f994f3ce9b55 100644 --- a/net-analyzer/cacti-spine/metadata.xml +++ b/net-analyzer/cacti-spine/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>netmon@gentoo.org</email> diff --git a/net-analyzer/cacti/Manifest b/net-analyzer/cacti/Manifest index ef0ed74ed512..89938bf84fc4 100644 --- a/net-analyzer/cacti/Manifest +++ b/net-analyzer/cacti/Manifest @@ -1,2 +1 @@ -DIST cacti-1.2.14.tar.gz 25182521 BLAKE2B 555c30ebd06ac71df608a1564892ecd176cf46fa079fd3615dc59fd984bc8bedd4512d971dc3c2731848107da728724ef459d84f0308bef8b0b6ab943b8bc3cf SHA512 734d8e059ea47630072269d92ad79e773268c5dd1cd9c565d23c41b2a74c8892bdc5190f7de6bb9ed281a67ade9c8ef6d723a9d4f486a4ba9aca99182d6ad056 -DIST cacti-1.2.16.tar.gz 29197220 BLAKE2B 19939d0ff79c895b481aeb7ffec8331d8b9c10a6b7e0dbda6532e06ef0322f21cf02f4bf53a9522e1f672dd04b343f5550e2f34f08b3af2050e1f72465cffc43 SHA512 fe22acf4dea8ab6ec79825d66a84ad4c43fdce2815e7327536d182bc04400ed7b1d268209bbbca8b307c4779ee5bf7369a617ec1f052d8805757c2ca9b30cc35 +DIST cacti-1.2.21.tar.gz 40798454 BLAKE2B 86eae6743c07e45b4b06202cca072a385f45d2021159f0f5160a8c2a8eb8f3a2f9db63512515602d1c3eb6be4b53f5755c20d6da2194ff445c133a2bcdb33e27 SHA512 084ff9135dd0a92596a4d65f2fd461c8e84907ff87e467f6d144ee3b52ef7aeb44ffa5a8c25e74e5ff25588bc6c5b13b44ab2f24ef5e1c6652513b5c2a39f78d diff --git a/net-analyzer/cacti/cacti-1.2.14.ebuild b/net-analyzer/cacti/cacti-1.2.14.ebuild deleted file mode 100644 index 2ec9213257a6..000000000000 --- a/net-analyzer/cacti/cacti-1.2.14.ebuild +++ /dev/null @@ -1,48 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit eutils 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 ~ppc ~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 . "${D}"${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/cacti/cacti-1.2.16-r1.ebuild b/net-analyzer/cacti/cacti-1.2.16-r1.ebuild deleted file mode 100644 index 78185ebd73d0..000000000000 --- a/net-analyzer/cacti/cacti-1.2.16-r1.ebuild +++ /dev/null @@ -1,54 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -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 ~ppc ~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 ) -" - -PATCHES=( - "${FILESDIR}/${P}-CVE-2020-35701.patch" - "${FILESDIR}/${P}-XSS-issue-4019.patch" -) - -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/cacti/cacti-1.2.16.ebuild b/net-analyzer/cacti/cacti-1.2.16.ebuild deleted file mode 100644 index 1dfa8747632d..000000000000 --- a/net-analyzer/cacti/cacti-1.2.16.ebuild +++ /dev/null @@ -1,49 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -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 ~ppc ~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/cacti/cacti-1.2.21.ebuild b/net-analyzer/cacti/cacti-1.2.21.ebuild new file mode 100644 index 000000000000..8b3907868f76 --- /dev/null +++ b/net-analyzer/cacti/cacti-1.2.21.ebuild @@ -0,0 +1,49 @@ +# Copyright 1999-2022 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 ~ppc ~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/cacti/files/cacti-1.2.16-CVE-2020-35701.patch b/net-analyzer/cacti/files/cacti-1.2.16-CVE-2020-35701.patch deleted file mode 100644 index f55b7b0a40df..000000000000 --- a/net-analyzer/cacti/files/cacti-1.2.16-CVE-2020-35701.patch +++ /dev/null @@ -1,29 +0,0 @@ -https://bugs.gentoo.org/765019 -https://github.com/Cacti/cacti/commit/565e0604a53f4988dc5b544d01f4a631eaa80d82 - -From 565e0604a53f4988dc5b544d01f4a631eaa80d82 Mon Sep 17 00:00:00 2001 -From: TheWitness <thewitness@cacti.net> -Date: Thu, 24 Dec 2020 10:39:50 -0500 -Subject: [PATCH] Fixing Issue #4022 - -SQL Injection in data_debug.php ---- a/data_debug.php -+++ b/data_debug.php -@@ -35,6 +35,8 @@ - - set_default_action(); - -+validate_request_vars(); -+ - switch (get_request_var('action')) { - case 'actions': - form_actions(); -@@ -123,8 +125,6 @@ - - break; - default: -- validate_request_vars(); -- - $refresh = array( - 'seconds' => get_request_var('refresh'), - 'page' => 'data_debug.php?header=false', diff --git a/net-analyzer/cacti/files/cacti-1.2.16-XSS-issue-4019.patch b/net-analyzer/cacti/files/cacti-1.2.16-XSS-issue-4019.patch deleted file mode 100644 index 1f09e572c860..000000000000 --- a/net-analyzer/cacti/files/cacti-1.2.16-XSS-issue-4019.patch +++ /dev/null @@ -1,360 +0,0 @@ -https://github.com/Cacti/cacti/issues/4019 - -From ef10fe1c340ed932dc18b6a566b21f9dd15933c2 Mon Sep 17 00:00:00 2001 -From: TheWitness <thewitness@cacti.net> -Date: Wed, 23 Dec 2020 16:33:27 -0500 -Subject: [PATCH] Fixing Issue #4019 - -* In a recent audit of core Cacti code, there were a few stored XSS issues that can be exposed -* Also removed a few spurious title_trims, that should no longer be a problem. ---- a/automation_devices.php -+++ b/automation_devices.php -@@ -485,7 +485,7 @@ function draw_filter() { - <?php - if (cacti_sizeof($networks)) { - foreach ($networks as $key => $name) { -- print "<option value='" . $key . "'"; if (get_request_var('network') == $key) { print ' selected'; } print '>' . $name . "</option>"; -+ print "<option value='" . html_escape($key) . "'"; if (get_request_var('network') == $key) { print ' selected'; } print '>' . html_escape($name) . "</option>"; - } - } - ?> -@@ -515,7 +515,7 @@ function draw_filter() { - <?php - if (cacti_sizeof($status_arr)) { - foreach ($status_arr as $st) { -- print "<option value='" . $st . "'"; if (get_request_var('status') == $st) { print ' selected'; } print '>' . $st . "</option>"; -+ print "<option value='" . html_escape($st) . "'"; if (get_request_var('status') == $st) { print ' selected'; } print '>' . html_escape($st) . "</option>"; - } - } - ?> -@@ -530,7 +530,7 @@ function draw_filter() { - <?php - if (cacti_sizeof($os_arr)) { - foreach ($os_arr as $st) { -- print "<option value='" . $st . "'"; if (get_request_var('os') == $st) { print ' selected'; } print '>' . $st . "</option>"; -+ print "<option value='" . html_escape($st) . "'"; if (get_request_var('os') == $st) { print ' selected'; } print '>' . html_escape($st) . "</option>"; - } - } - ?> -@@ -545,7 +545,7 @@ function draw_filter() { - <?php - if (cacti_sizeof($status_arr)) { - foreach ($status_arr as $st) { -- print "<option value='" . $st . "'"; if (get_request_var('snmp') == $st) { print ' selected'; } print '>' . $st . "</option>"; -+ print "<option value='" . html_escape($st) . "'"; if (get_request_var('snmp') == $st) { print ' selected'; } print '>' . html_escape($st) . "</option>"; - } - } - ?> -@@ -560,7 +560,7 @@ function draw_filter() { - <?php - if (cacti_sizeof($item_rows) > 0) { - foreach ($item_rows as $key => $value) { -- print "<option value='" . $key . "'"; if (get_request_var('rows') == $key) { print ' selected'; } print '>' . $value . "</option>"; -+ print "<option value='" . $key . "'"; if (get_request_var('rows') == $key) { print ' selected'; } print '>' . html_escape($value) . "</option>"; - } - } - ?> ---- a/data_debug.php -+++ b/data_debug.php -@@ -969,7 +969,7 @@ function data_debug_filter() { - - if (cacti_sizeof($templates) > 0) { - foreach ($templates as $template) { -- print "<option value='" . $template['id'] . "'"; if (get_request_var('template_id') == $template['id']) { print ' selected'; } print '>' . title_trim(html_escape($template['name']), 40) . "</option>"; -+ print "<option value='" . $template['id'] . "'"; if (get_request_var('template_id') == $template['id']) { print ' selected'; } print '>' . html_escape($template['name']) . '</option>'; - } - } - ?> -@@ -997,7 +997,7 @@ function data_debug_filter() { - $profiles = array_rekey(db_fetch_assoc('SELECT id, name FROM data_source_profiles ORDER BY name'), 'id', 'name'); - if (cacti_sizeof($profiles)) { - foreach ($profiles as $key => $value) { -- print "<option value='" . $key . "'"; if (get_request_var('profile') == $key) { print ' selected'; } print '>' . html_escape($value) . "</option>"; -+ print "<option value='" . $key . "'"; if (get_request_var('profile') == $key) { print ' selected'; } print '>' . html_escape($value) . '</option>'; - } - } - ?> -@@ -1063,7 +1063,7 @@ function data_debug_filter() { - <?php - if (cacti_sizeof($item_rows) > 0) { - foreach ($item_rows as $key => $value) { -- print "<option value='" . $key . "'"; if (get_request_var('rows') == $key) { print ' selected'; } print '>' . html_escape($value) . "</option>"; -+ print "<option value='" . $key . "'"; if (get_request_var('rows') == $key) { print ' selected'; } print '>' . html_escape($value) . '</option>'; - } - } - ?> ---- a/data_sources.php -+++ b/data_sources.php -@@ -1361,7 +1361,7 @@ function clearFilter() { - - if (cacti_sizeof($templates)) { - foreach ($templates as $template) { -- print "<option value='" . $template['id'] . "'"; if (get_request_var('template_id') == $template['id']) { print ' selected'; } print '>' . title_trim(html_escape($template['name']), 40) . '</option>'; -+ print "<option value='" . $template['id'] . "'"; if (get_request_var('template_id') == $template['id']) { print ' selected'; } print '>' . html_escape($template['name']) . '</option>'; - } - } - ?> ---- a/lib/api_automation.php -+++ b/lib/api_automation.php -@@ -154,7 +154,7 @@ function clearDeviceFilter() { - - if (cacti_sizeof($host_templates)) { - foreach ($host_templates as $host_template) { -- print "<option value='" . $host_template['id'] . "'"; if (get_request_var('host_template_id') == $host_template['id']) { print ' selected'; } print '>' . $host_template['name'] . "</option>\n"; -+ print "<option value='" . $host_template['id'] . "'"; if (get_request_var('host_template_id') == $host_template['id']) { print ' selected'; } print '>' . html_escape($host_template['name']) . '</option>'; - } - } - ?> -@@ -184,7 +184,7 @@ function clearDeviceFilter() { - <?php - if (cacti_sizeof($item_rows)) { - foreach ($item_rows as $key => $value) { -- print "<option value='". $key . "'"; if (get_request_var('rowsd') == $key) { print ' selected'; } print '>' . $value . '</option>\n'; -+ print "<option value='". $key . "'"; if (get_request_var('rowsd') == $key) { print ' selected'; } print '>' . $value . '</option>'; - } - } - ?> -@@ -432,7 +432,7 @@ function clearFilter() { - $hosts = get_allowed_devices(); - if (cacti_sizeof($hosts)) { - foreach ($hosts as $host) { -- print "<option value='" . $host['id'] . "'"; if (get_request_var('host_id') == $host['id']) { print ' selected'; } print '>' . html_escape($host['description']) . "</option>\n"; -+ print "<option value='" . $host['id'] . "'"; if (get_request_var('host_id') == $host['id']) { print ' selected'; } print '>' . html_escape($host['description']) . '</option>'; - } - } - ?> -@@ -453,7 +453,7 @@ function clearFilter() { - - if (cacti_sizeof($templates) > 0) { - foreach ($templates as $template) { -- print "<option value=' " . $template['id'] . "'"; if (get_request_var('template_id') == $template['id']) { print ' selected'; } print '>' . title_trim($template['name'], 40) . "</option>\n"; -+ print "<option value=' " . $template['id'] . "'"; if (get_request_var('template_id') == $template['id']) { print ' selected'; } print '>' . html_escape($template['name']) . '</option>'; - } - } - ?> -@@ -484,7 +484,7 @@ function clearFilter() { - <?php - if (cacti_sizeof($item_rows)) { - foreach ($item_rows as $key => $value) { -- print "<option value='" . $key . "'"; if (get_request_var('rows') == $key) { print ' selected'; } print '>' . $value . "</option>\n"; -+ print "<option value='" . $key . "'"; if (get_request_var('rows') == $key) { print ' selected'; } print '>' . $value . '</option>'; - } - } - ?> -@@ -718,7 +718,7 @@ function clearObjectFilter() { - <?php - if (cacti_sizeof($item_rows)) { - foreach ($item_rows as $key => $value) { -- print "<option value='". $key . "'"; if (get_request_var('rows') == $key) { print ' selected'; } print '>' . $value . '</option>\n'; -+ print "<option value='". $key . "'"; if (get_request_var('rows') == $key) { print ' selected'; } print '>' . $value . '</option>'; - } - } - ?> -@@ -1078,10 +1078,10 @@ function clearFilter() { - <?php - $host_templates = db_fetch_assoc('select id,name from host_template order by name'); - -- if (cacti_sizeof($host_templates) > 0) { -- foreach ($host_templates as $host_template) { -- print "<option value='" . $host_template['id'] . "'"; if (get_request_var('host_template_id') == $host_template['id']) { print ' selected'; } print '>' . $host_template['name'] . "</option>\n"; -- } -+ if (cacti_sizeof($host_templates)) { -+ foreach ($host_templates as $host_template) { -+ print "<option value='" . $host_template['id'] . "'"; if (get_request_var('host_template_id') == $host_template['id']) { print ' selected'; } print '>' . html_escape($host_template['name']) . '</option>'; -+ } - } - ?> - </select> -@@ -1110,7 +1110,7 @@ function clearFilter() { - <?php - if (cacti_sizeof($item_rows)) { - foreach ($item_rows as $key => $value) { -- print "<option value='" . $key . "'"; if (get_request_var('rows') == $key) { print ' selected'; } print '>' . $value . "</option>\n"; -+ print "<option value='" . $key . "'"; if (get_request_var('rows') == $key) { print ' selected'; } print '>' . $value . '</option>'; - } - } - ?> ---- a/lib/html.php -+++ b/lib/html.php -@@ -998,7 +998,7 @@ function html_create_list($form_data, $column_display, $column_id, $form_previou - print ' selected'; - } - -- print '>' . title_trim(null_out_substitutions(html_escape($form_data[$id])), 75) . '</option>'; -+ print '>' . html_escape(null_out_substitutions($form_data[$id])) . '</option>'; - } - } - } else { -@@ -1011,9 +1011,9 @@ function html_create_list($form_data, $column_display, $column_id, $form_previou - } - - if (isset($row['host_id'])) { -- print '>' . title_trim(html_escape($row[$column_display]), 75) . '</option>'; -+ print '>' . html_escape($row[$column_display]) . '</option>'; - } else { -- print '>' . title_trim(null_out_substitutions(html_escape($row[$column_display])), 75) . '</option>'; -+ print '>' . html_escape(null_out_substitutions($row[$column_display])) . '</option>'; - } - } - } -@@ -2010,7 +2010,7 @@ function html_host_filter($host_id = '-1', $call_back = 'applyFilter', $sql_wher - - if (cacti_sizeof($devices)) { - foreach ($devices as $device) { -- print "<option value='" . $device['id'] . "'"; if ($host_id == $device['id']) { print ' selected'; } print '>' . title_trim(html_escape(strip_domain($device['description'])), 40) . '</option>'; -+ print "<option value='" . $device['id'] . "'"; if ($host_id == $device['id']) { print ' selected'; } print '>' . html_escape(strip_domain($device['description'])) . '</option>'; - } - } - ?> -@@ -2385,6 +2385,7 @@ function html_common_header($title, $selectedTheme = '') { - <meta name='apple-mobile-web-app-capable' content='yes'> - <meta name='description' content='Monitoring tool of the Internet'> - <meta name='mobile-web-app-capable' content='yes'> -+ <meta name="theme-color" content="#161616"/> - <meta http-equiv="Content-Security-Policy" content="default-src *; img-src 'self' <?php print $alternates;?> data: blob:; style-src 'self' 'unsafe-inline' <?php print $alternates;?>; script-src 'self' <?php print $script_policy;?> 'unsafe-inline' <?php print $alternates;?>; worker-src 'self'"> - <meta name='robots' content='noindex,nofollow'> - <title><?php print $title; ?></title> ---- a/lib/html_graph.php -+++ b/lib/html_graph.php -@@ -212,9 +212,9 @@ function html_graph_preview_filter($page, $action, $devices_where = '', $templat - <select id='graphs' onChange='applyGraphFilter()'> - <?php - if (cacti_sizeof($graphs_per_page)) { -- foreach ($graphs_per_page as $key => $value) { -- print "<option value='" . $key . "'"; if (get_request_var('graphs') == $key) { print ' selected'; } print '>' . $value . "</option>\n"; -- } -+ foreach ($graphs_per_page as $key => $value) { -+ print "<option value='" . $key . "'"; if (get_request_var('graphs') == $key) { print ' selected'; } print '>' . $value . "</option>\n"; -+ } - } - ?> - </select> -@@ -260,7 +260,7 @@ function html_graph_preview_filter($page, $action, $devices_where = '', $templat - - if (cacti_sizeof($graph_timespans)) { - foreach($graph_timespans as $value => $text) { -- print "<option value='$value'"; if ($_SESSION['sess_current_timespan'] == $value) { print ' selected'; } print '>' . $text . "</option>\n"; -+ print "<option value='$value'"; if ($_SESSION['sess_current_timespan'] == $value) { print ' selected'; } print '>' . html_escape($text) . '</option>'; - } - } - ?> -@@ -293,7 +293,7 @@ function html_graph_preview_filter($page, $action, $devices_where = '', $templat - $end_val = cacti_sizeof($graph_timeshifts)+1; - if (cacti_sizeof($graph_timeshifts) > 0) { - for ($shift_value=$start_val; $shift_value < $end_val; $shift_value++) { -- print "<option value='$shift_value'"; if ($_SESSION['sess_current_timeshift'] == $shift_value) { print ' selected'; } print '>' . title_trim($graph_timeshifts[$shift_value], 40) . "</option>\n"; -+ print "<option value='$shift_value'"; if ($_SESSION['sess_current_timeshift'] == $shift_value) { print ' selected'; } print '>' . html_escape($graph_timeshifts[$shift_value]) . '</option>'; - } - } - ?> ---- a/lib/html_tree.php -+++ b/lib/html_tree.php -@@ -1138,7 +1138,7 @@ function grow_right_pane_tree($tree_id, $leaf_id, $host_group_data) { - - if (cacti_sizeof($graph_timespans)) { - foreach($graph_timespans as $value => $text) { -- print "<option value='$value'"; if ($_SESSION['sess_current_timespan'] == $value) { print ' selected'; } print '>' . $text . '</option>'; -+ print "<option value='$value'"; if ($_SESSION['sess_current_timespan'] == $value) { print ' selected'; } print '>' . html_escape($text) . '</option>'; - } - } - ?> -@@ -1171,7 +1171,7 @@ function grow_right_pane_tree($tree_id, $leaf_id, $host_group_data) { - $end_val = cacti_sizeof($graph_timeshifts)+1; - if (cacti_sizeof($graph_timeshifts)) { - for ($shift_value=$start_val; $shift_value < $end_val; $shift_value++) { -- print "<option value='$shift_value'"; if ($_SESSION['sess_current_timeshift'] == $shift_value) { print ' selected'; } print '>' . title_trim($graph_timeshifts[$shift_value], 40) . '</option>'; -+ print "<option value='$shift_value'"; if ($_SESSION['sess_current_timeshift'] == $shift_value) { print ' selected'; } print '>' . html_escape($graph_timeshifts[$shift_value]) . '</option>'; - } - } - ?> ---- a/managers.php -+++ b/managers.php -@@ -483,7 +483,7 @@ function clearFilter() { - <?php - if (cacti_sizeof($mibs)) { - foreach ($mibs as $mib) { -- print "<option value='" . $mib['mib'] . "'"; if (get_request_var('mib') == $mib['mib']) { print ' selected'; } print '>' . $mib['mib'] . '</option>'; -+ print "<option value='" . html_escape($mib['mib']) . "'"; if (get_request_var('mib') == $mib['mib']) { print ' selected'; } print '>' . html_escape($mib['mib']) . '</option>'; - } - } - ?> ---- a/utilities.php -+++ b/utilities.php -@@ -812,7 +812,7 @@ function applyFilter() { - - if (cacti_sizeof($users)) { - foreach ($users as $user) { -- print "<option value='" . $user['username'] . "'"; if (get_request_var('username') == $user['username']) { print ' selected'; } print '>' . $user['username'] . '</option>'; -+ print "<option value='" . html_escape($user['username']) . "'"; if (get_request_var('username') == $user['username']) { print ' selected'; } print '>' . html_escape($user['username']) . '</option>'; - } - } - ?> -@@ -1034,19 +1034,19 @@ function utilities_view_logfile() { - - $logfile = basename(get_nfilter_request_var('filename')); - $logbase = basename(read_config_option('path_cactilog')); -- -+ - if ($logfile == '') { - $logfile = $logbase; - } -- -+ - if ($logfile == '') { - $logfile = 'cacti.log'; - } -- -+ - $logname = ''; - $logpath = ''; - -- if (!clog_validate_filename($logfile, $logpath, $logname, true)) { -+ if (!clog_validate_filename($logfile, $logpath, $logname, true)) { - raise_message('clog_invalid'); - header('Location: utilities.php?action=view_logfile&filename=' . $logbase); - exit(0); -@@ -1171,7 +1171,7 @@ function clearFilter() { - - if (cacti_sizeof($logFileArray)) { - foreach ($logFileArray as $logFile) { -- print "<option value='" . $logFile . "'"; -+ print "<option value='" . html_escape($logFile) . "'"; - - if (get_nfilter_request_var('filename') == $logFile) { - print ' selected'; -@@ -1182,7 +1182,7 @@ function clearFilter() { - $logDate = cacti_count($logParts) < 2 ? '' : $logParts[1] . (isset($logParts[2]) ? '-' . $logParts[2]:''); - $logName = $logParts[0]; - -- print '>' . $logName . ($logDate != '' ? ' [' . substr($logDate,4) . ']':'') . '</option>'; -+ print '>' . html_escape($logName . ($logDate != '' ? ' [' . substr($logDate,4) . ']':'')) . '</option>'; - } - } - ?> -@@ -1807,7 +1807,7 @@ function clearFilter() { - - if (cacti_sizeof($templates)) { - foreach ($templates as $template) { -- print "<option value='" . $template['id'] . "'"; if (get_request_var('template_id') == $template['id']) { print ' selected'; } print '>' . title_trim(html_escape($template['name']), 40) . '</option>'; -+ print "<option value='" . $template['id'] . "'"; if (get_request_var('template_id') == $template['id']) { print ' selected'; } print '>' . html_escape($template['name']) . '</option>'; - } - } - ?> -@@ -2540,7 +2540,7 @@ function clearFilter() { - <?php - if (cacti_sizeof($mibs) > 0) { - foreach ($mibs as $mib) { -- print "<option value='" . $mib['mib'] . "'"; if (get_request_var('mib') == $mib['mib']) { print ' selected'; } print '>' . html_escape($mib['mib']) . '</option>'; -+ print "<option value='" . html_escape($mib['mib']) . "'"; if (get_request_var('mib') == $mib['mib']) { print ' selected'; } print '>' . html_escape($mib['mib']) . '</option>'; - } - } - ?> -@@ -2804,7 +2804,7 @@ function purgeFilter() { - <option value='-1'<?php if (get_request_var('receiver') == '-1') {?> selected<?php }?>><?php print __('Any');?></option> - <?php - foreach ($receivers as $receiver) { -- print "<option value='" . $receiver['manager_id'] . "'"; if (get_request_var('receiver') == $receiver['manager_id']) { print ' selected'; } print '>' . $receiver['hostname'] . '</option>'; -+ print "<option value='" . $receiver['manager_id'] . "'"; if (get_request_var('receiver') == $receiver['manager_id']) { print ' selected'; } print '>' . html_escape($receiver['hostname']) . '</option>'; - } - ?> - </select> diff --git a/net-analyzer/cacti/metadata.xml b/net-analyzer/cacti/metadata.xml index 0f56fca8650a..a300fdda8fa4 100644 --- a/net-analyzer/cacti/metadata.xml +++ b/net-analyzer/cacti/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>netmon@gentoo.org</email> diff --git a/net-analyzer/calamaris/calamaris-2.99.4.5.ebuild b/net-analyzer/calamaris/calamaris-2.99.4.5.ebuild index 446233781cb7..658b1514c2ec 100644 --- a/net-analyzer/calamaris/calamaris-2.99.4.5.ebuild +++ b/net-analyzer/calamaris/calamaris-2.99.4.5.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -10,10 +10,12 @@ SRC_URI="https://cord.de/files/${PN}/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~arm ~ppc ~x86" +IUSE="selinux" RDEPEND=" dev-lang/perl dev-perl/GDGraph + selinux? ( sec-policy/selinux-calamaris ) " src_prepare() { diff --git a/net-analyzer/calamaris/metadata.xml b/net-analyzer/calamaris/metadata.xml index 74c2baebb4ec..dce3f3be66c0 100644 --- a/net-analyzer/calamaris/metadata.xml +++ b/net-analyzer/calamaris/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>netmon@gentoo.org</email> diff --git a/net-analyzer/carl/Manifest b/net-analyzer/carl/Manifest deleted file mode 100644 index 8a178454b643..000000000000 --- a/net-analyzer/carl/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST carl-0.9.tar.gz 11096 BLAKE2B 46298873f8fff62a965a7ec7a657522dd90d1a298814f537bb5b32582ea63d0bcb1d4988cd31e6918f16514c65dd3c6517e9079c3c78f6cb0a4bc6d8ece1614a SHA512 9876e30d171bf00c4e53c6e90c98181ac25aeda004bdb8a03060c45a99c55fa087062076ff3964a222d2981ed682ae7b8f4cbade13c69154198200d35e1a577e diff --git a/net-analyzer/carl/carl-0.9-r3.ebuild b/net-analyzer/carl/carl-0.9-r3.ebuild deleted file mode 100644 index 8c4ba2d113c4..000000000000 --- a/net-analyzer/carl/carl-0.9-r3.ebuild +++ /dev/null @@ -1,18 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -PYTHON_COMPAT=( python3_6 python3_7 python3_8 pypy3) - -inherit distutils-r1 - -DESCRIPTION="An rsync logfile analyzer" -HOMEPAGE="http://www.schwarzvogel.de/software-misc.shtml" -SRC_URI="http://www.schwarzvogel.de/pkgs/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 x86" -IUSE="" - -DOCS="README" diff --git a/net-analyzer/carl/carl-0.9-r4.ebuild b/net-analyzer/carl/carl-0.9-r4.ebuild deleted file mode 100644 index a69735f5b3bd..000000000000 --- a/net-analyzer/carl/carl-0.9-r4.ebuild +++ /dev/null @@ -1,22 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -PYTHON_COMPAT=( python3_6 python3_7 python3_8 pypy3) - -inherit distutils-r1 - -DESCRIPTION="An rsync logfile analyzer" -HOMEPAGE="https://www.schwarzvogel.de/software/misc/" -SRC_URI="https://www.schwarzvogel.de/pkgs/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~x86" - -DOCS="README" - -src_prepare() { - sed -i -e "s|(__version__)|\"${PVR}\"|g" setup.py || die - default -} diff --git a/net-analyzer/carl/metadata.xml b/net-analyzer/carl/metadata.xml deleted file mode 100644 index 090046ba85ad..000000000000 --- a/net-analyzer/carl/metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> -<maintainer type="person"> - <email>klausman@gentoo.org</email> -</maintainer> -<maintainer type="project"> - <email>netmon@gentoo.org</email> - <name>Gentoo network monitoring and analysis project</name> -</maintainer> -</pkgmetadata> diff --git a/net-analyzer/cbm/Manifest b/net-analyzer/cbm/Manifest index a7868e03635e..ac585801d938 100644 --- a/net-analyzer/cbm/Manifest +++ b/net-analyzer/cbm/Manifest @@ -1 +1 @@ -DIST cbm-0.2.tar.gz 16043 BLAKE2B a5c041ac33b4694c2933bee0d71786896ec30d0735b921f34cfb6a247179709afd9fa6d90f0602869976f334391e8138830f538b18a08a7396f4049e26029b24 SHA512 ca9dbbd73e707dca3b7bf10201840de28b2b3956ce3cb2fc76e1b530caf6ff883eb437f8be0df1efe3b5d8398c4949ea00de4ba48ed26b27afa21cf445d5d076 +DIST cbm-0.3.2.tar.gz 17448 BLAKE2B 21acdfb2e125b31f617bd3204cc11ef199647552b67671e62bec7a94ea4a5c213a1099c72261e6370aee06e4a6686392878a30a863778387c08a1a8095855940 SHA512 7a597467203786023a8efee23ea1ed65195f872f6287ed2767f9be449cc47757980703f629222f37309c25cc5f201d9581a713479d954ddc99347d641ab4ac34 diff --git a/net-analyzer/cbm/cbm-0.2.ebuild b/net-analyzer/cbm/cbm-0.2.ebuild deleted file mode 100644 index 970db519d022..000000000000 --- a/net-analyzer/cbm/cbm-0.2.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="Color Bandwidth Meter" -HOMEPAGE=" - http://www.isotton.com/software/unix/cbm/ - https://github.com/resurrecting-open-source-projects/cbm -" -SRC_URI="https://github.com/resurrecting-open-source-projects/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -RDEPEND=" - sys-libs/ncurses -" -DEPEND=" - ${RDEPEND} - app-text/docbook-xml-dtd:4.4 - app-text/xmlto - virtual/pkgconfig -" -PATCHES=( - "${FILESDIR}"/${PN}-0.2-tinfo.patch -) - -src_prepare() { - default - eautoreconf -} diff --git a/net-analyzer/cbm/cbm-0.3.2.ebuild b/net-analyzer/cbm/cbm-0.3.2.ebuild new file mode 100644 index 000000000000..9c8f5b01a4b2 --- /dev/null +++ b/net-analyzer/cbm/cbm-0.3.2.ebuild @@ -0,0 +1,30 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit autotools + +DESCRIPTION="Color Bandwidth Meter" +HOMEPAGE="https://github.com/resurrecting-open-source-projects/cbm" +SRC_URI="https://github.com/resurrecting-open-source-projects/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +RDEPEND="sys-libs/ncurses:=" +DEPEND="${RDEPEND}" +BDEPEND="app-text/docbook-xml-dtd:4.4 + app-text/xmlto + virtual/pkgconfig +" + +PATCHES=( + "${FILESDIR}"/${PN}-0.2-tinfo.patch +) + +src_prepare() { + default + eautoreconf +} diff --git a/net-analyzer/cbm/metadata.xml b/net-analyzer/cbm/metadata.xml index 8377d38ed6dc..d5554963005f 100644 --- a/net-analyzer/cbm/metadata.xml +++ b/net-analyzer/cbm/metadata.xml @@ -1,12 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>pinkbyte@gentoo.org</email> - <name>Sergey Popov</name> - </maintainer> -<maintainer type="project"> + <maintainer type="project"> <email>netmon@gentoo.org</email> <name>Gentoo network monitoring and analysis project</name> </maintainer> + <upstream> + <remote-id type="github">resurrecting-open-source-projects/cbm</remote-id> + </upstream> </pkgmetadata> diff --git a/net-analyzer/chaosreader/Manifest b/net-analyzer/chaosreader/Manifest deleted file mode 100644 index 2261157cb9cf..000000000000 --- a/net-analyzer/chaosreader/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST chaosreader-0.96.tar.gz 99124 BLAKE2B 04e9dd45543033bb3d15264fcc9168b7e2cec6f304f10142df36c363e841afc91659d7956bbb60b05cc6ab4e8fd519adaf9a2e69be2efc129fd2f38ca0d99f1f SHA512 46ba4a66152403e150e652bf6fa08af98cd3d709ea2cb834a32411ca5dde5f94a7e972404626787e604c1449c29ab5f335673b305ab83856c0dfff7cbf2f4de4 diff --git a/net-analyzer/chaosreader/chaosreader-0.96.ebuild b/net-analyzer/chaosreader/chaosreader-0.96.ebuild deleted file mode 100644 index 7c26038eeef2..000000000000 --- a/net-analyzer/chaosreader/chaosreader-0.96.ebuild +++ /dev/null @@ -1,28 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DESCRIPTION="Trace TCP/UDP/... sessions and fetch application data." -HOMEPAGE="http://chaosreader.sourceforge.net - https://github.com/brendangregg/Chaosreader" -SRC_URI="https://github.com/brendangregg/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" -SLOT="0" - -KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux" -LICENSE="GPL-2+" - -DEPEND=">=dev-lang/perl-5.8.0" -RDEPEND="${DEPEND}" - -S="${WORKDIR}/Chaosreader-${PV}" - -PATCHES=( - "${FILESDIR}"/chaosreader-0.96-zombies.patch - "${FILESDIR}"/chaosreader-0.96-chunkcheck.patch - "${FILESDIR}"/chaosreader-0.96-divisionbyzero.patch -) - -src_install() { - dobin ${PN} -} diff --git a/net-analyzer/chaosreader/files/chaosreader-0.96-chunkcheck.patch b/net-analyzer/chaosreader/files/chaosreader-0.96-chunkcheck.patch deleted file mode 100644 index 6a394d4b308e..000000000000 --- a/net-analyzer/chaosreader/files/chaosreader-0.96-chunkcheck.patch +++ /dev/null @@ -1,27 +0,0 @@ ---- a/chaosreader 2011-11-10 19:17:50.000000000 +0100 -+++ b/chaosreader 2012-03-09 18:15:21.096105305 +0100 -@@ -5350,6 +5353,24 @@ - next if length($http_data) < 8; - $partnum++; - $parttext = sprintf("%02d",$partnum); -+ -+ ## from https://sourceforge.net/tracker/?func=detail&aid=2019799&group_id=107384&atid=647491 -+ ### Chunk Check -+ if ( $http_header =~ /Transfer-Encoding: chunked/ ) { -+ my $new_http_data=""; -+ my $chunksize=-1; -+ my $pos=0; -+ until ($chunksize==0) { -+ my $eolpos=index($http_data,"\r\n",$pos); -+ $chunksize=hex(substr($http_data,$pos,$eolpos - $pos)); -+ $pos=($eolpos+2); -+ if ($chunksize > 0) { -+ $new_http_data.=substr($http_data,$pos,$chunksize); -+ } -+ $pos+=($chunksize+2); -+ } -+ $http_data=$new_http_data; -+ } - - ### Part - Checks - $http_type = &File_Type($http_data); diff --git a/net-analyzer/chaosreader/files/chaosreader-0.96-divisionbyzero.patch b/net-analyzer/chaosreader/files/chaosreader-0.96-divisionbyzero.patch deleted file mode 100644 index 584918513062..000000000000 --- a/net-analyzer/chaosreader/files/chaosreader-0.96-divisionbyzero.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- a/chaosreader 2014-06-15 21:30:11.000000000 +0200 -+++ b/chaosreader 2019-02-21 18:26:00.671756895 +0100 -@@ -4275,7 +4275,14 @@ - print REPLAY "ms($timediff1);\n"; - } - $duration = 0.01 if $duration == 0; # avoid divide by 0, -- $speed = sprintf("%.2f",$bytes / (1024 * $duration)); -+ + # avoid division by zero -+ # from https://sourceforge.net/tracker/?func=detail&aid=2210488&group_id=107384&atid=647489 -+ if ( $duration > 0 ) { -+ $speed = sprintf("%.2f",$bytes / (1024 * $duration)); -+ } -+ else { -+ $speed = "unknown"; -+ } - print REPLAY "print \"\n\n" . - "Summary: $duration2 seconds, $bytes bytes, $speed Kb/sec\\n\";"; - close REPLAY; diff --git a/net-analyzer/chaosreader/files/chaosreader-0.96-zombies.patch b/net-analyzer/chaosreader/files/chaosreader-0.96-zombies.patch deleted file mode 100644 index 40fa6063adf3..000000000000 --- a/net-analyzer/chaosreader/files/chaosreader-0.96-zombies.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/chaosreader 2006-12-24 15:12:23.000000000 +0100 -+++ b/chaosreader 2006-12-24 15:11:56.000000000 +0100 -@@ -396,6 +395,8 @@ if ($Arg{normal}) { - - elsif ($Arg{standalone}) { - -+ $SIG{CHLD} = "IGNORE"; -+ - ############################################################ - # --- STANDALONE - Create Packet Logs and Process them --- - # diff --git a/net-analyzer/chaosreader/metadata.xml b/net-analyzer/chaosreader/metadata.xml deleted file mode 100644 index c0d14fba4c8a..000000000000 --- a/net-analyzer/chaosreader/metadata.xml +++ /dev/null @@ -1,9 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> -<!-- maintainer-needed --> - <upstream> - <remote-id type="sourceforge">chaosreader</remote-id> - <remote-id type="github">brendangregg/chaosreader</remote-id> - </upstream> -</pkgmetadata> diff --git a/net-analyzer/check_mk_agent/Manifest b/net-analyzer/check_mk_agent/Manifest index d378a34fa03d..4f03d903bfdd 100644 --- a/net-analyzer/check_mk_agent/Manifest +++ b/net-analyzer/check_mk_agent/Manifest @@ -1,2 +1 @@ -DIST check-mk-raw-1.2.8p27.cre.tar.gz 150213236 BLAKE2B f239edee68fdfc32aba9af40dead69ecdcb699b437b3ec615a3bf84b5eaa3644203ba4afea3d24a16ae722fe05eebb2650af1846eded97e322d88f2d7f5d102d SHA512 781b3dad0e144dc23a0d6791fa90a8ee2652919f898fa275abf7760d137f18ebe037a7d5d8f17c437f99fb7d0b22e57fdb42749dd6c084c74c5e2ef404eb3c1f 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.2.8_p27.ebuild b/net-analyzer/check_mk_agent/check_mk_agent-1.2.8_p27.ebuild deleted file mode 100644 index c41c9b1f3484..000000000000 --- a/net-analyzer/check_mk_agent/check_mk_agent-1.2.8_p27.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 index 20b2c3eaafa2..89c9c6e274a7 100644 --- a/net-analyzer/check_mk_agent/metadata.xml +++ b/net-analyzer/check_mk_agent/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <!-- maintainer-needed --> <longdescription lang="en"> diff --git a/net-analyzer/chronograf/Manifest b/net-analyzer/chronograf/Manifest index 5a47abd17233..b906fdb9c76e 100644 --- a/net-analyzer/chronograf/Manifest +++ b/net-analyzer/chronograf/Manifest @@ -1,437 +1,3 @@ -DIST chronograf-1.4.3.0.tar.gz 3979946 BLAKE2B 963511250e1d49ca92e9fde23b3c0899331ef22fe071c47c8d9d6a0ab0264e2dcb1dc083559424ff0b4bb59b0d4eb3121febe6f1ce828bac24598ae8be51cb6a SHA512 49a7565dc58f4f79ad1feb25bf6f74e9267630f6dab5f8767411d11f12dd7a76e9486b8f52c961c27dae6511286192585cee67363acf558287da436c39500ef9 -DIST chronograf-1.6.2.tar.gz 4585236 BLAKE2B a9861f84c1c862512fb1a5166f063a54d6a72f0eb3d175f7314ac50fd04b4f2529e18195cffa49b11a6b13483619ae7e579bc15479f8cea0698fd13cdc594677 SHA512 c4be1deed7ce4f0006cbf123faa0577909bf821581f5f263d3d474963f2541dca0092964a38626b80b5f32c11947f130aa97d37f3d673e304cea665c42bf2a32 -DIST chronograf-1.7.3.tar.gz 16319610 BLAKE2B 3d90ad33ce78b4bd939e5c016ea14b7986d8888707a8a68cd832e0826612aa984d65615301bee4d800343ecc38964103abcf72810c6390fd9cdd65542739e9ba SHA512 dd5e4805dcbe167a399b7927b976839bb99f805abc7caf0fbf9cba479647df1a681f175d7bfc48a2267312e7f89470935623f7bc5e6bcb7cf861928f3e0b2f1a +DIST chronograf-1.8.5-deps.tar.xz 125095248 BLAKE2B e26ebe7f3da1de0b2733fc664252f05bdf74b52610be4bd848c47d299977b8d29e066ce6371bb923190a3323aa0438b58de85bf98d8f2af8831a838822c8533d SHA512 957fa8aa460bb35a98caee2e5c878e987ee3a18ed16b491dc804f7f4d4291dea69dca750a62ca400d077883e777a239ed536eee544de9c3252cc209cb0565681 DIST chronograf-1.8.5-gen.tar.gz 3006503 BLAKE2B a7d8409d197df5c8a539ae0c0bf0a2fa557d5f56edc491cc9f75566e7dfa3eaea24955f7e36637dba87f9fb54aa6461b83e17c539599164100076e494d208465 SHA512 c7f28644d4143883b792448a62f03f733d7fbc1ea4fa77c29af9d5f7ee6982133c98cf995e13d76a4b43deda6ac30ecf9e8fedf7f0876beb2d9dc58dde3fea68 DIST chronograf-1.8.5.tar.gz 2208763 BLAKE2B fd5f12c5a3ed8f83016bcfb42afafc309acd642c7b6795ca43c265ee41824e9ee116238d0f56c010b3f3c777a67225c21da3179af763fc66e0f5ef87cb5cca59 SHA512 075f83f38fcfeff199ab7fc6d393cc6aafa95cd1bc7415602dc8bedb0d7203b5b70de386165ac6ba502fdd9503779016a616eb59b31a2e87a96b01ce66ecfa5c -DIST chronograf-gen-1.4.3.0.tar.gz 2488979 BLAKE2B 47738629d25dd6b5c11f942bdcea089291bfd8ad1476f448985d35fd35fa4a59274e95b863f7055c34ac0047f584fc45c83e3143aceb8b13b6c4fd28c42039ec SHA512 0346c19f80bea597c87a54f2d5409854a30dfa020bb0326791a6387d81aafe0c6e5112b6d086b21f95dc4f68a269a8fb2e0113156122636c3a6281ba58df6b49 -DIST chronograf-gen-1.6.2.tar.gz 3263429 BLAKE2B 6b6202bfd216a7777c89f2329379df03226b0b212e720987357b66bc26c3d07212a26ed2c41991c7ee3c0eea9f3a731985697b7e4752eb3be906cbc8790a8290 SHA512 55cf76b6c33134a49deb605543ff49aeffaa3baf4262787b19afe1d3d42c2a6e66e88d031f07a2f13a214556c479daa6b40f8586b529730c924ae45bf0e85213 -DIST chronograf-gen-1.7.3.tar.gz 2893752 BLAKE2B bfbc680c3237522844b406504412dd6001eef3f93fc31df18660bb74b7e7561f44c5d3af039af62e000610f40c81e78fcde8a651a5198b4bd152fa04e93c51c7 SHA512 8120f563e0c5be8a7b8179016db72a1ff5eb7447c1124ffeb87d5c928275f3b0080f1f4d01cd9c5b0eef601852b2e3701e3b4cefda9a427bbaeaf9fc46a69ab1 -DIST cloud.google.com%2Fgo%2F@v%2Fv0.26.0.mod 27 BLAKE2B 814b0fa8f12d5ce6171fa629b5a7eb34e0e882cc0c5430986896bb38c243e08dc83098f271227f4ba019e78f16dc97fbb381e833aff1819833d243b08add916b SHA512 5132f3438533427c0ab0fbb7a12112a7830ea9122662ed46019ff89c71d9cf80c02edc32dd5c892da572031b5a2cce100f2602fa6a19bea6be7c02781f701273 -DIST cloud.google.com%2Fgo%2F@v%2Fv0.34.0.mod 27 BLAKE2B 814b0fa8f12d5ce6171fa629b5a7eb34e0e882cc0c5430986896bb38c243e08dc83098f271227f4ba019e78f16dc97fbb381e833aff1819833d243b08add916b SHA512 5132f3438533427c0ab0fbb7a12112a7830ea9122662ed46019ff89c71d9cf80c02edc32dd5c892da572031b5a2cce100f2602fa6a19bea6be7c02781f701273 -DIST cloud.google.com%2Fgo%2F@v%2Fv0.38.0.mod 1006 BLAKE2B 9d321b9bad7e881795f0215828ca23ff5753b8ca9cbe64ca085bcd2f64d36d0d5bdd5c3e80eb64e19e067748b6b23eb7837827cede0e75a840ed1cfa2b00c1a8 SHA512 8aa90e6ce7d50af3db56c8a7abdd16822f6351cabb96e6b75ac0cdefa15bb4a2d402aa84e6212fec4d599ec6f13cb1891bb37f41200e6a05a27642375a89a959 -DIST cloud.google.com%2Fgo%2F@v%2Fv0.43.0.mod 1150 BLAKE2B 061e538c00a3bb43069837aa4492ee4a040a31cb20acc0bd18cc9c9bde19f1a2a54a19539e71df75b696879bcae42eed0e708e5e07eb76e1e8a238baea589592 SHA512 9b440323826ece8eb7681b931bf7964b02242425651111f1ace97c5b026d25f8ee5e72147bfbfde60166e9d3cede791d2d9ea20893985c118d087705747a04d0 -DIST cloud.google.com%2Fgo%2F@v%2Fv0.43.0.zip 2907020 BLAKE2B 819e31781f79e21fc887f9e133aad9c63a66cee2b94a115784aa9805af0fdcb7cf589f1b146374b8a9650acea2d65511bbbea2d71e9a8f233b65e0c4e446029f SHA512 0b704af83d3bcbaa27ac5a977ffe018b8706c184a924f69d2d5b317805eb93c43096243a0065c534a23963e85cff8987993f0dd4877d2a4c3bd604da1e2b62f6 -DIST github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.mod 34 BLAKE2B ce54a247aef91043830bdf0603c8452ba38eceb1495af6e7a74c9119234a0dc5cd080cb25258c28f5e270acf91189a5ed33e361cbf17de2be5e37dadbda1d90d SHA512 320941bc3b7fb8bc595e6135cbc513a7583d129f0cd92508055291e141191066303cf75148e25198c21f6c6c539a790ea3210f3ecf5de6a2a03b70c753091146 -DIST github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.zip 56132 BLAKE2B 5edcfe991d7fc40094d637bae8d8d6f1f897ab3d3786ade2bb80287738103264520681ced8d30d2037253206c32d3f867f4d024a571cb9aad030ebc451e198eb SHA512 43ed64ae515738487e9b75a2290d0b2bc25e83c021a9f29b21487c37adbf34e74e1e7d3d5ec0dfe678c8396356f95c3993a5f5610d1791ff62056cd182a4272f -DIST github.com%2F!burnt!sushi%2Fxgb%2F@v%2Fv0.0.0-20160522181843-27f122750802.mod 33 BLAKE2B d234bf9be3dd919cb1f8d33750a24dca68c90fea110fd0ff62f0dba86d2ebbfc66d55fea62745b6383c5607bc91cfd78c9d2cf12df251397e85995c04707caa2 SHA512 dbfa64ac31b25fdbff12110c6f9815abfde65f281e40852e7165499a2cefb6656c74fe0b82f0f018304daa02b83b421e9c15654efabad39787c69c1b2996a79d -DIST github.com%2F!d!a!t!a-!d!o!g%2Fgo-sqlmock%2F@v%2Fv1.3.3.mod 38 BLAKE2B eb94b6f6f4bf332f916cb642fae50486c6ad9f6a7aa1bb57aade3ed640bc98236ae167d30c140c106cee0ada737eca6bdf54d36bcab0751a940f283f55f08c5c SHA512 43bc64732c4ca2ff23bb09cd67f002b05a1b68963116fb42cf9bd60ac8dade8b2efa1cab798217a73b221ea86fb4e219e36912ffe338c7bd505f2a877be05c09 -DIST github.com%2F!d!a!t!a-!d!o!g%2Fgo-sqlmock%2F@v%2Fv1.3.3.zip 42823 BLAKE2B cb9b71b7dc0372ee4fed1c9c4c51abbd6cffa907f0eb5dd156475187256e5f8d007e667324edcecb3bbe51badf51c7d46643b89f30613670506c0aa5e76833a6 SHA512 b419a038368e290028a8e10066a95044d1b4aadfc3d33d396c05482f155dec4bd04f5a2277092761fa4433f4e25263a64b31524198dbe669526871ee540070d1 -DIST github.com%2F!data!dog%2Fzstd%2F@v%2Fv1.4.0.mod 31 BLAKE2B 3f699ae120e91b47e91e35449ae06e146a77a3b8c6834a6494ee4809e3f524bcfbb7b0d9a53b6c64b6ba9f3b1814a7cefa525030871557e52e54be629bae3aee SHA512 5d47517c29477f39a7f12d63ee80c1c64cbbe8065ede96732c133a0159e541b95bb17f10fea0ed5acde361deb84cbb66e79a38cf4be0dc7b28d8b8e342d45a88 -DIST github.com%2F!data!dog%2Fzstd%2F@v%2Fv1.4.0.zip 560702 BLAKE2B 16317bfaa25ef87107f9e94cb97c5b116eb258cf7829255f0add0d88a97f37e8179a320914a5c5c71501a11874cf1ff80f828200d87c3dd6b41263b2efd6f282 SHA512 4d2a6f8e2646941fcaec6df260b63b55e5036e18e9c1d2128bc098a52cce62cb663b2ad1903af9478b1133b680437859d8f881dae97c0aeff8756294d483632a -DIST github.com%2F!n!y!times%2Fgziphandler%2F@v%2Fv1.1.1.mod 91 BLAKE2B 4b450a7c1f230f8be959f6c2edfd47669015738deea7de2ac6347699a1671ec7e0bd66d134fd5fad079ebd9fd64eb4000ada8c91b2fe9193048eb4ac3c36735f SHA512 0e1988e2b81b9f2c0531c5fba44524f81fada3338c323141b1e4b49f5474c16b8ccb60bee17d204f17afaef228fcf4dda47ef125b48ff209ca49eb9d6a233745 -DIST github.com%2F!n!y!times%2Fgziphandler%2F@v%2Fv1.1.1.zip 55401 BLAKE2B 7604f64a9d9941b2d4f8430aedfaf02570a99d2b4321760574e777ab1ab87029af2cb629634fbae3859a478471591c0f66e4452445f40d556bd6ee9cdcc01570 SHA512 01c31a36b6c9dcdd10558f1341741d4b3ff181b16ea45114fb06598831690503e131b91d5a9b3e531102d6ad0e645c733c7bc50121932da470035677bae21ff4 -DIST github.com%2F!one!of!one%2Fxxhash%2F@v%2Fv1.2.2.mod 34 BLAKE2B 83966cb7de9bb687f99f17c5c89c03718258d2df34e3dda01b96a2fcb1273a0ba0e3253ba5950d5458193d3e54962371317a8fe85020ae338b44e864bd96667f SHA512 9081c69a2480ef726f547047306dc9136211ac7550882e68d458e2c04e5343366cb08f20525a51c804ab9a554dfe8363a1d9660bc0f9e501e1d996f7b6f320e4 -DIST github.com%2F!one!of!one%2Fxxhash%2F@v%2Fv1.2.2.zip 17606 BLAKE2B ee5acf57c658d87b97b533d695cb72c9d83e281f9e533271f03d85d52f92c3c90e240f3b6d2a01bebbea6befb147ab66d7f75c403fb8bb3e58a2bc0bb1269f6e SHA512 89912d8630bed5c71dcf391b57e4537b93f01c4f1cf320a8c11d5d34d47fa4e3ea4abbfb3bc3aa76ad3cf08350da67e190cd80322597d0de3123fbaccbcea9e4 -DIST github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20160405071501-a0175ee3bccc.mod 38 BLAKE2B 2e1a897393e3527f0f82e6ab9baf62558d9cf54b56ada5d79aa1b206128de30395d9082bc600c4aa2a17e81095e429cc5874de95047854531cccc9ea0b867de7 SHA512 072ca7ba3d5ca815f58848db201002cc572d95334aeacfe44cb226505ad20d82ce06eb2ee059650912ae499db6291822c583296cb65a66e54adce62d6d850929 -DIST github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20160405071501-a0175ee3bccc.zip 66023 BLAKE2B c023de8e6a5f0b13a7ad1484f21f04643782d802becae77f247709f0c16ab8aff7caf748736561138448efe1cd52c0ac1903b22b92ec56efe817935ccd45ff22 SHA512 356c87eec65f0dc8a680b7a19e888d87fb8c808ec675501df635560fd5d3b57da36ecc2cd9eeb4a5e454c5564d4cf1a062b47b7a050e116b57c87afbe020eb53 -DIST github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20151022065526-2efee857e7cf.mod 35 BLAKE2B 873b4b9c8491117a0b99bcc183ae96fc7e392c68d7271b73b5d7876574a5c7d67580425b35445ff2fff326c5cc7f328326d5d11946699c213cb2b84e8a9a0aad SHA512 7f23b8c5622c02b295646c7baf6f2ea3dd01e11e18ac9c263b853c7f771f5d098d8bcb75971f0cdc33d1c4765b563f3382ec5dc4bf20010065c3f1bc94e93175 -DIST github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20151022065526-2efee857e7cf.zip 5176 BLAKE2B 58fdc8010b4ee8363336ef720c8ef2d126c2b7dd79357ca4f99a1094957965544430420f6ae4155490f75242cd7a7cd20993a9ae15087ccdf33327c551caff59 SHA512 0dd4cbe03b224bfe68d00d121f758796f6e63b96eeee17261bc7d8f6ad1ef9878976b8eae5eadc2f6abee28670a83e6925596f4d35bea529fcd735772fc9a049 -DIST github.com%2Fandreyvit%2Fdiff%2F@v%2Fv0.0.0-20170406064948-c7f18ee00883.mod 33 BLAKE2B 5aced043cac582e67e8d3ddfef0a54dae0f7e4792dba23d7c6cb18fe687be98649a90e9aa46f591385003f945a2ffc192aca18bf1ef0516ac22fe1526d2e3b85 SHA512 8960a9c2dcaa7ab5225d3d10fbba4264032ff9bba80fd8efe2ecda6f9b925dab4db320a4650fba43c0d9c61d31005c6045eec4a650411bb549c60792f31c3b09 -DIST github.com%2Fandreyvit%2Fdiff%2F@v%2Fv0.0.0-20170406064948-c7f18ee00883.zip 4677 BLAKE2B fa0d0bb753cb780d7a9ab7f1df0129ff80832c97836756568dc3f1b0f92ddd8cdbef58ff43b8b0279ee7014f0d97becdb73bc87456183035692c47c53ddcd963 SHA512 4faccef281c2e780b5eeed214b82b9caa84bc8e6185d5a9bfb531e5293f35b46ed6b9d2888de7a41aeac9daeff2456a3db1f41edc45789b7d24b853ef61aeaad -DIST github.com%2Fantihax%2Foptional%2F@v%2Fv0.0.0-20180407024304-ca021399b1a6.mod 35 BLAKE2B 42febcb2e06c46797f14a850943d1df3c0e15630f376b8f1c860cf4e26ae4e2acbb38947f1348f501665f719943510aa2c0ad091f336e635430408794e61feed SHA512 c3d0bc6de3cac8395d0a231f041437b4caf00a4678270ae447b2e76bba3a588a6913cc1df6ba438bf6dd361b48860c365e9d32af55575208bd0f4b705b0504f6 -DIST github.com%2Fapache%2Farrow%2Fgo%2Farrow%2F@v%2Fv0.0.0-20191024131854-af6fa24be0db.mod 1060 BLAKE2B 50eb8aa20b011a8dedf13e3a00defda30ee36bb4ed9405e648ea2cdd2a00cc379c8a1c41d3d5794300fb7624e59b2b5aee65d8b93555c736908ec1e7c2ac46c9 SHA512 8bcab95c89a92d8840a37ecedb7a000290e6db5a4354bf1339066d1fc02c16532be5eafd4ae3213df10eac236d08dfcf50a0a6b848f63c0557453a26dc36d3ea -DIST github.com%2Fapache%2Farrow%2Fgo%2Farrow%2F@v%2Fv0.0.0-20191024131854-af6fa24be0db.zip 411649 BLAKE2B a041679c0e8a5039f0ead7334da5a787fec1189e45cde59a20cea3d52426178ee042592dc6b5342a5bf27573697f9f31e32db120c4755c48487c6f33699cefde SHA512 c3c226c1c31872a4ad0993712fddc23c482a6989b0f2ad768dae94b02bb162e5129efcd76f56f6713fa2f40e1b31f11470cb7e96bd22c2e9d2c999ba622d88b7 -DIST github.com%2Fbeorn7%2Fperks%2F@v%2Fv0.0.0-20180321164747-3a771d992973.mod 31 BLAKE2B f69b0989e51b0b649f81b044169fe4309f130eba5bcc6ff33aa9666b1b754aa0e524b8c7a627a91000ccc4f93bf93cdee3e97bd3b2184b050878bc3f413f0c72 SHA512 f21fd002853e4435421f8396e6be016f65be1537815c60d23940caf26e3f14dd6f2caac802cb64cd586b1b1f1220b2727de347b3d1816b8e741f68d87ebcf03f -DIST github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.0.mod 40 BLAKE2B ce42c81a7dcb03d21a99d6240ce12f8455297722513497b1a75f2c848b5fb7ef70b577c2406638442f16beedd68806de890a5c299cf1c008c439df23df2f5bb1 SHA512 ec4424da8e1e3849408da7bfe83d37e21ac75edb889de8ef63be897d59678679b018f4606be78500952e7eee73a6252ee6e477b1a1612e2d036dbf72c17b9c9b -DIST github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.0.zip 14678 BLAKE2B 3f95d78aa356a314f8da501f8085a880201766e184abb6c222c45e09c0c3b5e1e1eb7b89cc8ed46b77b09be8860fdf3e28525d9a451964ad64a96c6ee848a41d SHA512 be60a4c8059a9cb07ceb12e079b1224b6f871ecb1d7953906ab303cfe86d00cb979e203299f00fe828b2f6d2a3f5d55814c50809e9b872ab6d96db73f3771498 -DIST github.com%2Fboltdb%2Fbolt%2F@v%2Fv1.3.1.mod 30 BLAKE2B bf7d457fdd333781e403b93aac891f5a0a8e202c62983ec6e34ab559ea5624c3e6cc525416fe400c7a0af20a3f647b49eac5717aa749d9ff79b02fe994c36d42 SHA512 7a1ef7d0fc6d5a3a8530b44dd5aa23d4248d952fd573b9f0f6f630b1bc38fa5c9c65ecc4894734c7115a8a0c7c71e8d0e2da0773ed4c5779c23f7f294e1e7d5f -DIST github.com%2Fboltdb%2Fbolt%2F@v%2Fv1.3.1.zip 99852 BLAKE2B 9151e6475685ff3b550d1ae1291778a01793f691a3ddb007d64fa49f02ee85927c834ad709dee5fcba0f071630cd62504a65fd4344d4ea5b9fb713787bf6b725 SHA512 837cbbdb0a91efd765e697e01bc64f0206897d6363b303c96ba53062d674623b19d8c86d96a867529f1dfd6689240e18ae7c25dee268542d46e2877dcbf83848 -DIST github.com%2Fbouk%2Fhttprouter%2F@v%2Fv0.0.0-20160817010721-ee8b3818a7f5.mod 34 BLAKE2B 4c93abbfb48021296dad995711a6ae6e358b4c10faccb151f856cd8b78fc22862e37eb3818aa169120ca534ac326a87ca723374f83d2c5ccce34a652403b2655 SHA512 073e81f3d01d0a24d6c27dbdb233c41107b1f73faaf3e564f57afbefef98f6a6356d4c03669a1a036f86052f840b6a4e951a17ac96cdb16bfe64e2df389363c2 -DIST github.com%2Fbouk%2Fhttprouter%2F@v%2Fv0.0.0-20160817010721-ee8b3818a7f5.zip 27242 BLAKE2B 663057335f41946a05174a2bf6e888a7b7e32474f354fa1798f06b50f5a541ebba837e20500301f3ac114a9cfc161ac91b3b5d0a37b8981c8c8f9121f3c5ff74 SHA512 a5e61b75933c3240a00adbb961323f7eb1f5cc68659d316a22ba59e04dd76a0f9e3d863aae0e9e8c257b1b40b70f161368c4d7f117cbfd464eae52990fe980e5 -DIST github.com%2Fc-bata%2Fgo-prompt%2F@v%2Fv0.2.2.mod 35 BLAKE2B 275030ee2ce09666c11f6b20ba9d787119ced543b4e3f310900f5030544e956af15b407003d01849e807f0c8c256bb709619fdacba8c19b93e4806be5a1ae5d8 SHA512 cd905646c7ab3d19d41de121be3c8630c40ac2c55ca77b73afab555c54d1130f7c41c966ad91b84744fc2d52cbe3f6f7e7d1f2f9db5c8a29e7c799ec007bd4b2 -DIST github.com%2Fcespare%2Fxxhash%2F@v%2Fv1.1.0.mod 146 BLAKE2B 5efa8dad622ae253ffa106eafea277fd947fc0f28e6962e461283ce2267d992b85b1f0eb9074a90009d8ed1d47f9e1f3e03cfc0eb7ad7df104282cfd144cc12a SHA512 32c34a590e6c113a16700ef2faa5124ebb6c8773cd76594312157bd2b70d54cd939ff2c32fac47421b5615e804142cb7b393394d4745d5894f9b68392bc37ad9 -DIST github.com%2Fcespare%2Fxxhash%2F@v%2Fv1.1.0.zip 12221 BLAKE2B ea2f826b4582ec60f51c65783408df0e065d2a752d1cba17aaf277e0c2b48779a3bf3579982dcc26e5566c899c3f933e4c711d2f1e01c98c13e73d46fa08baad SHA512 09432cff34f69e9b0cc6f0d5bb9af376efccb85ab4396c14a4e0c072272f3172a93c240c5ae0aa89eab91799d1bed1a0e7e00ba83682843f46344c9e2fc2d4b6 -DIST github.com%2Fclient9%2Fmisspell%2F@v%2Fv0.3.4.mod 35 BLAKE2B 45d27e6bbd9255a355b6bd14ac839c7d87fabb393693a8b862ad974017af01309e5d36fa99d4925905c1617c0d90b5263b54cd95af2dbab186e293936dc86459 SHA512 ca8192c6321468b4332eb63c765a5798150dce9312873123b48d9ec67ebb4229cffc7b7e8054b8b0a6f45611f08130008031edf33da3468bb9a4ee9455fa02a5 -DIST github.com%2Fcoreos%2Fbbolt%2F@v%2Fv1.3.3.mod 31 BLAKE2B 7bbb809c199d39bac173751c3dc21b23ee8b020f20b4447c33681469b5083c64e74f699fa8d3dd55446b76ed44fc0949337303a776efeed90a764af1d751c8a4 SHA512 12f6b0e7090b257656ee9068083207fdd1b6d9f0b27546cb5b3a5a520e5944f3eccb8f6dd644a17e1089bbf787fd26b3e83eb0f0353071c8c4ef23ca99bc6251 -DIST github.com%2Fcoreos%2Fbbolt%2F@v%2Fv1.3.3.zip 113037 BLAKE2B 2f0be7ae1e384148a262492425cdfc8540020ec2000dc802d053bb19312441cc0350ced5dde82503914309e7cc6b8ef0629f31585d38a5690a7c2672a7572aa6 SHA512 5ce2d4bfd2cc84fb37ae0a300c14cd3f10da5e65e457ea4d4b96cfa334d434e01397bc08be6bfe92336fcbe11d97172b1cf218ea85761e7dd12e5e3b3d47f3f0 -DIST github.com%2Fcoreos%2Fetcd%2F@v%2Fv3.3.18+incompatible.mod 30 BLAKE2B d511bd14351d68fcde2b3be3f008373eb12d2c61133c80aa3a1938e53ffa061c0aa51065f07b208a073b448c25309c3b2d67c0ed19ad3697309a679fcb844414 SHA512 a986c2cac4728288aaf90667b54ffe9cbb9e1a55697347f9541e6aa0dbfc5b8d245c2ac15e8a9558d41862d98325f3f2f4055b02bcf1e9045b78bb3577b3f45f -DIST github.com%2Fcoreos%2Fetcd%2F@v%2Fv3.3.18+incompatible.zip 4268214 BLAKE2B 2d128aeb163368081e16aaf7b9f04f7feae54d3934c9ae009ba6d43e78c9b910d44538ccc06de0757eaf0b13ae53f94d3e3fbeb75d01d1d2b35bec0e4fd029c2 SHA512 2174be9dbb3f905c816ca9a21ea414914999f09ca075401e720ba4c765b26bb9dfa74fd74bb32af1e73345ce9420ea11f0e0b85d4ec302d438a5e48e38179508 -DIST github.com%2Fcoreos%2Fgo-semver%2F@v%2Fv0.3.0.mod 35 BLAKE2B 931ceb7bcae15a876b79910a59b0f4ec67ae8f0ac5fbd401e80233107e7683d9cc4a947548c4d08b26f2d47ad6bfe4916f99ffd2a98abe26e8161af87eb49c64 SHA512 58d88566898778823c24b5f4ff7ac50384075312e3eb332aa01233ada3ff385cd8a0e3b8727a77ecf068f13b52a304fbdb5f47a27957333dbd5a8fb1448956c2 -DIST github.com%2Fcoreos%2Fgo-semver%2F@v%2Fv0.3.0.zip 13848 BLAKE2B dc2ec3bf79baaafad410ac2b4625dbc1c520803659b480c2014ffef484d409135ea5d09035669457162457962dc6b3532a480893f399b876810fbc1adfdab8e2 SHA512 918009558869443193fed748b3cc807dbfc540967d60e0315c74c6a09324d7d783067e0f21c5461ebadcdec3c7e6417522565a00e33617af8a8168281a0040c3 -DIST github.com%2Fcoreos%2Fgo-systemd%2Fv22%2F@v%2Fv22.0.0.mod 91 BLAKE2B fad30507d91fca15291c8f13100206c9d9eae4f73ca4034e37de10d1494b42b03535540ce704582cd7a4be4ffa2685f778ac9cd3aa647d6c48d8e6fe33a345cb SHA512 54e3700ced7222d086eac5a73a5973147473e9d063a7a8dd719bff2dbe3d61d9e4cd7427f30c926a2289ef53948f158bc09e189d9714f0437d446f7c30d0cc6e -DIST github.com%2Fcoreos%2Fgo-systemd%2Fv22%2F@v%2Fv22.0.0.zip 114418 BLAKE2B 43e288a393932b03a27d91cd456cbef42c2611751d40e8a8e6c14d2b80f65990711a5be7d75e1f62b1eaef3d9eb8c9bcf3f51eb14a2436ca1dcb15b3b3a2ef16 SHA512 9df60d53633425f32d5bf594dd579ce61bee549c2672da2f7da39437031a8b0d27b7d3448adc6f9b20b230f48c355242ce8b01b0c5be25612165c53c73e10735 -DIST github.com%2Fcoreos%2Fpkg%2F@v%2Fv0.0.0-20180928190104-399ea9e2e55f.mod 29 BLAKE2B db9b03b0adf02e3b379eb06d67988a60f2e2034d1217e56b40ebafc1262cb4803500b73a3e697a5a73418615c84310bd7f7aeca6db56f6ddbcf6c044cce0e9f3 SHA512 ea629c85891049bdff24f75a4dbce34f048a9627fc126b44f497b3ae65602045ca4fe0856e1b3d7ba050bb867226b90c25912565867c696bc370697341681c33 -DIST github.com%2Fcoreos%2Fpkg%2F@v%2Fv0.0.0-20180928190104-399ea9e2e55f.zip 57782 BLAKE2B cdd50ecc0cbd0c7e58f3e6ff91cd26f7a212f4f62cb10358e1729b6b8be346390f1659ec7443a0c48f280c4a499f399b3ab3c03ba897ba8a7a61c336ff6f7c29 SHA512 e0ac39873cc584e40df505c3c01d20771d3a5e06f1c2c78a046971a220f029795b4cce7da71b497bfb618c0159897640c6606a4bd0d446826b142430f7f66204 -DIST github.com%2Fdave%2Fjennifer%2F@v%2Fv1.2.0.mod 32 BLAKE2B bac4a6712c426a393e847390ccd97e8ac70a59481520ee26e029880733401b91d138425f233a44513303b14d72210b5a7e54dec2078a7a7adec89f0b49a580ff SHA512 c75dee01e189f9fbc2fad8e7b74890ac91b1119af917341aa4437b0018e6895569d6c614e90864c75516825c8ce2923b34e1e396f67c56f1d71bd126dc1de712 -DIST github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.0.mod 34 BLAKE2B 7e09c2779bf7a84a9271e31522ebbe600a1c11b107d651d91f58c8373e4336332a3a881f3e12b382543d75f20398af66085fcb3e780eed341e870e9c30f29267 SHA512 5e079462f7e0dff0efda71f580aa185700cfa936b718a19d0e2a8c63212e47a07022dca0c282832d48e5165aae8e82aeeeb2ac3664268f1148fc772010fb860e -DIST github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.mod 34 BLAKE2B 7e09c2779bf7a84a9271e31522ebbe600a1c11b107d651d91f58c8373e4336332a3a881f3e12b382543d75f20398af66085fcb3e780eed341e870e9c30f29267 SHA512 5e079462f7e0dff0efda71f580aa185700cfa936b718a19d0e2a8c63212e47a07022dca0c282832d48e5165aae8e82aeeeb2ac3664268f1148fc772010fb860e -DIST github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.zip 60320 BLAKE2B 86bdbc333e5c23ccf4f805945ca9f2aecc5c242d2ae824d20127eceaa2bf7bbab239ff2799572a2c8fa206166a36e97d5eccc8fc5021743d8ad32f39cd53b9eb SHA512 7b4e4df2fea731e23e05437f26f24e32b2e99028d685b72e3a726c1cb616ada4a77ca4fb9db4a6fae48178cc5172e724b74499bc776d63a9110cb97377d5edeb -DIST github.com%2Fdgrijalva%2Fjwt-go%2F@v%2Fv3.2.0+incompatible.mod 35 BLAKE2B ae3ae89fc373221646f196cb2112e003afec9206977905007426d522c584b455fa207f105eaa35cc716fae74d605fcc2a88c0ab5b62e4025b7a739749410fbd9 SHA512 4d46c1b3280c5b4984d22e57b0541cc6762853c0f6cea19a7a5f392c23039e29ca616a4bd8f283c2a35c3c045ec54716f5000cb4f0f43f07f0464c12ed1369ec -DIST github.com%2Fdgrijalva%2Fjwt-go%2F@v%2Fv3.2.0+incompatible.zip 57069 BLAKE2B 2c921bf5a88bf293a4c86bbaed6d7c391a323cf3ac39a54ac10fb74da5498e0f565db5e5220a9871ad5c4dedad7eacc0657ad9f8907c2bfccf147384b53b37b9 SHA512 c937c8b98196eb8496735410324a6a845e618d47e4631c500c9def70d8effb27cfb4efb17f81a8d304ce1a9d27fa6fbcfdec11ea10355de3d1918f1ddeef81d2 -DIST github.com%2Fdustin%2Fgo-humanize%2F@v%2Fv1.0.0.mod 37 BLAKE2B f097ba062c5ae93b06edbf7827cc21a40d6bf6d2130c44fc8002344e860b3471742cf930e505a74a6a2af3a77a6dcc7d01b103d01f6f208c96dd9ca713c96344 SHA512 be96d9da23cc31932c1001e2ed367e55d06ccf2af41cc106e83b92fb866b61110d06ff224797c942b9ab6104bdcba4542f2214b9fb2d88df63e69be8158c6e2b -DIST github.com%2Fdustin%2Fgo-humanize%2F@v%2Fv1.0.0.zip 26356 BLAKE2B 665fb778605fc05dc686b59a3ad82a6df9020017243cc84498e4113c7b18343507a0084cd67febc329fa6b44e675696f99f632cd282ead5bb06f93ff3bd50bea SHA512 88e19d0139de7de602272e14586a99eda26b2867ea60ef56b517d13b37c0d28b1ab62c05b2f9cf1a9b8dcc8e5afa9c915baf7a30b0f17c4fbd47d5c71d0a3965 -DIST github.com%2Feapache%2Fgo-xerial-snappy%2F@v%2Fv0.0.0-20180814174437-776d5712da21.mod 43 BLAKE2B 500b3a85f43db1d61f037f437b3290888204aef8b80aabf42d70c37607fdac86e8b1f7f4e41ad3709ad7015a78b934ed7d6d254522eb3e2baba4ae24619ea4d2 SHA512 da87f8eea5497796badaa6bdd1c67ae04e75deb7595f10739f30f20364f22e588a449aacf603f2c8d738b365ac14211c7cfe8e1bfb91f220f5c9d547007ad453 -DIST github.com%2Feapache%2Fgo-xerial-snappy%2F@v%2Fv0.0.0-20180814174437-776d5712da21.zip 19526 BLAKE2B 87715fa440e98bd4c44516e419c0f0495da8fbad415c59361ac53008553c4ab16aaaf37581edaa6a50fa443b9ee28cb426f7e58a921f3a3490fabfa4248245fb SHA512 e8756683977e2dceeaeb1bfb63ec8fe4c7083cc1c7b242d59080a3078cfa5aa73d43f203470b140c1714a30a97dc843adf723243a072b7529c22e1fd72d7ac69 -DIST github.com%2Feclipse%2Fpaho.mqtt.golang%2F@v%2Fv1.2.0.mod 43 BLAKE2B 1431139ee59695bdb732385a06f05f26856117d6fde79f5aa3e3bac98bd7f10e6786600c90b414baf7d10c2bde471ceaf265e471b3159a00a13dac8cd4736b57 SHA512 9b87dd132016fb64ec4679aabaca500e4d07b1131affaf5bd1eb2e780b48f2e1364d1cc9e655a6a298d5e2e2b74aa554b228d636e294f01c3ce53f6f53837f0e -DIST github.com%2Feclipse%2Fpaho.mqtt.golang%2F@v%2Fv1.2.0.zip 108829 BLAKE2B efac4fdf409c984caf579ffc34c94419b0d9ff5d559dd02f763cbf7bfe853e167debe82696ce3a16764bccb885987ba68ff85938a5618738ef13d198bd004c33 SHA512 723c089d31c2b5d843c4b27e79a23a80504222da1019b6c6f92bde4a54e3b156d6ff33effe987482921c2d71eacdd4c1140cf87f13f2b5430d30b836fbb80d83 -DIST github.com%2Felazarl%2Fgo-bindata-assetfs%2F@v%2Fv1.0.0.mod 45 BLAKE2B 53afd9bac3239067917b3d730bb8b2775b196d3258695342047e9a49894ab1b585d36c664e3651f71dc0a5f68523648dffc0276000fddc7d5a2b0db328115b1f SHA512 0185b47e73f67a822bd73467f1f07982722d10f59c298592440e1217c31d308547e61067d47ed9aaf6ed802823878d9ec01ef6cbc1aa60fa833e246cec260d69 -DIST github.com%2Felazarl%2Fgo-bindata-assetfs%2F@v%2Fv1.0.0.zip 4879 BLAKE2B e11b6fcd8abfa51f7c9cee477783262735541bb5feeded13de28e70325fda9194ac1eb75e7be88038a95d60f62b21b125ec190b6792bd80bc83041a8a9f48b4d SHA512 7c2b651c4d53150d5caebbfd7930089bda292557a99f77bac8a9fe453517e2bdf1e554ca607f434c9df6320a48ecf0817e5112025440e84d3e03aa7163ade410 -DIST github.com%2Fghodss%2Fyaml%2F@v%2Fv1.0.0.mod 30 BLAKE2B 6a680b6e14f0cbca536b1ca02d633e16b2010cee7f590088748339785b2989cb0f86a51fba709da938d4c10ec810d5fe022d7d1a5c269d5ece253a78a5b2069f SHA512 7ffc7a5c3e0b39831e590ce3402dbf5c95392e88a08576a16d9e1887b11400efa71a9d183d3f1e080081246f28a70262a679348f009f7da6bd41f253a60b0741 -DIST github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.8.0.mod 29 BLAKE2B e43df3e551bcfb1d4a4843ddf00f1a9432cf768420f49943ee2936fcf3e890e59734b71ecbfcb85a70212122df3f03582335e37ca7330df9e335214e75a849d6 SHA512 2ace9d4bc029947991eb7237e7343fa31c5192d63927de1701434c305a659cb88fdae12e9b604f06ab318f1c26b207821edbe11e8d9382a0447544b782630c6c -DIST github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.3.0.mod 35 BLAKE2B 0868f712c026b68559846a28bd29f39f584603cd79e1189a9ad76909cce7423a811f71265baf5b7f381a33bee76917759a9cb6ac131ab21450b4b52558cb6190 SHA512 526b97ecd0ccf878c0ada56c5217405c34c59d4c9cb53808f98b24a2823c0b3f1a74e862b9b1a5594034e570aa6749574d5e49212d6d48724e984f528b8c67ea -DIST github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.4.0.mod 100 BLAKE2B 2558b7edc234429c8bc0926d347231c2352cbfe83d83bc3c7e76ed0ac4b3a843de65cc3e0dede3f0acb7a2dedc623584eff8cb236787c12d7f5a47c9e1c39145 SHA512 5782a5d5e5d4c64244a8463e0f15dfb97de4b60b9fed527ebbd8dc5a26999af8ad0b3ce0064da30182c757785ea9b35f253c5946b233fa3d9a61c873b23011c7 -DIST github.com%2Fgo-sql-driver%2Fmysql%2F@v%2Fv1.4.1.mod 38 BLAKE2B 198f3a6fb7348bf50286e1dbb067e72ff854b1daedf1d181b643872aab377b930029feeb95d5d6ca21109facde089527a06922b9ea52cdd59ef553d69b984e06 SHA512 21ac6d6f8fd92ccbe09cb30d0dd6a37142907048cc5f9d0574824765918dfd8ccef96b7ceab9dd259f9a95f5c5be566ac00ff4eb3e37ba7c7c98f25b3185baef -DIST github.com%2Fgo-sql-driver%2Fmysql%2F@v%2Fv1.4.1.zip 106521 BLAKE2B c7c61852b093d2b0452e9daf9ab26b83ee6426a9afa4f67abb0e0f98ef28961017f774075f5d90fc05d6de3c26fdf90a1916b426b32a41e2cee8fb0452e21f03 SHA512 023209372d47d4b5279789f581a6f4452aaff1e262ecbdb3fbdc48a0939599e319109b99d1c79414716f1c426c143cc1ce506dcd38f304dd5aa3e9348084628e -DIST github.com%2Fgo-stack%2Fstack%2F@v%2Fv1.8.0.mod 33 BLAKE2B 366a1ff397488b2b1c7e42db8a946bced1eb8d4260a6c177a978eb978e14f89265e7ac1d0bcd77905bc89eb35b68b3ebb028c0dfc67ff71395ab14b62335d16c SHA512 f3dc70dfcf086b785750d5b346ea07d0dc7903937bdbba58eace0fb903e656b02ddf3a1d49b486ac29b1cac9ca9d346e964d55d3a4cc5ee5ae79ac40b24d0cd0 -DIST github.com%2Fgodbus%2Fdbus%2Fv5%2F@v%2Fv5.0.3.mod 42 BLAKE2B 79541bfacd3378a6c6dbe9591309a80390444f2dc2419fb0137c723c6a2ec1e0588c00704ce3c19dc93297b19db89f79bfa09daa2632f6674e35e76819473cb0 SHA512 b9aad4f1c1d4f2c43b293b0c9ca8a600a37ca407ba8b22b0f826c8355828cb7860a96a85df84f720fe8aa2840974807ea7ea7b790790c6dafed794e761f1f26b -DIST github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.1.1.mod 32 BLAKE2B 939b72a591bc5fbb649c21a95b2c4b3f5d3ade273377f1f89407e55f436e7a863f15d708aabfc5435334500c8cb1e3ba057439c8ec81cfde68c1ec6794c6de6e SHA512 ab6c57ada3b0d1e36c91f3e0f45e573b91a4869f230f02a7e5e3e5a8f7e020bf56c63df1cbdc5b552ef9a4229ab739cf76df7f799091a2efa148ab9e5c12b1c5 -DIST github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.1.1.zip 2461758 BLAKE2B e02c6e6512de9be1410923a6b3eec36a087f8de00e1d1e715a61e6f26a18352db169b1dbec49e3d563e294d8c65c51ca5b55361dff70d1e9e20976e46209209e SHA512 7f9d1d2671c82a1df5f79a154340dd1fa1e92952feb03a1ddaedb1f6cea371bde8d6f7c774a4351aa87abc2646f97891d0beb4d175fe9d51e2f761d37f2699ec -DIST github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.2.1.mod 88 BLAKE2B 0699027ef7284edb7deb6a2640db52a5b93076e3250d42710bf02a1cd7d5f591f1d335ffb1e7e753dda5fe177837fad87a25bf69b03466bb545708fb2952fd7d SHA512 b91b25b4fe769a403fd7a1f82d7720bdb0526a349ffe7cfdfff09a2ba5e0015d5a3446cd8e0e5fe46479b7d2296a8616de38a8183c0185f84fcfc75d202db106 -DIST github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.3.1.mod 139 BLAKE2B 0c793b0070acfae7ad92de8d8e177d6b9a2519d521bb397da4dc2610927374e4c010db6a4454783556edaabf64e585b00112aea05820874c49f9bb4c4f049fb4 SHA512 232bef55468d9ff66ef7f446d8096a44a0a947533c8665f0f018300b7ec1804a634299a1a6ab64deaa67f1475e9ef68e7be233dc72fb2d9173559800f01af142 -DIST github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.3.1.zip 2698974 BLAKE2B 5fcb1c66d3fa55efca631fe5def383ec089fab784cad7d6a031ea390463a0c552f5fc4698f7648d271f40fb0ae3eee525f149347bb409c951d15d86b7f560e16 SHA512 c7e2170eda176da203ca64e402c11489c1fd183afd3359742e373927ff228d62e445f5dfc001a471303e1708862998c125ad4c2db86919596297b11cae4aee9e -DIST github.com%2Fgolang%2Fgeo%2F@v%2Fv0.0.0-20190916061304-5b978397cfec.mod 38 BLAKE2B 3dd22c8b8c82e80965988cbaf0b8241af2d32273ae0bffc30f3da0522a327ea65f2f93a0496558551f2799ac7fa4cb8f103d80de25ec8def97ba34578bdbce77 SHA512 d7a817fa0adf48e773c941af6f6207d87204e153ddec86cc4bdc9508411fcec5179b4bcd6bdeaacf5512d50afc5f4ae4f5f25354acbd665698e6110ed4e400fe -DIST github.com%2Fgolang%2Fgeo%2F@v%2Fv0.0.0-20190916061304-5b978397cfec.zip 468305 BLAKE2B 6e31468404432f25552cffa1214cc144df2fca016663b506bb1e79e32d444d64b232220a94615f13b503a03fa89fa318799968b8bd04fde2b7ad52beae4d9b6c SHA512 05aa995076c218e0faf316d9443a1fe1f26eee7373846873ea406cafc52e090eda044abd663a3b26258c71edcb2543d597e51eda83fb2d12e3aa4f7246029abd -DIST github.com%2Fgolang%2Fglog%2F@v%2Fv0.0.0-20160126235308-23def4e6c14b.mod 30 BLAKE2B 6dea6116bb7fb72123a93cc8b83dca5455b76591c7948524ffe664bf966780799c4d007154502922e21f688aef5148211db6b0e3dd3f6b545c4192f5bd5166a8 SHA512 3714d2a95d0435a113c36df5feb13f77a07a1514fdf6b5f01e6e8cc5d159067736e0065bad8062dc636fa5c52c98e3fea6985075005b2838bdf53e0b07093024 -DIST github.com%2Fgolang%2Fglog%2F@v%2Fv0.0.0-20160126235308-23def4e6c14b.zip 22449 BLAKE2B 8d2eaf41ab75e870a445d50b62c02877ae8049e282f066d9aedc0dfb54d04af55d921ebc84d1e4131cc66a3f9efdf8270a0e423e563d3f8fc5a6bdd403bcdb39 SHA512 a3c086e660f2285d9fb7d56d1eba74994e8f0052363413337413cb50009ba46d3a432e2b4c67a73bfb753e7c60646d96bdad308d8e634e53f0bb0bb97ea17bda -DIST github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20191227052852-215e87163ea7.mod 36 BLAKE2B 3eee85c76d1ccaca7488ee3039bae6a7a9b4c8253481cdf6d62d1126623312a07264ed0e061bf5d7bde3aafb23e078b2bc86c3718cb2fff6618976c420c7dcae SHA512 5a0f44d45d666885e31206077a515fa02246d56699aa02f7809868029fdf6a718a5df8edac0ec245880f982882c2f4ca1d13a1dc0c7c0f79d7e89c6c46fab523 -DIST github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20191227052852-215e87163ea7.zip 39683 BLAKE2B cebd7b69e8f18547e77e07d49ca26fabd513b6bf95317553c5bcabac3b513dc1d7becc259118eadbad18ee4d45a1dffc3ec96864b80d87c0dc6885983bdbb3d4 SHA512 e7a8277f9b7d2e35d1e8586c580d03457ac1e755e1051fcda20ff9f819a6fb9c3cd1892be3a50d4cbf141b35d1c7b85b27bdc402eb45b700a37ce994be4e5b5e -DIST github.com%2Fgolang%2Fmock%2F@v%2Fv1.1.1.mod 30 BLAKE2B 5c355e64d858c99536e459f9fc4428dc00435bea944b67bf3dda5b61edb5f0c193c5857eb10bed926987cef865836c3f7ae3d8f081a58551ccd0772e4eb565b1 SHA512 ae6a1a6f8d31592ea6141f2ea39c9b60cd28e73ffae74bcf370fa739865b95a7ed56f687975f017b42c59e3b0f1c02884fbd5c93140bce268771380c8c7a7a96 -DIST github.com%2Fgolang%2Fmock%2F@v%2Fv1.2.0.mod 30 BLAKE2B 5c355e64d858c99536e459f9fc4428dc00435bea944b67bf3dda5b61edb5f0c193c5857eb10bed926987cef865836c3f7ae3d8f081a58551ccd0772e4eb565b1 SHA512 ae6a1a6f8d31592ea6141f2ea39c9b60cd28e73ffae74bcf370fa739865b95a7ed56f687975f017b42c59e3b0f1c02884fbd5c93140bce268771380c8c7a7a96 -DIST github.com%2Fgolang%2Fmock%2F@v%2Fv1.3.1.mod 93 BLAKE2B aa4bc48d8914434d540f570e6017b3572dc4b75563174e73ecce9f86460669a264389e1e24ce26cbe056a26865b3cee294457315034b6ae9779001b7306d91a3 SHA512 5dff0170dc085e1be63ce69886cb019b9df09a5678128b3b0a1b174756500f7d4bd62dc25ee7546977e298f719746ce951119908ff59463a79a1aec7a8882e32 -DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.2.0.mod 34 BLAKE2B a4239cba934b6e80714b93d47e88f22ad28ce41d1d984c4261cc3f5f3b857fb28785223fa911b258e2665be2a9d24ffbd925e9e0f374452a2aacd712ad9d5f75 SHA512 e059a34363bb826bbcb8981adbfc10da90e04b86dc5376ab20bdfe1fab135953cff41ef1daa116aff10e9f3e6503168f6baf902f09aa0e8cd9a0da96b932f4b6 -DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.2.0.zip 482403 BLAKE2B 47db66e9c8187c20b27b9aeb8584f0f2289084103ccda25406eb30059147c3bcb867c76d145c4cab7eae801ed4cf76a63efe23f091e05c9206fcadc3358a02f6 SHA512 d102d00618f077f7d677eea9f0d4aff600e4b95caaca6ae6021355e64ed0a8fe418fd731370baa968f6fd338e377b5d3a2077b0b8a1ee399f992b8a7717cf77f -DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.1.mod 34 BLAKE2B a4239cba934b6e80714b93d47e88f22ad28ce41d1d984c4261cc3f5f3b857fb28785223fa911b258e2665be2a9d24ffbd925e9e0f374452a2aacd712ad9d5f75 SHA512 e059a34363bb826bbcb8981adbfc10da90e04b86dc5376ab20bdfe1fab135953cff41ef1daa116aff10e9f3e6503168f6baf902f09aa0e8cd9a0da96b932f4b6 -DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.2.mod 34 BLAKE2B a4239cba934b6e80714b93d47e88f22ad28ce41d1d984c4261cc3f5f3b857fb28785223fa911b258e2665be2a9d24ffbd925e9e0f374452a2aacd712ad9d5f75 SHA512 e059a34363bb826bbcb8981adbfc10da90e04b86dc5376ab20bdfe1fab135953cff41ef1daa116aff10e9f3e6503168f6baf902f09aa0e8cd9a0da96b932f4b6 -DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.2.zip 465217 BLAKE2B 4caaf832a22faf1c45e04bebf35d29b38bfab18a490ad1fd7b2c6cd85ae678fd3991505f68e526f9f2205cf919374b07d57f8abe95d8f74dc8263cd37a9db3dd SHA512 7fe69c066b2407e6000ae21888f6cc696e51df2342a71e196aba1a9a9ecce630bd9a4d41c58b3105002508a4d0efb9c5ae2b8a87f848b8e2c6293558b8c4b4ad -DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.3.mod 43 BLAKE2B 1985b508a7ca5fbf7283bfe42510dd54e1e409894b4bf404c918943c8bbc38a3682d00322514c8fef7d6528059fc547534bd956fb262f91fc63dfd6e97fe0bcd SHA512 17d97ea39719fd59908591504c8df288f5914243fcc43a2cd8cba6c2c50fd6f5315b17afa008f92ecdbda732d5447f848d31bbbfe59ef9bec78aaa3f25f51833 -DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.3.zip 458249 BLAKE2B 54ddd18b48745d6ad5a14e52a3eb57e28dc5d3ae87696a46dc48c867c7474af1b496d941005248f3af82ba4d2b964516e0325039e0d70de3758eb39e7c17abeb SHA512 bbde51e57a81708409dcc88617f1f5a4f7756c64912c4d0610899c6210201eb50782435adbf84cf622a47dd9a479c31113854d7976a434b3d882d218478b0e4f -DIST github.com%2Fgolang%2Fsnappy%2F@v%2Fv0.0.0-20180518054509-2e65f85255db.mod 32 BLAKE2B 8b498b103962181cf69cf5de686eee1a7f0e481ccd35430e33999c951b91ebb98e9dcb1dc9c4e40cb379fe4abae40a47eb36d9456fea076e44245022552d055a SHA512 c9faa5760addf2869df9a3ec5ed9da02944823afc5be93b8b6193c43261d167cff2aeb65bb844d959d368ada83932c86056aefbff799be326e889d3de4c2b8f5 -DIST github.com%2Fgolang%2Fsnappy%2F@v%2Fv0.0.0-20180518054509-2e65f85255db.zip 70555 BLAKE2B d83b37593eea44bbd11100af9c0c41bc2b55e14d06ef1fae1dce5242bf8cea1574c97a7148e7878385fd4bafbb433aa26fb4fcaa47e766353b2b6c179ddda124 SHA512 3ecebc76ab8e8f3cb65a95065639f3e90b5d722ba1aa564b42104e83ea4bd67af65e52c73a33b9b327b9934553f2c5b7324be8229f2c2e95c495065360a37c54 -DIST github.com%2Fgolang%2Fsnappy%2F@v%2Fv0.0.1.mod 32 BLAKE2B 8b498b103962181cf69cf5de686eee1a7f0e481ccd35430e33999c951b91ebb98e9dcb1dc9c4e40cb379fe4abae40a47eb36d9456fea076e44245022552d055a SHA512 c9faa5760addf2869df9a3ec5ed9da02944823afc5be93b8b6193c43261d167cff2aeb65bb844d959d368ada83932c86056aefbff799be326e889d3de4c2b8f5 -DIST github.com%2Fgolang%2Fsnappy%2F@v%2Fv0.0.1.zip 69641 BLAKE2B 7d5306ebb893e705188699f7b5e690c375bda9e0ab4c904aec10560dd75f278016c9f69ce4973260a4e5a8d8d7dd7c2f12a59f98e96a4456af6f23fd0db224c2 SHA512 fa400e3e1b6f57e29c93ecfb1dd94ccb1e4e4924f3b62ae125ad0bd88d56b5c48080ad78dbf545c1056bcacf860b93363a27780dbce2b812c5b58ca3c74fd11e -DIST github.com%2Fgoogle%2Fbtree%2F@v%2Fv0.0.0-20180813153112-4030bb1f1f0c.mod 31 BLAKE2B 910f367210db741c9f31a77f8eaaea348d3accbf0f219efbed95a780b93e2416fe64dd420ae45ff13da94a8f2a0c7b19850b13e1d9fc6cc1249d327bf04b5fd9 SHA512 f2ff873ecf0144b7f434810af1b49f66f09b4bcadc91d99201465a6ce36c7e7f05996f52800be287dcb3b62e14b75fcebb7c32be0eeda6bb0a15a23058c2d410 -DIST github.com%2Fgoogle%2Fbtree%2F@v%2Fv1.0.0.mod 31 BLAKE2B 910f367210db741c9f31a77f8eaaea348d3accbf0f219efbed95a780b93e2416fe64dd420ae45ff13da94a8f2a0c7b19850b13e1d9fc6cc1249d327bf04b5fd9 SHA512 f2ff873ecf0144b7f434810af1b49f66f09b4bcadc91d99201465a6ce36c7e7f05996f52800be287dcb3b62e14b75fcebb7c32be0eeda6bb0a15a23058c2d410 -DIST github.com%2Fgoogle%2Fbtree%2F@v%2Fv1.0.0.zip 17644 BLAKE2B 2ab156c678ef5120adab042c415b287bfa6ebf901181837122bbf83867ff312900a16a24c0f375708f915628ae5bac93b42f659663cf827b81e5e6c4c6e47769 SHA512 b54c7f94aef24c769a0478aea5dedbf67309dc3f59a5d7cf52ea8b49e81783d87bf80e5bcfa36f1f95a65e64bdd8312d20ebf81cd73952af5481b2f1f3619eb9 -DIST github.com%2Fgoogle%2Fflatbuffers%2F@v%2Fv1.11.0.mod 37 BLAKE2B 9355e4909ed1e7ea43b9882cdfffdc9c986b9a8febd22659143b53f05b4c7a9b152e01848cacaef750ce4fd7660dbb62ea3e0fec4bc2abb47dfeb566248df33d SHA512 9d10e0f8380c49034398df4cf8c9500a0e1091001f08b9574da6933b861210dc4d518c7e353570618c4d4c432c0162e8fab4b4acd64a2d5360efe456fed4881c -DIST github.com%2Fgoogle%2Fflatbuffers%2F@v%2Fv1.11.0.zip 1180341 BLAKE2B 390754756d725b5b898089e5375fb03452a168eaecbe5a6d7d596a781146d88ccdb822ee5daea0cee7f3c63040702d602d30a99a70def0880c9bbf60d337da94 SHA512 78d6138fd0a575d70d3813fa0dca70dd8ae3de591ea41d795462a82dcdbe73370fbf17717571e396bdeb1b67d61b0b8a34872b0e7110cfc9fd0fd3e3c6b985db -DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.2.0.mod 32 BLAKE2B 7c7baa1e29b9806fb97e0d557200e8722f2d373e149127307efa285cdfedb36dd57355168554d1a1bada62144e6a6a00c4d3246aa9afc7d0ffae0f087459c552 SHA512 7229d917bb0c788b07297e1b09b8f7952f951998a56f17ea1f69ff7c2f565a5686b212f42f45c6b8351905d6740a2ec5a235e493daa531ae00cb709faf67ae45 -DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.2.0.zip 74164 BLAKE2B 6a3c04c2986b35dcc32f14553534758c3270c294a5e2595487f884e32e76cac2ebbc34cf7e42232eb7d85e71fee7660b513de4e365981e625515b086c341d15c SHA512 7be2dd2b362f56ad7fb7be35b62a841ca051d4fe31ffe1ca784e393b0cfe44674a050cf1129a15094872bc16c8ed9bc62afe0e7017bcaf1a4eb9b2e39423f790 -DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.0.mod 40 BLAKE2B c717b6aaf18662c20120746a021b0ca878e7b190b3456cab24ec98032390a85b0af8540295e470647d403bf1beb582c8f8a74fa7129c4cbf747257206235c5a5 SHA512 351dc24af135b9c9d714aadce40fe9fa1ec05a35a4df90af79926d5119c3f33a6510ab9d78243748d7dad10bd2178f47d342ea2389972b88d5e9b4be6dee7daa -DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.0.zip 99332 BLAKE2B d95e04036796b0687ccfe18e2cae196efa87fbfe7a763a219860a82117f5a7ac594af005d67698289a9fa0f19b9c397f850ebcc8f6b2e2390fcc6463e95dd47a SHA512 6922e27a1a67c4e858880ca338f68ed80bc01175801b2194a900ba265c00eb482c29e785c564e9afb8f60288593b315ae8af6c8f366d35475678003440115d26 -DIST github.com%2Fgoogle%2Fgo-github%2F@v%2Fv17.0.0+incompatible.mod 35 BLAKE2B 87a5884f51a766419a5bfaca4d6b317f2e86680e7347d29dba287e4c2004db6b8a8afcb2b2b8145cc3f9a502b768105eab89ba0f3e99db44427fd3eab9d3ac8c SHA512 6d285a58dc91fb57f990b76b3c2634247bee990ec1bb3e0f11b19fe1edb3b9b1998030def12b20a6f05c574965ddcefda6883121f5aae70c695e031e72425178 -DIST github.com%2Fgoogle%2Fgo-github%2F@v%2Fv17.0.0+incompatible.zip 347066 BLAKE2B 5ef49f931c987f9a24880afbd3ca231093bb43f0c059df9110c38ffe3ad54c4de3851cc36cc9af15b49112462cc164b0812c8872d5fb2d61d0cf751040213762 SHA512 3a24fd40eec7d23c69143355338019544fcc935b01f63f604419a5d7b5f1222e89de7e28dc86454e57e262f9bee5e4333395f3b8d7392c6e87b7e8c442e05709 -DIST github.com%2Fgoogle%2Fgo-querystring%2F@v%2Fv1.0.0.mod 40 BLAKE2B 081291e204018d8256655052c8f518c8d489818e899a6932325f2efe7a33dd7228f1bab1fe31f190c2cd1a022b8f320c2a779910231122de430bdb6c196ca95e SHA512 b47c833f93e2d2f9746276fb7608dfe01295cead6b0c9cad36863e9c6da80e3abe8e7d79afb113fe382f73b641fcfd717090a8d6ca2d94bf2807fec07cd57574 -DIST github.com%2Fgoogle%2Fgo-querystring%2F@v%2Fv1.0.0.zip 9151 BLAKE2B 853a982f1c3b2b60fb44e3da969f7cdbeb6e5214c549e47dee57329a9c93c8786bcb2af6e3aab5f7aacf0bf0c70beb26f95c42b796cc2cff5b9b825040cf5a11 SHA512 e13c7622fe1c4ba73fe147255c02d6828f5d5deaea74ee14a97dd689819547b913caef4721838a68490991c710156307cf0487866d200021cf9d774a4600e52e -DIST github.com%2Fgoogle%2Fmartian%2F@v%2Fv2.1.0+incompatible.mod 33 BLAKE2B 694b57887cca857fe6950b0df444dc6e3d757dde540c1846ddcd4bb8f96a5eef3f469eaec30cf415541ff2f53acaafffbf4032189122875603d7e5e3dad2ef97 SHA512 cffb5dc1c6531ae9d5998b3a57ba14de5dd8631a36dd48975da07ce5ec052d97b6f632c5d30ab9ab695f178758837aae8a6344c67d57c7a39ca8e9243f8211df -DIST github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20181206194817-3ea8567a2e57.mod 31 BLAKE2B 705b12f16ca8f0258457d0972bc8845b553e9e8d9001de0f4a4a548afe23424b0902fee4c84e94bcbc4615401d1369730a60bc57de85aa674300c1a96ad1f128 SHA512 c7e8b1bdd0360b88ccdcfd0cfe73e5cce50010a21db41ec2d533f7863b67930fbb84f430b9ffb663c394256628b05e884b812c040354779e0fdac2a422ac57e9 -DIST github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20190515194954-54271f7e092f.mod 31 BLAKE2B 705b12f16ca8f0258457d0972bc8845b553e9e8d9001de0f4a4a548afe23424b0902fee4c84e94bcbc4615401d1369730a60bc57de85aa674300c1a96ad1f128 SHA512 c7e8b1bdd0360b88ccdcfd0cfe73e5cce50010a21db41ec2d533f7863b67930fbb84f430b9ffb663c394256628b05e884b812c040354779e0fdac2a422ac57e9 -DIST github.com%2Fgoogle%2Frenameio%2F@v%2Fv0.1.0.mod 34 BLAKE2B 1eabef50b2977886d7980d7da197828b826c54018766418b3160f5cd512784635e5791a40cc4fb806d52f5ead99f941fae8037872d6cedfd6c851103f3be1a74 SHA512 a46cae976ce90d1cef802eeaa873c059cc9ec3678d5c3c304a9de45f44f20a24d68fa290cfdcf78c4ac222a6d619a005825de8f11e72b9a5af476a0b0180092b -DIST github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.1.1.mod 30 BLAKE2B 704029826c505198458e86463528ce2c1b209376f376b92d4f05a0f4094d161b45470d04ed3c1b5635397aca3126c25911299711139d794cca3e9b2bb373ee17 SHA512 695f3424e0cc247a069fbd6b94820554e003030eb0e208ba7be38f660c5fc29f74a057e60031ec77918b5b320913d6deabdf19a0f0666b0f5bc5e2724e1fddba -DIST github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.1.1.zip 21279 BLAKE2B d8013c686f7cd497091f4c7d782b283eb95faa7617d68ec7f8cf937c5925d677d8552c662291e41cf2c137fce163d45fb62dfcde88088225c13e0980fcde3d7e SHA512 f28071ffb6515262fb73276725181a806740688fea8de8d9484e1204fcfe6e5fd437e38a3299acec6bb545deb31373d910a09d92937308176b2043ccc9f5397f -DIST github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.4.mod 88 BLAKE2B 840afaa28e8d5b816289e6556e114311f039b477e5ac86fc1c2ac80b1f8d7729ab6a83b99baa4c03de9634240481feb13900fd4049753b8de839656d6a7cef8f SHA512 31e50016a01fd485775368e2e430959278cb6c03ae6b1871b3d0c173fd43e91654ae87d1758c08daf897e55be8b4044bcb47fc072ec645d16e2594f345b46c73 -DIST github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.5.mod 79 BLAKE2B 21f442637ef0be838858e192b563e158bf6ed1f7e06e09a3872fbcd613046b095c5209d9ccd9cc0853ef14947b6b70d4483675505d0905a1d2aab15e7bfdf80a SHA512 2af320b0514b032ee87a92d99d673579981571f325d0d46133e212a639eca274d5a6f8164a7256cfa6c063967b98ace36e637f53d90331903fd6e4a21f1a5a19 -DIST github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.5.zip 16077 BLAKE2B f05e4ad34d0ca2cf07ed10f5b4510f277fb4fe621523c213016171a42be56edc1b33185a93226b0d04ae6f629358603030083c7b5ba03a36fadf8349b0ebaa9f SHA512 240fccffe9eef7f5900b7e3add1fc95b45efbca63d6c09086ed4a0d4c50d470fddeb01672da067222c107b794c204f8da63c366782c52e7b7de6514c310bcb7d -DIST github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv1.4.1.mod 45 BLAKE2B 5f187c997ed74f2aab1da57c9a828be383e41f47905531da8babc1360612ba5d4cc0fc6cc48106647ffa450f334c7cc5f455bea7f6e6b9734f3e55734cf623c6 SHA512 81ef224435efb5cbd429dd4339e8410234855f4a268302a61d34e76c388e89ea22c97ae90d71a6ef910ca00d3178e40d3587eaf484112966050fbd1f1f4843ab -DIST github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv1.4.1.zip 79215 BLAKE2B 25312a1d971b0e214f92e88846586f3cb96a23a8df927d2fa73e37cca6eec4d55cd88c3757831f37661ed82a0681a9d0c3e1edb32e5182b1a0b8e349e28ebf79 SHA512 8de80f729d0538295606f5900e9f70a3f77c4b6ea7782c9bfa8520ec89c75b6a7ae08b42b6ad0dcc261f9e9a298bb58645fc97c4e5c2b51cbd6cbab62401a2ae -DIST github.com%2Fgrpc-ecosystem%2Fgo-grpc-middleware%2F@v%2Fv1.1.0.mod 613 BLAKE2B b44c16f9b7d3d98bf2443388c993fdfa2e3ef12701a2517673d02ff1e2f8af172c59fffb5209e2bd614a94dbd7025f7f3aa4016efed8739ef60b71d21950ccbe SHA512 e5e04af7c8223f2455614409c8bc5e856b0fa66ec84289bdc96d2bbdc5d800136e93e862b10dcdacd1e8d6ebdfbcd1d56f3f9725588c92b618b09cef2557e3bd -DIST github.com%2Fgrpc-ecosystem%2Fgo-grpc-middleware%2F@v%2Fv1.1.0.zip 137405 BLAKE2B dc8aa9994d7e76d08a0b727443cf9f8703ea6cc392369816a0a57634b1f3d4004ceb6f09f904b8ac200a6306c898c8ac7afb024e81a433dbddb243af0165bda4 SHA512 fbd8d097cdb7b62c828b6d307d85aea05561fe613a7a38d64d73b107d0bdc067c5f3c6764dcc0705e41f6641b9daaac41eccb94623d50021334330c4c018f9f5 -DIST github.com%2Fgrpc-ecosystem%2Fgo-grpc-prometheus%2F@v%2Fv1.2.0.mod 52 BLAKE2B 9e5de5c147fb3f100119fc7c290e9790af57892762b7ea8b2a8328c397432466ba56ee20b64ced6dc548d58bf8ef0ecb2e62a51de2524f90a0ff39921d0f2a3f SHA512 c9e15e4a4436ffdedfe5ece51858a45806d6fd77d2306c35eb986a866a3da5bec0d5d06ddba55a05ca45c8c29a51bc7c58150849b5dbde569a6810012f3ace4e -DIST github.com%2Fgrpc-ecosystem%2Fgo-grpc-prometheus%2F@v%2Fv1.2.0.zip 35110 BLAKE2B 4ebd3cf0dc4580a53cbefe7a955cf05cb6d1d60a69951ea4e18eaaf108ce2cd5bfd0b2dc4bed62a12b48922f6f9dcdf1e598b77a946bfa0267314caea827286d SHA512 5c8e6beedefdf390a9eda76fd8d5042323e1c9a6306605ec7ca8b1612bc038a6cb0c02ca1093e0b6373a05ea64b7eb0c0bc62720a74b37d4ceb61564f4d46753 -DIST github.com%2Fgrpc-ecosystem%2Fgrpc-gateway%2F@v%2Fv1.12.1.mod 535 BLAKE2B 2be9f841d89f87d8b4d2935360953fc003863569b6caafcbfbc17fa8c3f08b480c6a565861db774a4ac3b40539c42185e00d9ab3d4611ae7a92d8bf1acc5553b SHA512 f803cd5c2d7b959df845c0c0f118573718be692698685c1e8201aaea744279aa32b4f8a930e57dbc2fcacd5872498d253849066a97dfa832a45a309569e4e992 -DIST github.com%2Fgrpc-ecosystem%2Fgrpc-gateway%2F@v%2Fv1.12.1.zip 572297 BLAKE2B c3918b6dd0629ec238c1bb7a02c5ac5c10c5c70456a36db837be393590913c4c6d5682166f09ab84f2796686fd8040fbc5ae3a0e5b52d1ab1a2c351126f9ed3b SHA512 c26c8a84e10aabd8c58882b479be2c29811ed0230c01ee58f15f445224cbd7506920dd2e5c573a10235534bc31f712c171a08106249cea73d5404a2f0a0d4dd1 -DIST github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.0.mod 39 BLAKE2B 13f90f934356dd1daefd27a94bb7a8c31f09835ea69f3fc83d343004858c6728bdd6bfaaa919331f7ee04744d18ac37f46a13be9feaa20e24e88ee364991a9b0 SHA512 bc3e0c3b16454e0f079bef539857c22f09ebf11e78ac1744a22f5af87d7297979b7ccdd48e4f59605cac562c268c3cacdbf2745f65be5c934f73f216707120e1 -DIST github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.1.mod 39 BLAKE2B 13f90f934356dd1daefd27a94bb7a8c31f09835ea69f3fc83d343004858c6728bdd6bfaaa919331f7ee04744d18ac37f46a13be9feaa20e24e88ee364991a9b0 SHA512 bc3e0c3b16454e0f079bef539857c22f09ebf11e78ac1744a22f5af87d7297979b7ccdd48e4f59605cac562c268c3cacdbf2745f65be5c934f73f216707120e1 -DIST github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.1.zip 19548 BLAKE2B fe48c3db37bc280cf5f36e522f4b13f7daa45768cad11c1148634ce7af618c1c20f568f98ea7193b0be7021fe8a4d209a4a7f1c94be3c05924a36022a57c46b1 SHA512 6927a910a368e1f2b0792989858d25c5a55891082cc38f5907c539a35919916e02872619cbf45ed583c6f6f8e85936a3fa790a161b071dddc922383e983d37ee -DIST github.com%2Finconshreveable%2Fmousetrap%2F@v%2Fv1.0.0.mod 44 BLAKE2B 764581d416faa477a91695a42c68cef5638d019a1622fb3bcee976c1581e904995d33c79ffed1d3b805f660931ece844b3e17437f158f8b82ddae82e95f0358f SHA512 0c77200112d96f9cddf8cf7da0059204914b06a8c400e2e672443bd02a45d9ebb3274275c20e6e7ee0728992e77579d945b36de44ccbaab2ee92fd55f382f7ac -DIST github.com%2Finconshreveable%2Fmousetrap%2F@v%2Fv1.0.0.zip 3712 BLAKE2B f4f79741bb83862583f51f2ac5e80181eb0e9c2a4578df32f7e24eb98f4f548b99333e0e6a377e03ef701057b01e852e6b710ab885b65170c861bef556863da4 SHA512 e16bd414c1df566a12944e4a99ebd84d2103f0cb3bf8ec312e3de400f20b3eae27845db50672801c10474dbf1dc61d0c2e16e5dcd3c4447681c0b77f9114a411 -DIST github.com%2Finfluxdata%2Fflux%2F@v%2Fv0.65.0.mod 2193 BLAKE2B 5915c62df75a52c3605aa6411cc7c69f1658345bd8b75a8e381f188c6da251aa6a0fc55f3044137e39c5980938e387ae48b151e0a3fe862a259ba3ad9a698326 SHA512 14986b3e68f459c9978e6912df35ab1f95eaa16e1554ff7c69b5e63a8dea1b012593bd4c1937abc1361e295ce2abe22be4f3cc1c6a1087c5199d8324999b35fc -DIST github.com%2Finfluxdata%2Fflux%2F@v%2Fv0.65.0.zip 4038797 BLAKE2B cd8b4c94eab6afa533893f40c1ccad089245d8980e97edd252ce703c19ef9560f5b50f3dd72dec94773150d81abefebb778be0785c3a4a93e7af783f488cf153 SHA512 5629f4165ad6f3252d8c9ede02aa321bf1e3fb2ae261e3fb364cde6054a1b90a592463c9c520a882dc76fa548a1b63356120eb6be372b9ae996826c2d3f8bd75 -DIST github.com%2Finfluxdata%2Finfluxdb%2F@v%2Fv1.1.5.mod 38 BLAKE2B 30b16c532180970779ac956aaa49124862f9c55e1493a6ecab8d03c5a719ac0ee4e747ffa56570c761ba660beb63ecf0a1a8eda0c4ce246ca2ac6949060038b9 SHA512 9840bb7405945d53cf1ad5fd29828c0546a57fca81fd0fb37fea26a92e977d1fc5f07987897476c5baecc7c030528f698bafb5b168c30dc59f3145b4c50c8479 -DIST github.com%2Finfluxdata%2Finfluxdb%2F@v%2Fv1.1.5.zip 1538986 BLAKE2B 2d4483493db7e3b8d6fe3d434079678c4dfc187f00b8e873f26216a8b9be8292fa57ce28194b93ff12a3f8c9b8eac1317fc5dcf1e4363e20326eec64ee5f38a7 SHA512 109a2ef075a8e98fbeaff79dff070b14d1829143b8df81777f06227a32f76a0022b65f81690b02b94208b83b42c8aab28f67e16c550152f1f3031eda5eceb00b -DIST github.com%2Finfluxdata%2Fkapacitor%2F@v%2Fv1.5.3.mod 39 BLAKE2B 1607627025efa59ac68965b2ee5f9b388691fc97f4cc3cbc7016d6d60e3f05e5e7679d2de1dc580b36bac9db2b7acefec4aee2f8b1c61795e7acb717a404c342 SHA512 2f2812e6b739f7b631652a1de7651d83442066c9e147f0e9654b58cd7b28d0e790d2a9e4413a22369218bdc83c9411e9cfa9ac2a4ae5e6def456c82f741b4cfc -DIST github.com%2Finfluxdata%2Fkapacitor%2F@v%2Fv1.5.3.zip 1061339 BLAKE2B 54d87acd0223991e8b9f1b4472d83c915ae4544d69e705dfd4b965f114be9d2b43cf4e88f6a57644ab6304f5b171a82c2c6e2c19ef56981390dd3bc9d6a54296 SHA512 3982f483549bfc2667567b94d4a7c2d087bc1006a560470e3cfcce34ab7ae41bfae491896f1fb589b021ee01a0e3c0d107fc32641bbb8dfc07914a8d6d59fa3d -DIST github.com%2Finfluxdata%2Fline-protocol%2F@v%2Fv0.0.0-20180522152040-32c6aa80de5e.mod 43 BLAKE2B fddec34812812262b5b2e9499391dbad71c00fb2546658d031306189207c366ba5f9863735c4a52c09b838f2b052feda55bc8f9e424447905725079f7877ef49 SHA512 f40bb2ea09705727ab3be3b8598b471e32dbcf5a67e64580faae7ac80f8b8504964a30b8d84cdedafcb47577bbe021e73127a2053ce04340c27c00726572edd8 -DIST github.com%2Finfluxdata%2Fline-protocol%2F@v%2Fv0.0.0-20180522152040-32c6aa80de5e.zip 7883 BLAKE2B a7d9cec7fc98b9a145f5f44a5697f1a46fd205a3917d97a6336fbee898325b325d637a56f65e0426fe74ec49f93acf6c89b07bbbfe8bd667a5ae48cf37ae7dc8 SHA512 b63f273f0d16f304e3cca2d7e739b91df0ee7f1fa53f409d2daffce3975232b904614d5b6ea7d1595c3fc1a5e9bd76cbbc2254f98e3743f4e7bc510e87711cce -DIST github.com%2Finfluxdata%2Fpromql%2Fv2%2F@v%2Fv2.12.0.mod 198 BLAKE2B e0abd56792debdf075818269c29a5928ea182b7e10792a2bce20f217db64b3922608067c6eb4a87a88c981c44478ea9e2ee3831905c724b103f98170718db37a SHA512 3cc83aabd3742a8dd775077f4c71055ba6a7949a7730af7da6df9e92bfdd7688c02b8c6f0df3f51b22f84a6defeb79040a6f1e9b78becb680358fdefd3e7528a -DIST github.com%2Finfluxdata%2Ftdigest%2F@v%2Fv0.0.0-20181121200506-bf2b5ad3c0a9.mod 259 BLAKE2B 4d4f1556bda08820db792730d893a735a856c824073e1b66f8b9a06e2512187038e4ae5f465d1f9b1e4e074c69722d5003917cf40dd6a0f61e0a32697a99c2fc SHA512 76e847d693e7e785e04ffeef5b48db94ff1a8a317a4037710522b596adf01e30c4b4a38e5e4b8040db55a5b1b3a68911fcb8b1e646473863c6644adfe5cf9759 -DIST github.com%2Finfluxdata%2Ftdigest%2F@v%2Fv0.0.0-20181121200506-bf2b5ad3c0a9.zip 21991 BLAKE2B 4515169854c8edd0e35eaaecd7a072eacd1a49ea0f83326e9c9977fe1cd300db4d92a3fd298f415e1817846a42183257947a66ef1b73dcf64fe2a2067c73d938 SHA512 45168ef62dcb9f294e34efcf820d93bcb2dd9e3c8bad23fdb9a4a1eec7a2fff90de7f52402fd53a7a62b9ec558e1137d4a3d2b40702a6b10078ad05b182b5b5d -DIST github.com%2Finfluxdata%2Fusage-client%2F@v%2Fv0.0.0-20160829180054-6d3895376368.mod 42 BLAKE2B a4aee4aad699064a4fe353531afb259439d8b83aea1ef68037faeabffaa4eb5e74b8d8dc85a34e67c068e166510695da32711906ff7a4a99cd3bfe572d4d83ad SHA512 58805194d2ba4f084b920a808d036aeaf794ef9df76e5a251bdd0ec073b02dedcf1a9c78bb9022fc4b1cd3c1b89215464de81ae8ae6415baa0aedde273867d01 -DIST github.com%2Finfluxdata%2Fusage-client%2F@v%2Fv0.0.0-20160829180054-6d3895376368.zip 12856 BLAKE2B 97c0757823b24070a5d0252e884d89cb2be7f4d5f9e5bd58343c40e0663afdb5698f53aa4c86e1ef099be3c4c31f9d191c40dc2bd4c296b4817c0a8de6775240 SHA512 d5e985a444279c9f77bed9cbb1f72022f98847ff10a69c785a2ddd42d7eebe0d12b653645fd2273855a01168e32841f0fad154e624a3758c59748d1251855902 -DIST github.com%2Fjessevdk%2Fgo-flags%2F@v%2Fv1.4.0.mod 36 BLAKE2B 67fdbc6d14995318979fb3e5575136262165afd7a1582f078d2c84c5d7fcc893f52707f01d798bd2a43e1cef8fdab6613f34fd9e4f5f1f6a61d91bf09a55ffa7 SHA512 5db9838fe6a00be9849cb79ad148813a573b652d6f6cf220c55b68bd23636016e6bddd6733f6b29d63e5f02d2750a86c2dcea6b964ceb87d4048d5c5f3cc989b -DIST github.com%2Fjessevdk%2Fgo-flags%2F@v%2Fv1.4.0.zip 73484 BLAKE2B f672190275344f13b69502306133f6d009fe380f079ff20aa18366ba790ba6bdac3bfec7e7c27d8da21a463a5adf3a0a5d7bee2a08cbd12d9f7c8fff2450fe55 SHA512 a66fd5693b4a57cbb994d48bbde37ad226f57bb73a0bad7da5e5763af5826795bc282d2fb23e60565286223050d4f2c2a5cab9bf7ef646cb571f4d844dfc2749 -DIST github.com%2Fjonboulle%2Fclockwork%2F@v%2Fv0.1.0.mod 38 BLAKE2B 091e824ab9156af7978fe3aa6f61ae046588510903cf635ec166225395e40df6a1c715e4eb3c47aee849435eca3cc10db971a7c28acdae233eda85a4408c7520 SHA512 377d94cf7dd50f88b57ba829ded5169a6c41c5a304814660df0a3447d10860b87855f25cdb945a6e4de14c41281651330d4109c6dd6684c86fa4dbba27a3872d -DIST github.com%2Fjonboulle%2Fclockwork%2F@v%2Fv0.1.0.zip 8857 BLAKE2B 2887917f30fc4cba4c028ce8d42262b007ecd785df9f4ba1dd74f9ddf68376a6c3af924449684c8ff8ca530b249445a7ac0ea36a63fdb18d767ed3649a63f7e0 SHA512 999ed7f22551e55d6b4b59af2ff2692ddddb251de4c61a835ccbb9f8386ae426ef8df6c3434b8e8e143faacf82ab64e022350f9d57ec51544a27042465cf920f -DIST github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.6.mod 35 BLAKE2B aa26eb3b67893fa913ea0f88bf22ac283c6cbac246683f41ede681940cb2e4437d033811fc12f2b47f9d94337dca9cdc926fbb5f044b2caed19c8e46a5879432 SHA512 e8bb59637bc1154ed648179314c4e20fa7f549353d094f4861e2fdfaeb70da1c1711c1159e78d82914a35b8ce184641937efd8808ffb1384136c7a6f3fbeb78c -DIST github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.6.zip 130029 BLAKE2B d93b46be80649fe8a93eafb6d1bf323daed352a9502bc00034da2bb868b757a32ee2417d0c1fb4f79693f076317d98c35987807f4823fc508043115aa3646a8b SHA512 ff2823c8371568a825075309054e424816e45c0242efea76d94127a72b875ff54d7c7f415bf7aefcb8f0df0863f56d9288df64869edbfba29fb15c693f968b17 -DIST github.com%2Fjstemmer%2Fgo-junit-report%2F@v%2Fv0.0.0-20190106144839-af01ea7f8024.mod 43 BLAKE2B 02346f7c8a28f8d40ef233bc1fc6f3cee54a54bfd79b374ab7f3435039a5d9f7da5d7fb7824c618d25034cde1d355b503bddd76b804d610828a080ccb2707dc2 SHA512 801663d67d1aead6b01df89e329c8ca969a1f860b5ee2c2018094791060bf6e8cddac8e2d788ac823e32278d4e9ad1dbd72935e4da2cf6e65a34dc97f195ce7c -DIST github.com%2Fjulienschmidt%2Fhttprouter%2F@v%2Fv1.2.0.mod 43 BLAKE2B 2b7883d00bddf90261a91670917e335bf5c59101032ed3ef5ab6752eb4da25e8417071b1d0021441fd887158b519f4fca4b028b6ea52fe3ae9a41b84441c8c06 SHA512 60340233f2a0205ee4b1a7b2d78ed52d88fe5d39887413d0e62d6ed006c51eda83ac117454b0c1a31ab29c5aceae13810ec719dadc554d10480219c1afc3e5bc -DIST github.com%2Fkevinburke%2Fgo-bindata%2F@v%2Fv3.21.0+incompatible.mod 40 BLAKE2B 1553a76830770feb3d6220cdf688b2f8f1f296f1141fd84197d5222b170806b508e895e5edf6cd5e052de5e272a211b7e01146d859670d210fcfc9ebd85862a9 SHA512 b4fd0fd62d0eb05abc32196dde7798d4d170680ca6cc151e19be765e5998759a5d570ea76f9c047259a2fbe82032e0ba5c73b63ff48b13a2e314240ac2a922d2 -DIST github.com%2Fkevinburke%2Fgo-bindata%2F@v%2Fv3.21.0+incompatible.zip 15413663 BLAKE2B 61e2d646a07737880a17510ec5c24dee03ec0df9345128683cba3215cc932f9520285142481db2a8dce9b5b1e5f5e90b083579b7bc5fe1dea9573b787c420e66 SHA512 f76d3779ec0386f37515fbd9107fac0f23b5a6e3cc30797a77139ed687eb19918be5e14c5c5f47bd096b02497bf9a65d1b602a5ce2b02312f3c4e96f469de9f2 -DIST github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.1.0.mod 143 BLAKE2B 128f8934f81d0e497e1258ec65129fe5d8831b66058669a5aef3fdb2fbe5f6d8ab30bfe97a1de7befadd34aafd55d6d15bb787e8948fb7718761392817203874 SHA512 c5e546822036a7114a29454e28290f8e1082392a47a101fb1d370e0969fc2c83186b4487473f903dd638abb8a763ce3180dc87993906895a2df33db7d8bc4790 -DIST github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.2.0.mod 98 BLAKE2B b9d3c55999054ed927f666a43066ccc6758a6c5f550651f43ad5d85b5403c882ee76ac2b2553803d71789da33c60ea41857ed545003072ab6c666dbb77118e00 SHA512 3529b37d770af511a716a612b7fd7fb6a4805d13166e3a6f9378950443f6eceb2f3d95db5a46027437ce55b36e571c75bba72a03769d21ecdc97888019d80a68 -DIST github.com%2Fkisielk%2Fgotool%2F@v%2Fv1.0.0.mod 35 BLAKE2B 2f43dcbab430f12316fde243db4bafe24372c74d60874b05917269e249a36660309c23da151db31d89c0d0a8fd0f179e2dd7f386af3ca533c95ef74017609af9 SHA512 86aca37f7f94ada381e0528a535b344c8fdbab9e0dcc7b71d716083501ad3d61db701ee159ccfb5455a351fc18a405301abe798037dd1200f9950bdd805d3dc9 -DIST github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.1.mod 58 BLAKE2B 4cf48282c28d2b8237fe9ff852ad25d102cce038fbd1852a1938bcf69c895df05dfdef6e533b3c0b4da28103eb5e3a9561f802414ccdd99b2d3ec2e2db0807ee SHA512 fe33ca4de6588b95f0155458b8b6daab218553b58de5dac220efe54019dfab085838cc6a22012a106fa36a6094447f744825cad04aaf0b158fce5aa676048fe5 -DIST github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.1.zip 3567 BLAKE2B 80b7bf217df9367160180d44c1fab6a9f10154bb9a6455538860158a08c5bf8c794fff973b899b1376e4e65764a9aa0d6b8b162a6d9ebe1adb1368b9a2a42786 SHA512 27910ae03fc9fbf573ac31454635c43bfd771d2a91325eca544f7be0e24b43c2798ed8e74b4c31e8c20c1a9cd266b835017aea3a3e24c2ecb43a14a6143af8e1 -DIST github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.3.mod 58 BLAKE2B 4cf48282c28d2b8237fe9ff852ad25d102cce038fbd1852a1938bcf69c895df05dfdef6e533b3c0b4da28103eb5e3a9561f802414ccdd99b2d3ec2e2db0807ee SHA512 fe33ca4de6588b95f0155458b8b6daab218553b58de5dac220efe54019dfab085838cc6a22012a106fa36a6094447f744825cad04aaf0b158fce5aa676048fe5 -DIST github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.3.zip 3966 BLAKE2B b638ca22c4f9df8cce5b84837e4f72b009c1ead300c08807b8268d26f04d6cc5476d9af56f676d8f4ac046c78c333614670e0853bee13de3439b5d89b96bfbb0 SHA512 ff98f8c05d8e23fca69ee5ed780e728f9d1779ab55cecd16bff890a91d14af81ae7a0304f34b3e04fbcbbb61e3c97c044dd9c190bd8359f3b19bdd31f8a37329 -DIST github.com%2Fkr%2Flogfmt%2F@v%2Fv0.0.0-20140226030751-b84e30acd515.mod 28 BLAKE2B fddd4b3cdef60f53bc3f8da5a3154d10b49dd180c12837d3740c22b442947cba2025649f3ac7321bcf0c73a272527659b0ccd9be141ddca13caa7594bf6ad3fe SHA512 3c623d077e39697506174a50c0380cb7787a05a52819b1a73c2f64ba8dd819fd500777de83c83d8d9e80f19c828128a569b4cd783667b4d6b9a375b0e3d527a7 -DIST github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.mod 67 BLAKE2B 2e1b4a8a38998179a32db321d331db54f881770a89719410876cdde1799cb8558ca2862bc70838d606540606d05918c4b115cf1c125945a77ed376c2efc4aa85 SHA512 4d841fc7a022e4e09e0a95925ad92a75809a67c30fb88de9190e4a2196383038dab9a5b3294b6a0b4786248977a0e09eea857a34100cbf22f8a52912ce9fa58d -DIST github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.zip 11159 BLAKE2B c176e4bc9b5534b0df153e027f22be7d28eefbea1c0adab10979f19d601b95d300c54086b5ee388f453c73b9931339b9b04208fc5e6512385b348c49faff5488 SHA512 bad73f3c47f70de55a90a977a1e2b4a68de545a8425c71533de081c7a8f71d7ab1b489001c56ba2e88dcb78c08804275f7f8128c812f50d005a074ed6dd9286f -DIST github.com%2Fkr%2Fpty%2F@v%2Fv1.1.1.mod 25 BLAKE2B 63db8520df2f699bca5a7ccecc44ee04973307d86099cfe66ded30e2ca1bdd76fc3db48cfca0138673c20c6f94061caf219f018b21b9d67231fe959eef338596 SHA512 967fcdce835c12afbf3b12bb204a256f32d46a3da535e2a7250159f62781a163ee107dd2a4fa20743b76bbf52b97e627e11e895c8d5ef73aede37d6a89e326eb -DIST github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.mod 64 BLAKE2B 475c51201a379df2cc4ff8c5681b6a7a1524f60d0b8fd0853fef569dea754efabf3425cd4b84e8427db8a6cf3e9b1141d5050d48d5d429cc1ce82162aa70050c SHA512 11d2502a7d241a0edf4e67bcb651a890a12f49d00f8b944cc9eb8f6e9cf5fbb2b2827e696021649bc795ffa275e95ee700e4a1706e03e88fa9ae079f5b9f48ce -DIST github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.zip 12591 BLAKE2B 944b0b9a802757e78e3dfb11d6c4d79e0e0d90489d49262b7079e6ea4728328457f8773b392c8a618aacb5fdec78948a16cc852eff71ca6f4fb9eb422c03890b SHA512 3f0d00b0545769ad882e25a9a6f30b96ce4b72a8a46bb3c064907c94e2dda4e499eb32354c149f89752f9bc5d1ee5cb2ee5cafa46e2f65ea329fb432d0c0029f -DIST github.com%2Flestrrat-go%2Fjwx%2F@v%2Fv0.9.0.mod 34 BLAKE2B 3d7eabace16abee8de4575a058588468e11ef91e3fecd49221b3daeac365695765ab16d4596ac0a6b3ba03c8a9a364e1a66ff6b85dbba8fa320d864e9fc0e7c7 SHA512 18c22c965b123460911646245a10cb5f5c249ef635331d38720d47bfd3ec9e2f8a39e024632d7a11ec1dee16ae5116b8150ad8b210ef25502f9d0d26a431dcbd -DIST github.com%2Flestrrat-go%2Fjwx%2F@v%2Fv0.9.0.zip 140025 BLAKE2B dc9e062b959786ba013b4e93bf011ad92592e380c58bfc65d4298b990a3fe556ad11beaa21672c9b21f553421b41cd935bd44352f4eefd99587b7fc68e7717ed SHA512 eb788b7e6d632265edb2183cbf416c78c22e0d7fda0e1f033ced23b50ab48d1596a2e037bb814de10baed3f92956dd0db69de0d9baa4fabe23ee6588cd8aebaf -DIST github.com%2Flib%2Fpq%2F@v%2Fv1.0.0.mod 25 BLAKE2B f81559c285e1be835f5ba6f95730022986373524dc66f0ff825885bc3d959ebef5711ccaae86983c0710da8a501a3e97829a01cf67bbd560dc7fdae682b0b7f6 SHA512 493893b0368a6e9ba2c2aab1650135de1dcc087e6eb172226a623d62a48e4102857f68f9ab6cd4f7047e6a291c62824ba924076891d162bbae846d97166bd1e9 -DIST github.com%2Flib%2Fpq%2F@v%2Fv1.0.0.zip 109027 BLAKE2B cdf1ed976d193fcfe3a3e632354605c4ee3caf5313525ebb04f12199036f6a2ed748a3c90c1c1847884670f47d61d94b3704de6e4d591a29b6b28b99c0158e75 SHA512 a3e7d0eedd2b18ca5580819c4983b700f242accfb08293898ef74e8f3ebde28a35a90c9927f90d2103aafbfa7274da3a91d274da6ec0e8cfdb1f8b994a5fd79e -DIST github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.0.9.mod 37 BLAKE2B 6bd675a05c0bb6f9dc12d09203d13de115801888cf8c02cb5d609f72d214b7e7ebf13a72ddfa2eb9172e9c2ba1f3e5a040f089a86ce9fe873d49288d5f7dc5a7 SHA512 3cc3ae26618b96a0fc076b18bab6f8f0f6a1064d6a9913c1015a9867fd3571d17f5d2867d72cec008e9bc7005883a596edb21424084f82ad5b572443de90f976 -DIST github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.0.9.zip 10606 BLAKE2B d9aed996970ecc4828716e86ddbc85a7949f60ceacc7326708ce499bfc09250bc8ee336806b229a44064839e7ce34f5cb2a7607da5e82c417a737ea869f97f03 SHA512 dd1763a8d04540b3e579d397fa4888c4bd8c00c3963cfcd1fe42af7c1990ef85f9a2e2fd5c5f2c7d3e6817448df5e2237241ff5a2cda651b061cc8932e0afdca -DIST github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.4.mod 34 BLAKE2B 55253c2475bc0169df729915bc92689eaad2908ff7b9dd81b8a553bd75d5f866c308a85fd69d664d31b0d2d373d8d52ee1701677cbebb07e361612ab8cf17f2a SHA512 00c272b4652db259c46875641b29489ecada2602e38beede8c8bd529d73b6e123bff58f8e0f8cadd2d680a6a5485aadffa448e9445548abbd2fb424b059a31e1 -DIST github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.4.zip 7026 BLAKE2B 3cebbd0bdebcd1d32b7fc618b7190b7813876a1df010d1c3ca3800c41acd64b6537e4b3e4d4a574e3eb736822a27eda7bb2fffa197063baf9a347a820573883f SHA512 829b0596279218a2fad36695fa42036f265ce79903a0f5aad27495dfc7c6a33e8bad32010e59f4dc6853f1e38fd9e9f635ca2f56adaf5ea47e4914f2a892d251 -DIST github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.3.mod 37 BLAKE2B f36ba4b667bc5bebbf49062ee5be234891ecc0a2be075c7bf57f5e39ee7fa2657d6bc086ba9a89728468ddd0623d27edb3c357ba4e91f79563bc9747d1d9ae63 SHA512 b891712f639a850e41582c15bcb384a985fad4f8aa86ce2d3f4d2554354aa1a9619667f60837a8280f869fc07dd58dc676c222bac23aaa5b2b00c06284b2f475 -DIST github.com%2Fmattn%2Fgo-sqlite3%2F@v%2Fv1.11.0.mod 35 BLAKE2B dfade1d4d17af2380cb103ad9a0c91ce0eb7e570f9ab98d32c8d74a9056b1ba89c44c6fbceb4a2d5e5d45bb552a18e5845b1c40d8d1efbe5a9aa87e4af0ae2cd SHA512 c929334b82e3174b98a22bcc58dffd1291e3bcea6c5f789ab36296353cafe0b09640ba7015ff559acdaef58a9212b0367bada54aa89f563c6dd4773f3220c04e -DIST github.com%2Fmattn%2Fgo-sqlite3%2F@v%2Fv1.11.0.zip 2337512 BLAKE2B 7507201c73f35a287783a9815ef1997018e39bf8d237a77bd630d032d48e6f780473c29f0946e80eace5bce077a36500755e11cfc875c10dedc026e93f035510 SHA512 0bc4df375bc8ced78cfaea6e7ebb572cb2b02dc64810b54b26f29da271f864a2fc9515ced2032783537dc06fe38ef126d8fc1f0221f62c4b64a78c0b1e4be785 -DIST github.com%2Fmattn%2Fgo-tty%2F@v%2Fv0.0.0-20180907095812-13ff1204f104.mod 31 BLAKE2B 01ec123858a9bf8d2e9b6b2bb8415431e5d4145cf3ce82c16522eaad6f5bcb7667e391ddc4544a3ee04a8dc9dbf3fbdfb74173da09f3a330952bb5eedbbe203e SHA512 8c099ef777c49b02a62031dbe9d4fdb18839f4b2265802ac5fc3e6c6fd1d3278dbd3bc01e8674a0b52d2d6e6a394d1d4ef7bd64f4388c68e9b81749a4228773e -DIST github.com%2Fmatttproud%2Fgolang_protobuf_extensions%2F@v%2Fv1.0.1.mod 56 BLAKE2B 50d2d6dc9c1ee92d629af8c9aae9fe5f70a0c6fe270a95a8232cee3c50132ef90c68218ac64a3b5b72d94e23ecbea5f567fef39a81be3d4585bae3f4f5348545 SHA512 5235188477921a263176fefaffccdaca4bf8175a2e248356a06596e37fa868400203172c7fe9fb80d0a65d335d23d80edefd242657de0eb83d9360589e063bba -DIST github.com%2Fmatttproud%2Fgolang_protobuf_extensions%2F@v%2Fv1.0.1.zip 44378 BLAKE2B 15ccda2b94bb024656859fb8a6968782b9a1bffb786b0b1ed69a3284b01f4a2100b3f3c46b6ebcb8f7febedb5bd4f6762fe333b7d4f1d14c700f8fce60843352 SHA512 e9349ee2a7d5e5b129ec6a1c0507854aebca82cf9ac2d0a681cac2f4630ea35551ede48e1931494362232a83dc9f26b6b4162c6114e0176084c50101b1da46b0 -DIST github.com%2Fmicrocosm-cc%2Fbluemonday%2F@v%2Fv1.0.2.mod 111 BLAKE2B cd42dc1330b96fae45e713c29f29646a37b6ad3470419a4bcb43c20c06a5b4fc1f3e198b5b2f99ea6da0d3eb241a2e5becd89fdcde6f015a773cc0170686dc40 SHA512 3f63e75a3eaf94a9dd340bf3fd5f615ea713ab08725e9d90435ef4a7df218f1793069a73c0295a667edc008cabe6ed8cb9e3db71035f0a3b801e73e89fb38697 -DIST github.com%2Fmicrocosm-cc%2Fbluemonday%2F@v%2Fv1.0.2.zip 155023 BLAKE2B a7deb9eb724afb25ca7e806b916ff452a8077833ad962901e4d48ee6d7c907e4e2f05b6d7216905e412be864e9f7634c7ec648ce98b8da1e2e448a5087c0681b SHA512 49e76ccc9a2932cb6e7c32f98ebcbd851554d5e5c70d8302563178a39713b81e735aaf6c1cd20cdeb66b655734da11fa0994bda94fa1032845da96bdb899f958 -DIST github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180306012644-bacd9c7ef1dd.mod 39 BLAKE2B a4d082021123db99b5d72a1d8d0011a517a79ff7b07238f0f01e550be684f18be03907b6280e673aaabee5ea837ce14b9e4daf278a23605c8dca8fba76bf40ac SHA512 4f29e15b1d18a8952c14f5142aa863b77b7be820129512cfeb3f8bc3335ff637a8a86c0284832a20543abc2c5351a3c0f992d52db895385e45f176af899b5844 -DIST github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180306012644-bacd9c7ef1dd.zip 10936 BLAKE2B b045256d37d4973e88d0d9c6dbad7397160ddd7b3102ea8420f92be2e8c3ebf6362f350eff10b52fc7fb447d98b00f07c2bc1da3f6e442ebdb8e90103492c8c5 SHA512 e7986e7dfb362e346309cf77ee3969c2881056959e34db07d2dfa0e505106844b7424270d8f17f1a89d335071688e98b992ac81e8ffe0c98c8a0e3d145144d4c -DIST github.com%2Fmodern-go%2Freflect2%2F@v%2Fv1.0.1.mod 37 BLAKE2B 3643a4250f81729708917dc751cbff6ab6e37761ca94784062a4eaf243682a9e2c755ce793024cba1737d0eee1c52c29984fe3008a2471ed24a759da87ec7081 SHA512 72fe8dfeed7041bf92af829dd84513f0c97f709d69586a044f830fd3de43deb27d0b02000338e00897a44c57806ad036cafcdb9661b1852ff76886ad92bd83f9 -DIST github.com%2Fmodern-go%2Freflect2%2F@v%2Fv1.0.1.zip 25694 BLAKE2B 59d0a645e3fc29e94a04fbed5329cfaf2162f5779f1c13bfe96c9d979c7acd1b356587b6e30760568607ea15d2088a76bb58e4504e17abf360f2702eb6e8c3c8 SHA512 8fb62179a48e212b74f0e8af79ee1c20479b1725c089c75a12b43bf4936caaf87d42b35f2b7a7de87c60e793347bb185486beb8061e588b8085ac354a3ef8562 -DIST github.com%2Fmwitkow%2Fgo-conntrack%2F@v%2Fv0.0.0-20161129095857-cc309e4a2223.mod 39 BLAKE2B 391eaf696f1a5c764f9e156ae3f6285ae5bf8a4abf2a735fd13fd1591f3bb97737502b79df093156305503ed4b63e0d458900e61fa8717f96ee17a6d43bc2f79 SHA512 9fccb6717f5b37cff2d858cc31f7e16aed120a67498c2f0d24aa30ffac4eba2e87822b12d62f700a0c62d7561708bab2e13e35e89cf5407cfb06a0de5c70808b -DIST github.com%2Fopentracing%2Fopentracing-go%2F@v%2Fv1.0.2.mod 45 BLAKE2B 7a7820ed255877b390c76ffd281258a8e70dbb2812b7d2d0bf63bb431e8e4f52faad48d4e6801b301ce35cd6dcd49ceac6ab94b32e35befe2e6df56e1a1e8eec SHA512 13b356ebfd062cecffa1e323aa7768d933c6915c2963eff50b1f743712d48cb24f137ba839a7df211e6e02979a4d1c9d32eec8194227edd995c3d35849edeb54 -DIST github.com%2Fopentracing%2Fopentracing-go%2F@v%2Fv1.0.2.zip 34113 BLAKE2B 29aea1a410735b812d7a0df30523e7632929f836ba18cf7329e0c1bae5b918ea898c8b10e59b9407b6862d28236c8877492a16e48fce256c0a5dc2ed6e798cab SHA512 5f35c076ac542650bc8d43fa4937f8f3e2de363d61909928d165a7673718f5fae0b0ca4d5276b31e044aff3f725982f4b56eed908312959dab24b344aeb5b88f -DIST github.com%2Fopentracing%2Fopentracing-go%2F@v%2Fv1.1.0.mod 45 BLAKE2B 7a7820ed255877b390c76ffd281258a8e70dbb2812b7d2d0bf63bb431e8e4f52faad48d4e6801b301ce35cd6dcd49ceac6ab94b32e35befe2e6df56e1a1e8eec SHA512 13b356ebfd062cecffa1e323aa7768d933c6915c2963eff50b1f743712d48cb24f137ba839a7df211e6e02979a4d1c9d32eec8194227edd995c3d35849edeb54 -DIST github.com%2Fopentracing%2Fopentracing-go%2F@v%2Fv1.1.0.zip 44929 BLAKE2B cbb592f6d60d1e5906d0bb0b89431713851582a17f092a7bdb7a508469013b99567a6d6f44807fdd79bbc6e470b01c6605d74b79dd62215111d2d4d5469a5fdc SHA512 a813adce63d0ef8b5a2d95c86099967bf5fdce2c7e71e1bc72d760e1235dfc430e650bb6dbbf1d42987586f496b1a5bfa6af8d20bd1fb1fffca786319cddfb22 -DIST github.com%2Fpierrec%2Flz4%2F@v%2Fv2.0.5+incompatible.mod 30 BLAKE2B 007bbbe9dc603d92170e1aa89946c3df382b73e60a01f247ff3c28c56eec5c06b1f901cd3f52a81ed967949436fe0d2a7b4dc70088dbb38de97705967f127aa3 SHA512 e3f6142da79fb97efb98b7bac49f4fdcc16f2c59b40ac87ca98b633874bac81105a0bcff20045bed75d39ba3922093102f9e74462356d6dda6147f6be4d31703 -DIST github.com%2Fpierrec%2Flz4%2F@v%2Fv2.0.5+incompatible.zip 3703141 BLAKE2B 0c8b5a768e298b8bdf314459aeb938a4a05dfa22bdee1b0a2d65e7b02edbf2be6b73ee51a331f4b1d14caef6bd9a001b11a72b85f5de3efcc044501fc2e0d3ce SHA512 b5352137315ec28c2f40f201629a4e60ac26a218a3c75666cf56959cff953fbb6153123413fd1518a1a636d10edac9022ba9f38065274b9f88a89e937283eefd -DIST github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.0.mod 29 BLAKE2B 7fb53b19bd1be0e783039647b42ecbe2070f51af102e473ec6d3544eea0ffa5863f1874ca1615348d5f8abbaa39c841b4fe18d43a8a615fa648cf22f35955e38 SHA512 0c156e21d35c45a89c1a1b69ff1976b4f7511b3870bf96126121f5a5effa3723eb45bf080e840d5c8b96898c65207dba83eb3e1a23668dd8a5e20ee6be775cc0 -DIST github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.0.zip 14743 BLAKE2B c0c06d296c0583be2a6eb06359659b50941ea516bc768833bbfe252b73a2d81616dbe2d2db1991bd196b4a615b253c60046bbc6d56ca7268ded5b0ff40a4dc81 SHA512 2975fb8868fddaff560951be41194b82b631138d617705c3f6162acb76ace8697cc8ebc8f610ca1fb1a5167c6b6b0ecc87c150133a757447831463a0da18f392 -DIST github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.1.mod 29 BLAKE2B 7fb53b19bd1be0e783039647b42ecbe2070f51af102e473ec6d3544eea0ffa5863f1874ca1615348d5f8abbaa39c841b4fe18d43a8a615fa648cf22f35955e38 SHA512 0c156e21d35c45a89c1a1b69ff1976b4f7511b3870bf96126121f5a5effa3723eb45bf080e840d5c8b96898c65207dba83eb3e1a23668dd8a5e20ee6be775cc0 -DIST github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.1.zip 14339 BLAKE2B 9332d9cac7dd3aa2f4d756f0d92c911cd0fb8e00232db3bb013a0ef12addae0aea2388ce3adf79407a81e13cfe9cd4b45aeb2bc9f8b84b4e3c5dfa63b59d46a1 SHA512 f97471d54c5e73b3f59326847cdd4dbbb142a9ae790df83493f11a851d716fb407e01a857152812caf731b8f3e0f37ae151ee83300feaa73152173f6cb5b8515 -DIST github.com%2Fpkg%2Fterm%2F@v%2Fv0.0.0-20180730021639-bffc007b7fd5.mod 27 BLAKE2B c44820090e3e6b67eb062638dd9251af75ef1262a034430d43ee34024051c45bfd596f258ba3f9238f1a8f25374fb55ab3840503310e1f97e6e6e5c98ea0725c SHA512 5b8d46571cfdd120c406dd6d48a943d4484053ddf05edd078529c3f927b4acfa1bf15c775e1adf9eddef260673fd6c591541fa1d781310017e421a9f164dd9ca -DIST github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.mod 37 BLAKE2B 94636062c94f8ff68cdcab7593a3acae7b9ffff616cad7b1d5c9cd147a4a1042d33666cbeed6fd816d6793113abfb595183097dcc46de7a3dfadc1423ed43e79 SHA512 c3d5c48cdb8ba6af7071a07cfede06e0ab67e3726d9de592a952fad40167dcbdd9621dc2c4df1bd3c28eb99d70b1b6d8d812441237c35bf492e5b7f07bd33902 -DIST github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.zip 12433 BLAKE2B 0c911c9d173080abd8edbbab1f47222343801d8eeae36b4add24773e3282fc2a39283fdf519a3d4483e39cdb7d9509b8570d151f46841ac1a616f312dc4cb0ba SHA512 3b85697185ba85cdef6202444ab6cabeabfad8a03d66b3839a852586b1f91ddae7897a57c8c138d5647022aa44906c7ef3c5339d520f90eeea0742a935da8cf2 -DIST github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.1.mod 43 BLAKE2B 2bfedb841a10d8d6a861189203de74eb9bc6bc37bb10cdfc2404b1e972b7672568ed27d235e143d831cf2f840943c039398296cb78f1309f00d1ad9e0ce21056 SHA512 191cf6496c41b2b82c9a8f2ab2aeab63ede47807160f7cf746c548b3e92e367fc8f80ff8c6efbb7e91ca5903d5672b235c1ab9f14d3f9f988e8ff1c821d3b8bf -DIST github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.0.0.mod 535 BLAKE2B a8d3fb22b519e88dcb6b6f305a80c94e8b40fba8bdc96941230b354cc6bd8ec4bfd121b8e5ee57e9883e0b01b6224ff22a55fa8434bee1623133cf59489e64d0 SHA512 1d3646f93821b2ff1a4d80074f773eca22ff3675caca9d267762a31c1ec719ab464ba7ade7c8e2aa79b16a4f35f5a64f779fd909060a0c3056f09af77cebd655 -DIST github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.0.0.zip 200972 BLAKE2B 6b6aa2cc4006f6671b0f54def912df6ff1aba7b69bd08c1950f7415032e2de383af556cd793f991989f1542cab5d7bc8a73894504c2f3b757a23007ba76b21b6 SHA512 c01081549c9e62a75d99ff37fb4bf3e620dd9e6a22a049c1b0b1b53604086ba68a5c366a7373423354b25cf7298c642956db7eca4b04be4b9431fe24ec8da125 -DIST github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20180712105110-5c3871d89910.mod 42 BLAKE2B 5519896b44b7bc3089a8965dc61aae63745c64ba1a390d3fff1202be7f8dd34f59862c04b49e377d6616a93a0341662becce65d431d445703a160ba49eda208b SHA512 c84dfe43954b19c1e4ac5ff8738e79db469f3bc1dc55e69b12503d0a5cf125cc74f4797ddbfe64b2a1bd1e2940575c32678671d51f67161c4f5b53b2a85ac46a -DIST github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190129233127-fd36f4220a90.mod 164 BLAKE2B ed42e8dec25021e488793be8e008c34ab5bdd6b5b884762d69f40d6c8968bb539041920ac7108e685ae56f2ef71b7174245772d96cc8f20463eba71580afae29 SHA512 4e0e6941b43c17cdce0205e9ba3d9fb18937f426ea2ac9a9e53396c906101d6ec2eb501cd8a791ee3ba9a32185f86495e9189134b8a9858134c73238d98ce0f6 -DIST github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190129233127-fd36f4220a90.zip 69217 BLAKE2B 738c4f5d28aff0b5e5eaa04f50e9a4e4671bb0a06dafb2174720cc0e6fa79ee87123f55776cdc051124434a3889232d512b32d08b1db1d2cb7f54e251b617e94 SHA512 6cf7daa3b86c574afbf5d91d3d4f372fb31c06ff93d59aa128d8ef025b5c22fcbca5a148b21637ed97127e5e2150305e48c241be1ee4c1b23ae32a09f19ffaa0 -DIST github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.4.1.mod 1223 BLAKE2B 969e069f2e210c2863b54504d62dec9ca606c485612ab1c42249e623a4bbde4e4ad0b41da30f83594b7efb4d4a44e0a68a5faa8c115263d73738773c35a98dab SHA512 02db8fa79cd8368060c72ba3925624c779bcc9e39817b6ed86ba143024959496db2c23c1aefe93a5d9f22b48e742072382e2ccaab430c1c9eae6254184e2358f -DIST github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.6.0.mod 693 BLAKE2B 414677e90b5a1e5e2b5b498e46386fb2fa7c93314b390bc4337c74865b6a72f8a64804e4c30aefc54515e9261cda168358d70bc533e8686cbbe0f625b8957d08 SHA512 829b3d7349806cebfad94252c09095aba4c5cbe0cb77cc124e7fc514ded1d8faf0f158d21be97911b8937ab9d330b284139275837607950ca602b3faebef146c -DIST github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.6.0.zip 152577 BLAKE2B 93ebd63d011ee7f0a610b7a5ca9fb7c2640bb57a60ccf4e22f46f81286c9e834a547b42db2c23d61d503eec5f4dcd0592e76a1a3e789f32d20d9182c6be7106b SHA512 bab9891928e51fc4524cc9384cea51429004d821ffcb1243147337169308cd5bf5791308fadca56d0f310e73fb69f8d3093bc35c654ef9f1c8738a0f1c5ab8fc -DIST github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20181005140218-185b4288413d.mod 36 BLAKE2B 3c6acbd1022261065a321c6f3cfa2946b58011f45fae9b98761397eb7e5e0984dae4ea34c4f837f798ab29ca8e26ed3f07771be10e500a99ce7e5e9f4c401b5c SHA512 05f032eba0c264b186936c2b9831624a01999972d4f1bba6aa15c452407eb10d402f1ac674eb41e2d24fa66e85ae2e56efd2326fc4ecc741169b9908d7935335 -DIST github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.2.mod 98 BLAKE2B 23576c142554e5a22a11d704cbff1bbaf1029518ceec7f04e22aa849763a7aa5e26ad1405a8cbc0d87097264a5fa7cfa3d655cad18148f5de6209a06580722d3 SHA512 0897ba1b7b4a32f206763327e138d3b460194097d19bedb8ee1bb6889b9d188afae9439178d1c2151fbe17b7d18545cd6cfebd050bade93cd39b435b35b6acdb -DIST github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.2.zip 132055 BLAKE2B ed3f24a397ca21aee9972a2fb1bcd12acdcd5b7aa5b21a36cd8e8c1b1e04bf3a1264cd7b21147e1f69e76792fb0d36f4cd44f51178376a9daeb092e69eb8a2f3 SHA512 e3f4d97e22ad8d27a3c8bcdb6516f4e1574348b864deb6f1569f3d94098987f35bc87c7a34f95e84834fcd8c750b3a177f847b586b72b91af0e0f9a735bc3f20 -DIST github.com%2Frogpeppe%2Ffastuuid%2F@v%2Fv1.2.0.mod 45 BLAKE2B 6fe371f17a31bcd132ac67cb50052f6f3874c9f62e2d67f48d52d241026fd21e58ca9abdc15fd53cb949f79e7d40dd0c289af3849da3d4d9ff75b491e8235c10 SHA512 ea2e9a81d7720b4e11129fbdd4772be224b6e1267157c29b9d33813b6f4ae905e43c3840cf1ade6ff5f73bd22c103430a0bc882355c16715e124b442652cd4da -DIST github.com%2Frogpeppe%2Fgo-internal%2F@v%2Fv1.3.0.mod 73 BLAKE2B 21e3545a4518c64daac1cf36e47a2c8e1fc8ab7402372f2e871052d0dd9d83fc2aa44babb2f8751180cb66dcd2af82ed202afbf5ad3a219c4562da23ae8ce185 SHA512 4fd07ae7c00bcc135cc10a0b34ab102a893ed8ea4708f9d38da52f98b09fb66144f970ffd8795476fd6625b25c9e48390a5b1c5c99bd0c8d536a94201dc96613 -DIST github.com%2Fsatori%2Fgo.uuid%2F@v%2Fv1.2.1-0.20181028125025-b2ce2384e17b.mod 33 BLAKE2B d6c66082304928ba92ad6144b157ce4f59db0abc5af56538abd5a81fd927ea716df4b5dee47ff883dd99f377d2b3a772296e08244fb7a769a5843a54426be81d SHA512 081e7b82b53c1a86743e3cc4973c1bd15e1b5c48929513bfc41c0e182fd4a047519b8cac9f4e830d7a08eb3443b2feb62c727387a294a30b7c988b698d6e8d45 -DIST github.com%2Fsatori%2Fgo.uuid%2F@v%2Fv1.2.1-0.20181028125025-b2ce2384e17b.zip 17966 BLAKE2B 66c06ae649b6a7eb0d9caaa20077dcf3f6c31bb75160538dbeff87092939c5e6a45da077756fb20fce3b0a6f5867080ed33ef5f9ec227a99130326038245ecf2 SHA512 17865d0bde1001939ef4e8c433ccee65b7f0df028352ad2a32654c5a1e3466a7f4b82368f155e2d66c431e4daaa7cad36002df37decd19306582a7c12880dc40 -DIST github.com%2Fsegmentio%2Fkafka-go%2F@v%2Fv0.1.0.mod 37 BLAKE2B faf1c2419c014da764d5ae4cc24e27c0c368f413f05ec8d6b7757412e811fcb18719d9a63d7505c6eae5588f5418be3bbb8e06302356996c12080b06ba68a849 SHA512 8c851766aefc9e5ca6d7330c26b5d87fa087fa057a1670dd51895ae116a91492be0ca41c0b15cb905cb044bdf5074a5648d0b8e4ebd236acdc11bf86baf57e26 -DIST github.com%2Fsegmentio%2Fkafka-go%2F@v%2Fv0.3.4.mod 464 BLAKE2B 8a30d981175a16c5e0bd4ddd69cfb0579b13b3b44da65e11b64e9096a7d9f4ff5e4e4ae2e54ee9f7220d475fd27fa7a69723a531f520a640f762a1077b172a5b SHA512 71d80acc160f26acb78953227a9e0f6ce3975090805470c73f5367c6bab148ee816f735b11a0f470b7227653adfd0fe407ec693306b08455c69b28950bcd2dd5 -DIST github.com%2Fsegmentio%2Fkafka-go%2F@v%2Fv0.3.4.zip 167084 BLAKE2B cf03b663445cc623b79c8fdfe96a0563c643e80aef675ae93962f23eeda61572f3891c2a413ac34bbd71aa31a1e4aaec6a29688c1d7e1439a347441a6a5841ab SHA512 efc890b9e4d6b1bfbf40578e413bd17e16f712b0d9ced18ed9d089d5d6c08e4a8f4c34ecbf88365ab6691463d93e1735f24141143ef84821739244916996c649 -DIST github.com%2Fsergi%2Fgo-diff%2F@v%2Fv1.0.0.mod 32 BLAKE2B 9c0be7f17fe7a9156f124f7f67c3e15e14719d0b271f36d5d41ccfa5ff6c1b7887e0051df6eb3b29f29b40357d8e438598088b3c4f4df28fb81f030c8efa7ff3 SHA512 8b8b8958405a188b93adcdda0634aaa2961b5b8e0d3b3e1f768fb9c49c02b73cf3bb39027431e0c1d209abea6cb72a651c5776bf26391e81f4dc18c7bafa692c -DIST github.com%2Fsergi%2Fgo-diff%2F@v%2Fv1.0.0.zip 52931 BLAKE2B e511ef9edf7d968d848e021658001daefe7c8cc7169b1c6984ca5388fc4d6a5f54def9060483e57392711617892d21322d9de099234901bd1c251e57e6489f6b SHA512 e3d8a20d1cc351b8944579988feff39cb0aa3e1f2aacf2e2307180c25c153a0473f2a5a3ebda9d96868cb1f477ccccffdce06b117be7fa5409b2d1926b4c270a -DIST github.com%2Fsergi%2Fgo-diff%2F@v%2Fv1.1.0.mod 281 BLAKE2B 15a1cb67527ae81338a77cffa1432cd83c798bd7094eadfbc88a7eb79f5236690dc2d5c93e3daefedb396516c41bf05da21b5e12966f69fd2663e7621267d015 SHA512 7af123ea69147856e23249740b882d90213ccc3f19cf698d960dd5950fa3f3f72c600854c5e0bb94977e6c5eab617736dcd20e180eebf599399215ad8c5c0051 -DIST github.com%2Fsergi%2Fgo-diff%2F@v%2Fv1.1.0.zip 55374 BLAKE2B 39f93770143cb70ef29156c1d31247bcab91ca7cc02f4164ed28a98769f1eede3e680b9b41dc55371a4dcbfe27b92bfce546ee2f1ca447f8623fb3fd88174888 SHA512 908f2454a0722d403aa33ea6cd1d40617ae8b84c62efc9a5de0bcf9c40413b6ba8412ac831e4b54b237190131be56e23266a9e18b0b680da5fd588e889985da3 -DIST github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.2.0.mod 393 BLAKE2B b9d712acd24d7a0605c74920733902a8eb1f9151fe0b0c575f01e2f821705ca7323f854c5b88d5bc534ccc9155571c083d4f53c6f6892879c829146bd95729f3 SHA512 c1621afd4618d1027b2d89a8e9653d18dabe098a7004b376ca2be63955ab783879540a890ab1324c2560dae9e6f3198dacc32d5fb0afd4b5a779d29a8c28f035 -DIST github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.2.0.zip 52967 BLAKE2B ffc9e503771f88257408708b3e0bf6f1d0c9a36dfb10d6f4f6377fa7e97599b1993f6198a8dc013d29ef17929a83562eac4f5eba1e8f51148b189a94128a4314 SHA512 d30efcc17654904bafaa3cbac0c2aae4b44f83dd347c8ae4ea77f5b637ef4371e08e6d8483ccb8a73273ff9fc91dcad43e8c536ebf5de9b69bac66cdfbf6efe8 -DIST github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.4.2.mod 337 BLAKE2B 94ce7d2e23281061ee0ac0b1be2f8c3439c86e62c56ecf556a81123d57d819b1e0e95ec3b7c6425f13abaaa1683942b7a3d0bb8ad489577284b2a6063c777b37 SHA512 38a79599dbd09661614d54fc92149fe581575b7833e89dd73a3f754fafa4bc549c6c9078753ab8e2a85ce2be3ab81e528e29b6d19e7c329e0cb0f74896d2e418 -DIST github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.4.2.zip 58627 BLAKE2B f4276f0095188324c06e4412303ac19e3006b18823985e26ca49b2de54ef58cade626b3d2439f5f2a29c47618420b890951f94e5a4801dbaad4c3294f6555a4e SHA512 3bf6be07dd9a97bde938309857e16dc425587c100e35b2acd1a6f11a9ac196238b0844abbaded43fcc01be0664efa15b64f159f6259322043e3046e7d361dc20 -DIST github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.6.0.mod 301 BLAKE2B 5322be7914862368eba07f521c046dbd7580edafd47ac633116b8c9f4b61526d0d63df11ba6894223590a1ffcf4bf478c394a335c305010ca9fc18107d4e61b7 SHA512 8fe5a437a5f3f8c1ce0aff067ee261a946d946d7640aa5acf7c34b9c8c4ee65128a6421aa38bbb1feeba1339b356952ad58b4bad98f1c89ac455d94e86684a8c -DIST github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.6.0.zip 65802 BLAKE2B e0487985824efba7ee61c5a73df7b591d625dcda32f833ae276191cd82bec8f3db30cc2ba217d80cb56af1436b8954fcd22ed3f861c6c7fcb4a94818357bbde3 SHA512 abd13a98d10b6c996918712443edacf97ba5fcb9ece7615f59458a583130f68920dd313533ff0d8c84c6011fd2c4d221783b1250e3250b569a6ead9d7c02f7a7 -DIST github.com%2Fsoheilhy%2Fcmux%2F@v%2Fv0.1.4.mod 32 BLAKE2B cf220acb07f93b3927afcfb4211e356e17f28dbef71cfdf777366d8cd09440282cd23e7800c7e86949615b90ec60ad4f2601ef21e58d4470349913c348758b0a SHA512 def5f190323350b58be18ef9f1b00e4810987a37e1fa9332be62a638a01df7f070788c75a19a0c11949890ccbc395419de45bf9c5f7fb38fdbef56118c681d32 -DIST github.com%2Fsoheilhy%2Fcmux%2F@v%2Fv0.1.4.zip 26744 BLAKE2B dbc7578fcac5c616d1cb5dd7cae959ee8df0496532db36d78d617ff265f213e4e5a336d33b795e793100c1b8e604919ca6fabb1736bcea0c02bdd0f8f0cc931a SHA512 dc990fd4f640acaa66baed26f2e82e0a6c46e293b016bd1573e72600e1256146f1b8abf746ebd96771bad4f3d95dded70c9f884908580ffffc4162efa0450735 -DIST github.com%2Fspaolacci%2Fmurmur3%2F@v%2Fv0.0.0-20180118202830-f09979ecbc72.mod 36 BLAKE2B 1ba81fe6a6b84ed40868e0fff431dc8485b912700c192d90181c22588345e7250af63160673c297129add94a41281d7f0ddca5733c2b32e20f65ca7c27046306 SHA512 d14779867dcbbe24d451e82ac72c823f80551cec89758ecd39c9e72fd75560694a0b8261726020b738ad4f447ce1093f910c12797c58b8dede38f6bc737b9a25 -DIST github.com%2Fspaolacci%2Fmurmur3%2F@v%2Fv0.0.0-20180118202830-f09979ecbc72.zip 10334 BLAKE2B dc4e7a5b7ff1179feed6341345c4a811b5c4e14bde5af612b9db64902f810e788fbb6ca224b3678dfee03e894fb1cecb5c3269f13b36ea5d52fd4dd8b8a28fe0 SHA512 33a0601227477c0fb56907b633936ee96c46bf0f8c0a9140facfc61e839f62e167e90b76fad14d4b0124b6066376eed464d0f76e08f0d308634c33eb6fd171d4 -DIST github.com%2Fspf13%2Fcobra%2F@v%2Fv0.0.3.mod 30 BLAKE2B cb72701c052ce4059500f4c6b3d0c4fb336d118865bf1f7f45ce0b0279e1d01b6e58d49f82182c2523681a97bcaa7a70216d63ceeca0ea1d09c1921226f6bc4e SHA512 ea13ed8e166d16a7bcd14a7cde90af1cacc0b05995d1c5ec245fa536208e0cbfffd689dd460d66c0a1ad315f2b0ae9f4b803ed72bcdfd89c4a98a7ed934289c7 -DIST github.com%2Fspf13%2Fcobra%2F@v%2Fv0.0.3.zip 139997 BLAKE2B c20d7292a69fd548bf0dbd62751dc08a41c66f120bd8b5142e96f498aafd208328ed4888d7ac59404b64dace96bcad210f64734e432f15ae63ce6d39dd308cf4 SHA512 1476716a98d5aa26c34af6d85eb93886cae211beac7cdc8f886d2030bf7f83802409aa56510ba09cbdb609dcd2faf87d3490c4e5392922e0e034edcd3d9fb1bf -DIST github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.3.mod 30 BLAKE2B 18c9fb79a291aaf800991a296c8d7b1933cf45bf56082301a64ce17ea64dd15fd304094fd4b0561bd99c48ada545dfe7fa8cf47a15593cd3166eb66657a5e114 SHA512 d08b4540b799cee9c5f088c4e1fe002c9fda86f1634380409eec1404598b84376d3ca26b4c1cbcf58bc19234ab56531ab11db8a00c6dd2e15a53f3b4ae757efc -DIST github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.3.zip 74638 BLAKE2B 0e9d2a40aa6e68cae69ae24f76385e840e0b53b2a4afcf89ac5ea61ee144462c113dde938c5de728c8e54e7e46dc099786ce85020bdd60859e1ac04393556246 SHA512 c33aa1ac5cf2a8441bc849a49b65a614de6c9e0c5d37a77f0b6972bdd8f25a651752743b1172e0a83fdbb384aa7e8b0685af5c5dad1bc128310c60e13cc9b56d -DIST github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.0.mod 32 BLAKE2B d698910da1ef00a70a1673b8c74105de195020ccd95d1e70c5dd1e1615210886ff9acbc9cfd03f46e99f5223b60b04695b8d362b9e0edd4e485480f802bd229a SHA512 4e366e5a60559a8863cb2a50280deb307d8bf885ca5440cce1b49a084b4cc4583b3481240125f35f161226592a43f2c0a426152f117d79b68c92c72a93f751d5 -DIST github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.1.mod 32 BLAKE2B d698910da1ef00a70a1673b8c74105de195020ccd95d1e70c5dd1e1615210886ff9acbc9cfd03f46e99f5223b60b04695b8d362b9e0edd4e485480f802bd229a SHA512 4e366e5a60559a8863cb2a50280deb307d8bf885ca5440cce1b49a084b4cc4583b3481240125f35f161226592a43f2c0a426152f117d79b68c92c72a93f751d5 -DIST github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.1.zip 37190 BLAKE2B 7c8b79cb736f53337fdd2878cd1d745a6da3d803c3d3f6a0ed53a86f1d4789d2c656c6e7a17f90caed496fac91fdc89fa66b1de7b2caf97409114aa59658efa3 SHA512 b2af82dccd20e9539d72c8629f2d4babd573f711a810fa77e629fec897a614776cc4ff857700c0b6eb32370a13d122504c0a4abdd3d9111eb8ac0938a0e7234f -DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.2.0.mod 35 BLAKE2B 0357260904c9ba41892132c7e07d2add9b10ce4a09e8db4966219d1f515f917581e2afa0987094c90759634bc2aeb66e758074e023ff331a8337f5090c0102f6 SHA512 5b7ce867497852e4918b8cde5f75ecf2f24b9c95ad112478ac132322e904243f1cea3d16f5731646efb669256dbefc129ac70a499c8b1d25403a14c7e4fad10b -DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.2.2.mod 35 BLAKE2B 0357260904c9ba41892132c7e07d2add9b10ce4a09e8db4966219d1f515f917581e2afa0987094c90759634bc2aeb66e758074e023ff331a8337f5090c0102f6 SHA512 5b7ce867497852e4918b8cde5f75ecf2f24b9c95ad112478ac132322e904243f1cea3d16f5731646efb669256dbefc129ac70a499c8b1d25403a14c7e4fad10b -DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.3.0.mod 154 BLAKE2B 60cd7801e7cd33746305cd636b048b25a86270ec3b29a21c3c078c7e95b769bce7e80c2c7c5474113786bd788c7f88f3719e34f02141038e0d161b36e32f39b9 SHA512 bb808fad059f5abd0171e4bdc724411eff2c7e8d303a4ffb3608a00e21bb3cfafe9e83b4b4e9bccd42c9a4331f67ddc6043e3dd5eaa9a122c86626eed43a8383 -DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.4.0.mod 179 BLAKE2B 3bb7cee3118f0d335ade107dfefc3a594dc3883564fe4c9e96d615e179d394a49a3d6cd6584ba9c684772bc3dc6479af6a168dd3841c03957252667384f6ba11 SHA512 243bf1f69c146252164ad72f853773dcc77f15d7c9e9b731bee26a95e7c8f4ce9ed9738db601b01edb82f4b3808873e1f153a6d4a0c97be0babbe65abc0f8d52 -DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.4.0.zip 90474 BLAKE2B 2f79f0cac2c15acaeae764aeb640534f58ec2ae86fe88a82533498e718cf37d67c563606090ad39b38e22ffca1e63a25cd881d6a472b862ddaf150c7d329b16a SHA512 a047ba8d5f529d459fb6ae8dd39367e6f6cd2e785e90f54a5f8759ff76e4cfff990f1b8c1e0cf49c67b97ca8de36ecf8fdeb3b8f16e579aeae2d563d38da69db -DIST github.com%2Ftmc%2Fgrpc-websocket-proxy%2F@v%2Fv0.0.0-20190109142713-0ad062ec5ee5.mod 43 BLAKE2B a0f8fc8639040a1b7194a35a4020cff543111ee47a3b013163e93d14d42325146b1f6c2acfd595438721c4f6e80f9e5871811c058accbf06c6500bdfd9524004 SHA512 b3b02f5e9f8b68a93f531ce9bece44fbaa691f1527528555327c15b574ecee209ba7f6b713d8ae1f6b58b1416a9eb39546be646ef73b4328e79d8bdf605dcf9b -DIST github.com%2Ftmc%2Fgrpc-websocket-proxy%2F@v%2Fv0.0.0-20190109142713-0ad062ec5ee5.zip 13644 BLAKE2B 484e5ae252f421994b2a23fe3e278992a11d79948509e202366a1b496c8f82e7289eabec3f5d2e0489da66bffe73c4c8c58224993ac621a1bd65a11abeb28a76 SHA512 8d7a4d0cf4d179438a0c8ecdf887169d45b3bdc5746f2e11a07c9621dae098c69b3b6a54ebae249efe9aa78669e81db9bf384919204b3d0af866808915eaa6f1 -DIST github.com%2Fxdg%2Fscram%2F@v%2Fv0.0.0-20180814205039-7eeb5667e42c.mod 28 BLAKE2B 87b79aaa3dda433afe275fbb69b3abfaf808a8a992f37846b51a3cb9069b1a0e5506ce6166d5186eef8656b451c3f6fad5bdfb58a213a9dbab2e7820e9062c81 SHA512 2303a64b0acb96f5f73dc64468a81d6aa6fd9a08240a04d5025884d6076cf90eeb5b132979488431d6f885138702a22a606419cfc0aecd05798deeb3acc4fa1e -DIST github.com%2Fxdg%2Fscram%2F@v%2Fv0.0.0-20180814205039-7eeb5667e42c.zip 33880 BLAKE2B 4b0decc2808a3f38cf272cdc053d1ed933e5023985543ae1643f0ad18dd9de98287403ec3c44ae753c001c25355591d000c996efc23f6bdf4a571cd1ad805833 SHA512 12666c80cb033c49832f33435b6a38d1e0e562965e84485efc5da6243f9fc959de19d05a70628a3bcdd02e7167a69a1a4731f6e6e3960e754f90fb38e7343f9e -DIST github.com%2Fxdg%2Fstringprep%2F@v%2Fv1.0.0.mod 33 BLAKE2B 602b301b7da6b66bdb3a5c9c88d4a74f776ea535fe1c4b1085840eaaea4ea5d9a05fc2f088b92fb85152d22025e89801eb476cdc26e031f8e3adb68fbb62542e SHA512 9c89175c24f82cba599f754d2efb8dec6def64b32735f9733b883b20a0758a6769afc527322ec5059ce275df6e034bc631a32c0a392a66e96c9d4d4a1087c4c8 -DIST github.com%2Fxdg%2Fstringprep%2F@v%2Fv1.0.0.zip 33696 BLAKE2B 698e18104a389eb6f9493ad19546a7b61e28b6e1ec138eba1b9f231a5bfca222057520861f3e5f466ec14a6908705b1cd5d0fa9339c5349d95f536e7162431a2 SHA512 b5cd794572b339f1b7ffea9443fdb5f2512b55f2d2ccbb39ddd4d4163eb3396576cb85d99c72b16d4ff564bf2a5062ea54c6d313126cf1c3e4d81a0663643d3b -DIST github.com%2Fxiang90%2Fprobing%2F@v%2Fv0.0.0-20190116061207-43a291ad63a2.mod 34 BLAKE2B da6bd307f61b08eb749a0b2d9a9f445dfc057c8cafaa13f4a7c6d2d2324f7812c9c8269d9747cc21db9c3478f73558da05035b3f1ce9940f5c5befb16dcdd159 SHA512 b9773f617e5b48c6767051fc7dd2faa63a8a9d537ee42fb51efe6db5b3d24060dea0a264568bb5324915de8917a334f3563dc49d35651a4ee7c15042faad2964 -DIST github.com%2Fxiang90%2Fprobing%2F@v%2Fv0.0.0-20190116061207-43a291ad63a2.zip 5264 BLAKE2B f6d986c7f5fbb1960fa1b62a5722d426c3ab79d865cb179bb9bca5a213bb2008a3cf4edb59dba1a336928cb0bd05d31f7083f394cec09270e66b55cd4a045b37 SHA512 2a8e1f10d10e4479568374b9e51b1b8dbbf1077d8af413d7dcd254ba1dc1cd38ee19e75a4661a4e237d3662e51cbcf96a08bc69a2e5beaf34a2559fcfb9d653c -DIST go.etcd.io%2Fbbolt%2F@v%2Fv1.3.3.mod 24 BLAKE2B f23f0532ce6fece605e76cd16e5f9a1fbf40657f26b2aa6a135bf300a232ffe8eaa9161f93d2845312b10ccb6dd5c4cfea40a2256b6481787ce9ddca7555b0fc SHA512 8988baa04517a19f905b323768f98690b19ce302d54da4648bf72baa2766c8ea8362efaf1c8dd2f02a82fb9c76e72f32373fd04cf48ff133804b6b251bd48529 -DIST go.etcd.io%2Fbbolt%2F@v%2Fv1.3.3.zip 112407 BLAKE2B af65ce0475f0b55ace7f03a7af6fdfaf8daae8b79e0ec1c9fd1aaa911cfe517c6760e6a5fb7881f87d7fed4da3274d14c78aa1424c85c003dc0fa98b092134ee SHA512 ff7060fd74bf2070006a55a739f6a8b64abc5ff09db2d2bc53fe978852e5b82f96bfc79c1f73b68e704bff423722f7adefba0b906de6d96d7e03c3e5740b7ac1 -DIST go.opencensus.io%2F@v%2Fv0.21.0.mod 305 BLAKE2B 73735106ac582b2e9d5f0d739412c3396e0df8627a6adbe810ac560998e4cf2eda12e449b6e336dd6b433eaf57c885b4a927359d0bc1bd6eba9432bb0793c35d SHA512 448e90223b8d67e4d5e4b150055ac83eacf9ef48aa34036c2e59559f21443f796e721df3c0395a829bf5d10d229cdc7beb956c8f90273e50f0989e45a82aace8 -DIST go.opencensus.io%2F@v%2Fv0.22.0.mod 408 BLAKE2B c96dc637d392594cdf710b9542b90504fb090392662ab45208d45abe2cbaac5b64e55f2f62d1afe5542d2747abef1eedfcff97cfc48d6e0649c23b9b8293f7e5 SHA512 823e1ca3a9adedb1a98f5ac900e190bd51480686872bd901cc20a394cf03be6c8fd69cfe7343e42cb6f9d3500282a8097b6c32376aeb3e92bf0b1ce3e75872d1 -DIST go.opencensus.io%2F@v%2Fv0.22.0.zip 291484 BLAKE2B ca3bfc9c9864a2218ec373d78792ba0a40f4e2522bf3e0acd01b153eee43083cf8b124ae19b5fb0eaf7eef7cd59b2733b6c3ad847761518eeff2b183780c79cf SHA512 4fe718c3dd4c7bc0914b32844ae86ce281721f98b05797fb0a0fb51245129dfe1a74d2d04b419f4e0b7a31409b874e0e9d7939c8426af1efd92fdd5f12a52a98 -DIST go.uber.org%2Fatomic%2F@v%2Fv1.3.2.mod 26 BLAKE2B 00521092f85fc8940d69a5885423e84d8e6987a29749d886be3f40c230e563b55d96779ccd2efb99e939167c93067e8d37117750cf2567fc49e70bce9e847d07 SHA512 4c66fd56c35d6d25a3091f83a2d3872ba395092c10519e052aaccf3edca281fb874a46e86e7a7294b4f42a5d5a51d3cc0f066081e5ab945288a48ac223bc19e6 -DIST go.uber.org%2Fatomic%2F@v%2Fv1.3.2.zip 15027 BLAKE2B 06a2451071b8cb0de9b4e664d007584998c91acf4bcca04be7f6c4e97c2579a9cc174e4db220347a00b252392cd6f3aa3e08e27ef3a231d422512a419a199c2a SHA512 be6b2545811ac8a869fd0365c1126be58531a6c0b51690feb17d7e88a2b79dfec6a466ac317df15e4d038c02df0f72993ae3e50a218c9f7f6659787c7f8e9333 -DIST go.uber.org%2Fatomic%2F@v%2Fv1.4.0.mod 26 BLAKE2B 00521092f85fc8940d69a5885423e84d8e6987a29749d886be3f40c230e563b55d96779ccd2efb99e939167c93067e8d37117750cf2567fc49e70bce9e847d07 SHA512 4c66fd56c35d6d25a3091f83a2d3872ba395092c10519e052aaccf3edca281fb874a46e86e7a7294b4f42a5d5a51d3cc0f066081e5ab945288a48ac223bc19e6 -DIST go.uber.org%2Fatomic%2F@v%2Fv1.5.0.mod 252 BLAKE2B d5019d6264ec35aa5c7c85d6c42130027213590c6dca568099f9c3b7c02fea9abdc969dccdc2d8d3f8abd0ce4c95727ec3f6f8dfbd2d4c1c75d4462e356181ac SHA512 15aae0e0950c9812700ba4bab0a19050c30398511df8e29fcfe496927fae3aa228761a796f150dd766377e5768beed842f06ece285e8b0e094a59288e1b86e23 -DIST go.uber.org%2Fatomic%2F@v%2Fv1.5.1.mod 252 BLAKE2B d5019d6264ec35aa5c7c85d6c42130027213590c6dca568099f9c3b7c02fea9abdc969dccdc2d8d3f8abd0ce4c95727ec3f6f8dfbd2d4c1c75d4462e356181ac SHA512 15aae0e0950c9812700ba4bab0a19050c30398511df8e29fcfe496927fae3aa228761a796f150dd766377e5768beed842f06ece285e8b0e094a59288e1b86e23 -DIST go.uber.org%2Fatomic%2F@v%2Fv1.5.1.zip 19041 BLAKE2B 7c782bd71c71dd343bbccf96d6f82bbfb246bf49956ea0dc1cce2c72d9f1b92bfce5ef9e939a340b363bc1179fbb7b35b2ab043b86907af74e1ea27a59e3e291 SHA512 e52ae80adaa4ea0336ebcdd314ceb6b798e388ea446bdab666769360666c3c717682d439e641a04db5c700e8ca62fbd39b768d6126da1c3eb4817abbcc672f98 -DIST go.uber.org%2Fmultierr%2F@v%2Fv1.1.0.mod 28 BLAKE2B 4f0c4b42b00093024ef494b1b0a07896ec41eb140fb953affc085921181eab44bab0baa38ab559b9e36e022acf5cb9ebad5ddcc7303f33982d9012e9e150cb03 SHA512 7939dfe977dd42ac3ca8b91824a73046222ac9bed4f9cbcf0f2d332727b92a094540a56dfb19d095df6d5917b30cec86a6e9e1b082581049fb05bb7bb10106a4 -DIST go.uber.org%2Fmultierr%2F@v%2Fv1.1.0.zip 14488 BLAKE2B 3bb8df1a459b2cf1dd63ab200f06a9f41f968f828b815b70bff899972a4c913656dbd3856dc6f4626836175d32b63c439e32a5aeb6a034f4733e2d09ef53f7f9 SHA512 d5fff733045694509ef1100fb8701526002b0841a11b5e1acbdea7e186c80738f651bd973c5eba2db5d2b8fff1b3057ea5d7d0e46645268b2f3619656238fdf4 -DIST go.uber.org%2Fmultierr%2F@v%2Fv1.3.0.mod 324 BLAKE2B 48b4bfac55f83ef9b78680d5354431cb8fa66139bb3e2f81dfb2861c8c2bd0731572372178c8499f8de7f3e7bd8d34f23f5b51935214eb008d52cda1e80953ce SHA512 9060d8bf8fd7a14d2a32656b1e086de1b3ec5658041ea0127fb2f68570c01059854137ce213d5ed648673c6f1843ae467facf647a4c7cd6ff44165eab575d30d -DIST go.uber.org%2Fmultierr%2F@v%2Fv1.4.0.mod 324 BLAKE2B 48b4bfac55f83ef9b78680d5354431cb8fa66139bb3e2f81dfb2861c8c2bd0731572372178c8499f8de7f3e7bd8d34f23f5b51935214eb008d52cda1e80953ce SHA512 9060d8bf8fd7a14d2a32656b1e086de1b3ec5658041ea0127fb2f68570c01059854137ce213d5ed648673c6f1843ae467facf647a4c7cd6ff44165eab575d30d -DIST go.uber.org%2Fmultierr%2F@v%2Fv1.4.0.zip 20167 BLAKE2B affec5465b2f84ff7796c959588b35670d48a8ec1bcf77f49c1a661bb08e62f051ba7d792738cdd857b26232c13501ebaf543ccd9b72012511e25a198ffbb874 SHA512 dec66c833797bcad5a7e458130b81cf6d7312f72182fdb26ad90996aa9cadcc264bb2c0fd62564fe18529f02a5e22d048d07d564dd72e8bae3430d7bef5f6d2f -DIST go.uber.org%2Ftools%2F@v%2Fv0.0.0-20190618225709-2cfd321de3ee.mod 25 BLAKE2B 233f108e33b587684ea189f873a869f028f02d9fee0eea04183b8d5baa445c5f76bbe2b497f5cae24dbe1745d8b26d35f302b23d8b11b95bb7c62f54416548ad SHA512 0ee649ad9b6a2d478469ece9e6ad9b51fa00f002f7a4966068892cdae278680403637897d83a0a423effcb8bddce1d2f9316774cb5890609f6085b906394909f -DIST go.uber.org%2Ftools%2F@v%2Fv0.0.0-20190618225709-2cfd321de3ee.zip 27032 BLAKE2B 58b337663e7a5625521925deadcd0d686ccbaa7d04925852bee0ff1cf3ada22c078e9715930dd20858b16bf51632a4e4d7e76986b0092107bc07ad46d132840c SHA512 b0f1b10667e0e600a4ebca7b4cd9983a27c3ec5f2c54cd46eb055cc0a07504642bea7ccfd0e0f6e3d007422633506efe863817b7c7bc9d18eec3642c84b28f8c -DIST go.uber.org%2Fzap%2F@v%2Fv1.10.0.mod 23 BLAKE2B c60cbd3c1e15e71a99909c113b100de3909740d9e0f939da800209ed1ccde49f77be7a8c22e045b9edc663859995859bc7ccd60bb6953846829ca3164115f3fa SHA512 263e322e5615c91e810fb9ba30a601508e1e3e418f87c7c74de962c341f207e703930f2ad41ae1bf7b2ad106831dc37b0b96637b816d130bddc7225d41911946 -DIST go.uber.org%2Fzap%2F@v%2Fv1.13.0.mod 221 BLAKE2B 586c82887d6cf6582837fb495a46030e1c582b58305fc70c7b88a29e570610e693a298fa7d4eac80bc86231c7fe6f6e27d3fdb5afe084363eb918692a1ccbc59 SHA512 2a7413f6f83e66456c340536502d855772e6de433ca4be1a9cd1572caf5fba7cafc7d377ef529324b5bd8af97830c9eae75768f7c45d4676b455e3959acc82c1 -DIST go.uber.org%2Fzap%2F@v%2Fv1.13.0.zip 217908 BLAKE2B 76cba015e6e09b9953c442c0080e7f0df0b47ccb57a1b7fba756dd3f32549c64dd2c71db9e00401c93c694d1cb1ce6336825e8a2b1221a199cb7b9a964370261 SHA512 e148cb9592231bcb86846dd43d8306f66618ea005cf397ef35efe2d63ba9fa08d3ff600419fa6392ce826ce585c4ee2ba44b548d3a23fed6ddf0ec8f62dd1052 -DIST go.uber.org%2Fzap%2F@v%2Fv1.9.1.mod 23 BLAKE2B c60cbd3c1e15e71a99909c113b100de3909740d9e0f939da800209ed1ccde49f77be7a8c22e045b9edc663859995859bc7ccd60bb6953846829ca3164115f3fa SHA512 263e322e5615c91e810fb9ba30a601508e1e3e418f87c7c74de962c341f207e703930f2ad41ae1bf7b2ad106831dc37b0b96637b816d130bddc7225d41911946 -DIST go.uber.org%2Fzap%2F@v%2Fv1.9.1.zip 221108 BLAKE2B 9f03d8b356ccff8e8dda9a4885d7fa79eeccb614415b1bc50ec206458f650456a9e1ade1401908b53c37a3b293cd3b7503b84104555250bc801e5c74b8fb9122 SHA512 259b357d0f31ae6ad5dd1b841d69d934b1d9d441617944d4b46269f43fb4de1cbf15750dac9dc87cf4260902ad2f4e4560e6e023375212e554d150fd65af5f9d -DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20180904163835-0709b304e793.mod 27 BLAKE2B f91145aab2cee00c3567772e97f6162b9681d6cbcbe67a1b5b2f59b8f912572f705a0d1280fdced086d92efd10c50ecede26d1cfa3d5419217e5eef95097b4b1 SHA512 a88da5b983ff482a4e8b512761eeee466a8b0664b42da54ec9772c2eb3cb1bc5b7545045e283bac82552336802d8bc8efe137ba16f3530228b529366744a33e6 -DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190308221718-c2843e01d9a2.mod 88 BLAKE2B aec7d0eea1278eb3d1568d5bfb4041267501ad14457ebfcbdbc5fe21473170b8616ca4028f52af2edbfd85922cbe04540b4b0df7f69f63197698143cc5557a7a SHA512 2df49895053b36fed7ea905aa73f86568fbafd79ff0a7976679d8c77cf15025129435d9dbfd89367b611b1aadbea4f4bd1835eb4efa9ea702466e443638d379e -DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190506204251-e1dfcc566284.mod 146 BLAKE2B 6fe18cbe4eb6c3f6c26a4d2f9f309c48eb9ea59017125179cbfd61bb1e62395515c8cb286e1139fbcf54d37dcb2baa1a2f98dcfbcb6178b7f7df3b51929ff5c5 SHA512 f40c7b620b28b5bdc6ce92d43768af71b5869e7f0eb7872dd0f2751eed2bd15a17f7af26bf2dc5c6f7e6b816a174d010bfd22b3f8f5dd72f22dc4e4357dea842 -DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190510104115-cbcb75029529.mod 146 BLAKE2B 6fe18cbe4eb6c3f6c26a4d2f9f309c48eb9ea59017125179cbfd61bb1e62395515c8cb286e1139fbcf54d37dcb2baa1a2f98dcfbcb6178b7f7df3b51929ff5c5 SHA512 f40c7b620b28b5bdc6ce92d43768af71b5869e7f0eb7872dd0f2751eed2bd15a17f7af26bf2dc5c6f7e6b816a174d010bfd22b3f8f5dd72f22dc4e4357dea842 -DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190605123033-f99c8df09eb5.mod 146 BLAKE2B 6fe18cbe4eb6c3f6c26a4d2f9f309c48eb9ea59017125179cbfd61bb1e62395515c8cb286e1139fbcf54d37dcb2baa1a2f98dcfbcb6178b7f7df3b51929ff5c5 SHA512 f40c7b620b28b5bdc6ce92d43768af71b5869e7f0eb7872dd0f2751eed2bd15a17f7af26bf2dc5c6f7e6b816a174d010bfd22b3f8f5dd72f22dc4e4357dea842 -DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190605123033-f99c8df09eb5.zip 1820985 BLAKE2B 3bc7be3cbeb21910390b55595aff40b3b2c8c023e8f19a8edb6c05d20bbb161b00dfb2b71664663a366c7e7b4c39025c9da36e485ef38fc55d3d5a8328acf2d8 SHA512 8ac925ff35cb11b9ac1f41a45df0f81433d0f4a1deaa026aa6982292dd5ad9f17e4223a9034433f14edf4707b2f461c592941ccf83e427ef6ad485839d3892e3 -DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20191011191535-87dc89f01550.mod 146 BLAKE2B 6fe18cbe4eb6c3f6c26a4d2f9f309c48eb9ea59017125179cbfd61bb1e62395515c8cb286e1139fbcf54d37dcb2baa1a2f98dcfbcb6178b7f7df3b51929ff5c5 SHA512 f40c7b620b28b5bdc6ce92d43768af71b5869e7f0eb7872dd0f2751eed2bd15a17f7af26bf2dc5c6f7e6b816a174d010bfd22b3f8f5dd72f22dc4e4357dea842 -DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20191011191535-87dc89f01550.zip 1844911 BLAKE2B 512a7175e03c2aac9c4f3a454a5f428e2567e2d862e362480835722c4f80b8aeeab1880510658da9b219741dc161492096ac2124ae763163103ac22255e52f78 SHA512 fc5402097646068a495867d50f55b00c2a774ddb99df373dc860c175383f8f1ab5c802bbefa55e013e45201a3077cb04f5dc8831f3ff320422623167d8c38568 -DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20191227163750-53104e6ec876.mod 155 BLAKE2B 8bba3353db8ceb3b9fe40b8fd59aacde169776a4a553a069a04836bbf15e5a9a8d7a2d39feed98dac6cb890198180fda39f26b528ff95f24c5b2bbf6601b45c3 SHA512 7c5a755a03063d47d259fda0a6c2faa63c2f30b98dbac583e106aaa817d6cde3e07551e0b5e08f3a25db4c4ca45a23cebe993ae6f3d39c88deeaf2c7d8086a06 -DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20191227163750-53104e6ec876.zip 1861371 BLAKE2B 27c60a280e5b0644abb8ec34c645d165e6e01be124c2600d43e22955e785632f82c4597bb19ad1a61f04ae2701c4a5005f899f57d41f111d23535d6a169973b0 SHA512 62f52a80a1944263dc582e6f33a7f52d86aba7171b7ab4edc14dd22b69f523c83469fbbb04b2cfe2bd013b0920ddc15a9977ef8b58f09179d136157c64331576 -DIST golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20180321215751-8460e604b9de.mod 24 BLAKE2B 9615629f1bf7d58419f5b73842e19f6be3a8c8cefb217364917f1aaf68aec00de41d96700378b048d6cc385e154ed6d3db59256b4a00e9165bac7951cd0bcbab SHA512 9131017b8ab0c2362b74e0c010daeb849689025aa31cb464dc379b0e34d0fcdb66749329b111041127997440bac052249dab522ab27239858405c056e3ac5dbf -DIST golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190121172915-509febef88a4.mod 24 BLAKE2B 9615629f1bf7d58419f5b73842e19f6be3a8c8cefb217364917f1aaf68aec00de41d96700378b048d6cc385e154ed6d3db59256b4a00e9165bac7951cd0bcbab SHA512 9131017b8ab0c2362b74e0c010daeb849689025aa31cb464dc379b0e34d0fcdb66749329b111041127997440bac052249dab522ab27239858405c056e3ac5dbf -DIST golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190510132918-efd6b22b2522.mod 327 BLAKE2B 209bd1491b6099491fca7ccfd2fabb500b56112557b4b359819b5f9d18e1587b8b1551acab53ac6c222b66b825c4058ecd6adb1d886f1868b7b96ebbd5865eea SHA512 e16919da8b2302c45f8fab5f0d200f41c2c978ad31eab2b4db18310bfbe09079d738f682920ef6530f1d5f53359ddc3d4bf33fe5cefbcefd440212b31e72ef28 -DIST golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190510132918-efd6b22b2522.zip 1480143 BLAKE2B 067e4f93ab06fe92de8625d9dc955abd0a4d9bf6f46324e301758bb75956d3e2eb6f1ee4a1a43fab985fc05b72e5a644c81dc805c0ea9bdb04118ffc09c30c5c SHA512 cf103cfdbadc63b0371ec66e5ae930a1a6fde1bb4a9b52c1c2e50f6b0ff8c1da6f40f48384c1855937a0dc66b5a000ff0cd5cc9fa7bf64962b8480457c8e6eea -DIST golang.org%2Fx%2Fimage%2F@v%2Fv0.0.0-20190227222117-0694c2d4d067.mod 60 BLAKE2B 1c8445e3c9313293a0551c8a2acc31a1738724b96886bdf165c74de6cf2d25b784baefa2c41997a64ff189333a8c59756fac7ac41b0ae1d4f167c38574905351 SHA512 c466f8b348acdc26208bcb782cf330a979d9af086a95f307a785884492430f11fe45d1ddc3abdc1b092654b3880a5e7a456740293935b1912a1d39b658de80e8 -DIST golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20181026193005-c67002cb31c3.mod 25 BLAKE2B 8942ceba0f85f2e950663feb634e602815315834dea89d18f7319100c19a27f15746a11b50157d682756fc922138660512cd6c8e75a2458b0cd512aba19760da SHA512 3ba23f3472e0ae7904b4250e2e3a1b04c719c4bb66c59ccfaf96fae2fb25ae0abf19f542f03c7179a312a008521acaf4ff389517b11dba8b6f581a9dded44883 -DIST golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190227174305-5b3e6a55c961.mod 88 BLAKE2B ce393846b227c374753f46fc076385826a6288b0c85095e097c041b844f46b87120774c68924492c4f33c33729103a2d916d2335e24953022630314b63f606d0 SHA512 0097db2957ab98a21a73960d2a37c526e5cabcd5ba4825e44f0ec4851ef83743ae171c8dc4b6c09ea4d931c15879c247e362ca53ef8dc762b484f1ddcc483d04 -DIST golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190301231843-5614ed5bae6f.mod 25 BLAKE2B 8942ceba0f85f2e950663feb634e602815315834dea89d18f7319100c19a27f15746a11b50157d682756fc922138660512cd6c8e75a2458b0cd512aba19760da SHA512 3ba23f3472e0ae7904b4250e2e3a1b04c719c4bb66c59ccfaf96fae2fb25ae0abf19f542f03c7179a312a008521acaf4ff389517b11dba8b6f581a9dded44883 -DIST golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190313153728-d0100b6bd8b3.mod 88 BLAKE2B 04ec98f76d6779784920b4f746fccafdba5ee6f365edc58985219675791d417746575165985de6d866ee891b6c768d317360a4229e61f19a1f05e4f0bafdb111 SHA512 5e787e9d2c16c87238995214eab353f87d009acf8ef78889295d11dfabef73cea4e8cabfc2999f9ef0c936efb84c22963e0aa2bce4b3678680a389cbe23df961 -DIST golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190409202823-959b441ac422.mod 88 BLAKE2B 04ec98f76d6779784920b4f746fccafdba5ee6f365edc58985219675791d417746575165985de6d866ee891b6c768d317360a4229e61f19a1f05e4f0bafdb111 SHA512 5e787e9d2c16c87238995214eab353f87d009acf8ef78889295d11dfabef73cea4e8cabfc2999f9ef0c936efb84c22963e0aa2bce4b3678680a389cbe23df961 -DIST golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190409202823-959b441ac422.zip 47697 BLAKE2B 9622c90dfec7f15a643b8d818a174e07d2656b4a951529eeaed8e558fff9cd514c6ab37e87f05661d35a832c6119ef9884b831859692764bc35d4f3bc5f768f9 SHA512 b026a9ef2d614ea41f6a151168233157825a52a39d7669d30ac9fa1e7f88b95e94e9814395e46aec6611f1bbd621d3267e676df4cb9a9b9b7fd80d2e52b1fe13 -DIST golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190930215403-16217165b5de.mod 88 BLAKE2B 04ec98f76d6779784920b4f746fccafdba5ee6f365edc58985219675791d417746575165985de6d866ee891b6c768d317360a4229e61f19a1f05e4f0bafdb111 SHA512 5e787e9d2c16c87238995214eab353f87d009acf8ef78889295d11dfabef73cea4e8cabfc2999f9ef0c936efb84c22963e0aa2bce4b3678680a389cbe23df961 -DIST golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190930215403-16217165b5de.zip 45710 BLAKE2B 7349ff19c5695071b04342199b7694af51d7a63b2a9940c72abdc8e2a03da41260da0ae09b039f1cf2c3752c7f2256164a3f0f4ce00410adcd5389cdc07e5cb9 SHA512 00ae7262d6a4f5839915a648e09a51fd939300b9f0404f2c13c062412d059b8278e3c40b2db2a927bffe74a940295834c18b77fb7dc58e88401e0b7606c13aeb -DIST golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20191125180803-fdd1cda4f05f.mod 97 BLAKE2B ec2dbdd2dad833a979dc53c8d170b4d0f5d336f4c52f36e3116cba2f3549e42fc3191fa56b81d3b9378a52322b86cf5eb0e947e6002dc1d1bee12f7a6bc2eb36 SHA512 23082eb3c6f3e4330e88178c7511b83a06288b678e517cf8ad5062943d0a0fdcea16973425a8dc01cfeacc32ec05b2dba8edb1adfba2e0bcb2d81cb5060c6085 -DIST golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20191125180803-fdd1cda4f05f.zip 45839 BLAKE2B 7fa2da9301cd760ce923164ca73b1e5c528f41421aeab0c9b90915b72ebf70f350766db083800d7f552c9253452dbac8c5dd48f8701dafb206513d46389b5638 SHA512 979b197fbfc92f81d4d376c4fcb0845a9e86a7a9350841d88ae2f3059c5192e2309df2e19edb76ef96e1e33bd957a83f95fe5c439d72731bd05fa29dda589e23 -DIST golang.org%2Fx%2Fmobile%2F@v%2Fv0.0.0-20190312151609-d3739f865fa6.mod 27 BLAKE2B 9bc664bbb78cd778f132bf3504160bf8f6d9950342fa73c461db815f07c0ce2ae5bb2a0ac099457d022e1edf2d07e536566fea043a77aa8b21054254ae854c46 SHA512 a105eb088532321694d3adb5da0b3cdceb7781670a2d4a8a757799e3c8fde02784b981747714cfa8770ed29eb1a0228e0945ad3c363220c39108a7432fc29a32 -DIST golang.org%2Fx%2Fmod%2F@v%2Fv0.0.0-20190513183733-4bf6d317e70e.mod 97 BLAKE2B f6c97d5de5c229ab22e047250a7030c201829f8237b63c0b272c0453dd8ea91360f4a73f9d2b56212103c76c36c01699231d9dd31d48ba8624554b5b36499190 SHA512 15deca99c6d866dcffdd51b1334fbe7f33ce88e1fd82badec64f5155782681887e7fd959ec2686fb35adf70afbe08d743e36c6a891f43462074663357e5b309a -DIST golang.org%2Fx%2Fmod%2F@v%2Fv0.1.1-0.20191105210325-c90efee705ee.mod 159 BLAKE2B 7124b4e21f0b1ff142fe4cd5c57a22de7bc5b1c578e16e8661085d475d67573279c1ce3165e05a28c77a41eac43fe29b1d98854abdcc7b0b66167f82db652dd8 SHA512 5e225da646ef87b8bf435b745313187cecd1bd3e88660f8a90cd2a6fdcadbe8fc51f53edae4b3aa2357ad273a8e58034920bb61a1cd5898b95d3fe39f30ec648 -DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180724234803-3673e40ba225.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a -DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180826012351-8a410e7b638d.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a -DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181114220301-adae6a3d119a.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a -DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181220203305-927f97764cc3.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a -DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190108225652-1e06a53dbb7e.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a -DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190213061140-3a22650c66bd.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a -DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190311183353-d8887717615a.mod 119 BLAKE2B e042b2716739483252c3340451b2c3c7b421fdf8d6b3e0333e979802fca66159596982ea63a24b6a64457b2757a0ad24cbb9ea032bab4c5377edf84a3ea18b97 SHA512 26b6c92eecd2208967336d4d23f8a71f77f9a73643ad1e5cd84dee36b2f626fffc806e4dd33acc284831a0961e2b363d898a747903235945fbfb665c5b4d5ef2 -DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190404232315-eb5bcb51f2a3.mod 119 BLAKE2B e042b2716739483252c3340451b2c3c7b421fdf8d6b3e0333e979802fca66159596982ea63a24b6a64457b2757a0ad24cbb9ea032bab4c5377edf84a3ea18b97 SHA512 26b6c92eecd2208967336d4d23f8a71f77f9a73643ad1e5cd84dee36b2f626fffc806e4dd33acc284831a0961e2b363d898a747903235945fbfb665c5b4d5ef2 -DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190501004415-9ce7a6920f09.mod 119 BLAKE2B e042b2716739483252c3340451b2c3c7b421fdf8d6b3e0333e979802fca66159596982ea63a24b6a64457b2757a0ad24cbb9ea032bab4c5377edf84a3ea18b97 SHA512 26b6c92eecd2208967336d4d23f8a71f77f9a73643ad1e5cd84dee36b2f626fffc806e4dd33acc284831a0961e2b363d898a747903235945fbfb665c5b4d5ef2 -DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190503192946-f4e77d36d62c.mod 119 BLAKE2B e042b2716739483252c3340451b2c3c7b421fdf8d6b3e0333e979802fca66159596982ea63a24b6a64457b2757a0ad24cbb9ea032bab4c5377edf84a3ea18b97 SHA512 26b6c92eecd2208967336d4d23f8a71f77f9a73643ad1e5cd84dee36b2f626fffc806e4dd33acc284831a0961e2b363d898a747903235945fbfb665c5b4d5ef2 -DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190603091049-60506f45cf65.mod 172 BLAKE2B 6c58510adee25cabb2e31dcbd88939145c6c0856ba2fd1f0b78f82ec6f2589fe0dcce736a192d145dbab8f4ba892bebb80cb6cea4ea89fbef72f7822d157c1a1 SHA512 5b9748f38f64301e4895d9d2bc106fc9bd05a29feff5cfb53e248d168af998fd1a501c1a3c27e23af663b283093d2a48393bb0798bea449256d89ae119b225eb -DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190613194153-d28f0bde5980.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236 -DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190620200207-3b0461eec859.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236 -DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190620200207-3b0461eec859.zip 1421786 BLAKE2B 15782d84b4fd3576df5ae0c6540880b3a87f5ed47d66527ad88bbdd5e96cd1b0fb321b896b686de67d4518d3c6eecd008f1e49f48fa29df962a4d01f6e08653f SHA512 e79353b8f6b6866a14236eed278aae32ccb02eed040a557dda219cd96eecdc0174a8ac29a5509a33f6f0f9e5aa16f7d1c6861167d9798a5cb1eb01aabcee56f2 -DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20191002035440-2ec189313ef0.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236 -DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20191209160850-c0dbc17a3553.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236 -DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20191209160850-c0dbc17a3553.zip 1499692 BLAKE2B 2ca64710a73a42e2c956ac30aff1ef35e9df2619ae3eaf7ebea4e6efe6cd322244daac868fce5842f08d14eb2ae3b20654d721bd8713fe2141b409aac593dbc7 SHA512 49ce7d40e2a126a4bece83b274e7c5ec18dfbc3fe2203290022a47d4eb651425dd3e90e23e747229e0b5c734fde374bfdbff629ff8466767cb17e8e94385719d -DIST golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20180821212333-d2e6202438be.mod 27 BLAKE2B 078fc99b981406f4ee3f8da94c83954e80619e76ea63cf6323f27614bbcb870bb650eb5ffaac865a374f3ed0ef0619d97e11f05924c92e395e72cb73f28630e6 SHA512 53431e560b5d6a9b50f44997ef6755f71741ccca155767dd954da41f11f53a3e8d01d7e01a2bb9de1fdd551dd2e734cb65e5641cf5de5c9a8a6a25a4894336f5 -DIST golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190226205417-e64efc72b421.mod 233 BLAKE2B 5a1feba7e2d9703a864889f35f70eb18d30f9c0179a1425b0f4cddf17b03d2d187ba36346243a97820ae45e03a136ac26aedfefa09c0c7bf6cbd246eddf36c50 SHA512 9e91ec99aeb8b639d63fde3cc38f750d0a29d4a05864595beec0de0667ef9193007d89cb899b1d5ba44f0675121b2cff1e09b86bad4331378a66e15ef2f4e26b -DIST golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190604053449-0f29369cfe45.mod 233 BLAKE2B 5a1feba7e2d9703a864889f35f70eb18d30f9c0179a1425b0f4cddf17b03d2d187ba36346243a97820ae45e03a136ac26aedfefa09c0c7bf6cbd246eddf36c50 SHA512 9e91ec99aeb8b639d63fde3cc38f750d0a29d4a05864595beec0de0667ef9193007d89cb899b1d5ba44f0675121b2cff1e09b86bad4331378a66e15ef2f4e26b -DIST golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190604053449-0f29369cfe45.zip 81912 BLAKE2B 647b2edcfc6109ea26a1844c259174eb37e3a97cbf12242716d4cc308b3918b5a0b104c9a5c2f3b4974bd94c28afa7ecaf40e71aae5fdd821cb1a5a15ec978e4 SHA512 62b95055b08c73a87c7ef69b2984eefd061e3f7d71eab8e05ce82a4ab1be2ce200aae7929da77a9ec49051b7c73bcc948fa4ee782afdfb8d74dc2d206636313b -DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20180314180146-1d60e4601c6f.mod 25 BLAKE2B 01f7f78a0324ca728efd4d662ea130d7e200ab25805125e472720ca01feaaf2625b15bf53f51837a6913e35e060a19018928a38851d7445f39e6e42e237dfda2 SHA512 a9dd073f69c5be1153aaab6e84dd3bb1610a0df8b9882ca4c486c6625d4b5201e5032f86e5014421358dff564d93c4e67f20e5fd1d21ed5e259ddfbc90af43c0 -DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181108010431-42b317875d0f.mod 25 BLAKE2B 01f7f78a0324ca728efd4d662ea130d7e200ab25805125e472720ca01feaaf2625b15bf53f51837a6913e35e060a19018928a38851d7445f39e6e42e237dfda2 SHA512 a9dd073f69c5be1153aaab6e84dd3bb1610a0df8b9882ca4c486c6625d4b5201e5032f86e5014421358dff564d93c4e67f20e5fd1d21ed5e259ddfbc90af43c0 -DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181221193216-37e7f081c4d4.mod 25 BLAKE2B 01f7f78a0324ca728efd4d662ea130d7e200ab25805125e472720ca01feaaf2625b15bf53f51837a6913e35e060a19018928a38851d7445f39e6e42e237dfda2 SHA512 a9dd073f69c5be1153aaab6e84dd3bb1610a0df8b9882ca4c486c6625d4b5201e5032f86e5014421358dff564d93c4e67f20e5fd1d21ed5e259ddfbc90af43c0 -DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190227155943-e225da77a7e6.mod 25 BLAKE2B 01f7f78a0324ca728efd4d662ea130d7e200ab25805125e472720ca01feaaf2625b15bf53f51837a6913e35e060a19018928a38851d7445f39e6e42e237dfda2 SHA512 a9dd073f69c5be1153aaab6e84dd3bb1610a0df8b9882ca4c486c6625d4b5201e5032f86e5014421358dff564d93c4e67f20e5fd1d21ed5e259ddfbc90af43c0 -DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190423024810-112230192c58.mod 25 BLAKE2B 01f7f78a0324ca728efd4d662ea130d7e200ab25805125e472720ca01feaaf2625b15bf53f51837a6913e35e060a19018928a38851d7445f39e6e42e237dfda2 SHA512 a9dd073f69c5be1153aaab6e84dd3bb1610a0df8b9882ca4c486c6625d4b5201e5032f86e5014421358dff564d93c4e67f20e5fd1d21ed5e259ddfbc90af43c0 -DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190423024810-112230192c58.zip 25620 BLAKE2B 770b7dc9bdd8999123fb58cfd951dcbd5592172fd394f1a70abc918e3d7adee5273da1c757f95be15a0ede27f4fd00804564828251ab308d6fc4b116415ac144 SHA512 5a9db9d294b5f2121f3de994da38161f013a0512ad64aaf51f1c7a94b7cdb1ec4102f7c457d29f9bde209e8c254f6ad034c294af3649dbd10d5349c05874f74c -DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180830151530-49385e6e1522.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c -DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180905080454-ebe1bf3edb33.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c -DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181116152217-5ac8a444bdc5.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c -DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190215142949-d0b11bdaac8a.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c -DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190312061237-fead79001313.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab -DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190412213103-97732733099d.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab -DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190422165155-953cdadca894.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab -DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190502145724-3ef323f4f1fd.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab -DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190507160741-ecd444e8653b.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab -DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190606165138-5da285871e9c.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab -DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190624142023-c5567b49c5d0.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab -DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190624142023-c5567b49c5d0.zip 1809154 BLAKE2B 63d29c0a89fdb5d1cfb9fa9f81ca75b0be518f63bddbb218581375ef651a30075e1c1a3ce46ee80dd2c3e2c25403d262bc2781f9b847db1a983db882d2ecfecf SHA512 868fa14dc95dd7381eeedd05c0026148afa4f85cd02e5ffe6f4a1e3315216378d0caef76124feb5e3d3ad2173217048d3c0b0285a032536a0a99dea47f0bfdf2 -DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200107162124-548cf772de50.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab -DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200107162124-548cf772de50.zip 1913079 BLAKE2B 8beb8e74d186ac1a5424f65cef958515d39b3082fd35c348a86305743b26d6e378635f8b4df868ddc386a700fac7e92d24f5aac3da467a8ee08abfcab7060be6 SHA512 7ccc0910f3dd4ca652bb2f02bd0e423497b4ecb6f9e124c4c6016597893ca3c9bed3c293922e28e5e6c958cdfedc0b8ffef2fe44ca3b282ebde1ab310a975fd9 -DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.mod 25 BLAKE2B 31009af0fdcd0f8730c9985287e6e364ec4e5183e57e92560dbc80a2010eced51b8a90f01a82b49384268c8a0adbf69d179c205d3f68e0eb459169d2ea9528f0 SHA512 ca081ef7cccd7bbedc6843fbe0c452352661a07e1298cd02ff338ed79d807c6401d613a3cf20011189d2f98a794ffa410547b3e352eb58a6f0a84822285d391d -DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.1-0.20180807135948-17ff2d5776d2.mod 25 BLAKE2B 31009af0fdcd0f8730c9985287e6e364ec4e5183e57e92560dbc80a2010eced51b8a90f01a82b49384268c8a0adbf69d179c205d3f68e0eb459169d2ea9528f0 SHA512 ca081ef7cccd7bbedc6843fbe0c452352661a07e1298cd02ff338ed79d807c6401d613a3cf20011189d2f98a794ffa410547b3e352eb58a6f0a84822285d391d -DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.2.mod 88 BLAKE2B f3dd520e0e4e9b57feab62ecabb9169f37f1ce49b2846b949f9266f807767d38f55e4aa8ea006229c6f81cfc1e2c9dc0d1e3c186235e416dfb90fe7e04751d07 SHA512 d9361afb453b10c9d02787568ec33ea4c97a115899c6b3d1a1246547a749244e9218475ae5ae9f741d9b355260d2d3c33852673e805fcdd5f26f3ca40f035884 -DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.2.zip 7430601 BLAKE2B d2403817cb6b7e32462b90995412c4e63cfdeaf3710fc9386f4b708e0ae2be9593649e923f0d844dc4420b177e42e7abfa7657e03e27fa08be9e98d76da4cb9c SHA512 8d8dad296f1497f352e94c416711dbb1f468901a3fd2dfd0a9c67f2d59306ea611d77917289521d2845f6958f571f6c3fe2d3dab289524d8145489d5b386fbaa -DIST golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20181108054448-85acf8d2951c.mod 25 BLAKE2B ba9e31cf2a4ab0f78a5c67d78026c2ef9571bcff7c820ce212637c8360420af274bfc47cb14bbc3df24457a4d3acb5dee38448a848abbd4e82232bef05b6b2e9 SHA512 6e51811c33b84ddd4a7548013579204266e466bd2e87aa9b6e34892570aa09c607ffa806f8a420474e26ca0e277ab23c81bb07b0ebf2c3b6ed193014c1bc37a7 -DIST golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20190308202827-9d24e82272b4.mod 25 BLAKE2B ba9e31cf2a4ab0f78a5c67d78026c2ef9571bcff7c820ce212637c8360420af274bfc47cb14bbc3df24457a4d3acb5dee38448a848abbd4e82232bef05b6b2e9 SHA512 6e51811c33b84ddd4a7548013579204266e466bd2e87aa9b6e34892570aa09c607ffa806f8a420474e26ca0e277ab23c81bb07b0ebf2c3b6ed193014c1bc37a7 -DIST golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20190308202827-9d24e82272b4.zip 11671 BLAKE2B 0a73cd55380594ca4bac71bee0207b51979e62407ec3c828f975e8091a20e2b9a6cc331dea88cf0ff44ff3a6c7d1cfd2844651acd1d957c0d725de525a58985f SHA512 ccd129fd4ce8e4067d0ad4b164cd8c4fb7ba65d5022bb656dfdb50dd2d467152bb83760f3d94c465b6d4c29c29931c8be6c697e1634ccbab4eb3a53edca7dc4a -DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180221164845-07fd8470d635.mod 26 BLAKE2B 2a44c2cc034af3473d9a1d4e1c23b0f4542333853bfc0ecbfcf9eacacbb3593b449fcfc94d23f49ccc16e5a844bc72a3462a3e08a5c26194106a64d1f2732e0a SHA512 3c166b18c0ce47a47e95da9eeede63879a92b0205bd4589d554f7bae89699be0efa83e1f5bba8e50f47714ea23e759b07f4543fe06301995d39373da2db16fc0 -DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180525024113-a5b4c53f6e8b.mod 26 BLAKE2B 2a44c2cc034af3473d9a1d4e1c23b0f4542333853bfc0ecbfcf9eacacbb3593b449fcfc94d23f49ccc16e5a844bc72a3462a3e08a5c26194106a64d1f2732e0a SHA512 3c166b18c0ce47a47e95da9eeede63879a92b0205bd4589d554f7bae89699be0efa83e1f5bba8e50f47714ea23e759b07f4543fe06301995d39373da2db16fc0 -DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180917221912-90fa682c2a6e.mod 26 BLAKE2B 2a44c2cc034af3473d9a1d4e1c23b0f4542333853bfc0ecbfcf9eacacbb3593b449fcfc94d23f49ccc16e5a844bc72a3462a3e08a5c26194106a64d1f2732e0a SHA512 3c166b18c0ce47a47e95da9eeede63879a92b0205bd4589d554f7bae89699be0efa83e1f5bba8e50f47714ea23e759b07f4543fe06301995d39373da2db16fc0 -DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20181030221726-6c7e314b6563.mod 26 BLAKE2B 2a44c2cc034af3473d9a1d4e1c23b0f4542333853bfc0ecbfcf9eacacbb3593b449fcfc94d23f49ccc16e5a844bc72a3462a3e08a5c26194106a64d1f2732e0a SHA512 3c166b18c0ce47a47e95da9eeede63879a92b0205bd4589d554f7bae89699be0efa83e1f5bba8e50f47714ea23e759b07f4543fe06301995d39373da2db16fc0 -DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190114222345-bf090417da8b.mod 26 BLAKE2B 2a44c2cc034af3473d9a1d4e1c23b0f4542333853bfc0ecbfcf9eacacbb3593b449fcfc94d23f49ccc16e5a844bc72a3462a3e08a5c26194106a64d1f2732e0a SHA512 3c166b18c0ce47a47e95da9eeede63879a92b0205bd4589d554f7bae89699be0efa83e1f5bba8e50f47714ea23e759b07f4543fe06301995d39373da2db16fc0 -DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190226205152-f727befe758c.mod 194 BLAKE2B 94f62204dd4fd9b865aca70366a7a7754e2e92ed27591beaf789b268ad272dfb34ca0906d888c608393b4c71bc5c9f975fc86c164528ed7d0390e41b66206ec4 SHA512 8b68acbca48744320e64a70a983a471e9e2fc2249562064b10256269033473fd50264b6544646227fb666f075c4f266df1835ca3f88ee679bb97d34bf62bd195 -DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190311212946-11955173bddd.mod 87 BLAKE2B 32cb406deea05323b1121386bf61f344f8eda0b5370e95bb73828ce0bea50bee375ae3e9b076b9d683a4d89561709c5e97e45e6b08344fbdf6b03b3ce4398dcd SHA512 18ae9b2f54109b4ec5cdea433ee0e3b7006e4d5ea57022d6e8151d4d364735a6b55cf7b5eb2f43b602ec786b2b6819ad78dfc33151ee1a63a0b1199f54ce34a1 -DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190312151545-0bb0c0a6e846.mod 87 BLAKE2B 32cb406deea05323b1121386bf61f344f8eda0b5370e95bb73828ce0bea50bee375ae3e9b076b9d683a4d89561709c5e97e45e6b08344fbdf6b03b3ce4398dcd SHA512 18ae9b2f54109b4ec5cdea433ee0e3b7006e4d5ea57022d6e8151d4d364735a6b55cf7b5eb2f43b602ec786b2b6819ad78dfc33151ee1a63a0b1199f54ce34a1 -DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190312170243-e65039ee4138.mod 87 BLAKE2B 32cb406deea05323b1121386bf61f344f8eda0b5370e95bb73828ce0bea50bee375ae3e9b076b9d683a4d89561709c5e97e45e6b08344fbdf6b03b3ce4398dcd SHA512 18ae9b2f54109b4ec5cdea433ee0e3b7006e4d5ea57022d6e8151d4d364735a6b55cf7b5eb2f43b602ec786b2b6819ad78dfc33151ee1a63a0b1199f54ce34a1 -DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190425150028-36563e24a262.mod 146 BLAKE2B 78e7f7eaadf244c74a90edd8a3e8d092b255cc9246320ca921558467fa02e84ccc68bc6c4d1d5d4baf3c9cab7da37cf6515e4d4889d490d21f374fc4415f1733 SHA512 e9c7b67e28905435e1420333a531e6c0a8f025dc3023f22e5067d5395c8d081bd7993ceeb6ae08c4cd2d1f13aa0f46274a8788e1be085e4b12eaef785f3d7213 -DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190506145303-2d16b83fe98c.mod 146 BLAKE2B 78e7f7eaadf244c74a90edd8a3e8d092b255cc9246320ca921558467fa02e84ccc68bc6c4d1d5d4baf3c9cab7da37cf6515e4d4889d490d21f374fc4415f1733 SHA512 e9c7b67e28905435e1420333a531e6c0a8f025dc3023f22e5067d5395c8d081bd7993ceeb6ae08c4cd2d1f13aa0f46274a8788e1be085e4b12eaef785f3d7213 -DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190524140312-2c0ae7006135.mod 146 BLAKE2B 78e7f7eaadf244c74a90edd8a3e8d092b255cc9246320ca921558467fa02e84ccc68bc6c4d1d5d4baf3c9cab7da37cf6515e4d4889d490d21f374fc4415f1733 SHA512 e9c7b67e28905435e1420333a531e6c0a8f025dc3023f22e5067d5395c8d081bd7993ceeb6ae08c4cd2d1f13aa0f46274a8788e1be085e4b12eaef785f3d7213 -DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190606124116-d0a3d012864b.mod 155 BLAKE2B 538451f0cc08c6752c81241193caad56fcb8fb7a5cdc2ad6840ae44a1f5c3e1539067634352ded872712c84da7046b32053f9634da76c4888eec9046035a0935 SHA512 5823f6ea0fb08243f243a9577cd31397999bb387c8e29312304ca2dd0e73391cad60891a2a1181ac5fb665c1b01824933c295289a5d4cd580fc77f1bd828955b -DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190621195816-6e04913cbbac.mod 155 BLAKE2B 538451f0cc08c6752c81241193caad56fcb8fb7a5cdc2ad6840ae44a1f5c3e1539067634352ded872712c84da7046b32053f9634da76c4888eec9046035a0935 SHA512 5823f6ea0fb08243f243a9577cd31397999bb387c8e29312304ca2dd0e73391cad60891a2a1181ac5fb665c1b01824933c295289a5d4cd580fc77f1bd828955b -DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190628153133-6cdbf07be9d0.mod 155 BLAKE2B 538451f0cc08c6752c81241193caad56fcb8fb7a5cdc2ad6840ae44a1f5c3e1539067634352ded872712c84da7046b32053f9634da76c4888eec9046035a0935 SHA512 5823f6ea0fb08243f243a9577cd31397999bb387c8e29312304ca2dd0e73391cad60891a2a1181ac5fb665c1b01824933c295289a5d4cd580fc77f1bd828955b -DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190628153133-6cdbf07be9d0.zip 2727853 BLAKE2B fddbbc97d7f84ee9c80e93815c3893f7cd7ea009ed9199272ad79c5e66d4790748f0b514a7d886fc8a576d751453938f4a61053bc93b05a32dad247f84df4f00 SHA512 2d9d072e62ed56ec47f76ea6e0bbebbdff15ae7fc94782ff1b25e80507a8d2fbc5f9f1bfa630ed816a95f7e64ee764628c24e3f75092691fcaf0b7f09c8ca745 -DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191029041327-9cc4af7d6b2c.mod 212 BLAKE2B ab1d99a25eed3af5426d8a58d249b827e4d30a046302df72c7e0b59955e65b636f4645c5c436bb21ec54ec3745b9996bce92d29826ad93cbc9120a06dc19b49a SHA512 6a0316ac3b01aba3f186b5db540a368ab780a821252f7f0975f9e44afea9170c4b3e7027dc5f79a54ebc6af290cbb59b876d3b53bbf26fd05fc3a80a06fae109 -DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191029190741-b9c20aec41a5.mod 212 BLAKE2B ab1d99a25eed3af5426d8a58d249b827e4d30a046302df72c7e0b59955e65b636f4645c5c436bb21ec54ec3745b9996bce92d29826ad93cbc9120a06dc19b49a SHA512 6a0316ac3b01aba3f186b5db540a368ab780a821252f7f0975f9e44afea9170c4b3e7027dc5f79a54ebc6af290cbb59b876d3b53bbf26fd05fc3a80a06fae109 -DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191125144606-a911d9008d1f.mod 212 BLAKE2B ab1d99a25eed3af5426d8a58d249b827e4d30a046302df72c7e0b59955e65b636f4645c5c436bb21ec54ec3745b9996bce92d29826ad93cbc9120a06dc19b49a SHA512 6a0316ac3b01aba3f186b5db540a368ab780a821252f7f0975f9e44afea9170c4b3e7027dc5f79a54ebc6af290cbb59b876d3b53bbf26fd05fc3a80a06fae109 -DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200107050322-53017a39ae36.mod 267 BLAKE2B d21181b3e1491ef78b09fc3546ed8ffbfeb7a4578039aaa24e2f5cc2352885c1a4d7dbfaf2853c421daa2a06691ac47513b5f186d31893fb1ef476cf9d4bb9bc SHA512 91b0380c7073eac4442bfd1924d311fc7b50b098ec4c72ea72fcc831273012326a44245add9b05a90895be46d11052ddcc942ea6bb909bda51d782f95acddff8 -DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200107050322-53017a39ae36.zip 2931920 BLAKE2B 10371eb0662dc44bb36e9defa816a31cc4152bc56f17c8353edd4ffa5df3dab30be879faf2564eec9d6dfe98b685f778f18e40e94e60b10ff7035af55e011efd SHA512 aab9ff3f900a02b4514f0902cbb85a77056b3ff6eaf83f4deb62d5c29015f311786c4ad73d91159201d031725e3fbcc90bd6ab8a2a45a735055c93c4d2089bb9 -DIST golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20190717185122-a985d3407aa7.mod 37 BLAKE2B 7449be81e1998a6439070de1a0ddf5bfd1e4971c90c2e358590a9c1c41128bfc1daa42a9bbc3709506df2442ec8420e6354343a095c837be46335c180083f28a SHA512 659d18a7a3a1be45ff6dc9e7475276b82ee7f11c47d39b0c237d7f872836a1dbdfff0902f21d6cd8093663997865da92e3e5a4acf1ad6129f972dc5e667b4f05 -DIST golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191011141410-1b5146add898.mod 37 BLAKE2B 7449be81e1998a6439070de1a0ddf5bfd1e4971c90c2e358590a9c1c41128bfc1daa42a9bbc3709506df2442ec8420e6354343a095c837be46335c180083f28a SHA512 659d18a7a3a1be45ff6dc9e7475276b82ee7f11c47d39b0c237d7f872836a1dbdfff0902f21d6cd8093663997865da92e3e5a4acf1ad6129f972dc5e667b4f05 -DIST gonum.org%2Fv1%2Fgonum%2F@v%2Fv0.0.0-20181121035319-3f7ecaa7e8ca.mod 147 BLAKE2B 6124c221210cb16cf7f0ea44ad962d904b2e8b050b4a86777f8a21114609c99866c53cd32572005bce9778317e2e13425cafee613ccacefa52933ae35c2fa65f SHA512 ff99bdfc473f5d75904731fc4e507a08743e5f4943d3fda12160a81dbcd1d7340935effad4e053be14da69240d6797d0462a823ba705e9f849607b8a069720d2 -DIST gonum.org%2Fv1%2Fgonum%2F@v%2Fv0.0.0-20181121035319-3f7ecaa7e8ca.zip 4640831 BLAKE2B 6da093ee4b8cfb3fddfaf5c8fc2c12208ddd201d740fce7288a9af0bf426a098e5d50754998c9407a293f2a703488a1ceb2bb31bbe89e51d4d5cab70eecc48ac SHA512 9172ec81f722dca5ee1ee434f8a4bab940e89ca980de22738c69c76f871fa4f05586e7d8d0aa5642011522e6d6005e775318741207a1ab73ab368731ff4652c8 -DIST gonum.org%2Fv1%2Fnetlib%2F@v%2Fv0.0.0-20181029234149-ec6d1f5cefe6.mod 27 BLAKE2B 7947d397295d9d1d7bd22c96f4310e54ade7afe7baf1850cead3176780d46b4f517dc1a1e3ee22e15f0345a043110cb0f32bc0175ad70de62fbaf2ee755e25a2 SHA512 1576aa0b64384add0cbec0e1e5187ba992022ba5d1ac2ed6ad2d3cd888a8f97218bd42aeb8cb5e53677e8192dc4db4c7800b15fb18c6bcc320a2c67b5bd07a37 -DIST gonum.org%2Fv1%2Fnetlib%2F@v%2Fv0.0.0-20181029234149-ec6d1f5cefe6.zip 216956 BLAKE2B ab805735866f3dce07675fc0f982c3c7b813fefe2f7357c194ee157b4f5f0d2632453b49e2941ab96e2c77a9b22f47763a9684802b93a2929a8adf5eeaac24ae SHA512 c7783218e11e1428faee68cce70acf4ef8dc79e0ae2c2b28dd5f42aa5dd8aed87e7e62598ee7528f2524d1fac3d827796d93530b16c6bd499862523f52bec86c -DIST google.golang.org%2Fapi%2F@v%2Fv0.15.0.mod 851 BLAKE2B 16f0842a8e0082a8532a7c8f5cf5092cd196a90197b3e05c6fe0275e10390e0b97477f60c07d26b422d0da9289fe3c8f2d8fb8fe2fec63af9e005adc26921724 SHA512 bd693c28b65c1b369f89a6b1926a127c91df98feb137ab5595bf141c1a67e3adcf25f79b4cbf3e4c44755d45b9f4876dacafbf18afa1e8c09fd89a8f9d0e9330 -DIST google.golang.org%2Fapi%2F@v%2Fv0.15.0.zip 14163585 BLAKE2B 0940d785a478203f50eb465c7e4f8686bdd54b638e21c25b41f2496bbafff66c94ab41a39ef52bb78c2bd2a59df54ca2fc77e378907397d8111e7717c8db3f48 SHA512 b81ba78ba8a62036edba302bd544c285ca5e1200209be27d6aaf62b3b116470a5cb32a1a6957c04537b407f6453057e0bd8ea9acf8fdd588c01ec9e70f8694e7 -DIST google.golang.org%2Fapi%2F@v%2Fv0.4.0.mod 506 BLAKE2B 6933fe30be88a21cca041b800cb9d095b1daf787f3701c0311da2606287d03799df9b556451d9170d02be8028ce686aaf69eaf941d2a8bdb4769c319c50c9905 SHA512 9fa566a26f8345a101dc94986755468b4782d78689d5a163aa5b960b507d4a0e8e435a8ce84073e07187745a156e2c9f586136895db2f08cfc4cd3329fc1e23a -DIST google.golang.org%2Fapi%2F@v%2Fv0.7.0.mod 802 BLAKE2B 59277c0ab43500926ae727289dfd892ce524164f7acea3d6ede2f4efceb5e89e71e88c2c9fa3e4785da4d2a69c59e5c81c4d735887a6ab52c0b07a8b6baca88d SHA512 617883d94a4de6e07dfd82d046148ccfc5ab4eaf73840a76a9823e5cf03a60b0e0b4f1b62712620de28895d013f01bcd39477cb87bfb94524a634be8818c268c -DIST google.golang.org%2Fapi%2F@v%2Fv0.7.0.zip 12958909 BLAKE2B 9ffceb4fe3e735aac577decb8f9db46c431c76a121c9ff946d19ad36081c67119c3f35e7c0825b761f206edd906eb95cd33f83ac3af24aa1c08e46d58b276b87 SHA512 00e929de2fc5da89f64d434ac2a4ca0252f7ef24926dc0c8c43bdbc84348522801b98346739b387c0b17c88bdb822875301b32a5007b8ecd54a443e0c4ec3057 -DIST google.golang.org%2Fappengine%2F@v%2Fv1.1.0.mod 35 BLAKE2B 24fb6ba95138448c45da7f1ecc4c87391485006b54b8e7ff96ec582c2659f9ea77574b4d5fef2442eff9e5564f3c3263ed8e6963c5d21cde8772a7143d82f3ed SHA512 6644c398d639794470e49cad4402d17765422934915b5a13e13e1f84d8890cc8fad9e6ea8c580d114aefea70d894242e05ce3a432ee596f772b98b6b73069fe2 -DIST google.golang.org%2Fappengine%2F@v%2Fv1.4.0.mod 162 BLAKE2B 21c4d160665b6a87101d2aec39d2f7faef9a66f6be50f7293706686022f808b131c9ce7ddfcba6c2b6d27d15f9414101650436a2403f156a0368de2bce72e482 SHA512 60fb2454326103e4905f79f23a25320cb2c0035b7a0e3c228af845ed7dae23014efb81685f29805303edf277e8b1a2d9a7530b8f3a1a8e57caa1a85edeb52475 -DIST google.golang.org%2Fappengine%2F@v%2Fv1.5.0.mod 162 BLAKE2B 21c4d160665b6a87101d2aec39d2f7faef9a66f6be50f7293706686022f808b131c9ce7ddfcba6c2b6d27d15f9414101650436a2403f156a0368de2bce72e482 SHA512 60fb2454326103e4905f79f23a25320cb2c0035b7a0e3c228af845ed7dae23014efb81685f29805303edf277e8b1a2d9a7530b8f3a1a8e57caa1a85edeb52475 -DIST google.golang.org%2Fappengine%2F@v%2Fv1.6.1.mod 362 BLAKE2B 2d6d24186c2748c4d8f559feb269b351d4260c9c0e0b9342377f23af9e5ecc02fc7f84f7be299aedb0da1b1a6d6d67c3271a826b776bb7cc034256550479a0f5 SHA512 e3c391dfcc5f14fdc5430d7a1d239d4ebec89399b17851e4d7643b8c0c70077aaec3a1bc1a8dd5e3320d8bc6e1562a26e3fe1121d75ce578f37f5d2e84a4ddf6 -DIST google.golang.org%2Fappengine%2F@v%2Fv1.6.1.zip 418135 BLAKE2B d3a64e18959e36aa267f235f1636d00ad545cb32a9245641bd771d511d8168c8070a2e517ae2b65d4d5911c1202267ea8cdd8ea8ed009cec3ccdb9013ad9a0ba SHA512 36a2b9842757e17959c520fe02243502017b8a074da8105763de86ba14c61659f49b3bb8b1eaf8b7c93f2ed297889a26dd43f3f87a139e205390cebb36f2e446 -DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20180817151627-c66870c02cf8.mod 34 BLAKE2B cd6cb61b9f55a3c1e8b33588e98e62c9c27613ac20fb039cd70c9ecbe41c34d11d80246290ab73a9faf3ec809a15fc00267654b0eb00dbf23fe5c9758c705d9c SHA512 1c29af2b4f8b54234f09dfbfad120b4b11d4fe67e9578b0553412f1587cac2fa2bfe5537fbf15e6d52dcb04332413231c250c3c460b04e64326d2eaed3102464 -DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190307195333-5fe7a883aa19.mod 450 BLAKE2B bf0efd5f0ff915b9f59fa81611892e70644a4b14fefd15190d0ff68043f7809f51d53766dc50fc0eb9372df3e6590d3fbcf51aec5e9b0c18027e156ce53b8df1 SHA512 37a99611220df08ac5f15ed6f718f37a35523f5cef392b7b7da86b0eaf05e4fa5e52aceb42a6b6ddf6924b1f7cc151876d2e532c83dd2edbcca7c41b9191c427 -DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190418145605-e7d98fc518a7.mod 450 BLAKE2B bf0efd5f0ff915b9f59fa81611892e70644a4b14fefd15190d0ff68043f7809f51d53766dc50fc0eb9372df3e6590d3fbcf51aec5e9b0c18027e156ce53b8df1 SHA512 37a99611220df08ac5f15ed6f718f37a35523f5cef392b7b7da86b0eaf05e4fa5e52aceb42a6b6ddf6924b1f7cc151876d2e532c83dd2edbcca7c41b9191c427 -DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190425155659-357c62f0e4bb.mod 450 BLAKE2B bf0efd5f0ff915b9f59fa81611892e70644a4b14fefd15190d0ff68043f7809f51d53766dc50fc0eb9372df3e6590d3fbcf51aec5e9b0c18027e156ce53b8df1 SHA512 37a99611220df08ac5f15ed6f718f37a35523f5cef392b7b7da86b0eaf05e4fa5e52aceb42a6b6ddf6924b1f7cc151876d2e532c83dd2edbcca7c41b9191c427 -DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190502173448-54afdca5d873.mod 450 BLAKE2B bf0efd5f0ff915b9f59fa81611892e70644a4b14fefd15190d0ff68043f7809f51d53766dc50fc0eb9372df3e6590d3fbcf51aec5e9b0c18027e156ce53b8df1 SHA512 37a99611220df08ac5f15ed6f718f37a35523f5cef392b7b7da86b0eaf05e4fa5e52aceb42a6b6ddf6924b1f7cc151876d2e532c83dd2edbcca7c41b9191c427 -DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190716160619-c506a9f90610.mod 331 BLAKE2B 63923e4fcfa896f163dc77009fbdee8ce8c2e31a4694b6ccddf3397cad5c89a3be5796dbc65b77cf059f1601729d976f9afd2969bd426c0cd8781b106ffe0be8 SHA512 9f22a11a1d639cc7a465b6e826c2bc3915fe0ac847159a38c470f0b1631d6f6b2e0ae0548344f7a8e97161d4c6b80113062c04062b7ab887d7d615c39cbfc2dd -DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190716160619-c506a9f90610.zip 7331409 BLAKE2B 51a6ccf976e85e507ce176591a4e40c50eef976912b80e284690dc515aa3425d5c7c6bcf16d3e0341e23ef31080f3939fdff49afb6ce70dc41b545701e1516fa SHA512 b906cb82c2a08a5e6a254446b1fc971b4418bf01f5f0c7cd8cdd00a080642e0042024a811b8256791fa8f8824812a79a3a09710aaecb672521e3fd98f07645d4 -DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190819201941-24fa4b261c55.mod 331 BLAKE2B 63923e4fcfa896f163dc77009fbdee8ce8c2e31a4694b6ccddf3397cad5c89a3be5796dbc65b77cf059f1601729d976f9afd2969bd426c0cd8781b106ffe0be8 SHA512 9f22a11a1d639cc7a465b6e826c2bc3915fe0ac847159a38c470f0b1631d6f6b2e0ae0548344f7a8e97161d4c6b80113062c04062b7ab887d7d615c39cbfc2dd -DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190927181202-20e1ac93f88c.mod 339 BLAKE2B 06dd6c875e6235007ea4f4a8350a7f80b3285e21f8ef599ea1e955a6185c5e11658040d073937a4110910c3d21d923487427c0dc626e342e10fef8efbfa95b2b SHA512 8d2fe5cf81319645c17ff8be71f966294976889b7aff74a5b234913dc34a1c7ac03548bcc9ed29120ef651705e7dc6da0c2aff892c9262d67d0044fec5685ac3 -DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190927181202-20e1ac93f88c.zip 7527030 BLAKE2B a012a3454a3758b952966cdcfa813722ab982da86e7ae75ad573b196ec453f4d1a03c783940ff8cd4835e00c94772af49f6b516a6322401d3ee823309b1bdce5 SHA512 6d07351ff14a855b2f7905a6337fb7f72e9b523436a151398d1a9e1cdf7a5b6c091781eacf3e122c9f9e533dc32f807660efee46d3a339d29133ec58d657840f -DIST google.golang.org%2Fgrpc%2F@v%2Fv1.19.0.mod 833 BLAKE2B 71052eaeaf40883bff624eecce8fd6f5669fdea9355e6ae0db9c86c841a62f7176d5ab58838d1645f59b9cb4ad4b636048aa3e9f1d7db521104b8f09dc535bc7 SHA512 38c4f75a0121cecd31b2628da3c3d77aeeb9b2c1974eef2d2d2bb7a3eb507d330debb7f14a724c8910174439b38ab54458096aaf665ea4af87a83f866ca0452e -DIST google.golang.org%2Fgrpc%2F@v%2Fv1.20.1.mod 795 BLAKE2B b825f2ab62a96b9b164410f761228575fd9882de37635c09803b9d2ce682ebbec30f301fd874aafaad95a5aa2431ba25962073e1bd4f336d8cb137e5939a8708 SHA512 585d4cf68b50a70d7967ac3941a7a83b83ed5df1a31773589a38348b6fdf247eb49e7778f7054b78ba1a65eef48d004a815abad932876cb1af2c09deea9c0db8 -DIST google.golang.org%2Fgrpc%2F@v%2Fv1.21.1.mod 828 BLAKE2B a57ef0fe7edabd002918282ba9ef83386689db2688fd8f1b9ebedd191bb0b7059cc0b99d95974ab68112cd48e1865558d314dda64c71ab239de39fe6e8f0db5b SHA512 f9ab0c8ed5a58799a39f64c63b995badb24d8ba1148c7a1be1e3342d1b0d6a6e334fa2cab16f8e9396907e60386cbccb6495dbbe3ca09440bb878e10e1686d62 -DIST google.golang.org%2Fgrpc%2F@v%2Fv1.21.1.zip 1027160 BLAKE2B 9cc654c2155c5306cbea34e57f9c6e527cd8504278921bb46186c9997a3dd15278a6cda877df9cdac8368a03dd793a071fdc55ab7591cb9d6bd26dcfbed469bd SHA512 8cd3c2d502dbf4955b29e3b0bc5439b7c9ea82c0bdbc2749bd378d5dd30eea81631dffb4aa3306ee4633b0c988f45e73103aeb5ef38d6cc63e6622886456fd06 -DIST google.golang.org%2Fgrpc%2F@v%2Fv1.24.0.mod 771 BLAKE2B ec4ea0b34d044e7a4dab50109d3b4e9b0081c538bd568155c4aa7a6370dd0ec31a18f3d1d294ad87af95cd58f2ac885026d07d43d21df1eee2c926dd4d8b2712 SHA512 b6c886622095b3999f108230f6cd3dddb72157180b0ad1a539919289b2e0c8496ebfaab369d65e83d6fd6eeb97b618b49a834c7ad3b98afc996f290d49c936fa -DIST google.golang.org%2Fgrpc%2F@v%2Fv1.24.0.zip 1065639 BLAKE2B 71bbc2ae5288a6008a020b056970fde4f25f64dd6fa8a6d3e1129256707c332af7d07861deb1c95cf068bc039c3dc2da56ff12b4560eec071b9f451e91ceab08 SHA512 e261d085731561e7540eb367f12d5dd48f424eae915380ec99cfab5685297c2e81adc8a58fff68ab29fecd04d03c28e2357c882fa72978391750fd50491fd29b -DIST gopkg.in%2Falecthomas%2Fkingpin.v2%2F@v%2Fv2.2.6.mod 38 BLAKE2B e7781691d8c15b764ef6c89fcdf20e69fc28d46e8df2703b6fdc342247595c10ed25e3cc5b30cd29b81c57837f5685e4122e1b2c218a51fffbb1567c85b0835a SHA512 585188d3a75067e6b7d8a8321959fe7df80c6a19f8668a87f0d1b8687c4d2cefc039167446f6d02f7eeeb147371bc7a673348213bcb07f4d90bebc0ccf9f2015 -DIST gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.mod 25 BLAKE2B 6470f3d94700c4d8b3176d692bdb91646750f2c6a866ff2ef4183aff1de01f024a8757f97b4626ec0355092e5f25e7ded91cd5be845f627d107c58b1daf400d7 SHA512 9ac0f80ef05881387cb2f48f81560f3207fe586ea16495383662e6d62e43d93fac01dfe72e1d0063d3ab065331dab3a8098d7da4f1830ba1aff6f27f8e1bc1b2 -DIST gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20180628173108-788fd7840127.mod 25 BLAKE2B 6470f3d94700c4d8b3176d692bdb91646750f2c6a866ff2ef4183aff1de01f024a8757f97b4626ec0355092e5f25e7ded91cd5be845f627d107c58b1daf400d7 SHA512 9ac0f80ef05881387cb2f48f81560f3207fe586ea16495383662e6d62e43d93fac01dfe72e1d0063d3ab065331dab3a8098d7da4f1830ba1aff6f27f8e1bc1b2 -DIST gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20180628173108-788fd7840127.zip 41465 BLAKE2B 9a7183d3ac6591399b5208026208047a670c85e8b6014ad29955b168c63bb4953fa972d31025613c2ab12d7207adeebe9578b3c15b65ebb792f1e41df2668297 SHA512 fa7c68a2b5a6bb14f99cda92a3e77aad0e4160f659c54ea73e9813af9ff9449df6b0cab42ee283971e778b6b9da4a6098df805dd284c3b1aedfcd3a0b8504bde -DIST gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20190902080502-41f04d3bba15.mod 25 BLAKE2B 6470f3d94700c4d8b3176d692bdb91646750f2c6a866ff2ef4183aff1de01f024a8757f97b4626ec0355092e5f25e7ded91cd5be845f627d107c58b1daf400d7 SHA512 9ac0f80ef05881387cb2f48f81560f3207fe586ea16495383662e6d62e43d93fac01dfe72e1d0063d3ab065331dab3a8098d7da4f1830ba1aff6f27f8e1bc1b2 -DIST gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20190902080502-41f04d3bba15.zip 41481 BLAKE2B b952f04dc8d4717c839de5a5b7780ec2434915d11f897cc759647f71073dd3df717e1195ff2f4f804457195886c63620b342a089fc489f5deafa9c928708d4bb SHA512 40a523fc1dcc36677a0dc0e626313d44a308fa2ad5eedf7b616470ae2972dd8f5b78c18384efffa65d58391e60b704ed35db5557a5dce8362ae45204f64b721d -DIST gopkg.in%2Ferrgo.v2%2F@v%2Fv2.1.0.mod 133 BLAKE2B c4ac637e2bf2d6635065be5213d73f23a1870054c58e9f1cce93af4627ed6fdefa96798b0fbbd27666573757f8b4a48c694ddf3f86c98e898124294459500771 SHA512 cac59fd7470fc9d3203dab6b9e881d4182cfca5acf0a19207a9aff2964d42f20422f9a164bb52b2fa73c523e3caafd63028189bd4190a1670870154dbf3e8178 -DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.1.mod 95 BLAKE2B adb3684980f1d8e6c23444e91028f8db55f1bc496114eb3508dbecf9917dbc8a0a4bed7c0d761123335a75b9ffe727e180f2d6aa5f84312edb05a798185c8362 SHA512 916ff67ddb6c2ba39905db4277ce42596d9ca5a42f8aa7f47f16335e78d91a1b30419fd1b7b6967b37e248363397ec527b38d2f500b3546edda5d2bce1944379 -DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.mod 95 BLAKE2B adb3684980f1d8e6c23444e91028f8db55f1bc496114eb3508dbecf9917dbc8a0a4bed7c0d761123335a75b9ffe727e180f2d6aa5f84312edb05a798185c8362 SHA512 916ff67ddb6c2ba39905db4277ce42596d9ca5a42f8aa7f47f16335e78d91a1b30419fd1b7b6967b37e248363397ec527b38d2f500b3546edda5d2bce1944379 -DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.zip 78275 BLAKE2B 139c8eb7c405dddbb67321eacd25c0af1e5b3f031831266abf6a8e5a5ed12f6381778868383c03433f8ef760d6b42ffbff40150f2fee91dedd0b312f9fe81c7f SHA512 3214b38f348921f6a6d9ef93d4337bb90abd0d101d69d16ad8e38415c22d3b9a85bda873df2eb7a271f9b973ef38b74731405e522e1bb8083c78932762cb5535 -DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.3.mod 95 BLAKE2B adb3684980f1d8e6c23444e91028f8db55f1bc496114eb3508dbecf9917dbc8a0a4bed7c0d761123335a75b9ffe727e180f2d6aa5f84312edb05a798185c8362 SHA512 916ff67ddb6c2ba39905db4277ce42596d9ca5a42f8aa7f47f16335e78d91a1b30419fd1b7b6967b37e248363397ec527b38d2f500b3546edda5d2bce1944379 -DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.4.mod 95 BLAKE2B adb3684980f1d8e6c23444e91028f8db55f1bc496114eb3508dbecf9917dbc8a0a4bed7c0d761123335a75b9ffe727e180f2d6aa5f84312edb05a798185c8362 SHA512 916ff67ddb6c2ba39905db4277ce42596d9ca5a42f8aa7f47f16335e78d91a1b30419fd1b7b6967b37e248363397ec527b38d2f500b3546edda5d2bce1944379 -DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.4.zip 80160 BLAKE2B 7c19bcfee1136e9afaa54bb36a296e48c276e21517eead613313409f3ff85f4a961c1dca7926d3c4fd51feb0f537a85de905294d2a310276bb8177f27f3776c3 SHA512 a8fa21d2f84f8c6f28250e9ec7d678ae160963eaa0a373f345fe67804925b2647239a6117ad6f253f458f34ec9f62bc21e8f2071fc9dfe76dbd2a7ded1e1a0e0 -DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.7.mod 95 BLAKE2B adb3684980f1d8e6c23444e91028f8db55f1bc496114eb3508dbecf9917dbc8a0a4bed7c0d761123335a75b9ffe727e180f2d6aa5f84312edb05a798185c8362 SHA512 916ff67ddb6c2ba39905db4277ce42596d9ca5a42f8aa7f47f16335e78d91a1b30419fd1b7b6967b37e248363397ec527b38d2f500b3546edda5d2bce1944379 -DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.7.zip 80579 BLAKE2B d5de9f0dbf72902ec2244971ef1d62790008d5686ec66b67ca5ded08503168e507d7afdbc38fbfe3b431432e32d2c79540e407a2916ea93de24d45040262366a SHA512 c4a38c485edfd1773be4d3b3dd97c475b1894603526f5d95b40a3ba34b148f3979f0983444009d716e106fea0a2362836a5277f49ea21f764a55279f343a3920 -DIST honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190102054323-c2f93a96b099.mod 26 BLAKE2B db6cc87a17bed88b955e6b36a17568930239c94a969211b02c2d5acc70386fbea63ac44365a0d3241e900125bd64644d698d8f1bdcabc3e6cf99c47259c63df5 SHA512 d00ae74b24e7fb3ff351ff68b88e59636153bbcf92b36e81e91556e3e75a7ccfb08ce471f757f92fd7612378944de3d7309c73923812e2df6a26b74e999ca9ce -DIST honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190106161140-3f1c8253044a.mod 26 BLAKE2B db6cc87a17bed88b955e6b36a17568930239c94a969211b02c2d5acc70386fbea63ac44365a0d3241e900125bd64644d698d8f1bdcabc3e6cf99c47259c63df5 SHA512 d00ae74b24e7fb3ff351ff68b88e59636153bbcf92b36e81e91556e3e75a7ccfb08ce471f757f92fd7612378944de3d7309c73923812e2df6a26b74e999ca9ce -DIST honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190418001031-e561f6794a2a.mod 26 BLAKE2B db6cc87a17bed88b955e6b36a17568930239c94a969211b02c2d5acc70386fbea63ac44365a0d3241e900125bd64644d698d8f1bdcabc3e6cf99c47259c63df5 SHA512 d00ae74b24e7fb3ff351ff68b88e59636153bbcf92b36e81e91556e3e75a7ccfb08ce471f757f92fd7612378944de3d7309c73923812e2df6a26b74e999ca9ce -DIST honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190418001031-e561f6794a2a.zip 448910 BLAKE2B 8c3aad49c0e5be1fd3417e077df34bb9b16333302d9043f6a3f44893fb78da794d3a114eee7ec7dd2e290ebd9fa3159e54123b88b742dbaf0d5426ed82b6c867 SHA512 54b74a22436d5425c5860fd9c4e7ce6d1d17c570b008aa0453b83680ae86e483150d7b6a485d0ac477be298c84b7b69a2af714fd3e0f6de71b128f4be56fed0d -DIST honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190523083050-ea95bdfd59fc.mod 26 BLAKE2B db6cc87a17bed88b955e6b36a17568930239c94a969211b02c2d5acc70386fbea63ac44365a0d3241e900125bd64644d698d8f1bdcabc3e6cf99c47259c63df5 SHA512 d00ae74b24e7fb3ff351ff68b88e59636153bbcf92b36e81e91556e3e75a7ccfb08ce471f757f92fd7612378944de3d7309c73923812e2df6a26b74e999ca9ce -DIST honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2019.2.3.mod 300 BLAKE2B 3e3f5a2be0918cbaacd5e43e59fcc6c7c6999645f0c9214cd5a522c31d34b6d3dad61e3ddae8ccdb2f3f0d90b406c047802ee3d9d54dc40fe6eff9cd35620792 SHA512 0c8aa788d0c03d6d049f0dd7468d0f81ce2131ccedd5a5a3a18362b7d30eef7ef325277844eefe4b707b1ad71c6f83a44e110b7af7b98e05406d347237a7bafb -DIST honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2019.2.3.zip 506912 BLAKE2B a38cb31fd8df49dae4ff187e67704b5586ba78a0dcfe5afa3b820f0ac80f7e12ba4bdb705caa97c6be85407fe97599d1244d2f56f0e9e36554ba43289d9f21d8 SHA512 3285ab90762ee6b771c95e1c842ab308f04ac366ddfa693040c49d8951bb01db33994eb69c2c9dfd6ab2b379b29cbfe31558ca6b6aafe3feea1e693b2a36d0cb -DIST rsc.io%2Fbinaryregexp%2F@v%2Fv0.2.0.mod 36 BLAKE2B 61110bed2b9e99e0250cf6e8b842257202c89b3462edf9368b73cab29f9dbd4dcc66c3e290a1d6329b7d62321eecc52082a8c4c0797eac743a29a8a00910a93f SHA512 db50ff677b0bdccbc1a1ad3df7c5cc76f2fcccf3ab99d08d1c2868440eb9b893fe89452f4286f7d42f2f16abf0f4acda67fe86e174dcfa730a743aafcc166774 -DIST rsc.io%2Fbinaryregexp%2F@v%2Fv0.2.0.zip 450232 BLAKE2B 2d10520e06557fa00e94a1ccd80b9b937bcaf404f81f853a020eed606c7a297db037baf784518e060604319ba5454423e4995ab005be18ae1398c5ef16f24719 SHA512 0a15b90c2a4577cbc298a34f714660e9fdc488b1fb72b33d0ae296cb6f15a691091d5e6d3c801998b9c2b7236b163118577b2816316078d613f74cd803947534 -DIST sigs.k8s.io%2Fyaml%2F@v%2Fv1.1.0.mod 24 BLAKE2B d33080dbc62b185d029eb43f75d66328dbfa7c463a3117b3efd5419ab8e1e52cc6f5d5a288d553421025c785ec6948b3aa68588cae19bd325f6acc0d043bb5fb SHA512 78f6402daccb04510f4ef35ee457ee13e4f447fba8e6aa33b4d32aa666e925861bf3b3f22c5ba9573871ec7e830f99e4caae0969724a54eadf40e6a7ed7931a0 -DIST sigs.k8s.io%2Fyaml%2F@v%2Fv1.1.0.zip 18120 BLAKE2B 244d3089322264e2fab71fa27e6e49396f724026674970eac309bb027d7bbc7030e9780fbc1c3803b20d893b8621f4e24d5c7824e0315440c14ceb850ec391f9 SHA512 c6e23fe09971b82d52e14d67e68458d3884b0f1d56a7fa9131fe4dafbfa971dd1f134f2d9eeab2599eae02c96132502036fd6b37eda92cd62f3129de6e04e7c3 diff --git a/net-analyzer/chronograf/chronograf-1.4.3.0.ebuild b/net-analyzer/chronograf/chronograf-1.4.3.0.ebuild deleted file mode 100644 index 2b2c7163f727..000000000000 --- a/net-analyzer/chronograf/chronograf-1.4.3.0.ebuild +++ /dev/null @@ -1,70 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -EGO_PN=github.com/influxdata/chronograf - -inherit golang-build golang-vcs-snapshot systemd user - -DESCRIPTION="Monitoring, processing and alerting on time series data" -HOMEPAGE="https://www.influxdata.com" -SRC_URI="https://${EGO_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz - https://dev.gentoo.org/~williamh/dist/${PN}-gen-${PV}.tar.gz" - -LICENSE="AGPL-3+" -SLOT="0" -KEYWORDS="~amd64" -IUSE="" - -pkg_setup() { - enewgroup chronograf - enewuser chronograf -1 -1 /var/lib/chronograf chronograf -} - -src_unpack() { - local f - golang-vcs-snapshot_src_unpack - pushd "${S}/src/${EGO_PN}" > /dev/null || die - for f in ${A}; do - case $f in - ${PN}-gen-*.tar.*) - unpack ${f} - ;; - esac - done -} - -src_compile() { - pushd "src/${EGO_PN}" > /dev/null || die - set -- env GOPATH="${S}" go build -o chronograf cmd/chronograf/main.go - echo "$@" - "$@" || die "building chronograf failed" - set -- env GOPATH="${S}" go build -o chronoctl cmd/chronoctl/main.go - echo "$@" - "$@" || die "building chronoctl failed" - popd > /dev/null || die -} - -src_install() { - pushd "src/${EGO_PN}" > /dev/null || die -dobin chronograf chronoctl - dodoc CHANGELOG.md - insinto /etc/logrotate.d - newins etc/scripts/logrotate chronograf - systemd_dounit etc/scripts/chronograf.service - insinto /usr/share/chronograf/canned -doins canned/*.json -keepdir /usr/share/chronograf/resources - keepdir /var/log/chronograf - fowners chronograf:chronograf /var/log/chronograf - newconfd "${FILESDIR}"/chronograf.confd chronograf - newinitd "${FILESDIR}"/chronograf.rc chronograf - popd > /dev/null || die -} - -pkg_postinst() { - if [[ -z "${REPLACING_VERSIONS}" ]]; then - einfo "In order to use chronograf, you will need to configure" - einfo "the appropriate options in ${EROOT}etc/conf.d/chronograf" - fi -} diff --git a/net-analyzer/chronograf/chronograf-1.6.2.ebuild b/net-analyzer/chronograf/chronograf-1.6.2.ebuild deleted file mode 100644 index ebae27747c62..000000000000 --- a/net-analyzer/chronograf/chronograf-1.6.2.ebuild +++ /dev/null @@ -1,70 +0,0 @@ -# Copyright 1999-2018 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -EGO_PN=github.com/influxdata/chronograf - -inherit golang-build golang-vcs-snapshot systemd user - -DESCRIPTION="Monitoring, processing and alerting on time series data" -HOMEPAGE="https://www.influxdata.com" -SRC_URI="https://${EGO_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz - https://dev.gentoo.org/~williamh/dist/${PN}-gen-${PV}.tar.gz" - -LICENSE="AGPL-3+" -SLOT="0" -KEYWORDS="~amd64" -IUSE="" - -pkg_setup() { - enewgroup chronograf - enewuser chronograf -1 -1 /var/lib/chronograf chronograf -} - -src_unpack() { - local f - golang-vcs-snapshot_src_unpack - pushd "${S}/src/${EGO_PN}" > /dev/null || die - for f in ${A}; do - case $f in - ${PN}-gen-*.tar.*) - unpack ${f} - ;; - esac - done -} - -src_compile() { - pushd "src/${EGO_PN}" > /dev/null || die - set -- env GOPATH="${S}" go build -o chronograf cmd/chronograf/main.go - echo "$@" - "$@" || die "building chronograf failed" - set -- env GOPATH="${S}" go build -o chronoctl cmd/chronoctl/main.go - echo "$@" - "$@" || die "building chronoctl failed" - popd > /dev/null || die -} - -src_install() { - pushd "src/${EGO_PN}" > /dev/null || die -dobin chronograf chronoctl - dodoc CHANGELOG.md - insinto /etc/logrotate.d - newins etc/scripts/logrotate chronograf - systemd_dounit etc/scripts/chronograf.service - insinto /usr/share/chronograf/canned -doins canned/*.json -keepdir /usr/share/chronograf/resources - keepdir /var/log/chronograf - fowners chronograf:chronograf /var/log/chronograf - newconfd "${FILESDIR}"/chronograf.confd chronograf - newinitd "${FILESDIR}"/chronograf.rc chronograf - popd > /dev/null || die -} - -pkg_postinst() { - if [[ -z "${REPLACING_VERSIONS}" ]]; then - einfo "In order to use chronograf, you will need to configure" - einfo "the appropriate options in ${EROOT}etc/conf.d/chronograf" - fi -} diff --git a/net-analyzer/chronograf/chronograf-1.7.3.ebuild b/net-analyzer/chronograf/chronograf-1.7.3.ebuild deleted file mode 100644 index c4eb4def22b6..000000000000 --- a/net-analyzer/chronograf/chronograf-1.7.3.ebuild +++ /dev/null @@ -1,70 +0,0 @@ -# Copyright 2018 Sony Interactive Entertainment Inc. -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -EGO_PN=github.com/influxdata/chronograf - -inherit golang-build golang-vcs-snapshot systemd user - -DESCRIPTION="Monitoring, processing and alerting on time series data" -HOMEPAGE="https://www.influxdata.com" -SRC_URI="https://${EGO_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz - https://dev.gentoo.org/~williamh/dist/${PN}-gen-${PV}.tar.gz" - -LICENSE="AGPL-3+" -SLOT="0" -KEYWORDS="~amd64" -IUSE="" - -pkg_setup() { - enewgroup chronograf - enewuser chronograf -1 -1 /var/lib/chronograf chronograf -} - -src_unpack() { - local f - golang-vcs-snapshot_src_unpack - pushd "${S}/src/${EGO_PN}" > /dev/null || die - for f in ${A}; do - case $f in - ${PN}-gen-*.tar.*) - unpack ${f} - ;; - esac - done -} - -src_compile() { - pushd "src/${EGO_PN}" > /dev/null || die - set -- env GOPATH="${S}" go build -o chronograf cmd/chronograf/main.go - echo "$@" - "$@" || die "building chronograf failed" - set -- env GOPATH="${S}" go build -o chronoctl cmd/chronoctl/main.go - echo "$@" - "$@" || die "building chronoctl failed" - popd > /dev/null || die -} - -src_install() { - pushd "src/${EGO_PN}" > /dev/null || die -dobin chronograf chronoctl - dodoc CHANGELOG.md - insinto /etc/logrotate.d - newins etc/scripts/logrotate chronograf - systemd_dounit etc/scripts/chronograf.service - insinto /usr/share/chronograf/canned -doins canned/*.json -keepdir /usr/share/chronograf/resources - keepdir /var/log/chronograf - fowners chronograf:chronograf /var/log/chronograf - newconfd "${FILESDIR}"/chronograf.confd chronograf - newinitd "${FILESDIR}"/chronograf.rc chronograf - popd > /dev/null || die -} - -pkg_postinst() { - if [[ -z "${REPLACING_VERSIONS}" ]]; then - einfo "In order to use chronograf, you will need to configure" - einfo "the appropriate options in ${EROOT}etc/conf.d/chronograf" - fi -} diff --git a/net-analyzer/chronograf/chronograf-1.8.5.ebuild b/net-analyzer/chronograf/chronograf-1.8.5.ebuild index e1ce27c1a19b..75faf8089855 100644 --- a/net-analyzer/chronograf/chronograf-1.8.5.ebuild +++ b/net-analyzer/chronograf/chronograf-1.8.5.ebuild @@ -1,4 +1,4 @@ -# Copyright 2020 Gentoo Authors +# Copyright 2020-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -7,442 +7,9 @@ COMMIT=6b7e6cb1a DESCRIPTION="Monitoring, processing and alerting on time series data" HOMEPAGE="https://www.influxdata.com" - -EGO_SUM=( - "cloud.google.com/go v0.26.0/go.mod" - "cloud.google.com/go v0.34.0/go.mod" - "cloud.google.com/go v0.38.0/go.mod" - "cloud.google.com/go v0.43.0" - "cloud.google.com/go v0.43.0/go.mod" - "github.com/BurntSushi/toml v0.3.1" - "github.com/BurntSushi/toml v0.3.1/go.mod" - "github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod" - "github.com/DATA-DOG/go-sqlmock v1.3.3" - "github.com/DATA-DOG/go-sqlmock v1.3.3/go.mod" - "github.com/DataDog/zstd v1.4.0" - "github.com/DataDog/zstd v1.4.0/go.mod" - "github.com/NYTimes/gziphandler v1.1.1" - "github.com/NYTimes/gziphandler v1.1.1/go.mod" - "github.com/OneOfOne/xxhash v1.2.2" - "github.com/OneOfOne/xxhash v1.2.2/go.mod" - "github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc" - "github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod" - "github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf" - "github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod" - "github.com/andreyvit/diff v0.0.0-20170406064948-c7f18ee00883" - "github.com/andreyvit/diff v0.0.0-20170406064948-c7f18ee00883/go.mod" - "github.com/antihax/optional v0.0.0-20180407024304-ca021399b1a6/go.mod" - "github.com/apache/arrow/go/arrow v0.0.0-20191024131854-af6fa24be0db" - "github.com/apache/arrow/go/arrow v0.0.0-20191024131854-af6fa24be0db/go.mod" - "github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod" - "github.com/beorn7/perks v1.0.0" - "github.com/beorn7/perks v1.0.0/go.mod" - "github.com/boltdb/bolt v1.3.1" - "github.com/boltdb/bolt v1.3.1/go.mod" - "github.com/bouk/httprouter v0.0.0-20160817010721-ee8b3818a7f5" - "github.com/bouk/httprouter v0.0.0-20160817010721-ee8b3818a7f5/go.mod" - "github.com/c-bata/go-prompt v0.2.2/go.mod" - "github.com/cespare/xxhash v1.1.0" - "github.com/cespare/xxhash v1.1.0/go.mod" - "github.com/client9/misspell v0.3.4/go.mod" - "github.com/coreos/bbolt v1.3.3" - "github.com/coreos/bbolt v1.3.3/go.mod" - "github.com/coreos/etcd v3.3.18+incompatible" - "github.com/coreos/etcd v3.3.18+incompatible/go.mod" - "github.com/coreos/go-semver v0.3.0" - "github.com/coreos/go-semver v0.3.0/go.mod" - "github.com/coreos/go-systemd/v22 v22.0.0" - "github.com/coreos/go-systemd/v22 v22.0.0/go.mod" - "github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f" - "github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod" - "github.com/dave/jennifer v1.2.0/go.mod" - "github.com/davecgh/go-spew v1.1.0/go.mod" - "github.com/davecgh/go-spew v1.1.1" - "github.com/davecgh/go-spew v1.1.1/go.mod" - "github.com/dgrijalva/jwt-go v3.2.0+incompatible" - "github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod" - "github.com/dustin/go-humanize v1.0.0" - "github.com/dustin/go-humanize v1.0.0/go.mod" - "github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21" - "github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21/go.mod" - "github.com/eclipse/paho.mqtt.golang v1.2.0" - "github.com/eclipse/paho.mqtt.golang v1.2.0/go.mod" - "github.com/elazarl/go-bindata-assetfs v1.0.0" - "github.com/elazarl/go-bindata-assetfs v1.0.0/go.mod" - "github.com/ghodss/yaml v1.0.0/go.mod" - "github.com/go-kit/kit v0.8.0/go.mod" - "github.com/go-logfmt/logfmt v0.3.0/go.mod" - "github.com/go-logfmt/logfmt v0.4.0/go.mod" - "github.com/go-sql-driver/mysql v1.4.1" - "github.com/go-sql-driver/mysql v1.4.1/go.mod" - "github.com/go-stack/stack v1.8.0/go.mod" - "github.com/godbus/dbus/v5 v5.0.3/go.mod" - "github.com/gogo/protobuf v1.1.1" - "github.com/gogo/protobuf v1.1.1/go.mod" - "github.com/gogo/protobuf v1.2.1/go.mod" - "github.com/gogo/protobuf v1.3.1" - "github.com/gogo/protobuf v1.3.1/go.mod" - "github.com/golang/geo v0.0.0-20190916061304-5b978397cfec" - "github.com/golang/geo v0.0.0-20190916061304-5b978397cfec/go.mod" - "github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b" - "github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod" - "github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7" - "github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod" - "github.com/golang/mock v1.1.1/go.mod" - "github.com/golang/mock v1.2.0/go.mod" - "github.com/golang/mock v1.3.1/go.mod" - "github.com/golang/protobuf v1.2.0" - "github.com/golang/protobuf v1.2.0/go.mod" - "github.com/golang/protobuf v1.3.1/go.mod" - "github.com/golang/protobuf v1.3.2" - "github.com/golang/protobuf v1.3.2/go.mod" - "github.com/golang/protobuf v1.3.3" - "github.com/golang/protobuf v1.3.3/go.mod" - "github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db" - "github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db/go.mod" - "github.com/golang/snappy v0.0.1" - "github.com/golang/snappy v0.0.1/go.mod" - "github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod" - "github.com/google/btree v1.0.0" - "github.com/google/btree v1.0.0/go.mod" - "github.com/google/flatbuffers v1.11.0" - "github.com/google/flatbuffers v1.11.0/go.mod" - "github.com/google/go-cmp v0.2.0" - "github.com/google/go-cmp v0.2.0/go.mod" - "github.com/google/go-cmp v0.3.0" - "github.com/google/go-cmp v0.3.0/go.mod" - "github.com/google/go-github v17.0.0+incompatible" - "github.com/google/go-github v17.0.0+incompatible/go.mod" - "github.com/google/go-querystring v1.0.0" - "github.com/google/go-querystring v1.0.0/go.mod" - "github.com/google/martian v2.1.0+incompatible/go.mod" - "github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod" - "github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod" - "github.com/google/renameio v0.1.0/go.mod" - "github.com/google/uuid v1.1.1" - "github.com/google/uuid v1.1.1/go.mod" - "github.com/googleapis/gax-go/v2 v2.0.4/go.mod" - "github.com/googleapis/gax-go/v2 v2.0.5" - "github.com/googleapis/gax-go/v2 v2.0.5/go.mod" - "github.com/gorilla/websocket v1.4.1" - "github.com/gorilla/websocket v1.4.1/go.mod" - "github.com/grpc-ecosystem/go-grpc-middleware v1.1.0" - "github.com/grpc-ecosystem/go-grpc-middleware v1.1.0/go.mod" - "github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0" - "github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod" - "github.com/grpc-ecosystem/grpc-gateway v1.12.1" - "github.com/grpc-ecosystem/grpc-gateway v1.12.1/go.mod" - "github.com/hashicorp/golang-lru v0.5.0/go.mod" - "github.com/hashicorp/golang-lru v0.5.1" - "github.com/hashicorp/golang-lru v0.5.1/go.mod" - "github.com/inconshreveable/mousetrap v1.0.0" - "github.com/inconshreveable/mousetrap v1.0.0/go.mod" - "github.com/influxdata/flux v0.65.0" - "github.com/influxdata/flux v0.65.0/go.mod" - "github.com/influxdata/influxdb v1.1.5" - "github.com/influxdata/influxdb v1.1.5/go.mod" - "github.com/influxdata/kapacitor v1.5.3" - "github.com/influxdata/kapacitor v1.5.3/go.mod" - "github.com/influxdata/line-protocol v0.0.0-20180522152040-32c6aa80de5e" - "github.com/influxdata/line-protocol v0.0.0-20180522152040-32c6aa80de5e/go.mod" - "github.com/influxdata/promql/v2 v2.12.0/go.mod" - "github.com/influxdata/tdigest v0.0.0-20181121200506-bf2b5ad3c0a9" - "github.com/influxdata/tdigest v0.0.0-20181121200506-bf2b5ad3c0a9/go.mod" - "github.com/influxdata/usage-client v0.0.0-20160829180054-6d3895376368" - "github.com/influxdata/usage-client v0.0.0-20160829180054-6d3895376368/go.mod" - "github.com/jessevdk/go-flags v1.4.0" - "github.com/jessevdk/go-flags v1.4.0/go.mod" - "github.com/jonboulle/clockwork v0.1.0" - "github.com/jonboulle/clockwork v0.1.0/go.mod" - "github.com/json-iterator/go v1.1.6" - "github.com/json-iterator/go v1.1.6/go.mod" - "github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod" - "github.com/julienschmidt/httprouter v1.2.0/go.mod" - "github.com/kevinburke/go-bindata v3.21.0+incompatible" - "github.com/kevinburke/go-bindata v3.21.0+incompatible/go.mod" - "github.com/kisielk/errcheck v1.1.0/go.mod" - "github.com/kisielk/errcheck v1.2.0/go.mod" - "github.com/kisielk/gotool v1.0.0/go.mod" - "github.com/konsorten/go-windows-terminal-sequences v1.0.1" - "github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod" - "github.com/konsorten/go-windows-terminal-sequences v1.0.3" - "github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod" - "github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod" - "github.com/kr/pretty v0.1.0" - "github.com/kr/pretty v0.1.0/go.mod" - "github.com/kr/pty v1.1.1/go.mod" - "github.com/kr/text v0.1.0" - "github.com/kr/text v0.1.0/go.mod" - "github.com/lestrrat-go/jwx v0.9.0" - "github.com/lestrrat-go/jwx v0.9.0/go.mod" - "github.com/lib/pq v1.0.0" - "github.com/lib/pq v1.0.0/go.mod" - "github.com/mattn/go-colorable v0.0.9" - "github.com/mattn/go-colorable v0.0.9/go.mod" - "github.com/mattn/go-isatty v0.0.4" - "github.com/mattn/go-isatty v0.0.4/go.mod" - "github.com/mattn/go-runewidth v0.0.3/go.mod" - "github.com/mattn/go-sqlite3 v1.11.0" - "github.com/mattn/go-sqlite3 v1.11.0/go.mod" - "github.com/mattn/go-tty v0.0.0-20180907095812-13ff1204f104/go.mod" - "github.com/matttproud/golang_protobuf_extensions v1.0.1" - "github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod" - "github.com/microcosm-cc/bluemonday v1.0.2" - "github.com/microcosm-cc/bluemonday v1.0.2/go.mod" - "github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd" - "github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod" - "github.com/modern-go/reflect2 v1.0.1" - "github.com/modern-go/reflect2 v1.0.1/go.mod" - "github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod" - "github.com/opentracing/opentracing-go v1.0.2" - "github.com/opentracing/opentracing-go v1.0.2/go.mod" - "github.com/opentracing/opentracing-go v1.1.0" - "github.com/opentracing/opentracing-go v1.1.0/go.mod" - "github.com/pierrec/lz4 v2.0.5+incompatible" - "github.com/pierrec/lz4 v2.0.5+incompatible/go.mod" - "github.com/pkg/errors v0.8.0" - "github.com/pkg/errors v0.8.0/go.mod" - "github.com/pkg/errors v0.8.1" - "github.com/pkg/errors v0.8.1/go.mod" - "github.com/pkg/term v0.0.0-20180730021639-bffc007b7fd5/go.mod" - "github.com/pmezard/go-difflib v1.0.0" - "github.com/pmezard/go-difflib v1.0.0/go.mod" - "github.com/prometheus/client_golang v0.9.1/go.mod" - "github.com/prometheus/client_golang v1.0.0" - "github.com/prometheus/client_golang v1.0.0/go.mod" - "github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod" - "github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90" - "github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod" - "github.com/prometheus/common v0.4.1/go.mod" - "github.com/prometheus/common v0.6.0" - "github.com/prometheus/common v0.6.0/go.mod" - "github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod" - "github.com/prometheus/procfs v0.0.2" - "github.com/prometheus/procfs v0.0.2/go.mod" - "github.com/rogpeppe/fastuuid v1.2.0/go.mod" - "github.com/rogpeppe/go-internal v1.3.0/go.mod" - "github.com/satori/go.uuid v1.2.1-0.20181028125025-b2ce2384e17b" - "github.com/satori/go.uuid v1.2.1-0.20181028125025-b2ce2384e17b/go.mod" - "github.com/segmentio/kafka-go v0.1.0/go.mod" - "github.com/segmentio/kafka-go v0.3.4" - "github.com/segmentio/kafka-go v0.3.4/go.mod" - "github.com/sergi/go-diff v1.0.0" - "github.com/sergi/go-diff v1.0.0/go.mod" - "github.com/sergi/go-diff v1.1.0" - "github.com/sergi/go-diff v1.1.0/go.mod" - "github.com/sirupsen/logrus v1.2.0" - "github.com/sirupsen/logrus v1.2.0/go.mod" - "github.com/sirupsen/logrus v1.4.2" - "github.com/sirupsen/logrus v1.4.2/go.mod" - "github.com/sirupsen/logrus v1.6.0" - "github.com/sirupsen/logrus v1.6.0/go.mod" - "github.com/soheilhy/cmux v0.1.4" - "github.com/soheilhy/cmux v0.1.4/go.mod" - "github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72" - "github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod" - "github.com/spf13/cobra v0.0.3" - "github.com/spf13/cobra v0.0.3/go.mod" - "github.com/spf13/pflag v1.0.3" - "github.com/spf13/pflag v1.0.3/go.mod" - "github.com/stretchr/objx v0.1.0/go.mod" - "github.com/stretchr/objx v0.1.1" - "github.com/stretchr/objx v0.1.1/go.mod" - "github.com/stretchr/testify v1.2.0/go.mod" - "github.com/stretchr/testify v1.2.2/go.mod" - "github.com/stretchr/testify v1.3.0/go.mod" - "github.com/stretchr/testify v1.4.0" - "github.com/stretchr/testify v1.4.0/go.mod" - "github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5" - "github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod" - "github.com/xdg/scram v0.0.0-20180814205039-7eeb5667e42c" - "github.com/xdg/scram v0.0.0-20180814205039-7eeb5667e42c/go.mod" - "github.com/xdg/stringprep v1.0.0" - "github.com/xdg/stringprep v1.0.0/go.mod" - "github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2" - "github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod" - "go.etcd.io/bbolt v1.3.3" - "go.etcd.io/bbolt v1.3.3/go.mod" - "go.opencensus.io v0.21.0/go.mod" - "go.opencensus.io v0.22.0" - "go.opencensus.io v0.22.0/go.mod" - "go.uber.org/atomic v1.3.2" - "go.uber.org/atomic v1.3.2/go.mod" - "go.uber.org/atomic v1.4.0/go.mod" - "go.uber.org/atomic v1.5.0/go.mod" - "go.uber.org/atomic v1.5.1" - "go.uber.org/atomic v1.5.1/go.mod" - "go.uber.org/multierr v1.1.0" - "go.uber.org/multierr v1.1.0/go.mod" - "go.uber.org/multierr v1.3.0/go.mod" - "go.uber.org/multierr v1.4.0" - "go.uber.org/multierr v1.4.0/go.mod" - "go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee" - "go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee/go.mod" - "go.uber.org/zap v1.9.1" - "go.uber.org/zap v1.9.1/go.mod" - "go.uber.org/zap v1.10.0/go.mod" - "go.uber.org/zap v1.13.0" - "go.uber.org/zap v1.13.0/go.mod" - "golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod" - "golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod" - "golang.org/x/crypto v0.0.0-20190506204251-e1dfcc566284/go.mod" - "golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod" - "golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5" - "golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod" - "golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550" - "golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod" - "golang.org/x/crypto v0.0.0-20191227163750-53104e6ec876" - "golang.org/x/crypto v0.0.0-20191227163750-53104e6ec876/go.mod" - "golang.org/x/exp v0.0.0-20180321215751-8460e604b9de/go.mod" - "golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod" - "golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522" - "golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod" - "golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod" - "golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod" - "golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod" - "golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod" - "golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod" - "golang.org/x/lint v0.0.0-20190409202823-959b441ac422" - "golang.org/x/lint v0.0.0-20190409202823-959b441ac422/go.mod" - "golang.org/x/lint v0.0.0-20190930215403-16217165b5de" - "golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod" - "golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f" - "golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f/go.mod" - "golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod" - "golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod" - "golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod" - "golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod" - "golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod" - "golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod" - "golang.org/x/net v0.0.0-20181220203305-927f97764cc3/go.mod" - "golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod" - "golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod" - "golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod" - "golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod" - "golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod" - "golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod" - "golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod" - "golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod" - "golang.org/x/net v0.0.0-20190620200207-3b0461eec859" - "golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod" - "golang.org/x/net v0.0.0-20191002035440-2ec189313ef0/go.mod" - "golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553" - "golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod" - "golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod" - "golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod" - "golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45" - "golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod" - "golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod" - "golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod" - "golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod" - "golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod" - "golang.org/x/sync v0.0.0-20190423024810-112230192c58" - "golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod" - "golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod" - "golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod" - "golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod" - "golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod" - "golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod" - "golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod" - "golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod" - "golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod" - "golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod" - "golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod" - "golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0" - "golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod" - "golang.org/x/sys v0.0.0-20200107162124-548cf772de50" - "golang.org/x/sys v0.0.0-20200107162124-548cf772de50/go.mod" - "golang.org/x/text v0.3.0/go.mod" - "golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod" - "golang.org/x/text v0.3.2" - "golang.org/x/text v0.3.2/go.mod" - "golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod" - "golang.org/x/time v0.0.0-20190308202827-9d24e82272b4" - "golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod" - "golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod" - "golang.org/x/tools v0.0.0-20180525024113-a5b4c53f6e8b/go.mod" - "golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod" - "golang.org/x/tools v0.0.0-20181030221726-6c7e314b6563/go.mod" - "golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod" - "golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod" - "golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod" - "golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod" - "golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod" - "golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod" - "golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod" - "golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod" - "golang.org/x/tools v0.0.0-20190606124116-d0a3d012864b/go.mod" - "golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod" - "golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0" - "golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod" - "golang.org/x/tools v0.0.0-20191029041327-9cc4af7d6b2c/go.mod" - "golang.org/x/tools v0.0.0-20191029190741-b9c20aec41a5/go.mod" - "golang.org/x/tools v0.0.0-20191125144606-a911d9008d1f/go.mod" - "golang.org/x/tools v0.0.0-20200107050322-53017a39ae36" - "golang.org/x/tools v0.0.0-20200107050322-53017a39ae36/go.mod" - "golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod" - "golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod" - "gonum.org/v1/gonum v0.0.0-20181121035319-3f7ecaa7e8ca" - "gonum.org/v1/gonum v0.0.0-20181121035319-3f7ecaa7e8ca/go.mod" - "gonum.org/v1/netlib v0.0.0-20181029234149-ec6d1f5cefe6" - "gonum.org/v1/netlib v0.0.0-20181029234149-ec6d1f5cefe6/go.mod" - "google.golang.org/api v0.4.0/go.mod" - "google.golang.org/api v0.7.0" - "google.golang.org/api v0.7.0/go.mod" - "google.golang.org/api v0.15.0" - "google.golang.org/api v0.15.0/go.mod" - "google.golang.org/appengine v1.1.0/go.mod" - "google.golang.org/appengine v1.4.0/go.mod" - "google.golang.org/appengine v1.5.0/go.mod" - "google.golang.org/appengine v1.6.1" - "google.golang.org/appengine v1.6.1/go.mod" - "google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod" - "google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod" - "google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod" - "google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod" - "google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873/go.mod" - "google.golang.org/genproto v0.0.0-20190716160619-c506a9f90610" - "google.golang.org/genproto v0.0.0-20190716160619-c506a9f90610/go.mod" - "google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod" - "google.golang.org/genproto v0.0.0-20190927181202-20e1ac93f88c" - "google.golang.org/genproto v0.0.0-20190927181202-20e1ac93f88c/go.mod" - "google.golang.org/grpc v1.19.0/go.mod" - "google.golang.org/grpc v1.20.1/go.mod" - "google.golang.org/grpc v1.21.1" - "google.golang.org/grpc v1.21.1/go.mod" - "google.golang.org/grpc v1.24.0" - "google.golang.org/grpc v1.24.0/go.mod" - "gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod" - "gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod" - "gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127" - "gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod" - "gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15" - "gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod" - "gopkg.in/errgo.v2 v2.1.0/go.mod" - "gopkg.in/yaml.v2 v2.2.1/go.mod" - "gopkg.in/yaml.v2 v2.2.2" - "gopkg.in/yaml.v2 v2.2.2/go.mod" - "gopkg.in/yaml.v2 v2.2.3/go.mod" - "gopkg.in/yaml.v2 v2.2.4" - "gopkg.in/yaml.v2 v2.2.4/go.mod" - "gopkg.in/yaml.v2 v2.2.7" - "gopkg.in/yaml.v2 v2.2.7/go.mod" - "honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod" - "honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod" - "honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a" - "honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod" - "honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod" - "honnef.co/go/tools v0.0.1-2019.2.3" - "honnef.co/go/tools v0.0.1-2019.2.3/go.mod" - "rsc.io/binaryregexp v0.2.0" - "rsc.io/binaryregexp v0.2.0/go.mod" - "sigs.k8s.io/yaml v1.1.0" - "sigs.k8s.io/yaml v1.1.0/go.mod" - ) -go-module_set_globals SRC_URI="https://github.com/influxdata/chronograf/archive/${PV}.tar.gz -> ${P}.tar.gz - https://dev.gentoo.org/~williamh/dist/${P}-gen.tar.gz - ${EGO_SUM_SRC_URI}" + https://dev.gentoo.org/~williamh/dist/${P}-deps.tar.xz + https://dev.gentoo.org/~williamh/dist/${P}-gen.tar.gz" LICENSE="AGPL-3+" SLOT="0" diff --git a/net-analyzer/chronograf/metadata.xml b/net-analyzer/chronograf/metadata.xml index c36c37139fad..db463f3eeb66 100644 --- a/net-analyzer/chronograf/metadata.xml +++ b/net-analyzer/chronograf/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> <email>williamh@gentoo.org</email> diff --git a/net-analyzer/cloudshark/cloudshark-1.0.4.ebuild b/net-analyzer/cloudshark/cloudshark-1.0.4.ebuild index c25a86e3f199..3904b2a51763 100644 --- a/net-analyzer/cloudshark/cloudshark-1.0.4.ebuild +++ b/net-analyzer/cloudshark/cloudshark-1.0.4.ebuild @@ -1,9 +1,7 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 - -inherit eutils multilib +EAPI=8 DESCRIPTION="Easily upload your wireshark captures to CloudShark" HOMEPAGE="https://cloudshark.io/articles/wireshark-plugin/ https://github.com/cloudshark/wireshark-plugin" @@ -27,12 +25,13 @@ get_PV() { src_prepare() { #cloudshark isn't meant to be installed systemwide, we fix that - epatch "${FILESDIR}"/cs_log_dir.patch + eapply "${FILESDIR}"/cs_log_dir.patch sed -i "s#%s/cloudshark_init.lua#/usr/$(get_libdir)/wireshark/plugins/$(get_PV net-analyzer/wireshark)/cloudshark_init.lua#" cloudshark.lua #this enables cloudshark by DEFAULT on tshark, not desired #sed -i 's#CLOUDSHARK_TSHARK = "n"#CLOUDSHARK_TSHARK = "y"#' cloudshark_init.default + default } src_install() { diff --git a/net-analyzer/cloudshark/metadata.xml b/net-analyzer/cloudshark/metadata.xml index bbafcdbcbb95..d9ce0ea4d0fa 100644 --- a/net-analyzer/cloudshark/metadata.xml +++ b/net-analyzer/cloudshark/metadata.xml @@ -1,5 +1,5 @@ -<?xml version='1.0' encoding='UTF-8'?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> <email>zerochaos@gentoo.org</email> diff --git a/net-analyzer/cnet/cnet-3.3.4.ebuild b/net-analyzer/cnet/cnet-3.3.4.ebuild index 252806110764..2685af53c5bd 100644 --- a/net-analyzer/cnet/cnet-3.3.4.ebuild +++ b/net-analyzer/cnet/cnet-3.3.4.ebuild @@ -1,12 +1,13 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 -inherit eutils multilib toolchain-funcs +EAPI=7 + +inherit toolchain-funcs DESCRIPTION="Network simulation tool" HOMEPAGE="https://www.csse.uwa.edu.au/cnet3/" -SRC_URI="https://dev.gentoo.org/~jer/${P}.tgz" +SRC_URI="https://dev.gentoo.org/~jsmolic/distfiles/${P}.tgz" LICENSE="GPL-2" SLOT="0" @@ -18,13 +19,10 @@ RDEPEND=" dev-libs/elfutils x11-libs/libX11 " -DEPEND=" - ${RDEPEND} -" +DEPEND="${RDEPEND}" + +DOCS=( 1st.README ) -DOCS=( - 1st.README -) PATCHES=( "${FILESDIR}"/${PN}-3.3.4-gentoo.patch "${FILESDIR}"/${PN}-3.3.1-tcl.patch diff --git a/net-analyzer/cnet/metadata.xml b/net-analyzer/cnet/metadata.xml index 74c2baebb4ec..dce3f3be66c0 100644 --- a/net-analyzer/cnet/metadata.xml +++ b/net-analyzer/cnet/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>netmon@gentoo.org</email> diff --git a/net-analyzer/cryptcat/cryptcat-1.2.1-r2.ebuild b/net-analyzer/cryptcat/cryptcat-1.2.1-r2.ebuild index 0c94c1940d9e..f60626e479c6 100644 --- a/net-analyzer/cryptcat/cryptcat-1.2.1-r2.ebuild +++ b/net-analyzer/cryptcat/cryptcat-1.2.1-r2.ebuild @@ -1,22 +1,26 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 -inherit eutils toolchain-funcs +EAPI=7 -DESCRIPTION="netcat clone extended with twofish encryption" -HOMEPAGE="http://cryptcat.sourceforge.net/" +inherit toolchain-funcs + +DESCRIPTION="Netcat clone extended with twofish encryption" +HOMEPAGE="https://cryptcat.sourceforge.io" SRC_URI="mirror://sourceforge/${PN}/${PN}-unix-${PV}.tar" +S="${WORKDIR}"/unix LICENSE="GPL-2" SLOT="0" KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux" -S=${WORKDIR}/unix +PATCHES=( + "${FILESDIR}"/${P}-build.patch + "${FILESDIR}"/${P}-misc.patch +) src_prepare() { - epatch "${FILESDIR}"/${P}-build.patch - epatch "${FILESDIR}"/${P}-misc.patch + default tc-export CC CXX } diff --git a/net-analyzer/cryptcat/files/cryptcat-1.2.1-build.patch b/net-analyzer/cryptcat/files/cryptcat-1.2.1-build.patch index 17ec33489c89..0b9c62b597f0 100644 --- a/net-analyzer/cryptcat/files/cryptcat-1.2.1-build.patch +++ b/net-analyzer/cryptcat/files/cryptcat-1.2.1-build.patch @@ -1,5 +1,5 @@ ---- a/unix/Makefile -+++ b/unix/Makefile +--- a/Makefile ++++ b/Makefile @@ -10,16 +10,14 @@ # debugging # DFLAGS = -DTEST -DDEBUG diff --git a/net-analyzer/cryptcat/metadata.xml b/net-analyzer/cryptcat/metadata.xml index 12086277ff16..c3e340e3461a 100644 --- a/net-analyzer/cryptcat/metadata.xml +++ b/net-analyzer/cryptcat/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>netmon@gentoo.org</email> diff --git a/net-analyzer/cutter/Manifest b/net-analyzer/cutter/Manifest index cc59c2538cd9..9cd1ba973c97 100644 --- a/net-analyzer/cutter/Manifest +++ b/net-analyzer/cutter/Manifest @@ -1,2 +1 @@ -DIST cutter-1.03.tgz 13176 BLAKE2B d879d849be77c34d3e1882cbe500be71e631a5047116828ab07f8ab07b5bbb853e19b6e8b7dd5c42a73ce7b5c2825228cbeae07ec875e83da7bd1bd1c6f34a7a SHA512 821e8abf496e22b86bdd855fb1c9c51648a276ebb572edd2ccb172ae7025a38794df37dfe153c1807785ecec279c34b9df5e2bcc2de582b3a88ee3776cf46eea DIST cutter-1.04.tgz 13680 BLAKE2B 373e5e0c0fb14224974ff399c7db0a69dc5568394a881be2c285437050a1ec4cfb26acbcdd593d22519f34a32760bdbe342a96c2a4d55547f7c06bc49806e228 SHA512 79c17ec8c17e696a79aa8b11fda347f2e6929eb35f9a37da450acf6aff7ab9471e13eaef24708f90f3f0c2791fade2eb944443b98df3d3ae4eef0c408abc7b3a diff --git a/net-analyzer/cutter/cutter-1.03-r1.ebuild b/net-analyzer/cutter/cutter-1.03-r1.ebuild deleted file mode 100644 index 7e3806ff08d3..000000000000 --- a/net-analyzer/cutter/cutter-1.03-r1.ebuild +++ /dev/null @@ -1,28 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit eutils toolchain-funcs - -DESCRIPTION="TCP/IP Connection cutting on Linux Firewalls and Routers" -HOMEPAGE="http://www.digitage.co.uk/digitage/software/linux-security/cutter" -SRC_URI="http://www.digitage.co.uk/digitage/files/${PN}/${P}.tgz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ~ppc x86" - -src_prepare() { - epatch "${FILESDIR}"/${P}-debian.patch - rm -f Makefile # implicit rules are better ;x -} - -src_compile() { - emake cutter CC="$(tc-getCC)" -} - -src_install() { - dosbin cutter - dodoc README - doman debian/cutter.8 -} diff --git a/net-analyzer/cutter/cutter-1.04.ebuild b/net-analyzer/cutter/cutter-1.04.ebuild index f11002ca418e..ebe71d34d0bc 100644 --- a/net-analyzer/cutter/cutter-1.04.ebuild +++ b/net-analyzer/cutter/cutter-1.04.ebuild @@ -1,8 +1,9 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 -inherit eutils toolchain-funcs +EAPI=7 + +inherit toolchain-funcs DESCRIPTION="TCP/IP Connection cutting on Linux Firewalls and Routers" HOMEPAGE="http://www.digitage.co.uk/digitage/software/linux-security/cutter" @@ -10,11 +11,18 @@ SRC_URI="http://www.digitage.co.uk/digitage/files/${PN}/${P}.tgz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" +KEYWORDS="amd64 ~ppc x86" + +PATCHES=( + "${FILESDIR}"/${PN}-1.03-debian.patch + "${FILESDIR}"/${PN}-1.04-musl-if-ether.patch +) src_prepare() { - epatch "${FILESDIR}"/${PN}-1.03-debian.patch - rm -f Makefile # implicit rules are better ;x + default + + # implicit rules are better ;x + rm -f Makefile || die } src_compile() { diff --git a/net-analyzer/cutter/files/cutter-1.04-musl-if-ether.patch b/net-analyzer/cutter/files/cutter-1.04-musl-if-ether.patch new file mode 100644 index 000000000000..fed8bc26ee02 --- /dev/null +++ b/net-analyzer/cutter/files/cutter-1.04-musl-if-ether.patch @@ -0,0 +1,12 @@ +https://git.alpinelinux.org/aports/tree/main/cutter/musl-fix.patch +https://bugs.gentoo.org/715994 +--- a/cutter.c ++++ b/cutter.c +@@ -47,7 +47,6 @@ + #include <linux/socket.h> + #include <linux/ip.h> + #include <linux/tcp.h> +-#include <linux/if_ether.h> + #include <fcntl.h> + #include <netpacket/packet.h> + #include <net/ethernet.h> /* the L2 protocols */ diff --git a/net-analyzer/cutter/metadata.xml b/net-analyzer/cutter/metadata.xml index 74c2baebb4ec..dce3f3be66c0 100644 --- a/net-analyzer/cutter/metadata.xml +++ b/net-analyzer/cutter/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>netmon@gentoo.org</email> diff --git a/net-analyzer/darkstat/Manifest b/net-analyzer/darkstat/Manifest index 0614aa5c743d..1a0ef22ae56d 100644 --- a/net-analyzer/darkstat/Manifest +++ b/net-analyzer/darkstat/Manifest @@ -1 +1 @@ -DIST darkstat-3.0.719.tar.bz2 117695 BLAKE2B b2aef3073aafaa42d006fd9ade652ea3542a5f238e347b219ee30e995915fa38b005161d26dff6a9a3e01e98b426ec14c32e1390592128d5816278e5f895f178 SHA512 264f6c5f862745fbfb5d125aae5a319369f028fd7be96cfb12775147f528a36b7f5a42bcd6434f2d376933292364641f2ec9cd9bdb1fe105f5a905e331181f98 +DIST darkstat-3.0.721.tar.gz 104050 BLAKE2B 1005bd3e40be59ad214c95908b34e70eb8b60e33a9b85ee3f6b7fa7f8f6691fad73234ef228ec529aaad0e8ad9eb07f0bdb9d08a560103af3cb377fd11765436 SHA512 077eec3cc69b021966d4545f408a7444136cedb8be1dbae96fb1ce94d9bcd3a1db3bf4ea1bed8999088b24f7e2ed333d1166fe39bf974f32772b8c8f6fde707c diff --git a/net-analyzer/darkstat/darkstat-3.0.719-r2.ebuild b/net-analyzer/darkstat/darkstat-3.0.719-r2.ebuild deleted file mode 100644 index 041df6e159de..000000000000 --- a/net-analyzer/darkstat/darkstat-3.0.719-r2.ebuild +++ /dev/null @@ -1,67 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit autotools - -DESCRIPTION="Network traffic analyzer with cute web interface" -HOMEPAGE="https://unix4lyfe.org/darkstat/" -SRC_URI="https://unix4lyfe.org/${PN}/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ppc x86" - -DEPEND=" - acct-user/darkstat - dev-libs/libbsd - net-libs/libpcap - sys-libs/zlib -" -RDEPEND=" - ${DEPEND} -" - -DARKSTAT_CHROOT_DIR=${DARKSTAT_CHROOT_DIR:-/var/lib/darkstat} - -DOCS=( AUTHORS ChangeLog README NEWS ) - -src_prepare() { - default - - sed -i -e 's|-flto||g' configure.ac || die - - eautoreconf -} - -src_configure() { - econf --disable-debug --with-privdrop-user=darkstat -} - -src_install() { - default - - newinitd "${FILESDIR}"/darkstat-initd darkstat - newconfd "${FILESDIR}"/darkstat-confd darkstat - - sed -i -e "s:__CHROOT__:${DARKSTAT_CHROOT_DIR}:g" "${D}"/etc/conf.d/darkstat || die - sed -i -e "s:__CHROOT__:${DARKSTAT_CHROOT_DIR}:g" "${D}"/etc/init.d/darkstat || die - - keepdir "${DARKSTAT_CHROOT_DIR}" - chown darkstat:0 "${D}${DARKSTAT_CHROOT_DIR}" -} - -pkg_postinst() { - # Workaround bug #141619 - DARKSTAT_CHROOT_DIR=`sed -n 's/^#CHROOT=\(.*\)/\1/p' "${ROOT}"etc/conf.d/darkstat` - chown darkstat:0 "${ROOT}${DARKSTAT_CHROOT_DIR}" - - elog "To start different darkstat instances which will listen on a different" - elog "interfaces create in /etc/init.d directory the 'darkstat.if' symlink to" - elog "darkstat script where 'if' is the name of the interface." - elog "Also in /etc/conf.d directory copy darkstat to darkstat.if" - elog "and edit it to change default values." - elog - elog "darkstat's default chroot directory is: \"${ROOT}${DARKSTAT_CHROOT_DIR}\"" -} diff --git a/net-analyzer/darkstat/darkstat-3.0.719-r3.ebuild b/net-analyzer/darkstat/darkstat-3.0.719-r3.ebuild deleted file mode 100644 index d67ebb1e93f5..000000000000 --- a/net-analyzer/darkstat/darkstat-3.0.719-r3.ebuild +++ /dev/null @@ -1,73 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools - -DESCRIPTION="Network traffic analyzer with cute web interface" -HOMEPAGE="https://unix4lyfe.org/darkstat/" -SRC_URI="https://unix4lyfe.org/${PN}/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" - -DEPEND=" - acct-user/darkstat - dev-libs/libbsd - net-libs/libpcap - sys-libs/zlib -" -RDEPEND=" - ${DEPEND} -" -DARKSTAT_CHROOT_DIR=${DARKSTAT_CHROOT_DIR:-/var/lib/darkstat} -DOCS=( AUTHORS ChangeLog README NEWS ) -PATCHES=( - "${FILESDIR}"/${PN}-3.0.719-strncpy-off-by-one.patch -) - -src_prepare() { - default - - sed -i \ - -e '/-DNDEBUG/d' \ - -e 's|-flto||g' \ - configure.ac || die - - eautoreconf -} - -src_configure() { - econf --with-privdrop-user=darkstat -} - -src_install() { - default - - newinitd "${FILESDIR}"/darkstat-initd darkstat - newconfd "${FILESDIR}"/darkstat-confd darkstat - - sed -i -e "s:__CHROOT__:${DARKSTAT_CHROOT_DIR}:g" "${D}"/etc/conf.d/darkstat || die - sed -i -e "s:__CHROOT__:${DARKSTAT_CHROOT_DIR}:g" "${D}"/etc/init.d/darkstat || die - - keepdir "${DARKSTAT_CHROOT_DIR}" - chown darkstat:0 "${D}${DARKSTAT_CHROOT_DIR}" -} - -pkg_postinst() { - # Workaround bug #141619 - DARKSTAT_CHROOT_DIR=$( - sed -n 's/^#CHROOT=\(.*\)/\1/p' "${ROOT}"/etc/conf.d/darkstat - ) - chown darkstat:0 "${ROOT}${DARKSTAT_CHROOT_DIR}" - - elog "To start different darkstat instances which will listen on a different" - elog "interfaces create in /etc/init.d directory the 'darkstat.if' symlink to" - elog "darkstat script where 'if' is the name of the interface." - elog "Also in /etc/conf.d directory copy darkstat to darkstat.if" - elog "and edit it to change default values." - elog - elog "darkstat's default chroot directory is: \"${ROOT}${DARKSTAT_CHROOT_DIR}\"" -} diff --git a/net-analyzer/darkstat/darkstat-3.0.721-r1.ebuild b/net-analyzer/darkstat/darkstat-3.0.721-r1.ebuild new file mode 100644 index 000000000000..3e6de7f9ed76 --- /dev/null +++ b/net-analyzer/darkstat/darkstat-3.0.721-r1.ebuild @@ -0,0 +1,72 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools + +DESCRIPTION="Network traffic analyzer with cute web interface" +HOMEPAGE="https://unix4lyfe.org/darkstat/" +if [[ ${PV} == *9999* ]] ; then + EGIT_REPO_URI="https://github.com/emikulic/darkstat" + inherit git-r3 +else + SRC_URI="https://github.com/emikulic/darkstat/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="amd64 ppc x86" +fi + +LICENSE="GPL-2" +SLOT="0" + +DEPEND="acct-user/darkstat + dev-libs/libbsd + net-libs/libpcap + sys-libs/zlib" +RDEPEND="${DEPEND}" + +DARKSTAT_CHROOT_DIR=${DARKSTAT_CHROOT_DIR:-/var/lib/darkstat} + +DOCS=( AUTHORS ChangeLog README.md NEWS ) + +PATCHES=( + "${FILESDIR}"/${PN}-3.0.719-strncpy-off-by-one.patch +) + +src_prepare() { + default + + sed -i \ + -e '/-DNDEBUG/d' \ + -e 's|-flto||g' \ + configure.ac || die + + eautoreconf +} + +src_configure() { + econf --with-privdrop-user=darkstat +} + +src_install() { + default + + newinitd "${FILESDIR}"/darkstat-initd darkstat + newconfd "${FILESDIR}"/darkstat-confd darkstat + + sed -i -e "s:__CHROOT__:${DARKSTAT_CHROOT_DIR}:g" "${D}"/etc/conf.d/darkstat || die + sed -i -e "s:__CHROOT__:${DARKSTAT_CHROOT_DIR}:g" "${D}"/etc/init.d/darkstat || die + + keepdir "${DARKSTAT_CHROOT_DIR}" + fowners darkstat:0 "${DARKSTAT_CHROOT_DIR}" +} + +pkg_postinst() { + elog "To start different darkstat instances which will listen on a different" + elog "interface, create within the ${EROOT}/etc/init.d directory a 'darkstat.if' symlink to" + elog "darkstat script where 'if' is the name of the interface." + elog "Also in the ${EROOT}/etc/conf.d directory, copy darkstat to darkstat.if" + elog "and edit it to change default values." + elog + elog "darkstat's default chroot directory is: ${EROOT}/var/lib/darkstat." + elog "Please chown it to darkstat:0 (or a different directory if you change it)." +} diff --git a/net-analyzer/darkstat/darkstat-9999999.ebuild b/net-analyzer/darkstat/darkstat-9999999.ebuild index 4ca39eb748e3..dcd53be61eb1 100644 --- a/net-analyzer/darkstat/darkstat-9999999.ebuild +++ b/net-analyzer/darkstat/darkstat-9999999.ebuild @@ -1,32 +1,33 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -inherit autotools git-r3 +inherit autotools DESCRIPTION="Network traffic analyzer with cute web interface" HOMEPAGE="https://unix4lyfe.org/darkstat/" -EGIT_REPO_URI="https://www.unix4lyfe.org/git/darkstat" +if [[ ${PV} == *9999* ]] ; then + EGIT_REPO_URI="https://github.com/emikulic/darkstat" + inherit git-r3 +else + SRC_URI="https://github.com/emikulic/darkstat/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~ppc ~x86" +fi LICENSE="GPL-2" SLOT="0" -KEYWORDS="" -BDEPEND=" - app-editors/vim-core -" -DEPEND=" - acct-user/darkstat +DEPEND="acct-user/darkstat dev-libs/libbsd net-libs/libpcap - sys-libs/zlib -" -RDEPEND=" - ${DEPEND} -" + sys-libs/zlib" +RDEPEND="${DEPEND}" + DARKSTAT_CHROOT_DIR=${DARKSTAT_CHROOT_DIR:-/var/lib/darkstat} -DOCS=( AUTHORS ChangeLog README NEWS ) + +DOCS=( AUTHORS ChangeLog README.md NEWS ) + PATCHES=( "${FILESDIR}"/${PN}-3.0.719-strncpy-off-by-one.patch ) @@ -56,21 +57,24 @@ src_install() { sed -i -e "s:__CHROOT__:${DARKSTAT_CHROOT_DIR}:g" "${D}"/etc/init.d/darkstat || die keepdir "${DARKSTAT_CHROOT_DIR}" - chown darkstat:0 "${D}${DARKSTAT_CHROOT_DIR}" + fowners darkstat:0 "${DARKSTAT_CHROOT_DIR}" } pkg_postinst() { # Workaround bug #141619 DARKSTAT_CHROOT_DIR=$( - sed -n 's/^#CHROOT=\(.*\)/\1/p' "${ROOT}"/etc/conf.d/darkstat + sed -n 's/^#CHROOT=\(.*\)/\1/p' "${EROOT}"/etc/conf.d/darkstat ) - chown darkstat:0 "${ROOT}${DARKSTAT_CHROOT_DIR}" + + if [[ -n "${DARKSTAT_CHROOT_DIR}" ]] && [[ "${DARKSTAT_CHROOT_DIR}" != "${EROOT:-/}" ]] ; then + chown darkstat:0 "${EROOT}/${DARKSTAT_CHROOT_DIR#/}/" + fi elog "To start different darkstat instances which will listen on a different" - elog "interfaces create in /etc/init.d directory the 'darkstat.if' symlink to" + elog "interface, create within the ${EROOT}/etc/init.d directory a 'darkstat.if' symlink to" elog "darkstat script where 'if' is the name of the interface." - elog "Also in /etc/conf.d directory copy darkstat to darkstat.if" + elog "Also in the ${EROOT}/etc/conf.d directory, copy darkstat to darkstat.if" elog "and edit it to change default values." elog - elog "darkstat's default chroot directory is: \"${ROOT}${DARKSTAT_CHROOT_DIR}\"" + elog "darkstat's default chroot directory is: ${EROOT}/${DARKSTAT_CHROOT_DIR#/}" } diff --git a/net-analyzer/darkstat/metadata.xml b/net-analyzer/darkstat/metadata.xml index c289cc9010db..7903d33acaf1 100644 --- a/net-analyzer/darkstat/metadata.xml +++ b/net-analyzer/darkstat/metadata.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type="project"> + <maintainer type="project"> <email>netmon@gentoo.org</email> <name>Gentoo network monitoring and analysis project</name> </maintainer> @@ -10,4 +10,7 @@ runs as a background process on a cable/DSL router, gathers all sorts of statistics about network usage, and serves them over HTTP. </longdescription> + <upstream> + <remote-id type="github">emikulic/darkstat</remote-id> + </upstream> </pkgmetadata> diff --git a/net-analyzer/dhcp_probe/Manifest b/net-analyzer/dhcp_probe/Manifest index daa2b61e7d68..5ed1a3a8246e 100644 --- a/net-analyzer/dhcp_probe/Manifest +++ b/net-analyzer/dhcp_probe/Manifest @@ -1 +1 @@ -DIST dhcp_probe-1.3.0.tar.gz 211613 BLAKE2B cbcc43b292fe537216ef40de9e417c1f700be4ad5f34feacd9475eb31866b68957ce66c5abc47db3b7e5a0dc8751ca6e54200b79ab2f1f8c3f308f6c1c7aef4d SHA512 d643012529ee5149adbc0c1f19f8e579c55201e86de2aec9b3313be9412db4e973162f864d1baaf79fa340b7bd9a7385f0f1406d1b616e801ced3c7bb387c854 +DIST dhcp_probe-1.3.1.tar.gz 246238 BLAKE2B 86c079c4c7951f3a70ced20dbea5d4f0d716335d2f9a18b1b9986965ca0446b5a7b673c7e652405deceeef336218016418a86be1a76d452c7802061403a66e82 SHA512 1002683e6ceb3806289fa9e4879be3d957a9ddc42656d7114942708560f8efba0db058137e04cad092e5a083900987aa1f76c5a7c20db4b57c104dd6a6fcabb6 diff --git a/net-analyzer/dhcp_probe/dhcp_probe-1.3.0-r4.ebuild b/net-analyzer/dhcp_probe/dhcp_probe-1.3.0-r4.ebuild deleted file mode 100644 index 3819fc35ca70..000000000000 --- a/net-analyzer/dhcp_probe/dhcp_probe-1.3.0-r4.ebuild +++ /dev/null @@ -1,50 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit flag-o-matic - -DESCRIPTION="discover DHCP and BootP servers on a directly-attached Ethernet network" -HOMEPAGE="https://www.net.princeton.edu/software/dhcp_probe/" -SRC_URI="https://www.net.princeton.edu/software/${PN}/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -DEPEND=" - net-libs/libpcap - >=net-libs/libnet-1.1.2.1-r2 -" -RDEPEND="${DEPEND}" -DOCS=( - "${FILESDIR}"/${PN}_mail - AUTHORS - ChangeLog - NEWS - README - TODO - extras/dhcp_probe.cf.sample -) -PATCHES=( - "${FILESDIR}"/${PV}/01_dhcp_probe.5.patch - "${FILESDIR}"/${PV}/02_dhcp_probe.8.patch - "${FILESDIR}"/${PV}/03_implicit_point_conv_bootp.c.patch - "${FILESDIR}"/${PV}/04_linux_32_or_64bits.patch - "${FILESDIR}"/${PV}/05-cleanup.patch - "${FILESDIR}"/${PV}/06-return.patch - "${FILESDIR}"/${PV}/07-comment.patch - "${FILESDIR}"/${PV}/08-man8.patch -) - -src_configure() { - use amd64 && append-flags -D__ARCH__=64 - STRIP=true econf -} - -src_install() { - default - - newinitd "${FILESDIR}/${PN}.initd" ${PN} - newconfd "${FILESDIR}/${PN}.confd" ${PN} -} diff --git a/net-analyzer/dhcp_probe/dhcp_probe-1.3.1.ebuild b/net-analyzer/dhcp_probe/dhcp_probe-1.3.1.ebuild new file mode 100644 index 000000000000..c7d6357a1e18 --- /dev/null +++ b/net-analyzer/dhcp_probe/dhcp_probe-1.3.1.ebuild @@ -0,0 +1,49 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools flag-o-matic toolchain-funcs + +DESCRIPTION="Discover DHCP and BootP servers on a directly-attached Ethernet network" +HOMEPAGE="https://www.net.princeton.edu/software/dhcp_probe/" +SRC_URI="https://www.net.princeton.edu/software/${PN}/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +DEPEND=" + net-libs/libnet + net-libs/libpcap" +RDEPEND="${DEPEND}" + +PATCHES=( + "${FILESDIR}"/${PN}-1.3.1-respect-AR.patch + "${FILESDIR}"/${PN}-1.3.1-fix-configure-CPP.patch +) + +src_prepare() { + default + + # for AR patch + eautoreconf +} + +src_configure() { + # configure uses CPP + tc-export CPP + + use amd64 && append-cppflags -D__ARCH__=64 + + STRIP=true econf +} + +src_install() { + default + + dodoc extras/dhcp_probe.cf.sample "${FILESDIR}"/${PN}_mail + + newinitd "${FILESDIR}"/${PN}.initd ${PN} + newconfd "${FILESDIR}"/${PN}.confd ${PN} +} diff --git a/net-analyzer/dhcp_probe/files/1.3.0/01_dhcp_probe.5.patch b/net-analyzer/dhcp_probe/files/1.3.0/01_dhcp_probe.5.patch deleted file mode 100644 index 2d5599c06224..000000000000 --- a/net-analyzer/dhcp_probe/files/1.3.0/01_dhcp_probe.5.patch +++ /dev/null @@ -1,47 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 01_dhcp_probe.5.dpatch by Laurent Guignard <lguignard.debian@gmail.com> -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: Change a syntax problem in groff file for hyphenation problem -## Note: -## Submitted to upstream programmer Irwin Tillman<irwin@princeton.edu>. -## This patch will be applied in the next version of the upstream code. - - -@DPATCH@ -diff -urNad trunk~/doc/dhcp_probe.cf.5 trunk/doc/dhcp_probe.cf.5 ---- trunk~/doc/dhcp_probe.cf.5 2009-03-30 14:53:40.000000000 +0200 -+++ trunk/doc/dhcp_probe.cf.5 2009-03-30 14:57:05.000000000 +0200 -@@ -472,10 +472,10 @@ - .PP - .RS - .nf ---p the name of the calling program (e.g. dhcp_probe), ---I the name of the interface on which the unexpected response packet was received ---i the IP source address of the packet ---m Ethernet source address of the packet -+\-p the name of the calling program (e.g. dhcp_probe), -+\-I the name of the interface on which the unexpected response packet was received -+\-i the IP source address of the packet -+\-m Ethernet source address of the packet - .fi - .RE - .PP -@@ -483,7 +483,7 @@ - .PP - .RS - .nf ---y the non-zero yiaddr value from the packet, when it falls inside a "Lease Network of Concern" -+\-y the non-zero yiaddr value from the packet, when it falls inside a "Lease Network of Concern" - .fi - .RE - .PP -@@ -723,7 +723,7 @@ - # alert_program_name2 /absolute/path/name - # - # The program specified via 'alert_program_name2' will be called as follows: --# /absolute/path/name -p name_of_calling_program -I name_of_interface_on_which_the_response_was_received -i IP_source_of_the_response -m ether_src_of_the_response [-y yiaddr_when_in_lease_networks_of_concern] -+# /absolute/path/name \-p name_of_calling_program \-I name_of_interface_on_which_the_response_was_received \-i IP_source_of_the_response \-m ether_src_of_the_response [\-y yiaddr_when_in_lease_networks_of_concern] - # The options may appear in any order. - # The program must silently ignore any options or arguments it does not recognize, - # so as to be forward-compatible with future enhancements to dhcp_probe. diff --git a/net-analyzer/dhcp_probe/files/1.3.0/02_dhcp_probe.8.patch b/net-analyzer/dhcp_probe/files/1.3.0/02_dhcp_probe.8.patch deleted file mode 100644 index d9d3d5aa898a..000000000000 --- a/net-analyzer/dhcp_probe/files/1.3.0/02_dhcp_probe.8.patch +++ /dev/null @@ -1,35 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 02_dhcp_probe.8.dpatch by Laurent Guignard <lguignard.debian@gmail.com> -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: Change a syntax problem in groff file for hyphenation problem -## Note: -## Submitted to upstream programmer Irwin Tillman<irwin@princeton.edu>. -## This patch will be applied in the next version of the upstream code. - - -@DPATCH@ -diff -urNad trunk~/doc/dhcp_probe.8 trunk/doc/dhcp_probe.8 ---- trunk~/doc/dhcp_probe.8 2009-03-30 14:53:40.000000000 +0200 -+++ trunk/doc/dhcp_probe.8 2009-03-30 15:18:09.000000000 +0200 -@@ -380,15 +380,15 @@ - file, - that program is executed, with the following required options: - .nf -- -p the name of the calling program (e.g. dhcp_probe) -- -I the name of the interface on which the unexpected response packet was received -- -i the IP source address of the packet -- -m and the Ethernet source address of the packet -+ \-p the name of the calling program (e.g. dhcp_probe) -+ \-I the name of the interface on which the unexpected response packet was received -+ \-i the IP source address of the packet -+ \-m and the Ethernet source address of the packet - .fi - If the response packet's yiaddr is non-zero and falls within a "Lease Networks of Concern", - the following optional options are also passed: - .nf -- -y the non-zero yiaddr value -+ \-y the non-zero yiaddr value - .fi - (We do not wait for the - .I alert_program_name2 diff --git a/net-analyzer/dhcp_probe/files/1.3.0/03_implicit_point_conv_bootp.c.patch b/net-analyzer/dhcp_probe/files/1.3.0/03_implicit_point_conv_bootp.c.patch deleted file mode 100644 index 41af750416bf..000000000000 --- a/net-analyzer/dhcp_probe/files/1.3.0/03_implicit_point_conv_bootp.c.patch +++ /dev/null @@ -1,21 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 03_implicit_point_conv_bootp.c.dpatch by Laurent Guignard <lguignard.debian@gmail.com> -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: Fix implicit Pointer Converstion in bootp.c file. -## Fix bug #529635 discovered by Dann Frazier <dannf@debian.org> -## - -@DPATCH@ -diff -urNad trunk~/src/bootp.c trunk/src/bootp.c ---- trunk~/src/bootp.c 2009-03-31 14:19:06.000000000 +0200 -+++ trunk/src/bootp.c 2009-05-21 09:51:26.000000000 +0200 -@@ -11,7 +11,7 @@ - #include "bootp.h" - #include "configfile.h" - #include "report.h" -- -+#include "utils.h" - - - diff --git a/net-analyzer/dhcp_probe/files/1.3.0/04_linux_32_or_64bits.patch b/net-analyzer/dhcp_probe/files/1.3.0/04_linux_32_or_64bits.patch deleted file mode 100644 index dcd79ffc58b2..000000000000 --- a/net-analyzer/dhcp_probe/files/1.3.0/04_linux_32_or_64bits.patch +++ /dev/null @@ -1,33 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 04_linux_32_or_64bits.dpatch by Laurent Guignard <lguignard.debian@gmail.com> -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: A solution to solve the bug #535361 -## May be this will be a solution with the right method ??? - -@DPATCH@ -diff -urNad trunk~/src/get_myipaddr.c trunk/src/get_myipaddr.c ---- trunk~/src/get_myipaddr.c 2009-09-03 13:10:32.000000000 +0200 -+++ trunk/src/get_myipaddr.c 2009-09-03 13:15:39.671451172 +0200 -@@ -118,7 +118,21 @@ - #endif /* not STRUCT_SOCKADDR_HAS_SA_LEN */ - - /* increment ptr to next interface for next time through the loop */ -+#ifdef __ARCH__ /* Debian GNU/Linux behavior for packaging goal */ -+ switch(__ARCH__) { -+ case 32: /* 32 bits architectures */ -+ ptr += sizeof(ifr->ifr_name) + len; -+ break; -+ case 64: /* 64 bits architectures */ -+ ptr += sizeof(struct ifreq); -+ break; -+ default: /* Default dhcp_probe behavior */ -+ ptr += sizeof(ifr->ifr_name) + len; -+ break; -+ } -+#else /* Default dhcp_probe behavior */ - ptr += sizeof(ifr->ifr_name) + len; -+#endif - - if (strcmp(ifname, ifr->ifr_name) != 0 ) /* is this the interface we're looking for? */ - continue; diff --git a/net-analyzer/dhcp_probe/files/1.3.0/05-cleanup.patch b/net-analyzer/dhcp_probe/files/1.3.0/05-cleanup.patch deleted file mode 100644 index 4151b461bbfd..000000000000 --- a/net-analyzer/dhcp_probe/files/1.3.0/05-cleanup.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- dhcp_probe-1.3.0/src/dhcp_probe.c.orig 2009-03-09 21:17:47.000000000 +0100 -+++ dhcp_probe-1.3.0/src/dhcp_probe.c 2009-11-19 18:09:26.000000000 +0100 -@@ -84,7 +84,6 @@ - struct sigaction sa; - FILE *pid_fp; - char *cwd = CWD; -- int i; - - int write_packet_len; - int bytes_written; -@@ -98,9 +97,6 @@ - int linktype; - char pcap_errbuf[PCAP_ERRBUF_SIZE], pcap_errbuf2[PCAP_ERRBUF_SIZE]; - -- /* for libnet */ -- char libnet_errbuf[LIBNET_ERRBUF_SIZE]; -- - /* get progname = last component of argv[0] */ - prog = strrchr(argv[0], '/'); - if (prog) -@@ -987,8 +983,6 @@ - Must not be called until after initial configuration is complete. - */ - -- int i; -- - if (! read_configfile(config_file)) { - my_exit(1, 1, 1); - } diff --git a/net-analyzer/dhcp_probe/files/1.3.0/06-return.patch b/net-analyzer/dhcp_probe/files/1.3.0/06-return.patch deleted file mode 100644 index c27ad646e6c9..000000000000 --- a/net-analyzer/dhcp_probe/files/1.3.0/06-return.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- dhcp_probe-1.3.0/src/dhcp_probe.c.orig 2009-11-19 18:13:31.000000000 +0100 -+++ dhcp_probe-1.3.0/src/dhcp_probe.c 2009-11-19 18:13:59.000000000 +0100 -@@ -684,6 +684,8 @@ - pcap_close(pd_template); - - my_exit(0, 1, 1); -+ -+ return 0; /* will not be reached */ - } - - diff --git a/net-analyzer/dhcp_probe/files/1.3.0/07-comment.patch b/net-analyzer/dhcp_probe/files/1.3.0/07-comment.patch deleted file mode 100644 index c8184144a597..000000000000 --- a/net-analyzer/dhcp_probe/files/1.3.0/07-comment.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- dhcp_probe-1.3.0/src/configfile.c.orig 2009-03-09 21:17:47.000000000 +0100 -+++ dhcp_probe-1.3.0/src/configfile.c 2009-11-19 18:17:03.000000000 +0100 -@@ -55,7 +55,7 @@ - - /* parallel arrays of "lease networks of concern" (address & mask), and number of elems in arrays. - We also precompute a parallel array of 'addr & mask' to save computing these repeatedly later. --/* If a response already identified as being from a rogue DHCP server contains a yiaddr field field -+ If a response already identified as being from a rogue DHCP server contains a yiaddr field field - that falls into one of these networks, it is reported as a matter of special concern. - */ - struct in_addr lease_networks_of_concern_addr[MAX_LEASE_NETWORKS_OF_CONCERN]; diff --git a/net-analyzer/dhcp_probe/files/1.3.0/08-man8.patch b/net-analyzer/dhcp_probe/files/1.3.0/08-man8.patch deleted file mode 100644 index 56f8686eaebd..000000000000 --- a/net-analyzer/dhcp_probe/files/1.3.0/08-man8.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- dhcp_probe-1.3.0/doc/dhcp_probe.8.orig 2009-11-19 18:27:47.000000000 +0100 -+++ dhcp_probe-1.3.0/doc/dhcp_probe.8 2009-11-19 18:28:50.000000000 +0100 -@@ -141,7 +141,7 @@ - libraries. - .SH OPTIONS - .TP --.IB \-c \ config_file -+.BI \-c \ config_file - Specifies the configuration file. - If not specified, this defaults to - .BR /etc/dhcp_probe.cf . -@@ -253,7 +253,7 @@ - .B \-v - Display the program's version number, then exit. - .TP --.IB \-w \ cwd -+.BI \-w \ cwd - Specifies the working directory; shortly after starting the - program changes its current working directory to this. - If not specified, this defaults to diff --git a/net-analyzer/dhcp_probe/files/dhcp_probe-1.3.1-fix-configure-CPP.patch b/net-analyzer/dhcp_probe/files/dhcp_probe-1.3.1-fix-configure-CPP.patch new file mode 100644 index 000000000000..fa32f0f73164 --- /dev/null +++ b/net-analyzer/dhcp_probe/files/dhcp_probe-1.3.1-fix-configure-CPP.patch @@ -0,0 +1,26 @@ +Before this patch, with CPP exported: +``` +checking for inet_aton function prototype in arpa/inet.h... ./configure: 6386: CPP: not found +checking how to run the C preprocessor... x86_64-pc-linux-gnu-gcc -E +./configure: 6512: ac_fn_c_try_cpp: not found +./configure: 6512: ac_fn_c_try_cpp: not found +configure: error: in `/var/tmp/portage/net-analyzer/dhcp_probe-1.3.1/work/dhcp_probe-1.3.1': +configure: error: C preprocessor "x86_64-pc-linux-gnu-gcc -E" fails sanity check +See `config.log' for more details +``` + +... and unexported: +``` +checking for inet_aton function prototype in arpa/inet.h... ./configure: 6386: CPP: not found +[... continues without dying ...] +``` +--- a/configure.ac ++++ b/configure.ac +@@ -16,6 +16,7 @@ dnl Checks for programs. + AC_PROG_CC + AC_PROG_RANLIB + AM_PROG_AR ++AC_PROG_CPP + + dnl ########################################################################## + diff --git a/net-analyzer/dhcp_probe/files/dhcp_probe-1.3.1-respect-AR.patch b/net-analyzer/dhcp_probe/files/dhcp_probe-1.3.1-respect-AR.patch new file mode 100644 index 000000000000..da32b63718ac --- /dev/null +++ b/net-analyzer/dhcp_probe/files/dhcp_probe-1.3.1-respect-AR.patch @@ -0,0 +1,10 @@ +--- a/configure.ac ++++ b/configure.ac +@@ -15,6 +15,7 @@ dnl ########################################################################## + dnl Checks for programs. + AC_PROG_CC + AC_PROG_RANLIB ++AM_PROG_AR + + dnl ########################################################################## + diff --git a/net-analyzer/dhcp_probe/metadata.xml b/net-analyzer/dhcp_probe/metadata.xml index 2c2a7923cfc8..d5af4bcfaf13 100644 --- a/net-analyzer/dhcp_probe/metadata.xml +++ b/net-analyzer/dhcp_probe/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>netmon@gentoo.org</email> diff --git a/net-analyzer/dhcpdump/dhcpdump-1.8.ebuild b/net-analyzer/dhcpdump/dhcpdump-1.8.ebuild index f846b315d95e..b7647756faa3 100644 --- a/net-analyzer/dhcpdump/dhcpdump-1.8.ebuild +++ b/net-analyzer/dhcpdump/dhcpdump-1.8.ebuild @@ -1,8 +1,9 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 -inherit eutils toolchain-funcs +EAPI=7 + +inherit toolchain-funcs DESCRIPTION="DHCP Packet Analyzer/tcpdump postprocessor" HOMEPAGE="https://www.mavetju.org/unix/general.php" @@ -12,20 +13,19 @@ LICENSE="BSD-2" SLOT="0" KEYWORDS="amd64 arm ~mips x86" +# for pod2man +BDEPEND="dev-lang/perl" RDEPEND="net-libs/libpcap" -DEPEND=" - ${RDEPEND} - dev-lang/perl -" - -src_prepare() { - epatch "${FILESDIR}"/${P}-Makefile.patch - epatch "${FILESDIR}"/${P}-debian.patch - epatch "${FILESDIR}"/${P}-endianness.patch -} +DEPEND="${RDEPEND}" + +PATCHES=( + "${FILESDIR}"/${P}-Makefile.patch + "${FILESDIR}"/${P}-debian.patch + "${FILESDIR}"/${P}-endianness.patch +) src_compile() { - emake CC=$(tc-getCC) + emake CC="$(tc-getCC)" } src_install() { diff --git a/net-analyzer/dhcpdump/metadata.xml b/net-analyzer/dhcpdump/metadata.xml index f34967c0f990..4a2aa198f9ce 100644 --- a/net-analyzer/dhcpdump/metadata.xml +++ b/net-analyzer/dhcpdump/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>netmon@gentoo.org</email> diff --git a/net-analyzer/dnsenum/Manifest b/net-analyzer/dnsenum/Manifest index fbfcc568646e..4b9d71389a55 100644 --- a/net-analyzer/dnsenum/Manifest +++ b/net-analyzer/dnsenum/Manifest @@ -1 +1,2 @@ DIST dnsenum-1.2.2.tar.gz 902708 BLAKE2B 4ce8b9b4f641949f9d06f60e452b3c9cfc32819a6d3aa0bdcbb37c58ef22b2dcfd4b3805e5b9a1a264326ddf1f24e4b68b6cb8b2bc7ee4f7ac5ae11017da8aab SHA512 3915be8e3ddf1102520594fcb1a41506401c662175455414226165e473844fa94f8577e68395586bfbf7e97b7c5a29e20e1ad63bb40a214c53e141afe66eddd6 +DIST dnsenum-1.3.1.tar.gz 21452 BLAKE2B e2ef22d2c001294a4c5417a571ed647b97cdf76af8534b4ff9648405d086c47aa39ca646e7b134122a085b97f2c6698ccb6d6e198cb564255c7f4d8df4838a78 SHA512 26cec4056ae787ee297868e58ca384946e1edb80be36b0a92beca846a8abb9be21963295cb2cc3349d9ec765b30b308f3721347d24208481c35dce371c32db97 diff --git a/net-analyzer/dnsenum/dnsenum-1.2.2.ebuild b/net-analyzer/dnsenum/dnsenum-1.2.2.ebuild index ac19ef55f4d4..7df960e72a02 100644 --- a/net-analyzer/dnsenum/dnsenum-1.2.2.ebuild +++ b/net-analyzer/dnsenum/dnsenum-1.2.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -9,7 +9,7 @@ SRC_URI="https://dnsenum.googlecode.com/files/${P}.tar.gz" LICENSE="GPL-2+" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 ~x86" RDEPEND=" dev-perl/Net-DNS diff --git a/net-analyzer/dnsenum/dnsenum-1.3.1.ebuild b/net-analyzer/dnsenum/dnsenum-1.3.1.ebuild new file mode 100644 index 000000000000..30be96ccd221 --- /dev/null +++ b/net-analyzer/dnsenum/dnsenum-1.3.1.ebuild @@ -0,0 +1,34 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DESCRIPTION="A perl script to enumerate DNS from a server" +HOMEPAGE="https://github.com/SparrowOchon/dnsenum2" +SRC_URI="https://github.com/SparrowOchon/dnsenum2/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +RDEPEND=" + dev-perl/HTML-Parser + dev-perl/Net-DNS + dev-perl/Net-IP + dev-perl/Net-Netmask + dev-perl/Net-Whois-IP + dev-perl/String-Random + dev-perl/WWW-Mechanize + dev-perl/XML-Writer" + +S="${WORKDIR}/${PN}2-${PV}" + +src_prepare() { + default + sed -i -e "s:dnsenum\.pl:dnsenum:g" dnsenum.pl || die +} + +src_install() { + emake DESTDIR="${D}" INSTALL_DEPS=0 install + dodoc README.md +} diff --git a/net-analyzer/dnsenum/metadata.xml b/net-analyzer/dnsenum/metadata.xml index 376c468e9d5c..73183f603795 100644 --- a/net-analyzer/dnsenum/metadata.xml +++ b/net-analyzer/dnsenum/metadata.xml @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> <email>zerochaos@gentoo.org</email> <name>Rick Farina</name> </maintainer> <upstream> - <remote-id type="github">fwaeytens/dnsenum</remote-id> + <remote-id type="github">SparrowOchon/dnsenum2</remote-id> </upstream> </pkgmetadata> diff --git a/net-analyzer/dnsmap/Manifest b/net-analyzer/dnsmap/Manifest index dd7b978d1f47..fe087b1eb9a2 100644 --- a/net-analyzer/dnsmap/Manifest +++ b/net-analyzer/dnsmap/Manifest @@ -1 +1 @@ -DIST dnsmap-0.35.tar.gz 73584 BLAKE2B 15de8771f8add66d2598996961cae06670ebf9009d575ad3eaee6e7300163fbc84abf6e9082791de155a9daf5581cf2daf568a7a85a4a55adbf0c81e92639e94 SHA512 9a1bc25500dde22f2c641cd41a83e634dffda06fdfd62d439b9b8656f5e7624ab1d4736ed0d375acc24fb3f12091f7f75190fd97c4b7fa3c237baa0ade871ca1 +DIST dnsmap-0.36.tar.gz 73782 BLAKE2B 94d6aa024979805c81dc5160b213a9e32297283f6b35f91e8eb376db83b5f3627783491530a89d24bbba740ba48870b0073910a1773242f0caedfcfd71e93ef2 SHA512 60f0602314ea6f2b8c16bda1d1d47110c4b2a16f32174882e4406b4ccece39001527337f6ba40da65524287d005c1611e4c14e6a1ec99b25e50f4a20c7e6577f diff --git a/net-analyzer/dnsmap/dnsmap-0.35.ebuild b/net-analyzer/dnsmap/dnsmap-0.35.ebuild deleted file mode 100644 index d6cb5787b332..000000000000 --- a/net-analyzer/dnsmap/dnsmap-0.35.ebuild +++ /dev/null @@ -1,31 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit autotools - -DESCRIPTION="Scan for subdomains using bruteforcing techniques" -HOMEPAGE="https://github.com/resurrecting-open-source-projects/dnsmap" -SRC_URI="https://github.com/resurrecting-open-source-projects/dnsmap/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -DOCS=( - CONTRIBUTING.md - ChangeLog - NEWS - README.md - TODO - doc/CREDITS.old -) - -src_prepare() { - default - eautoreconf -} - -src_install() { - default -} diff --git a/net-analyzer/dnsmap/dnsmap-0.36.ebuild b/net-analyzer/dnsmap/dnsmap-0.36.ebuild new file mode 100644 index 000000000000..ccfe8b6421d6 --- /dev/null +++ b/net-analyzer/dnsmap/dnsmap-0.36.ebuild @@ -0,0 +1,29 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools + +DESCRIPTION="Scan for subdomains using bruteforcing techniques" +HOMEPAGE="https://github.com/resurrecting-open-source-projects/dnsmap" +SRC_URI="https://github.com/resurrecting-open-source-projects/dnsmap/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +DOCS=( + CONTRIBUTING.md + ChangeLog + NEWS + README.md + TODO + doc/CREDITS.old +) + +src_prepare() { + default + + eautoreconf +} diff --git a/net-analyzer/dnsmap/metadata.xml b/net-analyzer/dnsmap/metadata.xml index 825589988b40..9c17f50421ee 100644 --- a/net-analyzer/dnsmap/metadata.xml +++ b/net-analyzer/dnsmap/metadata.xml @@ -1,7 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type="project"> -<email>netmon@gentoo.org</email> -</maintainer> + <maintainer type="project"> + <email>netmon@gentoo.org</email> + </maintainer> + <upstream> + <remote-id type="github">resurrecting-open-source-projects/dnsmap</remote-id> + </upstream> </pkgmetadata> diff --git a/net-analyzer/dnstracer/Manifest b/net-analyzer/dnstracer/Manifest index 4dc1e72038e3..fcc834eb16f2 100644 --- a/net-analyzer/dnstracer/Manifest +++ b/net-analyzer/dnstracer/Manifest @@ -1,2 +1 @@ DIST dnstracer-1.10.tar.gz 19169 BLAKE2B 8d549f7968b313778f4ee28a5dae0d782b23ff6ce874d343c079c178e9e7516d37af61c14ac6d4f00888dffa98f50768acd2d3fa2d221358d4db8aea82bc830f SHA512 8174f92c5c1b300c1011a24f0cf2f16dc2b52a082729e52d1033a047e20d132d6005b89618ecbbd25cbdc1c95cdc0748cf666bdc56b769b240d8885469bc6e05 -DIST dnstracer-1.9.tar.gz 130884 BLAKE2B cf08795eed59851c6da5d5c0ecc1a0b8445584ab10a9adf3cc526f5f831ceef9ed8deee8728ec964c35808a71e865f841f698403bcc0f16346e3abd5e13cac8b SHA512 e69fe772062ff315ff3148c26df78bd41c75d11dcfa6431f1e9374e6069182bd80826b22dc116011d975838d9527913d46edd78de049edd25e3ac9247d5f3473 diff --git a/net-analyzer/dnstracer/dnstracer-1.10.ebuild b/net-analyzer/dnstracer/dnstracer-1.10.ebuild index 733c4c9cc2d7..6635e2f464c2 100644 --- a/net-analyzer/dnstracer/dnstracer-1.10.ebuild +++ b/net-analyzer/dnstracer/dnstracer-1.10.ebuild @@ -1,24 +1,24 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 + inherit toolchain-funcs DESCRIPTION="Determines where a given nameserver gets its information from" HOMEPAGE="https://www.mavetju.org/unix/general.php" SRC_URI="https://www.mavetju.org/download/${P}.tar.bz2 -> ${P}.tar.gz" -LICENSE="BSD-2" +S="${WORKDIR}/${PN}" +LICENSE="BSD-2" SLOT="0" -KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux" +KEYWORDS="amd64 arm ~hppa ~ia64 ~ppc ppc64 ~s390 ~sparc x86 ~amd64-linux" + +BDEPEND="dev-lang/perl" -BDEPEND=" - dev-lang/perl -" PATCHES=( "${FILESDIR}"/${PN}-1.9-argv0.patch ) -S=${WORKDIR}/${PN} src_compile() { emake CC="$(tc-getCC) ${CFLAGS} ${LDFLAGS}" diff --git a/net-analyzer/dnstracer/dnstracer-1.9-r2.ebuild b/net-analyzer/dnstracer/dnstracer-1.9-r2.ebuild deleted file mode 100644 index 4de46fa1b6a1..000000000000 --- a/net-analyzer/dnstracer/dnstracer-1.9-r2.ebuild +++ /dev/null @@ -1,22 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -DESCRIPTION="Determines where a given nameserver gets its information from" -HOMEPAGE="http://www.mavetju.org/unix/general.php" -SRC_URI="http://www.mavetju.org/download/${P}.tar.gz" - -LICENSE="BSD-2" -SLOT="0" -KEYWORDS="amd64 arm ~hppa ~ia64 ~ppc ppc64 ~s390 ~sparc x86 ~amd64-linux" -IUSE="ipv6" - -DOCS=( CHANGES README ) -PATCHES=( - "${FILESDIR}"/${PN}-1.9-argv0.patch -) - -src_configure() { - econf $(use_enable ipv6) -} diff --git a/net-analyzer/dnstracer/metadata.xml b/net-analyzer/dnstracer/metadata.xml index 74c2baebb4ec..dce3f3be66c0 100644 --- a/net-analyzer/dnstracer/metadata.xml +++ b/net-analyzer/dnstracer/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>netmon@gentoo.org</email> diff --git a/net-analyzer/driftnet/driftnet-1.3.0.ebuild b/net-analyzer/driftnet/driftnet-1.3.0.ebuild index e286126f8a0c..3d2fa78cc783 100644 --- a/net-analyzer/driftnet/driftnet-1.3.0.ebuild +++ b/net-analyzer/driftnet/driftnet-1.3.0.ebuild @@ -1,8 +1,9 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -inherit autotools fcaps toolchain-funcs + +inherit autotools fcaps DESCRIPTION="Watches network traffic and displays media from TCP streams observed" HOMEPAGE="http://www.ex-parrot.com/~chris/driftnet/" @@ -37,6 +38,7 @@ DOCS=" PATCHES=( "${FILESDIR}"/${PN}-1.3.0-CFLAGS.patch "${FILESDIR}"/${PN}-1.3.0-gtk.patch + "${FILESDIR}"/${PN}-1.3.0-musl-stdint.patch ) src_prepare() { diff --git a/net-analyzer/driftnet/files/driftnet-0.1.6-giflib-5.patch b/net-analyzer/driftnet/files/driftnet-0.1.6-giflib-5.patch deleted file mode 100644 index 30ad62c38f47..000000000000 --- a/net-analyzer/driftnet/files/driftnet-0.1.6-giflib-5.patch +++ /dev/null @@ -1,50 +0,0 @@ ---- a/gif.c -+++ b/gif.c -@@ -20,7 +20,12 @@ - */ - int gif_load_hdr(img I) { - GifFileType *g; -+#if GIFLIB_MAJOR > 4 -+ int *GifError = NULL; -+ g = I->us = DGifOpenFileHandle(fileno(I->fp), GifError); -+#else - g = I->us = DGifOpenFileHandle(fileno(I->fp)); -+#endif /* GIFLIB_MAJOR */ - if (!I->us) { - I->err = IE_HDRFORMAT; - return 0; -@@ -36,7 +41,12 @@ - * Abort loading a GIF file after the header is done. - */ - int gif_abort_load(img I) { -+#if GIFLIB_MAJOR > 4 -+ int *GifError = NULL; -+ DGifCloseFile((GifFileType*)I->us, GifError); -+#else - DGifCloseFile((GifFileType*)I->us); -+#endif /* GIFLIB_MAJOR */ - return 1; - } - -@@ -44,6 +54,9 @@ - * Load GIF image. - */ - int gif_load_img(img I) { -+#if GIFLIB_MAJOR > 4 -+ int *GifError = NULL; -+#endif /* GIFLIB_MAJOR */ - GifFileType *g = I->us; - struct SavedImage *si; - int ret = 0; -@@ -114,7 +127,11 @@ - ret = 1; - fail: - -+#if GIFLIB_MAJOR > 4 -+ DGifCloseFile(g, GifError); -+#else - DGifCloseFile(g); -+#endif /* GIFLIB_MAJOR */ - - return ret; - } diff --git a/net-analyzer/driftnet/files/driftnet-1.3.0-musl-stdint.patch b/net-analyzer/driftnet/files/driftnet-1.3.0-musl-stdint.patch new file mode 100644 index 000000000000..7261bbc80e16 --- /dev/null +++ b/net-analyzer/driftnet/files/driftnet-1.3.0-musl-stdint.patch @@ -0,0 +1,113 @@ +https://bugs.gentoo.org/832419 +--- a/src/media/image.c ++++ b/src/media/image.c +@@ -11,6 +11,7 @@ + + #include <stdio.h> + #include <stdlib.h> /* On many systems (Darwin...), stdio.h is a prerequisite. */ ++#include <stdint.h> + #include <string.h> + + #include <netinet/in.h> /* ntohl */ +@@ -288,7 +289,7 @@ unsigned char *find_jpeg_image(const unsigned char *data, const size_t len, unsi + unsigned char *find_png_eoi(unsigned char *buffer, const size_t len) { + unsigned char *end_data, *data, chunk_code[PNG_CODE_LEN + 1]; + struct png_chunk chunk; +- u_int32_t datalen; ++ uint32_t datalen; + + /* Move past the PNG header */ + data = (buffer + PNG_SIG_LEN); +--- a/src/network/layer2.c ++++ b/src/network/layer2.c +@@ -12,6 +12,7 @@ + + #include "compat/compat.h" + ++#include <stdint.h> + #include <string.h> + + #ifdef __FreeBSD__ +@@ -39,7 +40,7 @@ + struct ethhdr { + unsigned char h_dest[ETH_ALEN]; + unsigned char h_source[ETH_ALEN]; +- u_int16_t h_proto; ++ uint16_t h_proto; + } __attribute__((packed)); + #endif + +@@ -55,20 +56,20 @@ struct ethhdr { + #endif + + struct ieee80211_radiotap_header { +- u_int8_t it_version; /* set to 0 */ +- u_int8_t it_pad; +- u_int16_t it_len; /* entire length */ +- u_int32_t it_present; /* fields present */ ++ uint8_t it_version; /* set to 0 */ ++ uint8_t it_pad; ++ uint16_t it_len; /* entire length */ ++ uint32_t it_present; /* fields present */ + }; + + struct ieee80211_frame { +- u_int16_t fc; +- u_int16_t wi_duration; +- u_int8_t wi_add1[6]; +- u_int8_t wi_add2[6]; +- u_int8_t wi_add3[6]; +- u_int16_t wi_sequenceControl; +- // u_int8_t wi_add4[6]; ++ uint16_t fc; ++ uint16_t wi_duration; ++ uint8_t wi_add1[6]; ++ uint8_t wi_add2[6]; ++ uint8_t wi_add3[6]; ++ uint16_t wi_sequenceControl; ++ // uint8_t wi_add4[6]; + //unsigned int qosControl:2; + //unsigned int frameBody[23124]; + }; +@@ -89,13 +90,13 @@ struct frame_control { + + /* SNAP LLC header format */ + struct snap_header { +- u_int8_t dsap; +- u_int8_t ssap; +- u_int8_t ctl; +- u_int8_t org1; +- u_int8_t org2; +- u_int8_t org3; +- u_int16_t ether_type; /* ethernet type */ ++ uint8_t dsap; ++ uint8_t ssap; ++ uint8_t ctl; ++ uint8_t org1; ++ uint8_t org2; ++ uint8_t org3; ++ uint16_t ether_type; /* ethernet type */ + }; + + /* +--- a/src/network/layer3.c ++++ b/src/network/layer3.c +@@ -12,6 +12,7 @@ + + #include "compat/compat.h" + ++#include <stdint.h> + #include <string.h> + #include <assert.h> + +@@ -30,8 +31,8 @@ + int layer3_find_tcp(const u_char *pkt, uint8_t nextproto, int * offset, + struct sockaddr * src, struct sockaddr * dst, struct tcphdr * tcp) + { +- u_int16_t *sport = NULL; +- u_int16_t *dport = NULL; ++ uint16_t *sport = NULL; ++ uint16_t *dport = NULL; + + while (1) { + switch (nextproto) { diff --git a/net-analyzer/driftnet/metadata.xml b/net-analyzer/driftnet/metadata.xml index 74c2baebb4ec..dce3f3be66c0 100644 --- a/net-analyzer/driftnet/metadata.xml +++ b/net-analyzer/driftnet/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>netmon@gentoo.org</email> diff --git a/net-analyzer/dsniff/Manifest b/net-analyzer/dsniff/Manifest new file mode 100644 index 000000000000..f299e852f03d --- /dev/null +++ b/net-analyzer/dsniff/Manifest @@ -0,0 +1,3 @@ +DIST dsniff_2.4b1+debian-30.debian.tar.xz 30788 BLAKE2B 8605b1dcca36f626f31410d88d25a57e6661b57b941155cdbde951991b09fb2dd7c147b1fdd1a22eded1cf904c890317b1844a7829cd6e43fd2fc5defc79b5f3 SHA512 45ffe34fcd30cd1461a354891b9d5567038cc176dbfa79c67020075cd40ae09b7092954925019e583d0d69cae76a558049b489745454a8034ce3e9e832c58f64 +DIST dsniff_2.4b1+debian-31.debian.tar.xz 30848 BLAKE2B 46bdfa08170fbfbba35fcc67340fc35352ef276dd5e8e00a540da39d28364c3198198eefeb6b85cb05e74d3785fc61c7e8e58d6ce37e0b62e6018e4842d938ad SHA512 da927bb887db6761a07dc2460bdeb834b386ccc5b8aa50ebce804ee130f89379268412cddd83ad64cc763e98e2f42a7efc23b7ca77db59445533272cb408088f +DIST dsniff_2.4b1+debian.orig.tar.gz 130220 BLAKE2B e6953a5bfc5331b030e1a5335987c51fa4cf2c644fc4e7ac9aefe17f52373a1f66ccef36c5d9136542f68a475350138b1f3e501bc9494a0fd4988c7c5a7b2eef SHA512 09c3a864f112f81b8fdf93436886b14eb8f603ec751b13f18cf027307f24098c018eacf98b3ae353731a0cf6f1c9cacfafbb534a0db8b9f0cc793e7515c41b5a diff --git a/net-analyzer/dsniff/dsniff-2.4_beta1_p30.ebuild b/net-analyzer/dsniff/dsniff-2.4_beta1_p30.ebuild new file mode 100644 index 000000000000..adb46e181081 --- /dev/null +++ b/net-analyzer/dsniff/dsniff-2.4_beta1_p30.ebuild @@ -0,0 +1,73 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit autotools toolchain-funcs + +MY_PV="${PV/_beta/b}" +MY_PV="${MY_PV/_p*/}" +MY_PV="$(ver_rs 1 '.' "${MY_PV}")" +# 2.4_beta1_p30 -> 2.4beta1-30 +MY_DEB_PV="$(ver_cut 1-2)$(ver_cut 3-4)-$(ver_cut 6)" + +DESCRIPTION="A collection of tools for network auditing and penetration testing" +HOMEPAGE="https://monkey.org/~dugsong/dsniff/" +SRC_URI="mirror://debian/pool/main/${PN::1}/${PN}/${PN}_${MY_PV}+debian.orig.tar.gz + mirror://debian/pool/main/${PN::1}/${PN}/${PN}_${MY_PV}+debian-${PV/*_p}.debian.tar.xz" +S="${WORKDIR}/${P/_beta1*/}" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64" +IUSE="X" + +# There's a berkdb configure option but we get a build failure if +# we try to disable it. Not clear how useful the package is +# without it anyway. +RDEPEND="net-libs/libpcap + >=net-libs/libnet-1.1.2.1-r1 + >=net-libs/libnids-1.21 + net-libs/libnsl:= + net-libs/libtirpc:= + dev-libs/openssl:= + >=sys-libs/db-4:= + X? ( x11-libs/libXmu )" +DEPEND="${DEPEND} + net-libs/rpcsvc-proto" +# Calls rpcgen during build +BDEPEND="net-libs/rpcsvc-proto" + +PATCHES=( + "${WORKDIR}"/debian/patches/ + "${FILESDIR}"/${PN}-2.4_beta1_p30-httppostfix.patch + "${FILESDIR}"/${PN}-2.4_beta1_p30-libdir-configure.patch + "${FILESDIR}"/${PN}-2.4_beta1_p30-respect-AR.patch +) + +src_prepare() { + default + + mv configure.{in,ac} || die + eautoreconf +} + +src_configure() { + tc-export AR + + econf \ + $(use_with X x) +} + +src_compile() { + emake CC="$(tc-getCC)" +} + +src_install() { + emake install install_prefix="${D}" + + dodir /etc/dsniff + cp "${ED}"/usr/share/dsniff/{dnsspoof.hosts,dsniff.{magic,services}} \ + "${ED}"/etc/dsniff/ || die + dodoc CHANGES README TODO +} diff --git a/net-analyzer/dsniff/dsniff-2.4_beta1_p31.ebuild b/net-analyzer/dsniff/dsniff-2.4_beta1_p31.ebuild new file mode 100644 index 000000000000..f7cbbc6b9514 --- /dev/null +++ b/net-analyzer/dsniff/dsniff-2.4_beta1_p31.ebuild @@ -0,0 +1,74 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit autotools toolchain-funcs + +MY_PV="${PV/_beta/b}" +MY_PV="${MY_PV/_p*/}" +MY_PV="$(ver_rs 1 '.' "${MY_PV}")" +# 2.4_beta1_p30 -> 2.4beta1-30 +MY_DEB_PV="$(ver_cut 1-2)$(ver_cut 3-4)-$(ver_cut 6)" + +DESCRIPTION="A collection of tools for network auditing and penetration testing" +HOMEPAGE="https://monkey.org/~dugsong/dsniff/" +SRC_URI="mirror://debian/pool/main/${PN::1}/${PN}/${PN}_${MY_PV}+debian.orig.tar.gz + mirror://debian/pool/main/${PN::1}/${PN}/${PN}_${MY_PV}+debian-${PV/*_p}.debian.tar.xz" +S="${WORKDIR}/${P/_beta1*/}" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64" +IUSE="X" + +# There's a berkdb configure option but we get a build failure if +# we try to disable it. Not clear how useful the package is +# without it anyway. +RDEPEND="net-libs/libpcap + >=net-libs/libnet-1.1.2.1-r1 + >=net-libs/libnids-1.21 + net-libs/libnsl:= + net-libs/libtirpc:= + dev-libs/openssl:= + >=sys-libs/db-4:= + X? ( x11-libs/libXmu )" +DEPEND="${DEPEND} + net-libs/rpcsvc-proto" +# Calls rpcgen during build +BDEPEND="net-libs/rpcsvc-proto" + +PATCHES=( + "${WORKDIR}"/debian/patches/ + "${FILESDIR}"/${PN}-2.4_beta1_p30-httppostfix.patch + "${FILESDIR}"/${PN}-2.4_beta1_p30-libdir-configure.patch + "${FILESDIR}"/${PN}-2.4_beta1_p30-respect-AR.patch + "${FILESDIR}"/${PN}-2.4_beta1_p31-c99-fixes.patch +) + +src_prepare() { + default + + mv configure.{in,ac} || die + eautoreconf +} + +src_configure() { + tc-export AR + + econf \ + $(use_with X x) +} + +src_compile() { + emake CC="$(tc-getCC)" +} + +src_install() { + emake install install_prefix="${D}" + + dodir /etc/dsniff + cp "${ED}"/usr/share/dsniff/{dnsspoof.hosts,dsniff.{magic,services}} \ + "${ED}"/etc/dsniff/ || die + dodoc CHANGES README TODO +} diff --git a/net-analyzer/dsniff/files/dsniff-2.4_beta1_p30-httppostfix.patch b/net-analyzer/dsniff/files/dsniff-2.4_beta1_p30-httppostfix.patch new file mode 100644 index 000000000000..487e45321662 --- /dev/null +++ b/net-analyzer/dsniff/files/dsniff-2.4_beta1_p30-httppostfix.patch @@ -0,0 +1,21 @@ +Allow mixed case in some fields. +--- a/decode_http.c ++++ b/decode_http.c +@@ -139,14 +139,14 @@ + host = p; + } + else if (req[0] == 'P') { +- if (strncmp(p, "Content-type: ", 14) == 0) { +- if (strncmp(p + 14, "application/" ++ if (strncasecmp(p, "Content-type: ", 14) == 0) { ++ if (strncasecmp(p + 14, "application/" + "x-www-form-urlencoded", + 33) != 0) { + query = NULL; + } + } +- else if (strncmp(p, "Content-length: ", 16) == 0) { ++ else if (strncasecmp(p, "Content-length: ", 16) == 0) { + p += 16; + i = atoi(p); + if ((msg = buf_tok(&inbuf, NULL, i)) == NULL) diff --git a/net-analyzer/dsniff/files/dsniff-2.4_beta1_p30-libdir-configure.patch b/net-analyzer/dsniff/files/dsniff-2.4_beta1_p30-libdir-configure.patch new file mode 100644 index 000000000000..a2309cd836e8 --- /dev/null +++ b/net-analyzer/dsniff/files/dsniff-2.4_beta1_p30-libdir-configure.patch @@ -0,0 +1,105 @@ +Respect libdir rather than always using 'lib'. +--- a/configure.in ++++ b/configure.in +@@ -127,13 +127,13 @@ AC_ARG_WITH(db, + if test -f ${dir}/include/db_185.h; then + AC_DEFINE(HAVE_DB_185_H) + DBINC="-I${dir}/include" +- DBLIB="-L${dir}/lib -ldb" ++ DBLIB="-L${dir}/${libdir#${prefix}} -ldb" + have_db=yes + break + elif test -f ${dir}/include/db.h; then + AC_DEFINE(HAVE_DB_H) + DBINC="-I${dir}/include" +- DBLIB="-L${dir}/lib -ldb" ++ DBLIB="-L${dir}/${libdir#${prefix}} -ldb" + have_db=yes + break + fi +@@ -178,11 +178,11 @@ AC_ARG_WITH(libpcap, + PCAPLIB="-L$withval -lpcap" + elif test -f $withval/include/pcap.h -a \ + -f $withval/include/net/bpf.h -a \ +- -f $withval/lib/libpcap.a; then ++ -f $withval/${libdir#${prefix}}/libpcap.a; then + owd=`pwd` + if cd $withval; then withval=`pwd`; cd $owd; fi + PCAPINC="-I$withval/include" +- PCAPLIB="-L$withval/lib -lpcap" ++ PCAPLIB="-L$withval/${libdir#${prefix}} -lpcap" + else + AC_ERROR(pcap.h, net/bpf.h, or libpcap.a not found in $withval) + fi +@@ -190,7 +190,7 @@ AC_ARG_WITH(libpcap, + esac ], + [ if test -f ${prefix}/include/pcap.h; then + PCAPINC="-I${prefix}/include" +- PCAPLIB="-L${prefix}/lib -lpcap" ++ PCAPLIB="-L${prefix}/${libdir#${prefix}} -lpcap" + elif test -f /usr/include/pcap/pcap.h; then + PCAPINC="-I/usr/include/pcap" + PCAPLIB="-lpcap" +@@ -226,7 +226,7 @@ AC_ARG_WITH(libnet, + CFLAGS="$CFLAGS `libnet-config --defines`" + fi + LNETINC="-I$withval/include" +- LNETLIB="-L$withval/lib -lnet" ++ LNETLIB="-L$withval/${libdir#${prefix}} -lnet" + else + AC_ERROR(libnet.h or libnet.a not found in $withval) + fi +@@ -235,7 +235,7 @@ AC_ARG_WITH(libnet, + [ if test -f ${prefix}/include/libnet.h; then + CFLAGS="$CFLAGS `${prefix}/bin/libnet-config --defines`" + LNETINC="-I${prefix}/include" +- LNETLIB="-L${prefix}/lib -lnet" ++ LNETLIB="-L${prefix}/${libdir#${prefix}} -lnet" + elif test -f /usr/include/libnet.h; then + CFLAGS="$CFLAGS `libnet-config --defines`" + LNETLIB="-lnet" +@@ -267,7 +267,7 @@ AC_ARG_WITH(libnids, + owd=`pwd` + if cd $withval; then withval=`pwd`; cd $owd; fi + NIDSINC="-I$withval/include" +- NIDSLIB="-L$withval/lib -lnids" ++ NIDSLIB="-L$withval/${libdir#${prefix}} -lnids" + else + AC_ERROR(nids.h or libnids.a not found in $withval) + fi +@@ -275,7 +275,7 @@ AC_ARG_WITH(libnids, + esac ], + [ if test -f ${prefix}/include/nids.h; then + NIDSINC="-I${prefix}/include" +- NIDSLIB="-L${prefix}/lib -lnids" ++ NIDSLIB="-L${prefix}/${libdir#${prefix}} -lnids" + elif test -f /usr/include/nids.h; then + NIDSLIB="-lnids" + else +@@ -309,11 +309,11 @@ AC_ARG_WITH(openssl, + SSLINC="-I$withval/include" + SSLLIB="-L$withval -lssl -lcrypto" + elif test -f $withval/include/openssl/ssl.h -a \ +- -f $withval/lib/libssl.a; then ++ -f $withval/${libdir#${prefix}}/libssl.a; then + owd=`pwd` + if cd $withval; then withval=`pwd`; cd $owd; fi + SSLINC="-I$withval/include" +- SSLLIB="-L$withval/lib -lssl -lcrypto" ++ SSLLIB="-L$withval/${libdir#${prefix}} -lssl -lcrypto" + else + AC_ERROR(ssl.h or libssl.a not found in $withval) + fi +@@ -322,10 +322,10 @@ AC_ARG_WITH(openssl, + esac ], + [ if test -f ${prefix}/include/openssl/ssl.h; then + SSLINC="-I${prefix}/include" +- SSLLIB="-L${prefix}/lib -lssl -lcrypto" ++ SSLLIB="-L${prefix}/${libdir#${prefix}} -lssl -lcrypto" + elif test -f ${prefix}/ssl/include/openssl/ssl.h; then + SSLINC="-I${prefix}/ssl/include" +- SSLLIB="-L${prefix}/ssl/lib -lssl -lcrypto" ++ SSLLIB="-L${prefix}/ssl/${libdir#${prefix}} -lssl -lcrypto" + elif test -f /usr/include/openssl/ssl.h; then + SSLLIB="-lssl -lcrypto" + else diff --git a/net-analyzer/dsniff/files/dsniff-2.4_beta1_p30-respect-AR.patch b/net-analyzer/dsniff/files/dsniff-2.4_beta1_p30-respect-AR.patch new file mode 100644 index 000000000000..fd2235fada7d --- /dev/null +++ b/net-analyzer/dsniff/files/dsniff-2.4_beta1_p30-respect-AR.patch @@ -0,0 +1,22 @@ +Respect the 'AR' environment variable. +--- a/Makefile.in ++++ b/Makefile.in +@@ -103,7 +103,7 @@ $(LIBOBJS): + $(CC) $(CFLAGS) $(CPPFLAGS) $(INCS) -c $(srcdir)/missing/$*.c + + libmissing.a: $(LIBOBJS) +- ar -cr $@ $(LIBOBJS) ++ $(AR) -cr $@ $(LIBOBJS) + $(RANLIB) $@ + + dsniff: $(HDRS) $(SRCS) $(OBJS) libmissing.a +--- a/configure.in ++++ b/configure.in +@@ -17,6 +17,7 @@ dnl Checks for programs. + AC_PROG_CC + AC_PROG_INSTALL + AC_PROG_RANLIB ++AC_CHECK_PROG(AR,ar,ar) + + dnl Checks for header files. + AC_PATH_XTRA diff --git a/net-analyzer/dsniff/files/dsniff-2.4_beta1_p31-c99-fixes.patch b/net-analyzer/dsniff/files/dsniff-2.4_beta1_p31-c99-fixes.patch new file mode 100644 index 000000000000..f77d21ea9510 --- /dev/null +++ b/net-analyzer/dsniff/files/dsniff-2.4_beta1_p31-c99-fixes.patch @@ -0,0 +1,36 @@ +# Gentoo bug: https://bugs.gentoo.org/919503 + +diff --git a/tcpkill.c b/tcpkill.c +index 1a64d40..de7ad00 100644 +--- a/tcpkill.c ++++ b/tcpkill.c +@@ -19,6 +19,7 @@ + #include <err.h> + #include <libnet.h> + #include <pcap.h> ++#include <inttypes.h> + + #include "pcaputil.h" + #include "version.h" +@@ -84,7 +85,7 @@ tcp_kill_cb(u_char *user, const struct pcap_pkthdr *pcap, const u_char *pkt) + if (libnet_write(l) < 0) + warn("write"); + +- fprintf(stderr, "%s R %lu:%lu(0) win 0\n", ctext, seq, seq); ++ fprintf(stderr, "%s R %"PRIu32":%"PRIu32"(0) win 0\n", ctext, seq, seq); + } + } + +diff --git a/urlsnarf.c b/urlsnarf.c +index f46ccf8..d57b9dd 100644 +--- a/urlsnarf.c ++++ b/urlsnarf.c +@@ -341,7 +341,7 @@ main(int argc, char *argv[]) + } + + struct pcap_pkthdr *h; +- u_char *d; ++ const u_char *d; + int rc; + while ((rc = pcap_next_ex(p, &h, &d)) == 1) { + tt = h->ts.tv_sec; diff --git a/net-analyzer/dsniff/metadata.xml b/net-analyzer/dsniff/metadata.xml new file mode 100644 index 000000000000..505675120273 --- /dev/null +++ b/net-analyzer/dsniff/metadata.xml @@ -0,0 +1,17 @@ +<?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> + dsniff is a collection of tools for network auditing and penetration testing. + dsniff, filesnarf, mailsnarf, msgsnarf, urlsnarf, and webspy passively monitor a + network for interesting data (passwords, e-mail, files, etc.). arpspoof, + dnsspoof, and macof facilitate the interception of network traffic normally + unavailable to an attacker (e.g, due to layer-2 switching). sshmitm and webmitm + implement active monkey-in-the-middle attacks against redirected SSH and HTTPS + sessions by exploiting weak bindings in ad-hoc PKI. + </longdescription> +</pkgmetadata> diff --git a/net-analyzer/echoping/echoping-6.0.2_p434-r4.ebuild b/net-analyzer/echoping/echoping-6.0.2_p434-r4.ebuild deleted file mode 100644 index 3557e9a751a7..000000000000 --- a/net-analyzer/echoping/echoping-6.0.2_p434-r4.ebuild +++ /dev/null @@ -1,65 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit autotools - -DESCRIPTION="Small program to test performances of remote servers" -HOMEPAGE="http://echoping.sourceforge.net/" -SRC_URI="https://dev.gentoo.org/~jer/${P}.tar.gz" -LICENSE="GPL-2" - -SLOT="0" -KEYWORDS="amd64 ~hppa x86" -IUSE="libressl gnutls http icp idn priority smtp ssl tos postgres ldap" -RESTRICT="test" - -RDEPEND=" - idn? ( net-dns/libidn ) - ldap? ( net-nds/openldap ) - postgres? ( dev-db/postgresql:* ) - ssl? ( - gnutls? ( >=net-libs/gnutls-3.3:= ) - !gnutls? ( - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) - ) - ) -" -DEPEND=" - ${RDEPEND} - >=sys-devel/libtool-2 -" - -REQUIRED_USE="gnutls? ( ssl )" -DOCS=( AUTHORS ChangeLog DETAILS NEWS README TODO ) -PATCHES=( - "${FILESDIR}"/${PN}-6.0.2_p434-fix_implicit_declarations.patch - "${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 -) - -src_prepare() { - default - eautoreconf -} - -src_configure() { - econf \ - $(use_enable http) \ - $(use_enable icp) \ - $(use_enable priority) \ - $(use_enable smtp) \ - $(use_enable tos) \ - $(use_with idn libidn) \ - $(usex gnutls $(use_with gnutls) $(use_with ssl)) \ - --config-cache \ - --disable-static \ - --disable-ttcp -} - -src_install() { - default - find "${ED}" -name '*.la' -delete || die -} diff --git a/net-analyzer/echoping/echoping-6.0.2_p434-r5.ebuild b/net-analyzer/echoping/echoping-6.0.2_p434-r5.ebuild new file mode 100644 index 000000000000..a1b34e731c1b --- /dev/null +++ b/net-analyzer/echoping/echoping-6.0.2_p434-r5.ebuild @@ -0,0 +1,65 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +inherit autotools + +DESCRIPTION="Small program to test performances of remote servers" +HOMEPAGE="https://framagit.org/bortzmeyer/echoping" +SRC_URI="https://dev.gentoo.org/~jsmolic/distfiles/${P}.tar.gz" +LICENSE="GPL-2" + +SLOT="0" +KEYWORDS="amd64 ~hppa x86" +IUSE="gnutls http icp idn priority smtp ssl tos postgres ldap" +RESTRICT="test" + +RDEPEND=" + idn? ( net-dns/libidn:= ) + ldap? ( net-nds/openldap:= ) + postgres? ( dev-db/postgresql:* ) + ssl? ( + gnutls? ( >=net-libs/gnutls-3.3:= ) + !gnutls? ( + dev-libs/openssl:0= + ) + ) +" +DEPEND=" + ${RDEPEND} + >=dev-build/libtool-2 +" + +REQUIRED_USE="gnutls? ( ssl )" +DOCS=( AUTHORS ChangeLog DETAILS NEWS README TODO ) +PATCHES=( + "${FILESDIR}"/${PN}-6.0.2_p434-fix_implicit_declarations.patch + "${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() { + default + eautoreconf +} + +src_configure() { + econf \ + $(use_enable http) \ + $(use_enable icp) \ + $(use_enable priority) \ + $(use_enable smtp) \ + $(use_enable tos) \ + $(use_with idn libidn) \ + $(usex gnutls $(use_with gnutls) $(use_with ssl)) \ + --config-cache \ + --disable-static \ + --disable-ttcp +} + +src_install() { + default + find "${ED}" -name '*.la' -delete || die +} 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 723d8a307977..78a65a684593 100644 --- a/net-analyzer/echoping/metadata.xml +++ b/net-analyzer/echoping/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>netmon@gentoo.org</email> @@ -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/egressor/Manifest b/net-analyzer/egressor/Manifest deleted file mode 100644 index 09b734e121f1..000000000000 --- a/net-analyzer/egressor/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST egressor_release1.0.tar.gz 28746 BLAKE2B 224ffd1fb56d9088a66367bbd88ecaab83c2316b2614a2b5211e03c4ff07683f8584c46d6ab7f0b26cbcb87a3321d0d3789a22cfee994aca3df8c488c9a297e5 SHA512 dfb1ee553ccfb92429fe68df06db031e5cbca41fe4fda36961ba8121d79de03a7dc36febc5a58561c3de9b1412cc90811f5ddc8b156aab8282b0dc3c14cd7aec diff --git a/net-analyzer/egressor/egressor-1.0-r2.ebuild b/net-analyzer/egressor/egressor-1.0-r2.ebuild deleted file mode 100644 index 528e269b5891..000000000000 --- a/net-analyzer/egressor/egressor-1.0-r2.ebuild +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit eutils toolchain-funcs - -DESCRIPTION="tool for checking router configuration" -HOMEPAGE="http://packetfactory.openwall.net/projects/egressor/" -SRC_URI="http://packetfactory.openwall.net/projects/egressor/${PN}_release${PV}.tar.gz" - -LICENSE="egressor" -SLOT="0" -KEYWORDS="amd64 ppc x86" - -DEPEND="<net-libs/libnet-1.1 - >=net-libs/libnet-1.0.2a-r3" -RDEPEND="net-libs/libpcap - dev-perl/Net-RawIP - dev-lang/perl" - -S=${WORKDIR} - -src_prepare() { - epatch \ - "${FILESDIR}"/${PV}-libnet-1.0.patch \ - "${FILESDIR}"/${PV}-flags.patch -} - -src_compile() { - tc-export CC - emake -C client -} - -src_install() { - dobin client/egressor server/egressor_server.pl - dodoc README client/README-CLIENT server/README-SERVER -} diff --git a/net-analyzer/egressor/files/1.0-flags.patch b/net-analyzer/egressor/files/1.0-flags.patch deleted file mode 100644 index 03368b05dbaa..000000000000 --- a/net-analyzer/egressor/files/1.0-flags.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- a/client/Makefile -+++ b/client/Makefile -@@ -5,8 +5,8 @@ - #---------------------------------------------------------------------- - - --CC = gcc --CFLAGS = -O3 -funroll-loops -fomit-frame-pointer -Wall -DMD=5 -+CC ?= gcc -+CFLAGS += -Wall -DMD=5 - #CFLAGS2 = -O -DMD=5 - OBJECTS = egressor.o md5c.o \ - -@@ -21,7 +21,7 @@ - - - egressor: egressor.o md5c.o -- $(CC) egressor.o $(LIBS) -o ./egressor -+ $(CC) $(CFLAGS) $(LDFLAGS) egressor.o $(LIBS) -o ./egressor - - md5c.o: global.h md5.h - $(CC) -c $(CFLAGS) md5c.c diff --git a/net-analyzer/egressor/files/1.0-libnet-1.0.patch b/net-analyzer/egressor/files/1.0-libnet-1.0.patch deleted file mode 100644 index be7cb4f15c6f..000000000000 --- a/net-analyzer/egressor/files/1.0-libnet-1.0.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/client/Makefile -+++ b/client/Makefile -@@ -15 +15 @@ --LIBS = -L../../lib/ -lnet -+LIBS = -L../../lib/ -lnet-1.0 ---- a/client/libnet_test.h -+++ b/client/libnet_test.h -@@ -36 +36 @@ --#include <libnet.h> -+#include <libnet-1.0.h> diff --git a/net-analyzer/egressor/metadata.xml b/net-analyzer/egressor/metadata.xml deleted file mode 100644 index 74c2baebb4ec..000000000000 --- a/net-analyzer/egressor/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://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/etherape/Manifest b/net-analyzer/etherape/Manifest index efc2f9ca72a3..d579f7fa8695 100644 --- a/net-analyzer/etherape/Manifest +++ b/net-analyzer/etherape/Manifest @@ -1 +1 @@ -DIST etherape-0.9.19.tar.gz 1452435 BLAKE2B d80d0d0eceeff67890d6a992551a136bfdcd3de005468d7d09eccc94ddf472209738c29d06a321116c90da1a31be0349f80dbee73d3297eae3e02588afea4e94 SHA512 3819c36a6ea5b1ec6fc675563ab0264d180824343344bf4f2da834db39547b721c1565b6edb882d55ce4e0ca93e4b34e3a544996a988584aaf7fe8b8d5ca265e +DIST etherape-0.9.20.tar.gz 1480790 BLAKE2B 22682d1b7b72206519d0ad32855f558a718bed83674753fcc923419845ac8b97ce970c1121f49eac9b910e10675b5397e5d3a16701af5bc9b78187baee455ccf SHA512 1dbfbb0efff7871a4b78ca90f81ac2155b57ace217b72e443cdc8b3d3807f7ab881c876bec12d93673500026a9dbf1111417a419891df62230e664af9b54b636 diff --git a/net-analyzer/etherape/etherape-0.9.19.ebuild b/net-analyzer/etherape/etherape-0.9.19.ebuild deleted file mode 100644 index 721766aba287..000000000000 --- a/net-analyzer/etherape/etherape-0.9.19.ebuild +++ /dev/null @@ -1,26 +0,0 @@ -# Copyright 1999-2020 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" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ~arm64 ppc ppc64 sparc x86" - -RDEPEND=" - dev-libs/glib:2 - dev-libs/popt - net-libs/libpcap - x11-libs/goocanvas:2.0 -" -DEPEND=" - ${RDEPEND} - >=sys-devel/gettext-0.11.5 - app-text/docbook-xml-dtd:4.1.2 - app-text/yelp-tools - virtual/pkgconfig -" diff --git a/net-analyzer/etherape/etherape-0.9.20.ebuild b/net-analyzer/etherape/etherape-0.9.20.ebuild new file mode 100644 index 000000000000..e1b4495473b6 --- /dev/null +++ b/net-analyzer/etherape/etherape-0.9.20.ebuild @@ -0,0 +1,26 @@ +# Copyright 1999-2021 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" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64 ~arm64 ppc ppc64 sparc x86" + +RDEPEND=" + dev-libs/glib:2 + dev-libs/popt + net-libs/libpcap + x11-libs/goocanvas:2.0 +" +DEPEND="${RDEPEND}" +BDEPEND=" + app-text/docbook-xml-dtd:4.1.2 + app-text/yelp-tools + >=sys-devel/gettext-0.11.5 + virtual/pkgconfig +" diff --git a/net-analyzer/etherape/metadata.xml b/net-analyzer/etherape/metadata.xml index 81f2ca0b0fae..9c45f653502a 100644 --- a/net-analyzer/etherape/metadata.xml +++ b/net-analyzer/etherape/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>netmon@gentoo.org</email> diff --git a/net-analyzer/ethloop/ethloop-10-r4.ebuild b/net-analyzer/ethloop/ethloop-10-r4.ebuild index 17108d444276..dc5653f727a8 100644 --- a/net-analyzer/ethloop/ethloop-10-r4.ebuild +++ b/net-analyzer/ethloop/ethloop-10-r4.ebuild @@ -1,25 +1,26 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 + inherit toolchain-funcs DESCRIPTION="Local simulator for testing Linux QoS disciplines" HOMEPAGE="http://luxik.cdi.cz/~devik/qos/ethloop/" SRC_URI="http://luxik.cdi.cz/~devik/qos/${PN}/${PN}${PV}.tgz" +S="${WORKDIR}"/${PN} LICENSE="all-rights-reserved" SLOT="0" KEYWORDS="~amd64 ~ppc x86" RESTRICT="mirror bindist" -S=${WORKDIR}/${PN} PATCHES=( "${FILESDIR}"/${P}-misc.patch ) src_compile() { - emake CC=$(tc-getCC) CFLAGS="${CFLAGS}" + emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" } src_install() { diff --git a/net-analyzer/ethloop/metadata.xml b/net-analyzer/ethloop/metadata.xml index 74c2baebb4ec..dce3f3be66c0 100644 --- a/net-analyzer/ethloop/metadata.xml +++ b/net-analyzer/ethloop/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>netmon@gentoo.org</email> diff --git a/net-analyzer/ettercap/ettercap-0.8.3.1-r3.ebuild b/net-analyzer/ettercap/ettercap-0.8.3.1-r3.ebuild new file mode 100644 index 000000000000..2474d2cd615a --- /dev/null +++ b/net-analyzer/ettercap/ettercap-0.8.3.1-r3.ebuild @@ -0,0 +1,87 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake + +DESCRIPTION="Suite for man in the middle attacks" +HOMEPAGE="https://github.com/Ettercap/ettercap" + +LICENSE="GPL-2+" +SLOT="0" + +if [[ ${PV} == 9999 ]] ; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/Ettercap/${PN}.git" +else + SRC_URI="https://github.com/Ettercap/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~alpha amd64 arm ppc ppc64 sparc x86" +fi + +IUSE="doc geoip gtk ipv6 ncurses +plugins test" +RESTRICT="!test? ( test )" + +RDEPEND=" + dev-libs/libbsd + dev-libs/libpcre + dev-libs/openssl:= + net-libs/libnet:1.1 + >=net-libs/libpcap-0.8.1 + sys-libs/zlib + geoip? ( dev-libs/geoip ) + gtk? ( + >=app-accessibility/at-spi2-core-2.46.0 + >=dev-libs/glib-2.2.2:2 + media-libs/freetype + x11-libs/cairo + x11-libs/gdk-pixbuf:2 + >=x11-libs/gtk+-2.2.2:2 + >=x11-libs/pango-1.2.3 + ) + ncurses? ( >=sys-libs/ncurses-5.3:= ) + plugins? ( >=net-misc/curl-7.26.0 ) +" +DEPEND=" + app-alternatives/yacc + app-alternatives/lex +" +BDEPEND=" + doc? ( + app-text/ghostscript-gpl + sys-apps/groff + ) + test? ( dev-libs/check ) +" + +PATCHES=( + "${FILESDIR}"/${P}-curl-8.patch + "${FILESDIR}"/${P}-libressl.patch #903001, 736990 + "${FILESDIR}"/${P}-musl.patch #897820 +) + +src_prepare() { + sed -i "s:Release:Release Gentoo:" CMakeLists.txt || die + cmake_src_prepare +} + +src_configure() { + local mycmakeargs=( + -DENABLE_CURSES="$(usex ncurses)" + -DENABLE_GTK="$(usex gtk)" + -DENABLE_PLUGINS="$(usex plugins)" + -DENABLE_IPV6="$(usex ipv6)" + -DENABLE_TESTS="$(usex test)" + -DENABLE_PDF_DOCS="$(usex doc)" + -DENABLE_GEOIP="$(usex geoip)" + -DBUNDLED_LIBS=OFF + -DSYSTEM_LIBS=ON + -DINSTALL_SYSCONFDIR="${EPREFIX}"/etc + ) + + # right now we only support gtk2, but ettercap also supports gtk3 + # do we care? do we want to support both? + ! use gtk && mycmakeargs+=(-DINSTALL_DESKTOP=OFF) + + cmake_src_configure +} diff --git a/net-analyzer/ettercap/ettercap-0.8.3.1.ebuild b/net-analyzer/ettercap/ettercap-0.8.3.1.ebuild deleted file mode 100644 index 7d5c3ac6c11e..000000000000 --- a/net-analyzer/ettercap/ettercap-0.8.3.1.ebuild +++ /dev/null @@ -1,76 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake - -DESCRIPTION="A suite for man in the middle attacks" -HOMEPAGE="https://github.com/Ettercap/ettercap" - -LICENSE="GPL-2+" -SLOT="0" - -if [[ ${PV} == "9999" ]] ; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/Ettercap/${PN}.git" -else - SRC_URI="https://github.com/Ettercap/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~alpha amd64 arm ppc ppc64 sparc x86" -fi - -IUSE="doc geoip gtk ipv6 libressl ncurses +plugins test" -RESTRICT="!test? ( test )" - -RDEPEND="dev-libs/libbsd - dev-libs/libpcre - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) - net-libs/libnet:1.1 - >=net-libs/libpcap-0.8.1 - sys-libs/zlib - geoip? ( dev-libs/geoip ) - gtk? ( - >=dev-libs/atk-1.2.4 - >=dev-libs/glib-2.2.2:2 - media-libs/freetype - x11-libs/cairo - x11-libs/gdk-pixbuf:2 - >=x11-libs/gtk+-2.2.2:2 - >=x11-libs/pango-1.2.3 - ) - ncurses? ( >=sys-libs/ncurses-5.3:= ) - plugins? ( >=net-misc/curl-7.26.0 )" -DEPEND="${RDEPEND} - doc? ( app-text/ghostscript-gpl - sys-apps/groff ) - test? ( dev-libs/check ) - sys-devel/flex - virtual/yacc" - -PATCHES=( "${FILESDIR}"/${P}-libressl.patch ) - -src_prepare() { - sed -i "s:Release:Release Gentoo:" CMakeLists.txt || die - cmake_src_prepare -} - -src_configure() { - local mycmakeargs=( - -DENABLE_CURSES="$(usex ncurses)" - -DENABLE_GTK="$(usex gtk)" - -DENABLE_PLUGINS="$(usex plugins)" - -DENABLE_IPV6="$(usex ipv6)" - -DENABLE_TESTS="$(usex test)" - -DENABLE_PDF_DOCS="$(usex doc)" - -DENABLE_GEOIP="$(usex geoip)" - -DBUNDLED_LIBS=OFF - -DSYSTEM_LIBS=ON - -DINSTALL_SYSCONFDIR="${EPREFIX}"/etc - ) - - ! use gtk && mycmakeargs+=(-DINSTALL_DESKTOP=OFF) - #right now we only support gtk2, but ettercap also supports gtk3 - #do we care? do we want to support both? - cmake_src_configure -} diff --git a/net-analyzer/ettercap/ettercap-9999.ebuild b/net-analyzer/ettercap/ettercap-9999.ebuild index f6f494b3507f..2b82d1fd180f 100644 --- a/net-analyzer/ettercap/ettercap-9999.ebuild +++ b/net-analyzer/ettercap/ettercap-9999.ebuild @@ -1,37 +1,37 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit cmake -DESCRIPTION="A suite for man in the middle attacks" +DESCRIPTION="Suite for man in the middle attacks" HOMEPAGE="https://github.com/Ettercap/ettercap" LICENSE="GPL-2+" SLOT="0" -if [[ ${PV} == "9999" ]] ; then +if [[ ${PV} == 9999 ]] ; then inherit git-r3 EGIT_REPO_URI="https://github.com/Ettercap/${PN}.git" else SRC_URI="https://github.com/Ettercap/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86" + KEYWORDS="~alpha amd64 arm ppc ppc64 sparc x86" fi -IUSE="doc geoip gtk ipv6 libressl ncurses +plugins test" +IUSE="doc geoip gtk ipv6 ncurses +plugins test" RESTRICT="!test? ( test )" -RDEPEND="dev-libs/libbsd - dev-libs/libpcre - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) +RDEPEND=" + dev-libs/libbsd + dev-libs/libpcre2 + dev-libs/openssl:= net-libs/libnet:1.1 >=net-libs/libpcap-0.8.1 sys-libs/zlib geoip? ( dev-libs/geoip ) gtk? ( - >=dev-libs/atk-1.2.4 + >=app-accessibility/at-spi2-core-2.46.0 >=dev-libs/glib-2.2.2:2 media-libs/freetype x11-libs/cairo @@ -40,13 +40,19 @@ RDEPEND="dev-libs/libbsd >=x11-libs/pango-1.2.3 ) ncurses? ( >=sys-libs/ncurses-5.3:= ) - plugins? ( >=net-misc/curl-7.26.0 )" -DEPEND="${RDEPEND} - doc? ( app-text/ghostscript-gpl - sys-apps/groff ) + plugins? ( >=net-misc/curl-7.26.0 ) +" +DEPEND=" + app-alternatives/yacc + app-alternatives/lex +" +BDEPEND=" + doc? ( + app-text/ghostscript-gpl + sys-apps/groff + ) test? ( dev-libs/check ) - sys-devel/flex - virtual/yacc" +" src_prepare() { sed -i "s:Release:Release Gentoo:" CMakeLists.txt || die @@ -67,8 +73,9 @@ src_configure() { -DINSTALL_SYSCONFDIR="${EPREFIX}"/etc ) + # right now we only support gtk2, but ettercap also supports gtk3 + # do we care? do we want to support both? ! use gtk && mycmakeargs+=(-DINSTALL_DESKTOP=OFF) - #right now we only support gtk2, but ettercap also supports gtk3 - #do we care? do we want to support both? + cmake_src_configure } diff --git a/net-analyzer/ettercap/files/ettercap-0.8.3.1-curl-8.patch b/net-analyzer/ettercap/files/ettercap-0.8.3.1-curl-8.patch new file mode 100644 index 000000000000..e1c2259733c2 --- /dev/null +++ b/net-analyzer/ettercap/files/ettercap-0.8.3.1-curl-8.patch @@ -0,0 +1,32 @@ +https://bugs.gentoo.org/902987 +https://github.com/Ettercap/ettercap/commit/40534662043b7d831d1f6c70448afa9d374a9b63 + +From 40534662043b7d831d1f6c70448afa9d374a9b63 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Thu, 23 Mar 2023 10:23:14 -0700 +Subject: [PATCH] sslstrip: Enhance the libcurl version check to consider + version 8+ + +Lately curl has released version 8 and hence LIBCURL_VERSION_MAJOR is +reset to 0, current check assumes major version to be 7 at max and hence +on systems with libcurl 8+ this check breaks and build fails + +Fixes + +TOPDIR/build/tmp/work/cortexa15t2hf-neon-yoe-linux-gnueabi/ettercap/0.8.3.1-r0/git/plug-ins/sslstrip/sslstrip.c:57:2: error: libcurl 7.26.0 or up is needed + ^ +1 error generated. + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- a/plug-ins/sslstrip/sslstrip.c ++++ b/plug-ins/sslstrip/sslstrip.c +@@ -51,7 +51,7 @@ + + #include <curl/curl.h> + +-#if (LIBCURL_VERSION_MAJOR < 7) || (LIBCURL_VERSION_MINOR < 26) ++#if (LIBCURL_VERSION_MAJOR < 7) || (LIBCURL_VERSION_MAJOR == 7 && LIBCURL_VERSION_MINOR < 26) + #error libcurl 7.26.0 or up is needed + #endif + + diff --git a/net-analyzer/ettercap/files/ettercap-0.8.3.1-libressl.patch b/net-analyzer/ettercap/files/ettercap-0.8.3.1-libressl.patch index ed5a49ce4361..a56e75c88b75 100644 --- a/net-analyzer/ettercap/files/ettercap-0.8.3.1-libressl.patch +++ b/net-analyzer/ettercap/files/ettercap-0.8.3.1-libressl.patch @@ -1,3 +1,8 @@ +https://bugs.gentoo.org/903001 +https://bugs.gentoo.org/736990 +https://github.com/Ettercap/ettercap/pull/1069 +https://github.com/Ettercap/ettercap/commit/b2fc8e959dc71fdbaba08aecb1f157c914490a07 + From b2f7634c9dbc0ef68640f0571787d92300e9f9f9 Mon Sep 17 00:00:00 2001 From: Stefan Strogin <stefan@steils.org> Date: Sat, 15 Aug 2020 07:18:31 +0300 @@ -7,15 +12,12 @@ Disable taking over SNI extension from ClientHello and SSL configuration operations until LibreSSL supports the required API. Fixes: https://github.com/Ettercap/ettercap/issues/1068 -Upstream-Status: Submitted -[https://github.com/Ettercap/ettercap/pull/1069] -Signed-off-by: Stefan Strogin <steils@gentoo.org> --- src/ec_sslwrap.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/ec_sslwrap.c b/src/ec_sslwrap.c -index b9f26a14..1e4c24fc 100644 +index b9f26a142..1e4c24fc1 100644 --- a/src/ec_sslwrap.c +++ b/src/ec_sslwrap.c @@ -71,11 +71,11 @@ @@ -32,6 +34,3 @@ index b9f26a14..1e4c24fc 100644 #define HAVE_OPENSSL_1_1_1 #endif --- -2.28.0 - diff --git a/net-analyzer/ettercap/files/ettercap-0.8.3.1-musl.patch b/net-analyzer/ettercap/files/ettercap-0.8.3.1-musl.patch new file mode 100644 index 000000000000..516823ec6972 --- /dev/null +++ b/net-analyzer/ettercap/files/ettercap-0.8.3.1-musl.patch @@ -0,0 +1,39 @@ +Upsream-PR: https://github.com/Ettercap/ettercap/pull/1220 +Uptream-Commit: https://github.com/Ettercap/ettercap/commit/f03a1174ffccf9343423498fa3c65bd9090d4ce0 +Bug: https://bugs.gentoo.org/897820 + +From 3ef51159d4e2cea97accb87af08943333fbefb04 Mon Sep 17 00:00:00 2001 +From: Gianfranco Costamagna <costamagnagianfranco@yahoo.it> +Date: Fri, 3 Mar 2023 21:27:14 +0100 +Subject: [PATCH] Define _GNU_SOURCE to make sure memmem is found when musl + library is used. This fixes issue: #1219 + +Thanks Sam James for the suggestion! +--- + include/ec.h | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/include/ec.h b/include/ec.h +index fbf048111..561062c2f 100644 +--- a/include/ec.h ++++ b/include/ec.h +@@ -21,6 +21,9 @@ + #if !defined (__USE_GNU) /* for memmem(), strsignal(), etc etc... */ + #define __USE_GNU + #endif ++#if !defined (_GNU_SOURCE) /* for memmem(), strsignal(), etc etc... on musl */ ++ #define _GNU_SOURCE ++#endif + #ifdef OS_SOLARIS + #define _REENTRANT /* for strtok_r() */ + #endif +@@ -28,6 +31,9 @@ + #if defined (__USE_GNU) + #undef __USE_GNU + #endif ++#if defined (_GNU_SOURCE) ++ #undef _GNU_SOURCE ++#endif + #include <strings.h> + #include <unistd.h> + #include <time.h> diff --git a/net-analyzer/ettercap/metadata.xml b/net-analyzer/ettercap/metadata.xml index a98ad417c5f9..6a049198d589 100644 --- a/net-analyzer/ettercap/metadata.xml +++ b/net-analyzer/ettercap/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> <email>zerochaos@gentoo.org</email> diff --git a/net-analyzer/fail2ban/Manifest b/net-analyzer/fail2ban/Manifest index 544366b395d0..ab84e5639461 100644 --- a/net-analyzer/fail2ban/Manifest +++ b/net-analyzer/fail2ban/Manifest @@ -1 +1 @@ -DIST fail2ban-0.11.2.tar.gz 559552 BLAKE2B 0c61c1d5f6eb23d585533fbb84e69343cb305df188537a97002489318292c6056447c4c221c9d4d4cde6cca52f0c2fb877b597957f703e4d6707801a646e52b0 SHA512 46b27abd947b00ea64106dbac563ef8afef38eec86684024d47d9a0e8c1969ff864ad6df7f4f8de2aa3eb1af6d769fb6796592d9f0e35521d5f95f17b8cade97 +DIST fail2ban-1.0.2.tar.gz 583295 BLAKE2B 84eb5e3487c4db734f4f0a36af142d520e1cc53c2960893ee2f05ff4e78133860be59ed9580fa0d972509a03c17e5d9458b8e3f6b470a4c3154f10911f94691e SHA512 688a84361b5794e1658f53d2d200ce752fe1e3320ddb1742c32c4b4b82a79ace16ae464e7ea3eeb94a0e862bcac73c2d3a0e61dd7b28e179a4c857f950d74dbb diff --git a/net-analyzer/fail2ban/fail2ban-0.11.2.ebuild b/net-analyzer/fail2ban/fail2ban-0.11.2.ebuild deleted file mode 100644 index ebb59e058f0b..000000000000 --- a/net-analyzer/fail2ban/fail2ban-0.11.2.ebuild +++ /dev/null @@ -1,111 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{6,7,8,9} ) -DISTUTILS_SINGLE_IMPL=1 - -inherit bash-completion-r1 distutils-r1 systemd - -DESCRIPTION="scans log files and bans IPs that show malicious signs" -HOMEPAGE="https://www.fail2ban.org/" -SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 arm ~arm64 hppa ppc ppc64 sparc x86" -IUSE="selinux systemd" -# Needs some work to enable them right now -RESTRICT="test" - -RDEPEND=" - virtual/logger - virtual/mta - selinux? ( sec-policy/selinux-fail2ban ) - systemd? ( $(python_gen_cond_dep '|| ( - dev-python/python-systemd[${PYTHON_MULTI_USEDEP}] - sys-apps/systemd[python(-),${PYTHON_MULTI_USEDEP}] - )' 'python*' ) ) -" - -DOCS=( ChangeLog DEVELOP README.md THANKS TODO doc/run-rootless.txt ) - -python_prepare_all() { - default - - # 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 - - sed -i -e 's|runscript|openrc-run|g' files/gentoo-initd || die - - distutils-r1_python_prepare_all -} - -python_compile() { - ./fail2ban-2to3 || die - distutils-r1_python_compile -} - -python_install_all() { - distutils-r1_python_install_all - - rm -rf "${D}"/usr/share/doc/${PN} "${D}"/run || die - - # not FILESDIR - newconfd files/gentoo-confd ${PN} - newinitd files/gentoo-initd ${PN} - sed -e "s:@BINDIR@:${EPREFIX}/usr/bin:g" files/${PN}.service.in > "${T}/${PN}.service" || die - systemd_dounit "${T}/${PN}.service" - systemd_dotmpfilesd 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() { - 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 && ! has_version app-admin/gamin; then - elog "For most jail.conf configurations, it is recommended you install either" - elog "dev-python/pyinotify or app-admin/gamin (in order of preference)" - elog "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 - - if has_version sys-apps/systemd[-python]; then - elog "If you want to track logins through sys-apps/systemd's" - elog "journal backend, then reinstall sys-apps/systemd with USE=python" - fi -} diff --git a/net-analyzer/fail2ban/fail2ban-1.0.2-r2.ebuild b/net-analyzer/fail2ban/fail2ban-1.0.2-r2.ebuild new file mode 100644 index 000000000000..2a67b21bda7b --- /dev/null +++ b/net-analyzer/fail2ban/fail2ban-1.0.2-r2.ebuild @@ -0,0 +1,129 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISTUTILS_SINGLE_IMPL=1 +PYTHON_COMPAT=( python3_{10..11} ) + +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 hppa ~loong ppc ppc64 ~riscv sparc x86" +fi + +LICENSE="GPL-2" +SLOT="0" +IUSE="selinux systemd" + +RDEPEND=" + virtual/logger + virtual/mta + selinux? ( sec-policy/selinux-fail2ban ) + systemd? ( + $(python_gen_cond_dep ' + dev-python/python-systemd[${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}"/${P}-configreader-warning.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_compile() { + ./fail2ban-2to3 || die + distutils-r1_python_compile +} + +python_test() { + # Skip testRepairDb for bug #907348 (didn't always fail..) + bin/fail2ban-testcases \ + --no-network \ + --no-gamin \ + --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.0.2-r3.ebuild b/net-analyzer/fail2ban/fail2ban-1.0.2-r3.ebuild new file mode 100644 index 000000000000..f78595850988 --- /dev/null +++ b/net-analyzer/fail2ban/fail2ban-1.0.2-r3.ebuild @@ -0,0 +1,137 @@ +# 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" + +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}] + ') + ) +" + +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}"/${P}-configreader-warning.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 + + # 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() { + ./fail2ban-2to3 || die + distutils-r1_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 \ + --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 75cf1cc7136f..f9f5b8721fff 100644 --- a/net-analyzer/fail2ban/fail2ban-9999.ebuild +++ b/net-analyzer/fail2ban/fail2ban-9999.ebuild @@ -1,64 +1,92 @@ -# 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 -PYTHON_COMPAT=( python3_{6,7,8,9} ) DISTUTILS_SINGLE_IMPL=1 +PYTHON_COMPAT=( python3_{10..12} ) -inherit bash-completion-r1 distutils-r1 git-r3 systemd +inherit bash-completion-r1 distutils-r1 systemd tmpfiles -DESCRIPTION="scans log files and bans IPs that show malicious signs" +DESCRIPTION="Scans log files and bans IPs that show malicious signs" HOMEPAGE="https://www.fail2ban.org/" -EGIT_REPO_URI="https://github.com/${PN}/${PN}" + +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="~amd64" +fi LICENSE="GPL-2" SLOT="0" -KEYWORDS="" -IUSE="selinux systemd" -# Needs some work to enable them right now -RESTRICT="test" +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_MULTI_USEDEP}] - sys-apps/systemd[python(-),${PYTHON_MULTI_USEDEP}] - )' 'python*' ) ) + 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() { - default + 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 - - sed -i -e 's|runscript|openrc-run|g' files/gentoo-initd || die - - distutils-r1_python_prepare_all } -python_compile() { - ./fail2ban-2to3 || die - distutils-r1_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 \ + --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 "${D}"/usr/share/doc/${PN} "${D}"/run || die + 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 - # not FILESDIR - newconfd files/gentoo-confd ${PN} - newinitd files/gentoo-initd ${PN} - sed -e "s:@BINDIR@:${EPREFIX}/usr/bin:g" files/${PN}.service.in > "${T}/${PN}.service" || die - systemd_dounit "${T}/${PN}.service" - systemd_dotmpfilesd files/${PN}-tmpfiles.conf doman man/*.{1,5} # Use INSTALL_MASK if you do not want to touch /etc/logrotate.d. @@ -78,34 +106,30 @@ pkg_preinst() { } pkg_postinst() { - if [[ $previous_less_than_0_7 = 0 ]] ; then + 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 "files before restarting Fail2Ban!" elog - elog "Fail2ban is not installed under /usr/lib anymore. The" + 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 && ! has_version app-admin/gamin; then - elog "For most jail.conf configurations, it is recommended you install either" - elog "dev-python/pyinotify or app-admin/gamin (in order of preference)" - elog "to control how log file modifications are detected" + 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 + 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 - - if has_version sys-apps/systemd[-python]; then - elog "If you want to track logins through sys-apps/systemd's" - elog "journal backend, then reinstall sys-apps/systemd with USE=python" - fi } diff --git a/net-analyzer/fail2ban/files/fail2ban-0.11.2-adjust-apache-logs-paths.patch b/net-analyzer/fail2ban/files/fail2ban-0.11.2-adjust-apache-logs-paths.patch new file mode 100644 index 000000000000..3017883f0d5a --- /dev/null +++ b/net-analyzer/fail2ban/files/fail2ban-0.11.2-adjust-apache-logs-paths.patch @@ -0,0 +1,29 @@ +From bda9b88e883207b99781352c68610980e23fa62f Mon Sep 17 00:00:00 2001 +From: Sam James <sam@gentoo.org> +Date: Wed, 11 Aug 2021 01:58:05 +0100 +Subject: [PATCH] Adjust Apache log paths for Gentoo + +Closes: https://bugs.gentoo.org/805485 +--- + config/paths-common.conf | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/config/paths-common.conf b/config/paths-common.conf +index 7383caf..4f4a6e1 100644 +--- a/config/paths-common.conf ++++ b/config/paths-common.conf +@@ -36,9 +36,9 @@ sshd_backend = %(default_backend)s + dropbear_log = %(syslog_authpriv)s + dropbear_backend = %(default_backend)s + +-apache_error_log = /var/log/apache2/*error.log ++apache_error_log = /var/log/apache2/*error_log + +-apache_access_log = /var/log/apache2/*access.log ++apache_access_log = /var/log/apache2/*access_log + + # from /etc/audit/auditd.conf + auditd_log = /var/log/audit/audit.log +-- +2.32.0 + diff --git a/net-analyzer/fail2ban/files/fail2ban-1.0.2-configreader-warning.patch b/net-analyzer/fail2ban/files/fail2ban-1.0.2-configreader-warning.patch new file mode 100644 index 000000000000..748e507e4a26 --- /dev/null +++ b/net-analyzer/fail2ban/files/fail2ban-1.0.2-configreader-warning.patch @@ -0,0 +1,19 @@ +https://github.com/fail2ban/fail2ban/commit/432e7e1 + +From 432e7e1e93936f09e349e80d94254e5f43d0cc8a Mon Sep 17 00:00:00 2001 +From: "Sergey G. Brester" <serg.brester@sebres.de> +Date: Mon, 28 Nov 2022 13:21:15 +0100 +Subject: [PATCH] no warning if no config value but default (debug message now) + +closes #3420 +--- a/fail2ban/client/configreader.py ++++ b/fail2ban/client/configreader.py +@@ -277,7 +277,7 @@ def getOptions(self, sec, options, pOptions=None, shouldExist=False, convert=Tru + # TODO: validate error handling here. + except NoOptionError: + if not optvalue is None: +- logSys.warning("'%s' not defined in '%s'. Using default one: %r" ++ logSys.debug("'%s' not defined in '%s'. Using default one: %r" + % (optname, sec, optvalue)) + values[optname] = optvalue + # elif logSys.getEffectiveLevel() <= logLevel: diff --git a/net-analyzer/fail2ban/files/fail2ban-1.0.2-umask-tests.patch b/net-analyzer/fail2ban/files/fail2ban-1.0.2-umask-tests.patch new file mode 100644 index 000000000000..8feca43412ec --- /dev/null +++ b/net-analyzer/fail2ban/files/fail2ban-1.0.2-umask-tests.patch @@ -0,0 +1,45 @@ +Avoid corrupting umask permanently in the testdir because of fail2ban/server/server.py::start. + +In particular: +* https://bugs.gentoo.org/659010#c11 +* https://bugs.gentoo.org/790251#c10 +* https://bugs.gentoo.org/907350 + +But see also the many dupes. +--- a/fail2ban/tests/fail2banclienttestcase.py ++++ b/fail2ban/tests/fail2banclienttestcase.py +@@ -23,6 +23,7 @@ __author__ = "Serg Brester" + __copyright__ = "Copyright (c) 2014- Serg G. Brester (sebres), 2008- Fail2Ban Contributors" + __license__ = "GPL" + ++import atexit + import fileinput + import os + import re +@@ -40,6 +41,14 @@ from ..client.fail2bancmdline import Fail2banCmdLine + from ..client.fail2banclient import exec_command_line as _exec_client, CSocket, VisualWait + from ..client.fail2banserver import Fail2banServer, exec_command_line as _exec_server + from .. import protocol ++ ++def current_umask(): ++ tmp = os.umask(0o022) ++ os.umask(tmp) ++ return tmp ++ ++old_umask = current_umask() ++ + from ..server import server + from ..server.mytime import MyTime + from ..server.utils import Utils +@@ -48,6 +57,11 @@ from .utils import LogCaptureTestCase, logSys as DefLogSys, with_tmpdir, shutil, + + from ..helpers import getLogger + ++def restore_umask(): ++ os.umask(old_umask) ++ ++atexit.register(restore_umask) ++ + # Gets the instance of the logger. + logSys = getLogger(__name__) + diff --git a/net-analyzer/fail2ban/metadata.xml b/net-analyzer/fail2ban/metadata.xml index cd908145eacc..12bbcacb9196 100644 --- a/net-analyzer/fail2ban/metadata.xml +++ b/net-analyzer/fail2ban/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> <email>sam@gentoo.org</email> diff --git a/net-analyzer/firewalk/metadata.xml b/net-analyzer/firewalk/metadata.xml index 74c2baebb4ec..dce3f3be66c0 100644 --- a/net-analyzer/firewalk/metadata.xml +++ b/net-analyzer/firewalk/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>netmon@gentoo.org</email> diff --git a/net-analyzer/flent/Manifest b/net-analyzer/flent/Manifest deleted file mode 100644 index 9b8f56346cb2..000000000000 --- a/net-analyzer/flent/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST flent-1.3.2.tar.gz 2977251 BLAKE2B 03b4f67ec5a9a83ceee40b1cda529aaaccc162012a8de702a5c0bc58e08ec62df80e60d901bd76d3bc4c2d9cde0310ad32fcfbe458fc2b2a9cb2bdc82e9ec704 SHA512 cda7e9fffffa0b6d6e723c18e175fc844d97b8cae0299c46cbbd5ca03bd09d39d9d92c7ee72e6bda5bc27d921090ba5be747eca7a64dd4ef1f889575c18973d6 diff --git a/net-analyzer/flent/flent-1.3.2.ebuild b/net-analyzer/flent/flent-1.3.2.ebuild deleted file mode 100644 index efc8e7382ee8..000000000000 --- a/net-analyzer/flent/flent-1.3.2.ebuild +++ /dev/null @@ -1,24 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python3_{6,7,8} ) - -inherit distutils-r1 xdg - -DESCRIPTION="The FLExible Network Tester" -HOMEPAGE="https://flent.org/" -SRC_URI="https://github.com/tohojo/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="+qt5 +plots" - -RDEPEND="qt5? ( dev-python/PyQt5[${PYTHON_USEDEP}] ) - plots? ( dev-python/matplotlib[${PYTHON_USEDEP}] ) - net-analyzer/netperf[demo] - net-misc/iperf - net-analyzer/fping" -DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]" diff --git a/net-analyzer/flent/metadata.xml b/net-analyzer/flent/metadata.xml deleted file mode 100644 index d33bba3bd96b..000000000000 --- a/net-analyzer/flent/metadata.xml +++ /dev/null @@ -1,14 +0,0 @@ -<?xml version='1.0' encoding='UTF-8'?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="person"> - <email>zx2c4@gentoo.org</email> - <name>Jason A. Donenfeld</name> - </maintainer> - <use> - <flag name="plots">Enable drawing plots</flag> - </use> - <upstream> - <remote-id type="github">tohojo/flent</remote-id> - </upstream> -</pkgmetadata> diff --git a/net-analyzer/flow-tools/Manifest b/net-analyzer/flow-tools/Manifest index 11214dc160a7..958d870d3dc3 100644 --- a/net-analyzer/flow-tools/Manifest +++ b/net-analyzer/flow-tools/Manifest @@ -1,2 +1 @@ -DIST flow-tools-0.68.5.1.tar.bz2 914062 BLAKE2B 8a987c1aac53a1370045ab118888c51ce2de7b8db4074432e86e701153469163870cf1cf9da9e2267ed934d240de4b4bf2391b4681012b82db7e4205207b7fa4 SHA512 ae17ba39854daa8ef3deecd3a554bb6d1fa47648cb791d8225a40bec13f65bf0692871660b2c3490d133b1251875c323d066bb0c0483eceb0707cec9b7714c57 DIST flow-tools-0.68.6.tar.gz 1078778 BLAKE2B 8a6179e44f2efa90bb2c3ace73bfbb8a928c1d7aabc8f47a778ca7361a92c13f2df168194bdd9c489c175079c1bd977f6ad9852711a62d99649d1f44609d746b SHA512 fc3d0650ace93ec2180340624648b5967fd7f094900f8409e751b439eb659c9623e2ee55effeb74164ec6b15f0a1edd8ed7735ccfacfd72af08e9c5c0d65b740 diff --git a/net-analyzer/flow-tools/files/flow-tools-0.68.5.1-openssl11.patch b/net-analyzer/flow-tools/files/flow-tools-0.68.5.1-openssl11.patch index 686d40ab8079..cbbddcaae68d 100644 --- a/net-analyzer/flow-tools/files/flow-tools-0.68.5.1-openssl11.patch +++ b/net-analyzer/flow-tools/files/flow-tools-0.68.5.1-openssl11.patch @@ -1,20 +1,5 @@ --- a/lib/ftxlate.c +++ b/lib/ftxlate.c -@@ -34,6 +34,14 @@ - #include <openssl/ssl.h> - #include <openssl/evp.h> - #undef free_func -+ -+/* fixup LibreSSL OpenSSL version numbering */ -+#include <openssl/opensslv.h> -+#if (defined LIBRESSL_VERSION_NUMBER && OPENSSL_VERSION_NUMBER == 0x20000000L) -+#undef OPENSSL_VERSION_NUMBER -+#define OPENSSL_VERSION_NUMBER 0x1000107fL -+#endif -+ - #endif /* HAVE_OPENSSL */ - - #include <sys/time.h> @@ -2040,11 +2048,13 @@ diff --git a/net-analyzer/flow-tools/files/flow-tools-0.68.5.1-syslog.patch b/net-analyzer/flow-tools/files/flow-tools-0.68.5.1-syslog.patch deleted file mode 100644 index cb17471072bc..000000000000 --- a/net-analyzer/flow-tools/files/flow-tools-0.68.5.1-syslog.patch +++ /dev/null @@ -1,47 +0,0 @@ ---- a/lib/fterr.c -+++ b/lib/fterr.c -@@ -112,7 +112,7 @@ - fprintf(((fterr_file) ? fterr_file : stderr), "%s\n", buf2); - - if (fterr_flags & FTERR_SYSLOG) -- syslog(LOG_INFO, buf); -+ syslog(LOG_INFO, "%s", buf); - - } /* fterr_info */ - -@@ -134,7 +134,7 @@ - - if (fterr_flags & FTERR_SYSLOG) { - snprintf(buf2, 1024, "%s: %s", buf, strerror(errno)); -- syslog(LOG_INFO, buf2); -+ syslog(LOG_INFO, "%s", buf2); - } - - if (fterr_exit) -@@ -159,7 +159,7 @@ - } - - if (fterr_flags & FTERR_SYSLOG) -- syslog(LOG_INFO, buf); -+ syslog(LOG_INFO, "%s", buf); - - if (fterr_exit) - fterr_exit(code); -@@ -183,7 +183,7 @@ - } - - if (fterr_flags & FTERR_SYSLOG) -- syslog(LOG_INFO, buf); -+ syslog(LOG_INFO, "%s", buf); - - } /* fterr_warnx */ - -@@ -205,7 +205,7 @@ - - if (fterr_flags & FTERR_SYSLOG) { - snprintf(buf2, 1024, "%s: %s", buf, strerror(errno)); -- syslog(LOG_INFO, buf2); -+ syslog(LOG_INFO, "%s", buf2); - } - - } /* fterr_warn */ diff --git a/net-analyzer/flow-tools/flow-tools-0.68.5.1-r11.ebuild b/net-analyzer/flow-tools/flow-tools-0.68.5.1-r11.ebuild deleted file mode 100644 index d1f4fc95e62a..000000000000 --- a/net-analyzer/flow-tools/flow-tools-0.68.5.1-r11.ebuild +++ /dev/null @@ -1,68 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DESCRIPTION="library and programs to process reports from NetFlow data" -HOMEPAGE="https://code.google.com/p/flow-tools/" -SRC_URI="https://${PN}.googlecode.com/files/${P}.tar.bz2" - -LICENSE="BSD GPL-2" -SLOT="0" -KEYWORDS="amd64 ppc x86" -IUSE="debug libressl mysql postgres ssl static-libs" - -RDEPEND=" - acct-group/flows - acct-user/flows - sys-apps/tcp-wrappers - sys-libs/zlib - mysql? ( dev-db/mysql-connector-c:0= ) - postgres? ( dev-db/postgresql:* ) - ssl? ( - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) - )" -DEPEND="${RDEPEND}" -BDEPEND=" - sys-devel/flex - sys-devel/bison" - -DOCS=( ChangeLog README SECURITY TODO ) - -PATCHES=( - "${FILESDIR}"/${P}-run.patch - "${FILESDIR}"/${P}-syslog.patch - "${FILESDIR}"/${P}-openssl11.patch - "${FILESDIR}"/${P}-fno-common.patch -) - -src_configure() { - econf \ - $(use_enable static-libs static) \ - $(usex mysql --with-mysql '') \ - $(usex postgres --with-postgresql=yes --with-postgresql=no) \ - $(usex ssl --with-openssl '') \ - --sysconfdir=/etc/flow-tools -} - -src_install() { - default - - find "${D}" -name '*.la' -delete || die - - exeinto /var/lib/flows/bin - doexe "${FILESDIR}"/linkme - - keepdir /var/lib/flows/ft - - newinitd "${FILESDIR}/flowcapture.initd" flowcapture - newconfd "${FILESDIR}/flowcapture.confd" flowcapture - - fowners flows:flows /var/lib/flows - fowners flows:flows /var/lib/flows/bin - fowners flows:flows /var/lib/flows/ft - - fperms 0755 /var/lib/flows - fperms 0755 /var/lib/flows/bin -} diff --git a/net-analyzer/flow-tools/flow-tools-0.68.6-r1.ebuild b/net-analyzer/flow-tools/flow-tools-0.68.6-r1.ebuild index d8ee002d2ccf..aced4bca3177 100644 --- a/net-analyzer/flow-tools/flow-tools-0.68.6-r1.ebuild +++ b/net-analyzer/flow-tools/flow-tools-0.68.6-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 @@ -11,8 +11,8 @@ SRC_URI="https://github.com/5u623l20/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="BSD GPL-3" SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" -IUSE="debug libressl mysql postgres ssl static-libs" +KEYWORDS="amd64 ~ppc x86" +IUSE="debug mysql postgres ssl static-libs" RDEPEND=" acct-group/flows @@ -21,18 +21,15 @@ RDEPEND=" sys-libs/zlib mysql? ( dev-db/mysql-connector-c:0= ) postgres? ( dev-db/postgresql:* ) - ssl? ( - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) - ) + ssl? ( dev-libs/openssl:0= ) " DEPEND=" ${RDEPEND} " BDEPEND=" app-text/docbook-sgml-utils - sys-devel/bison - sys-devel/flex + app-alternatives/yacc + app-alternatives/lex " DOCS=( ChangeLog.old README README.fork SECURITY TODO TODO.old ) PATCHES=( diff --git a/net-analyzer/flow-tools/metadata.xml b/net-analyzer/flow-tools/metadata.xml index e2ec7efaf9f5..52394dd65495 100644 --- a/net-analyzer/flow-tools/metadata.xml +++ b/net-analyzer/flow-tools/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>netmon@gentoo.org</email> @@ -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/flowgrind/Manifest b/net-analyzer/flowgrind/Manifest index 60af6addd626..30f4e0a2a403 100644 --- a/net-analyzer/flowgrind/Manifest +++ b/net-analyzer/flowgrind/Manifest @@ -1 +1 @@ -DIST flowgrind-0.8.0.tar.bz2 298730 BLAKE2B e924c9900d24565dc025af47d57173d828eea6a0d0bce462ab1e9cb38a14b1ac14b4148797c164212473852f5c0525161766b115b5a435fbfd673dbde8e14765 SHA512 2af250da696c4d0f613191e7a2e3084b2aa1dc995665a4164324cdb2cc56af7b000b8a2f5d5e7ac8ebbad3ae0ba4fc8eb641afe65c1a842a633c19e95ba3e65a +DIST flowgrind-0.8.2.tar.bz2 264486 BLAKE2B f0135abad43066895ce9acfb0050d12a22054d03f59e48164cde0444b3677a7581e86f25a5a967279432c95a65811135a5ce28da0f041553bca6299aabd783fa SHA512 6d1395881f45fb04b2c73bc7e01cea6610795b58f59c297577c8f30942c81334e8e95cefb2331e5e40dc5f4df64a21307a94d471113251fd3127272cd081bb7b diff --git a/net-analyzer/flowgrind/files/flowgrind-0.8.0-fno-common.patch b/net-analyzer/flowgrind/files/flowgrind-0.8.0-fno-common.patch deleted file mode 100644 index 60835b858816..000000000000 --- a/net-analyzer/flowgrind/files/flowgrind-0.8.0-fno-common.patch +++ /dev/null @@ -1,36 +0,0 @@ ---- a/src/daemon.c -+++ b/src/daemon.c -@@ -86,6 +86,10 @@ - - int daemon_pipe[2]; - -+pthread_t daemon_thread; -+char *dump_prefix; -+char *dump_dir; -+ - pthread_mutex_t mutex; - struct request *requests = 0, *requests_last = 0; - ---- a/src/daemon.h -+++ b/src/daemon.h -@@ -252,7 +252,7 @@ - int num_flows; - }; - --pthread_t daemon_thread; -+extern pthread_t daemon_thread; - - /* Through this pipe we wakeup the thread from select */ - extern int daemon_pipe[2]; -@@ -268,9 +268,8 @@ - * large a reply can get */ - struct report* get_reports(int *has_more); - --/* FIXME: shouldn't be global? */ --char *dump_prefix; --char *dump_dir; -+extern char *dump_prefix; -+extern char *dump_dir; - - void *daemon_main(void* ptr); - void add_report(struct report* report); diff --git a/net-analyzer/flowgrind/flowgrind-0.8.0-r1.ebuild b/net-analyzer/flowgrind/flowgrind-0.8.0-r1.ebuild deleted file mode 100644 index 2c2e1839abfa..000000000000 --- a/net-analyzer/flowgrind/flowgrind-0.8.0-r1.ebuild +++ /dev/null @@ -1,49 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DESCRIPTION="Network performance measurement tool" -HOMEPAGE="http://flowgrind.net/ https://github.com/flowgrind/flowgrind/" -SRC_URI="https://github.com/${PN}/${PN}/releases/download/${P}/${P}.tar.bz2" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="debug doc gsl pcap" - -RDEPEND=" - dev-libs/xmlrpc-c[abyss,curl] - sys-apps/util-linux - gsl? ( sci-libs/gsl ) - pcap? ( net-libs/libpcap ) -" -DEPEND=" - ${RDEPEND} -" -BDEPEND=" - doc? ( app-doc/doxygen ) -" -PATCHES=( - "${FILESDIR}"/${PN}-0.8.0-fno-common.patch -) - -src_configure() { - econf \ - $(use_enable debug) \ - $(use_with doc doxygen) \ - $(use_with gsl) \ - $(use_with pcap) -} - -src_compile() { - default - - use doc && emake html -} - -src_install() { - default - - use doc && dodoc -r doc/html -} diff --git a/net-analyzer/flowgrind/flowgrind-0.8.2.ebuild b/net-analyzer/flowgrind/flowgrind-0.8.2.ebuild new file mode 100644 index 000000000000..61eabf771920 --- /dev/null +++ b/net-analyzer/flowgrind/flowgrind-0.8.2.ebuild @@ -0,0 +1,40 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DESCRIPTION="Network performance measurement tool" +HOMEPAGE="http://flowgrind.net/ https://github.com/flowgrind/flowgrind/" +SRC_URI="https://github.com/${PN}/${PN}/releases/download/${P}/${P}.tar.bz2" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="doc gsl pcap" + +RDEPEND="dev-libs/xmlrpc-c:=[abyss,curl] + sys-apps/util-linux + gsl? ( sci-libs/gsl:= ) + pcap? ( net-libs/libpcap )" +DEPEND="${RDEPEND}" +BDEPEND="doc? ( app-text/doxygen )" + +src_configure() { + econf \ + --disable-debug \ + $(use_with doc doxygen) \ + $(use_with gsl) \ + $(use_with pcap) +} + +src_compile() { + default + + use doc && emake html +} + +src_install() { + default + + use doc && dodoc -r doc/html +} diff --git a/net-analyzer/flowgrind/metadata.xml b/net-analyzer/flowgrind/metadata.xml index c16842bb234d..f204a22693f6 100644 --- a/net-analyzer/flowgrind/metadata.xml +++ b/net-analyzer/flowgrind/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>netmon@gentoo.org</email> diff --git a/net-analyzer/fping/Manifest b/net-analyzer/fping/Manifest index cd1bf94273aa..78cb10654baa 100644 --- a/net-analyzer/fping/Manifest +++ b/net-analyzer/fping/Manifest @@ -1,2 +1,2 @@ -DIST fping-4.4.tar.gz 182921 BLAKE2B ddf84d5576170f0279e1d801fbb4afe491c698e5fba3ef4ac6fe25b2dc9b72605c23b6d33559d04170a885ed9ab423cbc1b853110dba93d5d250b6008b0c2a3e SHA512 8c9ff78edee10ce8e02a0d6189d4a2d91cc60954740c15730f8f1a17d037ee9f565828fa0dcd47a06f2746328063125704d467939d6280b44d5ac98a65e5acd0 -DIST fping-5.0.tar.gz 185281 BLAKE2B 6dbb6708ecb55c1f1281bcd9e298475a1ad3a21aa81d8488b61cb39ad07d1d7285247a3c39883cbaae0b1a0e4403b6340ea7ec43411b81546f0e8eeefb02ef88 SHA512 c843f7bb7c4e3289c4dd9eb8ae2ab93a363316c0000aac9187f79580a3d2505df179f2e0ae9e0a791c74bfc9e17c476874f8e122dfa6ad74930498c4e02d0de3 +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-4.2-fping6-6.patch b/net-analyzer/fping/files/fping-4.2-fping6-6.patch deleted file mode 100644 index 63138d3e2d2c..000000000000 --- a/net-analyzer/fping/files/fping-4.2-fping6-6.patch +++ /dev/null @@ -1,21 +0,0 @@ -From 6fd4f8bd91abc43f80078bdd0084cb6d2b1de7f1 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Johan=20Str=C3=B6m?= <johan@stromnet.se> -Date: Tue, 25 Jun 2019 14:03:14 +0200 -Subject: [PATCH] Do not fail if using fping6 with -6 flag - -Mostly for backwards compatability ---- - src/fping.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/src/fping.c -+++ b/src/fping.c -@@ -435,7 +435,7 @@ - break; - case '6': - #ifdef IPV6 -- if (hints_ai_family != AF_UNSPEC) { -+ if (hints_ai_family != AF_UNSPEC && hints_ai_family != AF_INET6) { - fprintf(stderr, "%s: can't specify both -4 and -6\n", prog); - exit(1); - } 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-4.4.ebuild b/net-analyzer/fping/fping-4.4.ebuild deleted file mode 100644 index 7ea26ec93e2e..000000000000 --- a/net-analyzer/fping/fping-4.4.ebuild +++ /dev/null @@ -1,35 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -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 ~sparc ~x86 ~amd64-linux ~x86-linux" -IUSE="ipv6 suid" - -FILECAPS=( cap_net_raw+ep usr/sbin/fping ) -PATCHES=( - "${FILESDIR}"/${PN}-4.2-fping6-6.patch -) - -src_configure() { - econf $(use_enable ipv6) -} - -src_install() { - default - - if use suid; then - fperms u+s /usr/sbin/fping - fi - - if use ipv6; then - dosym fping /usr/sbin/fping6 - fi -} diff --git a/net-analyzer/fping/fping-5.0.ebuild b/net-analyzer/fping/fping-5.0.ebuild deleted file mode 100644 index da4e623accc3..000000000000 --- a/net-analyzer/fping/fping-5.0.ebuild +++ /dev/null @@ -1,35 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -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 sparc x86 ~amd64-linux ~x86-linux" -IUSE="ipv6 suid" - -FILECAPS=( cap_net_raw+ep usr/sbin/fping ) -PATCHES=( - "${FILESDIR}"/${PN}-4.2-fping6-6.patch -) - -src_configure() { - econf $(use_enable ipv6) -} - -src_install() { - default - - if use suid; then - fperms u+s /usr/sbin/fping - fi - - if use ipv6; then - dosym fping /usr/sbin/fping6 - fi -} 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..ddd1e6978d3a --- /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.1.ebuild b/net-analyzer/fping/fping-5.1.ebuild new file mode 100644 index 000000000000..5ff5eaf654b1 --- /dev/null +++ b/net-analyzer/fping/fping-5.1.ebuild @@ -0,0 +1,31 @@ +# Copyright 1999-2022 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 ) + +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/fping/metadata.xml b/net-analyzer/fping/metadata.xml index 83aa7240bf83..162af0fb9eae 100644 --- a/net-analyzer/fping/metadata.xml +++ b/net-analyzer/fping/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>netmon@gentoo.org</email> @@ -7,5 +7,6 @@ </maintainer> <upstream> <remote-id type="sourceforge">fping</remote-id> + <remote-id type="github">schweikert/fping</remote-id> </upstream> </pkgmetadata> diff --git a/net-analyzer/fprobe/files/conf.d-fprobe b/net-analyzer/fprobe/files/conf.d-fprobe deleted file mode 100644 index a93c5c10b207..000000000000 --- a/net-analyzer/fprobe/files/conf.d-fprobe +++ /dev/null @@ -1,71 +0,0 @@ -# Config file for /etc/init.d/fprobe - -# Do we want the interface in promiscous mode [yes/no] -#PROMISC=no - -# Interface -IFACE=eth0 - -# If configured, only capture packets matching this tcpdump expression -#FILTER="" - -# Flow state timers -#TIMER_EXPIRED=5 -#TIMER_FRAGMENTED=30 -#TIMER_IDLE=60 -#TIMER_ACTIVE=300 - -# This is the default and should be left unless you know what you are doing -#FLOW_VER=5 - -# local ip. if configured fprobe will use this as the source IP for sending ALL flow data -# If you want to specify a specific source address per collecter, customize it below -#LOCALIP= - -# SNMP iface id -SNMP_IFACE="${IFACE#eth}" - -# Maximum number of concurrent flows to track -# using a specified amount of memory -#MEMBULK=10000 -#MEMLIMIT= - -# Pending queue -#PENDING=100 - -# Kernel capture buffer size (kB) -#KERNBUF=1024 - -# Realtime priority [0=disabled, 1..99] -#RTPRIO=0 - -# Delay N nanoseconds after each B bytes -#DELAY="0:0" - -# How much of the start of each packet to grab -#SNAPLEN=256 - -# chroot() to this location after startup -CHROOT="/var/empty" - -# User to run as. must have perms to the pidfile directory /var/run/fprobe/ -USER=nobody - -# logging level for syslog (0=EMERG, ..., 6=INFO, 7=DEBUG) -#LOGLEVEL=6 - -# If you want to run multiple instances of fprobe, -# You MUST set this variable to a unique INTEGER for each one! -PIDFILE_ID='' - -# remote ip. this is where we send flows -REMOTEIP=127.0.0.1 -# port to listen on -PORT=2055 -# Collector type, see the manpage for valid types -TYPE='' - -# If you want multiple collectors, just specify each one here -COLLECTORS="${REMOTEIP}:${PORT}/${LOCALIP}/${TYPE}" - -# vim:ft=gentoo-conf-d: diff --git a/net-analyzer/fprobe/files/conf.d-fprobe-r1 b/net-analyzer/fprobe/files/conf.d-fprobe-r1 new file mode 100644 index 000000000000..ca7aff4e4341 --- /dev/null +++ b/net-analyzer/fprobe/files/conf.d-fprobe-r1 @@ -0,0 +1,72 @@ +# Config file for /etc/init.d/fprobe + +# Do we want the interface in promiscous mode [yes/no] +#PROMISC=no + +# Interface +IFACE=eth0 + +# required: only capture packets matching this tcpdump expression +# default is all IP + IPv6 +FILTER="ip or ip6" + +# Flow state timers +#TIMER_EXPIRED=5 +#TIMER_FRAGMENTED=30 +#TIMER_IDLE=60 +#TIMER_ACTIVE=300 + +# This is the default and should be left unless you know what you are doing +#FLOW_VER=5 + +# local ip. if configured fprobe will use this as the source IP for sending ALL flow data +# If you want to specify a specific source address per collecter, customize it below +#LOCALIP= + +# SNMP iface id +SNMP_IFACE="${IFACE#eth}" + +# Maximum number of concurrent flows to track +# using a specified amount of memory +#MEMBULK=10000 +#MEMLIMIT= + +# Pending queue +#PENDING=100 + +# Kernel capture buffer size (kB) +#KERNBUF=1024 + +# Realtime priority [0=disabled, 1..99] +#RTPRIO=0 + +# Delay N nanoseconds after each B bytes +#DELAY="0:0" + +# How much of the start of each packet to grab +#SNAPLEN=256 + +# chroot() to this location after startup +CHROOT="/var/empty" + +# User to run as. must have perms to the pidfile directory /var/run/fprobe/ +USER=nobody + +# logging level for syslog (0=EMERG, ..., 6=INFO, 7=DEBUG) +#LOGLEVEL=6 + +# If you want to run multiple instances of fprobe, +# You MUST set this variable to a unique INTEGER for each one! +PIDFILE_ID='' + +# remote ip. this is where we send flows +REMOTEIP=127.0.0.1 +# port to listen on +PORT=2055 +# Collector type, see the manpage for valid types +TYPE='' + +# If you want multiple collectors, just specify each one here +COLLECTORS="${REMOTEIP}:${PORT}/${LOCALIP}/${TYPE}" + +# vim:ft=gentoo-conf-d: diff --git a/net-analyzer/fprobe/files/fprobe-1.1-autoconf.patch b/net-analyzer/fprobe/files/fprobe-1.1-autoconf.patch new file mode 100644 index 000000000000..9adccbe127e3 --- /dev/null +++ b/net-analyzer/fprobe/files/fprobe-1.1-autoconf.patch @@ -0,0 +1,315 @@ +https://bugs.gentoo.org/921189 + +Fix various underquoting issues and use of old macros. +--- a/configure.in ++++ b/configure.in +@@ -3,44 +3,42 @@ define([AC_CACHE_LOAD], ) + define([AC_CACHE_SAVE], ) + + AC_INIT +-AC_CANONICAL_SYSTEM +-AM_INIT_AUTOMAKE(fprobe,1.1) +-AM_CONFIG_HEADER(config.h) ++AC_CANONICAL_HOST ++AM_INIT_AUTOMAKE([fprobe], [1.1]) ++AM_CONFIG_HEADER([config.h]) + + AC_PROG_CC + AC_PROG_INSTALL + +-AC_CHECK_LIB(pthread, pthread_create, , +- AC_CHECK_LIB(c_r, pthread_create), , +- [AC_ERROR(POSIX threads not found)]) +-AC_SEARCH_LIBS(socket, socket) +-AC_SEARCH_LIBS(gethostbyname, nsl) +-AC_SEARCH_LIBS(sched_setscheduler, rt) ++AC_CHECK_LIB([pthread], [pthread_create], [], [AC_CHECK_LIB([c_r], [pthread_create], [], [AC_MSG_ERROR(POSIX threads not found)])]) ++AC_SEARCH_LIBS([socket], [socket]) ++AC_SEARCH_LIBS([gethostbyname], [nsl]) ++AC_SEARCH_LIBS([sched_setscheduler], [rt]) + + dnl ************************************************ + dnl inttypes + +-AC_CHECK_HEADER(inttypes.h, , +- [AC_CHECK_SIZEOF(int, 8) +- AC_CHECK_SIZEOF(long, 8) +- AC_CHECK_SIZEOF(long long, 8)] +-) ++AC_CHECK_HEADER([inttypes.h], [], [ ++ AC_CHECK_SIZEOF([int], [8]) ++ AC_CHECK_SIZEOF([long], [8]) ++ AC_CHECK_SIZEOF([long long], [8]) ++]) + + dnl ************************************************ + dnl OS type + +-case "${target}" in ++case "${host}" in + *-*-*linux*) +- AC_DEFINE_UNQUOTED(OS_LINUX, , OS type) +- AC_DEFINE_UNQUOTED(CLONEBASED_THREADS, , clone()-based threads) ++ AC_DEFINE_UNQUOTED([OS_LINUX], [], [OS type]) ++ AC_DEFINE_UNQUOTED([CLONEBASED_THREADS], [], [clone()-based threads]) + CFLAGS="$CFLAGS -D_BSD_SOURCE" + ;; + *-*-solaris*) +- AC_DEFINE_UNQUOTED(OS_SOLARIS, , OS type) ++ AC_DEFINE_UNQUOTED([OS_SOLARIS], [], [OS type]) + CFLAGS="$CFLAGS -D_POSIX_PTHREAD_SEMANTICS" + ;; + *-*-freebsd*) +- AC_DEFINE_UNQUOTED(OS_FREEBSD, , OS type) ++ AC_DEFINE_UNQUOTED([OS_FREEBSD], [], [OS type]) + CFLAGS="$CFLAGS -pthread" + ;; + esac +@@ -48,12 +46,12 @@ esac + dnl ************************************************ + dnl pcap.h location + +-AC_ARG_WITH(pcap, ++AC_ARG_WITH([pcap], + [ --with-pcap=DIR pcap.h location], +- pcap="$withval") ++ [pcap="$withval"]) + +-AC_CHECK_HEADER(pcap.h, , [ +- AC_MSG_CHECKING(for pcap.h in alternative location) ++AC_CHECK_HEADER([pcap.h], [] , [ ++ AC_MSG_CHECKING([for pcap.h in alternative location]) + found="" + pcap_dirs="$pcap /usr/include/pcap" + for pcap in $pcap_dirs; do +@@ -64,18 +62,18 @@ AC_CHECK_HEADER(pcap.h, , [ + fi + done + +- AC_MSG_RESULT($found) ++ AC_MSG_RESULT([$found]) + if test -z "$found"; then +- AC_ERROR(pcap.h not found) ++ AC_MSG_ERROR([pcap.h not found]) + fi + ]) + + dnl ************************************************ + dnl libpcap location + +-AC_ARG_WITH(libpcap, ++AC_ARG_WITH([libpcap], + [ --with-libpcap=DIR libpcap location], +- libpcap="$withval") ++ [libpcap="$withval"]) + + if test "$libpcap" = "yes"; then + libpcap="" +@@ -85,15 +83,15 @@ if test "$libpcap"; then + LDFLAGS="$LDFLAGS -L$libpcap" + fi + +-AC_CHECK_LIB(pcap, pcap_loop, , AC_ERROR(libpcap not found), $LDFLAGS) ++AC_CHECK_LIB([pcap], [pcap_loop], [], [AC_MSG_ERROR(libpcap not found)], [$LDFLAGS]) + + dnl ************************************************ + dnl Memory bulk indexing mode + +-AC_MSG_CHECKING(which memory bulk indexing mode to use) +-AC_ARG_WITH(membulk, ++AC_MSG_CHECKING([which memory bulk indexing mode to use]) ++AC_ARG_WITH([membulk], + [ --with-membulk=MODE indexing mode: index8|index16|ptr [default=ptr]], +- mem="$withval", mem="ptr") ++ [mem="$withval"], [mem="ptr"]) + + case "$mem" in + ptr) +@@ -106,95 +104,95 @@ case "$mem" in + mem_bits="16" + ;; + *) +- AC_ERROR(Invalid argument: "$mem") ++ AC_MSG_ERROR([Invalid argument: "$mem"]) + ;; + esac + +-AC_MSG_RESULT("$mem") +-AC_DEFINE_UNQUOTED(MEM_BITS, $mem_bits, Memory bulk indexing mode) ++AC_MSG_RESULT([$mem]) ++AC_DEFINE_UNQUOTED([MEM_BITS], [$mem_bits], [Memory bulk indexing mode]) + + dnl ************************************************ + dnl Hash type + +-AC_MSG_CHECKING(which hash type and size to use) +-AC_ARG_WITH(hash, ++AC_MSG_CHECKING([which hash type and size to use]) ++AC_ARG_WITH([hash], + [ --with-hash=TYPE hash type: crc16|xor16|xor8 [default=crc16]], +- hash="$withval", hash="crc16") ++ [hash="$withval"], [hash="crc16"]) + + hash_type=`echo "$hash"|cut -b -3` + hash_bits=`echo "$hash"|cut -b 4-` + + if test "$hash_type" = "xor"; then +- AC_DEFINE_UNQUOTED(HASH_TYPE_XOR, , Hash type) ++ AC_DEFINE_UNQUOTED([HASH_TYPE_XOR], [], [Hash type]) + if test "$hash_bits" != "8" -a "$hash_bits" != "16"; then +- AC_ERROR(Invalid argument: "$withval") ++ AC_MSG_ERROR([Invalid argument: "$withval"]) + fi + else + if test "$hash" != "crc16"; then +- AC_ERROR(Invalid argument: "$hash") ++ AC_MSG_ERROR([Invalid argument: "$hash"]) + fi +- AC_DEFINE_UNQUOTED(HASH_TYPE_CRC, , Hash type) ++ AC_DEFINE_UNQUOTED([HASH_TYPE_CRC], [], [Hash type]) + fi + +-AC_DEFINE_UNQUOTED(HASH_BITS, $hash_bits , Hash size) +-AC_MSG_RESULT("$hash") ++AC_DEFINE_UNQUOTED([HASH_BITS], [$hash_bits], [Hash size]) ++AC_MSG_RESULT([$hash]) + + dnl ************************************************ + dnl Uptime trick + +-AC_MSG_CHECKING(whether to enable uptime trick) +-AC_ARG_ENABLE(uptime_trick, ++AC_MSG_CHECKING([whether to enable uptime trick]) ++AC_ARG_ENABLE([uptime_trick], + [ --enable-uptime_trick enable uptime trick [default=yes]], +- uptime_trick="$enableval", uptime_trick="yes") ++ [uptime_trick="$enableval"], [uptime_trick="yes"]) + case "$uptime_trick" in + yes) +- AC_MSG_RESULT(yes) +- AC_DEFINE_UNQUOTED(UPTIME_TRICK, , Uptime trick) ++ AC_MSG_RESULT([yes]) ++ AC_DEFINE_UNQUOTED([UPTIME_TRICK], [], [Uptime trick]) + ;; + *) +- AC_MSG_RESULT(no) ++ AC_MSG_RESULT([no]) + ;; + esac + + dnl ************************************************ + dnl ICMP trick + +-AC_MSG_CHECKING(whether to enable icmp trick) +-AC_ARG_ENABLE(icmp_trick, ++AC_MSG_CHECKING([whether to enable icmp trick]) ++AC_ARG_ENABLE([icmp_trick], + [ --enable-icmp_trick enable icmp trick: yes|cisco|no [default=yes]], +- icmp_trick="$enableval", icmp_trick="yes") ++ [icmp_trick="$enableval"], [icmp_trick="yes"]) + case "$icmp_trick" in + yes) +- AC_MSG_RESULT(yes) +- AC_DEFINE_UNQUOTED(ICMP_TRICK, , ICMP trick) ++ AC_MSG_RESULT([yes]) ++ AC_DEFINE_UNQUOTED([ICMP_TRICK], [], [ICMP trick]) + ;; + cisco) +- AC_MSG_RESULT(yes: cisco) +- AC_DEFINE_UNQUOTED(ICMP_TRICK_CISCO, , ICMP trick) ++ AC_MSG_RESULT([yes: cisco]) ++ AC_DEFINE_UNQUOTED([ICMP_TRICK_CISCO], [], [ICMP trick]) + ;; + *) +- AC_MSG_RESULT(no) ++ AC_MSG_RESULT([no]) + ;; + esac + + dnl ************************************************ + dnl Debugging output + +-AC_MSG_CHECKING(whether to enable debugging) ++AC_MSG_CHECKING([whether to enable debugging]) + AC_ARG_ENABLE(debug, + [ --enable-debug enable debugging [default=no]], +- debug="$enableval", debug="no") ++ [debug="$enableval"], [debug="no"]) + case "$debug" in + no) +- AC_MSG_RESULT(no) ++ AC_MSG_RESULT([no]) + debug_val="0" + ;; + yes) +- AC_MSG_RESULT(all) ++ AC_MSG_RESULT([all]) + debug_val="-1" + ;; + *) +- AC_MSG_RESULT(custom: $debug) ++ AC_MSG_RESULT([custom: $debug]) + debug_val="0" + debug=`echo $debug|tr , " "` + for i in $debug; do +@@ -202,43 +200,44 @@ case "$debug" in + done + ;; + esac +-AC_DEFINE_UNQUOTED(DEBUG, ($debug_val) , Debugging output) ++AC_DEFINE_UNQUOTED([DEBUG], [$debug_val], [Debugging output]) + + dnl ************************************************ + dnl Runtime messages + +-AC_MSG_CHECKING(whether to enable runtime messages) +-AC_ARG_ENABLE(messages, ++AC_MSG_CHECKING([whether to enable runtime messages]) ++AC_ARG_ENABLE([messages], + [ --enable-messages enable runtime messages [default=no]], +- messages="$enableval", messages="no") ++ [messages="$enableval"], [messages="no"]) + case "$messages" in + yes) +- AC_MSG_RESULT(yes) +- AC_DEFINE_UNQUOTED(MESSAGES, , Runtime messages) ++ AC_MSG_RESULT([yes]) ++ AC_DEFINE_UNQUOTED([MESSAGES], [], [Runtime messages]) + ;; + *) +- AC_MSG_RESULT(no) ++ AC_MSG_RESULT([no]) + ;; + esac + + dnl ************************************************ + dnl Pidfiles location + +-AC_MSG_CHECKING(directory to store pidfiles) +-AC_ARG_WITH(piddir, ++AC_MSG_CHECKING([directory to store pidfiles]) ++AC_ARG_WITH([piddir], + [ --with-piddir=DIR pidfiles location [default=/var/run]], +- piddir="$withval", piddir="/var/run") +- AC_DEFINE_UNQUOTED(PID_DIR, "$piddir", Pidfiles location) +- AC_MSG_RESULT("$piddir") ++ [piddir="$withval"], [piddir="/var/run"]) ++AC_DEFINE_UNQUOTED([PID_DIR], ["$piddir"], [Pidfiles location]) ++AC_MSG_RESULT([$piddir]) + + dnl ************************************************ + + CFLAGS="$CFLAGS -D_REENTRANT" + CFLAGS="$CFLAGS -DWALL -W -Wall" + +-AC_SUBST(PACKAGE) +-AC_SUBST(VERSION) ++AC_SUBST([PACKAGE]) ++AC_SUBST([VERSION]) + DATE=`date +%Y-%m-%d` +-AC_SUBST(DATE) ++AC_SUBST([DATE]) + +-AC_OUTPUT(Makefile src/Makefile) ++AC_CONFIG_FILES([Makefile src/Makefile]) ++AC_OUTPUT diff --git a/net-analyzer/fprobe/files/fprobe-1.1-setgroups.patch b/net-analyzer/fprobe/files/fprobe-1.1-setgroups.patch index 803a2a9ce43a..948c6fee29c1 100644 --- a/net-analyzer/fprobe/files/fprobe-1.1-setgroups.patch +++ b/net-analyzer/fprobe/files/fprobe-1.1-setgroups.patch @@ -4,15 +4,12 @@ Signed-off-by: Robin H. Johnson <robbat2@gentoo.org> --- a/src/fprobe.c +++ b/src/fprobe.c -@@ -1541,10 +1541,10 @@ - } - +@@ -1543,7 +1543,7 @@ if (pw) { - if (setgroups(0, NULL) < 0) { - my_log(LOG_CRIT, "setgroups: %s", strerror(errno)); + if (setgroups(0, NULL) < 0) { + my_log(LOG_CRIT, "setgroups: %s", strerror(errno)); - exit(1); + //exit(1); - } + } if (setregid(pw->pw_gid, pw->pw_gid)) { my_log(LOG_CRIT, "setregid(%u): %s", pw->pw_gid, strerror(errno)); - exit(1); diff --git a/net-analyzer/fprobe/files/init.d-fprobe b/net-analyzer/fprobe/files/init.d-fprobe deleted file mode 100644 index c470af432c9c..000000000000 --- a/net-analyzer/fprobe/files/init.d-fprobe +++ /dev/null @@ -1,41 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -depend() { - need net -} - -BIN=/usr/sbin/fprobe -PIDFILE_EXTRA="" -[ -n "$PIDFILE_ID" ] && PIDFILE_EXTRA="[$PIDFILE_ID]" -PIDFILE="/var/run/fprobe$PIDFILE_EXTRA.pid" - -start() { - ebegin "Starting fprobe" - local OPTS="" - [ "${PROMISC}" = "yes" ] || OPTS="${OPTS} -p" - [ -n "${FILTER}" ] && OPTS="${OPTS} -f '${FILTER}'" - for optname in i:IFACE s:TIMER_EXPIRED g:TIME_FRAGMENTED d:TIMER_IDLE \ - e:TIMER_ACTIVE n:FLOW_VER a:LOCALIP x:SNMP_IFACE b:MEMBULK \ - m:MEMLIMIT q:PENDING B:KERNBUF r:RTPRIO t:DELAY S:SNAPLEN \ - c:CHROOT u:USER v:LOGLEVEL ; do - opt="${optname%:*}" optvar="${optname#*:}" - eval optvalue='$'$optvar - [ -n "$optvalue" ] && OPTS="${OPTS} -${opt} ${optvalue}" - done - OPTS="${OPTS} -l 1:${PIDFILE_ID} ${COLLECTORS}" - start-stop-daemon --start --exec $BIN \ - --pidfile ${PIDFILE} \ - -- ${OPTS} - eend $? -} - -stop() { - ebegin "Stopping fprobe" - start-stop-daemon --stop --quiet --exec $BIN \ - --pidfile ${PIDFILE} - eend $? -} - -# vim:ft=gentoo-init-d: diff --git a/net-analyzer/fprobe/files/init.d-fprobe-r1 b/net-analyzer/fprobe/files/init.d-fprobe-r1 new file mode 100644 index 000000000000..2dc84b8bfbe9 --- /dev/null +++ b/net-analyzer/fprobe/files/init.d-fprobe-r1 @@ -0,0 +1,40 @@ +#!/sbin/openrc-run +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +depend() { + need net +} + +BIN=/usr/sbin/fprobe +PIDFILE_EXTRA="" +[ -n "$PIDFILE_ID" ] && PIDFILE_EXTRA="[$PIDFILE_ID]" +PIDFILE="/var/run/fprobe$PIDFILE_EXTRA.pid" + +start() { + ebegin "Starting fprobe" + local OPTS="" + [ "${PROMISC}" = "yes" ] || OPTS="${OPTS} -p" + for optname in i:IFACE s:TIMER_EXPIRED g:TIME_FRAGMENTED d:TIMER_IDLE \ + e:TIMER_ACTIVE n:FLOW_VER a:LOCALIP x:SNMP_IFACE b:MEMBULK \ + m:MEMLIMIT q:PENDING B:KERNBUF r:RTPRIO t:DELAY S:SNAPLEN \ + c:CHROOT u:USER v:LOGLEVEL ; do + opt="${optname%:*}" optvar="${optname#*:}" + eval optvalue='$'$optvar + [ -n "$optvalue" ] && OPTS="${OPTS} -${opt} ${optvalue}" + done + OPTS="${OPTS} -l 1:${PIDFILE_ID} ${COLLECTORS}" + start-stop-daemon --start --exec $BIN \ + --pidfile ${PIDFILE} \ + -- -f "${FILTER}" ${OPTS} + eend $? +} + +stop() { + ebegin "Stopping fprobe" + start-stop-daemon --stop --quiet --exec $BIN \ + --pidfile ${PIDFILE} + eend $? +} + +# vim:ft=gentoo-init-d: diff --git a/net-analyzer/fprobe/fprobe-1.1-r3.ebuild b/net-analyzer/fprobe/fprobe-1.1-r3.ebuild deleted file mode 100644 index d86d043a9c3f..000000000000 --- a/net-analyzer/fprobe/fprobe-1.1-r3.ebuild +++ /dev/null @@ -1,43 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -DESCRIPTION="libpcap-based tool to collect network traffic data and emit it as NetFlow flows" -HOMEPAGE="http://fprobe.sourceforge.net" -LICENSE="GPL-2" - -SRC_URI="mirror://sourceforge/fprobe/${P}.tar.bz2" -SLOT="0" -KEYWORDS="~amd64 ~ppc x86" - -IUSE="debug messages" - -DEPEND=" - net-libs/libpcap -" -RDEPEND=" - ${DEPEND} -" -PATCHES=( - "${FILESDIR}"/fprobe-1.1-pidfile-sanity.patch - "${FILESDIR}"/fprobe-1.1-setgroups.patch -) - -src_configure() { - econf \ - $(use_enable debug) \ - $(use_enable messages) -} - -DOCS=( AUTHORS NEWS README TODO ) - -src_install() { - default - - docinto contrib - dodoc contrib/tg.sh - - newinitd "${FILESDIR}"/init.d-fprobe fprobe - newconfd "${FILESDIR}"/conf.d-fprobe fprobe -} diff --git a/net-analyzer/fprobe/fprobe-1.1-r6.ebuild b/net-analyzer/fprobe/fprobe-1.1-r6.ebuild new file mode 100644 index 000000000000..b873e1f9619b --- /dev/null +++ b/net-analyzer/fprobe/fprobe-1.1-r6.ebuild @@ -0,0 +1,46 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +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" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64 ppc x86" +IUSE="debug messages" + +RDEPEND="net-libs/libpcap" +DEPEND="${RDEPEND}" + +PATCHES=( + "${FILESDIR}"/fprobe-1.1-pidfile-sanity.patch + "${FILESDIR}"/fprobe-1.1-setgroups.patch +) + +src_prepare() { + default + + # Clang 16, bug #899924 + eautoreconf +} + +src_configure() { + econf \ + $(use_enable debug) \ + $(use_enable messages) +} + +src_install() { + default + + docinto contrib + dodoc contrib/tg.sh + + newinitd "${FILESDIR}"/init.d-fprobe-r1 fprobe + newconfd "${FILESDIR}"/conf.d-fprobe-r1 fprobe +} diff --git a/net-analyzer/fprobe/fprobe-1.1-r7.ebuild b/net-analyzer/fprobe/fprobe-1.1-r7.ebuild new file mode 100644 index 000000000000..2e60316ccd2c --- /dev/null +++ b/net-analyzer/fprobe/fprobe-1.1-r7.ebuild @@ -0,0 +1,47 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +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" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~x86" +IUSE="debug messages" + +RDEPEND="net-libs/libpcap" +DEPEND="${RDEPEND}" + +PATCHES=( + "${FILESDIR}"/fprobe-1.1-pidfile-sanity.patch + "${FILESDIR}"/fprobe-1.1-setgroups.patch + "${FILESDIR}"/fprobe-1.1-autoconf.patch +) + +src_prepare() { + default + + # Clang 16, bug #899924 + eautoreconf +} + +src_configure() { + econf \ + $(use_enable debug) \ + $(use_enable messages) +} + +src_install() { + default + + docinto contrib + dodoc contrib/tg.sh + + newinitd "${FILESDIR}"/init.d-fprobe-r1 fprobe + newconfd "${FILESDIR}"/conf.d-fprobe-r1 fprobe +} diff --git a/net-analyzer/fprobe/metadata.xml b/net-analyzer/fprobe/metadata.xml index 0fd136315cb2..e0651bda4243 100644 --- a/net-analyzer/fprobe/metadata.xml +++ b/net-analyzer/fprobe/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>netmon@gentoo.org</email> diff --git a/net-analyzer/fragroute/fragroute-1.2.6-r4.ebuild b/net-analyzer/fragroute/fragroute-1.2.6-r4.ebuild index 664c3d346e8c..4dabe888f8a2 100644 --- a/net-analyzer/fragroute/fragroute-1.2.6-r4.ebuild +++ b/net-analyzer/fragroute/fragroute-1.2.6-r4.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -22,7 +22,7 @@ DEPEND=" ${RDEPEND} " BDEPEND=" - virtual/awk + app-alternatives/awk " DOCS=( INSTALL README TODO ) PATCHES=( diff --git a/net-analyzer/fragroute/metadata.xml b/net-analyzer/fragroute/metadata.xml index f8f153715435..0a1a4df8d8a0 100644 --- a/net-analyzer/fragroute/metadata.xml +++ b/net-analyzer/fragroute/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>netmon@gentoo.org</email> diff --git a/net-analyzer/ftester/ftester-1.0.ebuild b/net-analyzer/ftester/ftester-1.0.ebuild index aabe8017d39e..a14b04707519 100644 --- a/net-analyzer/ftester/ftester-1.0.ebuild +++ b/net-analyzer/ftester/ftester-1.0.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=8 DESCRIPTION="Firewall and Intrusion Detection System testing tool" HOMEPAGE="http://dev.inversepath.com/trac/ftester" diff --git a/net-analyzer/ftester/metadata.xml b/net-analyzer/ftester/metadata.xml index 2c2a7923cfc8..d5af4bcfaf13 100644 --- a/net-analyzer/ftester/metadata.xml +++ b/net-analyzer/ftester/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>netmon@gentoo.org</email> diff --git a/net-analyzer/fwlogwatch/Manifest b/net-analyzer/fwlogwatch/Manifest index aa622d9eff42..5572520f8b49 100644 --- a/net-analyzer/fwlogwatch/Manifest +++ b/net-analyzer/fwlogwatch/Manifest @@ -1,2 +1 @@ -DIST fwlogwatch-1.4.tar.bz2 92652 BLAKE2B 94c5ecd6e17c3ce07ffaa33f738109162913253b837bcc4c4fc79068edb610c046b3a178db5481c3e145482686f3f837ecd2fc579700b4a5a68bbaae47f9e537 SHA512 0a67c0ae8b096fdf7a06e279a11b0bc71f2d514790c1669f60606b17a7f3f3ec97dedc2005438ce0ec82efcd66a822b62dbb36603f4b02e010f469fb885b87e6 DIST fwlogwatch-1.5.tar.bz2 94451 BLAKE2B c0456931dc425df4ec190f1c8bcba21e0784009dae66869a5f5c0371b68d0bdb1bf57c788468f7c9fd32abf8b676a4029bcde7d348c37e4b7f5771bc48f04297 SHA512 d4890596859929ddc6adfd7f9e735e0c414bad40eff6732120a522a8bd4fb8d1442c7d1026f0f3c6ac5c4d51b76a2bac486d04f0fbceae67395c585098afef85 diff --git a/net-analyzer/fwlogwatch/fwlogwatch-1.4.ebuild b/net-analyzer/fwlogwatch/fwlogwatch-1.4.ebuild deleted file mode 100644 index 54a2095f9c3d..000000000000 --- a/net-analyzer/fwlogwatch/fwlogwatch-1.4.ebuild +++ /dev/null @@ -1,86 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit eutils flag-o-matic toolchain-funcs - -DESCRIPTION="A packet filter and firewall log analyzer" -HOMEPAGE="http://fwlogwatch.inside-security.de/" -SRC_URI="http://fwlogwatch.inside-security.de/sw/${P}.tar.bz2" - -KEYWORDS="amd64 ~ppc sparc x86" -LICENSE="GPL-1" -SLOT="0" -IUSE="nls zlib" - -RDEPEND=" - zlib? ( sys-libs/zlib ) -" -DEPEND=" - ${RDEPEND} - sys-devel/flex - nls? ( sys-devel/gettext ) -" - -src_prepare() { - if use nls; then - strip-linguas -i po/ - local lingua pofile - for pofile in po/*.po; do - lingua=${pofile/po\/} - lingua=${lingua/.po} - if ! has ${lingua} ${LINGUAS}; then - sed -i \ - -e "/${lingua}.[mp]o/d" \ - Makefile po/Makefile || die - fi - done - fi - - sed -i \ - -e '/^INSTALL_/s|$| -D|g' \ - -e 's|make|$(MAKE)|g ' \ - Makefile || die -} - -src_configure() { - if ! use zlib; then - sed -i Makefile -e '/^LIBS/ s|-lz||g' || die - else - append-cflags -DHAVE_ZLIB - fi - - use nls && append-cflags -DHAVE_GETTEXT -} - -src_compile() { - emake \ - CC=$(tc-getCC) \ - CFLAGS="${CFLAGS}" \ - LDFLAGS="${LDFLAGS}" - use nls && emake -C po -} - -src_install() { - emake \ - LOCALE_DIR="${D}/usr" INSTALL_DIR="${D}/usr" \ - install - use nls && emake \ - LOCALE_DIR="${D}/usr" INSTALL_DIR="${D}/usr" \ - install-i18n - - dosbin contrib/fwlw_notify - dosbin contrib/fwlw_respond - - dodoc AUTHORS ChangeLog CREDITS README - - insinto /usr/share/fwlogwatch/contrib - - doins contrib/fwlogsummary.cgi - doins contrib/fwlogsummary_small.cgi - doins contrib/fwlogwatch.php - - insinto /etc - doins fwlogwatch.config -} diff --git a/net-analyzer/fwlogwatch/fwlogwatch-1.5-r1.ebuild b/net-analyzer/fwlogwatch/fwlogwatch-1.5-r1.ebuild new file mode 100644 index 000000000000..ed6ff796ace8 --- /dev/null +++ b/net-analyzer/fwlogwatch/fwlogwatch-1.5-r1.ebuild @@ -0,0 +1,96 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit flag-o-matic strip-linguas toolchain-funcs + +DESCRIPTION="A packet filter and firewall log analyzer" +HOMEPAGE="http://fwlogwatch.inside-security.de/" +SRC_URI="http://fwlogwatch.inside-security.de/sw/${P}.tar.bz2" + +LICENSE="GPL-1" +SLOT="0" +KEYWORDS="amd64 ~ppc sparc x86" +IUSE="geoip nls zlib" + +RDEPEND=" + virtual/libcrypt:= + geoip? ( dev-libs/geoip ) + zlib? ( sys-libs/zlib ) +" +DEPEND="${RDEPEND}" +BDEPEND=" + app-alternatives/lex + nls? ( sys-devel/gettext ) +" + +src_prepare() { + default + + if use nls; then + strip-linguas -i po/ + local lingua pofile + for pofile in po/*.po; do + lingua=${pofile/po\/} + lingua=${lingua/.po} + if ! has ${lingua} ${LINGUAS}; then + sed -i \ + -e "/${lingua}.[mp]o/d" \ + Makefile po/Makefile || die + fi + done + fi + + sed -i \ + -e '/^INSTALL_/s|$| -D|g' \ + -e 's|make|$(MAKE)|g ' \ + Makefile || die +} + +src_configure() { + if ! use zlib; then + sed -i Makefile -e '/^LIBS/ s|-lz||g' || die + else + append-cflags -DHAVE_ZLIB + fi + + if use geoip; then + append-cflags -DHAVE_GEOIP + sed -i Makefile -e '/^LIBS/ s| #| -lGeoIP #|g' || die + fi + + use nls && append-cflags -DHAVE_GETTEXT +} + +src_compile() { + emake \ + CC="$(tc-getCC)" \ + CFLAGS="${CFLAGS}" \ + LDFLAGS="${LDFLAGS}" + use nls && emake -C po +} + +src_install() { + emake \ + LOCALE_DIR="${D}/usr" INSTALL_DIR="${D}/usr" \ + install + + use nls && emake \ + LOCALE_DIR="${D}/usr" INSTALL_DIR="${D}/usr" \ + install-i18n + + dosbin contrib/fwlw_notify + dosbin contrib/fwlw_respond + + dodoc AUTHORS ChangeLog CREDITS README + + insinto /usr/share/fwlogwatch/contrib + + doins contrib/fwlogsummary.cgi + doins contrib/fwlogsummary_small.cgi + doins contrib/fwlogwatch.php + + insinto /etc + doins fwlogwatch.config +} diff --git a/net-analyzer/fwlogwatch/fwlogwatch-1.5.ebuild b/net-analyzer/fwlogwatch/fwlogwatch-1.5.ebuild deleted file mode 100644 index 93b1e6a2a352..000000000000 --- a/net-analyzer/fwlogwatch/fwlogwatch-1.5.ebuild +++ /dev/null @@ -1,92 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit eutils flag-o-matic toolchain-funcs - -DESCRIPTION="A packet filter and firewall log analyzer" -HOMEPAGE="http://fwlogwatch.inside-security.de/" -SRC_URI="http://fwlogwatch.inside-security.de/sw/${P}.tar.bz2" - -KEYWORDS="~amd64 ~ppc ~sparc ~x86" -LICENSE="GPL-1" -SLOT="0" -IUSE="geoip nls zlib" - -RDEPEND=" - geoip? ( dev-libs/geoip ) - zlib? ( sys-libs/zlib ) -" -DEPEND=" - ${RDEPEND} - sys-devel/flex - nls? ( sys-devel/gettext ) -" - -src_prepare() { - if use nls; then - strip-linguas -i po/ - local lingua pofile - for pofile in po/*.po; do - lingua=${pofile/po\/} - lingua=${lingua/.po} - if ! has ${lingua} ${LINGUAS}; then - sed -i \ - -e "/${lingua}.[mp]o/d" \ - Makefile po/Makefile || die - fi - done - fi - - sed -i \ - -e '/^INSTALL_/s|$| -D|g' \ - -e 's|make|$(MAKE)|g ' \ - Makefile || die -} - -src_configure() { - if ! use zlib; then - sed -i Makefile -e '/^LIBS/ s|-lz||g' || die - else - append-cflags -DHAVE_ZLIB - fi - - if use geoip; then - append-cflags -DHAVE_GEOIP - sed -i Makefile -e '/^LIBS/ s| #| -lGeoIP #|g' || die - fi - - use nls && append-cflags -DHAVE_GETTEXT -} - -src_compile() { - emake \ - CC=$(tc-getCC) \ - CFLAGS="${CFLAGS}" \ - LDFLAGS="${LDFLAGS}" - use nls && emake -C po -} - -src_install() { - emake \ - LOCALE_DIR="${D}/usr" INSTALL_DIR="${D}/usr" \ - install - use nls && emake \ - LOCALE_DIR="${D}/usr" INSTALL_DIR="${D}/usr" \ - install-i18n - - dosbin contrib/fwlw_notify - dosbin contrib/fwlw_respond - - dodoc AUTHORS ChangeLog CREDITS README - - insinto /usr/share/fwlogwatch/contrib - - doins contrib/fwlogsummary.cgi - doins contrib/fwlogsummary_small.cgi - doins contrib/fwlogwatch.php - - insinto /etc - doins fwlogwatch.config -} diff --git a/net-analyzer/fwlogwatch/metadata.xml b/net-analyzer/fwlogwatch/metadata.xml index 74c2baebb4ec..dce3f3be66c0 100644 --- a/net-analyzer/fwlogwatch/metadata.xml +++ b/net-analyzer/fwlogwatch/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>netmon@gentoo.org</email> diff --git a/net-analyzer/gensink/gensink-4.1-r2.ebuild b/net-analyzer/gensink/gensink-4.1-r2.ebuild index 5a99e658ec60..808eea74cb25 100644 --- a/net-analyzer/gensink/gensink-4.1-r2.ebuild +++ b/net-analyzer/gensink/gensink-4.1-r2.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 -inherit base toolchain-funcs +inherit toolchain-funcs DESCRIPTION="A simple TCP benchmark suite" HOMEPAGE="http://jes.home.cern.ch/jes/gensink/" @@ -12,7 +12,9 @@ LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~ppc x86" -PATCHES=( "${FILESDIR}/${P}-make.patch" ) +PATCHES=( + "${FILESDIR}/${P}-make.patch" +) src_compile() { tc-export CC diff --git a/net-analyzer/gensink/metadata.xml b/net-analyzer/gensink/metadata.xml index 74c2baebb4ec..dce3f3be66c0 100644 --- a/net-analyzer/gensink/metadata.xml +++ b/net-analyzer/gensink/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>netmon@gentoo.org</email> diff --git a/net-analyzer/gnome-nettool/Manifest b/net-analyzer/gnome-nettool/Manifest index d63b7d4fc227..3bf87fa30249 100644 --- a/net-analyzer/gnome-nettool/Manifest +++ b/net-analyzer/gnome-nettool/Manifest @@ -1 +1 @@ -DIST gnome-nettool-3.8.1.tar.xz 589024 BLAKE2B f12c43b713ae81a2460b12c150e2c52baf98900b14ce0ff188b3fb1a55aa636391fb62d9c20b40d3a60ff322d4af9744d072c2727a77bced056ef0df042e21cf SHA512 c1c90fa727ebbf21442c4d0f5f4e98acf91fdd68a476f5f378167f92c3d7938ef33598525b62b838dc9b485abeb40171bdffb0fe3cb060fd3982db013a30bbed +DIST gnome-nettool-42.0.tar.xz 422880 BLAKE2B 847f14781865eb936f0ded28a3f45ffa4ed02a20d335aea95a623795a2bb40bf57a49ecb28b26088c2818d028a401b3ef346806ea60305022bcafc9972094f4e SHA512 a640cd7f2008be870c4c457d3f793e6d31a10457b826641ef3cb9b831ea1d80756abc2a39aef7cb093905adafe41f27ee3c5648b1a6a3a01aa3d3ee7988330ce diff --git a/net-analyzer/gnome-nettool/files/42.0-meson-drop-unused-positional-arguments.patch b/net-analyzer/gnome-nettool/files/42.0-meson-drop-unused-positional-arguments.patch new file mode 100644 index 000000000000..e1da4288a742 --- /dev/null +++ b/net-analyzer/gnome-nettool/files/42.0-meson-drop-unused-positional-arguments.patch @@ -0,0 +1,38 @@ +https://gitlab.gnome.org/GNOME/gnome-nettool/-/merge_requests/3 + +From 1124c3e1fdb8472d30b7636500229aa16cdc1244 Mon Sep 17 00:00:00 2001 +From: Jeremy Bicha <jeremy.bicha@canonical.com> +Date: Wed, 6 Apr 2022 13:05:25 -0400 +Subject: [PATCH] meson: drop unused positional arguments + +This fixes a build error with newer meson +--- + data/meson.build | 6 ++---- + 1 file changed, 2 insertions(+), 4 deletions(-) + +diff --git a/data/meson.build b/data/meson.build +index 585e6d3..ed1e8bb 100644 +--- a/data/meson.build ++++ b/data/meson.build +@@ -20,16 +20,14 @@ desktop_in = configure_file(input: 'gnome-nettool.desktop.in.in', + output: 'gnome-nettool.desktop.in', + configuration: desktop_conf) + +-i18n.merge_file('desktop', +- type: 'desktop', ++i18n.merge_file(type: 'desktop', + input: desktop_in, + output: 'gnome-nettool.desktop', + po_dir: po_dir, + install: true, + install_dir: join_paths(prefix, datadir, 'applications')) + +-i18n.merge_file('appdata', +- type: 'xml', ++i18n.merge_file(type: 'xml', + input: 'gnome-nettool.appdata.xml.in', + output: 'gnome-nettool.appdata.xml', + po_dir: po_dir, +-- +GitLab + diff --git a/net-analyzer/gnome-nettool/gnome-nettool-3.8.1.ebuild b/net-analyzer/gnome-nettool/gnome-nettool-3.8.1.ebuild deleted file mode 100644 index 9d215a641c88..000000000000 --- a/net-analyzer/gnome-nettool/gnome-nettool-3.8.1.ebuild +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" -GCONF_DEBUG="yes" - -inherit eutils gnome2 - -DESCRIPTION="Graphical front-ends to various networking command-line" -HOMEPAGE="https://git.gnome.org/browse/gnome-nettool/" - -LICENSE="GPL-2" -SLOT="0" -IUSE="debug" -KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86" - -COMMON_DEPEND=" - >=dev-libs/glib-2.25.10:2 - gnome-base/libgtop:2= - x11-libs/cairo - x11-libs/gdk-pixbuf:2 - >=x11-libs/gtk+-2.90.4:3 - x11-libs/pango -" -RDEPEND="${COMMON_DEPEND} - || ( - net-misc/iputils - net-analyzer/tcptraceroute - net-analyzer/traceroute ) - net-analyzer/nmap - net-dns/bind-tools - userland_GNU? ( net-misc/netkit-fingerd net-misc/whois ) - userland_BSD? ( net-misc/bsdwhois ) -" -DEPEND="${COMMON_DEPEND} - app-text/yelp-tools - >=dev-util/intltool-0.40 - virtual/pkgconfig - sys-devel/gettext -" - -src_configure() { - gnome2_src_configure $(use_enable debug) -} diff --git a/net-analyzer/gnome-nettool/gnome-nettool-42.0.ebuild b/net-analyzer/gnome-nettool/gnome-nettool-42.0.ebuild new file mode 100644 index 000000000000..43103575b16d --- /dev/null +++ b/net-analyzer/gnome-nettool/gnome-nettool-42.0.ebuild @@ -0,0 +1,51 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{9..11} ) +inherit gnome.org gnome2-utils meson python-any-r1 xdg + +DESCRIPTION="Graphical front-ends to various networking command-line" +HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-nettool" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86" + +DEPEND=" + >=x11-libs/gtk+-3.0.0:3 + >=dev-libs/glib-2.26:2 + gnome-base/libgtop:2= +" +RDEPEND="${DEPEND} + || ( + net-misc/iputils + net-analyzer/tcptraceroute + net-analyzer/traceroute + ) + net-analyzer/nmap + net-dns/bind-tools + net-misc/netkit-fingerd + net-misc/whois +" +BDEPEND=" + ${PYTHON_DEPS} + app-text/yelp-tools + virtual/pkgconfig + sys-devel/gettext +" + +PATCHES=( + "${FILESDIR}"/${PV}-meson-drop-unused-positional-arguments.patch +) + +pkg_postinst() { + xdg_pkg_postinst + gnome2_schemas_update +} + +pkg_postrm() { + xdg_pkg_postrm + gnome2_schemas_update +} diff --git a/net-analyzer/gnome-nettool/metadata.xml b/net-analyzer/gnome-nettool/metadata.xml index 39980802b1da..fc638e18fbe9 100644 --- a/net-analyzer/gnome-nettool/metadata.xml +++ b/net-analyzer/gnome-nettool/metadata.xml @@ -1,8 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type="project"> - <email>gnome@gentoo.org</email> - <name>Gentoo GNOME Desktop</name> -</maintainer> + <maintainer type="project"> + <email>gnome@gentoo.org</email> + <name>Gentoo GNOME Desktop</name> + </maintainer> + <upstream> + <remote-id type="gnome-gitlab">GNOME/gnome-nettool</remote-id> + </upstream> </pkgmetadata> diff --git a/net-analyzer/goaccess/Manifest b/net-analyzer/goaccess/Manifest index 8449602d0ea3..4fe953157e67 100644 --- a/net-analyzer/goaccess/Manifest +++ b/net-analyzer/goaccess/Manifest @@ -1 +1,3 @@ -DIST goaccess-1.4.2.tar.gz 633162 BLAKE2B 4da268bb051114893b480e4eef18e007ccffb9b61ae49cc9a96622864716a44793f0895b5d27685e1b5e22c33f1bdd256dc148d26c7b6fefbd982a3f8fdf1960 SHA512 14bc5a08c2e6bb1db8d664a224b778603a358cf3a52a341a3a3e04e84337d0bb574892cb5005dc62098a8a6f0a834d1014479c29593714fdd6a87cedb3f3fb38 +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 diff --git a/net-analyzer/goaccess/files/goaccess.confd b/net-analyzer/goaccess/files/goaccess.confd new file mode 100644 index 000000000000..4ff75a1a4ff6 --- /dev/null +++ b/net-analyzer/goaccess/files/goaccess.confd @@ -0,0 +1,8 @@ +# Config file for /etc/init.d/goaccess + +# Various options. +# run `goaccess --help` for valid cmdline options +OPTS="--user-name=goaccess --pid-file=/run/goaccess/goaccess.pid -o /var/lib/goaccess/goaccess.html -l /var/log/goaccess/goaccess.log" + +# GoAccess config file +#CONFIG="/etc/goaccess/goaccess.conf" diff --git a/net-analyzer/goaccess/files/goaccess.initd b/net-analyzer/goaccess/files/goaccess.initd new file mode 100644 index 000000000000..be0059588396 --- /dev/null +++ b/net-analyzer/goaccess/files/goaccess.initd @@ -0,0 +1,14 @@ +#!/sbin/openrc-run +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +command="/usr/bin/goaccess" +name="GoAccess" +description="Real-time web log analyzer" +config="${CONFIG:-/etc/goaccess/goaccess.conf}" +command_args="--real-time-html --daemonize -p $config ${OPTS}" +start_stop_daemon_args="-q" + +depend() { + need net +} diff --git a/net-analyzer/goaccess/files/goaccess.service b/net-analyzer/goaccess/files/goaccess.service new file mode 100644 index 000000000000..8fab5f9b7c56 --- /dev/null +++ b/net-analyzer/goaccess/files/goaccess.service @@ -0,0 +1,15 @@ +[Unit] +Description=Real-time web log analyzer +After=network.target + +[Service] +Type=simple +User=root +Group=root +Restart=always +ExecStart=/usr/bin/goaccess --real-time-html --daemonize -p /etc/goaccess/goaccess.conf --user-name=goaccess -o /var/lib/goaccess/goaccess.html -l /var/log/goaccess/goaccess.log +StandardOutput=null +StandardError=null + +[Install] +WantedBy=multi-user.target diff --git a/net-analyzer/goaccess/files/goaccess.tmpfile b/net-analyzer/goaccess/files/goaccess.tmpfile new file mode 100644 index 000000000000..caee9ffff853 --- /dev/null +++ b/net-analyzer/goaccess/files/goaccess.tmpfile @@ -0,0 +1 @@ +d /run/goaccess 0755 goaccess goaccess diff --git a/net-analyzer/goaccess/goaccess-1.4.2.ebuild b/net-analyzer/goaccess/goaccess-1.4.2.ebuild deleted file mode 100644 index e029cb0bf444..000000000000 --- a/net-analyzer/goaccess/goaccess-1.4.2.ebuild +++ /dev/null @@ -1,52 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools - -if [[ ${PV} = *9999* ]] ; then - EGIT_REPO_URI="https://github.com/allinurl/${PN}.git" - inherit git-r3 -else - SRC_URI="https://tar.goaccess.io/${P}.tar.gz" - KEYWORDS="~amd64 ~x86 ~amd64-linux" -fi - -DESCRIPTION="A real-time web log analyzer and interactive viewer that runs in a terminal" -HOMEPAGE="https://goaccess.io" - -LICENSE="MIT" -SLOT="0" -IUSE="debug geoip geoipv2 getline libressl ssl unicode" -REQUIRED_USE="geoipv2? ( geoip )" - -BDEPEND="virtual/pkgconfig" -RDEPEND="sys-libs/ncurses:0=[unicode?] - geoip? ( - !geoipv2? ( dev-libs/geoip ) - geoipv2? ( dev-libs/libmaxminddb:0= ) - ) - ssl? ( - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) - )" -DEPEND="${RDEPEND}" - -src_prepare() { - default - - # Change path to GeoIP bases in config - sed -i -e s':/usr/local:/usr:' config/goaccess.conf || die "sed failed for goaccess.conf" - - eautoreconf -} - -src_configure() { - econf \ - "$(use_enable debug)" \ - "$(use_enable geoip geoip "$(usex geoipv2 mmdb legacy)")" \ - "$(use_enable unicode utf8)" \ - "$(use_with getline)" \ - "$(use_with ssl openssl)" -} diff --git a/net-analyzer/goaccess/goaccess-1.6.3.ebuild b/net-analyzer/goaccess/goaccess-1.6.3.ebuild new file mode 100644 index 000000000000..52788637826a --- /dev/null +++ b/net-analyzer/goaccess/goaccess-1.6.3.ebuild @@ -0,0 +1,70 @@ +# 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.7.2.ebuild new file mode 100644 index 000000000000..483e675fa316 --- /dev/null +++ b/net-analyzer/goaccess/goaccess-1.7.2.ebuild @@ -0,0 +1,71 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +# shellcheck disable=SC2207 + +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=( + $(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.8.1.ebuild b/net-analyzer/goaccess/goaccess-1.8.1.ebuild new file mode 100644 index 000000000000..483e675fa316 --- /dev/null +++ b/net-analyzer/goaccess/goaccess-1.8.1.ebuild @@ -0,0 +1,71 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +# shellcheck disable=SC2207 + +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=( + $(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-9999.ebuild b/net-analyzer/goaccess/goaccess-9999.ebuild index e029cb0bf444..f865c1c79c2b 100644 --- a/net-analyzer/goaccess/goaccess-9999.ebuild +++ b/net-analyzer/goaccess/goaccess-9999.ebuild @@ -1,52 +1,73 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +# shellcheck disable=SC2207 -inherit autotools +EAPI=8 -if [[ ${PV} = *9999* ]] ; then - EGIT_REPO_URI="https://github.com/allinurl/${PN}.git" - inherit git-r3 -else - SRC_URI="https://tar.goaccess.io/${P}.tar.gz" - KEYWORDS="~amd64 ~x86 ~amd64-linux" -fi +EGIT_REPO_URI="https://github.com/allinurl/${PN}.git" -DESCRIPTION="A real-time web log analyzer and interactive viewer that runs in a terminal" +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" -IUSE="debug geoip geoipv2 getline libressl ssl unicode" +KEYWORDS="" +IUSE="debug geoip geoipv2 getline ssl unicode" REQUIRED_USE="geoipv2? ( geoip )" -BDEPEND="virtual/pkgconfig" -RDEPEND="sys-libs/ncurses:0=[unicode?] +RDEPEND="acct-group/goaccess + acct-user/goaccess + sys-libs/ncurses:=[unicode(+)?] geoip? ( !geoipv2? ( dev-libs/geoip ) geoipv2? ( dev-libs/libmaxminddb:0= ) ) - ssl? ( - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) - )" + ssl? ( dev-libs/openssl:0= )" DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" src_prepare() { default - # Change path to GeoIP bases in config - sed -i -e s':/usr/local:/usr:' config/goaccess.conf || die "sed failed for goaccess.conf" + # 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() { - econf \ - "$(use_enable debug)" \ - "$(use_enable geoip geoip "$(usex geoipv2 mmdb legacy)")" \ - "$(use_enable unicode utf8)" \ - "$(use_with getline)" \ - "$(use_with ssl openssl)" + local 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/metadata.xml b/net-analyzer/goaccess/metadata.xml index 43a4da78f81f..cf961e4f268e 100644 --- a/net-analyzer/goaccess/metadata.xml +++ b/net-analyzer/goaccess/metadata.xml @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> + <maintainer type="person" proxied="yes"> <email>spiderx@spiderx.dp.ua</email> <name>Vladimir Pavljuchenkov</name> </maintainer> - <maintainer type="project"> + <maintainer type="project" proxied="proxy"> <email>proxy-maint@gentoo.org</email> <name>Proxy Maintainers</name> </maintainer> diff --git a/net-analyzer/gr-fosphor/Manifest b/net-analyzer/gr-fosphor/Manifest index 7e83ff32c097..d483f1e5b1d9 100644 --- a/net-analyzer/gr-fosphor/Manifest +++ b/net-analyzer/gr-fosphor/Manifest @@ -1 +1 @@ -DIST gr-fosphor-0.0_p20200131.tar.gz 244685 BLAKE2B db01b9df87f377db2adaaca3d1542f99eaca9f73303c71ea9add1845307704817c8930736d44462191476b4cb935a18401b7012a1ea6465bdb5cf3624c182f2c SHA512 7bf2758f98ae7d088256060878fbf33966880ddbb7fb132da00f9c2530d84b91a6385eabbf61ff40d3002d3a42eadf5e2d78b8c797bc93501cafaf8a7bdde7ae +DIST gr-fosphor-0.0_p20210108.tar.gz 223873 BLAKE2B 4c44ea026760a12fbc9f50c439f47b9af3956270d8f0a05c951fb19cc4f23a7064476a0a111d39e79183d52e8c6e686d17bf17f76df92e052f81d8940df588fe SHA512 fa2e4c28f8910eb82de42c76f2c00e8b832c023844f1d61aedb5ef3b0fafa7f3f7f26ab535a936d4ad8a42bedb380e71fe6c03f5e1b767afe731d70e080d241e diff --git a/net-analyzer/gr-fosphor/files/gr-fosphor-0.0_p20200131-htmldir.patch b/net-analyzer/gr-fosphor/files/gr-fosphor-0.0_p20200131-htmldir.patch new file mode 100644 index 000000000000..16a4475299bf --- /dev/null +++ b/net-analyzer/gr-fosphor/files/gr-fosphor-0.0_p20200131-htmldir.patch @@ -0,0 +1,8 @@ +--- a/docs/doxygen/CMakeLists.txt ++++ b/docs/doxygen/CMakeLists.txt +@@ -50,4 +50,4 @@ + + add_custom_target(doxygen_target ALL DEPENDS ${BUILT_DIRS}) + +-install(DIRECTORY ${BUILT_DIRS} DESTINATION ${GR_PKG_DOC_DIR}) ++install(DIRECTORY ${BUILT_DIRS} DESTINATION ${CMAKE_INSTALL_DOCDIR}) diff --git a/net-analyzer/gr-fosphor/files/gr-fosphor-0.0_p20210108-fix-use.patch b/net-analyzer/gr-fosphor/files/gr-fosphor-0.0_p20210108-fix-use.patch new file mode 100644 index 000000000000..da3287f35496 --- /dev/null +++ b/net-analyzer/gr-fosphor/files/gr-fosphor-0.0_p20210108-fix-use.patch @@ -0,0 +1,18 @@ +diff --git a/python/bindings/CMakeLists.txt b/python/bindings/CMakeLists.txt +index b7054da..86e5461 100644 +--- a/python/bindings/CMakeLists.txt ++++ b/python/bindings/CMakeLists.txt +@@ -54,10 +54,11 @@ endmacro(GR_PYBIND_MAKE) + + list(APPEND fosphor_python_files + base_sink_c_python.cc +- glfw_sink_c_python.cc +- qt_sink_c_python.cc + python_bindings.cc) + ++list_cond_append(ENABLE_GLFW fosphor_python_files glfw_sink_c_python.cc) ++list_cond_append(ENABLE_QT fosphor_python_files qt_sink_c_python.cc) ++ + GR_PYBIND_MAKE(fosphor + ../.. + gr::fosphor diff --git a/net-analyzer/gr-fosphor/gr-fosphor-0.0_p20200131.ebuild b/net-analyzer/gr-fosphor/gr-fosphor-0.0_p20200131.ebuild deleted file mode 100644 index 73f6863f9df9..000000000000 --- a/net-analyzer/gr-fosphor/gr-fosphor-0.0_p20200131.ebuild +++ /dev/null @@ -1,64 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -PYTHON_COMPAT=( python3_{6,7,8} ) - -inherit cmake-utils python-single-r1 - -DESCRIPTION="gnuradio fosphor block (GPU spectrum display)" -HOMEPAGE="https://sdr.osmocom.org/trac/wiki/fosphor" - -if [[ ${PV} == 9999* ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/osmocom/${PN}.git" -else - COMMIT="defdd4aca6cd157ccc3b10ea16b5b4f552f34b96" - SRC_URI="https://github.com/osmocom/gr-fosphor/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" - S="${WORKDIR}/${PN}-${COMMIT}" - KEYWORDS="~amd64 ~x86" -fi - -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -LICENSE="GPL-3+" -SLOT="0" -IUSE="glfw qt5" - -RDEPEND="qt5? ( - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtopengl:5 - dev-qt/qtwidgets:5 - ) - dev-libs/boost:= - dev-libs/log4cpp - media-libs/freetype - =net-wireless/gnuradio-3.8*:0=[qt5,${PYTHON_SINGLE_USEDEP}] - glfw? ( >=media-libs/glfw-3 ) - virtual/opencl - virtual/opengl - ${PYTHON_DEPS} -" -DEPEND="${RDEPEND} - dev-lang/swig:0 - dev-util/cppunit -" - -src_prepare() { - cmake-utils_src_prepare - default -} - -src_configure() { - # tries to run OpenCL test program, but failing doesn't hurt - addpredict /dev/dri - - local mycmakeargs=( - -DENABLE_DEFAULT=OFF - -DENABLE_GLFW="$(usex glfw)" - -DENABLE_QT="$(usex qt5)" - -DENABLE_PYTHON=ON - ) - cmake-utils_src_configure -} diff --git a/net-analyzer/gr-fosphor/gr-fosphor-0.0_p20210108.ebuild b/net-analyzer/gr-fosphor/gr-fosphor-0.0_p20210108.ebuild new file mode 100644 index 000000000000..3a6f011748ef --- /dev/null +++ b/net-analyzer/gr-fosphor/gr-fosphor-0.0_p20210108.ebuild @@ -0,0 +1,79 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{9..11} ) + +inherit cmake python-single-r1 + +DESCRIPTION="gnuradio fosphor block (GPU spectrum display)" +HOMEPAGE="https://sdr.osmocom.org/trac/wiki/fosphor" + +if [[ ${PV} == *9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/osmocom/${PN}.git" +else + COMMIT="974ab2fe54c25e8b6c37aa4de148ba0625eef652" + SRC_URI="https://github.com/osmocom/gr-fosphor/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" + S="${WORKDIR}/${PN}-${COMMIT}" + KEYWORDS="~amd64 ~x86" +fi + +LICENSE="GPL-3+" +SLOT="0" +IUSE="glfw qt5" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +RDEPEND=" + dev-libs/boost:= + dev-libs/log4cpp + media-libs/freetype + >=net-wireless/gnuradio-3.9:0=[qt5,${PYTHON_SINGLE_USEDEP}] + $(python_gen_cond_dep 'dev-python/pygccxml[${PYTHON_USEDEP}]') + glfw? ( >=media-libs/glfw-3 ) + virtual/opencl + virtual/opengl + ${PYTHON_DEPS} + qt5? ( + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtopengl:5 + dev-qt/qtwidgets:5 + )" +DEPEND="${RDEPEND}" +BDEPEND="$(python_gen_cond_dep 'dev-python/pybind11[${PYTHON_USEDEP}]')" + +PATCHES=( "${FILESDIR}"/${PN}-0.0_p20200131-htmldir.patch + "${FILESDIR}"/${P}-fix-use.patch ) + +src_prepare() { + cmake_src_prepare + + # adapt python bindings to use flags + use glfw || sed -i -e "s#bind_glfw_sink_c(m)##" \ + "${S}"/python/bindings/python_bindings.cc ||die + use qt5 || sed -i -e "s#bind_qt_sink_c(m)##" \ + "${S}"/python/bindings/python_bindings.cc ||die + + eapply_user +} + +src_configure() { + # tries to run OpenCL test program, but failing doesn't hurt + addpredict /dev/dri + + local mycmakeargs=( + -DENABLE_DEFAULT=OFF + -DENABLE_GLFW="$(usex glfw)" + -DENABLE_QT="$(usex qt5)" + -DENABLE_PYTHON=ON + ) + cmake_src_configure +} + +src_install() { + cmake_src_install + find "${D}" -name '*.py[oc]' -delete || die + python_optimize +} diff --git a/net-analyzer/gr-fosphor/gr-fosphor-9999.ebuild b/net-analyzer/gr-fosphor/gr-fosphor-9999.ebuild index 73f6863f9df9..accf82083f3d 100644 --- a/net-analyzer/gr-fosphor/gr-fosphor-9999.ebuild +++ b/net-analyzer/gr-fosphor/gr-fosphor-9999.ebuild @@ -1,53 +1,62 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 -PYTHON_COMPAT=( python3_{6,7,8} ) +EAPI=8 -inherit cmake-utils python-single-r1 +PYTHON_COMPAT=( python3_{9..11} ) + +inherit cmake python-single-r1 DESCRIPTION="gnuradio fosphor block (GPU spectrum display)" HOMEPAGE="https://sdr.osmocom.org/trac/wiki/fosphor" -if [[ ${PV} == 9999* ]]; then +if [[ ${PV} == *9999 ]]; then inherit git-r3 EGIT_REPO_URI="https://github.com/osmocom/${PN}.git" else - COMMIT="defdd4aca6cd157ccc3b10ea16b5b4f552f34b96" + COMMIT="974ab2fe54c25e8b6c37aa4de148ba0625eef652" SRC_URI="https://github.com/osmocom/gr-fosphor/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" S="${WORKDIR}/${PN}-${COMMIT}" KEYWORDS="~amd64 ~x86" fi -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - LICENSE="GPL-3+" SLOT="0" IUSE="glfw qt5" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" -RDEPEND="qt5? ( - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtopengl:5 - dev-qt/qtwidgets:5 - ) +RDEPEND=" dev-libs/boost:= dev-libs/log4cpp media-libs/freetype - =net-wireless/gnuradio-3.8*:0=[qt5,${PYTHON_SINGLE_USEDEP}] + >=net-wireless/gnuradio-3.9:0=[qt5,${PYTHON_SINGLE_USEDEP}] + $(python_gen_cond_dep 'dev-python/pygccxml[${PYTHON_USEDEP}]') glfw? ( >=media-libs/glfw-3 ) virtual/opencl virtual/opengl ${PYTHON_DEPS} -" -DEPEND="${RDEPEND} - dev-lang/swig:0 - dev-util/cppunit -" + qt5? ( + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtopengl:5 + dev-qt/qtwidgets:5 + )" +DEPEND="${RDEPEND}" +BDEPEND="$(python_gen_cond_dep 'dev-python/pybind11[${PYTHON_USEDEP}]')" + +PATCHES=( "${FILESDIR}"/${PN}-0.0_p20200131-htmldir.patch + "${FILESDIR}"/${PN}-0.0_p20210108-fix-use.patch ) src_prepare() { - cmake-utils_src_prepare - default + cmake_src_prepare + + # adapt python bindings to use flags + use glfw || sed -i -e "s#bind_glfw_sink_c(m)##" \ + "${S}"/python/bindings/python_bindings.cc ||die + use qt5 || sed -i -e "s#bind_qt_sink_c(m)##" \ + "${S}"/python/bindings/python_bindings.cc ||die + + eapply_user } src_configure() { @@ -60,5 +69,11 @@ src_configure() { -DENABLE_QT="$(usex qt5)" -DENABLE_PYTHON=ON ) - cmake-utils_src_configure + cmake_src_configure +} + +src_install() { + cmake_src_install + find "${D}" -name '*.py[oc]' -delete || die + python_optimize } diff --git a/net-analyzer/gr-fosphor/metadata.xml b/net-analyzer/gr-fosphor/metadata.xml index ccd32e8fbac8..2b496fa3b1f7 100644 --- a/net-analyzer/gr-fosphor/metadata.xml +++ b/net-analyzer/gr-fosphor/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>radio@gentoo.org</email> @@ -8,4 +8,7 @@ <use> <flag name="glfw">enable GLFW based interface</flag> </use> + <upstream> + <remote-id type="github">osmocom/gr-fosphor</remote-id> + </upstream> </pkgmetadata> diff --git a/net-analyzer/graphite-web/Manifest b/net-analyzer/graphite-web/Manifest deleted file mode 100644 index 7a5d3aca5d0a..000000000000 --- a/net-analyzer/graphite-web/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST graphite-web-1.1.5.tar.gz 1173809 BLAKE2B 94a1b4deab3159d3bde2d3c8b6f9664f39942cb1b815ce042b196be3c0e769ee1acac4b619135e9471360849308b90e02e1df4f7d6b7d0ef31e46d38ee2425e5 SHA512 b2097609ca77a40e6e7d83a3141335e2208d69e7f4edbac8ce3505ed9dd654589836a3b3498bfb7f7585332bceeb8e367f0c10f3cf6afdb5ad6b96377338a7bb -DIST graphite-web-1.1.7.tar.gz 1173818 BLAKE2B e2373360897c1447d60cbf84e5d0dd280130730f617ba12cf0195ed2539f55bcfe8a1cb3b6b9e4f9540a6f08ecb7870072aa61447012baa5553878ebf417937f SHA512 eb0a1de35d3535bd1fdc4e6edc6fe50fd6c8789fef4807eb4cd30d6b20e91e09d21daedb80f55339a8c05325db8fe1038e7a461bf155e41555dee60160d5b241 diff --git a/net-analyzer/graphite-web/files/graphite-web-1.1.5-fhs-paths.patch b/net-analyzer/graphite-web/files/graphite-web-1.1.5-fhs-paths.patch deleted file mode 100644 index 4cbbe7213b35..000000000000 --- a/net-analyzer/graphite-web/files/graphite-web-1.1.5-fhs-paths.patch +++ /dev/null @@ -1,63 +0,0 @@ -Install FHS-style paths - ---- a/conf/graphite.wsgi.example -+++ b/conf/graphite.wsgi.example -@@ -1,4 +1,4 @@ - import sys --sys.path.append('/opt/graphite/webapp') -+sys.path.append('@GENTOO_PORTAGE_EPREFIX@/usr/share/graphite-web/webapp') - - from graphite.wsgi import application ---- a/setup.py -+++ b/setup.py -@@ -107,8 +107,8 @@ - ], - package_data={'graphite' : - ['templates/*', 'local_settings.py.example']}, -- scripts=glob('bin/*'), -- data_files=list(webapp_content.items()) + storage_dirs + conf_files + examples, -+ scripts=['bin/graphite-web-build-index'], -+ data_files=list(webapp_content.items()), - install_requires=['Django>=1.8,<2.1', 'django-tagging==0.4.3', 'pytz', 'pyparsing', 'cairocffi', 'urllib3', 'scandir', 'six'], - classifiers=[ - 'Intended Audience :: Developers', ---- a/webapp/graphite/local_settings.py.example -+++ b/webapp/graphite/local_settings.py.example -@@ -101,6 +101,7 @@ - # Change only GRAPHITE_ROOT if your install is merely shifted from /opt/graphite - # to somewhere else - #GRAPHITE_ROOT = '/opt/graphite' -+GRAPHITE_ROOT = '@GENTOO_PORTAGE_EPREFIX@/usr/share/graphite-web' - - # Most installs done outside of a separate tree such as /opt/graphite will - # need to change these settings. Note that the default settings for each -@@ -110,6 +111,11 @@ - #STATIC_ROOT = '/opt/graphite/static' - #LOG_DIR = '/opt/graphite/storage/log/webapp' - #INDEX_FILE = '/opt/graphite/storage/index' # Search index file -+CONF_DIR = '@GENTOO_PORTAGE_EPREFIX@/etc/graphite-web' -+STORAGE_DIR = '@GENTOO_PORTAGE_EPREFIX@/var/lib/carbon' -+STATIC_ROOT = '@GENTOO_PORTAGE_EPREFIX@/usr/share/graphite-web/webapp/content' -+LOG_DIR = '@GENTOO_PORTAGE_EPREFIX@/var/log/graphite-web' -+INDEX_FILE = '@GENTOO_PORTAGE_EPREFIX@/var/lib/graphite-web/index' # Search index file - - # To further or fully customize the paths, modify the following. Note that the - # default settings for each of these are relative to CONF_DIR and STORAGE_DIR -@@ -127,6 +133,8 @@ - #CERES_DIR = '/opt/graphite/storage/ceres' - #WHISPER_DIR = '/opt/graphite/storage/whisper' - #RRD_DIR = '/opt/graphite/storage/rrd' -+WHISPER_DIR = '@GENTOO_PORTAGE_EPREFIX@/var/lib/carbon/whisper' -+RRD_DIR = '@GENTOO_PORTAGE_EPREFIX@/var/lib/carbon/rrd' - # - # Data directories using the "Standard" metrics finder (i.e. not Ceres) - #STANDARD_DIRS = [WHISPER_DIR, RRD_DIR] # Default: set from the above variables -@@ -244,7 +244,7 @@ - # - #DATABASES = { - # 'default': { --# 'NAME': '/opt/graphite/storage/graphite.db', -+# 'NAME': '@GENTOO_PORTAGE_EPREFIX@/var/lib/graphite-web/graphite.db', - # 'ENGINE': 'django.db.backends.sqlite3', - # 'USER': '', - # 'PASSWORD': '', diff --git a/net-analyzer/graphite-web/files/graphite-web-1.1.7-fhs-paths.patch b/net-analyzer/graphite-web/files/graphite-web-1.1.7-fhs-paths.patch deleted file mode 100644 index 6550f083039e..000000000000 --- a/net-analyzer/graphite-web/files/graphite-web-1.1.7-fhs-paths.patch +++ /dev/null @@ -1,63 +0,0 @@ -Install FHS-style paths - ---- a/conf/graphite.wsgi.example -+++ b/conf/graphite.wsgi.example -@@ -1,4 +1,4 @@ - import sys --sys.path.append('/opt/graphite/webapp') -+sys.path.append('@GENTOO_PORTAGE_EPREFIX@/usr/share/graphite-web/webapp') - - from graphite.wsgi import application ---- a/setup.py -+++ b/setup.py -@@ -115,8 +115,8 @@ - ], - package_data={'graphite' : - ['templates/*', 'local_settings.py.example']}, -- scripts=glob('bin/*'), -- data_files=list(webapp_content.items()) + storage_dirs + conf_files + examples, -+ scripts=['bin/graphite-web-build-index'], -+ data_files=list(webapp_content.items()), - install_requires=['Django>=1.8,<3.1', 'django-tagging==0.4.3', 'pytz', - 'pyparsing', 'cairocffi', 'urllib3', 'scandir', 'six'], - classifiers=[ ---- a/webapp/graphite/local_settings.py.example -+++ b/webapp/graphite/local_settings.py.example -@@ -101,6 +101,7 @@ - # Change only GRAPHITE_ROOT if your install is merely shifted from /opt/graphite - # to somewhere else - #GRAPHITE_ROOT = '/opt/graphite' -+GRAPHITE_ROOT = '@GENTOO_PORTAGE_EPREFIX@/usr/share/graphite-web' - - # Most installs done outside of a separate tree such as /opt/graphite will - # need to change these settings. Note that the default settings for each -@@ -110,6 +111,11 @@ - #STATIC_ROOT = '/opt/graphite/static' - #LOG_DIR = '/opt/graphite/storage/log/webapp' - #INDEX_FILE = '/opt/graphite/storage/index' # Search index file -+CONF_DIR = '@GENTOO_PORTAGE_EPREFIX@/etc/graphite-web' -+STORAGE_DIR = '@GENTOO_PORTAGE_EPREFIX@/var/lib/carbon' -+STATIC_ROOT = '@GENTOO_PORTAGE_EPREFIX@/usr/share/graphite-web/webapp/content' -+LOG_DIR = '@GENTOO_PORTAGE_EPREFIX@/var/log/graphite-web' -+INDEX_FILE = '@GENTOO_PORTAGE_EPREFIX@/var/lib/graphite-web/index' # Search index file - - # To further or fully customize the paths, modify the following. Note that the - # default settings for each of these are relative to CONF_DIR and STORAGE_DIR -@@ -127,6 +133,8 @@ - #CERES_DIR = '/opt/graphite/storage/ceres' - #WHISPER_DIR = '/opt/graphite/storage/whisper' - #RRD_DIR = '/opt/graphite/storage/rrd' -+WHISPER_DIR = '@GENTOO_PORTAGE_EPREFIX@/var/lib/carbon/whisper' -+RRD_DIR = '@GENTOO_PORTAGE_EPREFIX@/var/lib/carbon/rrd' - # - # Data directories using the "Standard" metrics finder (i.e. not Ceres) - #STANDARD_DIRS = [WHISPER_DIR, RRD_DIR] # Default: set from the above variables -@@ -244,7 +244,7 @@ - # - #DATABASES = { - # 'default': { --# 'NAME': '/opt/graphite/storage/graphite.db', -+# 'NAME': '@GENTOO_PORTAGE_EPREFIX@/var/lib/graphite-web/graphite.db', - # 'ENGINE': 'django.db.backends.sqlite3', - # 'USER': '', - # 'PASSWORD': '', diff --git a/net-analyzer/graphite-web/graphite-web-1.1.5-r1.ebuild b/net-analyzer/graphite-web/graphite-web-1.1.5-r1.ebuild deleted file mode 100644 index 4eb15c40b8c7..000000000000 --- a/net-analyzer/graphite-web/graphite-web-1.1.5-r1.ebuild +++ /dev/null @@ -1,93 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -PYTHON_COMPAT=( python3_{6,7,8} ) - -inherit distutils-r1 prefix - -DESCRIPTION="Enterprise scalable realtime graphing" -HOMEPAGE="https://graphiteapp.org/" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="+carbon ldap mysql memcached postgres +sqlite" - -DEPEND="" -RDEPEND=" - carbon? ( dev-python/carbon[${PYTHON_USEDEP}] ) - ldap? ( dev-python/python-ldap[${PYTHON_USEDEP}] ) - memcached? ( dev-python/python-memcached[${PYTHON_USEDEP}] ) - mysql? ( dev-python/mysqlclient[${PYTHON_USEDEP}] ) - postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] ) - >=dev-python/django-1.11.19[sqlite?,${PYTHON_USEDEP}] - >=dev-python/django-tagging-0.4.6[${PYTHON_USEDEP}] - dev-python/cairocffi[${PYTHON_USEDEP}] - dev-python/pyparsing[${PYTHON_USEDEP}] - dev-python/pytz[${PYTHON_USEDEP}] - dev-python/six[${PYTHON_USEDEP}] - dev-python/urllib3[${PYTHON_USEDEP}] - media-libs/fontconfig -" - -PATCHES=( - # Do not install the configuration and data files. We install them - # somewhere sensible by hand. - "${FILESDIR}"/${PN}-1.1.5-fhs-paths.patch -) - -python_prepare_all() { - # Use a less common name - mv bin/build-index bin/${PN}-build-index || die - # use FHS-style paths - export GRAPHITE_NO_PREFIX=yes - distutils-r1_python_prepare_all - eprefixify \ - conf/graphite.wsgi.example \ - webapp/graphite/local_settings.py.example -} - -python_install_all() { - distutils-r1_python_install_all - keepdir /var/{lib,log}/${PN} - docinto examples - docompress -x "/usr/share/doc/${PF}/examples" - dodoc \ - examples/example-graphite-vhost.conf \ - conf/dashboard.conf.example \ - conf/graphite.wsgi.example -} - -python_install() { - distutils-r1_python_install \ - --install-data="${EPREFIX}"/usr/share/${PN} - - insinto /etc/${PN} - newins webapp/graphite/local_settings.py.example local_settings.py - pushd "${D}/$(python_get_sitedir)"/graphite > /dev/null || die - ln -s ../../../../../etc/${PN}/local_settings.py local_settings.py || die - popd > /dev/null || die -} - -pkg_config() { - "${EROOT}"/usr/bin/django-admin.py migrate \ - --settings=graphite.settings --run-syncdb - "${EROOT}"/usr/bin/${PN}-build-index -} - -pkg_postinst() { - # Only display this for new installs - if [[ -z ${REPLACING_VERSIONS} ]]; then - elog "You need to configure ${PN} to run with a WSGI server of your choice." - elog "For example using Apache, you can use www-apache/mod_wsgi," - elog " using Nginx, you can use www-servers/uwsgi." - elog "Don't forget to edit local_settings.py in ${EPREFIX}/etc/${PN}" - elog "See https://graphite.readthedocs.org/en/latest/config-local-settings.html" - elog "Run emerge --config =${PN}-${PVR} if this is a fresh install." - elog "" - elog "If you want to update the search index regularily, you should consider running" - elog "the '${PN}-build-index' script in a crontab." - fi -} diff --git a/net-analyzer/graphite-web/graphite-web-1.1.7.ebuild b/net-analyzer/graphite-web/graphite-web-1.1.7.ebuild deleted file mode 100644 index 96b7920163db..000000000000 --- a/net-analyzer/graphite-web/graphite-web-1.1.7.ebuild +++ /dev/null @@ -1,97 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -PYTHON_COMPAT=( python3_{6,7,8} ) - # 1.1.7 supports up to 3.9, so it's a matter of deps -DISTUTILS_USE_SETUPTOOLS=no # export USE_SETUPTOOLS to activate - -inherit distutils-r1 prefix - -DESCRIPTION="Enterprise scalable realtime graphing" -HOMEPAGE="https://graphiteapp.org/" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="+carbon ldap mysql memcached postgres +sqlite" - -DEPEND="" -RDEPEND=" - carbon? ( dev-python/carbon[${PYTHON_USEDEP}] ) - ldap? ( dev-python/python-ldap[${PYTHON_USEDEP}] ) - memcached? ( dev-python/python-memcached[${PYTHON_USEDEP}] ) - mysql? ( dev-python/mysqlclient[${PYTHON_USEDEP}] ) - postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] ) - >=dev-python/django-1.11.19[sqlite?,${PYTHON_USEDEP}] - >=dev-python/django-tagging-0.4.6[${PYTHON_USEDEP}] - dev-python/cairocffi[${PYTHON_USEDEP}] - dev-python/pyparsing[${PYTHON_USEDEP}] - dev-python/pytz[${PYTHON_USEDEP}] - dev-python/six[${PYTHON_USEDEP}] - dev-python/urllib3[${PYTHON_USEDEP}] - media-libs/fontconfig -" - -PATCHES=( - # Do not install the configuration and data files. We install them - # somewhere sensible by hand. - "${FILESDIR}"/${PN}-1.1.7-fhs-paths.patch -) - -python_prepare_all() { - # Use a less common name - mv bin/build-index bin/${PN}-build-index || die - # use FHS-style paths - export GRAPHITE_NO_PREFIX=yes - distutils-r1_python_prepare_all - eprefixify \ - conf/graphite.wsgi.example \ - webapp/graphite/local_settings.py.example -} - -python_install_all() { - distutils-r1_python_install_all - keepdir /var/{lib,log}/${PN} - docinto examples - docompress -x "/usr/share/doc/${PF}/examples" - dodoc \ - examples/example-graphite-vhost.conf \ - conf/dashboard.conf.example \ - conf/graphite.wsgi.example -} - -python_install() { - distutils-r1_python_install \ - --install-data="${EPREFIX}"/usr/share/${PN} - - insinto /etc/${PN} - newins webapp/graphite/local_settings.py.example local_settings.py - pushd "${D}/$(python_get_sitedir)"/graphite > /dev/null || die - ln -s ../../../../../etc/${PN}/local_settings.py local_settings.py || die - popd > /dev/null || die - - python_optimize -} - -pkg_config() { - "${EROOT}"/usr/bin/django-admin.py migrate \ - --settings=graphite.settings --run-syncdb - "${EROOT}"/usr/bin/${PN}-build-index -} - -pkg_postinst() { - # Only display this for new installs - if [[ -z ${REPLACING_VERSIONS} ]]; then - elog "You need to configure ${PN} to run with a WSGI server of your choice." - elog "For example using Apache, you can use www-apache/mod_wsgi," - elog " using Nginx, you can use www-servers/uwsgi." - elog "Don't forget to edit local_settings.py in ${EPREFIX}/etc/${PN}" - elog "See https://graphite.readthedocs.org/en/latest/config-local-settings.html" - elog "Run emerge --config =${PN}-${PVR} if this is a fresh install." - elog "" - elog "If you want to update the search index regularily, you should consider running" - elog "the '${PN}-build-index' script in a crontab." - fi -} diff --git a/net-analyzer/graphite-web/metadata.xml b/net-analyzer/graphite-web/metadata.xml deleted file mode 100644 index d4f9fa582626..000000000000 --- a/net-analyzer/graphite-web/metadata.xml +++ /dev/null @@ -1,17 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="person"> - <email>grobian@gentoo.org</email> - <name>Fabian Groffen</name> - </maintainer> - <use> - <flag name="memcached">Enable memcached support</flag> - <flag name="carbon">Enable carbon support</flag> - </use> - <upstream> - <remote-id type="pypi">graphite-web</remote-id> - <remote-id type="github">graphite-project/graphite-web</remote-id> - <bugs-to>https://github.com/graphite-project/graphite-web/issues</bugs-to> - </upstream> -</pkgmetadata> diff --git a/net-analyzer/greenbone-feed-sync/Manifest b/net-analyzer/greenbone-feed-sync/Manifest new file mode 100644 index 000000000000..23d120d9afc1 --- /dev/null +++ b/net-analyzer/greenbone-feed-sync/Manifest @@ -0,0 +1,2 @@ +DIST greenbone-feed-sync-23.10.0.tar.gz 63001 BLAKE2B 5566cef8649e578cb498f0a5bc1e41f237a3702698b2012f3a62d8f5f647e6b1e3253c7d92e4a9fc82ad7991de8010b94ba8c1194a820511c49e5f5262e471ff SHA512 fe5864c4e650f17a072cd6e4153779ea33ad8f0ac28e92114b40c465a04b70791b603ccbe82934dcdad13fce2003e2d9786cec75854efecf8aefa74c7ce178f4 +DIST greenbone-feed-sync-24.3.0.tar.gz 58949 BLAKE2B 10260850dad8781682e9f3e3eb31faa4139080b3c5661261770fe28053df472b21b4e2ef98f258b5c634c26d543313da30bb01d9eadfdb8ea8e7b7b57205b7f5 SHA512 ac1ce1f0a2898997e5a330e9a186b6203b7593e5b847d23202c28e7b3b7be1556001cc6d8ba5abd7077d1b51e0f21640728f78659ecf9a60eede28ea483344b4 diff --git a/net-analyzer/greenbone-feed-sync/files/greenbone-feed-sync.cron b/net-analyzer/greenbone-feed-sync/files/greenbone-feed-sync.cron new file mode 100644 index 000000000000..5b3755982966 --- /dev/null +++ b/net-analyzer/greenbone-feed-sync/files/greenbone-feed-sync.cron @@ -0,0 +1,7 @@ +#!/bin/sh +# +# To enable sync via cron, execute "sudo -u gvm touch /etc/gvm/cron-feed-sync-enabled" +if [[ ! -f /etc/gvm/cron-feed-sync-enabled ]]; then + exit +fi +sudo -u gvm /usr/bin/greenbone-feed-sync --quiet --type all diff --git a/net-analyzer/greenbone-feed-sync/files/greenbone-feed-sync.service b/net-analyzer/greenbone-feed-sync/files/greenbone-feed-sync.service new file mode 100644 index 000000000000..987fe731d47b --- /dev/null +++ b/net-analyzer/greenbone-feed-sync/files/greenbone-feed-sync.service @@ -0,0 +1,11 @@ +[Unit] +Description=sync the Greenbone Community Feed + +[Service] +Type=oneshot +ExecStart=/usr/bin/greenbone-feed-sync --quiet --type all +SyslogIdentifier=greenbone-feed-sync +User=gvm + +[Install] +WantedBy=multi-user.target diff --git a/net-analyzer/greenbone-feed-sync/files/greenbone-feed-sync.timer b/net-analyzer/greenbone-feed-sync/files/greenbone-feed-sync.timer new file mode 100644 index 000000000000..9faf470e013c --- /dev/null +++ b/net-analyzer/greenbone-feed-sync/files/greenbone-feed-sync.timer @@ -0,0 +1,9 @@ +[Unit] +Description=Daily update of all feeds of the Greenbone Vulerability Management (GMV) suite + +[Timer] +OnCalendar=daily +RandomizedDelaySec=2hour + +[Install] +WantedBy=timers.target diff --git a/net-analyzer/greenbone-feed-sync/greenbone-feed-sync-23.10.0.ebuild b/net-analyzer/greenbone-feed-sync/greenbone-feed-sync-23.10.0.ebuild new file mode 100644 index 000000000000..53a297aa1af6 --- /dev/null +++ b/net-analyzer/greenbone-feed-sync/greenbone-feed-sync-23.10.0.ebuild @@ -0,0 +1,69 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{9..12} ) +DISTUTILS_USE_PEP517=poetry +inherit distutils-r1 systemd + +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 ~x86" +IUSE="cron" +RESTRICT="test" + +DEPEND=" + acct-user/gvm + net-misc/rsync + >=net-analyzer/gvmd-22.5.0 + dev-python/tomli[${PYTHON_USEDEP}] + >=dev-python/rich-13.2.0[${PYTHON_USEDEP}] +" + +RDEPEND=" + ${DEPEND} + cron? ( virtual/cron ) +" + +python_install() { + distutils-r1_python_install + + #greenbone-feed-sync should not be run as root to avoid changing file permissions + insinto /etc/sudoers.d + newins - greenbone-feed-sync <<-EOF + gvm ALL = NOPASSWD: /usr/bin/greenbone-feed-sync +EOF + fperms 0750 /etc/sudoers.d + fperms 0440 /etc/sudoers.d/greenbone-feed-sync + + if use cron; then + exeinto /etc/cron.daily + newexe "${FILESDIR}"/${PN}.cron ${PN} + fi + + systemd_dounit "${FILESDIR}/${PN}.timer" "${FILESDIR}/${PN}.service" +} + +pkg_postinst() { + if [[ -n ${REPLACING_VERSIONS} ]]; then + return + fi + + if use cron; then + elog + elog "Edit ${EROOT}/etc/cron.weekly/greenbone-feed-sync to activate daily feed update!" + elog + fi + + if systemd_is_booted; then + elog + elog "To enable the systemd timer, run the following command:" + elog " systemctl enable --now greenbone-feed-sync.timer" + elog + fi +} diff --git a/net-analyzer/greenbone-feed-sync/greenbone-feed-sync-24.3.0.ebuild b/net-analyzer/greenbone-feed-sync/greenbone-feed-sync-24.3.0.ebuild new file mode 100644 index 000000000000..a29bec692a29 --- /dev/null +++ b/net-analyzer/greenbone-feed-sync/greenbone-feed-sync-24.3.0.ebuild @@ -0,0 +1,90 @@ +# 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 systemd + +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" + +LICENSE="GPL-3+" +SLOT="0" +KEYWORDS="~amd64" +IUSE="cron" + +COMMON_DEPEND=" + acct-user/gvm + net-misc/rsync + >=net-analyzer/gvmd-22.5.0 + >=dev-python/tomli-2.0.1[${PYTHON_USEDEP}] + >=dev-python/rich-13.2.0[${PYTHON_USEDEP}] + >=dev-python/shtab-1.7.0[${PYTHON_USEDEP}] +" +DEPEND=" + ${COMMON_DEPEND} + test? ( >=net-analyzer/pontos-22.12.2[${PYTHON_USEDEP}] ) +" +RDEPEND=" + ${COMMON_DEPEND} + cron? ( virtual/cron ) +" + +distutils_enable_tests unittest + +src_test() { + # 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 +} + +python_install() { + distutils-r1_python_install + + # greenbone-feed-sync should not be run as root to avoid changing file permissions + insinto /etc/sudoers.d + newins - greenbone-feed-sync <<-EOF + gvm ALL = NOPASSWD: /usr/bin/greenbone-feed-sync + EOF + + fperms 0750 /etc/sudoers.d + fperms 0440 /etc/sudoers.d/greenbone-feed-sync + + if use cron; then + exeinto /etc/cron.daily + newexe "${FILESDIR}"/${PN}.cron ${PN} + fi + + systemd_dounit "${FILESDIR}/${PN}.timer" "${FILESDIR}/${PN}.service" +} + +pkg_postinst() { + if [[ -n ${REPLACING_VERSIONS} ]]; then + return + fi + + if use cron; then + elog + elog "Edit ${EROOT}/etc/cron.weekly/greenbone-feed-sync to activate daily feed update!" + elog + fi + + if systemd_is_booted; then + elog + elog "To enable the systemd timer, run the following command:" + elog " systemctl enable --now greenbone-feed-sync.timer" + elog + fi +} diff --git a/net-analyzer/greenbone-feed-sync/metadata.xml b/net-analyzer/greenbone-feed-sync/metadata.xml new file mode 100644 index 000000000000..7f358764088e --- /dev/null +++ b/net-analyzer/greenbone-feed-sync/metadata.xml @@ -0,0 +1,22 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="person" proxied="yes"> + <email>foti.giuseppe@gmail.com</email> + <name>Giuseppe Foti</name> + </maintainer> + <maintainer type="project" proxied="proxy"> + <email>proxy-maint@gentoo.org</email> + <name>Proxy Maintainers</name> + </maintainer> + <use> + <flag name="cron">Adds file to enable daily cron job to update Greenbone Community Feed's data"</flag> + </use> + <longdescription lang="en"> + This is the new script for syncing the Greenbone Community Feed. + The greenbone-nvt-sync script was previously installed by net-analyzer/openvas-scanner. + </longdescription> + <upstream> + <remote-id type="github">greenbone/greenbone-feed-sync</remote-id> + </upstream> +</pkgmetadata> diff --git a/net-analyzer/greenbone-security-assistant/Manifest b/net-analyzer/greenbone-security-assistant/Manifest deleted file mode 100644 index d46d8a5a6353..000000000000 --- a/net-analyzer/greenbone-security-assistant/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST greenbone-security-assistant-9.0.1-node_modules.tar.gz 44176347 BLAKE2B c8d1195ddc8167ff7a228a4e013c6139524e8527310c65529d37de8fe5e984379ba783e10544caf81ac801ceb1199ad7249c96a0e6032ade8a519068e6cefb42 SHA512 1718f97d330f7868afe34bf172699b8aa8ce795dc2e4a6f20b28135434623a68022c36310e381bd55bacbb621fd9bf5c8595c8030f5d3dc32bb427cc2febd028 -DIST greenbone-security-assistant-9.0.1.tar.gz 1936391 BLAKE2B 22b9020a97e79b31555d66826740ca49d1eba5d55324f0e80349dc571a7b45bcf2c6403ac311e78f742c51900921f3e61ef0740f11fd794069242e2ab21b1c3e SHA512 688bde97722f31416406e43230253c05dc8d05eb9fea6d8fd084ec4e748b67bab238f78cc11534e4fc948d911e468d43b5be0b224f17959db5e59faae7f5d086 diff --git a/net-analyzer/greenbone-security-assistant/files/greenbone-security-assistant-8.0.1-node.patch b/net-analyzer/greenbone-security-assistant/files/greenbone-security-assistant-8.0.1-node.patch deleted file mode 100644 index 116bd48264dd..000000000000 --- a/net-analyzer/greenbone-security-assistant/files/greenbone-security-assistant-8.0.1-node.patch +++ /dev/null @@ -1,34 +0,0 @@ ---- a/gsa/CMakeLists.txt 2019-07-17 16:45:39.000000000 +0300 -+++ b/gsa/CMakeLists.txt 2019-07-17 22:24:49.466906757 +0300 -@@ -1095,28 +1095,17 @@ - ${GSA_JS_SRC_FILES} - PARENT_SCOPE) - -- --add_custom_command (OUTPUT node-modules.stamp -- DEPENDS ${GSA_PKG_FILES} -- COMMAND ${INSTALLER} "${INSTALLER_ARGS}" "install" -- COMMAND ${CMAKE_COMMAND} -E touch ${CMAKE_CURRENT_BINARY_DIR}/node-modules.stamp -- WORKING_DIRECTORY ${GSA_SRC_DIR} -- COMMENT "Install gsa-ng js dependencies") -- -- - add_custom_command (OUTPUT bundle.stamp -- COMMAND ${CMAKE_COMMAND} -E env REACT_APP_VERSION=${PROJECT_VERSION_STRING} ${INSTALLER} "${INSTALLER_ARGS}" run build -+ COMMAND ${CMAKE_COMMAND} -E env REACT_APP_VERSION=${PROJECT_VERSION_STRING} ${INSTALLER} --offline run build - COMMAND ${CMAKE_COMMAND} -E touch ${CMAKE_CURRENT_BINARY_DIR}/bundle.stamp - WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} -- DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/node-modules.stamp -- ${GSA_PKG_FILES} -+ DEPENDS ${GSA_PKG_FILES} - ${GSA_STATIC_SRC_FILES} - ${GSA_JS_SRC_FILES} - COMMENT "Build gsa-ng install files") - - add_custom_target (gsa-ng ALL -- DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/node-modules.stamp -- ${CMAKE_CURRENT_BINARY_DIR}/bundle.stamp) -+ DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/bundle.stamp) - - set (GSA_STATIC_BUILD_FILES - ${GSA_BUILD_DIR}/index.html) diff --git a/net-analyzer/greenbone-security-assistant/files/greenbone-security-assistant-9.0.1-glibc_siglist.patch b/net-analyzer/greenbone-security-assistant/files/greenbone-security-assistant-9.0.1-glibc_siglist.patch deleted file mode 100644 index f9f587c96c8c..000000000000 --- a/net-analyzer/greenbone-security-assistant/files/greenbone-security-assistant-9.0.1-glibc_siglist.patch +++ /dev/null @@ -1,14 +0,0 @@ -#------------------------------------------------------------------- -# compatibility with glibc 2.32 version #751592 -#------------------------------------------------------------------- ---- ./gsad/src/gsad.c 2020-05-13 09:22:13.000000000 +0200 -+++ ./gsad/src/gsad.c 2020-10-28 13:07:25.127222254 +0100 -@@ -3318,7 +3318,7 @@ - { - if (termination_signal) - { -- g_debug ("Received %s signal.\n", sys_siglist[termination_signal]); -+ g_debug ("Received %s signal.\n", strsignal(termination_signal)); - gsad_cleanup (); - /* Raise signal again, to exit with the correct return value. */ - signal (termination_signal, SIG_DFL); diff --git a/net-analyzer/greenbone-security-assistant/files/greenbone-security-assistant-9.0.1-uninstall-snippet.patch b/net-analyzer/greenbone-security-assistant/files/greenbone-security-assistant-9.0.1-uninstall-snippet.patch deleted file mode 100644 index 8622fd810674..000000000000 --- a/net-analyzer/greenbone-security-assistant/files/greenbone-security-assistant-9.0.1-uninstall-snippet.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- a/gsa/CMakeLists.txt 2019-07-18 23:14:04.639202986 +0300 -+++ b/gsa/CMakeLists.txt 2019-07-18 23:21:54.568052589 +0300 -@@ -1164,9 +1164,6 @@ - install (FILES public/robots.txt - DESTINATION ${GSA_DEST_DIR}) - --# remove old generated files --install (CODE "file(REMOVE_RECURSE ${GSA_DEST_DIR}/static)") -- - install (DIRECTORY - ${GSA_BUILD_DIR}/static - ${GSA_BUILD_DIR}/img diff --git a/net-analyzer/greenbone-security-assistant/files/gsa.nginx.reverse.proxy.example b/net-analyzer/greenbone-security-assistant/files/gsa.nginx.reverse.proxy.example deleted file mode 100644 index b233911a2f1d..000000000000 --- a/net-analyzer/greenbone-security-assistant/files/gsa.nginx.reverse.proxy.example +++ /dev/null @@ -1,78 +0,0 @@ -upstream backend { - server 127.0.0.1:9392; - keepalive 64; -} - -server { - listen IP:80; - server_name openvas.domain.tdl; - return 301 https://openvas.domain.tdl$request_uri; -} - -server { - listen IP:443 ssl http2; - server_name openvas.domain.tdl; - access_log /var/log/nginx/openvas.domain.tdl.access.log; - error_log /var/log/nginx/openvas.domain.tdl.error.log; - # Not sourcing directly from file - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - fastcgi_param QUERY_STRING $query_string; - fastcgi_param REQUEST_METHOD $request_method; - fastcgi_param CONTENT_TYPE $content_type; - fastcgi_param CONTENT_LENGTH $content_length; - fastcgi_param SCRIPT_NAME $fastcgi_script_name; - fastcgi_param REQUEST_URI $request_uri; - fastcgi_param DOCUMENT_URI $document_uri; - fastcgi_param SERVER_PROTOCOL $server_protocol; - fastcgi_param REQUEST_SCHEME $scheme; - fastcgi_param HTTPS $https; - fastcgi_param GATEWAY_INTERFACE CGI/1.1; - fastcgi_param SERVER_SOFTWARE nginx/$nginx_version; - fastcgi_param REMOTE_ADDR $remote_addr; - fastcgi_param REMOTE_PORT $remote_port; - fastcgi_param SERVER_ADDR $server_addr; - fastcgi_param SERVER_PORT $server_port; - fastcgi_param SERVER_NAME $server_name; - fastcgi_param REDIRECT_STATUS 200; - fastcgi_param HTTP_PROXY ""; - fastcgi_param PATH_INFO $fastcgi_path_info; - fastcgi_param PATH_TRANSLATED $document_root$fastcgi_path_info; - fastcgi_param DOCUMENT_ROOT $document_root; - - location / { - proxy_set_header Host $http_host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header REMOTE_HOST $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-FORWARDED-PROTOCOL $scheme; - proxy_pass https://backend; - proxy_http_version 1.1; - proxy_pass_request_headers on; - proxy_set_header Connection "keep-alive"; - proxy_store off; - gzip on; - gzip_proxied any; - gzip_types *; - } - - resolver 127.0.0.1; - resolver_timeout 6s; - ssl_certificate /openvas.domain.tdl/fullchain.pem; - ssl_certificate_key /openvas.domain.tdl/privkey.pem; - ssl_trusted_certificate /openvas.domain.tdl/chain.pem; - ssl_dhparam /openvas.domain.tdl/dhparam.pem; - ssl_protocols TLSv1 TLSv1.1 TLSv1.2; - ssl_prefer_server_ciphers on; - ssl_ciphers ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:DHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA256:ECDHE-ECDSA-AES128-SHA:ECDHE-RSA-AES256-SHA384:ECDHE-RSA-AES128-SHA:ECDHE-ECDSA-AES256-SHA384:ECDHE-ECDSA-AES256-SHA:ECDHE-RSA-AES256-SHA:DHE-RSA-AES128-SHA256:DHE-RSA-AES128-SHA:DHE-RSA-AES256-SHA256:DHE-RSA-AES256-SHA:ECDHE-ECDSA-DES-CBC3-SHA:ECDHE-RSA-DES-CBC3-SHA:EDH-RSA-DES-CBC3-SHA:AES128-GCM-SHA256:AES256-GCM-SHA384:AES128-SHA256:AES256-SHA256:AES128-SHA:AES256-SHA:DES-CBC3-SHA:!DSS; - ssl_ecdh_curve secp384r1; - ssl_stapling on; - ssl_stapling_verify on; - ssl_session_cache shared:SSL:40m; - ssl_session_timeout 21h; - ssl_session_tickets off; - ssl_buffer_size 4k; - add_header Referrer-Policy no-referrer-when-downgrade; - add_header X-Frame-Options "SAMEORIGIN"; - add_header X-Content-Type-Options "nosniff"; - add_header X-XSS-Protection "1; mode=block"; -} diff --git a/net-analyzer/greenbone-security-assistant/files/gsad.init b/net-analyzer/greenbone-security-assistant/files/gsad.init deleted file mode 100644 index 7dc4b82afa78..000000000000 --- a/net-analyzer/greenbone-security-assistant/files/gsad.init +++ /dev/null @@ -1,20 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -: ${GSAD_USER:=gvm} -: ${GSAD_GROUP:=gvm} -: ${GSAD_TIMEOUT:=30} - -name="Greenbone Security Assistant (GSA)" -command="/usr/bin/gsad" -command_args="--foreground ${GSAD_OPTIONS} ${GSAD_LISTEN_ADDRESS} ${GSAD_LISTEN_PORT} ${GVMD_LISTEN_ADDRESS} ${GVMD_LISTEN_PORT} ${GSAD_GNUTLS_PRIORITIES}" -command_background="true" -command_user="${GSAD_USER}:${GSAD_GROUP}" -pidfile="/run/gsad.pid" -retry="${GSAD_TIMEOUT}" - -depend() { - after bootmisc - need localmount net gvmd -} diff --git a/net-analyzer/greenbone-security-assistant/files/gsad.logrotate b/net-analyzer/greenbone-security-assistant/files/gsad.logrotate deleted file mode 100644 index f80bba881c7b..000000000000 --- a/net-analyzer/greenbone-security-assistant/files/gsad.logrotate +++ /dev/null @@ -1,13 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 -# Daemon ignore HUP so we use 'copytruncate' instead of 'create' -# with safe file size to prevent losing log entries. - -/var/log/gvm/gsad.log { - compress - missingok - notifempty - sharedscripts - copytruncate - maxsize 10M -} diff --git a/net-analyzer/greenbone-security-assistant/files/gsad.service b/net-analyzer/greenbone-security-assistant/files/gsad.service deleted file mode 100644 index 91e791878008..000000000000 --- a/net-analyzer/greenbone-security-assistant/files/gsad.service +++ /dev/null @@ -1,18 +0,0 @@ -[Unit] -Description=Greenbone Security Assistant -After=network.target -After=openvassd.service -After=gvmd.service -Wants=gvmd.service - -[Service] -Type=forking -User=gvm -Group=gvm -EnvironmentFile=-/etc/gvm/sysconfig/gsad-daemon.conf -ExecStart=/usr/bin/gsad $GSAD_OPTIONS $GSAD_LISTEN_ADDRESS $GSAD_LISTEN_PORT $GVMD_LISTEN_ADDRESS $GVMD_LISTEN_PORT $GSAD_GNUTLS_PRIORITIES -Restart=always -RestartSec=10 - -[Install] -WantedBy=multi-user.target diff --git a/net-analyzer/greenbone-security-assistant/greenbone-security-assistant-9.0.1.ebuild b/net-analyzer/greenbone-security-assistant/greenbone-security-assistant-9.0.1.ebuild deleted file mode 100644 index a0621ef26527..000000000000 --- a/net-analyzer/greenbone-security-assistant/greenbone-security-assistant-9.0.1.ebuild +++ /dev/null @@ -1,124 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -CMAKE_MAKEFILE_GENERATOR="emake" -inherit cmake flag-o-matic systemd toolchain-funcs - -MY_PN="gsa" -MY_DN="gsad" -MY_NODE_N="node_modules" - -DESCRIPTION="Greenbone Security Assistant" -HOMEPAGE="https://www.greenbone.net/en/" -SRC_URI="https://github.com/greenbone/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz -https://github.com/greenbone/${MY_PN}/releases/download/v${PV}/gsa-node-modules-${PV}.tar.gz -> ${P}-${MY_NODE_N}.tar.gz" - -SLOT="0" -LICENSE="GPL-2+" -KEYWORDS="~amd64 ~x86" -IUSE="extras" - -DEPEND=" - dev-libs/libgcrypt:0= - dev-libs/libxml2 - dev-libs/libxslt - >=net-analyzer/gvm-libs-11.0.1 - net-libs/gnutls:= - net-libs/libmicrohttpd" - -RDEPEND=" - ${DEPEND} - >=net-analyzer/gvmd-9.0.1 - net-analyzer/ospd-openvas" - -BDEPEND=" - dev-python/polib - >=net-libs/nodejs-8.12.0 - >=sys-apps/yarn-1.15.2 - virtual/pkgconfig - extras? ( - app-doc/doxygen[dot] - app-doc/xmltoman - app-text/htmldoc - sys-devel/gettext - )" - -BUILD_DIR="${WORKDIR}/${MY_PN}-${PV}_build" -S="${WORKDIR}/${MY_PN}-${PV}" -MY_NODE_DIR="${S}/${MY_PN}/" - -PATCHES=( - # Disable yarn-fetch during compile. - "${FILESDIR}/${PN}-8.0.1-node.patch" - # Remove ugly uninstall-snippet that causes failing re-emerge. - "${FILESDIR}/${P}-uninstall-snippet.patch" - # Replace deprecated glibc sys_siglist with strsignal - "${FILESDIR}/${P}-glibc_siglist.patch" -) - -src_prepare() { - cmake_src_prepare - # We will use pre-generated npm stuff. - mv "${WORKDIR}/${MY_NODE_N}" "${MY_NODE_DIR}" || die "couldn't move node_modules" - # Update .yarnrc accordingly. - echo "--modules-folder ${MY_NODE_DIR}" >> "${S}/${MY_PN}/.yarnrc" || die "echo failed" - # QA-Fix | Remove !CLANG doxygen warnings for 9.0.0 - if use extras; then - if ! tc-is-clang; then - local f - for f in gsad/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" - "-DSBINDIR=${EPREFIX}/usr/bin" - "-DGSAD_PID_DIR=${EPREFIX}/run/" - "-DDEFAULT_CONFIG_DIR=${EPREFIX}/etc/default" - "-DLOGROTATE_DIR=${EPREFIX}/etc/logrotate.d" - ) - cmake_src_configure -} - -src_compile() { - # setting correct PATH for finding react-js - NODE_ENV=production PATH="$PATH:${S}/gsa/node_modules/.bin/" cmake_src_compile - if use extras; then - cmake_build -C "${BUILD_DIR}" doc - cmake_build doc-full -C "${BUILD_DIR}" doc - fi - cmake_build rebuild_cache -} - -src_install() { - if use extras; then - local HTML_DOCS=( "${BUILD_DIR}/${MY_DN}/doc/generated/html/." ) - fi - cmake_src_install - - insinto /etc/gvm/sysconfig - doins "${FILESDIR}/${MY_DN}-daemon.conf" - - insinto /etc/gvm/reverse-proxy - doins "${FILESDIR}/${MY_PN}.nginx.reverse.proxy.example" - fowners -R gvm:gvm /etc/gvm - - newinitd "${FILESDIR}/${MY_DN}.init" "${MY_DN}" - newconfd "${FILESDIR}/${MY_DN}-daemon.conf" "${MY_DN}" - - insinto /etc/logrotate.d - newins "${FILESDIR}/${MY_DN}.logrotate" "${MY_DN}" - - systemd_dounit "${FILESDIR}/${MY_DN}.service" -} diff --git a/net-analyzer/greenbone-security-assistant/metadata.xml b/net-analyzer/greenbone-security-assistant/metadata.xml deleted file mode 100644 index f6df02262b86..000000000000 --- a/net-analyzer/greenbone-security-assistant/metadata.xml +++ /dev/null @@ -1,24 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="person"> - <email>jonas.licht@gmail.com</email> - <name>Jonas Licht</name> - </maintainer> - <maintainer type="project"> - <email>proxy-maint@gentoo.org</email> - <name>Proxy Maintainers</name> - </maintainer> - <use> - <flag name="extras">Pdf results, extra fonts, html docs support</flag> - </use> - <longdescription lang="en"> - The Greenbone Security Assistant is the web interface developed for the Greenbone Security Manager appliances. - It connects to the Greenbone Vulnerability Manager GVM to provide a full-featured user interface for vulnerability management. - Greenbone Security Assistant consists of GSA - The webpage written in React and - GSAD - The HTTP server talking to the GVM daemon. - </longdescription> - <upstream> - <remote-id type="github">greenbone/gsa</remote-id> - </upstream> -</pkgmetadata> diff --git a/net-analyzer/gsa/Manifest b/net-analyzer/gsa/Manifest new file mode 100644 index 000000000000..c7dc9a59b4b6 --- /dev/null +++ b/net-analyzer/gsa/Manifest @@ -0,0 +1,2 @@ +DIST gsa-23.0.0.tar.gz 3605974 BLAKE2B c3797a20427754e0bee32d6e64599f04d1ed474435172efdeb0f3200aaec0d7a7dae0d80c035a762e3b6483f6b629a32e5225737ba521047ef90d564f2d1a036 SHA512 d2dfe12777a8b7610ebc1e7eceb079d38ae1f83085c5a411c115950e55254c82151f77ce16d12342d40b457999f50348a48e66f236a83d145697f68ef9caf993 +DIST gsa-node-modules-23.0.0.tar.xz 28474728 BLAKE2B f16b863d4a052cfbbc2758d66ca7f7715b2d0a303b916c149e562e9b2f4c2eeb9696447613fa382cc951d72c54758ea285402149f77793c94a0b39f71c39379d SHA512 ab3aedc50f1f9802b2a986a6b2e905b858f42722ef821d9b6d5aac44f113c62142a22292ce90badeb588276391ae64d68de177da727dcf09279105a9b635f4ab diff --git a/net-analyzer/gsa/gsa-23.0.0.ebuild b/net-analyzer/gsa/gsa-23.0.0.ebuild new file mode 100644 index 000000000000..34f8965050e2 --- /dev/null +++ b/net-analyzer/gsa/gsa-23.0.0.ebuild @@ -0,0 +1,49 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +MY_NODE_N="node-modules" +MY_NODE_D="node_modules" +MY_NODE_PV="${PV}" + +DESCRIPTION="Greenbone Security Assistant" +HOMEPAGE="https://www.greenbone.net https://github.com/greenbone/gsa" +SRC_URI=" + https://github.com/greenbone/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz + https://github.com/greenbone/${PN}/releases/download/v${PV}/${PN}-${MY_NODE_N}-${PV}.tar.xz +" + +SLOT="0" +LICENSE="AGPL-3+" +KEYWORDS="amd64 ~x86" + +BDEPEND=" + >=net-libs/nodejs-18.0.0[ssl] + >=sys-apps/yarn-1.22 +" + +MY_NODE_DIR="${S}/${MY_NODE_D}/" + +src_prepare() { + default + # We will use pre-generated npm stuff. + mv "${WORKDIR}/${MY_NODE_D}" "${MY_NODE_DIR}" || die "couldn't move node_modules" + + # Make SVGR not traverse the path up to / looking for a + # configuration file. Fixes + # Error: EACCES: permission denied, open '/.config/svgrrc' + # in case a directory /.config exists, see https://bugs.gentoo.org/909731 + echo "runtimeConfig: false" > .svgrrc.yml || die +} + +src_compile() { + # setting correct PATH for finding react-js + NODE_ENV=production PATH="${PATH}:${MY_NODE_DIR}/.bin/" \ + yarn --offline build || die +} + +src_install() { + insinto "usr/share/gvm/gsad/web" + doins -r build/* +} diff --git a/net-analyzer/gsa/metadata.xml b/net-analyzer/gsa/metadata.xml new file mode 100644 index 000000000000..6fb56eca5155 --- /dev/null +++ b/net-analyzer/gsa/metadata.xml @@ -0,0 +1,24 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="person" proxied="yes"> + <email>foti.giuseppe@gmail.com</email> + <name>Giuseppe Foti</name> + </maintainer> + <maintainer type="person" proxied="yes"> + <email>jonas.licht@gmail.com</email> + <name>Jonas Licht</name> + </maintainer> + <maintainer type="project" proxied="proxy"> + <email>proxy-maint@gentoo.org</email> + <name>Proxy Maintainers</name> + </maintainer> + <longdescription lang="en"> + The Greenbone Security Assistant is the web interface developed for the Greenbone Security Manager appliances. + It connects to the Greenbone Vulnerability Manager GVM to provide a full-featured user interface for vulnerability management. + Greenbone Security Assistant consists of GSA - The webpage written in React and + </longdescription> + <upstream> + <remote-id type="github">greenbone/gsa</remote-id> + </upstream> +</pkgmetadata> diff --git a/net-analyzer/gsad/Manifest b/net-analyzer/gsad/Manifest new file mode 100644 index 000000000000..63f1c795315c --- /dev/null +++ b/net-analyzer/gsad/Manifest @@ -0,0 +1,2 @@ +DIST gsad-22.9.0.tar.gz 224735 BLAKE2B da1ee149f6937ef2bb6d23391bf8594b776c8396d2a9fb0733b6d6933e1bd002ae560c178f8c300a09fd0d73c92615b750728fe8302f00b91e11926fe1a15aaa SHA512 ffe146a0dc87d2d95835dfa9b8eaeb2825a24aabe0f97e2ebd525235f96b23907476154fa52789c1d30d53daaf256743a4723db06e94bf6d4db98aaa57f08004 +DIST gsad-22.9.1.tar.gz 222663 BLAKE2B e65c8ecfa613a1653d36234d00e95da690e32c1c7ffc8904f509d568533079138115fcd389aaafa6d6cb96d5df42c9071e04edbbc95ea77731627ab7036adbde SHA512 25592b7e07357ff41f142cf926132491af20757a404773f3d532bafbf6e75d98b259103860920f657512d16a120351478767d347b01bef122ea1177c685d0d5b diff --git a/net-analyzer/gsad/files/gsad-22.init b/net-analyzer/gsad/files/gsad-22.init new file mode 100644 index 000000000000..a17f2dc1c084 --- /dev/null +++ b/net-analyzer/gsad/files/gsad-22.init @@ -0,0 +1,35 @@ +#!/sbin/openrc-run +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +: ${GSAD_USER:=gvm} +: ${GSAD_GROUP:=gvm} +: ${GSAD_TIMEOUT:=30} +: ${GSAD_PIDFILE:="/run/gsad/gsad.pid"} + +name="Greenbone Security Assistant (GSA)" +command="/usr/bin/gsad" +command_args="${GSAD_OPTIONS} ${GSAD_LISTEN_ADDRESS} ${GSAD_LISTEN_PORT} ${GVMD_LISTEN_ADDRESS} ${GVMD_LISTEN_PORT} ${GSAD_GNUTLS_PRIORITIES} --drop-privileges=${GSAD_USER}" +retry="${GSAD_TIMEOUT}" + +depend() { + after bootmisc + need localmount net + want gvmd +} + +start_pre() { + checkpath -d --mode 0755 --owner root /run/gsad +} + +start_post() { + checkpath -f --mode 0644 --owner "${GSAD_USER}:${GSAD_GROUP}" /var/log/gvm/gsad.log +} + +stop_post() { + if [ -f "${GSAD_PIDFILE}" ]; then + ebegin "Removing PID file" + rm --force "${GSAD_PIDFILE}" + eend $? + fi +} diff --git a/net-analyzer/greenbone-security-assistant/files/gsad-daemon.conf b/net-analyzer/gsad/files/gsad-daemon.conf index f7c7ee514e50..e74b409cc84a 100644 --- a/net-analyzer/greenbone-security-assistant/files/gsad-daemon.conf +++ b/net-analyzer/gsad/files/gsad-daemon.conf @@ -1,7 +1,7 @@ # Greenbone Security Assistant command args # e.g. --foreground | e.g. --no-redirect -GSAD_OPTIONS="--no-redirect" +GSAD_OPTIONS="--no-redirect --http-only" # GSAD listen adress GSAD_LISTEN_ADDRESS="--listen=127.0.0.1" diff --git a/net-analyzer/gsad/files/gsad.service.conf b/net-analyzer/gsad/files/gsad.service.conf new file mode 100644 index 000000000000..23d1db6f96bc --- /dev/null +++ b/net-analyzer/gsad/files/gsad.service.conf @@ -0,0 +1,2 @@ +[Unit] +PartOf=gvm.target diff --git a/net-analyzer/gsad/gsad-22.9.0.ebuild b/net-analyzer/gsad/gsad-22.9.0.ebuild new file mode 100644 index 000000000000..2230d3f5a627 --- /dev/null +++ b/net-analyzer/gsad/gsad-22.9.0.ebuild @@ -0,0 +1,102 @@ +# 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 Security Assistant" +HOMEPAGE="https://www.greenbone.net https://github.com/greenbone/gsad" +SRC_URI="https://github.com/greenbone/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +SLOT="0" +LICENSE="AGPL-3+" +KEYWORDS="~amd64 ~x86" +IUSE="brotli doc" + +DEPEND=" + acct-user/gvm + >=net-libs/libmicrohttpd-0.9.0:= + dev-libs/libxml2:2 + >=dev-libs/glib-2.42:2 + >=net-analyzer/gvm-libs-22.6 + >=net-libs/gnutls-3.2.15:= + >=sys-libs/zlib-1.2 + dev-libs/libgcrypt:0= + brotli? ( + app-arch/brotli + ) +" + +RDEPEND=" + ${DEPEND} + >=net-analyzer/gvmd-22.4 + >=net-analyzer/gsa-22.4 + net-analyzer/ospd-openvas +" + +BDEPEND=" + dev-python/polib + virtual/pkgconfig + doc? ( + app-text/doxygen[dot] + app-text/xmltoman + ) +" + +src_prepare() { + cmake_src_prepare + + # 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" + "-DSBINDIR=${EPREFIX}/usr/bin" + "-DGSAD_RUN_DIR=${EPREFIX}/run/gsad" + "-DGVMD_RUN_DIR=${EPREFIX}/run/gvmd" + "-DSYSTEMD_SERVICE_DIR=$(systemd_get_systemunitdir)" + "-DLOGROTATE_DIR=${EPREFIX}/etc/logrotate.d" + ) + cmake_src_configure +} + +src_compile() { + # setting correct PATH for finding react-js + NODE_ENV=production PATH="$PATH:${S}/gsa/node_modules/.bin/" 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 +} + +src_install() { + if use doc; then + local HTML_DOCS=( "${BUILD_DIR}/doc/generated/html/." ) + fi + cmake_src_install + + systemd_install_serviced "${FILESDIR}/gsad.service.conf" \ + ${PN}.service + + insinto /etc/gvm/sysconfig + newins "${FILESDIR}/${PN}-daemon.conf" "${PN}-daemon.conf" + + newinitd "${FILESDIR}/${PN}-22.init" "${PN}" + newconfd "${FILESDIR}/${PN}-daemon.conf" "${PN}" +} diff --git a/net-analyzer/gsad/gsad-22.9.1.ebuild b/net-analyzer/gsad/gsad-22.9.1.ebuild new file mode 100644 index 000000000000..1dcd0909a14a --- /dev/null +++ b/net-analyzer/gsad/gsad-22.9.1.ebuild @@ -0,0 +1,102 @@ +# 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 Security Assistant" +HOMEPAGE="https://www.greenbone.net https://github.com/greenbone/gsad" +SRC_URI="https://github.com/greenbone/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +SLOT="0" +LICENSE="AGPL-3+" +KEYWORDS="amd64 ~x86" +IUSE="brotli doc" + +DEPEND=" + acct-user/gvm + >=net-libs/libmicrohttpd-0.9.0:= + dev-libs/libxml2:2 + >=dev-libs/glib-2.42:2 + >=net-analyzer/gvm-libs-22.6 + >=net-libs/gnutls-3.2.15:= + >=sys-libs/zlib-1.2 + dev-libs/libgcrypt:0= + brotli? ( + app-arch/brotli + ) +" + +RDEPEND=" + ${DEPEND} + >=net-analyzer/gvmd-22.4 + >=net-analyzer/gsa-22.4 + net-analyzer/ospd-openvas +" + +BDEPEND=" + dev-python/polib + virtual/pkgconfig + doc? ( + app-text/doxygen[dot] + app-text/xmltoman + ) +" + +src_prepare() { + cmake_src_prepare + + # 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" + "-DSBINDIR=${EPREFIX}/usr/bin" + "-DGSAD_RUN_DIR=${EPREFIX}/run/gsad" + "-DGVMD_RUN_DIR=${EPREFIX}/run/gvmd" + "-DSYSTEMD_SERVICE_DIR=$(systemd_get_systemunitdir)" + "-DLOGROTATE_DIR=${EPREFIX}/etc/logrotate.d" + ) + cmake_src_configure +} + +src_compile() { + # setting correct PATH for finding react-js + NODE_ENV=production PATH="$PATH:${S}/gsa/node_modules/.bin/" 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 +} + +src_install() { + if use doc; then + local HTML_DOCS=( "${BUILD_DIR}/doc/generated/html/." ) + fi + cmake_src_install + + systemd_install_serviced "${FILESDIR}/gsad.service.conf" \ + ${PN}.service + + insinto /etc/gvm/sysconfig + newins "${FILESDIR}/${PN}-daemon.conf" "${PN}-daemon.conf" + + newinitd "${FILESDIR}/${PN}-22.init" "${PN}" + newconfd "${FILESDIR}/${PN}-daemon.conf" "${PN}" +} diff --git a/net-analyzer/gsad/metadata.xml b/net-analyzer/gsad/metadata.xml new file mode 100644 index 000000000000..27bf47cfefc0 --- /dev/null +++ b/net-analyzer/gsad/metadata.xml @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="person" proxied="yes"> + <email>foti.giuseppe@gmail.com</email> + <name>Giuseppe Foti</name> + </maintainer> + <maintainer type="person" proxied="yes"> + <email>jonas.licht@gmail.com</email> + <name>Jonas Licht</name> + </maintainer> + <maintainer type="project" proxied="proxy"> + <email>proxy-maint@gentoo.org</email> + <name>Proxy Maintainers</name> + </maintainer> + <upstream> + <remote-id type="github">greenbone/gsad</remote-id> + </upstream> +</pkgmetadata> 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/gspoof/metadata.xml b/net-analyzer/gspoof/metadata.xml index c08e67a93e3e..5e297da92ed0 100644 --- a/net-analyzer/gspoof/metadata.xml +++ b/net-analyzer/gspoof/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <!-- maintainer-needed --> <upstream> diff --git a/net-analyzer/gvm-libs/Manifest b/net-analyzer/gvm-libs/Manifest index fe81d4ac9b4b..19c9c6ddd694 100644 --- a/net-analyzer/gvm-libs/Manifest +++ b/net-analyzer/gvm-libs/Manifest @@ -1,2 +1,2 @@ -DIST gvm-libs-10.0.1.tar.gz 198483 BLAKE2B 4f4ddc7a3a1b4d45a51868cf03844365a9c4dd07f17ab53957ac4a1452ecba595885abdf01402a78aa784163aaba60b5c452fb9c2b5a11d38c40706e820c22c2 SHA512 961570e8fa8f89f0b462991bff1bf4e512ed6419cff6871c7432899847fb9edcc9f0adb7c280d12ee69fbb5c8e306c9e4366e2cbbb05fc3bae06795dcfb42206 -DIST gvm-libs-11.0.1.tar.gz 213553 BLAKE2B b7c8ffeca8682fcfe68afe0992632fac18a01fc9b0016fcbaf27c0340b5150337784caac2368a22789073714808ce2c0471efde668e6911dcd0cfceaf862b671 SHA512 159acbe8e24f172398a6396988b87676a214fa15c2985e67845dcad1ebcb92ba5e2a19cee2994dc7cd0cac706992e81e8c6a793e99216aaac87a91c1c72c9a46 +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 diff --git a/net-analyzer/gvm-libs/files/gvm-libs-10.0.1-pid.patch b/net-analyzer/gvm-libs/files/gvm-libs-10.0.1-pid.patch deleted file mode 100644 index 29c2a4cd83a6..000000000000 --- a/net-analyzer/gvm-libs/files/gvm-libs-10.0.1-pid.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/CMakeLists.txt 2019-04-05 11:27:07.000000000 +0300 -+++ b/CMakeLists.txt 2019-07-14 23:42:42.723081614 +0300 -@@ -172,7 +172,7 @@ - endif (NOT DATADIR) - - if (NOT GVM_PID_DIR) -- set (GVM_PID_DIR "${LOCALSTATEDIR}/run") -+ set (GVM_PID_DIR "/var/lib/gvm") - endif (NOT GVM_PID_DIR) - - if (NOT GVM_SYSCONF_DIR) 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-10.0.1.ebuild b/net-analyzer/gvm-libs/gvm-libs-10.0.1.ebuild deleted file mode 100644 index ebcbd5996319..000000000000 --- a/net-analyzer/gvm-libs/gvm-libs-10.0.1.ebuild +++ /dev/null @@ -1,100 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -CMAKE_MAKEFILE_GENERATOR="emake" -inherit cmake flag-o-matic toolchain-funcs user - -DESCRIPTION="Greenbone vulnerability management libraries, previously named openvas-libraries" -HOMEPAGE="https://www.greenbone.net/en/" -SRC_URI="https://github.com/greenbone/gvm-libs/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -SLOT="0" -LICENSE="GPL-2+" -KEYWORDS="~amd64 ~x86" -IUSE="extras ldap radius" - -DEPEND=" - app-crypt/gpgme:= - dev-libs/hiredis - dev-libs/libgcrypt:= - dev-perl/UUID - net-libs/gnutls:= - net-libs/libssh:= - sys-libs/zlib - ldap? ( net-nds/openldap ) - radius? ( net-dialup/freeradius-client )" - -RDEPEND=" - ${DEPEND}" - -BDEPEND=" - sys-devel/bison - sys-devel/flex - virtual/pkgconfig - extras? ( app-doc/doxygen[dot] - app-doc/xmltoman - app-text/htmldoc - dev-perl/CGI - dev-perl/SQL-Translator - )" - -PATCHES=( - # Creating pid on build time instead of relying daemon! - # QA fix for 10.0.1. - "${FILESDIR}/${P}-pid.patch" -) - -pkg_setup() { - enewgroup gvm 495 - enewuser gvm 495 -1 /var/lib/gvm gvm -} - -src_prepare() { - cmake_src_prepare - # QA-Fix | Remove doxygen warnings for !CLANG - if use extras; 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" - $(usex ldap -DBUILD_WITHOUT_LDAP=0 -DBUILD_WITHOUT_LDAP=1) - $(usex radius -DBUILD_WITHOUT_RADIUS=0 -DBUILD_WITHOUT_RADIUS=1) - ) - # Add release hardening flags for 10.0.1 - append-cflags -Wformat -Wformat-security -D_FORTIFY_SOURCE=2 -fstack-protector - append-ldflags -Wl,-z,relro -Wl,-z,now - cmake_src_configure -} - -src_compile() { - cmake_src_compile - if use extras; then - cmake_build -C "${BUILD_DIR}" doc - cmake_build doc-full -C "${BUILD_DIR}" doc - HTML_DOCS=( "${BUILD_DIR}"/doc/generated/html/. ) - fi - cmake_build rebuild_cache -} - -src_install() { - cmake_src_install - - # Set proper permissions on required files/directories - keepdir /var/lib/gvm - fowners -R gvm:gvm /var/lib/gvm -} diff --git a/net-analyzer/gvm-libs/gvm-libs-11.0.1.ebuild b/net-analyzer/gvm-libs/gvm-libs-11.0.1.ebuild deleted file mode 100644 index be84a74a2762..000000000000 --- a/net-analyzer/gvm-libs/gvm-libs-11.0.1.ebuild +++ /dev/null @@ -1,97 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -CMAKE_MAKEFILE_GENERATOR="emake" -inherit cmake flag-o-matic toolchain-funcs - -DESCRIPTION="Greenbone vulnerability management libraries, previously named openvas-libraries" -HOMEPAGE="https://www.greenbone.net/en/" -SRC_URI="https://github.com/greenbone/gvm-libs/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -SLOT="0" -LICENSE="GPL-2+" -KEYWORDS="~amd64 ~x86" -IUSE="extras ldap test radius" -RESTRICT="!test? ( test )" - -DEPEND=" - acct-user/gvm - app-crypt/gpgme:= - dev-libs/glib - dev-libs/hiredis - dev-libs/libgcrypt:= - dev-perl/UUID - net-libs/gnutls:= - net-libs/libssh:= - sys-libs/zlib - ldap? ( net-nds/openldap ) - radius? ( net-dialup/freeradius-client )" - -RDEPEND=" - ${DEPEND}" - -BDEPEND=" - dev-vcs/git - sys-devel/bison - sys-devel/flex - virtual/pkgconfig - extras? ( - app-doc/doxygen[dot] - app-doc/xmltoman - app-text/htmldoc - dev-perl/CGI - dev-perl/SQL-Translator - ) - test? ( dev-libs/cgreen )" - -src_prepare() { - cmake_src_prepare - # QA-Fix | Remove doxygen warnings for !CLANG - if use extras; 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" - "-DGVM_PID_DIR=${EPREFIX}/var/lib/gvm" - "-DBUILD_TESTS=$(usex test)" - ) - cmake_src_configure -} - -src_compile() { - cmake_src_compile - if use extras; 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 extras; then - local HTML_DOCS=( "${BUILD_DIR}"/doc/generated/html/. ) - fi - cmake_src_install - - # Set proper permissions on required files/directories - keepdir /var/lib/gvm - fowners -R gvm:gvm /var/lib/gvm -} 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.8.0.ebuild b/net-analyzer/gvm-libs/gvm-libs-22.8.0.ebuild new file mode 100644 index 000000000000..5c0ad0faa80c --- /dev/null +++ b/net-analyzer/gvm-libs/gvm-libs-22.8.0.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-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/metadata.xml b/net-analyzer/gvm-libs/metadata.xml index 3fc9918d9918..df3bcf4ee54f 100644 --- a/net-analyzer/gvm-libs/metadata.xml +++ b/net-analyzer/gvm-libs/metadata.xml @@ -1,20 +1,21 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> + <maintainer type="person" proxied="yes"> + <email>foti.giuseppe@gmail.com</email> + <name>Giuseppe Foti</name> + </maintainer> + <maintainer type="person" proxied="yes"> <email>jonas.licht@gmail.com</email> <name>Jonas Licht</name> </maintainer> - <maintainer type="project"> + <maintainer type="project" proxied="proxy"> <email>proxy-maint@gentoo.org</email> <name>Proxy Maintainers</name> </maintainer> - <use> - <flag name="extras">Html docs support</flag> - </use> <longdescription lang="en"> This is the libraries module for the Greenbone Vulnerability Management Solution. - It is used for the Greenbone Security Manager appliances and provides various + It is used for the Greenbone Security Manager appliances and provides various functionalities to support the integrated service daemons. </longdescription> <upstream> diff --git a/net-analyzer/gvm-tools/Manifest b/net-analyzer/gvm-tools/Manifest index c1bb1f18ae10..aa7ac3dc5280 100644 --- a/net-analyzer/gvm-tools/Manifest +++ b/net-analyzer/gvm-tools/Manifest @@ -1,2 +1 @@ -DIST gvm-tools-2.0.0.tar.gz 114592 BLAKE2B 73532138f4153ce625e68d4feb477bea4504be910266d6dac113caff1da096bc6072649ddc456b3348e1aba79c9b7e147ba019a70e4163267c474850019a076e SHA512 0adf7e06b1208c91fbc02dab42593280c95f6572e27d96d6f8777d710747a9e427c79678d9aef785b7ecd6d4fd30e79a1c063fe4256025ac0616c1d242f45025 -DIST gvm-tools-2.1.0.tar.gz 128144 BLAKE2B d9dd1857446912bd26a0b5efa38cc34c77bfe9959aaa9ab42ea8518ef9231e5877317319ac8e924b14a5382c80cb00c70d0413635506355eb111b84b5715bf4e SHA512 80933ab8303c1ff77451a9fafd9331b6a0b4c3ae40c4ea318171b6b9e969fb6f20c6970d021a14db1bf8ff816c7f779e2eb750bf84f9093055273f58ad04cda2 +DIST gvm-tools-24.1.0.tar.gz 218801 BLAKE2B ddc17406e5253696dca652c5e583fd5cc64505202f81496372d8b26ee7d4dafa1457cf4ae3249e7a183c123b3bd51b2de566ccdb2fa5f251d4edac90175e1b95 SHA512 6138c6c85421c7b011b73c2c857e9481cd46622ad3627a8d85c50563ebbd3c6d5cae80f43118ec85ef243fb965dcbe1cd7c1df29326f1d81b21c56ad117bef28 diff --git a/net-analyzer/gvm-tools/gvm-tools-2.0.0-r1.ebuild b/net-analyzer/gvm-tools/gvm-tools-2.0.0-r1.ebuild deleted file mode 100644 index d7688b807664..000000000000 --- a/net-analyzer/gvm-tools/gvm-tools-2.0.0-r1.ebuild +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{6,7,8} ) -DISTUTILS_USE_SETUPTOOLS=rdepend -inherit distutils-r1 - -DESCRIPTION="Remote control for Greenbone Vulnerability Manager, previously named openvas-cli" -HOMEPAGE="https://www.greenbone.net/en/" -SRC_URI="https://github.com/greenbone/gvm-tools/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -SLOT="0" -LICENSE="GPL-3" -KEYWORDS="~amd64 ~x86" -IUSE="" - -RDEPEND=" - net-analyzer/python-gvm[${PYTHON_USEDEP}] - !net-analyzer/openvas-cli - !net-analyzer/openvas-tools" - -DEPEND=" - ${RDEPEND}" - -distutils_enable_tests unittest - -src_prepare() { - distutils-r1_src_prepare - # Exlude tests & correct FHS/Gentoo policy paths - sed -i "s/packages=find_packages(),.*/packages=find_packages(exclude=['tests*', 'docs']),/" setup.py || die - sed -i -e "s*''*'/usr/share/doc/${P}'*g" setup.py || die - - # Fixing tests - # Use correct socket path - sed -i "s/\/usr\/local\/var\/run\/gvmd.sock/\/var\/run\/gvmd.sock/g" tests/test_parser.py || die - # ignore help formating - sed -i "s/class HelpFormatting/@unittest.skip('ignoring help formatting')\nclass HelpFormatting/g" tests/test_parser.py || die -} diff --git a/net-analyzer/gvm-tools/gvm-tools-2.1.0.ebuild b/net-analyzer/gvm-tools/gvm-tools-2.1.0.ebuild deleted file mode 100644 index 233ed23869d6..000000000000 --- a/net-analyzer/gvm-tools/gvm-tools-2.1.0.ebuild +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{7,8,9} ) -DISTUTILS_USE_SETUPTOOLS=pyproject.toml -inherit distutils-r1 - -DESCRIPTION="Remote control for Greenbone Vulnerability Manager, previously named openvas-cli" -HOMEPAGE="https://www.greenbone.net/en/" -SRC_URI="https://github.com/greenbone/gvm-tools/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -SLOT="0" -LICENSE="GPL-3" -KEYWORDS="~amd64 ~x86" -IUSE="" - -RDEPEND=" - >=net-analyzer/python-gvm-1.4.0[${PYTHON_USEDEP}] - !net-analyzer/openvas-cli - !net-analyzer/openvas-tools" - -DEPEND=" - ${RDEPEND}" - -distutils_enable_tests unittest - -src_prepare() { - distutils-r1_src_prepare - - # Fixing tests - # Use correct socket path - sed -i "s/\/usr\/local\/var\/run\/gvmd.sock/\/var\/run\/gvmd.sock/g" tests/test_parser.py || die - # ignore help formating - sed -i "s/class HelpFormatting/@unittest.skip('ignoring help formatting')\nclass HelpFormatting/g" tests/test_parser.py || die -} diff --git a/net-analyzer/gvm-tools/gvm-tools-24.1.0.ebuild b/net-analyzer/gvm-tools/gvm-tools-24.1.0.ebuild new file mode 100644 index 000000000000..486de1f6273a --- /dev/null +++ b/net-analyzer/gvm-tools/gvm-tools-24.1.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} ) +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" + +SLOT="0" +LICENSE="GPL-3" +KEYWORDS="amd64 ~x86" + +RDEPEND=" + >=net-analyzer/python-gvm-23.4.2[${PYTHON_USEDEP}] +" +DEPEND="${RDEPEND}" + +distutils_enable_tests unittest diff --git a/net-analyzer/gvm-tools/metadata.xml b/net-analyzer/gvm-tools/metadata.xml index eb6dcb63c5d3..49aa4756bce9 100644 --- a/net-analyzer/gvm-tools/metadata.xml +++ b/net-analyzer/gvm-tools/metadata.xml @@ -1,11 +1,15 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> + <maintainer type="person" proxied="yes"> + <email>foti.giuseppe@gmail.com</email> + <name>Giuseppe Foti</name> + </maintainer> + <maintainer type="person" proxied="yes"> <email>jonas.licht@gmail.com</email> <name>Jonas Licht</name> </maintainer> - <maintainer type="project"> + <maintainer type="project" proxied="proxy"> <email>proxy-maint@gentoo.org</email> <name>Proxy Maintainers</name> </maintainer> diff --git a/net-analyzer/gvm/files/gvm.init b/net-analyzer/gvm/files/gvm.init new file mode 100644 index 000000000000..22a736c403b3 --- /dev/null +++ b/net-analyzer/gvm/files/gvm.init @@ -0,0 +1,25 @@ +#!/sbin/openrc-run +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +: ${GVM_USER:=gvm} +: ${GVM_GROUP:=$(id -ng ${GVM_USER})} +: ${GVM_TIMEOUT:=30} + +name="Greenbone Vulnerability Manager" +command="/bin/true" +command_background="true" +command_user="${GVM_USER}:${GVM_GROUP}" +pidfile="/run/gvm/gvm.pid" +retry="${GVM_TIMEOUT}" + +depend() { + after bootmisc + need localmount net redis-openvas ospd-openvas gvmd gsad + want notus-scanner +} + +start_pre() { + mkdir /run/gvm + chown -R gvm:gvm /run/gvm/ +} diff --git a/net-analyzer/gvm/files/gvm.target b/net-analyzer/gvm/files/gvm.target new file mode 100644 index 000000000000..783f8781579a --- /dev/null +++ b/net-analyzer/gvm/files/gvm.target @@ -0,0 +1,5 @@ +[Unit] +Description=Greenbone Vulnerability Manager +Requires=multi-user.target redis-openvas.service ospd-openvas.service gvmd.service gsad.service +Wants=notus-scanner.service +After=syslog.target network.target networking.service multi-user.target notus-scanner.service redis-openvas.service ospd-openvas.service gvmd.service gsad.service diff --git a/net-analyzer/gvm/gvm-10.0.1.ebuild b/net-analyzer/gvm/gvm-10.0.1.ebuild deleted file mode 100644 index daa514eeb21e..000000000000 --- a/net-analyzer/gvm/gvm-10.0.1.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 optfeature - -DESCRIPTION="Greenbone Vulnerability Management,previously named OpenVAS" -HOMEPAGE="https://www.greenbone.net/en/" - -SLOT="0" -LICENSE="GPL-2" -KEYWORDS="~amd64 ~x86" -IUSE="cli +cron +extras +gsa ldap ospd postgres radius +sqlite" -REQUIRED_USE="|| ( postgres sqlite )" - -RDEPEND=" - >=net-analyzer/gvm-libs-10.0.1[extras?,ldap?,radius?] - >=net-analyzer/gvmd-8.0.1[extras?,postgres?,sqlite?] - >=net-analyzer/openvas-scanner-6.0.1[cron?,extras?] - cli? ( >=net-analyzer/gvm-tools-2.0.0 ) - gsa? ( >=net-analyzer/greenbone-security-assistant-8.0.1[extras?] ) - ospd? ( >=net-analyzer/ospd-2.0.0[extras?] )" - -pkg_postinst() { - elog "Additional support for extra checks can be get from" - optfeature "Web server scanning and testing tool" net-analyzer/nikto - optfeature "Portscanner" net-analyzer/nmap - optfeature "IPsec VPN scanning, fingerprinting and testing tool" net-analyzer/ike-scan - optfeature "Application protocol detection tool" net-analyzer/amap - optfeature "ovaldi (OVAL) — an OVAL Interpreter" app-forensics/ovaldi - optfeature "Linux-kernel-based portscanner" net-analyzer/portbunny - optfeature "Web application attack and audit framework" net-analyzer/w3af -} diff --git a/net-analyzer/gvm/gvm-11.0.0.ebuild b/net-analyzer/gvm/gvm-11.0.0.ebuild deleted file mode 100644 index 01f284b6ef8a..000000000000 --- a/net-analyzer/gvm/gvm-11.0.0.ebuild +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit optfeature - -DESCRIPTION="Greenbone Vulnerability Management,previously named OpenVAS" -HOMEPAGE="https://www.greenbone.net/en/" - -SLOT="0" -LICENSE="GPL-2" -KEYWORDS="~amd64 ~x86" -IUSE="cli +cron +extras +gsa ldap ospd radius" - -RDEPEND=" - >=net-analyzer/gvm-libs-11.0.0[extras?,ldap?,radius?] - >=net-analyzer/gvmd-9.0.0[extras?] - >=net-analyzer/openvas-scanner-7.0.0[cron?,extras?] - cli? ( >=net-analyzer/gvm-tools-2.0.0 ) - gsa? ( >=net-analyzer/greenbone-security-assistant-9.0.0[extras?] ) - ospd? ( >=net-analyzer/ospd-2.0.0[extras?] )" - -pkg_postinst() { - elog "Additional support for extra checks can be get from" - optfeature "Web server scanning and testing tool" net-analyzer/nikto - optfeature "Portscanner" net-analyzer/nmap - optfeature "IPsec VPN scanning, fingerprinting and testing tool" net-analyzer/ike-scan - optfeature "Application protocol detection tool" net-analyzer/amap - optfeature "ovaldi (OVAL) — an OVAL Interpreter" app-forensics/ovaldi - optfeature "Linux-kernel-based portscanner" net-analyzer/portbunny - optfeature "Web application attack and audit framework" net-analyzer/w3af -} diff --git a/net-analyzer/gvm/gvm-22.4-r1.ebuild b/net-analyzer/gvm/gvm-22.4-r1.ebuild new file mode 100644 index 000000000000..1fce1de5e626 --- /dev/null +++ b/net-analyzer/gvm/gvm-22.4-r1.ebuild @@ -0,0 +1,40 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit optfeature systemd + +DESCRIPTION="Greenbone Vulnerability Management, previously named OpenVAS" +HOMEPAGE="https://www.greenbone.net" + +SLOT="0" +LICENSE="AGPL-3+" +KEYWORDS="amd64 ~x86" +IUSE="cli doc +gsa ldap ospd snmp radius" + +RDEPEND=" + >=net-analyzer/gvm-libs-${PV}[doc?,ldap?,radius?] + >=net-analyzer/gvmd-${PV}[doc?] + >=net-analyzer/openvas-scanner-${PV}[doc?,snmp?] + >=net-analyzer/greenbone-feed-sync-23.6.0 + cli? ( >=net-analyzer/gvm-tools-21.10.0 ) + gsa? ( >=net-analyzer/gsad-${PV}[doc?] ) + ospd? ( >=net-analyzer/ospd-openvas-${PV}[doc?] ) +" + +src_unpack() { + mkdir "${WORKDIR}/${P}" +} + +src_install() { + systemd_dounit "${FILESDIR}/${PN}.target" + newinitd "${FILESDIR}/${PN}.init" "${PN}" +} + +pkg_postinst() { + optfeature "web server scanning and testing tool" net-analyzer/nikto + optfeature "IPsec VPN scanning, fingerprinting and testing tool" net-analyzer/ike-scan + optfeature "port scanner" net-analyzer/nmap + optfeature "create results from local security checks" net-analyzer/notus-scanner +} diff --git a/net-analyzer/gvm/metadata.xml b/net-analyzer/gvm/metadata.xml index eeb4ec70aac9..588dd28fa08c 100644 --- a/net-analyzer/gvm/metadata.xml +++ b/net-analyzer/gvm/metadata.xml @@ -1,27 +1,26 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> + <maintainer type="person" proxied="yes"> + <email>foti.giuseppe@gmail.com</email> + <name>Giuseppe Foti</name> + </maintainer> + <maintainer type="person" proxied="yes"> <email>jonas.licht@gmail.com</email> <name>Jonas Licht</name> </maintainer> - <maintainer type="project"> + <maintainer type="project" proxied="proxy"> <email>proxy-maint@gentoo.org</email> <name>Proxy Maintainers</name> </maintainer> <use> <flag name="cli">Command Line Interface for OpenVAS Scanner</flag> - <flag name="cron">A cron job to update GVM's vulnerability feeds daily</flag> - <flag name="extras">Extra fonts, pdf-results! and html docs support</flag> <flag name="gsa">Greenbone Security Assistant (WebUI)</flag> <flag name="ospd">Enable support for scanner wrappers</flag> </use> <longdescription lang="en"> - GVM previously named OpenVAS stands for Open Vulnerability Assessment System and is a network security scanner - with associated tools like a graphical user front-end. + GVM previously named OpenVAS stands for Open Vulnerability Assessment System and is a network security scanner + with associated tools like a graphical user front-end. The core component is a server with a set of network vulnerability tests (NVTs) to detect security problems in remote systems and applications. </longdescription> - <upstream> - <remote-id type="github">greenbone</remote-id> - </upstream> </pkgmetadata> diff --git a/net-analyzer/gvmd/Manifest b/net-analyzer/gvmd/Manifest index de6f6ae1f9ba..c3c366b7f8c7 100644 --- a/net-analyzer/gvmd/Manifest +++ b/net-analyzer/gvmd/Manifest @@ -1 +1,3 @@ -DIST gvmd-9.0.1.tar.gz 1446748 BLAKE2B 7b7b4e8e4224e7a24964f39157bd0535fb4e6405b2813da7c827f4705c4b5df4d953783a3e21950c9196aa5878a09ce6eec7b4d906cc13730e508b0aa5d4be61 SHA512 4c4f0e1fdd2255be1a96967d61d9066d8860aecc5959f04c559b1a248bcc54d9cb75facd0156e223d674f038718f1e8ba0ee6b36cdc8ed88efe480acd1aa54cf +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 diff --git a/net-analyzer/gvmd/files/greenbone-certdata-sync.conf b/net-analyzer/gvmd/files/greenbone-certdata-sync.conf deleted file mode 100644 index d31a7331d341..000000000000 --- a/net-analyzer/gvmd/files/greenbone-certdata-sync.conf +++ /dev/null @@ -1 +0,0 @@ -COMMUNITY_CERT_RSYNC_FEED="rsync://feed.openvas.org:/cert-data" diff --git a/net-analyzer/gvmd/files/greenbone-nvt-sync.conf b/net-analyzer/gvmd/files/greenbone-nvt-sync.conf deleted file mode 100644 index 967c41dec2e3..000000000000 --- a/net-analyzer/gvmd/files/greenbone-nvt-sync.conf +++ /dev/null @@ -1 +0,0 @@ -COMMUNITY_NVT_RSYNC_FEED="rsync://feed.openvas.org:/nvt-feed" diff --git a/net-analyzer/gvmd/files/greenbone-scapdata-sync.conf b/net-analyzer/gvmd/files/greenbone-scapdata-sync.conf deleted file mode 100644 index 4a7426bc8057..000000000000 --- a/net-analyzer/gvmd/files/greenbone-scapdata-sync.conf +++ /dev/null @@ -1 +0,0 @@ -COMMUNITY_SCAP_RSYNC_FEED="rsync://feed.openvas.org:/scap-data" diff --git a/net-analyzer/gvmd/files/gvmd-22.init b/net-analyzer/gvmd/files/gvmd-22.init new file mode 100644 index 000000000000..fdae00af6317 --- /dev/null +++ b/net-analyzer/gvmd/files/gvmd-22.init @@ -0,0 +1,24 @@ +#!/sbin/openrc-run +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +: ${GVMD_USER:=gvm} +: ${GVMD_GROUP:=$(id -ng ${GVMD_USER})} +: ${GVMD_TIMEOUT:=30} + +name="Greenbone Vulnerability Manager" +command=/usr/bin/gvmd +command_args="${GVMD_VT_UPDATE} ${GVMD_OPTIONS} ${GVMD_LISTEN_ADDRESS_TCP} ${GVMD_PORT} ${GVMD_SCANNER_HOST} ${GVMD_GNUTLS_PRIORITIES}" +command_user="${GVMD_USER}:${GVMD_GROUP}" +pidfile="/run/gvmd/gvmd.pid" +retry="${GVMD_TIMEOUT}" + +depend() { + after bootmisc postgresql postgresql-9.6 postgresql-10 postgresql-11 postgresql-12 postgresql-13 postgresql-14 postgresql-15 postgresql-16 + want postgresql postgresql-9.6 postgresql-10 postgresql-11 postgresql-12 postgresql-13 postgresql-14 postgresql-15 postgresql-16 + need localmount net ospd-openvas +} + +start_pre() { + checkpath -d --owner ${GVMD_USER} /run/gvmd +} diff --git a/net-analyzer/gvmd/files/gvmd-9.0.1-glibc_siglist.patch b/net-analyzer/gvmd/files/gvmd-9.0.1-glibc_siglist.patch deleted file mode 100644 index 186bd882bdd8..000000000000 --- a/net-analyzer/gvmd/files/gvmd-9.0.1-glibc_siglist.patch +++ /dev/null @@ -1,96 +0,0 @@ -From ed07f5a23dd0644d0bbd3f2ddc1cec3b6ce922c6 Mon Sep 17 00:00:00 2001 -From: Timo Gurr <timo.gurr@gmail.com> -Date: Tue, 1 Sep 2020 10:03:34 +0200 -Subject: [PATCH] Replace deprecated sys_siglist with strsignal - -Required to work with glibc >= 2.32. - -https://sourceware.org/pipermail/libc-announce/2020/000029.html - - The deprecated arrays sys_siglist, _sys_siglist, and sys_sigabbrev - are no longer available to newly linked binaries, and their declarations - have been removed from <string.h>. They are exported solely as - compatibility symbols to support old binaries. All programs should use - strsignal instead. - ---- ./src/manage.c 2020-05-12 18:54:26.000000000 +0200 -+++ ./src/manage.c 2020-10-27 13:32:20.423421085 +0100 -@@ -3283,7 +3283,7 @@ - { - g_debug ("%s: Received %s signal.", - __FUNCTION__, -- sys_siglist[get_termination_signal()]); -+ strsignal(get_termination_signal())); - } - if (global_current_report) - { -@@ -3305,7 +3305,7 @@ - { - g_debug ("%s: Received %s signal.", - __FUNCTION__, -- sys_siglist[get_termination_signal()]); -+ strsignal(get_termination_signal())); - if (global_current_report) - { - set_report_scan_run_status (global_current_report, ---- ./src/gvmd.c 2020-05-12 18:54:26.000000000 +0200 -+++ ./src/gvmd.c 2020-10-27 13:34:47.606424207 +0100 -@@ -922,7 +922,7 @@ - if (sigaction (signal, &action, NULL) == -1) - { - g_critical ("%s: failed to register %s handler", -- __FUNCTION__, sys_siglist[signal]); -+ __FUNCTION__, strsignal(termination_signal)); - exit (EXIT_FAILURE); - } - } -@@ -953,7 +953,7 @@ - if (sigaction (signal, &action, NULL) == -1) - { - g_critical ("%s: failed to register %s handler", -- __FUNCTION__, sys_siglist[signal]); -+ __FUNCTION__, strsignal(termination_signal)); - exit (EXIT_FAILURE); - } - } -@@ -1258,7 +1258,7 @@ - if (termination_signal) - { - g_debug ("Received %s signal", -- sys_siglist[termination_signal]); -+ strsignal(termination_signal)); - cleanup (); - /* Raise signal again, to exit with the correct return value. */ - setup_signal_handler (termination_signal, SIG_DFL, 0); -@@ -1347,7 +1347,7 @@ - if (termination_signal) - { - g_debug ("Received %s signal", -- sys_siglist[termination_signal]); -+ strsignal(termination_signal)); - cleanup (); - /* Raise signal again, to exit with the correct return value. */ - setup_signal_handler (termination_signal, SIG_DFL, 0); ---- ./src/manage_sql.c 2020-05-12 18:54:26.000000000 +0200 -+++ ./src/manage_sql.c 2020-10-27 13:36:19.071426148 +0100 -@@ -18711,7 +18711,7 @@ - void - manage_cleanup_process_error (int signal) - { -- g_debug ("Received %s signal", sys_siglist[signal]); -+ g_debug ("Received %s signal", strsignal(signal)); - if (sql_is_open ()) - { - if (current_scanner_task) ---- ./src/gmpd.c 2020-05-12 18:54:26.000000000 +0200 -+++ ./src/gmpd.c 2020-10-27 13:46:29.687439101 +0100 -@@ -496,8 +496,7 @@ - { - g_debug ("%s: Received %s signal.", - __FUNCTION__, -- sys_siglist[get_termination_signal()]); -- -+ strsignal(get_termination_signal())); - goto client_free; - } - diff --git a/net-analyzer/gvmd/files/gvmd-daemon-22.conf b/net-analyzer/gvmd/files/gvmd-daemon-22.conf new file mode 100644 index 000000000000..061609e1c45c --- /dev/null +++ b/net-analyzer/gvmd/files/gvmd-daemon-22.conf @@ -0,0 +1,32 @@ +# GVMD command args + +# e.g --foreground +GVMD_OPTIONS="" + +# Manager listen address unix socket +# Failing under non-root user (looking for solution) +GVMD_LISTEN_ADDRESS_UNIX="--unix-socket=/run/gvmd/gvmd.sock" + +# Manager listen address TCP +GVMD_LISTEN_ADDRESS_TCP="--listen=127.0.0.1" + +# Manager listen port +GVMD_PORT="--port=9390" + +# Manager unix socket listen owner +GVMD_LISTEN_OWNER="--listen-owner=gvm" + +# Manager unix socket listen group +GVMD_LISTEN_GROUP="--listen-group=gvm" + +# Manager unix socket listen mode +GVMD_LISTEN_MODE="--listen-mode=755" + +# Scanner listen address unix socket +GVMD_SCANNER_HOST="--scanner-host=/run/ospd/ospd-openvas.sock" + +# Update vt +GVMD_VT_UPDATE="--osp-vt-update=/run/ospd/ospd-openvas.sock" + +# TLS settings +GVMD_GNUTLS_PRIORITIES="--gnutls-priorities=SECURE256:+SUITEB192:+SECURE192:+SECURE128:+SUITEB128:-MD5:-SHA1:-VERS-TLS1.0:-VERS-TLS1.1:-VERS-SSL3.0" diff --git a/net-analyzer/gvmd/files/gvmd-daemon.conf b/net-analyzer/gvmd/files/gvmd-daemon.conf deleted file mode 100644 index d97da00c7688..000000000000 --- a/net-analyzer/gvmd/files/gvmd-daemon.conf +++ /dev/null @@ -1,29 +0,0 @@ -# GVMD command args - -# e.g --foreground -GVMD_OPTIONS="" - -# Manager listen address unix socket -# Failing under non-root user (looking for solution) -GVMD_LISTEN_ADDRESS_UNIX="--unix-socket=/var/run/gvmd.sock" - -# Manager listen address TCP -GVMD_LISTEN_ADDRESS_TCP="--listen=127.0.0.1" - -# Manager listen port -GVMD_PORT="--port=9390" - -# Manager unix socket listen owner -GVMD_LISTEN_OWNER="--listen-owner=gvm" - -# Manager unix socket listen group -GVMD_LISTEN_GROUP="--listen-group=gvm" - -# Manager unix socket listen mode -GVMD_LISTEN_MODE="--listen-mode=755" - -# Scanner listen address unix socket -GVMD_SCANNER_HOST="--scanner-host=/var/run/openvassd.sock" - -# TLS settings -GVMD_GNUTLS_PRIORITIES="--gnutls-priorities=SECURE256:+SUITEB192:+SECURE192:+SECURE128:+SUITEB128:-MD5:-SHA1:-VERS-TLS1.0:-VERS-TLS1.1:-VERS-SSL3.0" diff --git a/net-analyzer/gvmd/files/gvmd-startpre.sh b/net-analyzer/gvmd/files/gvmd-startpre.sh deleted file mode 100644 index d04daa09b0a2..000000000000 --- a/net-analyzer/gvmd/files/gvmd-startpre.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/sh - -# Greenbone Vulnerability Manager Systemd ExecStartPre -touch /var/run/gvm-{checking,create-functions,helping,migrating,serving} -chown -R gvm:gvm /var/run/gvm-{checking,create-functions,helping,migrating,serving} diff --git a/net-analyzer/gvmd/files/gvmd.init b/net-analyzer/gvmd/files/gvmd.init deleted file mode 100644 index 098232afa1e5..000000000000 --- a/net-analyzer/gvmd/files/gvmd.init +++ /dev/null @@ -1,24 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -: ${GVMD_USER:=gvm} -: ${GVMD_GROUP:=gvm} -: ${GVMD_TIMEOUT:=30} - -name="Greenbone Vulnerability Manager" -command=/usr/bin/gvmd -command_args="--foreground ${GVMD_OPTIONS} ${GVMD_LISTEN_ADDRESS_TCP} ${GVMD_PORT} ${GVMD_SCANNER_HOST} ${GVMD_GNUTLS_PRIORITIES}" -command_background="true" -command_user="${GVMD_USER}:${GVMD_GROUP}" -pidfile="/run/gvmd.pid" -retry="${GVMD_TIMEOUT}" - -depend() { - after bootmisc - need localmount net ospd-openvas -} - -start_pre() { - /bin/bash /etc/gvm/gvmd-startpre.sh -} diff --git a/net-analyzer/gvmd/files/gvmd.logrotate b/net-analyzer/gvmd/files/gvmd.logrotate deleted file mode 100644 index 453462575f8b..000000000000 --- a/net-analyzer/gvmd/files/gvmd.logrotate +++ /dev/null @@ -1,13 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 -# Daemon ignore HUP so we use 'copytruncate' instead of 'create' -# with safe file size to prevent losing log entries. - -/var/log/gvm/gvmd.log { - compress - missingok - notifempty - sharedscripts - copytruncate - maxsize 10M -} diff --git a/net-analyzer/gvmd/files/gvmd.service b/net-analyzer/gvmd/files/gvmd.service deleted file mode 100644 index 2e3ad84c85a5..000000000000 --- a/net-analyzer/gvmd/files/gvmd.service +++ /dev/null @@ -1,21 +0,0 @@ -[Unit] -Description=Greenbone Vulnerability Manager -After=network.target -After=openvassd.service -Wants=openvassd.service -Before=gsad.service - -[Service] -Type=forking -PrivateTmp=yes -User=gvm -Group=gvm -PermissionsStartOnly=true -EnvironmentFile=-/etc/gvm/sysconfig/gvmd-daemon.conf -ExecStartPre=-/etc/gvm/gvmd-startpre.sh -ExecStart=/usr/bin/gvmd $GVMD_OPTIONS $GVMD_LISTEN_ADDRESS_TCP $GVMD_PORT $GVMD_SCANNER_HOST $GVMD_GNUTLS_PRIORITIES -Restart=on-failure -RestartSec=10 - -[Install] -WantedBy=multi-user.target diff --git a/net-analyzer/gvmd/files/gvmd.service.conf b/net-analyzer/gvmd/files/gvmd.service.conf new file mode 100644 index 000000000000..2e22ddab18c3 --- /dev/null +++ b/net-analyzer/gvmd/files/gvmd.service.conf @@ -0,0 +1,23 @@ +[Unit] +After=postgresql-9.6.service +After=postgresql-10.service +After=postgresql-11.service +After=postgresql-12.service +After=postgresql-13.service +After=postgresql-14.service +After=postgresql-15.service +After=postgresql-16.service +Wants=postgresql-9.6.service +Wants=postgresql-10.service +Wants=postgresql-11.service +Wants=postgresql-12.service +Wants=postgresql-13.service +Wants=postgresql-14.service +Wants=postgresql-15.service +Wants=postgresql-16.service +PartOf=gvm.target + +[Service] +Type=exec +ExecStart= +ExecStart=/usr/bin/gvmd --foreground --osp-vt-update=/run/ospd/ospd-openvas.sock --listen-group=gvm diff --git a/net-analyzer/gvmd/gvmd-23.1.0.ebuild b/net-analyzer/gvmd/gvmd-23.1.0.ebuild new file mode 100644 index 000000000000..0730bd7ff8ed --- /dev/null +++ b/net-analyzer/gvmd/gvmd-23.1.0.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.7 + >=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.4.0.ebuild b/net-analyzer/gvmd/gvmd-23.4.0.ebuild new file mode 100644 index 000000000000..f9f321120a6e --- /dev/null +++ b/net-analyzer/gvmd/gvmd-23.4.0.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.8 + >=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.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-9.0.1.ebuild b/net-analyzer/gvmd/gvmd-9.0.1.ebuild deleted file mode 100644 index d22d159745dd..000000000000 --- a/net-analyzer/gvmd/gvmd-9.0.1.ebuild +++ /dev/null @@ -1,123 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -CMAKE_MAKEFILE_GENERATOR="emake" -inherit cmake flag-o-matic systemd toolchain-funcs - -DESCRIPTION="Greenbone vulnerability manager, previously named openvas-manager" -HOMEPAGE="https://www.greenbone.net/en/" -SRC_URI="https://github.com/greenbone/gvmd/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -SLOT="0" -LICENSE="GPL-2+" -KEYWORDS="~amd64 ~x86" -IUSE="extras +postgres sqlite test" -# keep deprecated USE Flags for revdep of gvm -REQUIRED_USE="postgres !sqlite" -RESTRICT="!test? ( test )" - -DEPEND=" - dev-db/postgresql:*[uuid] - dev-libs/libgcrypt:0= - dev-libs/libical - >=net-analyzer/gvm-libs-11.0.1 - net-libs/gnutls:=[tools] - extras? ( - app-text/xmlstarlet - dev-texlive/texlive-latexextra )" - -RDEPEND=" - ${DEPEND} - acct-user/gvm - net-analyzer/ospd-openvas" - -BDEPEND=" - sys-devel/bison - sys-devel/flex - virtual/pkgconfig - extras? ( - app-doc/doxygen[dot] - app-doc/xmltoman - app-text/htmldoc - dev-libs/libxslt - ) - test? ( dev-libs/cgreen )" - -PATCHES=( - # Replace deprecated glibc sys_siglist with strsignal - "${FILESDIR}/${P}-glibc_siglist.patch" -) - -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/gvmd-${PV}/html/*g" "$S"/doc/CMakeLists.txt || die - sed -i -e "s*/doc/gvm/*/doc/gvmd-${PV}/*g" "$S"/CMakeLists.txt || die - # QA-Fix | Remove !CLANG Doxygen warnings for 9.0.0 - if use extras; 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" - ) - cmake_src_configure -} - -src_compile() { - cmake_src_compile - if use extras; 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 extras; then - local HTML_DOCS=( "${BUILD_DIR}"/doc/generated/html/. ) - fi - cmake_src_install - - insinto /etc/gvm - doins -r "${FILESDIR}"/*sync* - - insinto /etc/gvm/sysconfig - doins "${FILESDIR}/${PN}-daemon.conf" - - exeinto /etc/gvm - doexe "${FILESDIR}"/gvmd-startpre.sh - - fowners -R gvm:gvm /etc/gvm - - newinitd "${FILESDIR}/${PN}.init" "${PN}" - newconfd "${FILESDIR}/${PN}-daemon.conf" "${PN}" - - insinto /etc/logrotate.d - newins "${FILESDIR}/${PN}.logrotate" "${PN}" - - systemd_dounit "${FILESDIR}/${PN}.service" - - # Set proper permissions on required files/directories - keepdir /var/lib/gvm/gvmd - fowners -R gvm:gvm /var/lib/gvm -} diff --git a/net-analyzer/gvmd/metadata.xml b/net-analyzer/gvmd/metadata.xml index 072f33914919..362c0017dc23 100644 --- a/net-analyzer/gvmd/metadata.xml +++ b/net-analyzer/gvmd/metadata.xml @@ -1,22 +1,23 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> + <maintainer type="person" proxied="yes"> + <email>foti.giuseppe@gmail.com</email> + <name>Giuseppe Foti</name> + </maintainer> + <maintainer type="person" proxied="yes"> <email>jonas.licht@gmail.com</email> <name>Jonas Licht</name> </maintainer> - <maintainer type="project"> + <maintainer type="project" proxied="proxy"> <email>proxy-maint@gentoo.org</email> <name>Proxy Maintainers</name> </maintainer> - <use> - <flag name="extras">Html docs support</flag> - </use> <longdescription lang="en"> The Greenbone Vulnerability Manager is the central management service between security scanners and the user clients. It manages the storage of any vulnerability management configurations and of the scan results. Access to data, control commands and workflows is offered via the XML-based Greenbone Management Protocol (GMP). - The primary scanner OpenVAS Scanner is controlled directly via protocol OTP while any other + The primary scanner OpenVAS Scanner is controlled directly via protocol OTP while any other remote scanner is coupled with the Open Scanner Protocol (OSP). </longdescription> <upstream> diff --git a/net-analyzer/hexinject/Manifest b/net-analyzer/hexinject/Manifest index dfec39c623d0..8edb0618ffb3 100644 --- a/net-analyzer/hexinject/Manifest +++ b/net-analyzer/hexinject/Manifest @@ -1,2 +1 @@ -DIST hexinject-1.5.tar.gz 14449 BLAKE2B e7c3fc34cce5b004622d6fe30584d90d8739fcc218d485317ddab178807caa4bf82e86b66f45df3311e05ca96c58aa9590108ffaa53c703feaafa64af8804e2e SHA512 cd145b6f2ae9d739effca03959fb474df11d28ff015c0e5bd1e30c341f60085154795f3c8a601b7241623944b3868b6fc9a3e1530a3aa4e7aaa2b3794a5aa34a DIST hexinject-1.6.tar.gz 16876 BLAKE2B ac2951a5b4705ec84ed72fa5513e84b8bf031bd7e43b05c76fe83fc601cf3a245352afb0f226cc128bb028124ba898bc67394f2d839554ee01e25ee25c8f0c4d SHA512 7432122a7ca42b7ac066cc55daec2d4a656b08e0f390db1a49f626181080d07687026d04a150573e3341e4e76f87a20b6466deddcc9d022e7d66fadcb8dac1ad diff --git a/net-analyzer/hexinject/files/hexinject-1.5-fix-build-system.patch b/net-analyzer/hexinject/files/hexinject-1.5-fix-build-system.patch deleted file mode 100644 index 046d083710df..000000000000 --- a/net-analyzer/hexinject/files/hexinject-1.5-fix-build-system.patch +++ /dev/null @@ -1,15 +0,0 @@ -Respect user flags - ---- a/Makefile -+++ b/Makefile -@@ -1,7 +1,7 @@ - all: -- gcc -o hexinject hexinject.c -lpcap -- gcc -o prettypacket prettypacket.c -- gcc -o hex2raw hex2raw.c -+ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o hexinject hexinject.c -lpcap -+ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o prettypacket prettypacket.c -+ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o hex2raw hex2raw.c - - clean: - rm -f hexinject prettypacket hex2raw *~ diff --git a/net-analyzer/hexinject/files/hexinject-1.6-fix-build-system.patch b/net-analyzer/hexinject/files/hexinject-1.6-fix-build-system.patch index fbe91199bbfa..9d22337afa93 100644 --- a/net-analyzer/hexinject/files/hexinject-1.6-fix-build-system.patch +++ b/net-analyzer/hexinject/files/hexinject-1.6-fix-build-system.patch @@ -1,18 +1,22 @@ Author: holgersson <holgersson@posteo.de> Date: Fri Oct 20 18:30:00 2017 +0200 -Don’t call gcc directly, and respect CFLAGS. As this project -is plain C I don’t care fore CXXFLAGS here. +Respect CC, CFLAGS, CPPFLAGS and LDFLAGS. ---- a/Makefile 2017-10-20 18:15:11.743805540 +0200 -+++ b/Makefile 2017-10-20 18:24:55.120009439 +0200 -@@ -1,6 +1,6 @@ +--- a/Makefile ++++ b/Makefile +@@ -1,11 +1,7 @@ -CC = gcc -CFLAGS = -Wall -LDFLAGS = -lpcap -+CC ?= gcc +CFLAGS += -Wall -+LDFLAGS = -lpcap ++LDLIBS = -lpcap - all: - $(CC) $(CFLAGS) $(LDFLAGS) -o hexinject hexinject.c +-all: +- $(CC) $(CFLAGS) $(LDFLAGS) -o hexinject hexinject.c +- $(CC) $(CFLAGS) $(LDFLAGS) -o prettypacket prettypacket.c +- $(CC) $(CFLAGS) $(LDFLAGS) -o hex2raw hex2raw.c ++all: hexinject prettypacket hex2raw + + clean: + rm -f hexinject prettypacket hex2raw *~ diff --git a/net-analyzer/hexinject/hexinject-1.5.ebuild b/net-analyzer/hexinject/hexinject-1.5.ebuild deleted file mode 100644 index b33f5f0bda0c..000000000000 --- a/net-analyzer/hexinject/hexinject-1.5.ebuild +++ /dev/null @@ -1,36 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit flag-o-matic toolchain-funcs - -DESCRIPTION="Network packet sniffer and injector" -HOMEPAGE="http://hexinject.sourceforge.net/" -SRC_URI="http://downloads.sourceforge.net/project/${PN}/${P}/${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="+tools experimental" - -DEPEND="net-libs/libpcap" -RDEPEND="${DEPEND} - experimental? ( dev-lang/tcl )" - -S="${WORKDIR}/${PN}" - -PATCHES=( "${FILESDIR}"/${PN}-1.5-fix-build-system.patch ) - -src_prepare() { - default - append-cflags -std=gnu89 - tc-export CC -} - -src_install() { - dobin hexinject - use tools && dobin hex2raw prettypacket - use experimental && dobin packets.tcl - einstalldocs -} diff --git a/net-analyzer/hexinject/hexinject-1.6-r1.ebuild b/net-analyzer/hexinject/hexinject-1.6-r1.ebuild deleted file mode 100644 index e36c1803461e..000000000000 --- a/net-analyzer/hexinject/hexinject-1.6-r1.ebuild +++ /dev/null @@ -1,36 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" - -inherit toolchain-funcs - -DESCRIPTION="Network packet sniffer and injector" -HOMEPAGE="http://hexinject.sourceforge.net/" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="+tools experimental" - -DEPEND="net-libs/libpcap" -RDEPEND="${DEPEND} - experimental? ( dev-lang/tcl )" - -S="${WORKDIR}/${PN}" - -PATCHES=( "${FILESDIR}"/${PN}-1.6-fix-build-system.patch ) - -src_configure() { - default - - tc-export CC -} - -src_install() { - dobin hexinject - use tools && dobin hex2raw prettypacket - use experimental && dobin packets.tcl - einstalldocs -} diff --git a/net-analyzer/hexinject/hexinject-1.6-r2.ebuild b/net-analyzer/hexinject/hexinject-1.6-r2.ebuild new file mode 100644 index 000000000000..bfef01f88b8f --- /dev/null +++ b/net-analyzer/hexinject/hexinject-1.6-r2.ebuild @@ -0,0 +1,33 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit toolchain-funcs + +DESCRIPTION="Network packet sniffer and injector" +HOMEPAGE="http://hexinject.sourceforge.net/" +SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" +S="${WORKDIR}/${PN}" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="+tools experimental" + +DEPEND="net-libs/libpcap" +RDEPEND="${DEPEND} + experimental? ( dev-lang/tcl )" + +PATCHES=( "${FILESDIR}"/${PN}-1.6-fix-build-system.patch ) + +src_configure() { + tc-export CC +} + +src_install() { + dobin hexinject + use tools && dobin hex2raw prettypacket + use experimental && dobin packets.tcl + einstalldocs +} diff --git a/net-analyzer/hexinject/hexinject-1.6.ebuild b/net-analyzer/hexinject/hexinject-1.6.ebuild deleted file mode 100644 index 5d8011ced352..000000000000 --- a/net-analyzer/hexinject/hexinject-1.6.ebuild +++ /dev/null @@ -1,34 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit flag-o-matic toolchain-funcs - -DESCRIPTION="Network packet sniffer and injector" -HOMEPAGE="http://hexinject.sourceforge.net/" -SRC_URI="http://downloads.sourceforge.net/project/${PN}/${P}/${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="+tools experimental" - -DEPEND="net-libs/libpcap" -RDEPEND="${DEPEND} - experimental? ( dev-lang/tcl )" - -S="${WORKDIR}/${PN}" - -src_prepare() { - default - append-cflags -std=gnu89 - tc-export CC -} - -src_install() { - dobin hexinject - use tools && dobin hex2raw prettypacket - use experimental && dobin packets.tcl - einstalldocs -} diff --git a/net-analyzer/hexinject/metadata.xml b/net-analyzer/hexinject/metadata.xml index e3ef4f8b00b1..531e51708740 100644 --- a/net-analyzer/hexinject/metadata.xml +++ b/net-analyzer/hexinject/metadata.xml @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> + <maintainer type="person" proxied="yes"> <email>holgersson@posteo.de</email> <name>Nils Freydank</name> </maintainer> - <maintainer type="project"> + <maintainer type="project" proxied="proxy"> <email>proxy-maint@gentoo.org</email> <name>Proxy Maintainers</name> </maintainer> diff --git a/net-analyzer/hping/files/bytesex.h.patch b/net-analyzer/hping/files/bytesex.h.patch deleted file mode 100644 index 872321d41bfd..000000000000 --- a/net-analyzer/hping/files/bytesex.h.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- a/bytesex.h -+++ b/bytesex.h -@@ -9,11 +9,15 @@ - - #if defined(__i386__) \ - || defined(__alpha__) \ -+ || defined(__arm__) \ -+ || defined(__x86_64__) \ -+ || defined(__ia64__) \ - || (defined(__mips__) && (defined(MIPSEL) || defined (__MIPSEL__))) - #define BYTE_ORDER_LITTLE_ENDIAN - #elif defined(__mc68000__) \ - || defined (__sparc__) \ - || defined (__sparc) \ -+ || defined (__hppa__) \ - || defined (__PPC__) \ - || defined (__BIG_ENDIAN__) \ - || (defined(__mips__) && (defined(MIPSEB) || defined (__MIPSEB__))) diff --git a/net-analyzer/hping/hping-3_pre20141226.ebuild b/net-analyzer/hping/hping-3_pre20141226.ebuild index 5b7241faa8d8..ea7237270ec2 100644 --- a/net-analyzer/hping/hping-3_pre20141226.ebuild +++ b/net-analyzer/hping/hping-3_pre20141226.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 toolchain-funcs +inherit flag-o-matic toolchain-funcs HPING_COMMIT="3547c7691742c6eaa31f8402e0ccbb81387c1b99" DESCRIPTION="A ping-like TCP/IP packet assembler/analyzer" @@ -13,7 +13,7 @@ S="${WORKDIR}/${PN}-${HPING_COMMIT}" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc sparc x86" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc sparc x86" IUSE="tcl" DEPEND=" @@ -36,6 +36,9 @@ PATCHES=( ) src_configure() { + # bug #861161 + filter-lto + tc-export CC # Not an autotools type configure: diff --git a/net-analyzer/hping/metadata.xml b/net-analyzer/hping/metadata.xml index 74c2baebb4ec..1a63b0126d8d 100644 --- a/net-analyzer/hping/metadata.xml +++ b/net-analyzer/hping/metadata.xml @@ -1,8 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!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> + <maintainer type="project"> + <email>netmon@gentoo.org</email> + <name>Gentoo network monitoring and analysis project</name> + </maintainer> + <upstream> + <remote-id type="github">antirez/hping</remote-id> + </upstream> </pkgmetadata> diff --git a/net-analyzer/httping/Manifest b/net-analyzer/httping/Manifest index 50d7e99a616d..c94047bd1d9c 100644 --- a/net-analyzer/httping/Manifest +++ b/net-analyzer/httping/Manifest @@ -1 +1,2 @@ DIST httping-2.5.tgz 71400 BLAKE2B da261827a4e2276816dbb2f9a6bac989f4ec0e7fc4b7686d51e57f8d4078ec3f94acef032b7042774e9cff57c8158696026e45d44ae1fbb00e52175c9c08b9a5 SHA512 397ce2eac91c9aede0eb19823bfca4e7f98c263937f5954c8a48d5248a251d2030e31f18decb7f7f8b0118ec0e16ec0a84ea4c943ccde7056b80de162954c355 +DIST httping-2.9.tar.gz 83674 BLAKE2B aa1e2b74756ebf62896ad2a4b89e68eff61f73f98ff881bba2fe4e14d2ed2a63af84a2780122ad845d1057ece3f37d567b7bf5d5b62a4b8487c58f1442a90fdf SHA512 74d4a98590b6862a2f15fffdf3bc58e3226a94c7aebbe60135695397b20e6cb71fe8c2af75b8525724f2f9ce6530d1f8eecd3193bc50f31d254bbb9903615019 diff --git a/net-analyzer/httping/files/httping-2.9-c99.patch b/net-analyzer/httping/files/httping-2.9-c99.patch new file mode 100644 index 000000000000..48e07219d4e8 --- /dev/null +++ b/net-analyzer/httping/files/httping-2.9-c99.patch @@ -0,0 +1,35 @@ +https://github.com/folkertvanheusden/HTTPing/pull/12 + +From 684a6e255ea2f5b11a0548e5d99c2678be7563d9 Mon Sep 17 00:00:00 2001 +From: Sam James <sam@gentoo.org> +Date: Sat, 16 Dec 2023 10:48:17 +0000 +Subject: [PATCH] http.c: add <stdlib.h> for malloc +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +GCC 14 makes implicit function declarations an error by default: +``` +http.c: In function ‘get_HTTP_headers’: +http.c:21:32: error: implicit declaration of function ‘malloc’ [-Wimplicit-function-declaration] + 21 | char *buffer = (char *)malloc(len + 1); + | ^~~~~~ +http.c:16:1: note: include ‘<stdlib.h>’ or provide a declaration of ‘malloc’ + 15 | #include "utils.h" + +++ |+#include <stdlib.h> + 16 | +[...] +``` + +Bug: https://bugs.gentoo.org/920107 +Signed-off-by: Sam James <sam@gentoo.org> +--- a/http.c ++++ b/http.c +@@ -2,6 +2,7 @@ + + #include <assert.h> + #include <stdio.h> ++#include <stdlib.h> + #include <string.h> + #include <unistd.h> + #ifndef NO_SSL diff --git a/net-analyzer/httping/httping-2.5.ebuild b/net-analyzer/httping/httping-2.5.ebuild index b4f856e559ba..13b748882e33 100644 --- a/net-analyzer/httping/httping-2.5.ebuild +++ b/net-analyzer/httping/httping-2.5.ebuild @@ -1,30 +1,26 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 -inherit eutils toolchain-funcs +EAPI=7 + +inherit toolchain-funcs flag-o-matic DESCRIPTION="http protocol ping-like program" -HOMEPAGE="http://www.vanheusden.com/httping/" -SRC_URI="http://www.vanheusden.com/${PN}/${P}.tgz" +HOMEPAGE="https://www.vanheusden.com/httping/" +SRC_URI="https://www.vanheusden.com/${PN}/${P}.tgz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 ~arm64 ~hppa ~mips ~ppc ppc64 ~sparc x86" -IUSE="debug fftw libressl l10n_nl ncurses ssl +tfo" +KEYWORDS="amd64 ~arm64 ~hppa ~mips ~ppc ppc64 ~riscv ~sparc x86" +IUSE="debug fftw l10n_nl ncurses ssl +tfo" RDEPEND=" fftw? ( sci-libs/fftw:3.0 ) ncurses? ( sys-libs/ncurses:0= ) - ssl? ( - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) - ) -" -DEPEND=" - ${RDEPEND} - ncurses? ( virtual/pkgconfig ) + ssl? ( dev-libs/openssl:0= ) " +DEPEND="${RDEPEND}" +BDEPEND="ncurses? ( virtual/pkgconfig )" # This would bring in test? ( dev-util/cppcheck ) but unlike # upstream we should only care about compile/run time testing @@ -43,13 +39,21 @@ src_prepare() { mkdir nl || die mv httping-nl.1 nl/httping.1 || die fi + } src_configure() { # not an autotools script echo > makefile.inc || die - use ncurses && LDFLAGS+=" $( $( tc-getPKG_CONFIG ) --libs ncurses )" + if use ncurses ; then + local ncurses_flags="$($(tc-getPKG_CONFIG) --libs ncurses)" + + # Don't require ncurses with unicode support + # bug #731950 + sed -i -e "s/-lncursesw/${ncurses_flags}/" Makefile || die + append-ldflags "${ncurses_flags}" + fi } src_compile() { diff --git a/net-analyzer/httping/httping-2.9-r1.ebuild b/net-analyzer/httping/httping-2.9-r1.ebuild new file mode 100644 index 000000000000..a9db3b0d13f7 --- /dev/null +++ b/net-analyzer/httping/httping-2.9-r1.ebuild @@ -0,0 +1,79 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit toolchain-funcs flag-o-matic + +DESCRIPTION="http protocol ping-like program" +HOMEPAGE="https://www.vanheusden.com/httping/" +SRC_URI="https://github.com/folkertvanheusden/HTTPing/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}"/HTTPing-${PV} + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="amd64 ~arm64 ~hppa ~mips ~ppc ppc64 ~riscv ~sparc x86" +IUSE="debug fftw l10n_nl ncurses ssl +tfo" + +RDEPEND=" + fftw? ( sci-libs/fftw:3.0 ) + ncurses? ( sys-libs/ncurses:= ) + ssl? ( dev-libs/openssl:= ) +" +DEPEND="${RDEPEND}" +BDEPEND="ncurses? ( virtual/pkgconfig )" + +# This would bring in test? ( dev-util/cppcheck ) but unlike +# upstream we should only care about compile/run time testing +RESTRICT="test" + +PATCHES=( + "${FILESDIR}"/${PN}-2.2.1-flags.patch + "${FILESDIR}"/${PN}-2.9-c99.patch +) + +src_prepare() { + default + + # Don't clobber toolchain defaults + sed -i -e 's:-D_FORTIFY_SOURCE=2::' Makefile || die + + # doman does not get PN-LANG.CAT so we move things around and then point at + # it later + if use l10n_nl; then + mkdir nl || die + mv httping-nl.1 nl/httping.1 || die + fi + +} + +src_configure() { + # not an autotools script + echo > makefile.inc || die + + if use ncurses ; then + local ncurses_flags="$($(tc-getPKG_CONFIG) --libs ncurses)" + + # Don't require ncurses with unicode support + # bug #731950 + sed -i -e "s/-lncursesw/${ncurses_flags}/" Makefile || die + append-libs "${ncurses_flags}" + fi +} + +src_compile() { + emake \ + CC="$(tc-getCC)" \ + FW=$(usex fftw) \ + DEBUG=$(usex debug) \ + NC=$(usex ncurses) \ + SSL=$(usex ssl) \ + TFO=$(usex tfo) +} + +src_install() { + dobin httping + doman httping.1 + + use l10n_nl && doman -i18n=nl nl/httping.1 +} diff --git a/net-analyzer/httping/httping-9999999.ebuild b/net-analyzer/httping/httping-9999999.ebuild deleted file mode 100644 index 32a92c0aead0..000000000000 --- a/net-analyzer/httping/httping-9999999.ebuild +++ /dev/null @@ -1,70 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit git-r3 toolchain-funcs - -DESCRIPTION="like ping but for HTTP requests" -HOMEPAGE="https://www.vanheusden.com/httping/" -EGIT_REPO_URI="https://github.com/flok99/httping" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="" -IUSE="debug fftw libressl l10n_nl ncurses ssl +tfo" - -RDEPEND=" - fftw? ( sci-libs/fftw:3.0 ) - ncurses? ( sys-libs/ncurses:0= ) - ssl? ( - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) - ) -" -DEPEND=" - ${RDEPEND} - ncurses? ( virtual/pkgconfig ) -" - -# This would bring in test? ( dev-util/cppcheck ) but unlike -# upstream we should only care about compile/run time testing -RESTRICT="test" - -PATCHES=( - "${FILESDIR}"/${PN}-2.2.1-flags.patch -) - -src_prepare() { - default - - # doman does not get PN-LANG.CAT so we move things around and then point at - # it later - if use l10n_nl; then - mkdir nl || die - mv httping-nl.1 nl/httping.1 || die - fi -} - -src_configure() { - # not an autotools script - echo > makefile.inc || die - - use ncurses && LDFLAGS+=" $( $( tc-getPKG_CONFIG ) --libs ncurses )" -} - -src_compile() { - emake \ - CC="$(tc-getCC)" \ - FW=$(usex fftw) \ - DEBUG=$(usex debug) \ - NC=$(usex ncurses) \ - SSL=$(usex ssl) \ - TFO=$(usex tfo) -} - -src_install() { - dobin httping - doman httping.1 - - use l10n_nl && doman -i18n=nl nl/httping.1 -} diff --git a/net-analyzer/httping/metadata.xml b/net-analyzer/httping/metadata.xml index b3a969016433..73888334196d 100644 --- a/net-analyzer/httping/metadata.xml +++ b/net-analyzer/httping/metadata.xml @@ -1,11 +1,14 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!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> -<use> -<flag name="tfo">Enable support for TCP Fast Open</flag> -</use> + <maintainer type="project"> + <email>netmon@gentoo.org</email> + <name>Gentoo network monitoring and analysis project</name> + </maintainer> + <use> + <flag name="tfo">Enable support for TCP Fast Open</flag> + </use> + <upstream> + <remote-id type="github">folkertvanheusden/HTTPing</remote-id> + </upstream> </pkgmetadata> diff --git a/net-analyzer/hunt/files/hunt-1.5-gentoo.patch b/net-analyzer/hunt/files/hunt-1.5-gentoo.patch index e0bcccae0aae..b5b49944f016 100644 --- a/net-analyzer/hunt/files/hunt-1.5-gentoo.patch +++ b/net-analyzer/hunt/files/hunt-1.5-gentoo.patch @@ -8,7 +8,10 @@ --- a/tpserv/Makefile +++ b/tpserv/Makefile -@@ -3,7 +3,7 @@ +@@ -1,9 +1,8 @@ +-CFLAGS=-Wall -O2 -g +- ++CFLAGS += -Wall all: tpserv tpserv: tpserv.o diff --git a/net-analyzer/hunt/hunt-1.5_p6_p1.ebuild b/net-analyzer/hunt/hunt-1.5_p6_p1.ebuild index ec3c6e7a044a..b31b315b3758 100644 --- a/net-analyzer/hunt/hunt-1.5_p6_p1.ebuild +++ b/net-analyzer/hunt/hunt-1.5_p6_p1.ebuild @@ -1,31 +1,28 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 + inherit flag-o-matic toolchain-funcs -DESCRIPTION="tool for checking well known weaknesses in the TCP/IP protocol" +DESCRIPTION="Tool for checking well known weaknesses in the TCP/IP protocol" HOMEPAGE="http://lin.fsid.cvut.cz/~kra/index.html" SRC_URI=" mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${PV/_p*}.orig.tar.gz - mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${PV/_p*}-$(ver_cut 4).$(ver_cut 6).diff.gz -" + mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${PV/_p*}-$(ver_cut 4).$(ver_cut 6).diff.gz" +S="${WORKDIR}/${P/_p*}" LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~ppc x86" + PATCHES=( + "${WORKDIR}"/${PN}_1.5-6.1.diff "${FILESDIR}"/${P/_p*}-exit.patch "${FILESDIR}"/${P/_p*}-gentoo.patch "${FILESDIR}"/${P/_p*}-log2.patch "${FILESDIR}"/${P/_p*}-tpserv-log.patch ) -S=${WORKDIR}/${P/_p*} - -src_prepare() { - eapply "${WORKDIR}"/${PN}_${PV/_p*}-$(ver_cut 4).$(ver_cut 6).diff - default -} src_configure() { append-cppflags -DSYNC_FAST @@ -34,7 +31,7 @@ src_configure() { src_compile() { local target for target in . tpserv; do - emake CC=$(tc-getCC) LDFLAGS="${CFLAGS} ${LDFLAGS}" -C "${target}" + emake CC="$(tc-getCC)" LDFLAGS="${CFLAGS} ${LDFLAGS}" -C "${target}" done } diff --git a/net-analyzer/hunt/metadata.xml b/net-analyzer/hunt/metadata.xml index 74c2baebb4ec..dce3f3be66c0 100644 --- a/net-analyzer/hunt/metadata.xml +++ b/net-analyzer/hunt/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>netmon@gentoo.org</email> diff --git a/net-analyzer/hydra/Manifest b/net-analyzer/hydra/Manifest index fb6dd8eb4936..b72f822f43c3 100644 --- a/net-analyzer/hydra/Manifest +++ b/net-analyzer/hydra/Manifest @@ -1,2 +1 @@ -DIST hydra-9.0.tar.gz 1168498 BLAKE2B b4834c66fb1bebcd19151784b75d4c9220cbf7045b289a063a1cbc48a793abfa2edcb466d43234bd4c8e14074a2e2a39ccd697698392f24f39c84da54ee07165 SHA512 58067bd2696e82645bb959fe5537f2876e1d8c170a15fe6a9ac65bbdc33cfb75b47fd1a969c314a6c6d91b2b6c0ce4ba087680bbd67a5a38925a2a8b5c5ad338 -DIST hydra-9.1.tar.gz 611846 BLAKE2B 9a5b6dc52b5f4069bf326e86728ebaf8c1fe018536f3943b83493de934703bff6770ae3f7a9a223ee00b5f52f7bd10ee4ddc272e1bbad00c399aa19cc0c083ba SHA512 863176375fe1aae4c0a2b74c11aba297682d66e522c98c926c539348309b0af4e407e460b4cb803d2c83c008787c73f7f1e56ac6aca9791351e1b596c2e4fbb2 +DIST hydra-9.5.tar.gz 833798 BLAKE2B 848c5b34719c2db98b3a3bee1c47e0b2ebeea668f5c387f015c7079f800cf0607a8cb5accba25ef2e253deb44422d51cf6e012c313496942a47468e0503000e8 SHA512 a8fe42d175d184cdb82072f3a963b956d767fa908aaf1cbbc0746b6a67cfd37f8b5e3ecf9be82085a7f6c1ef57e91a8bf05bfeb41e96708899b6c8d7f05eee06 diff --git a/net-analyzer/hydra/files/hydra-9.0-unneeded-buf.patch b/net-analyzer/hydra/files/hydra-9.0-unneeded-buf.patch deleted file mode 100644 index 0055257b04a0..000000000000 --- a/net-analyzer/hydra/files/hydra-9.0-unneeded-buf.patch +++ /dev/null @@ -1,60 +0,0 @@ ---- a/hydra-irc.c -+++ b/hydra-irc.c -@@ -7,7 +7,6 @@ RFC 1459: Internet Relay Chat Protocol - */ - - extern char *HYDRA_EXIT; --char *buf; - char buffer[300] = ""; - int32_t myport = PORT_IRC, mysslport = PORT_IRC_SSL; - ---- a/hydra-rexec.c -+++ b/hydra-rexec.c -@@ -5,7 +5,6 @@ - #define COMMAND "/bin/ls /" - - extern char *HYDRA_EXIT; --char *buf; - - int32_t start_rexec(int32_t s, char *ip, int32_t port, unsigned char options, char *miscptr, FILE * fp) { - char *empty = ""; ---- a/hydra-rlogin.c -+++ b/hydra-rlogin.c -@@ -12,7 +12,6 @@ no memleaks found on 110425 - #define TERM "vt100/9600" - - extern char *HYDRA_EXIT; --char *buf; - - int32_t start_rlogin(int32_t s, char *ip, int32_t port, unsigned char options, char *miscptr, FILE * fp) { - char *empty = ""; ---- a/hydra-rsh.c -+++ b/hydra-rsh.c -@@ -11,7 +11,6 @@ no memleaks found on 110425 - */ - - extern char *HYDRA_EXIT; --char *buf; - - int32_t start_rsh(int32_t s, char *ip, int32_t port, unsigned char options, char *miscptr, FILE * fp) { - char *empty = ""; ---- a/hydra-rtsp.c -+++ b/hydra-rtsp.c -@@ -12,7 +12,6 @@ - #include "sasl.h" - - extern char *HYDRA_EXIT; --char *buf; - char packet[500]; - char packet2[500]; - ---- a/hydra-teamspeak.c -+++ b/hydra-teamspeak.c -@@ -36,7 +36,6 @@ struct team_speak { - extern int32_t hydra_data_ready_timed(int32_t socket, long sec, long usec); - - extern char *HYDRA_EXIT; --char *buf; - - int32_t start_teamspeak(int32_t s, char *ip, int32_t port, unsigned char options, char *miscptr, FILE * fp) { - char *empty = ""; diff --git a/net-analyzer/hydra/files/hydra-9.0-vnc.patch b/net-analyzer/hydra/files/hydra-9.0-vnc.patch deleted file mode 100644 index 69c933ee8386..000000000000 --- a/net-analyzer/hydra/files/hydra-9.0-vnc.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/hydra-vnc.c -+++ b/hydra-vnc.c -@@ -75,7 +75,7 @@ int32_t start_vnc(int32_t s, char *ip, int32_t port, unsigned char options, char - //supported security type - switch (buf2[3]) { - case 0x0: -- hydra_report(stderr, "[ERROR] VNC server told us to quit %c\n", buf[3]); -+ hydra_report(stderr, "[ERROR] VNC server told us to quit %c\n", buf2[3]); - hydra_child_exit(0); - break; - case 0x1: diff --git a/net-analyzer/hydra/files/hydra-9.5-no-clobber-fortify-source.patch b/net-analyzer/hydra/files/hydra-9.5-no-clobber-fortify-source.patch new file mode 100644 index 000000000000..281e5b63c9ff --- /dev/null +++ b/net-analyzer/hydra/files/hydra-9.5-no-clobber-fortify-source.patch @@ -0,0 +1,14 @@ +Don't clobber toolchain defaults. + +https://bugs.gentoo.org/895530 +--- a/configure ++++ b/configure +@@ -1381,7 +1381,7 @@ fi + echo "Checking for secure compile option support in $CC ..." + GCCSEC="no" + LDSEC="no" +-GCCSECOPT="-fstack-protector-all --param ssp-buffer-size=4 -D_FORTIFY_SOURCE=2" ++GCCSECOPT="-fstack-protector-all --param ssp-buffer-size=4" + echo '#include <stdio.h>' > $TMPC.c + echo 'int main() { printf(""); return 0; }' >> $TMPC.c + $CC -pie -fPIE $GCCSEPOPT -o $TMPC $TMPC.c > /dev/null 2> $TMPC.c.err diff --git a/net-analyzer/hydra/hydra-9.0-r1.ebuild b/net-analyzer/hydra/hydra-9.0-r1.ebuild deleted file mode 100644 index 402929ea2301..000000000000 --- a/net-analyzer/hydra/hydra-9.0-r1.ebuild +++ /dev/null @@ -1,129 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit flag-o-matic 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" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" -IUSE=" - debug firebird gcrypt gtk idn libressl memcached mongodb mysql ncp ncurses - oracle pcre postgres rdp libssh subversion zlib -" - -RDEPEND=" - 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= ) - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) - memcached? ( dev-libs/libmemcached[sasl] ) - mongodb? ( dev-libs/mongo-c-driver ) - mysql? ( dev-db/mysql-connector-c:0= ) - ncp? ( net-fs/ncpfs ) - ncurses? ( sys-libs/ncurses:= ) - oracle? ( dev-db/oracle-instantclient-basic ) - pcre? ( dev-libs/libpcre ) - postgres? ( dev-db/postgresql:* ) - rdp? ( net-misc/freerdp ) - libssh? ( >=net-libs/libssh-0.4.0 ) - subversion? ( dev-vcs/subversion ) - zlib? ( sys-libs/zlib ) -" -DEPEND=" - ${RDEPEND} - virtual/pkgconfig -" -PATCHES=( - "${FILESDIR}"/${PN}-9.0-unneeded-buf.patch - "${FILESDIR}"/${PN}-9.0-vnc.patch -) -S=${WORKDIR}/thc-${P} - -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 -} - -src_configure() { - # Note: the top level configure script is not autoconf-based - tc-export CC PKG_CONFIG - - append-cflags -fcommon - - 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 ncp '-lncp' '' '-DLIBNCP' - hydra_sed ncurses '-lcurses' '$( "${PKG_CONFIG}" --libs ncurses )' '-DLIBNCURSES' - hydra_sed pcre '-lpcre' '$( "${PKG_CONFIG}" --libs libpcre )' '-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 )' '-DLIBFREERDP2' - # 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 subversion '-lsvn_client-1 -lapr-1 -laprutil-1 -lsvn_subr-1' '' '-DLIBSVN' - hydra_sed zlib '-lz' '$( "${PKG_CONFIG}" --libs zlib )' '-DHAVE_ZLIB' - - sh configure \ - $(use gtk || echo --disable-xhydra) \ - $(usex 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.0.ebuild b/net-analyzer/hydra/hydra-9.0.ebuild deleted file mode 100644 index 3a812ec881b5..000000000000 --- a/net-analyzer/hydra/hydra-9.0.ebuild +++ /dev/null @@ -1,125 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit 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" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="amd64 ~ppc x86" -IUSE=" - debug firebird gcrypt gtk idn libressl memcached mongodb mysql ncp ncurses - oracle pcre postgres rdp libssh subversion zlib -" - -RDEPEND=" - 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= ) - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) - memcached? ( dev-libs/libmemcached[sasl] ) - mongodb? ( dev-libs/mongo-c-driver ) - mysql? ( dev-db/mysql-connector-c:0= ) - ncp? ( net-fs/ncpfs ) - ncurses? ( sys-libs/ncurses:= ) - oracle? ( dev-db/oracle-instantclient-basic ) - pcre? ( dev-libs/libpcre ) - postgres? ( dev-db/postgresql:* ) - rdp? ( net-misc/freerdp ) - libssh? ( >=net-libs/libssh-0.4.0 ) - subversion? ( dev-vcs/subversion ) - zlib? ( sys-libs/zlib ) -" -DEPEND=" - ${RDEPEND} - virtual/pkgconfig -" -S=${WORKDIR}/thc-${P} - -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 -} - -src_configure() { - # Note: the top level configure script is not autoconf-based - tc-export CC PKG_CONFIG - - append-cflags -fcommon - - 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 ncp '-lncp' '' '-DLIBNCP' - hydra_sed ncurses '-lcurses' '$( "${PKG_CONFIG}" --libs ncurses )' '-DLIBNCURSES' - hydra_sed pcre '-lpcre' '$( "${PKG_CONFIG}" --libs libpcre )' '-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 )' '-DLIBFREERDP2' - # 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 subversion '-lsvn_client-1 -lapr-1 -laprutil-1 -lsvn_subr-1' '' '-DLIBSVN' - hydra_sed zlib '-lz' '$( "${PKG_CONFIG}" --libs zlib )' '-DHAVE_ZLIB' - - sh configure \ - $(use gtk || echo --disable-xhydra) \ - $(usex 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.1.ebuild b/net-analyzer/hydra/hydra-9.1.ebuild deleted file mode 100644 index 0b2eb5c879d1..000000000000 --- a/net-analyzer/hydra/hydra-9.1.ebuild +++ /dev/null @@ -1,125 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit flag-o-matic 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" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" -IUSE=" - debug firebird gcrypt gtk idn libressl memcached mongodb mysql ncp ncurses - oracle pcre postgres rdp libssh subversion zlib -" - -RDEPEND=" - 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= ) - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) - memcached? ( dev-libs/libmemcached[sasl] ) - mongodb? ( dev-libs/mongo-c-driver ) - mysql? ( dev-db/mysql-connector-c:0= ) - ncp? ( net-fs/ncpfs ) - ncurses? ( sys-libs/ncurses:= ) - oracle? ( dev-db/oracle-instantclient-basic ) - pcre? ( dev-libs/libpcre ) - postgres? ( dev-db/postgresql:* ) - rdp? ( net-misc/freerdp ) - libssh? ( >=net-libs/libssh-0.4.0 ) - subversion? ( dev-vcs/subversion ) - zlib? ( sys-libs/zlib ) -" -DEPEND=" - ${RDEPEND} - virtual/pkgconfig -" -S=${WORKDIR}/thc-${P} - -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 -} - -src_configure() { - # Note: the top level configure script is not autoconf-based - tc-export CC PKG_CONFIG - - append-cflags -fcommon - - 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 ncp '-lncp' '' '-DLIBNCP' - hydra_sed ncurses '-lcurses' '$( "${PKG_CONFIG}" --libs ncurses )' '-DLIBNCURSES' - hydra_sed pcre '-lpcre' '$( "${PKG_CONFIG}" --libs libpcre )' '-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 subversion '-lsvn_client-1 -lapr-1 -laprutil-1 -lsvn_subr-1' '' '-DLIBSVN' - hydra_sed zlib '-lz' '$( "${PKG_CONFIG}" --libs zlib )' '-DHAVE_ZLIB' - - sh configure \ - $(use gtk || echo --disable-xhydra) \ - $(usex 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.md -} diff --git a/net-analyzer/hydra/hydra-9.5-r1.ebuild b/net-analyzer/hydra/hydra-9.5-r1.ebuild new file mode 100644 index 000000000000..daca94b7c580 --- /dev/null +++ b/net-analyzer/hydra/hydra-9.5-r1.ebuild @@ -0,0 +1,128 @@ +# Copyright 1999-2024 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? ( + >=app-accessibility/at-spi2-core-2.46.0 + 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:= ) + memcached? ( dev-libs/libmemcached[sasl] ) + mongodb? ( dev-libs/mongo-c-driver ) + mysql? ( dev-db/mysql-connector-c:= ) + ncurses? ( sys-libs/ncurses:= ) + oracle? ( dev-db/oracle-instantclient[sdk] ) + pcre? ( dev-libs/libpcre2 ) + postgres? ( dev-db/postgresql:* ) + rdp? ( <net-misc/freerdp-3:0= ) + 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.5-no-clobber-fortify-source.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-r10.ebuild b/net-analyzer/hydra/hydra-9.5-r10.ebuild new file mode 100644 index 000000000000..0960ae6bf060 --- /dev/null +++ b/net-analyzer/hydra/hydra-9.5-r10.ebuild @@ -0,0 +1,128 @@ +# Copyright 1999-2024 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? ( + >=app-accessibility/at-spi2-core-2.46.0 + 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:= ) + memcached? ( dev-libs/libmemcached[sasl] ) + mongodb? ( dev-libs/mongo-c-driver ) + mysql? ( dev-db/mysql-connector-c:= ) + ncurses? ( sys-libs/ncurses:= ) + oracle? ( dev-db/oracle-instantclient[sdk] ) + pcre? ( dev-libs/libpcre2 ) + postgres? ( dev-db/postgresql:* ) + rdp? ( net-misc/freerdp:2= ) + 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.5-no-clobber-fortify-source.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-9999999.ebuild b/net-analyzer/hydra/hydra-9999999.ebuild deleted file mode 100644 index 3ff5496cc9b3..000000000000 --- a/net-analyzer/hydra/hydra-9999999.ebuild +++ /dev/null @@ -1,123 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit flag-o-matic git-r3 toolchain-funcs - -DESCRIPTION="Parallelized network login hacker" -HOMEPAGE="https://github.com/vanhauser-thc/thc-hydra" -EGIT_REPO_URI="https://github.com/vanhauser-thc/thc-hydra" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="" -IUSE=" - debug firebird gcrypt gtk idn libressl memcached mongodb mysql ncp ncurses - oracle pcre postgres rdp libssh subversion zlib -" - -RDEPEND=" - 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= ) - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) - memcached? ( dev-libs/libmemcached[sasl] ) - mongodb? ( dev-libs/mongo-c-driver ) - mysql? ( dev-db/mysql-connector-c:0= ) - ncp? ( net-fs/ncpfs ) - ncurses? ( sys-libs/ncurses:= ) - oracle? ( dev-db/oracle-instantclient-basic ) - pcre? ( dev-libs/libpcre ) - postgres? ( dev-db/postgresql:* ) - rdp? ( net-misc/freerdp ) - libssh? ( >=net-libs/libssh-0.4.0 ) - subversion? ( dev-vcs/subversion ) - zlib? ( sys-libs/zlib ) -" -DEPEND=" - ${RDEPEND} - virtual/pkgconfig -" - -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 -} - -src_configure() { - # Note: the top level configure script is not autoconf-based - tc-export CC PKG_CONFIG - append-cflags -fcommon - - 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 ncp '-lncp' '' '-DLIBNCP' - hydra_sed ncurses '-lcurses' '$( "${PKG_CONFIG}" --libs ncurses )' '-DLIBNCURSES' - hydra_sed pcre '-lpcre' '$( "${PKG_CONFIG}" --libs libpcre )' '-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 )' '-DLIBFREERDP2' - # 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 subversion '-lsvn_client-1 -lapr-1 -laprutil-1 -lsvn_subr-1' '' '-DLIBSVN' - hydra_sed zlib '-lz' '$( "${PKG_CONFIG}" --libs zlib )' '-DHAVE_ZLIB' - - sh configure \ - $(use gtk || echo --disable-xhydra) \ - $(usex 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.md -} diff --git a/net-analyzer/hydra/metadata.xml b/net-analyzer/hydra/metadata.xml index 0c88bc63e93a..2fea84bbc667 100644 --- a/net-analyzer/hydra/metadata.xml +++ b/net-analyzer/hydra/metadata.xml @@ -1,13 +1,15 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type="project"> -<email>netmon@gentoo.org</email> -</maintainer> -<use> -<flag name="gcrypt">Enable radmin2 support through <pkg>dev-libs/libgcrypt</pkg></flag> -<flag name="libssh">Enable SSH support through <pkg>net-libs/libssh</pkg></flag> -<flag name="mongodb">MongoDB support through <pkg>dev-libs/mongo-c-driver</pkg></flag> -<flag name="ncp">NCP protocol (NetWare) support through ncpfs</flag> -</use> + <maintainer type="project"> + <email>netmon@gentoo.org</email> + </maintainer> + <use> + <flag name="gcrypt">Enable radmin2 support through <pkg>dev-libs/libgcrypt</pkg></flag> + <flag name="libssh">Enable SSH support through <pkg>net-libs/libssh</pkg></flag> + <flag name="mongodb">MongoDB support through <pkg>dev-libs/mongo-c-driver</pkg></flag> + </use> + <upstream> + <remote-id type="github">vanhauser-thc/thc-hydra</remote-id> + </upstream> </pkgmetadata> diff --git a/net-analyzer/ibmonitor/ibmonitor-1.4-r1.ebuild b/net-analyzer/ibmonitor/ibmonitor-1.4-r1.ebuild index 4b5b559a57ba..be878eebbd6c 100644 --- a/net-analyzer/ibmonitor/ibmonitor-1.4-r1.ebuild +++ b/net-analyzer/ibmonitor/ibmonitor-1.4-r1.ebuild @@ -1,18 +1,18 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 DESCRIPTION="Interactive bandwidth monitor" -HOMEPAGE="http://ibmonitor.sourceforge.net" +HOMEPAGE="https://ibmonitor.sourceforge.net" SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" +S="${WORKDIR}/${PN}" -KEYWORDS="~amd64 ~hppa ~ppc x86" -LICENSE="GPL-2" +KEYWORDS="~amd64 ~hppa ~ppc ~riscv x86" +LICENSE="GPL-2+" SLOT="0" RDEPEND="dev-perl/TermReadKey" -S=${WORKDIR}/${PN} src_install() { dobin ibmonitor diff --git a/net-analyzer/ibmonitor/metadata.xml b/net-analyzer/ibmonitor/metadata.xml index 2488b71436bd..d136821db8c5 100644 --- a/net-analyzer/ibmonitor/metadata.xml +++ b/net-analyzer/ibmonitor/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>netmon@gentoo.org</email> diff --git a/net-analyzer/icinga2/Manifest b/net-analyzer/icinga2/Manifest index e92368b9b6f6..5e6efce507f8 100644 --- a/net-analyzer/icinga2/Manifest +++ b/net-analyzer/icinga2/Manifest @@ -1 +1 @@ -DIST icinga2-2.12.3.tar.gz 7534454 BLAKE2B 021f940b3885c90cc43b4708c83430685fdb692d5ce95ed0f667a95b7dd2f4817b30fb7b05f1e214ba3aa31cef806af0f83e68447ece94916d806fb95f66526e SHA512 28b87e03a8ffeb7a1d19ddf9555151b826f7bf1fd33b0139c2fc8abe7c89d66d96089d5b32d0aaccc3876040514b2bfbde9970416d5ec4ea3b023b17c0fb1799 +DIST icinga2-2.14.2.tar.gz 9397382 BLAKE2B f533db06e693f9c9f0627c50615ded591696879b22fe9cb7bab115607d7f25ef3f30732de1e34f7adee594385c21ab2f22fdc925f4be18e8423fa69e94d3e1b9 SHA512 a7574254eed715c32317feaac57d5444a9d2bcccbfe06adbcee4d7d3c2928ecb1f381a5321c219406816bb39120eb9e95ca073399844cbafde274d289f619f57 diff --git a/net-analyzer/icinga2/files/icinga2-2.12.1-boost-1.74.0.patch b/net-analyzer/icinga2/files/icinga2-2.12.1-boost-1.74.0.patch deleted file mode 100644 index e6ad4807993a..000000000000 --- a/net-analyzer/icinga2/files/icinga2-2.12.1-boost-1.74.0.patch +++ /dev/null @@ -1,436 +0,0 @@ -From c30bae2994f1e5f33f6da51eb96d423e9bf0f75c Mon Sep 17 00:00:00 2001 -From: Louis Sautier <sautier.louis@gmail.com> -Date: Thu, 20 Aug 2020 18:25:48 +0200 -Subject: [PATCH] =?UTF-8?q?Fix=20=E2=80=98fs::copy=5Foption=E2=80=99=20has?= - =?UTF-8?q?=20not=20been=20declared=20with=20boost=201.74.0?= -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -It was deprecated in -https://github.com/boostorg/filesystem/commit/f199152b7df036ff1606c85e4ea1b28edfeda6cc ---- - lib/base/utility.cpp | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/lib/base/utility.cpp b/lib/base/utility.cpp -index 1add7616c6..d8e6f20b0c 100644 ---- a/lib/base/utility.cpp -+++ b/lib/base/utility.cpp -@@ -725,7 +725,11 @@ void Utility::CopyFile(const String& source, const String& target) - { - namespace fs = boost::filesystem; - -+#if BOOST_VERSION >= 107400 -+ fs::copy_file(fs::path(source.Begin(), source.End()), fs::path(target.Begin(), target.End()), fs::copy_options::overwrite_existing); -+#else /* BOOST_VERSION */ - fs::copy_file(fs::path(source.Begin(), source.End()), fs::path(target.Begin(), target.End()), fs::copy_option::overwrite_if_exists); -+#endif /* BOOST_VERSION */ - } - - /* -From 45dd71e0f9a93369e08d6cb26f97940f9c9594aa Mon Sep 17 00:00:00 2001 -From: "Alexander A. Klimov" <alexander.klimov@icinga.com> -Date: Wed, 26 Aug 2020 13:56:26 +0200 -Subject: [PATCH] Introduce HttpUtility::Set() - -refs #8185 ---- - lib/cli/consolecommand.cpp | 9 ++++--- - lib/perfdata/elasticsearchwriter.cpp | 13 ++++----- - lib/perfdata/influxdbwriter.cpp | 7 ++--- - lib/remote/configfileshandler.cpp | 4 +-- - lib/remote/eventshandler.cpp | 2 +- - lib/remote/httpserverconnection.cpp | 40 ++++++++++++++-------------- - lib/remote/httputility.cpp | 4 +-- - lib/remote/httputility.hpp | 28 +++++++++++++++++++ - lib/remote/infohandler.cpp | 6 ++--- - plugins/check_nscp_api.cpp | 9 ++++--- - 10 files changed, 77 insertions(+), 45 deletions(-) - -diff --git a/lib/cli/consolecommand.cpp b/lib/cli/consolecommand.cpp -index 41b6590e4c..42c5c63133 100644 ---- a/lib/cli/consolecommand.cpp -+++ b/lib/cli/consolecommand.cpp -@@ -3,6 +3,7 @@ - #include "cli/consolecommand.hpp" - #include "config/configcompiler.hpp" - #include "remote/consolehandler.hpp" -+#include "remote/httputility.hpp" - #include "remote/url.hpp" - #include "base/configwriter.hpp" - #include "base/serializer.hpp" -@@ -580,11 +581,11 @@ Dictionary::Ptr ConsoleCommand::SendRequest() - - http::request<http::string_body> request(http::verb::post, std::string(l_Url->Format(false)), 10); - -- request.set(http::field::user_agent, "Icinga/DebugConsole/" + Application::GetAppVersion()); -- request.set(http::field::host, l_Url->GetHost() + ":" + l_Url->GetPort()); -+ HttpUtility::Set(request, http::field::user_agent, "Icinga/DebugConsole/" + Application::GetAppVersion()); -+ HttpUtility::Set(request, http::field::host, l_Url->GetHost() + ":" + l_Url->GetPort()); - -- request.set(http::field::accept, "application/json"); -- request.set(http::field::authorization, "Basic " + Base64::Encode(l_Url->GetUsername() + ":" + l_Url->GetPassword())); -+ HttpUtility::Set(request, http::field::accept, "application/json"); -+ HttpUtility::Set(request, http::field::authorization, "Basic " + Base64::Encode(l_Url->GetUsername() + ":" + l_Url->GetPassword())); - - try { - http::write(*l_TlsStream, request); -diff --git a/lib/perfdata/elasticsearchwriter.cpp b/lib/perfdata/elasticsearchwriter.cpp -index 6870198e45..3764bf536b 100644 ---- a/lib/perfdata/elasticsearchwriter.cpp -+++ b/lib/perfdata/elasticsearchwriter.cpp -@@ -2,6 +2,7 @@ - - #include "perfdata/elasticsearchwriter.hpp" - #include "perfdata/elasticsearchwriter-ti.cpp" -+#include "remote/httputility.hpp" - #include "remote/url.hpp" - #include "icinga/compatutility.hpp" - #include "icinga/service.hpp" -@@ -474,27 +475,27 @@ void ElasticsearchWriter::SendRequest(const String& body) - - http::request<http::string_body> request (http::verb::post, std::string(url->Format(true)), 10); - -- request.set(http::field::user_agent, "Icinga/" + Application::GetAppVersion()); -- request.set(http::field::host, url->GetHost() + ":" + url->GetPort()); -+ HttpUtility::Set(request, http::field::user_agent, "Icinga/" + Application::GetAppVersion()); -+ HttpUtility::Set(request, http::field::host, url->GetHost() + ":" + url->GetPort()); - - /* Specify required headers by Elasticsearch. */ -- request.set(http::field::accept, "application/json"); -+ HttpUtility::Set(request, http::field::accept, "application/json"); - - /* Use application/x-ndjson for bulk streams. While ES - * is able to handle application/json, the newline separator - * causes problems with Logstash (#6609). - */ -- request.set(http::field::content_type, "application/x-ndjson"); -+ HttpUtility::Set(request, http::field::content_type, "application/x-ndjson"); - - /* Send authentication if configured. */ - String username = GetUsername(); - String password = GetPassword(); - - if (!username.IsEmpty() && !password.IsEmpty()) -- request.set(http::field::authorization, "Basic " + Base64::Encode(username + ":" + password)); -+ HttpUtility::Set(request, http::field::authorization, "Basic " + Base64::Encode(username + ":" + password)); - - request.body() = body; -- request.set(http::field::content_length, request.body().size()); -+ HttpUtility::Set(request, http::field::content_length, request.body().size()); - - /* Don't log the request body to debug log, this is already done above. */ - Log(LogDebug, "ElasticsearchWriter") -diff --git a/lib/perfdata/influxdbwriter.cpp b/lib/perfdata/influxdbwriter.cpp -index 4692b8b5df..0ddd582447 100644 ---- a/lib/perfdata/influxdbwriter.cpp -+++ b/lib/perfdata/influxdbwriter.cpp -@@ -2,6 +2,7 @@ - - #include "perfdata/influxdbwriter.hpp" - #include "perfdata/influxdbwriter-ti.cpp" -+#include "remote/httputility.hpp" - #include "remote/url.hpp" - #include "icinga/service.hpp" - #include "icinga/macroprocessor.hpp" -@@ -501,11 +502,11 @@ void InfluxdbWriter::Flush() - - http::request<http::string_body> request (http::verb::post, std::string(url->Format(true)), 10); - -- request.set(http::field::user_agent, "Icinga/" + Application::GetAppVersion()); -- request.set(http::field::host, url->GetHost() + ":" + url->GetPort()); -+ HttpUtility::Set(request, http::field::user_agent, "Icinga/" + Application::GetAppVersion()); -+ HttpUtility::Set(request, http::field::host, url->GetHost() + ":" + url->GetPort()); - - request.body() = body; -- request.set(http::field::content_length, request.body().size()); -+ HttpUtility::Set(request, http::field::content_length, request.body().size()); - - try { - if (stream.first) { -diff --git a/lib/remote/configfileshandler.cpp b/lib/remote/configfileshandler.cpp -index d714f4d864..5c2bfdb405 100644 ---- a/lib/remote/configfileshandler.cpp -+++ b/lib/remote/configfileshandler.cpp -@@ -82,9 +82,9 @@ bool ConfigFilesHandler::HandleRequest( - - String content((std::istreambuf_iterator<char>(fp)), std::istreambuf_iterator<char>()); - response.result(http::status::ok); -- response.set(http::field::content_type, "application/octet-stream"); -+ HttpUtility::Set(response, http::field::content_type, "application/octet-stream"); - response.body() = content; -- response.set(http::field::content_length, response.body().size()); -+ HttpUtility::Set(response, http::field::content_length, response.body().size()); - } catch (const std::exception& ex) { - HttpUtility::SendJsonError(response, params, 500, "Could not read file.", - DiagnosticInformation(ex)); -diff --git a/lib/remote/eventshandler.cpp b/lib/remote/eventshandler.cpp -index e92b14a2d4..e41b4711c6 100644 ---- a/lib/remote/eventshandler.cpp -+++ b/lib/remote/eventshandler.cpp -@@ -100,7 +100,7 @@ bool EventsHandler::HandleRequest( - server.StartStreaming(); - - response.result(http::status::ok); -- response.set(http::field::content_type, "application/json"); -+ HttpUtility::Set(response, http::field::content_type, "application/json"); - - IoBoundWorkSlot dontLockTheIoThread (yc); - -diff --git a/lib/remote/httpserverconnection.cpp b/lib/remote/httpserverconnection.cpp -index d4eac7d074..688392c821 100644 ---- a/lib/remote/httpserverconnection.cpp -+++ b/lib/remote/httpserverconnection.cpp -@@ -184,12 +184,12 @@ bool EnsureValidHeaders( - { "status", String("Bad Request: ") + errorMsg } - })); - } else { -- response.set(http::field::content_type, "text/html"); -+ HttpUtility::Set(response, http::field::content_type, "text/html"); - response.body() = String("<h1>Bad Request</h1><p><pre>") + errorMsg + "</pre></p>"; -- response.set(http::field::content_length, response.body().size()); -+ HttpUtility::Set(response, http::field::content_length, response.body().size()); - } - -- response.set(http::field::connection, "close"); -+ HttpUtility::Set(response, http::field::connection, "close"); - - boost::system::error_code ec; - -@@ -247,20 +247,20 @@ bool HandleAccessControl( - auto& origin (request[http::field::origin]); - - if (allowedOrigins.find(origin.to_string()) != allowedOrigins.end()) { -- response.set(http::field::access_control_allow_origin, origin); -+ HttpUtility::Set(response, http::field::access_control_allow_origin, origin); - } - - allowOriginHeader.Done(); - -- response.set(http::field::access_control_allow_credentials, "true"); -+ HttpUtility::Set(response, http::field::access_control_allow_credentials, "true"); - - if (request.method() == http::verb::options && !request[http::field::access_control_request_method].empty()) { - response.result(http::status::ok); -- response.set(http::field::access_control_allow_methods, "GET, POST, PUT, DELETE"); -- response.set(http::field::access_control_allow_headers, "Authorization, X-HTTP-Method-Override"); -+ HttpUtility::Set(response, http::field::access_control_allow_methods, "GET, POST, PUT, DELETE"); -+ HttpUtility::Set(response, http::field::access_control_allow_headers, "Authorization, X-HTTP-Method-Override"); - response.body() = "Preflight OK"; -- response.set(http::field::content_length, response.body().size()); -- response.set(http::field::connection, "close"); -+ HttpUtility::Set(response, http::field::content_length, response.body().size()); -+ HttpUtility::Set(response, http::field::connection, "close"); - - boost::system::error_code ec; - -@@ -288,10 +288,10 @@ bool EnsureAcceptHeader( - - if (request.method() != http::verb::get && request[http::field::accept] != "application/json") { - response.result(http::status::bad_request); -- response.set(http::field::content_type, "text/html"); -+ HttpUtility::Set(response, http::field::content_type, "text/html"); - response.body() = "<h1>Accept header is missing or not set to 'application/json'.</h1>"; -- response.set(http::field::content_length, response.body().size()); -- response.set(http::field::connection, "close"); -+ HttpUtility::Set(response, http::field::content_length, response.body().size()); -+ HttpUtility::Set(response, http::field::connection, "close"); - - boost::system::error_code ec; - -@@ -320,8 +320,8 @@ bool EnsureAuthenticatedUser( - << "Unauthorized request: " << request.method_string() << ' ' << request.target(); - - response.result(http::status::unauthorized); -- response.set(http::field::www_authenticate, "Basic realm=\"Icinga 2\""); -- response.set(http::field::connection, "close"); -+ HttpUtility::Set(response, http::field::www_authenticate, "Basic realm=\"Icinga 2\""); -+ HttpUtility::Set(response, http::field::connection, "close"); - - if (request[http::field::accept] == "application/json") { - HttpUtility::SendJsonBody(response, nullptr, new Dictionary({ -@@ -329,9 +329,9 @@ bool EnsureAuthenticatedUser( - { "status", "Unauthorized. Please check your user credentials." } - })); - } else { -- response.set(http::field::content_type, "text/html"); -+ HttpUtility::Set(response, http::field::content_type, "text/html"); - response.body() = "<h1>Unauthorized. Please check your user credentials.</h1>"; -- response.set(http::field::content_length, response.body().size()); -+ HttpUtility::Set(response, http::field::content_length, response.body().size()); - } - - boost::system::error_code ec; -@@ -421,12 +421,12 @@ bool EnsureValidBody( - { "status", String("Bad Request: ") + ec.message() } - })); - } else { -- response.set(http::field::content_type, "text/html"); -+ HttpUtility::Set(response, http::field::content_type, "text/html"); - response.body() = String("<h1>Bad Request</h1><p><pre>") + ec.message() + "</pre></p>"; -- response.set(http::field::content_length, response.body().size()); -+ HttpUtility::Set(response, http::field::content_length, response.body().size()); - } - -- response.set(http::field::connection, "close"); -+ HttpUtility::Set(response, http::field::connection, "close"); - - http::async_write(stream, response, yc[ec]); - stream.async_flush(yc[ec]); -@@ -511,7 +511,7 @@ void HttpServerConnection::ProcessMessages(boost::asio::yield_context yc) - parser.header_limit(1024 * 1024); - parser.body_limit(-1); - -- response.set(http::field::server, l_ServerHeader); -+ HttpUtility::Set(response, http::field::server, l_ServerHeader); - - if (!EnsureValidHeaders(*m_Stream, buf, parser, response, m_ShuttingDown, yc)) { - break; -diff --git a/lib/remote/httputility.cpp b/lib/remote/httputility.cpp -index 91902ba501..e46e990ecf 100644 ---- a/lib/remote/httputility.cpp -+++ b/lib/remote/httputility.cpp -@@ -56,9 +56,9 @@ void HttpUtility::SendJsonBody(boost::beast::http::response<boost::beast::http:: - { - namespace http = boost::beast::http; - -- response.set(http::field::content_type, "application/json"); -+ HttpUtility::Set(response, http::field::content_type, "application/json"); - response.body() = JsonEncode(val, params && GetLastParameter(params, "pretty")); -- response.set(http::field::content_length, response.body().size()); -+ HttpUtility::Set(response, http::field::content_length, response.body().size()); - } - - void HttpUtility::SendJsonError(boost::beast::http::response<boost::beast::http::string_body>& response, -diff --git a/lib/remote/httputility.hpp b/lib/remote/httputility.hpp -index 6465b4af92..be600d4090 100644 ---- a/lib/remote/httputility.hpp -+++ b/lib/remote/httputility.hpp -@@ -5,8 +5,12 @@ - - #include "remote/url.hpp" - #include "base/dictionary.hpp" -+#include "base/string.hpp" - #include <boost/beast/http.hpp> -+#include <boost/lexical_cast.hpp> - #include <string> -+#include <type_traits> -+#include <utility> - - namespace icinga - { -@@ -26,6 +30,30 @@ class HttpUtility - static void SendJsonBody(boost::beast::http::response<boost::beast::http::string_body>& response, const Dictionary::Ptr& params, const Value& val); - static void SendJsonError(boost::beast::http::response<boost::beast::http::string_body>& response, const Dictionary::Ptr& params, const int code, - const String& verbose = String(), const String& diagnosticInformation = String()); -+ -+ template<class Message, class Key, class Value, typename std::enable_if<std::is_arithmetic<Value>::value, int>::type = 0> -+ static void Set(Message& message, Key&& key, Value value) -+ { -+ Set(message, std::forward<Key>(key), boost::lexical_cast<std::string>(value)); -+ } -+ -+ template<class Message, class Key> -+ static void Set(Message& message, Key&& key, const String& value) -+ { -+ Set(message, std::forward<Key>(key), value.GetData()); -+ } -+ -+ template<class Message, class Key> -+ static void Set(Message& message, Key&& key, String&& value) -+ { -+ Set(message, std::forward<Key>(key), value.GetData()); -+ } -+ -+ template<class Message, class Key, class Value, typename std::enable_if<!std::is_arithmetic<Value>::value, int>::type = 0> -+ static void Set(Message& message, Key&& key, Value&& value) -+ { -+ message.set(std::forward<Key>(key), std::forward<Value>(value)); -+ } - }; - - } -diff --git a/lib/remote/infohandler.cpp b/lib/remote/infohandler.cpp -index 18c18c0e04..daec628047 100644 ---- a/lib/remote/infohandler.cpp -+++ b/lib/remote/infohandler.cpp -@@ -29,7 +29,7 @@ bool InfoHandler::HandleRequest( - - if (url->GetPath().empty()) { - response.result(http::status::found); -- response.set(http::field::location, "/v1"); -+ HttpUtility::Set(response, http::field::location, "/v1"); - return true; - } - -@@ -74,7 +74,7 @@ bool InfoHandler::HandleRequest( - - HttpUtility::SendJsonBody(response, params, result); - } else { -- response.set(http::field::content_type, "text/html"); -+ HttpUtility::Set(response, http::field::content_type, "text/html"); - - String body = "<html><head><title>Icinga 2</title></head><h1>Hello from Icinga 2 (Version: " + Application::GetAppVersion() + ")!</h1>"; - body += "<p>You are authenticated as <b>" + user->GetName() + "</b>. "; -@@ -92,7 +92,7 @@ bool InfoHandler::HandleRequest( - - body += R"(<p>More information about API requests is available in the <a href="https://icinga.com/docs/icinga2/latest/" target="_blank">documentation</a>.</p></html>)"; - response.body() = body; -- response.set(http::field::content_length, response.body().size()); -+ HttpUtility::Set(response, http::field::content_length, response.body().size()); - } - - return true; -diff --git a/plugins/check_nscp_api.cpp b/plugins/check_nscp_api.cpp -index 3f6843ec29..ad15e62527 100644 ---- a/plugins/check_nscp_api.cpp -+++ b/plugins/check_nscp_api.cpp -@@ -16,6 +16,7 @@ - #include "base/tcpsocket.hpp" /* include global icinga::Connect */ - #include "base/tlsstream.hpp" - #include "base/base64.hpp" -+#include "remote/httputility.hpp" - #include "remote/url.hpp" - #include <remote/url-characters.hpp> - #include <boost/program_options.hpp> -@@ -365,11 +366,11 @@ static Dictionary::Ptr FetchData(const String& host, const String& port, const S - - http::request<http::string_body> request (http::verb::get, std::string(url->Format(true)), 10); - -- request.set(http::field::user_agent, "Icinga/check_nscp_api/" + String(VERSION)); -- request.set(http::field::host, host + ":" + port); -+ HttpUtility::Set(request, http::field::user_agent, "Icinga/check_nscp_api/" + String(VERSION)); -+ HttpUtility::Set(request, http::field::host, host + ":" + port); - -- request.set(http::field::accept, "application/json"); -- request.set("password", password); -+ HttpUtility::Set(request, http::field::accept, "application/json"); -+ HttpUtility::Set(request, "password", password); - - if (l_Debug) { - std::cout << "Sending request to " << url->Format(false, false) << "'.\n"; -From 7e62a68eadada58e762d3f4261750796adffd440 Mon Sep 17 00:00:00 2001 -From: "Alexander A. Klimov" <alexander.klimov@icinga.com> -Date: Wed, 26 Aug 2020 13:48:39 +0200 -Subject: [PATCH] Define BOOST_ASIO_USE_TS_EXECUTOR_AS_DEFAULT - -refs #8185 ---- - CMakeLists.txt | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 046f23cf22..46e765415e 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -172,6 +172,9 @@ add_definitions(-DBOOST_COROUTINES_NO_DEPRECATION_WARNING) - - add_definitions(-DBOOST_FILESYSTEM_NO_DEPRECATED) - -+# Required for Boost v1.74+ -+add_definitions(-DBOOST_ASIO_USE_TS_EXECUTOR_AS_DEFAULT) -+ - link_directories(${Boost_LIBRARY_DIRS}) - include_directories(${Boost_INCLUDE_DIRS}) - 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.12.3.ebuild b/net-analyzer/icinga2/icinga2-2.12.3.ebuild deleted file mode 100644 index ad2f31c9b0f3..000000000000 --- a/net-analyzer/icinga2/icinga2-2.12.3.ebuild +++ /dev/null @@ -1,149 +0,0 @@ -# Copyright 1999-2020 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 libressl lto mail mariadb minimal +mysql nano-syntax +plugins postgres systemd +vim-syntax" - -# Add accounts to DEPEND because of fowners in src_install -DEPEND=" - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) - >=dev-libs/boost-1.66.0:=[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=" - sys-devel/bison - >=sys-devel/flex-2.5.35" -RDEPEND=" - ${DEPEND} - plugins? ( || ( - net-analyzer/monitoring-plugins - net-analyzer/nagios-plugins - ) ) - mail? ( virtual/mailx ) - acct-group/nagios" - -REQUIRED_USE="!minimal? ( || ( mariadb mysql postgres ) )" - -PATCHES=( - # https://github.com/Icinga/icinga2/issues/8185#issuecomment-680875875 - "${FILESDIR}/${PN}-2.12.1-boost-1.74.0.patch" -) - -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 - -DICINGA2_LTO_BUILD=$(usex lto) - ) - # 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 root:icinga /etc/icinga2 - fperms 0750 /etc/icinga2 - fowners icinga:icinga /var/lib/icinga2 - fowners icinga:icinga /var/spool/icinga2 - fowners -R icinga:icingacmd /var/lib/icinga2/api - 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.2.ebuild b/net-analyzer/icinga2/icinga2-2.14.2.ebuild new file mode 100644 index 000000000000..1ce211b79dc7 --- /dev/null +++ b/net-analyzer/icinga2/icinga2-2.14.2.ebuild @@ -0,0 +1,146 @@ +# 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-9999.ebuild b/net-analyzer/icinga2/icinga2-9999.ebuild index c19de03c6e71..f2525a95a10b 100644 --- a/net-analyzer/icinga2/icinga2-9999.ebuild +++ b/net-analyzer/icinga2/icinga2-9999.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -inherit cmake systemd +inherit cmake if [[ ${PV} != 9999 ]]; then SRC_URI="https://github.com/Icinga/icinga2/archive/v${PV}.tar.gz -> ${P}.tar.gz" @@ -18,13 +18,12 @@ HOMEPAGE="https://icinga.com/" LICENSE="GPL-2" SLOT="0" -IUSE="console jumbo-build libressl lto mail mariadb minimal +mysql nano-syntax +plugins postgres systemd +vim-syntax" +IUSE="console jumbo-build mail mariadb minimal +mysql +plugins postgres systemd" # Add accounts to DEPEND because of fowners in src_install DEPEND=" - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) - >=dev-libs/boost-1.66.0:=[context] + dev-libs/openssl:0= + dev-libs/boost:=[context] console? ( dev-libs/libedit ) mariadb? ( dev-db/mariadb-connector-c:= ) mysql? ( dev-db/mysql-connector-c:= ) @@ -34,8 +33,8 @@ DEPEND=" acct-group/icinga acct-group/icingacmd" BDEPEND=" - sys-devel/bison - >=sys-devel/flex-2.5.35" + app-alternatives/yacc + app-alternatives/lex" RDEPEND=" ${DEPEND} plugins? ( || ( @@ -61,7 +60,8 @@ src_configure() { -DINSTALL_SYSTEMD_SERVICE_AND_INITSCRIPT=ON -DUSE_SYSTEMD=$(usex systemd) -DLOGROTATE_HAS_SU=ON - -DICINGA2_LTO_BUILD=$(usex lto) + # only appends -flto + -DICINGA2_LTO_BUILD=OFF ) # default to off if minimal, allow the flags to be set otherwise if use minimal; then @@ -106,11 +106,13 @@ src_install() { rm -r "${D}/run" || die "failed to remove /run" rm -r "${D}/var/cache" || die "failed to remove /var/cache" - fowners root:icinga /etc/icinga2 + fowners -R icinga:icinga /etc/icinga2 fperms 0750 /etc/icinga2 fowners icinga:icinga /var/lib/icinga2 - fowners icinga:icinga /var/spool/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 @@ -119,16 +121,12 @@ src_install() { 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 + insinto /usr/share/vim/vimfiles + doins -r "${WORKDIR}"/${P}/tools/syntax/vim/ftdetect + doins -r "${WORKDIR}"/${P}/tools/syntax/vim/syntax - if use nano-syntax; then - insinto /usr/share/nano - doins "${WORKDIR}"/${P}/tools/syntax/nano/icinga2.nanorc - fi + insinto /usr/share/nano + doins "${WORKDIR}"/${P}/tools/syntax/nano/icinga2.nanorc } pkg_postinst() { diff --git a/net-analyzer/icinga2/metadata.xml b/net-analyzer/icinga2/metadata.xml index 720f4e2e47b7..7a4547f2335d 100644 --- a/net-analyzer/icinga2/metadata.xml +++ b/net-analyzer/icinga2/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> <email>prometheanfire@gentoo.org</email> @@ -7,7 +7,6 @@ </maintainer> <use> <flag name="console">Adds support for line-editing in the console</flag> - <flag name="lto">Adds support for link time optimization</flag> <flag name="jumbo-build">Combine source files to speed up build process, requires more memory</flag> <flag name="mail">Allows for mailing of alerts</flag> <flag name="mariadb">Enable support for the mariadb database backend</flag> diff --git a/net-analyzer/ifmetric/ifmetric-0.3-r2.ebuild b/net-analyzer/ifmetric/ifmetric-0.3-r2.ebuild deleted file mode 100644 index f5e962992ffb..000000000000 --- a/net-analyzer/ifmetric/ifmetric-0.3-r2.ebuild +++ /dev/null @@ -1,31 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -DESCRIPTION="Set metrics of all IPv4 routes attached to a given network interface at once" -HOMEPAGE="http://0pointer.de/lennart/projects/ifmetric/" -SRC_URI="http://0pointer.de/lennart/projects/ifmetric/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~ppc x86" - -DEPEND="sys-kernel/linux-headers" - -DOCS=( - README - doc/README.html -) - -PATCHES=( - "${FILESDIR}"/${P}-ul.patch - "${FILESDIR}"/${P}-replybuf.patch -) - -src_configure() { - # man page and HTML are already generated - econf \ - --disable-xmltoman \ - --disable-lynx -} diff --git a/net-analyzer/ifmetric/ifmetric-0.3-r3.ebuild b/net-analyzer/ifmetric/ifmetric-0.3-r3.ebuild new file mode 100644 index 000000000000..df13f75e5942 --- /dev/null +++ b/net-analyzer/ifmetric/ifmetric-0.3-r3.ebuild @@ -0,0 +1,27 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DESCRIPTION="Set metrics of all IPv4 routes attached to a given network interface at once" +HOMEPAGE="http://0pointer.de/lennart/projects/ifmetric/" +SRC_URI="http://0pointer.de/lennart/projects/ifmetric/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~ppc x86" + +DEPEND="sys-kernel/linux-headers" + +PATCHES=( + "${FILESDIR}"/${P}-ul.patch + "${FILESDIR}"/${P}-replybuf.patch +) +HTML_DOCS=( doc/README.html ) + +src_configure() { + # man page and HTML are already generated + econf \ + --disable-xmltoman \ + --disable-lynx +} diff --git a/net-analyzer/ifmetric/metadata.xml b/net-analyzer/ifmetric/metadata.xml index 2c2a7923cfc8..d5af4bcfaf13 100644 --- a/net-analyzer/ifmetric/metadata.xml +++ b/net-analyzer/ifmetric/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>netmon@gentoo.org</email> diff --git a/net-analyzer/ifstat/ifstat-1.1-r2.ebuild b/net-analyzer/ifstat/ifstat-1.1-r2.ebuild index 616e7250a9ca..5682724e0c88 100644 --- a/net-analyzer/ifstat/ifstat-1.1-r2.ebuild +++ b/net-analyzer/ifstat/ifstat-1.1-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -11,7 +11,7 @@ SRC_URI="http://gael.roualland.free.fr/ifstat/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 ~hppa ~mips ppc ppc64 sparc x86" +KEYWORDS="~alpha amd64 hppa ~mips ppc ppc64 ~riscv sparc x86" IUSE="snmp" DEPEND="snmp? ( >=net-analyzer/net-snmp-5.0 )" diff --git a/net-analyzer/ifstat/metadata.xml b/net-analyzer/ifstat/metadata.xml index 2c2a7923cfc8..d5af4bcfaf13 100644 --- a/net-analyzer/ifstat/metadata.xml +++ b/net-analyzer/ifstat/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>netmon@gentoo.org</email> diff --git a/net-analyzer/ifstatus/Manifest b/net-analyzer/ifstatus/Manifest index 699157aedea9..3d533a2aa938 100644 --- a/net-analyzer/ifstatus/Manifest +++ b/net-analyzer/ifstatus/Manifest @@ -1,2 +1 @@ -DIST ifstatus-v1.1.0.tar.gz 25233 BLAKE2B de9d088bf7001799c3a54775c0c63d5dcf4f1f3f4998ce02b82a11bea7a6dabb1263829ff42ba1cd05ebd6b202827196757727c24db022ffa7d06ece38db6616 SHA512 2660310be7186067315414218e3d3d269499e391c7ffa12022ac53a0456ddbe0f7d5562b788fe6b2569b7d0eba7acf5699e0386769a91606a3e14b51239a2766 DIST ifstatus-v2.0.0.tar.gz 24058 BLAKE2B 09a2b0af26cb05dfc24eefdbb6ac52b0ac289a687301f5fa67f0fcaf2622da96e149af3f7c08257e0ef8418f4f08b5ca1b77af71ba7c00dabddcb87cc95ddce7 SHA512 e1720f5dcc26788149cc72ccb72b85fffc72b367f2268e1e4f06a8fe4d80685146d310746c0b1a913e24995f6e93011d7d75ea5b4f9ca479af2d79264b89e27d diff --git a/net-analyzer/ifstatus/files/ifstatus-1.1.0-gcc43.patch b/net-analyzer/ifstatus/files/ifstatus-1.1.0-gcc43.patch deleted file mode 100644 index 27111d7576f4..000000000000 --- a/net-analyzer/ifstatus/files/ifstatus-1.1.0-gcc43.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/Main.h -+++ b/Main.h -@@ -38,6 +38,7 @@ - #include <unistd.h> - #include <string.h> - #include <curses.h> -+#include <stdlib.h> - - #include <sys/time.h> - #include <sys/types.h> diff --git a/net-analyzer/ifstatus/files/ifstatus-1.1.0-gcc6.patch b/net-analyzer/ifstatus/files/ifstatus-1.1.0-gcc6.patch deleted file mode 100644 index 760a09fbf2c6..000000000000 --- a/net-analyzer/ifstatus/files/ifstatus-1.1.0-gcc6.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- a/Interface.h -+++ b/Interface.h -@@ -57,7 +57,11 @@ - - InterfaceData & operator=(InterfaceData & rInterfaceData); - InterfaceData operator-(InterfaceData & rInterfaceData); - -+#if __cplusplus >= 201103L -+ InterfaceData & operator=(InterfaceData && rInterfaceData) = default; -+ InterfaceData(const InterfaceData&) = default; -+#endif - private: - - unsigned long long m_ullReceived[eTotalTypes]; diff --git a/net-analyzer/ifstatus/files/ifstatus-1.1.0-tinfo.patch b/net-analyzer/ifstatus/files/ifstatus-1.1.0-tinfo.patch deleted file mode 100644 index e2c14e6add71..000000000000 --- a/net-analyzer/ifstatus/files/ifstatus-1.1.0-tinfo.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- a/Makefile -+++ b/Makefile -@@ -1,9 +1,7 @@ - # Makefile for IFStatus - # Gabriel Montenegro - --GCC = g++ --LDFLAGS = -lncurses --CFLAGS = -O2 -Wall -+LDLIBS = $(shell $(PKG_CONFIG) --libs ncurses) - - BIN = ifstatus - OBJ = BorderDecorator.o\ -@@ -30,7 +28,7 @@ - all : ifstatus printdone - - ifstatus : $(OBJ) -- $(GCC) $(CFLAGS) $(LDFLAGS) $^ -o $@ -+ $(LINK.cc) $^ $(LDLIBS) -o $@ - - printdone: - @if [ -e "./${BIN}" ]; then echo "Compiled.."; else echo "Error compiling!"; fi diff --git a/net-analyzer/ifstatus/ifstatus-1.1.0-r2.ebuild b/net-analyzer/ifstatus/ifstatus-1.1.0-r2.ebuild deleted file mode 100644 index 10f512067d0b..000000000000 --- a/net-analyzer/ifstatus/ifstatus-1.1.0-r2.ebuild +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit eutils toolchain-funcs - -KEYWORDS="amd64 arm ~ppc x86" - -DESCRIPTION="A simple CLI program for displaying network statistics in real time" -HOMEPAGE="http://ifstatus.sourceforge.net/" -SRC_URI="mirror://sourceforge/${PN}/${PN}-v${PV}.tar.gz" -LICENSE="GPL-2" -SLOT="0" - -RDEPEND=">=sys-libs/ncurses-4.2:0=" -DEPEND=" - ${RDEPEND} - virtual/pkgconfig -" - -S="${WORKDIR}/${PN}" - -PATCHES=( - "${FILESDIR}/${P}-gcc43.patch" - "${FILESDIR}/${P}-tinfo.patch" - "${FILESDIR}/${P}-gcc6.patch" -) - -src_prepare() { - default - tc-export CXX PKG_CONFIG -} - -src_install() { - dobin ifstatus - dodoc AUTHORS README -} - -pkg_postinst() { - elog "You may want to configure ~/.ifstatus/ifstatus.cfg" - elog "before running ifstatus. For example, you may add" - elog "Interfaces = eth0 there. Read the README file for" - elog "more information." -} diff --git a/net-analyzer/ifstatus/ifstatus-2.0.0.ebuild b/net-analyzer/ifstatus/ifstatus-2.0.0.ebuild index 7b2612d29fee..8a132f8f389f 100644 --- a/net-analyzer/ifstatus/ifstatus-2.0.0.ebuild +++ b/net-analyzer/ifstatus/ifstatus-2.0.0.ebuild @@ -1,32 +1,30 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 -inherit toolchain-funcs +EAPI=8 -KEYWORDS="~amd64 ~arm ~ppc ~x86" +inherit toolchain-funcs -DESCRIPTION="A simple CLI program for displaying network statistics in real time" -HOMEPAGE="http://ifstatus.sourceforge.net/" +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" -LICENSE="GPL-2" +S="${WORKDIR}/${PN}-v${PV}" + +LICENSE="GPL-2+" SLOT="0" +KEYWORDS="amd64 arm ~ppc ~riscv x86" + +RDEPEND=">=sys-libs/ncurses-4.2:0=" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" -RDEPEND=" - >=sys-libs/ncurses-4.2:0= -" -DEPEND=" - ${RDEPEND} - virtual/pkgconfig -" PATCHES=( "${FILESDIR}"/${PN}-2.0.0-tinfo.patch ) -S="${WORKDIR}/${PN}-v${PV}" src_compile() { tc-export CXX PKG_CONFIG - emake GCC=$(tc-getCXX) ${PN} + emake GCC="$(tc-getCXX)" ${PN} } src_install() { @@ -35,8 +33,8 @@ src_install() { } pkg_postinst() { - elog "You may want to configure ~/.ifstatus/ifstatus.cfg" - elog "before running ifstatus. For example, you may add" - elog "Interfaces = eth0 there. Read the README file for" - elog "more information." + elog "You may want to configure ~/.ifstatus/ifstatus.cfg" + elog "before running ifstatus. For example, you may add" + elog "Interfaces = eth0 there. Read the README file for" + elog "more information." } diff --git a/net-analyzer/ifstatus/metadata.xml b/net-analyzer/ifstatus/metadata.xml index 2a57e972be89..c62cb0e806f6 100644 --- a/net-analyzer/ifstatus/metadata.xml +++ b/net-analyzer/ifstatus/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>netmon@gentoo.org</email> diff --git a/net-analyzer/iftop/files/ax_pthread.m4 b/net-analyzer/iftop/files/ax_pthread.m4 deleted file mode 100644 index 6d400ed4e8e2..000000000000 --- a/net-analyzer/iftop/files/ax_pthread.m4 +++ /dev/null @@ -1,317 +0,0 @@ -# =========================================================================== -# http://www.gnu.org/software/autoconf-archive/ax_pthread.html -# =========================================================================== -# -# SYNOPSIS -# -# AX_PTHREAD([ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]]) -# -# DESCRIPTION -# -# This macro figures out how to build C programs using POSIX threads. It -# sets the PTHREAD_LIBS output variable to the threads library and linker -# flags, and the PTHREAD_CFLAGS output variable to any special C compiler -# flags that are needed. (The user can also force certain compiler -# flags/libs to be tested by setting these environment variables.) -# -# Also sets PTHREAD_CC to any special C compiler that is needed for -# multi-threaded programs (defaults to the value of CC otherwise). (This -# is necessary on AIX to use the special cc_r compiler alias.) -# -# NOTE: You are assumed to not only compile your program with these flags, -# but also link it with them as well. e.g. you should link with -# $PTHREAD_CC $CFLAGS $PTHREAD_CFLAGS $LDFLAGS ... $PTHREAD_LIBS $LIBS -# -# If you are only building threads programs, you may wish to use these -# variables in your default LIBS, CFLAGS, and CC: -# -# LIBS="$PTHREAD_LIBS $LIBS" -# CFLAGS="$CFLAGS $PTHREAD_CFLAGS" -# CC="$PTHREAD_CC" -# -# In addition, if the PTHREAD_CREATE_JOINABLE thread-attribute constant -# has a nonstandard name, defines PTHREAD_CREATE_JOINABLE to that name -# (e.g. PTHREAD_CREATE_UNDETACHED on AIX). -# -# Also HAVE_PTHREAD_PRIO_INHERIT is defined if pthread is found and the -# PTHREAD_PRIO_INHERIT symbol is defined when compiling with -# PTHREAD_CFLAGS. -# -# ACTION-IF-FOUND is a list of shell commands to run if a threads library -# is found, and ACTION-IF-NOT-FOUND is a list of commands to run it if it -# is not found. If ACTION-IF-FOUND is not specified, the default action -# will define HAVE_PTHREAD. -# -# Please let the authors know if this macro fails on any platform, or if -# you have any other suggestions or comments. This macro was based on work -# by SGJ on autoconf scripts for FFTW (http://www.fftw.org/) (with help -# from M. Frigo), as well as ac_pthread and hb_pthread macros posted by -# Alejandro Forero Cuervo to the autoconf macro repository. We are also -# grateful for the helpful feedback of numerous users. -# -# Updated for Autoconf 2.68 by Daniel Richard G. -# -# LICENSE -# -# Copyright (c) 2008 Steven G. Johnson <stevenj@alum.mit.edu> -# Copyright (c) 2011 Daniel Richard G. <skunk@iSKUNK.ORG> -# -# This program is free software: you can redistribute it and/or modify it -# under the terms of the GNU General Public License as published by the -# Free Software Foundation, either version 3 of the License, or (at your -# option) any later version. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General -# Public License for more details. -# -# You should have received a copy of the GNU General Public License along -# with this program. If not, see <http://www.gnu.org/licenses/>. -# -# As a special exception, the respective Autoconf Macro's copyright owner -# gives unlimited permission to copy, distribute and modify the configure -# scripts that are the output of Autoconf when processing the Macro. You -# need not follow the terms of the GNU General Public License when using -# or distributing such scripts, even though portions of the text of the -# Macro appear in them. The GNU General Public License (GPL) does govern -# all other use of the material that constitutes the Autoconf Macro. -# -# This special exception to the GPL applies to versions of the Autoconf -# Macro released by the Autoconf Archive. When you make and distribute a -# modified version of the Autoconf Macro, you may extend this special -# exception to the GPL to apply to your modified version as well. - -#serial 20 - -AU_ALIAS([ACX_PTHREAD], [AX_PTHREAD]) -AC_DEFUN([AX_PTHREAD], [ -AC_REQUIRE([AC_CANONICAL_HOST]) -AC_LANG_PUSH([C]) -ax_pthread_ok=no - -# We used to check for pthread.h first, but this fails if pthread.h -# requires special compiler flags (e.g. on True64 or Sequent). -# It gets checked for in the link test anyway. - -# First of all, check if the user has set any of the PTHREAD_LIBS, -# etcetera environment variables, and if threads linking works using -# them: -if test x"$PTHREAD_LIBS$PTHREAD_CFLAGS" != x; then - save_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS $PTHREAD_CFLAGS" - save_LIBS="$LIBS" - LIBS="$PTHREAD_LIBS $LIBS" - AC_MSG_CHECKING([for pthread_join in LIBS=$PTHREAD_LIBS with CFLAGS=$PTHREAD_CFLAGS]) - AC_TRY_LINK_FUNC(pthread_join, ax_pthread_ok=yes) - AC_MSG_RESULT($ax_pthread_ok) - if test x"$ax_pthread_ok" = xno; then - PTHREAD_LIBS="" - PTHREAD_CFLAGS="" - fi - LIBS="$save_LIBS" - CFLAGS="$save_CFLAGS" -fi - -# We must check for the threads library under a number of different -# names; the ordering is very important because some systems -# (e.g. DEC) have both -lpthread and -lpthreads, where one of the -# libraries is broken (non-POSIX). - -# Create a list of thread flags to try. Items starting with a "-" are -# C compiler flags, and other items are library names, except for "none" -# which indicates that we try without any flags at all, and "pthread-config" -# which is a program returning the flags for the Pth emulation library. - -ax_pthread_flags="pthreads none -Kthread -kthread lthread -pthread -pthreads -mthreads pthread --thread-safe -mt pthread-config" - -# The ordering *is* (sometimes) important. Some notes on the -# individual items follow: - -# pthreads: AIX (must check this before -lpthread) -# none: in case threads are in libc; should be tried before -Kthread and -# other compiler flags to prevent continual compiler warnings -# -Kthread: Sequent (threads in libc, but -Kthread needed for pthread.h) -# -kthread: FreeBSD kernel threads (preferred to -pthread since SMP-able) -# lthread: LinuxThreads port on FreeBSD (also preferred to -pthread) -# -pthread: Linux/gcc (kernel threads), BSD/gcc (userland threads) -# -pthreads: Solaris/gcc -# -mthreads: Mingw32/gcc, Lynx/gcc -# -mt: Sun Workshop C (may only link SunOS threads [-lthread], but it -# doesn't hurt to check since this sometimes defines pthreads too; -# also defines -D_REENTRANT) -# ... -mt is also the pthreads flag for HP/aCC -# pthread: Linux, etcetera -# --thread-safe: KAI C++ -# pthread-config: use pthread-config program (for GNU Pth library) - -case ${host_os} in - solaris*) - - # On Solaris (at least, for some versions), libc contains stubbed - # (non-functional) versions of the pthreads routines, so link-based - # tests will erroneously succeed. (We need to link with -pthreads/-mt/ - # -lpthread.) (The stubs are missing pthread_cleanup_push, or rather - # a function called by this macro, so we could check for that, but - # who knows whether they'll stub that too in a future libc.) So, - # we'll just look for -pthreads and -lpthread first: - - ax_pthread_flags="-pthreads pthread -mt -pthread $ax_pthread_flags" - ;; - - darwin*) - ax_pthread_flags="-pthread $ax_pthread_flags" - ;; -esac - -if test x"$ax_pthread_ok" = xno; then -for flag in $ax_pthread_flags; do - - case $flag in - none) - AC_MSG_CHECKING([whether pthreads work without any flags]) - ;; - - -*) - AC_MSG_CHECKING([whether pthreads work with $flag]) - PTHREAD_CFLAGS="$flag" - ;; - - pthread-config) - AC_CHECK_PROG(ax_pthread_config, pthread-config, yes, no) - if test x"$ax_pthread_config" = xno; then continue; fi - PTHREAD_CFLAGS="`pthread-config --cflags`" - PTHREAD_LIBS="`pthread-config --ldflags` `pthread-config --libs`" - ;; - - *) - AC_MSG_CHECKING([for the pthreads library -l$flag]) - PTHREAD_LIBS="-l$flag" - ;; - esac - - save_LIBS="$LIBS" - save_CFLAGS="$CFLAGS" - LIBS="$PTHREAD_LIBS $LIBS" - CFLAGS="$CFLAGS $PTHREAD_CFLAGS" - - # Check for various functions. We must include pthread.h, - # since some functions may be macros. (On the Sequent, we - # need a special flag -Kthread to make this header compile.) - # We check for pthread_join because it is in -lpthread on IRIX - # while pthread_create is in libc. We check for pthread_attr_init - # due to DEC craziness with -lpthreads. We check for - # pthread_cleanup_push because it is one of the few pthread - # functions on Solaris that doesn't have a non-functional libc stub. - # We try pthread_create on general principles. - AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <pthread.h> - static void routine(void *a) { a = 0; } - static void *start_routine(void *a) { return a; }], - [pthread_t th; pthread_attr_t attr; - pthread_create(&th, 0, start_routine, 0); - pthread_join(th, 0); - pthread_attr_init(&attr); - pthread_cleanup_push(routine, 0); - pthread_cleanup_pop(0) /* ; */])], - [ax_pthread_ok=yes], - []) - - LIBS="$save_LIBS" - CFLAGS="$save_CFLAGS" - - AC_MSG_RESULT($ax_pthread_ok) - if test "x$ax_pthread_ok" = xyes; then - break; - fi - - PTHREAD_LIBS="" - PTHREAD_CFLAGS="" -done -fi - -# Various other checks: -if test "x$ax_pthread_ok" = xyes; then - save_LIBS="$LIBS" - LIBS="$PTHREAD_LIBS $LIBS" - save_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS $PTHREAD_CFLAGS" - - # Detect AIX lossage: JOINABLE attribute is called UNDETACHED. - AC_MSG_CHECKING([for joinable pthread attribute]) - attr_name=unknown - for attr in PTHREAD_CREATE_JOINABLE PTHREAD_CREATE_UNDETACHED; do - AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <pthread.h>], - [int attr = $attr; return attr /* ; */])], - [attr_name=$attr; break], - []) - done - AC_MSG_RESULT($attr_name) - if test "$attr_name" != PTHREAD_CREATE_JOINABLE; then - AC_DEFINE_UNQUOTED(PTHREAD_CREATE_JOINABLE, $attr_name, - [Define to necessary symbol if this constant - uses a non-standard name on your system.]) - fi - - AC_MSG_CHECKING([if more special flags are required for pthreads]) - flag=no - case ${host_os} in - aix* | freebsd* | darwin*) flag="-D_THREAD_SAFE";; - osf* | hpux*) flag="-D_REENTRANT";; - solaris*) - if test "$GCC" = "yes"; then - flag="-D_REENTRANT" - else - flag="-mt -D_REENTRANT" - fi - ;; - esac - AC_MSG_RESULT(${flag}) - if test "x$flag" != xno; then - PTHREAD_CFLAGS="$flag $PTHREAD_CFLAGS" - fi - - AC_CACHE_CHECK([for PTHREAD_PRIO_INHERIT], - ax_cv_PTHREAD_PRIO_INHERIT, [ - AC_LINK_IFELSE([ - AC_LANG_PROGRAM([[#include <pthread.h>]], [[int i = PTHREAD_PRIO_INHERIT;]])], - [ax_cv_PTHREAD_PRIO_INHERIT=yes], - [ax_cv_PTHREAD_PRIO_INHERIT=no]) - ]) - AS_IF([test "x$ax_cv_PTHREAD_PRIO_INHERIT" = "xyes"], - AC_DEFINE([HAVE_PTHREAD_PRIO_INHERIT], 1, [Have PTHREAD_PRIO_INHERIT.])) - - LIBS="$save_LIBS" - CFLAGS="$save_CFLAGS" - - # More AIX lossage: compile with *_r variant - if test "x$GCC" != xyes; then - case $host_os in - aix*) - AS_CASE(["x/$CC"], - [x*/c89|x*/c89_128|x*/c99|x*/c99_128|x*/cc|x*/cc128|x*/xlc|x*/xlc_v6|x*/xlc128|x*/xlc128_v6], - [#handle absolute path differently from PATH based program lookup - AS_CASE(["x$CC"], - [x/*], - [AS_IF([AS_EXECUTABLE_P([${CC}_r])],[PTHREAD_CC="${CC}_r"])], - [AC_CHECK_PROGS([PTHREAD_CC],[${CC}_r],[$CC])])]) - ;; - esac - fi -fi - -test -n "$PTHREAD_CC" || PTHREAD_CC="$CC" - -AC_SUBST(PTHREAD_LIBS) -AC_SUBST(PTHREAD_CFLAGS) -AC_SUBST(PTHREAD_CC) - -# Finally, execute ACTION-IF-FOUND/ACTION-IF-NOT-FOUND: -if test x"$ax_pthread_ok" = xyes; then - ifelse([$1],,AC_DEFINE(HAVE_PTHREAD,1,[Define if you have POSIX threads libraries and header files.]),[$1]) - : -else - ax_pthread_ok=no - $2 -fi -AC_LANG_POP -])dnl AX_PTHREAD diff --git a/net-analyzer/iftop/files/iftop-1.0_pre4-allow-scales-beyond-1gbps.patch b/net-analyzer/iftop/files/iftop-1.0_pre4-allow-scales-beyond-1gbps.patch new file mode 100644 index 000000000000..9c9892147df5 --- /dev/null +++ b/net-analyzer/iftop/files/iftop-1.0_pre4-allow-scales-beyond-1gbps.patch @@ -0,0 +1,43 @@ +https://code.blinkace.com/pdw/iftop/-/commit/77901c8c53e01359d83b8090aacfe62214658183 +https://bugs.gentoo.org/857837 + +From: Paul Warren <pdw@ex-parrot.com> +Date: Wed, 3 Oct 2018 18:02:36 +0100 +Subject: [PATCH] Support scales beyond 1Gbps +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Guido Jäkel <Guido.Jaekel@GMX.DE> +--- a/ui.c ++++ b/ui.c +@@ -71,7 +71,7 @@ int dontshowdisplay = 0; + + /* Barchart scales. */ + static struct { +- int max, interval; ++ long max; int interval; + } scale[] = { + { 64000, 10 }, /* 64 kbit/s */ + { 128000, 10 }, +@@ -79,7 +79,9 @@ static struct { + { 1000000, 10 }, /* 1 Mbit/s */ + { 10000000, 10 }, + { 100000000, 100 }, +- { 1000000000, 100 } /* 1 Gbit/s */ ++ { 1000000000, 100 }, /* 1 Gbit/s */ ++ {10000000000, 100 }, ++ {100000000000, 100 } + }; + static int rateidx = 0, wantbiggerrate; + +@@ -105,7 +107,7 @@ static float get_max_bandwidth() { + } + + /* rate in bits */ +-static int get_bar_length(const int rate) { ++static int get_bar_length(const long rate) { + float l; + if (rate <= 0) + return 0; +GitLab diff --git a/net-analyzer/iftop/iftop-1.0_pre4-r4.ebuild b/net-analyzer/iftop/iftop-1.0_pre4-r4.ebuild deleted file mode 100644 index 45a3bfa2dd16..000000000000 --- a/net-analyzer/iftop/iftop-1.0_pre4-r4.ebuild +++ /dev/null @@ -1,46 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit autotools - -DESCRIPTION="display bandwidth usage on an interface" -SRC_URI="http://www.ex-parrot.com/pdw/iftop/download/${P/_/}.tar.gz" -HOMEPAGE="http://www.ex-parrot.com/pdw/iftop/" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" - -RDEPEND=" - net-libs/libpcap - sys-libs/ncurses:0= -" -DEPEND=" - ${RDEPEND} - virtual/pkgconfig -" -PATCHES=( - "${FILESDIR}"/${PN}-1.0_pre4-configure.ac.patch - "${FILESDIR}"/${PN}-1.0_pre4-Makefile.am.patch - "${FILESDIR}"/${PN}-1.0_pre4-tsent-set-but-not-used.patch - "${FILESDIR}"/${PN}-1.0_pre4-ip6.arpa.patch - "${FILESDIR}"/${PN}-1.0_pre4-fix-MAC-formatting.patch - "${FILESDIR}"/${PN}-1.0_pre4-fno-common.patch -) -S="${WORKDIR}"/${P/_/} - -src_prepare() { - default - # bug 490168 - cat "${FILESDIR}"/ax_pthread.m4 >> "${S}"/acinclude.m4 || die - - eautoreconf -} - -src_install() { - dosbin iftop - doman iftop.8 - - dodoc AUTHORS ChangeLog README "${FILESDIR}"/iftoprc -} diff --git a/net-analyzer/iftop/iftop-1.0_pre4-r5.ebuild b/net-analyzer/iftop/iftop-1.0_pre4-r5.ebuild new file mode 100644 index 000000000000..23bb00c63b89 --- /dev/null +++ b/net-analyzer/iftop/iftop-1.0_pre4-r5.ebuild @@ -0,0 +1,49 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools + +DESCRIPTION="Display bandwidth usage on an interface" +HOMEPAGE="http://www.ex-parrot.com/pdw/iftop/ https://code.blinkace.com/pdw/iftop" +SRC_URI="http://www.ex-parrot.com/pdw/iftop/download/${P/_/}.tar.gz" +S="${WORKDIR}"/${P/_/} + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ppc ~ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" + +RDEPEND=" + net-libs/libpcap + sys-libs/ncurses:= +" +DEPEND="${RDEPEND}" +# autoconf-archive for ax_pthread, bug #490168 +BDEPEND=" + dev-build/autoconf-archive + virtual/pkgconfig +" + +PATCHES=( + "${FILESDIR}"/${PN}-1.0_pre4-configure.ac.patch + "${FILESDIR}"/${PN}-1.0_pre4-Makefile.am.patch + "${FILESDIR}"/${PN}-1.0_pre4-tsent-set-but-not-used.patch + "${FILESDIR}"/${PN}-1.0_pre4-ip6.arpa.patch + "${FILESDIR}"/${PN}-1.0_pre4-fix-MAC-formatting.patch + "${FILESDIR}"/${PN}-1.0_pre4-fno-common.patch + "${FILESDIR}"/${PN}-1.0_pre4-allow-scales-beyond-1gbps.patch +) + +src_prepare() { + default + + eautoreconf +} + +src_install() { + dosbin iftop + doman iftop.8 + + dodoc AUTHORS ChangeLog README "${FILESDIR}"/iftoprc +} diff --git a/net-analyzer/iftop/iftop-9999999.ebuild b/net-analyzer/iftop/iftop-9999999.ebuild deleted file mode 100644 index f67befd3bc29..000000000000 --- a/net-analyzer/iftop/iftop-9999999.ebuild +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit autotools git-r3 - -DESCRIPTION="display bandwidth usage on an interface" -HOMEPAGE="http://www.ex-parrot.com/pdw/iftop/" -EGIT_REPO_URI="https://code.blinkace.com/pdw/iftop" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="" - -RDEPEND=" - net-libs/libpcap - sys-libs/ncurses:0= -" -DEPEND=" - ${RDEPEND} - virtual/pkgconfig -" -S="${WORKDIR}"/${P/_/} -PATCHES=( - "${FILESDIR}"/${PN}-1.0_pre4-configure.ac.patch - "${FILESDIR}"/${PN}-1.0_pre4-Makefile.am.patch - "${FILESDIR}"/${PN}-1.0_pre4-fix-MAC-formatting.patch - "${FILESDIR}"/${PN}-1.0_pre4-fno-common.patch -) - -src_prepare() { - default - # bug 490168 - cat "${FILESDIR}"/ax_pthread.m4 >> "${S}"/acinclude.m4 || die - - eautoreconf -} - -src_install() { - dosbin iftop - doman iftop.8 - - dodoc AUTHORS ChangeLog README "${FILESDIR}"/iftoprc -} diff --git a/net-analyzer/iftop/metadata.xml b/net-analyzer/iftop/metadata.xml index 789a44405524..211445353661 100644 --- a/net-analyzer/iftop/metadata.xml +++ b/net-analyzer/iftop/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>netmon@gentoo.org</email> diff --git a/net-analyzer/ike-scan/Manifest b/net-analyzer/ike-scan/Manifest index e0cdada21dde..992eb7171b88 100644 --- a/net-analyzer/ike-scan/Manifest +++ b/net-analyzer/ike-scan/Manifest @@ -1 +1 @@ -DIST ike-scan-1.9.4.tar.gz 1360202 BLAKE2B abe206b22a23a6d4eaa2218204657d6c47f22ac8009df1f1e7918fbb55575033f237462ed57ba89aee8bed28e47a4dacf69e443dac5cd3b506842e26e71f97e9 SHA512 d7dde6d3d76a2e3ddeb9ed1f0dee3e2c3a13d4afa57ebb8ff19f6af094f7334b464509cee6ffc385d2703bcf9bc1c503bc604506279518f692f82c8f12f146be +DIST ike-scan-1.9.5.tar.gz 1542264 BLAKE2B 3095c2929c7f24da43852402a3e5cfe73dd65100773283ef08b791784be2e2f04bba24843469e407695a027e76e1e0aa18effabc210643414677a35df7f2614c SHA512 5eb98e41c639bc30996041f4e759a6ada7f4baa5b8102992ac2313ed8ff51032d877b116bc24972e0ecd652290849aa67a63523d92ee63af6577112350ee5590 diff --git a/net-analyzer/ike-scan/files/ike-scan-1.9.5-clang-16.patch b/net-analyzer/ike-scan/files/ike-scan-1.9.5-clang-16.patch new file mode 100644 index 000000000000..c4aec2836ba0 --- /dev/null +++ b/net-analyzer/ike-scan/files/ike-scan-1.9.5-clang-16.patch @@ -0,0 +1,92 @@ +https://github.com/royhills/ike-scan/pull/39 + +From 9949ce4bdf9f4bcb616b2a5d273708a7ea9ee93d Mon Sep 17 00:00:00 2001 +From: Sam James <sam@gentoo.org> +Date: Mon, 26 Sep 2022 05:22:18 +0100 +Subject: [PATCH 1/3] acinclude.m4: fix -Wimplicit-int errors (Clang 16+ + compat) + +--- a/acinclude.m4 ++++ b/acinclude.m4 +@@ -144,7 +144,7 @@ int does_int64_work() + return 0; + return 1; + } +-main() { ++int main() { + return ! does_int64_work(); + }], + [Ac_cachevar=yes], +@@ -200,7 +200,7 @@ int does_int64_snprintf_work() + return 0; /* either multiply or snprintf is busted */ + return 1; + } +-main() { ++int main() { + return ! does_int64_snprintf_work(); + }], + [pgac_cv_snprintf_long_long_int_format=$pgac_format; break], + +From 6a931ca559a937cb9f7917b9131ec1aca4919683 Mon Sep 17 00:00:00 2001 +From: Sam James <sam@gentoo.org> +Date: Mon, 26 Sep 2022 05:23:06 +0100 +Subject: [PATCH 2/3] acinclude.m4: fix typo in 'x' if check + +Case doesn't matter but case does need to match on left & right +hand side, so just choose uppercase everywhere to match what +the rest of the file does. +--- a/acinclude.m4 ++++ b/acinclude.m4 +@@ -278,7 +278,7 @@ dnl in <features.h>. We don't use __GNUC_PREREQ directly because <features.h> + dnl is not present on all the operating systems that we support, e.g. OpenBSD. + dnl + AC_DEFUN([GCC_FORTIFY_SOURCE],[ +- if test "x$CC" != "X"; then ++ if test "X$CC" != "X"; then + AC_MSG_CHECKING([whether ${CC} accepts -D_FORTIFY_SOURCE]) + AC_TRY_COMPILE(,[ + #define GNUC_PREREQ(maj, min) ((__GNUC__ << 16) + __GNUC_MINOR__ >= ((maj) << 16) + (min)) +@@ -311,7 +311,7 @@ dnl If it is not supported, then the test program will compile without + dnl warnings. + dnl + AC_DEFUN([GCC_FORMAT_SECURITY],[ +- if test "x$CC" != "X"; then ++ if test "X$CC" != "X"; then + AC_MSG_CHECKING([whether ${CC} accepts -Wformat-security]) + wfs_old_cflags="$CFLAGS" + CFLAGS="$CFLAGS -Wall -Werror -Wformat -Wformat-security" + +From fbc40c7b117b523eceb9aa58d6086bde701f1299 Mon Sep 17 00:00:00 2001 +From: Sam James <sam@gentoo.org> +Date: Sat, 1 Oct 2022 01:24:04 +0100 +Subject: [PATCH 3/3] configure.ac: Fix recognising -Wformat-security with + Clang + +Before: +``` +checking whether clang accepts -fstack-protector... yes +checking whether clang accepts -D_FORTIFY_SOURCE... yes +checking whether clang accepts -Wformat-security... no +``` + +After: +``` +checking whether clang accepts -fstack-protector... yes +checking whether clang accepts -Wformat-security... yes +checking whether clang accepts -D_FORTIFY_SOURCE... yes +``` + +Signed-off-by: Sam James <sam@gentoo.org> +--- a/configure.ac ++++ b/configure.ac +@@ -34,8 +34,8 @@ if test -n "$GCC"; then + CFLAGS="$CFLAGS -Wall -Wshadow -Wwrite-strings" + GCC_WEXTRA + GCC_STACK_PROTECT_CC +- GCC_FORTIFY_SOURCE + GCC_FORMAT_SECURITY ++ GCC_FORTIFY_SOURCE + dnl Uncomment the lines below for testing with stricter warnings. + dnl CFLAGS="$CFLAGS -pedantic -Wpointer-arith -Wcast-qual -Wcast-align -Wconversion -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wnested-externs -Winline " + dnl Uncomment the line below to check malloc/free with electric fence + diff --git a/net-analyzer/ike-scan/files/ike-scan-1.9.5-openssl-libdir.patch b/net-analyzer/ike-scan/files/ike-scan-1.9.5-openssl-libdir.patch new file mode 100644 index 000000000000..0ee12dc2f907 --- /dev/null +++ b/net-analyzer/ike-scan/files/ike-scan-1.9.5-openssl-libdir.patch @@ -0,0 +1,55 @@ +TODO: switch to pkgconfig +--- a/configure.ac ++++ b/configure.ac +@@ -187,49 +187,9 @@ AC_ARG_WITH(openssl, + [ + if test "x$withval" != "xno" ; then + AC_MSG_RESULT(yes) +- for ssldir in $withval /usr/local/ssl /usr/lib/ssl /usr/ssl /usr/pkg /usr/local /usr; do +- if test -f "${ssldir}/include/openssl/ssl.h"; then +- found_openssl="yes" +- openssl_header_dir="${ssldir}/include" +- AC_MSG_NOTICE([Found ${ssldir}/include/openssl/ssl.h]) +- break +- fi +- if test -f "${ssldir}/openssl/ssl.h"; then +- found_openssl="yes" +- openssl_header_dir="${ssldir}" +- AC_MSG_NOTICE([Found ${ssldir}/openssl/ssl.h]) +- break +- fi +- done +- if test x$found_openssl != xyes; then +- AC_MSG_ERROR([Cannot find OpenSSL header files]) +- else +- AC_MSG_NOTICE([OpenSSL header files found in $openssl_header_dir]) +- CPPFLAGS="-I${openssl_header_dir} ${CPPFLAGS}" +- fi +- if test -f "${ssldir}/lib/libcrypto.so"; then +- openssl_lib_dir="${ssldir}/lib" +- AC_MSG_NOTICE([Found ${ssldir}/lib/libcrypto.so]) +- elif test -f "${ssldir}/libcrypto.so"; then +- openssl_lib_dir="${ssldir}" +- AC_MSG_NOTICE([Found ${ssldir}/libcrypto.so]) +- elif test -f "${ssldir}/lib/libcrypto.dylib"; then +- openssl_lib_dir="${ssldir}/lib" +- AC_MSG_NOTICE([Found ${ssldir}/lib/libcrypto.dylib]) +- elif test -f "${ssldir}/libcrypto.dylib"; then +- openssl_lib_dir="${ssldir}" +- AC_MSG_NOTICE([Found ${ssldir}/libcrypto.dylib]) +- elif test -f "${ssldir}/lib/libcrypto.a"; then +- openssl_lib_dir="${ssldir}/lib" +- AC_MSG_NOTICE([Found ${ssldir}/lib/libcrypto.a]) +- elif test -f "${ssldir}/libcrypto.a"; then +- openssl_lib_dir="${ssldir}" +- AC_MSG_NOTICE([Found ${ssldir}/libcrypto.a]) +- else +- openssl_lib_dir="${ssldir}/lib" +- AC_MSG_NOTICE([Cannot find libcrypto under $ssldir - assuming its in the standard search path]) +- fi + AC_MSG_NOTICE([OpenSSL libraries found in $openssl_lib_dir]) ++ openssl_header_dir="${withval}/include/openssl" ++ CPPFLAGS="${CPPFLAGS} -I${openssl_header_dir}" + LDFLAGS="-L${openssl_lib_dir} ${LDFLAGS}" + LIBS="-lcrypto ${LIBS}" + diff --git a/net-analyzer/ike-scan/ike-scan-1.9.4.ebuild b/net-analyzer/ike-scan/ike-scan-1.9.4.ebuild deleted file mode 100644 index 9237de4dda56..000000000000 --- a/net-analyzer/ike-scan/ike-scan-1.9.4.ebuild +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit autotools - -DESCRIPTION="A utility for finding, fingerprinting and testing IKE VPN servers" -HOMEPAGE="https://github.com/royhills/ike-scan/" -SRC_URI="https://github.com/royhills/ike-scan/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~ppc x86" -IUSE="libressl ssl" - -DEPEND=" - ssl? ( - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) - ) -" -RDEPEND=" - ${DEPEND} -" - -src_prepare() { - # Fix buffer overflow, bug #277556 - sed \ - -e "/MAXLINE/s:255:511:g" \ - -i ike-scan.h || die - - default - - eautoreconf -} - -src_configure() { - econf $(use_with ssl openssl) -} - -src_install() { - default - dodoc udp-backoff-fingerprinting-paper.txt -} diff --git a/net-analyzer/ike-scan/ike-scan-1.9.5.ebuild b/net-analyzer/ike-scan/ike-scan-1.9.5.ebuild new file mode 100644 index 000000000000..da10ef3cd21b --- /dev/null +++ b/net-analyzer/ike-scan/ike-scan-1.9.5.ebuild @@ -0,0 +1,44 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools + +DESCRIPTION="A utility for finding, fingerprinting and testing IKE VPN servers" +HOMEPAGE="https://github.com/royhills/ike-scan" +SRC_URI="https://github.com/royhills/ike-scan/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~ppc x86" +IUSE="ssl" + +DEPEND="ssl? ( dev-libs/openssl:= )" +RDEPEND="${DEPEND}" + +PATCHES=( + "${FILESDIR}"/${PN}-1.9.5-clang-16.patch + "${FILESDIR}"/${PN}-1.9.5-openssl-libdir.patch +) + +src_prepare() { + default + + # Fix buffer overflow, bug #277556 + sed \ + -e "/MAXLINE/s:255:511:g" \ + -i ike-scan.h || die + + eautoreconf +} + +src_configure() { + econf \ + $(use_with ssl openssl "${ESYSROOT}"/usr) +} + +src_install() { + default + dodoc udp-backoff-fingerprinting-paper.txt +} diff --git a/net-analyzer/ike-scan/ike-scan-99999.ebuild b/net-analyzer/ike-scan/ike-scan-99999.ebuild deleted file mode 100644 index 1e9a5ce43bb9..000000000000 --- a/net-analyzer/ike-scan/ike-scan-99999.ebuild +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit autotools git-r3 - -DESCRIPTION="A utility for finding, fingerprinting and testing IKE VPN servers" -HOMEPAGE="https://github.com/royhills/ike-scan/" -EGIT_REPO_URI="https://github.com/royhills/ike-scan" - -LICENSE="GPL-2" -SLOT="0" -IUSE="libressl ssl" -KEYWORDS="" - -DEPEND=" - ssl? ( - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) - ) -" -RDEPEND=" - ${DEPEND} -" - -src_prepare() { - # Fix buffer overflow, bug #277556 - sed \ - -e "/MAXLINE/s:255:511:g" \ - -i ike-scan.h || die - - default - - eautoreconf -} - -src_configure() { - econf $(use_with ssl openssl) -} - -src_install() { - default - dodoc udp-backoff-fingerprinting-paper.txt -} diff --git a/net-analyzer/ike-scan/metadata.xml b/net-analyzer/ike-scan/metadata.xml index 2c2a7923cfc8..7d61f5907a05 100644 --- a/net-analyzer/ike-scan/metadata.xml +++ b/net-analyzer/ike-scan/metadata.xml @@ -1,8 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!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> + <upstream> + <remote-id type="github">royhills/ike-scan</remote-id> + </upstream> </pkgmetadata> diff --git a/net-analyzer/ipaudit/Manifest b/net-analyzer/ipaudit/Manifest index 1d5b03465bf8..403c37514f35 100644 --- a/net-analyzer/ipaudit/Manifest +++ b/net-analyzer/ipaudit/Manifest @@ -1 +1 @@ -DIST ipaudit-1.0BETA2.tar.gz 135680 BLAKE2B 2a8e7754251c743758d6e0d7008d904a3a237c26a660f5c07661c632dd75ecda6cf3b04253eb76f64c72ed278da00030cf64231bdc4760a6b04df1497f628ec2 SHA512 3a8890821c515aea95762eeb2cc7a649533ff739984c944bcb26acb72434e1f2b453a98365719fce9e062d6262b9d76ac389f149ad2a19361422783bc0b55e09 +DIST ipaudit-1.1.tar.gz 170253 BLAKE2B 6515cab817a35835d5c3eb33dc4d8c9f28a1ceb906854e55c3695fc6ee5d230ad2ae6a6fd59849623e161fe4deb5013f55bdf6effcaaf6ca4d064ded73c148f0 SHA512 5eb1971b454c8c96c02dc260e537a9a627554b7c9d1e269be9de2ffdb5cbfed00272b643de7b15865659cef0db482e4c460f96b1545bcd6c4f208c96d7401ef9 diff --git a/net-analyzer/ipaudit/ipaudit-1.0_beta2-r1.ebuild b/net-analyzer/ipaudit/ipaudit-1.0_beta2-r1.ebuild deleted file mode 100644 index fba409faf3e3..000000000000 --- a/net-analyzer/ipaudit/ipaudit-1.0_beta2-r1.ebuild +++ /dev/null @@ -1,23 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DESCRIPTION="IPAudit monitors network activity on a network by host, protocol and port" -HOMEPAGE="http://ipaudit.sourceforge.net/" -MY_P="${PN}-${PV/_beta/BETA}" -SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz" -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ppc x86" -IUSE="mysql" -DEPEND="net-libs/libpcap - mysql? ( dev-db/mysql-connector-c:0= )" -RDEPEND="${DEPEND}" -S="${WORKDIR}/${MY_P}" - -DOCS=( AUTHORS README ) - -src_configure() { - econf $(use_with mysql) -} diff --git a/net-analyzer/ipaudit/ipaudit-1.1.ebuild b/net-analyzer/ipaudit/ipaudit-1.1.ebuild new file mode 100644 index 000000000000..dc1733d16940 --- /dev/null +++ b/net-analyzer/ipaudit/ipaudit-1.1.ebuild @@ -0,0 +1,23 @@ +# Copyright 1999-2022 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" + +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="amd64 ~ppc x86" +IUSE="mysql" + +RDEPEND=" + net-libs/libpcap + sys-libs/zlib:= + mysql? ( dev-db/mysql-connector-c:= )" +DEPEND="${RDEPEND}" + +src_configure() { + econf $(use_with mysql) +} diff --git a/net-analyzer/ipaudit/metadata.xml b/net-analyzer/ipaudit/metadata.xml index 9b6b0277edf6..acfba63f9767 100644 --- a/net-analyzer/ipaudit/metadata.xml +++ b/net-analyzer/ipaudit/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> <email>robbat2@gentoo.org</email> diff --git a/net-analyzer/ipband/ipband-0.8.1-r2.ebuild b/net-analyzer/ipband/ipband-0.8.1-r2.ebuild index 9c04a837c52c..6b90c152be8a 100644 --- a/net-analyzer/ipband/ipband-0.8.1-r2.ebuild +++ b/net-analyzer/ipband/ipband-0.8.1-r2.ebuild @@ -1,14 +1,15 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 + inherit toolchain-funcs -DESCRIPTION="A pcap based IP traffic and bandwidth monitor" -HOMEPAGE="http://ipband.sourceforge.net/" +DESCRIPTION="Pcap based IP traffic and bandwidth monitor" +HOMEPAGE="https://ipband.sourceforge.net/" SRC_URI="mirror://sourceforge/${PN}/${P}.tgz" -LICENSE="GPL-2" +LICENSE="GPL-2+" SLOT="0" KEYWORDS="~amd64 x86" diff --git a/net-analyzer/ipband/metadata.xml b/net-analyzer/ipband/metadata.xml index 1a6bed5f2dea..849a3380246b 100644 --- a/net-analyzer/ipband/metadata.xml +++ b/net-analyzer/ipband/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>netmon@gentoo.org</email> diff --git a/net-analyzer/ipcad/ipcad-3.7.3.ebuild b/net-analyzer/ipcad/ipcad-3.7.3.ebuild index e9723ab496af..7c8d36c02083 100644 --- a/net-analyzer/ipcad/ipcad-3.7.3.ebuild +++ b/net-analyzer/ipcad/ipcad-3.7.3.ebuild @@ -1,8 +1,9 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 -inherit autotools eutils +EAPI=8 + +inherit autotools DESCRIPTION="IP Cisco Accounting Daemon" HOMEPAGE="https://sourceforge.net/projects/ipcad/ http://lionet.info/ipcad/" @@ -18,11 +19,14 @@ RDEPEND=" " DEPEND="${RDEPEND}" +PATCHES=( + "${FILESDIR}"/${PN}-3.7-linux-2.6.27.patch + "${FILESDIR}"/${PN}-3.7-linux-2.6.35.patch + "${FILESDIR}"/${P}-signal_h.patch +) + src_prepare() { - epatch \ - "${FILESDIR}"/${PN}-3.7-linux-2.6.27.patch \ - "${FILESDIR}"/${PN}-3.7-linux-2.6.35.patch \ - "${FILESDIR}"/${P}-signal_h.patch + default sed -i \ -e "s|^chroot = /adm/tmp;|chroot = /var/ipcad;|" \ diff --git a/net-analyzer/ipcad/metadata.xml b/net-analyzer/ipcad/metadata.xml index 95df253aa80c..6098397dd05a 100644 --- a/net-analyzer/ipcad/metadata.xml +++ b/net-analyzer/ipcad/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>netmon@gentoo.org</email> diff --git a/net-analyzer/ipgen/metadata.xml b/net-analyzer/ipgen/metadata.xml index 2f99ecc465ec..3e3ad912eda9 100644 --- a/net-analyzer/ipgen/metadata.xml +++ b/net-analyzer/ipgen/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>netmon@gentoo.org</email> diff --git a/net-analyzer/ipguard/ipguard-1.04-r1.ebuild b/net-analyzer/ipguard/ipguard-1.04-r1.ebuild index 73efd0b68720..0b9d630790e5 100644 --- a/net-analyzer/ipguard/ipguard-1.04-r1.ebuild +++ b/net-analyzer/ipguard/ipguard-1.04-r1.ebuild @@ -1,7 +1,8 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 + inherit toolchain-funcs DESCRIPTION="Tool designed to protect LAN IP adress space by ARP spoofing" @@ -16,9 +17,9 @@ DEPEND=" net-libs/libnet:1.1 net-libs/libpcap " -RDEPEND=" - ${DEPEND} -" +RDEPEND="${DEPEND}" +BDEPEND="virtual/pkgconfig" + PATCHES=( "${FILESDIR}"/${P}-gentoo.patch "${FILESDIR}"/${P}-init.d.patch @@ -28,16 +29,16 @@ PATCHES=( src_compile() { emake \ - CC=$(tc-getCC) \ + CC="$(tc-getCC)" \ LIBNET_CONFIG="$(tc-getPKG_CONFIG) libnet" \ - PREFIX=\"${EPREFIX:-/usr}\" + PREFIX=\""${EPREFIX:-/usr}"\" } src_install() { emake \ DESTDIR="${D}" \ LIBNET_CONFIG="$(tc-getPKG_CONFIG) libnet" \ - PREFIX=\"${EPREFIX:-/usr}\" \ + PREFIX=\""${EPREFIX:-/usr}"\" \ install newinitd doc/${PN}.gentoo ${PN} diff --git a/net-analyzer/ipguard/metadata.xml b/net-analyzer/ipguard/metadata.xml index 74c2baebb4ec..dce3f3be66c0 100644 --- a/net-analyzer/ipguard/metadata.xml +++ b/net-analyzer/ipguard/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>netmon@gentoo.org</email> diff --git a/net-analyzer/iplog/iplog-2.2.3-r2.ebuild b/net-analyzer/iplog/iplog-2.2.3-r2.ebuild deleted file mode 100644 index a21f01029226..000000000000 --- a/net-analyzer/iplog/iplog-2.2.3-r2.ebuild +++ /dev/null @@ -1,35 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit eutils - -DESCRIPTION="iplog is a TCP/IP traffic logger" -HOMEPAGE="http://ojnk.sourceforge.net/" -SRC_URI="mirror://sourceforge/ojnk/${P}.tar.gz" - -LICENSE="|| ( GPL-2 FDL-1.1 )" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~mips ppc sparc x86" - -DEPEND="net-libs/libpcap" -RDEPEND="${DEPEND}" - -src_prepare() { - epatch "${FILESDIR}"/${PV}-DLT_LINUX_SSL.patch -} - -src_compile() { - emake CFLAGS="${CFLAGS} -D_REENTRANT" all -} - -src_install() { - emake \ - prefix="${D}"/usr \ - mandir="${D}"/usr/share/man \ - install - - dodoc AUTHORS NEWS README TODO example-iplog.conf - - newinitd "${FILESDIR}"/iplog.rc6 iplog -} diff --git a/net-analyzer/iplog/iplog-2.2.3-r3.ebuild b/net-analyzer/iplog/iplog-2.2.3-r3.ebuild new file mode 100644 index 000000000000..67d0f523848a --- /dev/null +++ b/net-analyzer/iplog/iplog-2.2.3-r3.ebuild @@ -0,0 +1,31 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit flag-o-matic toolchain-funcs + +DESCRIPTION="TCP/IP traffic logger" +HOMEPAGE="https://ojnk.sourceforge.net/" +SRC_URI="mirror://sourceforge/ojnk/${P}.tar.gz" + +LICENSE="|| ( GPL-2 FDL-1.1 )" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~ppc sparc x86" + +DEPEND="net-libs/libpcap" +RDEPEND="${DEPEND}" + +PATCHES=( "${FILESDIR}"/${PV}-DLT_LINUX_SSL.patch ) + +DOCS=( AUTHORS NEWS README TODO example-iplog.conf ) + +src_compile() { + append-cppflags -D_REENTRANT + emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" CPPFLAGS="${CPPFLAGS}" all +} + +src_install() { + default + newinitd "${FILESDIR}"/iplog.rc6 iplog +} diff --git a/net-analyzer/iplog/metadata.xml b/net-analyzer/iplog/metadata.xml index 42b9b99c0b7f..a99d7f577e44 100644 --- a/net-analyzer/iplog/metadata.xml +++ b/net-analyzer/iplog/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>netmon@gentoo.org</email> diff --git a/net-analyzer/ippl/ippl-1.4.14-r6.ebuild b/net-analyzer/ippl/ippl-1.4.14-r6.ebuild index 1cddf3d999fa..a764e3b53a63 100644 --- a/net-analyzer/ippl/ippl-1.4.14-r6.ebuild +++ b/net-analyzer/ippl/ippl-1.4.14-r6.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 @@ -14,8 +14,8 @@ SLOT="0" KEYWORDS="amd64 ~ppc x86" BDEPEND=" - virtual/yacc - sys-devel/flex" + app-alternatives/yacc + app-alternatives/lex" RDEPEND="acct-user/ippl" PATCHES=( diff --git a/net-analyzer/ippl/metadata.xml b/net-analyzer/ippl/metadata.xml index 74c2baebb4ec..dce3f3be66c0 100644 --- a/net-analyzer/ippl/metadata.xml +++ b/net-analyzer/ippl/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>netmon@gentoo.org</email> diff --git a/net-analyzer/ipsumdump/Manifest b/net-analyzer/ipsumdump/Manifest index 5b57fb55a84e..902e8a47818b 100644 --- a/net-analyzer/ipsumdump/Manifest +++ b/net-analyzer/ipsumdump/Manifest @@ -1,2 +1 @@ -DIST ipsumdump-1.85.tar.gz 919540 BLAKE2B 870e003f4d9149904e6a411ae89b6df3e6f90e378b300dea823701e5f168d7f7b2c788702c3ca9c5840dbbe4372e30435e6fab79fd975328ddc474bc3e797559 SHA512 b42844cf028b9c1ea9da90306be8d731bffcec1a8f5c9eeb8029f563ddd5781651c583913a2105d8ad99cabac4b003345e1e8fdfb83367cabf806de1bca31596 DIST ipsumdump-1.86.tar.gz 895567 BLAKE2B 5d33e2c6a5df836592028fb1026749561188b3e0cc15fe691404ad17bc1dd724f4fd9e1be46bbe76b200288575251178f874df4f8697b0e943de4185b71f9e69 SHA512 38bf55589ab81eb7601283410a9f962508e419c1a0ef24f088a2d1328b29e360a9788a20689ea45724fbc56194ecb5ede1f3b792e5bc7e97a500a7b2e434fe65 diff --git a/net-analyzer/ipsumdump/ipsumdump-1.85.ebuild b/net-analyzer/ipsumdump/ipsumdump-1.85.ebuild deleted file mode 100644 index 371b03c67b61..000000000000 --- a/net-analyzer/ipsumdump/ipsumdump-1.85.ebuild +++ /dev/null @@ -1,24 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -DESCRIPTION="Simple TCP/IP Dump summarizer/analyzer" -HOMEPAGE="http://read.seas.harvard.edu/~kohler/ipsumdump/" -SRC_URI="http://read.seas.harvard.edu/~kohler/ipsumdump/${P}.tar.gz" - -LICENSE="the-Click-license" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="+ipv6 +nanotimestamp" - -RDEPEND="net-libs/libpcap" -DEPEND="${RDEPEND} - dev-lang/perl - dev-libs/expat - sys-apps/texinfo" - -src_configure() { - econf $(use_enable ipv6 ip6) \ - $(use_enable nanotimestamp) -} diff --git a/net-analyzer/ipsumdump/ipsumdump-1.86-r1.ebuild b/net-analyzer/ipsumdump/ipsumdump-1.86-r1.ebuild index 8b367ee4b4b7..6db10e8c8170 100644 --- a/net-analyzer/ipsumdump/ipsumdump-1.86-r1.ebuild +++ b/net-analyzer/ipsumdump/ipsumdump-1.86-r1.ebuild @@ -1,37 +1,39 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 DESCRIPTION="Simple TCP/IP Dump summarizer/analyzer" -HOMEPAGE="http://read.seas.harvard.edu/~kohler/ipsumdump/" -SRC_URI="http://read.seas.harvard.edu/~kohler/ipsumdump/${P}.tar.gz" +HOMEPAGE="https://read.seas.harvard.edu/~kohler/ipsumdump/" +SRC_URI="https://read.seas.harvard.edu/~kohler/ipsumdump/${P}.tar.gz" LICENSE="the-Click-license" SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="+ipv6 +nanotimestamp" +BDEPEND=" + dev-lang/perl + sys-apps/texinfo +" RDEPEND=" net-libs/libpcap " DEPEND=" ${RDEPEND} - dev-lang/perl dev-libs/expat - sys-apps/texinfo virtual/os-headers " -DOCS=( - NEWS.md - README.md -) + +DOCS=( NEWS.md README.md ) + PATCHES=( "${FILESDIR}"/${PN}-1.86-SIOCGSTAMP.patch ) src_configure() { econf \ + --cache-file="${S}"/config.cache \ $(use_enable ipv6 ip6) \ $(use_enable nanotimestamp) } diff --git a/net-analyzer/ipsumdump/ipsumdump-1.86.ebuild b/net-analyzer/ipsumdump/ipsumdump-1.86.ebuild deleted file mode 100644 index 51f75d48e429..000000000000 --- a/net-analyzer/ipsumdump/ipsumdump-1.86.ebuild +++ /dev/null @@ -1,34 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -DESCRIPTION="Simple TCP/IP Dump summarizer/analyzer" -HOMEPAGE="http://read.seas.harvard.edu/~kohler/ipsumdump/" -SRC_URI="http://read.seas.harvard.edu/~kohler/ipsumdump/${P}.tar.gz" - -LICENSE="the-Click-license" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="+ipv6 +nanotimestamp" - -RDEPEND=" - net-libs/libpcap -" -DEPEND=" - ${RDEPEND} - dev-lang/perl - dev-libs/expat - sys-apps/texinfo - virtual/os-headers -" -DOCS=( - NEWS.md - README.md -) - -src_configure() { - econf \ - $(use_enable ipv6 ip6) \ - $(use_enable nanotimestamp) -} diff --git a/net-analyzer/ipsumdump/metadata.xml b/net-analyzer/ipsumdump/metadata.xml index 670b2921b9ff..89968ad31c0f 100644 --- a/net-analyzer/ipsumdump/metadata.xml +++ b/net-analyzer/ipsumdump/metadata.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type='project'> +<maintainer type="project"> <email>netmon@gentoo.org</email> </maintainer> <use> diff --git a/net-analyzer/iptraf-ng/files/iptraf-ng-1.1.4-tcplog_flowrate_msg.patch b/net-analyzer/iptraf-ng/files/iptraf-ng-1.1.4-tcplog_flowrate_msg.patch deleted file mode 100644 index 8e01989fe6fe..000000000000 --- a/net-analyzer/iptraf-ng/files/iptraf-ng-1.1.4-tcplog_flowrate_msg.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/src/tcptable.c -+++ b/src/tcptable.c -@@ -437,6 +437,8 @@ static char *tcplog_flowrate_msg(struct tcptableent *entry, char *buf, - size_t bufsize) - { - time_t interval = time(NULL) - entry->conn_starttime; -+ if (interval < 1) -+ interval = 1; - - char rbuf[64]; - rate_print(entry->bcount / interval, rbuf, sizeof(rbuf)); diff --git a/net-analyzer/iptraf-ng/iptraf-ng-1.2.1.ebuild b/net-analyzer/iptraf-ng/iptraf-ng-1.2.1.ebuild index cf6548199533..bb3fab832e02 100644 --- a/net-analyzer/iptraf-ng/iptraf-ng-1.2.1.ebuild +++ b/net-analyzer/iptraf-ng/iptraf-ng-1.2.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -10,7 +10,7 @@ SRC_URI="https://github.com/iptraf-ng/iptraf-ng/archive/v${PV}.tar.gz -> ${P}.ta LICENSE="GPL-2 doc? ( FDL-1.1 )" SLOT="0" -KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86" +KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86" IUSE="doc" RDEPEND=" diff --git a/net-analyzer/iptraf-ng/metadata.xml b/net-analyzer/iptraf-ng/metadata.xml index 74c2baebb4ec..8137ba4f4c5d 100644 --- a/net-analyzer/iptraf-ng/metadata.xml +++ b/net-analyzer/iptraf-ng/metadata.xml @@ -1,8 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!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> +<upstream> + <remote-id type="github">iptraf-ng/iptraf-ng</remote-id> +</upstream> </pkgmetadata> diff --git a/net-analyzer/iptstate/Manifest b/net-analyzer/iptstate/Manifest index 54cbf6286e8e..5414199ac370 100644 --- a/net-analyzer/iptstate/Manifest +++ b/net-analyzer/iptstate/Manifest @@ -1 +1 @@ -DIST iptstate-2.2.6.tar.bz2 28700 BLAKE2B 66e18425a4fed423a5a03c8f9ecbc87f4553a64475ab77144f3f37969eb6a399d52d7166bb68d9c9e80753163b841c71b42bfc13796e4a9d2c23db084740f3f5 SHA512 411b357aced384c52caac17b23f3c6bd631ff34d41b6000b90ff6dfc3cf20e36e46416d3691ac699b06f16d6042a42681b42a5d3594ce287aa6cf3b3b637c999 +DIST iptstate-2.2.7.tar.bz2 29994 BLAKE2B 0be657d4452b40b1835279bfa141b94e3db7adeeba141dede8456c64e4847efbb23197afab7e2452c9ad84c1be5eaffa1d9f7da15a5aaeb0c6fb28c1d62d6733 SHA512 43e258639e0f728d4a393d2dd7a834a6df1131da5291559a504800a0918dad3e010baaeb1bca66cb9a62bad6955f678be3302aac916fc956a525cdd7e9d0690a diff --git a/net-analyzer/iptstate/files/iptstate-2.2.5-gentoo.patch b/net-analyzer/iptstate/files/iptstate-2.2.5-gentoo.patch deleted file mode 100644 index fdaeeb7867b2..000000000000 --- a/net-analyzer/iptstate/files/iptstate-2.2.5-gentoo.patch +++ /dev/null @@ -1,26 +0,0 @@ ---- a/Makefile -+++ b/Makefile -@@ -17,12 +17,11 @@ - ### ADVANCED USERS AND PACKAGERS MIGHT WANT TO CHANGE THIS - - CXX?= g++ --CXXFLAGS?= -g -Wall -O2 -+CXXFLAGS+= -Wall - CXXFILES?= iptstate.cc - - # THIS IS FOR NORMAL COMPILATION --LIBS?= -lncurses -lnetfilter_conntrack --CPPFLAGS= -+LIBS= $(shell $(PKG_CONFIG) --libs ncurses libnetfilter_conntrack) - - ### YOU SHOULDN'T NEED TO CHANGE ANYTHING BELOW THIS - -@@ -45,7 +44,7 @@ - echo "+------------------------------------------------------------+" ;\ - echo ""; - -- $(CXX) $(CXXFLAGS) $(CXXFILES) -o iptstate $(LIBS) $(CPPFLAGS) -+ $(CXX) $(LDFLAGS) $(CXXFLAGS) $(CPPFLAGS) $(CXXFILES) -o iptstate $(LIBS) - @touch iptstate - - @\ diff --git a/net-analyzer/iptstate/files/iptstate-2.2.7-respect-CPPFLAGS.patch b/net-analyzer/iptstate/files/iptstate-2.2.7-respect-CPPFLAGS.patch new file mode 100644 index 000000000000..6b658eac80bb --- /dev/null +++ b/net-analyzer/iptstate/files/iptstate-2.2.7-respect-CPPFLAGS.patch @@ -0,0 +1,18 @@ +From: Sam James <sam@gentoo.org> +Date: Fri, 10 Dec 2021 03:19:45 +0000 +Subject: [PATCH 3/3] Makefile: don't override CPPFLAGS + +There's no need to explicitly blank this and it prevents overrides +from the environment. + +Signed-off-by: Sam James <sam@gentoo.org> +--- a/Makefile ++++ b/Makefile +@@ -26,7 +26,6 @@ CXXFILES?= iptstate.cc + + # THIS IS FOR NORMAL COMPILATION + LIBS?= $(shell $(PKG_CONFIG) --libs ncurses libnetfilter_conntrack) +-CPPFLAGS= + + ### YOU SHOULDN'T NEED TO CHANGE ANYTHING BELOW THIS + diff --git a/net-analyzer/iptstate/files/iptstate-2.2.7-respect-LDFLAGS.patch b/net-analyzer/iptstate/files/iptstate-2.2.7-respect-LDFLAGS.patch new file mode 100644 index 000000000000..41c875453926 --- /dev/null +++ b/net-analyzer/iptstate/files/iptstate-2.2.7-respect-LDFLAGS.patch @@ -0,0 +1,18 @@ +https://github.com/jaymzh/iptstate/pull/21 + +From: Sam James <sam@gentoo.org> +Date: Fri, 10 Dec 2021 03:10:49 +0000 +Subject: [PATCH 1/2] Makefile: respect LDFLAGS + +Signed-off-by: Sam James <sam@gentoo.org> +--- a/Makefile ++++ b/Makefile +@@ -49,7 +49,7 @@ iptstate: iptstate.cc Makefile + echo "+------------------------------------------------------------+" ;\ + echo ""; + +- $(CXX) $(CXXFLAGS) $(CXXFILES) -o iptstate $(LIBS) $(CPPFLAGS) ++ $(CXX) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) $(CXXFILES) -o iptstate $(LIBS) + @touch iptstate + + @\ diff --git a/net-analyzer/iptstate/files/iptstate-2.2.7-use-pkg-config.patch b/net-analyzer/iptstate/files/iptstate-2.2.7-use-pkg-config.patch new file mode 100644 index 000000000000..3896799f78ae --- /dev/null +++ b/net-analyzer/iptstate/files/iptstate-2.2.7-use-pkg-config.patch @@ -0,0 +1,21 @@ +https://github.com/jaymzh/iptstate/pull/21 + +From: Sam James <sam@gentoo.org> +Date: Fri, 10 Dec 2021 03:10:42 +0000 +Subject: [PATCH 2/2] Makefile: Use pkg-config + +Depending on platform, linking against ncurses may require -ltinfo as well, +and linking against netfilter_conntrack may require -lnetfilter too. + +Signed-off-by: Sam James <sam@gentoo.org> +--- a/Makefile ++++ b/Makefile +@@ -25,7 +25,7 @@ CXXFLAGS?= -g -Wall -O2 -Werror=format-security -Wformat-truncation=0 + CXXFILES?= iptstate.cc + + # THIS IS FOR NORMAL COMPILATION +-LIBS?= -lncurses -lnetfilter_conntrack ++LIBS?= $(shell $(PKG_CONFIG) --libs ncurses libnetfilter_conntrack) + CPPFLAGS= + + ### YOU SHOULDN'T NEED TO CHANGE ANYTHING BELOW THIS diff --git a/net-analyzer/iptstate/iptstate-2.2.6.ebuild b/net-analyzer/iptstate/iptstate-2.2.6.ebuild deleted file mode 100644 index 0f85670270ce..000000000000 --- a/net-analyzer/iptstate/iptstate-2.2.6.ebuild +++ /dev/null @@ -1,35 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit toolchain-funcs - -DESCRIPTION="IP Tables State displays states being kept by iptables in a top-like format" -HOMEPAGE="https://www.phildev.net/iptstate/ https://github.com/jaymzh/iptstate" -SRC_URI="https://github.com/jaymzh/${PN}/releases/download/v${PV}/${P}.tar.bz2" - -LICENSE="ZLIB" -SLOT="0" -KEYWORDS="amd64 ~hppa ~ppc x86" - -RDEPEND=" - >=sys-libs/ncurses-5.7-r7:0= - >=net-libs/libnetfilter_conntrack-0.0.50 -" -DEPEND=" - ${RDEPEND} - virtual/pkgconfig -" -PATCHES=( - "${FILESDIR}"/${PN}-2.2.5-gentoo.patch -) - -src_prepare() { - default - tc-export CXX PKG_CONFIG -} - -src_install() { - emake PREFIX="${D}"/usr install - dodoc BUGS Changelog CONTRIB README.md WISHLIST -} diff --git a/net-analyzer/iptstate/iptstate-2.2.7.ebuild b/net-analyzer/iptstate/iptstate-2.2.7.ebuild new file mode 100644 index 000000000000..8ac212c6fb01 --- /dev/null +++ b/net-analyzer/iptstate/iptstate-2.2.7.ebuild @@ -0,0 +1,34 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit toolchain-funcs + +DESCRIPTION="IP Tables State displays states being kept by iptables in a top-like format" +HOMEPAGE="https://www.phildev.net/iptstate/ https://github.com/jaymzh/iptstate" +SRC_URI="https://github.com/jaymzh/${PN}/releases/download/v${PV}/${P}.tar.bz2" + +LICENSE="ZLIB" +SLOT="0" +KEYWORDS="amd64 ~hppa ~ppc x86" + +RDEPEND=">=sys-libs/ncurses-5.7-r7:= + >=net-libs/libnetfilter_conntrack-0.0.50" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" + +PATCHES=( + "${FILESDIR}"/${PN}-2.2.7-respect-LDFLAGS.patch + "${FILESDIR}"/${PN}-2.2.7-use-pkg-config.patch + "${FILESDIR}"/${PN}-2.2.7-respect-CPPFLAGS.patch +) + +src_configure() { + tc-export CXX PKG_CONFIG +} + +src_install() { + emake PREFIX="${D}"/usr install + dodoc BUGS Changelog CONTRIB README.md WISHLIST +} diff --git a/net-analyzer/iptstate/metadata.xml b/net-analyzer/iptstate/metadata.xml index bcd164dad76c..aff3c6f03b2d 100644 --- a/net-analyzer/iptstate/metadata.xml +++ b/net-analyzer/iptstate/metadata.xml @@ -1,5 +1,5 @@ -<?xml version='1.0' encoding='UTF-8'?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<?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> diff --git a/net-analyzer/ipv6toolkit/Manifest b/net-analyzer/ipv6toolkit/Manifest index d7cf7dd956f7..bb373ee0eff7 100644 --- a/net-analyzer/ipv6toolkit/Manifest +++ b/net-analyzer/ipv6toolkit/Manifest @@ -1,2 +1 @@ -DIST ipv6toolkit-2.1_p20190919.tar.gz 979235 BLAKE2B 1b652b00874b9a71a5e5b86643d9c71fc02917af93d9730e7e4be7e5203d07dfef5bc7d1bb0453a6bf9dece69f7f4256912f0902132dd21530ae8ea9e94b8b4f SHA512 78e7565f4827d21573ced06002311a4f3736df71846085b3e8e47e0d6aebeaa4e60881c148c3c65ee010ffcfb2bf3ad56bb2625203aff5b0fdf40fbb7f37ecb9 DIST ipv6toolkit-2.1_p20200412.tar.gz 987247 BLAKE2B 7fcb07c0cbb22e377618f62b69a16e4a5aeda3b3ebc32bd216cf9fa3beb2d8775cec6543482609361bb23304e3284e770ae82ada053fb172c432adfe360e09ba SHA512 480245e4f5ed31d6de726467ab8e1726285ccc7eeb6c84bd75caf62af35409ebf5ea63a29567200b387592317a5d5989c76ad38d3f0842ebdf5392f28e81be9f diff --git a/net-analyzer/ipv6toolkit/files/ipv6toolkit-2.1_p20190919-fno-common.patch b/net-analyzer/ipv6toolkit/files/ipv6toolkit-2.1_p20190919-fno-common.patch deleted file mode 100644 index 9d4a3dcffe9e..000000000000 --- a/net-analyzer/ipv6toolkit/files/ipv6toolkit-2.1_p20190919-fno-common.patch +++ /dev/null @@ -1,192 +0,0 @@ ---- a/tools/flow6.c -+++ b/tools/flow6.c -@@ -85,8 +85,7 @@ - - bpf_u_int32 my_netmask; - bpf_u_int32 my_ip; --struct bpf_program pcap_filter; --char dev[64], errbuf[PCAP_ERRBUF_SIZE]; -+char dev[64]; - unsigned char buffer[65556], buffrh[MIN_IPV6_HLEN + MIN_TCP_HLEN]; - unsigned char *v6buffer, *ptr, *startofprefixes; - char *pref; ---- a/tools/frag6.c -+++ b/tools/frag6.c -@@ -94,8 +94,7 @@ - - bpf_u_int32 my_netmask; - bpf_u_int32 my_ip; --struct bpf_program pcap_filter; --char dev[64], errbuf[PCAP_ERRBUF_SIZE]; -+char dev[64]; - unsigned char buffer[65556], buffrh[MIN_IPV6_HLEN + MIN_TCP_HLEN]; - unsigned char *v6buffer, *ptr, *startofprefixes; - char *pref; ---- a/tools/icmp6.c -+++ b/tools/icmp6.c -@@ -114,8 +114,7 @@ - - bpf_u_int32 my_netmask; - bpf_u_int32 my_ip; --struct bpf_program pcap_filter; --char dev[64], errbuf[PCAP_ERRBUF_SIZE]; -+char dev[64]; - unsigned char buffer[65556], buffrh[MIN_IPV6_HLEN + MIN_TCP_HLEN]; - unsigned char *v6buffer, *ptr, *startofprefixes; - char *pref; ---- a/tools/ipv6toolkit.h -+++ b/tools/ipv6toolkit.h -@@ -2,3 +2,10 @@ - #define MAX_CMDLINE_OPT_LEN 40 - #define DATE_STR_LEN 40 - -+#include <pcap.h> -+#include <setjmp.h> -+ -+extern char errbuf[PCAP_ERRBUF_SIZE]; -+extern struct bpf_program pcap_filter; -+extern sigjmp_buf env; -+extern unsigned int canjump; ---- a/tools/jumbo6.c -+++ b/tools/jumbo6.c -@@ -80,8 +80,7 @@ - - bpf_u_int32 my_netmask; - bpf_u_int32 my_ip; --struct bpf_program pcap_filter; --char dev[64], errbuf[PCAP_ERRBUF_SIZE]; -+char dev[64]; - unsigned char buffer[65556], buffrh[MIN_IPV6_HLEN + MIN_TCP_HLEN]; - unsigned char *v6buffer, *ptr, *startofprefixes; - char *pref; ---- a/tools/na6.c -+++ b/tools/na6.c -@@ -61,8 +61,7 @@ - struct in6_addr *pkt_ipv6addr; - bpf_u_int32 my_netmask; - bpf_u_int32 my_ip; --struct bpf_program pcap_filter; --char dev[64], errbuf[PCAP_ERRBUF_SIZE]; -+char dev[64]; - char all_nodes_addr[]= ALL_NODES_MULTICAST_ADDR; - unsigned char buffer[65556]; - unsigned char *v6buffer, *ptr, *startofprefixes; ---- a/tools/ni6.c -+++ b/tools/ni6.c -@@ -90,8 +90,7 @@ - - bpf_u_int32 my_netmask; - bpf_u_int32 my_ip; --struct bpf_program pcap_filter; --char dev[64], errbuf[PCAP_ERRBUF_SIZE]; -+char dev[64]; - unsigned char buffer[65556], buffrh[MIN_IPV6_HLEN + MIN_TCP_HLEN]; - char domain[MAX_DOMAIN_LEN]; - unsigned char *v6buffer, *ptr, *startofprefixes; ---- a/tools/ns6.c -+++ b/tools/ns6.c -@@ -59,8 +59,7 @@ - const u_char *pktdata; - bpf_u_int32 my_netmask; - bpf_u_int32 my_ip; --struct bpf_program pcap_filter; --char dev[64], errbuf[PCAP_ERRBUF_SIZE]; -+char dev[64]; - - unsigned char buffer[65556]; - unsigned char *v6buffer, *ptr, *startofprefixes; ---- a/tools/path6.c -+++ b/tools/path6.c -@@ -88,8 +88,7 @@ - - bpf_u_int32 my_netmask; - bpf_u_int32 my_ip; --struct bpf_program pcap_filter; --char dev[64], errbuf[PCAP_ERRBUF_SIZE]; -+char dev[64]; - unsigned char buffer[65556], buffrh[MIN_IPV6_HLEN + MIN_TCP_HLEN]; - unsigned char *v6buffer, *ptr, *startofprefixes; - char *pref; ---- a/tools/ra6.c -+++ b/tools/ra6.c -@@ -64,8 +64,7 @@ - struct in6_addr *pkt_ipv6addr; - bpf_u_int32 my_netmask; - bpf_u_int32 my_ip; --struct bpf_program pcap_filter; --char dev[64], errbuf[PCAP_ERRBUF_SIZE]; -+char dev[64]; - char all_nodes_addr[]= ALL_NODES_MULTICAST_ADDR; - - unsigned char buffer[ETHER_HDR_LEN+MIN_IPV6_HLEN+MAX_IPV6_PAYLOAD]; ---- a/tools/rd6.c -+++ b/tools/rd6.c -@@ -106,8 +106,7 @@ - - bpf_u_int32 my_netmask; - bpf_u_int32 my_ip; --struct bpf_program pcap_filter; --char dev[64], errbuf[PCAP_ERRBUF_SIZE]; -+char dev[64]; - unsigned char buffer[65556], buffrh[MIN_IPV6_HLEN + MIN_TCP_HLEN]; - unsigned char *v6buffer, *ptr, *startofprefixes; - char *pref; ---- a/tools/rs6.c -+++ b/tools/rs6.c -@@ -60,8 +60,7 @@ - struct in6_addr *pkt_ipv6addr; - bpf_u_int32 my_netmask; - bpf_u_int32 my_ip; --struct bpf_program pcap_filter; --char dev[64], errbuf[PCAP_ERRBUF_SIZE]; -+char dev[64]; - char all_nodes_addr[]= ALL_NODES_MULTICAST_ADDR; - - unsigned char buffer[65556]; ---- a/tools/scan6.c -+++ b/tools/scan6.c -@@ -153,8 +153,7 @@ - - bpf_u_int32 my_netmask; - bpf_u_int32 my_ip; --struct bpf_program pcap_filter; --char dev[64], errbuf[PCAP_ERRBUF_SIZE]; -+char dev[64]; - unsigned char buffer[BUFFER_SIZE], buffrh[MIN_IPV6_HLEN + MIN_TCP_HLEN]; - char line[LINE_BUFFER_SIZE]; - unsigned char *v6buffer, *ptr, *startofprefixes; -@@ -269,10 +268,6 @@ - 443, 547, 993, 995, 1194, 3306, 5060, 5061, 5432, 6446, 8080}; - - --/* IPv6 Address Resolution */ --sigjmp_buf env; --unsigned int canjump; -- - int main(int argc, char **argv){ - extern char *optarg; - int r; ---- a/tools/tcp6.c -+++ b/tools/tcp6.c -@@ -116,8 +116,7 @@ - - bpf_u_int32 my_netmask; - bpf_u_int32 my_ip; --struct bpf_program pcap_filter; --char dev[64], errbuf[PCAP_ERRBUF_SIZE]; -+char dev[64]; - unsigned char buffer[65556], buffrh[MIN_IPV6_HLEN + MIN_TCP_HLEN]; - unsigned char *v6buffer, *ptr, *startofprefixes; - char *pref; ---- a/tools/udp6.c -+++ b/tools/udp6.c -@@ -99,8 +99,7 @@ - - bpf_u_int32 my_netmask; - bpf_u_int32 my_ip; --struct bpf_program pcap_filter; --char dev[64], errbuf[PCAP_ERRBUF_SIZE]; -+char dev[64]; - unsigned char buffer[65556], buffrh[MIN_IPV6_HLEN + MIN_UDP_HLEN]; - unsigned char *v6buffer, *ptr, *startofprefixes; - char *pref; diff --git a/net-analyzer/ipv6toolkit/ipv6toolkit-2.1_p20190919.ebuild b/net-analyzer/ipv6toolkit/ipv6toolkit-2.1_p20190919.ebuild deleted file mode 100644 index bff5e134fff8..000000000000 --- a/net-analyzer/ipv6toolkit/ipv6toolkit-2.1_p20190919.ebuild +++ /dev/null @@ -1,48 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit toolchain-funcs - -DESCRIPTION="Set of IPv6 security/trouble-shooting tools to send arbitrary IPv6-based packets" -HOMEPAGE="https://www.si6networks.com/tools/ipv6toolkit/" -SNAPSHOT="20de5f297f73b6a8115d1eac52adfe0b6df5b3ed" -SRC_URI="https://github.com/fgont/ipv6toolkit/archive/${SNAPSHOT}.tar.gz -> ${P}.tar.gz" -S="${WORKDIR}"/"${PN}"-"${SNAPSHOT}" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -DEPEND=" - net-libs/libpcap[ipv6(+)] -" -RDEPEND=" - ${DEPEND} - sys-apps/hwids -" -PATCHES=( - "${FILESDIR}"/${PN}-2.1_p20190919-fno-common.patch -) - -HWIDS_OUI_PATH=/usr/share/misc/oui.txt - -src_prepare() { - default - sed -i "s#/usr/share/ipv6toolkit/oui.txt#${HWIDS_OUI_PATH}#" \ - manuals/ipv6toolkit.conf.5 -} -src_compile() { - emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" PREFIX=/usr -} - -src_install() { - dodir /etc - emake install DESTDIR="${ED}" PREFIX=/usr - #remove the included oui file - rm -f "${D}"/usr/share/ipv6toolkit/oui.txt - #fix the conf file to use the one from sys-apps/hwids - sed -i "s#/usr/share/ipv6toolkit/oui.txt#${HWIDS_OUI_PATH}#" \ - "${ED}"/etc/ipv6toolkit.conf - dodoc CHANGES.TXT README.TXT -} diff --git a/net-analyzer/ipv6toolkit/ipv6toolkit-2.1_p20200412-r1.ebuild b/net-analyzer/ipv6toolkit/ipv6toolkit-2.1_p20200412-r1.ebuild new file mode 100644 index 000000000000..afe8e856acea --- /dev/null +++ b/net-analyzer/ipv6toolkit/ipv6toolkit-2.1_p20200412-r1.ebuild @@ -0,0 +1,40 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +inherit toolchain-funcs + +DESCRIPTION="Set of IPv6 security/trouble-shooting tools to send arbitrary IPv6-based packets" +HOMEPAGE="https://www.si6networks.com/tools/ipv6toolkit/" +SNAPSHOT="623a0fbc0422cdc0a4b833d7b5ec58a2eaa9bddf" +SRC_URI="https://github.com/fgont/ipv6toolkit/archive/${SNAPSHOT}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}"/"${PN}"-"${SNAPSHOT}" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +DEPEND=" + net-libs/libpcap[ipv6(+)] +" +RDEPEND=" + ${DEPEND} + sys-apps/hwdata +" + +src_prepare() { + default +} + +src_compile() { + emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" PREFIX="${EPREFIX}/usr" + sed -i -e "s:ipv6toolkit/oui.txt:hwdata/oui.txt:" data/ipv6toolkit.conf manuals/ipv6toolkit.conf.5 || die +} + +src_install() { + dodir /etc + emake install DESTDIR="${D}" PREFIX="${EPREFIX}/usr" + #remove the included oui file + rm "${ED}"/usr/share/ipv6toolkit/oui.txt || die + dodoc CHANGES.TXT README.TXT +} diff --git a/net-analyzer/ipv6toolkit/ipv6toolkit-2.1_p20200412.ebuild b/net-analyzer/ipv6toolkit/ipv6toolkit-2.1_p20200412.ebuild deleted file mode 100644 index 2d692fb0ea06..000000000000 --- a/net-analyzer/ipv6toolkit/ipv6toolkit-2.1_p20200412.ebuild +++ /dev/null @@ -1,45 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit toolchain-funcs - -DESCRIPTION="Set of IPv6 security/trouble-shooting tools to send arbitrary IPv6-based packets" -HOMEPAGE="https://www.si6networks.com/tools/ipv6toolkit/" -SNAPSHOT="623a0fbc0422cdc0a4b833d7b5ec58a2eaa9bddf" -SRC_URI="https://github.com/fgont/ipv6toolkit/archive/${SNAPSHOT}.tar.gz -> ${P}.tar.gz" -S="${WORKDIR}"/"${PN}"-"${SNAPSHOT}" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -DEPEND=" - net-libs/libpcap[ipv6(+)] -" -RDEPEND=" - ${DEPEND} - sys-apps/hwids -" - -HWIDS_OUI_PATH=/usr/share/misc/oui.txt - -src_prepare() { - default - sed -i "s#/usr/share/ipv6toolkit/oui.txt#${HWIDS_OUI_PATH}#" \ - manuals/ipv6toolkit.conf.5 -} -src_compile() { - emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" PREFIX=/usr -} - -src_install() { - dodir /etc - emake install DESTDIR="${ED}" PREFIX=/usr - #remove the included oui file - rm -f "${D}"/usr/share/ipv6toolkit/oui.txt - #fix the conf file to use the one from sys-apps/hwids - sed -i "s#/usr/share/ipv6toolkit/oui.txt#${HWIDS_OUI_PATH}#" \ - "${ED}"/etc/ipv6toolkit.conf - dodoc CHANGES.TXT README.TXT -} diff --git a/net-analyzer/ipv6toolkit/ipv6toolkit-99999999.ebuild b/net-analyzer/ipv6toolkit/ipv6toolkit-99999999.ebuild index 8a862e677183..78d911dcf494 100644 --- a/net-analyzer/ipv6toolkit/ipv6toolkit-99999999.ebuild +++ b/net-analyzer/ipv6toolkit/ipv6toolkit-99999999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -17,27 +17,22 @@ DEPEND=" " RDEPEND=" ${DEPEND} - sys-apps/hwids + sys-apps/hwdata " -HWIDS_OUI_PATH=/usr/share/misc/oui.txt - src_prepare() { default - sed -i "s#/usr/share/ipv6toolkit/oui.txt#${HWIDS_OUI_PATH}#" \ - manuals/ipv6toolkit.conf.5 } + src_compile() { - emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" PREFIX=/usr + emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" PREFIX="${EPREFIX}/usr" + sed -i -e "s:ipv6toolkit/oui.txt:hwdata/oui.txt:" data/ipv6toolkit.conf manuals/ipv6toolkit.conf.5 || die } src_install() { dodir /etc - emake install DESTDIR="${ED}" PREFIX=/usr + emake install DESTDIR="${D}" PREFIX="${EPREFIX}/usr" #remove the included oui file - rm -f "${D}"/usr/share/ipv6toolkit/oui.txt - #fix the conf file to use the one from sys-apps/hwids - sed -i "s#/usr/share/ipv6toolkit/oui.txt#${HWIDS_OUI_PATH}#" \ - "${ED}"/etc/ipv6toolkit.conf + rm "${ED}"/usr/share/ipv6toolkit/oui.txt || die dodoc CHANGES.TXT README.TXT } diff --git a/net-analyzer/ipv6toolkit/metadata.xml b/net-analyzer/ipv6toolkit/metadata.xml index cbd8599e1179..21d69a1889aa 100644 --- a/net-analyzer/ipv6toolkit/metadata.xml +++ b/net-analyzer/ipv6toolkit/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>netmon@gentoo.org</email> diff --git a/net-analyzer/isic/isic-0.07-r1.ebuild b/net-analyzer/isic/isic-0.07-r1.ebuild deleted file mode 100644 index ac8c670339bd..000000000000 --- a/net-analyzer/isic/isic-0.07-r1.ebuild +++ /dev/null @@ -1,35 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit toolchain-funcs - -DESCRIPTION="IP Stack Integrity Checker" -HOMEPAGE="http://isic.sourceforge.net/" -SRC_URI="mirror://sourceforge/isic/${P}.tgz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="amd64 ppc x86" - -DEPEND="net-libs/libnet:1.1" -RDEPEND="${DEPEND}" - -DOCS=( ChangeLog README ) - -src_prepare() { - # Add two missing includes - echo "#include <netinet/udp.h>" >> isic.h || die - echo "#include <netinet/tcp.h>" >> isic.h || die - - # Install man pages in /usr/share/man - sed -i -e 's|/man/man1|/share&|g' Makefile.in || die - - tc-export CC -} - -src_configure() { - # Build system does not know about DESTDIR - econf --prefix="${D}/usr" --exec_prefix="${D}/usr" -} diff --git a/net-analyzer/isic/isic-0.07-r2.ebuild b/net-analyzer/isic/isic-0.07-r2.ebuild new file mode 100644 index 000000000000..07add2fa0cc9 --- /dev/null +++ b/net-analyzer/isic/isic-0.07-r2.ebuild @@ -0,0 +1,33 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit toolchain-funcs + +DESCRIPTION="IP Stack Integrity Checker" +HOMEPAGE="https://isic.sourceforge.net/" +SRC_URI="mirror://sourceforge/isic/${P}.tgz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="amd64 ppc x86" + +DEPEND="net-libs/libnet:1.1" +RDEPEND="${DEPEND}" + +src_prepare() { + default + # Add two missing includes + echo "#include <netinet/udp.h>" >> isic.h || die + echo "#include <netinet/tcp.h>" >> isic.h || die + + # Install man pages in /usr/share/man + sed -i -e 's|/man/man1|/share&|g' Makefile.in || die +} + +src_configure() { + tc-export CC + # Build system does not know about DESTDIR + econf --prefix="${D}/usr" --exec_prefix="${D}/usr" +} diff --git a/net-analyzer/isic/metadata.xml b/net-analyzer/isic/metadata.xml index 27b1e5096bbf..2880856da202 100644 --- a/net-analyzer/isic/metadata.xml +++ b/net-analyzer/isic/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>netmon@gentoo.org</email> diff --git a/net-analyzer/jffnms/Manifest b/net-analyzer/jffnms/Manifest deleted file mode 100644 index e59234875498..000000000000 --- a/net-analyzer/jffnms/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST jffnms-0.9.4.tgz 610758 BLAKE2B 2bbe122bae3d358e710895ebd1c38f28644260744d97f5ab88301dc5549c099c9af0931156d47ce0e616c0f6f84b04f2e7ae04f4d0efc8cc3ff72b01dc51e22c SHA512 4d0c4ed1fbf0107029d92b2ea8f0f02c46d532810dc58bf048c5ffaf79f7f24630101be8319876db1aee3356ced32e7cba2f2494bc8a92a635b0a4e6897c6fe7 diff --git a/net-analyzer/jffnms/jffnms-0.9.4-r1.ebuild b/net-analyzer/jffnms/jffnms-0.9.4-r1.ebuild deleted file mode 100644 index c0957c2f5e85..000000000000 --- a/net-analyzer/jffnms/jffnms-0.9.4-r1.ebuild +++ /dev/null @@ -1,56 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit user - -DESCRIPTION="Network Management and Monitoring System" -HOMEPAGE="http://www.jffnms.org/" -SRC_URI="mirror://sourceforge/${PN}/${P}.tgz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="mysql postgres snmp" - -RDEPEND=" - dev-lang/php[apache2,cli,gd,mysql?,postgres?,session,snmp,sockets,wddx] - dev-php/PEAR-PEAR - media-gfx/graphviz - media-libs/gd - net-analyzer/fping - net-analyzer/net-snmp - net-analyzer/nmap - net-analyzer/rrdtool[graph] - sys-apps/diffutils -" - -pkg_setup() { - enewgroup jffnms - enewuser jffnms -1 /bin/bash -1 jffnms,apache -} - -src_install() { - local INSTALL_DIR="/opt/${PN}" - local IMAGE_DIR="${D}${INSTALL_DIR}" - - insinto "${INSTALL_DIR}" - doins -r * - - rm -f "${IMAGE_DIR}/LICENSE" - - # Clean up Windows related stuff - rm -f "${IMAGE_DIR}"/*.win32.txt - rm -rf "${IMAGE_DIR}"/docs/windows - rm -rf "${IMAGE_DIR}"/engine/windows - - fowners -R jffnms:apache "${INSTALL_DIR}" - fperms -R ug+rw "${INSTALL_DIR}" -} - -pkg_postinst() { - elog "${PN} has been partialy installed on your system. However you" - elog "still need proceed with final installation and configuration." - elog "You can visit https://wiki.gentoo.org/wiki/Jffnms in order" - elog "to get detailed information on how to get jffnms up and running." -} diff --git a/net-analyzer/jffnms/metadata.xml b/net-analyzer/jffnms/metadata.xml deleted file mode 100644 index a7910963dea7..000000000000 --- a/net-analyzer/jffnms/metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>netmon@gentoo.org</email> - <name>Gentoo network monitoring and analysis project</name> - </maintainer> - <upstream> - <remote-id type="sourceforge">jffnms</remote-id> - </upstream> -</pkgmetadata> diff --git a/net-analyzer/jmx2munin/Manifest b/net-analyzer/jmx2munin/Manifest deleted file mode 100644 index 4d69d490d879..000000000000 --- a/net-analyzer/jmx2munin/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST jmx2munin-gentoo-1.0_p20120811.tar.gz 6890 BLAKE2B f28622405cf76cfd6effd4a86a1994e921eb71afced8e0c9c167422fc20378b607b63d7b93add0b816b21a8dc3c9504a4c406ea17f3db159dfd9f4aea440ac32 SHA512 154817d63fb278970d04785821a29833007a553055efe28aa6a3654d01b7a4422a2a1c98cd1693ae52ea28a57505b6d7988f241f6d119425f5c3ae38471b72be diff --git a/net-analyzer/jmx2munin/jmx2munin-1.0_p20120811-r1.ebuild b/net-analyzer/jmx2munin/jmx2munin-1.0_p20120811-r1.ebuild deleted file mode 100644 index ad8601a5fcc0..000000000000 --- a/net-analyzer/jmx2munin/jmx2munin-1.0_p20120811-r1.ebuild +++ /dev/null @@ -1,54 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -JAVA_PKG_IUSE="doc source" - -inherit java-pkg-2 java-pkg-simple - -MY_P="${PN}-gentoo-${PV}" - -DESCRIPTION="JMX Monitoring plugin for Munin" -HOMEPAGE="https://github.com/tcurdt/jmx2munin" -SRC_URI="https://github.com/gentoo/jmx2munin/tarball/${MY_P} -> ${MY_P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64" -IUSE="" - -CDEPEND="dev-java/jcommander:0" - -DEPEND="${CDEPEND} - >=virtual/jdk-1.6" - -RDEPEND="${CDEPEND} - net-analyzer/munin - >=virtual/jre-1.6" - -S="${WORKDIR}/${MY_P}" - -JAVA_SRC_DIR="src/main/java/org/vafer/jmx" -JAVA_GENTOO_CLASSPATH="jcommander" - -src_unpack() { - unpack ${A} - mv gentoo-${PN}-* ${MY_P} -} - -java_prepare() { - rm pom.xml || die -} - -src_install() { - java-pkg-simple_src_install - java-pkg_dolauncher ${PN} --main org.vafer.jmx.munin.Munin - - exeinto /usr/libexec/munin/plugins - newexe contrib/${PN}.sh ${PN}_ - - dodoc README.md contrib/jmx2munin.cfg/cassandra/nodes_in_cluster - - keepdir /etc/munin/${PN} -} diff --git a/net-analyzer/jmx2munin/metadata.xml b/net-analyzer/jmx2munin/metadata.xml deleted file mode 100644 index 737e4b4746ff..000000000000 --- a/net-analyzer/jmx2munin/metadata.xml +++ /dev/null @@ -1,15 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>java@gentoo.org</email> - <name>Java</name> - </maintainer> - <maintainer type="project"> - <email>sysadmin@gentoo.org</email> - <name>Gentoo Sysadmin Project</name> - </maintainer> - <upstream> - <remote-id type="github">gentoo/jmx2munin</remote-id> - </upstream> -</pkgmetadata> diff --git a/net-analyzer/jnettop/files/jnettop-0.13.0-clang16.patch b/net-analyzer/jnettop/files/jnettop-0.13.0-clang16.patch new file mode 100644 index 000000000000..d8723b6a5b13 --- /dev/null +++ b/net-analyzer/jnettop/files/jnettop-0.13.0-clang16.patch @@ -0,0 +1,9 @@ +https://bugs.gentoo.org/870667 +--- a/acinclude.m4 ++++ b/acinclude.m4 +@@ -151,4 +151,5 @@ + AC_MSG_CHECKING([if "localhost" resolves]) + AC_TRY_RUN([ ++#include <stdlib.h> + #include <string.h> + #include <sys/types.h> diff --git a/net-analyzer/jnettop/jnettop-0.13.0-r1.ebuild b/net-analyzer/jnettop/jnettop-0.13.0-r1.ebuild deleted file mode 100644 index e0c718000574..000000000000 --- a/net-analyzer/jnettop/jnettop-0.13.0-r1.ebuild +++ /dev/null @@ -1,46 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit autotools eutils - -DESCRIPTION="A top like console network traffic visualiser" -HOMEPAGE="http://jnettop.kubs.info/" -SRC_URI="http://jnettop.kubs.info/dist/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ~arm ~ppc ~sparc x86 ~amd64-linux ~x86-linux" -IUSE="berkdb ncurses syslog" - -RDEPEND=" - net-libs/libpcap - >=dev-libs/glib-2.0.1 - berkdb? ( =sys-libs/db-4* ) - ncurses? ( sys-libs/ncurses ) - syslog? ( virtual/logger ) -" - -DEPEND="${RDEPEND} - virtual/pkgconfig" - -DOCS=( AUTHORS ChangeLog NEWS README ) - -src_prepare() { - epatch \ - "${FILESDIR}/${P}-asneeded.patch" \ - "${FILESDIR}/${P}-tinfo.patch" - eautoreconf -} - -src_configure() { - econf \ - $(use_with ncurses) \ - $(use_with berkdb db4) \ - $(use_with syslog) -} - -src_install() { - default - newdoc .${PN} ${PN}.dotfile -} diff --git a/net-analyzer/jnettop/jnettop-0.13.0-r2.ebuild b/net-analyzer/jnettop/jnettop-0.13.0-r2.ebuild new file mode 100644 index 000000000000..8b2365f79d7b --- /dev/null +++ b/net-analyzer/jnettop/jnettop-0.13.0-r2.ebuild @@ -0,0 +1,48 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools + +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+" +SLOT="0" +KEYWORDS="amd64 ~arm ~arm64 ~ppc ~sparc x86 ~amd64-linux ~x86-linux" +IUSE="berkdb ncurses syslog" + +RDEPEND=" + net-libs/libpcap + >=dev-libs/glib-2.0.1 + berkdb? ( =sys-libs/db-4* ) + ncurses? ( sys-libs/ncurses ) + syslog? ( virtual/logger ) +" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" + +PATCHES=( + "${FILESDIR}/${P}-asneeded.patch" + "${FILESDIR}/${P}-tinfo.patch" + "${FILESDIR}/${P}-clang16.patch" +) + +src_prepare() { + default + eautoreconf +} + +src_configure() { + econf \ + $(use_with ncurses) \ + $(use_with berkdb db4) \ + $(use_with syslog) +} + +src_install() { + default + newdoc .${PN} ${PN}.dotfile +} diff --git a/net-analyzer/jnettop/metadata.xml b/net-analyzer/jnettop/metadata.xml index 74c2baebb4ec..64065c6ebf3a 100644 --- a/net-analyzer/jnettop/metadata.xml +++ b/net-analyzer/jnettop/metadata.xml @@ -1,8 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!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> +<upstream> + <remote-id type="sourceforge">jnettop</remote-id> +</upstream> </pkgmetadata> diff --git a/net-analyzer/kapacitor/Manifest b/net-analyzer/kapacitor/Manifest index ed51e89c0feb..e84886f6f4f4 100644 --- a/net-analyzer/kapacitor/Manifest +++ b/net-analyzer/kapacitor/Manifest @@ -1,3 +1 @@ -DIST kapacitor-1.4.1.tar.gz 7543899 BLAKE2B 142ea7899be3728d2e857a83beebb8ff32dae6b7a71097de1474878a1728c6597937d03a828746af2464d6406ae80796b11579a10baacb66843bd535f971d940 SHA512 315e01e97f6a89afbbd0e36c17ee64d2744bc8ccce2e318f17ad5fba75599fdc55c303069c32aed07ba73c8ba9cdbacdb76c7ffe0c81681c1ef0be0ba405802e -DIST kapacitor-1.5.1.tar.gz 5668659 BLAKE2B 5caf7a51945d84010f25dcbe198d4a1b7fc21f2ef7036a0489d6274212068937942f0490637a11ab05399d3a95ec1d96f3d42f0a2b3e3b7b4ff1377ef1e220e6 SHA512 6e25f89d9b75c6c14350a189be7bcd4210a331025a4bd0a8fa363dee8abbe8c582013a9c3020e638e9490ded12d70212963dc01bd3570395412641e2911d93f5 DIST kapacitor-1.5.5.tar.gz 5708426 BLAKE2B 432d24f3bbe0f42e36b881e0c709cebd96dd3674ddf752f6a25cfb333108c903073b887e12d630d6c9e33a77b1256ea090cfe216cd9eb30b9bee53c48b7ab154 SHA512 34a2577a9c6f069ab8f747b9bd2f80f941bbedcccd740c24ec9f308804ec259e78cf14c924fcee3315b6f9f7f59adb9c50aedf06587898b8a0fb54f721d79212 diff --git a/net-analyzer/kapacitor/kapacitor-1.4.1-r1.ebuild b/net-analyzer/kapacitor/kapacitor-1.4.1-r1.ebuild deleted file mode 100644 index dd499480fbdd..000000000000 --- a/net-analyzer/kapacitor/kapacitor-1.4.1-r1.ebuild +++ /dev/null @@ -1,48 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -EGO_PN=github.com/influxdata/kapacitor - -inherit golang-build golang-vcs-snapshot systemd user - -DESCRIPTION="Monitoring, processing and alerting on time series data" -HOMEPAGE="https://www.influxdata.com" -SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64" -IUSE="" - -pkg_setup() { - enewgroup kapacitor - enewuser kapacitor -1 -1 /var/lib/kapacitor kapacitor -} - -src_compile() { - pushd "src/${EGO_PN}" > /dev/null || die - set -- env GOPATH="${S}" go build -v -work -x ./... - echo "$@" - "$@" || die "compile failed" - popd > /dev/null -} - -src_install() { - pushd "src/${EGO_PN}" > /dev/null || die - set -- env GOPATH="${S}" go install -v -work -x ./... - echo "$@" - "$@" || die - dobin "${S}"/bin/kapacitor{,d} - insinto /etc/kapacitor -doins etc/kapacitor/kapacitor.conf -keepdir /etc/kapacitor/load - insinto /etc/logrotate.d - doins etc/logrotate.d/kapacitor - systemd_dounit scripts/kapacitor.service - keepdir /var/log/kapacitor - fowners kapacitor:kapacitor /var/log/kapacitor - newconfd "${FILESDIR}"/kapacitor.confd kapacitor - newinitd "${FILESDIR}"/kapacitor.rc kapacitor - popd > /dev/null || die -} diff --git a/net-analyzer/kapacitor/kapacitor-1.5.1.ebuild b/net-analyzer/kapacitor/kapacitor-1.5.1.ebuild deleted file mode 100644 index dd499480fbdd..000000000000 --- a/net-analyzer/kapacitor/kapacitor-1.5.1.ebuild +++ /dev/null @@ -1,48 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -EGO_PN=github.com/influxdata/kapacitor - -inherit golang-build golang-vcs-snapshot systemd user - -DESCRIPTION="Monitoring, processing and alerting on time series data" -HOMEPAGE="https://www.influxdata.com" -SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64" -IUSE="" - -pkg_setup() { - enewgroup kapacitor - enewuser kapacitor -1 -1 /var/lib/kapacitor kapacitor -} - -src_compile() { - pushd "src/${EGO_PN}" > /dev/null || die - set -- env GOPATH="${S}" go build -v -work -x ./... - echo "$@" - "$@" || die "compile failed" - popd > /dev/null -} - -src_install() { - pushd "src/${EGO_PN}" > /dev/null || die - set -- env GOPATH="${S}" go install -v -work -x ./... - echo "$@" - "$@" || die - dobin "${S}"/bin/kapacitor{,d} - insinto /etc/kapacitor -doins etc/kapacitor/kapacitor.conf -keepdir /etc/kapacitor/load - insinto /etc/logrotate.d - doins etc/logrotate.d/kapacitor - systemd_dounit scripts/kapacitor.service - keepdir /var/log/kapacitor - fowners kapacitor:kapacitor /var/log/kapacitor - newconfd "${FILESDIR}"/kapacitor.confd kapacitor - newinitd "${FILESDIR}"/kapacitor.rc kapacitor - popd > /dev/null || die -} diff --git a/net-analyzer/kapacitor/metadata.xml b/net-analyzer/kapacitor/metadata.xml index c36c37139fad..db463f3eeb66 100644 --- a/net-analyzer/kapacitor/metadata.xml +++ b/net-analyzer/kapacitor/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> <email>williamh@gentoo.org</email> diff --git a/net-analyzer/knocker/Manifest b/net-analyzer/knocker/Manifest index 587431e73fe1..9290a58d8dc7 100644 --- a/net-analyzer/knocker/Manifest +++ b/net-analyzer/knocker/Manifest @@ -1 +1 @@ -DIST knocker-0.7.1.tar.gz 72132 BLAKE2B a6eb8e37354df630481f809c77e98f1c9dab3290b8a34e1a3c7bbfc5f3d0f41b9a1f97a8f5a8afef7e1ec0c5afa444e908b8d50eeaedf08a384e86cda1c7b182 SHA512 e65d615235328c027e1c6179a11bee186fa3d173205850e8b9fac591819e344de770d968c2667f1a18bef88cf90422c357bf76b9d05a8915629977cb8e334cc2 +DIST knocker-0.8.0.tar.gz 117380 BLAKE2B bb6b344efc0c7b22266b59430eff3b7982d328b54277085cef9709f9f41b7e6e40b1cc22944b36f927db00cd7f15afc1774be20df504e1f3f4eb2b2b1c293973 SHA512 127fde05f2f331e7a4489c4612852fe841f0981b737be1d871de33355a0b55f2ab50d2c083ef857420b4af81909d5cc8fbe6c89174e141f77e6bf25719b6bf47 diff --git a/net-analyzer/knocker/files/knocker-0.7.1-fency.patch b/net-analyzer/knocker/files/knocker-0.7.1-fency.patch deleted file mode 100644 index 6051d87b2e68..000000000000 --- a/net-analyzer/knocker/files/knocker-0.7.1-fency.patch +++ /dev/null @@ -1,149 +0,0 @@ ---- a/ChangeLog -+++ b/ChangeLog -@@ -23,7 +23,7 @@ - .conf in the user ~/.knocker subdirectory. - - 13 May 2002 -- - --no-fency (-nf for short) option added. This switch tells knocker to show -+ - --no-fancy (-nf for short) option added. This switch tells knocker to show - the output in a "polite" way. All the lines and stuffs shown in the default - mode, will not be displayed using this option. - ---- a/src/knocker_args.c -+++ b/src/knocker_args.c -@@ -82,7 +82,7 @@ - fprintf (stdout, "Extra options:\n"); - fprintf (stdout, " %s, %s quiet mode (no console output, logs to file)\n", QUIET_MODE_SHORT_OPT, QUIET_MODE_LONG_OPT); - fprintf (stdout, " %s, %s <logfile> log scan results to the specified file\n", ENABLE_LOGFILE_SHORT_OPT, ENABLE_LOGFILE_LONG_OPT); -- fprintf (stdout, " %s, %s disable fency output\n", NO_FENCY_SHORT_OPT, NO_FENCY_LONG_OPT); -+ fprintf (stdout, " %s, %s disable fancy output\n", NO_FANCY_SHORT_OPT, NO_FANCY_LONG_OPT); - fprintf (stdout, " %s, %s disable colored output\n", NO_COLORS_SHORT_OPT, NO_COLORS_LONG_OPT); - fprintf (stdout, "\n"); - fprintf (stdout, " %s let you configure %s\n", CONFIGURE_LONG_OPT, PACKAGE); -@@ -111,7 +111,7 @@ - args->logfile = logfile; - args->quiet = quiet; - args->colors = colors; -- args->fency = TRUE; /* true by default */ -+ args->fancy = TRUE; /* true by default */ - - return 0; - } -@@ -189,10 +189,10 @@ - } - return (0); /* we should have all arguments here */ - } -- else if ((!strcmp (argv[i], NO_FENCY_SHORT_OPT)) || (!strcmp (argv[i], NO_FENCY_LONG_OPT))) -+ else if ((!strcmp (argv[i], NO_FANCY_SHORT_OPT)) || (!strcmp (argv[i], NO_FANCY_LONG_OPT))) - { -- /* Disable fency output */ -- args->fency = FALSE; -+ /* Disable fancy output */ -+ args->fancy = FALSE; - } - else if ((!strcmp (argv[i], NO_COLORS_SHORT_OPT)) || (!strcmp (argv[i], NO_COLORS_LONG_OPT))) - { ---- a/src/knocker_output.c -+++ b/src/knocker_output.c -@@ -48,7 +48,7 @@ - { - time_t timenow; - -- if (!knocker_args.fency) -+ if (!knocker_args.fancy) - return 0; - - -@@ -104,7 +104,7 @@ - */ - void knocker_output_host_info (const char *hostname_str, const char *hostip_str) - { -- if (knocker_args.fency) -+ if (knocker_args.fancy) - { - knocker_term_color_fprintf (knocker_output_fp, " - ", KNOCKER_COLOR_1, KNOCKER_COLOR_1_ATTR); - knocker_term_color_fprintf (knocker_output_fp, "hostname to scan: ", KNOCKER_COLOR_1, KNOCKER_COLOR_1_ATTR); -@@ -134,7 +134,7 @@ - */ - void knocker_output_resolve_error (char *hostname_str) - { -- if (knocker_args.fency) -+ if (knocker_args.fancy) - { - knocker_term_color_fprintf (knocker_output_fp, " - ", KNOCKER_COLOR_1, KNOCKER_COLOR_1_ATTR); - knocker_term_color_fprintf (knocker_output_fp, "failed to resolve given hostname/IP: ", KNOCKER_COLOR_1, KNOCKER_COLOR_1_ATTR); -@@ -157,7 +157,7 @@ - */ - void knocker_output_ports_info (int sp, int ep) - { -- if (!knocker_args.fency) -+ if (!knocker_args.fancy) - { - knocker_term_color_fprintf (knocker_output_fp, "\n", KNOCKER_COLOR_2, KNOCKER_COLOR_2_ATTR); - return; -@@ -183,7 +183,7 @@ - */ - void knocker_output_open_port (int port, char *service_str) - { -- if (knocker_args.fency) -+ if (knocker_args.fancy) - { - knocker_term_color_fprintf (knocker_output_fp, " -=[ ", KNOCKER_COLOR_1, KNOCKER_COLOR_1_ATTR); - knocker_term_color_intfprintf (knocker_output_fp, port, KNOCKER_COLOR_2, KNOCKER_COLOR_2_ATTR); -@@ -216,7 +216,7 @@ - */ - void knocker_output_results (char *hostname_str, char *hostname_ip, int tot_ps, int open_ps, char *secs) - { -- if (knocker_args.fency) -+ if (knocker_args.fancy) - { - knocker_term_color_fprintf (knocker_output_fp, "\n", KNOCKER_COLOR_2, KNOCKER_COLOR_2_ATTR); - knocker_term_color_fprintf (knocker_output_fp, "+=- - - - - - - - - - - - - - - - - - - - - - - - - - - - ", ---- a/src/knocker_main.c -+++ b/src/knocker_main.c -@@ -75,7 +75,7 @@ - - knocker_core_init_portscan_data (&pscan_data); - -- if (knocker_args.fency) -+ if (knocker_args.fancy) - knocker_term_clear (); - - knocker_output_open (); ---- a/src/knocker_args.h -+++ b/src/knocker_args.h -@@ -53,9 +53,9 @@ - #define QUIET_MODE_SHORT_OPT "-q" - #define QUIET_MODE_LONG_OPT "--quiet" - -- /* option to disable fency cool out put */ --#define NO_FENCY_SHORT_OPT "-nf" --#define NO_FENCY_LONG_OPT "--no-fency" -+ /* option to disable fancy cool out put */ -+#define NO_FANCY_SHORT_OPT "-nf" -+#define NO_FANCY_LONG_OPT "--no-fancy" - - /* option to disable colored out put */ - #define NO_COLORS_SHORT_OPT "-nc" -@@ -88,7 +88,7 @@ - int logfile; /* log to file TRUE,FALSE */ - int quiet; /* quiet mode TRUE,FALSE */ - int colors; /* no colors, TRUE,FALSE */ -- int fency; /* fency output, TRUE, FALSE */ -+ int fancy; /* fancy output, TRUE, FALSE */ - int win32_frontend; - } knocker_args_t; - ---- a/docs/knocker.1 -+++ b/docs/knocker.1 -@@ -38,8 +38,8 @@ - \fB\-lf\fr, \fB\-\-logfile <logfile>\fR - log the results to a specified file. - .TP --\fB\-nf\fr, \fB\-\-no-fency\fR --disable fency output -+\fB\-nf\fr, \fB\-\-no-fancy\fR -+disable fancy output - .TP - \fB\-nc\fr, \fB\-\-no-colors\fR - disable colored output diff --git a/net-analyzer/knocker/files/knocker-0.7.1-fno-common.patch b/net-analyzer/knocker/files/knocker-0.7.1-fno-common.patch deleted file mode 100644 index 0b5247a653a4..000000000000 --- a/net-analyzer/knocker/files/knocker-0.7.1-fno-common.patch +++ /dev/null @@ -1,215 +0,0 @@ ---- a/src/knocker_args.c -+++ b/src/knocker_args.c -@@ -34,6 +34,7 @@ - - static int _have_last_host = 0; /* tells if we've got the host with the --last-host option */ - -+knocker_args_t knocker_args; /* command line arguments structure */ - - /* - ============================================================================ ---- a/src/knocker_args.h -+++ b/src/knocker_args.h -@@ -93,7 +93,7 @@ - } knocker_args_t; - - --knocker_args_t knocker_args; /* command line arguments structure */ -+extern knocker_args_t knocker_args; /* command line arguments structure */ - - /* - Initialize a knocker_args_t type of structure ---- a/src/knocker_conf.c -+++ b/src/knocker_conf.c -@@ -31,6 +31,11 @@ - #include "knocker_user.h" - #include "knocker_conf.h" - -+int KNOCKER_USER_COLOR; -+int KNOCKER_COLOR_1; -+int KNOCKER_COLOR_2; -+int KNOCKER_COLOR_1_ATTR; -+int KNOCKER_COLOR_2_ATTR; - - /* - ============================================================================ ---- a/src/knocker_conf.h -+++ b/src/knocker_conf.h -@@ -46,11 +46,11 @@ - /* The actual values variable */ - /* these values are read from the conf file */ - /* by the knocker_conf_parse function */ --int KNOCKER_USER_COLOR; --int KNOCKER_COLOR_1; --int KNOCKER_COLOR_2; --int KNOCKER_COLOR_1_ATTR; --int KNOCKER_COLOR_2_ATTR; -+extern int KNOCKER_USER_COLOR; -+extern int KNOCKER_COLOR_1; -+extern int KNOCKER_COLOR_2; -+extern int KNOCKER_COLOR_1_ATTR; -+extern int KNOCKER_COLOR_2_ATTR; - - void knocker_conf_configure ( void ); - int knocker_conf_parse ( void ); ---- a/src/knocker_core.c -+++ b/src/knocker_core.c -@@ -50,6 +50,9 @@ - static void knocker_core_free_host_ip_string (knocker_core_host_t * hinfo); - - -+char *knocker_core_last_hostip; /* string of the last resolved host ip address */ -+char *knocker_core_last_hostname; /* string of the last used host name */ -+char *knocker_core_last_service; /* string of the last service */ - - /* - ============================================================================ ---- a/src/knocker_core.h -+++ b/src/knocker_core.h -@@ -164,9 +164,9 @@ - static const char knocker_core_author_email[] = _KNOCKER_CORE_AUTHOR_EMAIL_; - - /* allocated and deallocated within knocker_core_init, knocker_core_quit */ --char *knocker_core_last_hostip; /* string of the last resolved host ip address */ --char *knocker_core_last_hostname; /* string of the last used host name */ --char *knocker_core_last_service; /* string of the last service */ -+extern char *knocker_core_last_hostip; /* string of the last resolved host ip address */ -+extern char *knocker_core_last_hostname; /* string of the last used host name */ -+extern char *knocker_core_last_service; /* string of the last service */ - - - int knocker_core_init ( void ); ---- a/src/knocker_led.c -+++ b/src/knocker_led.c -@@ -50,6 +50,9 @@ - #define LED_VALUE_SCR LED_SCR - - -+knocker_led_t knocker_led_status; -+int ledt; -+ - #ifndef NO_LED - static int initialized = 0; - #endif ---- a/src/knocker_led.h -+++ b/src/knocker_led.h -@@ -65,7 +65,7 @@ - int sequence; /* used in knocker_led_sequence() only */ - } knocker_led_t; - --knocker_led_t knocker_led_status; -+extern knocker_led_t knocker_led_status; - - void knocker_led_turn_on (int led); - void knocker_led_turn_off (int led); -@@ -75,7 +75,7 @@ - void knocker_led_reset ( void ); - - #define led_delay 1 --int ledt; -+extern int ledt; - - #endif /* _KNOCKER_LED_H_ */ - ---- a/src/knocker_log.c -+++ b/src/knocker_log.c -@@ -30,7 +30,7 @@ - const char knocker_log_header[] = - "+-----------------------------------------------------------------------------+\n|--=| k n o c k e r -- t h e -- n e t -- p o r t s c a n n e r |=-=[logfile]=-|\n+-----------------------------------------------------------------------------+\n"; - --char *knocker_time; -+FILE *knocker_log_fp; - - /* - ============================================================================ ---- a/src/knocker_log.h -+++ b/src/knocker_log.h -@@ -33,7 +33,7 @@ - #include <string.h> - - #define KNOCKER_LOG_FILE "knocker_scan.log" --FILE *knocker_log_fp; -+extern FILE *knocker_log_fp; - - int knocker_log_open (const char *filename); - void knocker_log_host_info (char *hostname_str, char *hostip_str); ---- a/src/knocker_output.c -+++ b/src/knocker_output.c -@@ -38,8 +38,6 @@ - }; - - --char *knocker_time; -- - /* - ============================================================================ - ============================================================================ ---- a/src/knocker_services.c -+++ b/src/knocker_services.c -@@ -28,6 +28,9 @@ - #include "knocker_services.h" - #include "knocker_core.h" - -+int knocker_core_services_db_init; -+char *knocker_core_services_db[SERVICES_DB_TOTAL_SERVICES]; -+ - /* this following list of services has been automatically - generated from /etc/services */ - ---- a/src/knocker_services.h -+++ b/src/knocker_services.h -@@ -29,9 +29,9 @@ - - #define SERVICES_DB_TOTAL_SERVICES 30000 /* was erroneously 231 */ - --int knocker_core_services_db_init; -+extern int knocker_core_services_db_init; - --char *knocker_core_services_db[SERVICES_DB_TOTAL_SERVICES]; -+extern char *knocker_core_services_db[SERVICES_DB_TOTAL_SERVICES]; - - int init_knocker_core_services_db ( void ); - void free_knocker_core_services_db ( void ); ---- a/src/knocker_time.c -+++ b/src/knocker_time.c -@@ -40,6 +40,7 @@ - static struct timeval timer_start; - #endif - -+char *knocker_time; - - void knocker_time_start_timer (void) - { ---- a/src/knocker_time.h -+++ b/src/knocker_time.h -@@ -30,6 +30,8 @@ - - #include <time.h> - -+extern char *knocker_time; -+ - void knocker_time_start_timer (void); - double knocker_time_get_ticks (void); - void knocker_time_delay (unsigned long ms); ---- a/src/knocker_user.c -+++ b/src/knocker_user.c -@@ -41,6 +41,8 @@ - #define KNOCKER_LASTSCAN_FILE "lastscan" - #define KNOCKER_TOKEN "|" - -+knocker_user_t knocker_user; -+ - static int _dir_exists (const char *path); - static int _dir_create (const char *path); - static int _file_exists (const char *path); ---- a/src/knocker_user.h -+++ b/src/knocker_user.h -@@ -30,7 +30,7 @@ - int super; /* user is root or not */ - } knocker_user_t; - --knocker_user_t knocker_user; -+extern knocker_user_t knocker_user; - - int knocker_user_is_root ( void ); - char *knocker_user_get_username ( void ); diff --git a/net-analyzer/knocker/files/knocker-0.7.1-free.patch b/net-analyzer/knocker/files/knocker-0.7.1-free.patch deleted file mode 100644 index 5381d2fd83e3..000000000000 --- a/net-analyzer/knocker/files/knocker-0.7.1-free.patch +++ /dev/null @@ -1,30 +0,0 @@ ---- a/src/knocker_conf.c -+++ b/src/knocker_conf.c -@@ -223,6 +223,8 @@ - { - char *tmpp = malloc (strlen (line)); - char *p = malloc (strlen (line)); -+ char *tmpp_orig = tmpp; -+ char *p_orig = p; - - /* Check if the option is present in the line */ - tmpp = strstr (line, opt); -@@ -234,7 +236,7 @@ - - if (!_isblank (*tmpp) || *tmpp != KNOCKER_OPTION_TOKEN) - { -- free (tmpp); -+ free (tmpp_orig); - return 0; - } - -@@ -247,8 +249,7 @@ - - strcpy (value, p); - -- /* free(p); this cause knocker to segfault */ -- /* well I have to know why... */ -+ free(p_orig); - - return 1; - } diff --git a/net-analyzer/knocker/files/knocker-0.8.0-fency.patch b/net-analyzer/knocker/files/knocker-0.8.0-fency.patch new file mode 100644 index 000000000000..a5ff93fb07bb --- /dev/null +++ b/net-analyzer/knocker/files/knocker-0.8.0-fency.patch @@ -0,0 +1,151 @@ +--- a/ChangeLog ++++ b/ChangeLog +@@ -23,7 +23,7 @@ + .conf in the user ~/.knocker subdirectory. + + 13 May 2002 +- - --no-fency (-nf for short) option added. This switch tells knocker to show ++ - --no-fancy (-nf for short) option added. This switch tells knocker to show + the output in a "polite" way. All the lines and stuffs shown in the default + mode, will not be displayed using this option. + +--- a/src/knocker_args.c ++++ b/src/knocker_args.c +@@ -82,7 +82,7 @@ + fprintf (stdout, "Extra options:\n"); + fprintf (stdout, " %s, %s quiet mode (no console output, logs to file)\n", QUIET_MODE_SHORT_OPT, QUIET_MODE_LONG_OPT); + fprintf (stdout, " %s, %s <logfile> log scan results to the specified file\n", ENABLE_LOGFILE_SHORT_OPT, ENABLE_LOGFILE_LONG_OPT); +- fprintf (stdout, " %s, %s disable fency output\n", NO_FENCY_SHORT_OPT, NO_FENCY_LONG_OPT); ++ fprintf (stdout, " %s, %s disable fancy output\n", NO_FANCY_SHORT_OPT, NO_FANCY_LONG_OPT); + fprintf (stdout, " %s, %s disable colored output\n", NO_COLORS_SHORT_OPT, NO_COLORS_LONG_OPT); + fprintf (stdout, "\n"); + fprintf (stdout, " %s let you configure %s\n", CONFIGURE_LONG_OPT, PACKAGE); +@@ -111,7 +111,7 @@ + args->logfile = logfile; + args->quiet = quiet; + args->colors = colors; +- args->fency = TRUE; /* true by default */ ++ args->fancy = TRUE; /* true by default */ + + return 0; + } +@@ -189,10 +189,10 @@ + } + return (0); /* we should have all arguments here */ + } +- else if ((!strcmp (argv[i], NO_FENCY_SHORT_OPT)) || (!strcmp (argv[i], NO_FENCY_LONG_OPT))) ++ else if ((!strcmp (argv[i], NO_FANCY_SHORT_OPT)) || (!strcmp (argv[i], NO_FANCY_LONG_OPT))) + { +- /* Disable fency output */ +- args->fency = FALSE; ++ /* Disable fancy output */ ++ args->fancy = FALSE; + } + else if ((!strcmp (argv[i], NO_COLORS_SHORT_OPT)) || (!strcmp (argv[i], NO_COLORS_LONG_OPT))) + { +--- a/src/knocker_main.c ++++ b/src/knocker_main.c +@@ -75,7 +75,7 @@ + + knocker_core_init_portscan_data (&pscan_data); + +- if (knocker_args.fency) ++ if (knocker_args.fancy) + knocker_term_clear (); + + knocker_output_open (); +--- a/src/knocker_args.h ++++ b/src/knocker_args.h +@@ -53,9 +53,9 @@ + #define QUIET_MODE_SHORT_OPT "-q" + #define QUIET_MODE_LONG_OPT "--quiet" + +- /* option to disable fency cool out put */ +-#define NO_FENCY_SHORT_OPT "-nf" +-#define NO_FENCY_LONG_OPT "--no-fency" ++ /* option to disable fancy cool out put */ ++#define NO_FANCY_SHORT_OPT "-nf" ++#define NO_FANCY_LONG_OPT "--no-fancy" + + /* option to disable colored out put */ + #define NO_COLORS_SHORT_OPT "-nc" +@@ -88,7 +88,7 @@ + int logfile; /* log to file TRUE,FALSE */ + int quiet; /* quiet mode TRUE,FALSE */ + int colors; /* no colors, TRUE,FALSE */ +- int fency; /* fency output, TRUE, FALSE */ ++ int fancy; /* fancy output, TRUE, FALSE */ + int win32_frontend; + } knocker_args_t; + +--- a/doc/knocker.1 ++++ b/dos/knocker.1 +@@ -38,8 +38,8 @@ + \fB\-lf\fr, \fB\-\-logfile <logfile>\fR + log the results to a specified file. + .TP +-\fB\-nf\fr, \fB\-\-no-fency\fR +-disable fency output ++\fB\-nf\fr, \fB\-\-no-fancy\fR ++disable fancy output + .TP + \fB\-nc\fr, \fB\-\-no-colors\fR + disable colored output +diff --git a/src/knocker_output.c b/src/knocker_output.c +index 4714c24..613b608 100755 +--- a/src/knocker_output.c ++++ b/src/knocker_output.c +@@ -46,7 +46,7 @@ int knocker_output_open (void) + time (&timenow); + knocker_time = ctime (&timenow); + +- if (knocker_args.fency) ++ if (knocker_args.fancy) + { + knocker_term_color_fprintf (knocker_output_fp, "\n", KNOCKER_COLOR_1, KNOCKER_COLOR_1_ATTR); + +@@ -98,7 +98,7 @@ int knocker_output_open (void) + + void knocker_output_host_info (const char *hostname_str, const char *hostip_str) + { +- if (knocker_args.fency) ++ if (knocker_args.fancy) + { + knocker_term_color_fprintf (knocker_output_fp, " - ", KNOCKER_COLOR_1, KNOCKER_COLOR_1_ATTR); + knocker_term_color_fprintf (knocker_output_fp, "hostname to scan: ", KNOCKER_COLOR_1, KNOCKER_COLOR_1_ATTR); +@@ -124,7 +124,7 @@ void knocker_output_host_info (const char *hostname_str, const char *hostip_str) + + void knocker_output_resolve_error (char *hostname_str) + { +- if (knocker_args.fency) ++ if (knocker_args.fancy) + { + knocker_term_color_fprintf (knocker_output_fp, " - ", KNOCKER_COLOR_1, KNOCKER_COLOR_1_ATTR); + knocker_term_color_fprintf (knocker_output_fp, "failed to resolve given hostname/IP: ", KNOCKER_COLOR_1, KNOCKER_COLOR_1_ATTR); +@@ -144,7 +144,7 @@ void knocker_output_resolve_error (char *hostname_str) + + void knocker_output_ports_info (int sp, int ep) + { +- if (!knocker_args.fency) ++ if (!knocker_args.fancy) + { + knocker_term_color_fprintf (knocker_output_fp, "\n", KNOCKER_COLOR_2, KNOCKER_COLOR_2_ATTR); + return; +@@ -166,7 +166,7 @@ void knocker_output_ports_info (int sp, int ep) + + void knocker_output_open_port (int port, char *service_str) + { +- if (knocker_args.fency) ++ if (knocker_args.fancy) + { + knocker_term_color_fprintf (knocker_output_fp, " -=[ ", KNOCKER_COLOR_1, KNOCKER_COLOR_1_ATTR); + knocker_term_color_intfprintf (knocker_output_fp, port, KNOCKER_COLOR_2, KNOCKER_COLOR_2_ATTR); +@@ -192,7 +192,7 @@ void knocker_output_open_port (int port, char *service_str) + + void knocker_output_results (char *hostname_str, char *hostname_ip, int tot_ps, int open_ps, char *secs) + { +- if (knocker_args.fency) ++ if (knocker_args.fancy) + { + knocker_term_color_fprintf (knocker_output_fp, "\n", KNOCKER_COLOR_2, KNOCKER_COLOR_2_ATTR); + knocker_term_color_fprintf (knocker_output_fp, "+=- - - - - - - - - - - - - - - - - - - - - - - - - - - - ", diff --git a/net-analyzer/knocker/knocker-0.7.1-r3.ebuild b/net-analyzer/knocker/knocker-0.7.1-r3.ebuild deleted file mode 100644 index 0e56cfddb098..000000000000 --- a/net-analyzer/knocker/knocker-0.7.1-r3.ebuild +++ /dev/null @@ -1,26 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit toolchain-funcs - -DESCRIPTION="Knocker is an easy to use security port scanner written in C" -HOMEPAGE="http://knocker.sourceforge.net" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ppc x86" - -PATCHES=( - "${FILESDIR}"/${P}-fency.patch - "${FILESDIR}"/${P}-free.patch - "${FILESDIR}"/${P}-knocker_user_is_root.patch - "${FILESDIR}"/${P}-fno-common.patch -) -DOCS=( AUTHORS BUGS ChangeLog NEWS README TO-DO ) - -src_configure() { - tc-export CC - default -} diff --git a/net-analyzer/knocker/knocker-0.8.0.ebuild b/net-analyzer/knocker/knocker-0.8.0.ebuild new file mode 100644 index 000000000000..e321e9635e5d --- /dev/null +++ b/net-analyzer/knocker/knocker-0.8.0.ebuild @@ -0,0 +1,26 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=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" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64 ppc x86" + +PATCHES=( + "${FILESDIR}"/${PN}-0.8.0-fency.patch + "${FILESDIR}"/${PN}-0.7.1-knocker_user_is_root.patch +) + +DOCS=( AUTHORS BUGS ChangeLog NEWS README TO-DO ) + +src_configure() { + tc-export CC + default +} diff --git a/net-analyzer/knocker/metadata.xml b/net-analyzer/knocker/metadata.xml index 490337f25c7d..5eac8d0cb4e2 100644 --- a/net-analyzer/knocker/metadata.xml +++ b/net-analyzer/knocker/metadata.xml @@ -1,11 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!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> <upstream> + <remote-id type="github">gabgio/knocker</remote-id> <remote-id type="sourceforge">knocker</remote-id> </upstream> </pkgmetadata> diff --git a/net-analyzer/labrea/files/labrea-2.5-libdir.patch b/net-analyzer/labrea/files/labrea-2.5-libdir.patch new file mode 100644 index 000000000000..039745205c3c --- /dev/null +++ b/net-analyzer/labrea/files/labrea-2.5-libdir.patch @@ -0,0 +1,26 @@ +--- a/configure.in ++++ b/configure.in +@@ -82,9 +82,9 @@ AC_ARG_WITH(libpcap, + if cd $withval; then withval=`pwd`; cd $owd; fi + PCAPINC="-I$withval/include" + if test -f $withval/lib/libwpcap.a; then +- PCAPLIB="-L$withval/lib -lwpcap" ++ PCAPLIB="-L$withval/${libdir} -lwpcap" + else +- PCAPLIB="-L$withval/lib -lpcap" ++ PCAPLIB="-L$withval/${libdir} -lpcap" + fi + else + AC_ERROR(pcap.h, net/bpf.h, or libpcap.a not found in $withval) +@@ -94,9 +94,9 @@ AC_ARG_WITH(libpcap, + [ if test -f ${prefix}/include/pcap.h; then + PCAPINC="-I${prefix}/include" + if test -f ${prefix}/lib/libwpcap.a; then +- PCAPLIB="-L${prefix}/lib -lwpcap" ++ PCAPLIB="-L${libdir} -lwpcap" + else +- PCAPLIB="-L${prefix}/lib -lpcap" ++ PCAPLIB="-L${libdir} -lpcap" + fi + elif test -f /usr/include/pcap/pcap.h; then + PCAPINC="-I/usr/include/pcap" diff --git a/net-analyzer/labrea/files/labrea-2.5_p1-clang16.patch b/net-analyzer/labrea/files/labrea-2.5_p1-clang16.patch new file mode 100644 index 000000000000..15ed9ff0960c --- /dev/null +++ b/net-analyzer/labrea/files/labrea-2.5_p1-clang16.patch @@ -0,0 +1,7 @@ +https://bugs.gentoo.org/871513 +--- a/inc/utils.h ++++ b/inc/utils.h +@@ -52,2 +52,3 @@ + ++void util_alarm(void); + void util_init(void); diff --git a/net-analyzer/labrea/labrea-2.5_p1.ebuild b/net-analyzer/labrea/labrea-2.5_p1.ebuild index 5fc9881601f9..2e1cbb89bd39 100644 --- a/net-analyzer/labrea/labrea-2.5_p1.ebuild +++ b/net-analyzer/labrea/labrea-2.5_p1.ebuild @@ -1,14 +1,16 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 + inherit autotools DESCRIPTION="'Sticky' Honeypot and IDS" -HOMEPAGE="http://labrea.sourceforge.net/" +HOMEPAGE="https://labrea.sourceforge.io" SRC_URI="mirror://sourceforge/${PN}/${P/_p*}-stable-${PV/*_p}.tar.gz" +S="${WORKDIR}/${P/_p/-stable-}" -LICENSE="GPL-2" +LICENSE="GPL-2+" SLOT="0" KEYWORDS="amd64 ~ppc x86" @@ -16,15 +18,16 @@ DEPEND=" net-libs/libpcap >=dev-libs/libdnet-1.7 " -RDEPEND=" - ${DEPEND} -" +RDEPEND="${DEPEND}" + DOCS=( AUTHORS ChangeLog README{,.first} TODO NEWS ) + PATCHES=( "${FILESDIR}"/${P/_p/-stable-}-incdir.patch "${FILESDIR}"/${P/_p*}-pcap_open.patch + "${FILESDIR}"/${PN}-2.5-libdir.patch + "${FILESDIR}"/${P}-clang16.patch ) -S=${WORKDIR}/${P/_p/-stable-} src_prepare() { default @@ -32,6 +35,8 @@ src_prepare() { # autotools will overwrite this with the generic version mv INSTALL README.first || die + mv configure.{in,ac} || die + eautoreconf } diff --git a/net-analyzer/labrea/metadata.xml b/net-analyzer/labrea/metadata.xml index 8a128dcadbeb..7b25ccf324cd 100644 --- a/net-analyzer/labrea/metadata.xml +++ b/net-analyzer/labrea/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>netmon@gentoo.org</email> diff --git a/net-analyzer/lft/Manifest b/net-analyzer/lft/Manifest index c110350415b4..9b6cb4681d0e 100644 --- a/net-analyzer/lft/Manifest +++ b/net-analyzer/lft/Manifest @@ -1,5 +1 @@ -DIST lft-3.77.tar.gz 376369 BLAKE2B be518167608896a43b7e2ef1ca478f3fa9a9ced58737e607af348bd8929a2890356dc6041ce3ea9fa3273a954d4df151a4c6ff5fc5a0e26e25b3849bf83aac5d SHA512 b06fa50cbccb40d275ac604b86c6aed4ee00700cde38fd579de06bb577280f154d0173c4788920410a5c2e0c8ed20d7adf07f15d0b98cf5ad4ea422651df60f1 -DIST lft-3.79.tar.gz 376655 BLAKE2B 4c3affe00a09befc00029029a1da5d530d08bce317e616e7d996a8e31d22632cf43adbe519f4789313b59dc01f4c36d19860effd561b4f691eadcac05c935d6e SHA512 83f35cb24966467a7da180ca8ac9d642e7ca6267a14e752a813f172956554c3d4b278a450d230535c15db1b14d415dca752ad05ed1cec8c1c7cf4953b90a646d -DIST lft-3.8.tar.gz 376731 BLAKE2B e78e6d32cdaff8864e13477522dac92953d7ba44cb7d64e327eeb126411d6f6c022fe1e2011377df28bc948ae75193d1de2801ee12edc42a5cf70e2b56f5e8e5 SHA512 13ea176362096cc8c20500d61969483642f5d003263b529ec8d601786f621341107859510f9cafa5d365417beafce897bcc9cd631171e291ca3dc07fec1bd483 -DIST lft-3.9.tar.gz 377008 BLAKE2B ee56fde8ea25eddc9d7b7860c55f5f9d90a867fd54b5169fdfffd9c7276e38ed9f3855480472c0ed51e53db608e16a0f462f315c0e4b10794b69daab00aeb8b8 SHA512 9d95644eaa61a295d15381c35a8130642e3299a6e90a73bf4a1f369a3b9d8eee648497638f36f0ed5ae970d0307420ba30dbe4ac865767923fd618fbccddc806 DIST lft-3.91.tar.gz 377135 BLAKE2B 6b67438738ebab46e5c6c79c17f074042535e9eecb80827562fb6ca6550118ecb3e70118379c4cd0b99611189554fe117ebb3d76580130627b2a21d72c9b5253 SHA512 1d030e2def14330426eef4c81245c4cce5f09c560b65b319199b20d82e967b77a5d4e323e2e64a8c1bcf80d1f87ae871e3f24a7d9cbc19cd7a5be2d3204845e7 diff --git a/net-analyzer/lft/lft-3.77.ebuild b/net-analyzer/lft/lft-3.77.ebuild deleted file mode 100644 index b79c445424c0..000000000000 --- a/net-analyzer/lft/lft-3.77.ebuild +++ /dev/null @@ -1,26 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -DESCRIPTION="Layer Four Traceroute (LFT) and WhoB" -HOMEPAGE="http://pwhois.org/lft/" -SRC_URI="http://pwhois.org/get/${P}.tar.gz" - -LICENSE="VOSTROM" -SLOT="0" -KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos" - -DEPEND=" - net-libs/libpcap -" -RDEPEND=" - ${DEPEND} -" - -DOCS=( CHANGELOG README TODO ) - -src_prepare() { - default - sed -i Makefile.in -e 's:strip:true:g' || die -} diff --git a/net-analyzer/lft/lft-3.79.ebuild b/net-analyzer/lft/lft-3.79.ebuild deleted file mode 100644 index 58a145bd7256..000000000000 --- a/net-analyzer/lft/lft-3.79.ebuild +++ /dev/null @@ -1,26 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -DESCRIPTION="Layer Four Traceroute (LFT) and WhoB" -HOMEPAGE="http://pwhois.org/lft/" -SRC_URI="http://pwhois.org/get/${P}.tar.gz" - -LICENSE="VOSTROM" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos" - -DEPEND=" - net-libs/libpcap -" -RDEPEND=" - ${DEPEND} -" - -DOCS=( CHANGELOG README TODO ) - -src_prepare() { - default - sed -i Makefile.in -e 's:strip:true:g' || die -} diff --git a/net-analyzer/lft/lft-3.80.ebuild b/net-analyzer/lft/lft-3.80.ebuild deleted file mode 100644 index bc7acaa2b658..000000000000 --- a/net-analyzer/lft/lft-3.80.ebuild +++ /dev/null @@ -1,27 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -DESCRIPTION="Layer Four Traceroute (LFT) and WhoB" -HOMEPAGE="http://pwhois.org/lft/" -SRC_URI="http://pwhois.org/get/${P/0}.tar.gz" - -LICENSE="VOSTROM" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos" - -DEPEND=" - net-libs/libpcap -" -RDEPEND=" - ${DEPEND} -" -S=${WORKDIR}/${P/0} - -DOCS=( CHANGELOG README TODO ) - -src_prepare() { - default - sed -i Makefile.in -e 's:strip:true:g' || die -} diff --git a/net-analyzer/lft/lft-3.90.ebuild b/net-analyzer/lft/lft-3.90.ebuild deleted file mode 100644 index d874cf1a0c8c..000000000000 --- a/net-analyzer/lft/lft-3.90.ebuild +++ /dev/null @@ -1,30 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DESCRIPTION="Layer Four Traceroute (LFT) and WhoB" -HOMEPAGE="http://pwhois.org/lft/" -SRC_URI="http://pwhois.org/get/${P/0}.tar.gz" - -LICENSE="VOSTROM" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos" - -DEPEND=" - net-libs/libpcap -" -RDEPEND=" - ${DEPEND} -" -S=${WORKDIR}/${P/0} - -DOCS=( CHANGELOG README TODO ) - -src_prepare() { - sed -i -e 's:strip:true:g' Makefile.in || die - sed -i \ - -e 's|_BSD_SOURCE|_DEFAULT_SOURCE|g' \ - configure config/acconfig.h.in || die - default -} diff --git a/net-analyzer/lft/lft-3.91-r1.ebuild b/net-analyzer/lft/lft-3.91-r1.ebuild index 576eb0a3cc0b..3e57965afb2b 100644 --- a/net-analyzer/lft/lft-3.91-r1.ebuild +++ b/net-analyzer/lft/lft-3.91-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -9,7 +9,7 @@ SRC_URI="http://pwhois.org/get/${P}.tar.gz" LICENSE="VOSTROM" SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos" +KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos" DEPEND=" net-libs/libpcap diff --git a/net-analyzer/lft/metadata.xml b/net-analyzer/lft/metadata.xml index 2fd58454386f..25ecd83c4cd4 100644 --- a/net-analyzer/lft/metadata.xml +++ b/net-analyzer/lft/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>netmon@gentoo.org</email> diff --git a/net-analyzer/lilac/Manifest b/net-analyzer/lilac/Manifest deleted file mode 100644 index fa04b8612898..000000000000 --- a/net-analyzer/lilac/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST lilac-1.0.3.tar.gz 1794493 BLAKE2B 99f89ee232f493afcac541fe22890ed9711e6310b0af959f5e381a0575bbefd9a4607cc651ad62e737f98251b3bc073c38a02d2499bd10e440d8696493c82364 SHA512 bee9ddb7f4adc2199ee804db2d5758bb172f7f18a868206774d54d2ad7b9741a16152dbdd8c8c7cd82e6375428c9d0466bd38e3affdab55bcb574914f0fb813c diff --git a/net-analyzer/lilac/lilac-1.0.3-r1.ebuild b/net-analyzer/lilac/lilac-1.0.3-r1.ebuild deleted file mode 100644 index 9a622aa56f85..000000000000 --- a/net-analyzer/lilac/lilac-1.0.3-r1.ebuild +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -WEBAPP_MANUAL_SLOT="yes" -inherit webapp - -DESCRIPTION="Web-based configuration tool written to configure Nagios" -HOMEPAGE="http://www.lilacplatform.com" -SRC_URI="mirror://gentoo/${P}.tar.gz" - -LICENSE="GPL-2" -KEYWORDS="~amd64 ~x86" -SLOT="${PV}" - -RDEPEND=" - >=dev-php/PEAR-PEAR-1.6.1 - >=net-analyzer/nagios-3.0 - >=virtual/mysql-5.0 - dev-lang/php[curl,json(+),mysql,pcntl,pdo,posix,simplexml] - virtual/httpd-php -" - -src_install() { - webapp_src_preinst - - dodoc INSTALL UPGRADING - rm -f INSTALL UPGRADING - - insinto "${MY_HTDOCSDIR}" - doins -r . - - webapp_configfile "${MY_HTDOCSDIR}"/includes/lilac-conf.php.dist - webapp_serverowned "${MY_HTDOCSDIR}"/includes/lilac-conf.php.dist - webapp_src_install -} diff --git a/net-analyzer/lilac/metadata.xml b/net-analyzer/lilac/metadata.xml deleted file mode 100644 index 74c2baebb4ec..000000000000 --- a/net-analyzer/lilac/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://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/linkchecker/Manifest b/net-analyzer/linkchecker/Manifest index ed397cd02a29..bcbda24cc7ec 100644 --- a/net-analyzer/linkchecker/Manifest +++ b/net-analyzer/linkchecker/Manifest @@ -1 +1,2 @@ -DIST linkchecker-10.0.0_pre20200729.tar.gz 401694 BLAKE2B f1a0918c30b292e569fd3168eee152e63ba7266f0ef848a55601e0205d8b0521cb653db77c8dc7b5d1140b493c95e50d76acba44e961586159f2b691e6898353 SHA512 35c49ca5de06688667e39f4eb0d8a048e565fe460a4aff125a484e3966c62cbea95fd95154cb2b544c0f4987f66012793726cf890d604321ed83970654a318f6 +DIST LinkChecker-10.2.1.tar.gz 545530 BLAKE2B ddbf22d9cdd04d89257b92d032cff24e4dde866b4be115f7b5b878bf2a42dd08159eef451b33ed621d747f06dffa445f4258975b932e5ae0eb8b79cfb8203549 SHA512 6410aff11e94cbf001979a85dd41e50daaa6a3577689d4256a0a5627a29253baef24ed7739dbafe91f58c0841923ac3094aa558e91f34629e3e6c008e461230a +DIST LinkChecker-10.3.0.tar.gz 542403 BLAKE2B 24420c7479909d3d19d8fce45cfb2f5712107705a409f7d407097002ce6c6bb534a62a388b3a8d01760db7ac4200adf1d7250868dbeb41ec8cf8489a1776266b SHA512 fbcc4d10418642d6f0c0146a50294fa3d872eb98b53c49081af5d5ac644f1280694ad1ef8f82f639526ba08f6f0ed754b316567dd12c4e5e98360ccee4634d16 diff --git a/net-analyzer/linkchecker/linkchecker-10.0.0_pre20200729.ebuild b/net-analyzer/linkchecker/linkchecker-10.0.0_pre20200729.ebuild deleted file mode 100644 index 69dd01691653..000000000000 --- a/net-analyzer/linkchecker/linkchecker-10.0.0_pre20200729.ebuild +++ /dev/null @@ -1,60 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{6..9} ) -PYTHON_REQ_USE="sqlite?" - -inherit bash-completion-r1 distutils-r1 optfeature - -DESCRIPTION="Check websites for broken links" -HOMEPAGE="https://github.com/linkcheck/linkchecker" - -if [[ "${PV}" == "9999" ]]; then - EGIT_REPO_URI="https://github.com/linkcheck/linkchecker.git" - inherit git-r3 -else - GIT_COMMIT="a977e4d7129450ba9fda8389724c80c1bde66883" - SRC_URI="https://github.com/linkchecker/linkchecker/archive/${GIT_COMMIT}.tar.gz -> ${P}.tar.gz" - S="${WORKDIR}/${PN}-${GIT_COMMIT}" - KEYWORDS="amd64 x86" -fi - -LICENSE="GPL-2" -SLOT="0" -IUSE="sqlite" -# requires py2 only libs -RESTRICT="test" - -RDEPEND=" - dev-python/beautifulsoup[${PYTHON_USEDEP}] - dev-python/dnspython[${PYTHON_USEDEP}] - dev-python/pyxdg[${PYTHON_USEDEP}] - dev-python/requests[${PYTHON_USEDEP}] -" - -python_prepare_all() { - local PATCHES=( - "${FILESDIR}/${PN}-9.3-bash-completion.patch" - ) - - distutils-r1_python_prepare_all -} - -python_install_all() { - local DOCS=( - doc/changelog.txt - doc/upgrading.txt - ) - distutils-r1_python_install_all - - newbashcomp config/linkchecker-completion ${PN} -} - -pkg_postinst() { - optfeature "bash-completion support" dev-python/argcomplete[${PYTHON_USEDEP}] - optfeature "Virus scanning" app-antivirus/clamav - optfeature "Geo IP support" dev-python/geoip-python[${PYTHON_USEDEP}] - optfeature "GNOME proxy settings support" dev-python/pygobject[${PYTHON_USEDEP}] -} diff --git a/net-analyzer/linkchecker/linkchecker-10.2.1.ebuild b/net-analyzer/linkchecker/linkchecker-10.2.1.ebuild new file mode 100644 index 000000000000..c378ed2caf78 --- /dev/null +++ b/net-analyzer/linkchecker/linkchecker-10.2.1.ebuild @@ -0,0 +1,67 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_REQ_USE="sqlite?" +DISTUTILS_USE_PEP517=hatchling +DISTUTILS_SINGLE_IMPL=1 + +inherit bash-completion-r1 distutils-r1 multiprocessing optfeature + +DESCRIPTION="Check websites for broken links" +HOMEPAGE="https://github.com/linkchecker/linkchecker" +SRC_URI="https://github.com/linkchecker/linkchecker/releases/download/v${PV}/LinkChecker-${PV}.tar.gz" +KEYWORDS="amd64 x86" + +LICENSE="GPL-2" +SLOT="0" +IUSE="sqlite" + +RDEPEND=" + $(python_gen_cond_dep ' + dev-python/beautifulsoup4[${PYTHON_USEDEP}] + dev-python/dnspython[${PYTHON_USEDEP}] + dev-python/requests[${PYTHON_USEDEP}] + ') +" +BDEPEND=" + test? ( + $(python_gen_cond_dep ' + app-text/pdfminer[${PYTHON_USEDEP}] + dev-python/parameterized[${PYTHON_USEDEP}] + dev-python/pyftpdlib[${PYTHON_USEDEP}] + dev-python/pyopenssl[${PYTHON_USEDEP}] + dev-python/pytest-xdist[${PYTHON_USEDEP}] + ') + sys-devel/gettext + ) +" + +distutils_enable_tests pytest + +PATCHES=( "${FILESDIR}/${PN}-9.3-bash-completion.patch" ) + +DOCS=( + doc/changelog.txt + doc/upgrading.txt +) + +python_test() { + # Telnet test uses miniboa which is not available in Gentoo + rm -f tests/checker/test_telnet.py + # Multiple warnings about unclosed test sockets with epytest + pytest -vra -n "$(makeopts_jobs)"|| die +} + +python_install_all() { + distutils-r1_python_install_all + newbashcomp config/linkchecker-completion ${PN} +} + +pkg_postinst() { + optfeature "Virus scanning" app-antivirus/clamav + optfeature "Check links in PDF files" app-text/pdfminer + optfeature "bash-completion support" dev-python/argcomplete +} diff --git a/net-analyzer/linkchecker/linkchecker-10.3.0.ebuild b/net-analyzer/linkchecker/linkchecker-10.3.0.ebuild new file mode 100644 index 000000000000..93e2b021cf4e --- /dev/null +++ b/net-analyzer/linkchecker/linkchecker-10.3.0.ebuild @@ -0,0 +1,67 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..12} ) +PYTHON_REQ_USE="sqlite?" +DISTUTILS_USE_PEP517=hatchling +DISTUTILS_SINGLE_IMPL=1 + +inherit bash-completion-r1 distutils-r1 multiprocessing optfeature + +MY_P=LinkChecker-${PV} +DESCRIPTION="Check websites for broken links" +HOMEPAGE="https://github.com/linkchecker/linkchecker" +SRC_URI="https://github.com/linkchecker/linkchecker/releases/download/v${PV}/${MY_P}.tar.gz" +S="${WORKDIR}/${MY_P}" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64 x86" +IUSE="sqlite" + +RDEPEND=" + $(python_gen_cond_dep ' + dev-python/beautifulsoup4[${PYTHON_USEDEP}] + dev-python/dnspython[${PYTHON_USEDEP}] + dev-python/requests[${PYTHON_USEDEP}] + ') +" +BDEPEND=" + test? ( + $(python_gen_cond_dep ' + app-text/pdfminer[${PYTHON_USEDEP}] + dev-python/parameterized[${PYTHON_USEDEP}] + dev-python/pyftpdlib[${PYTHON_USEDEP}] + dev-python/pyopenssl[${PYTHON_USEDEP}] + dev-python/pytest-xdist[${PYTHON_USEDEP}] + ') + sys-devel/gettext + ) +" + +distutils_enable_tests pytest + +PATCHES=( "${FILESDIR}/${PN}-9.3-bash-completion.patch" ) + +DOCS=( + doc/changelog.txt + doc/upgrading.txt +) + +python_test() { + # Multiple warnings about unclosed test sockets with epytest + pytest -vra -n "$(makeopts_jobs)" || die +} + +python_install_all() { + distutils-r1_python_install_all + newbashcomp config/linkchecker-completion ${PN} +} + +pkg_postinst() { + optfeature "Virus scanning" app-antivirus/clamav + optfeature "Check links in PDF files" app-text/pdfminer + optfeature "bash-completion support" dev-python/argcomplete +} diff --git a/net-analyzer/linkchecker/linkchecker-9999.ebuild b/net-analyzer/linkchecker/linkchecker-9999.ebuild deleted file mode 100644 index a476b327ae96..000000000000 --- a/net-analyzer/linkchecker/linkchecker-9999.ebuild +++ /dev/null @@ -1,58 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{6..9} ) -PYTHON_REQ_USE="sqlite?" - -inherit bash-completion-r1 distutils-r1 optfeature - -DESCRIPTION="Check websites for broken links" -HOMEPAGE="https://github.com/linkcheck/linkchecker" - -if [[ "${PV}" == "9999" ]]; then - EGIT_REPO_URI="https://github.com/linkcheck/linkchecker.git" - inherit git-r3 -else - SRC_URI="" - KEYWORDS="~amd64 ~x86" -fi - -LICENSE="GPL-2" -SLOT="0" -IUSE="sqlite" -# requires py2 only libs -RESTRICT="test" - -RDEPEND=" - dev-python/beautifulsoup[${PYTHON_USEDEP}] - dev-python/dnspython[${PYTHON_USEDEP}] - dev-python/pyxdg[${PYTHON_USEDEP}] - dev-python/requests[${PYTHON_USEDEP}] -" - -python_prepare_all() { - local PATCHES=( - "${FILESDIR}/${PN}-9.3-bash-completion.patch" - ) - - distutils-r1_python_prepare_all -} - -python_install_all() { - local DOCS=( - doc/changelog.txt - doc/upgrading.txt - ) - distutils-r1_python_install_all - - newbashcomp config/linkchecker-completion ${PN} -} - -pkg_postinst() { - optfeature "bash-completion support" dev-python/argcomplete[${PYTHON_USEDEP}] - optfeature "Virus scanning" app-antivirus/clamav - optfeature "Geo IP support" dev-python/geoip-python[${PYTHON_USEDEP}] - optfeature "GNOME proxy settings support" dev-python/pygobject[${PYTHON_USEDEP}] -} diff --git a/net-analyzer/linkchecker/metadata.xml b/net-analyzer/linkchecker/metadata.xml index 34057dbac2ab..6904bacfa7cb 100644 --- a/net-analyzer/linkchecker/metadata.xml +++ b/net-analyzer/linkchecker/metadata.xml @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> + <maintainer type="person" proxied="yes"> <email>hydrapolic@gmail.com</email> <name>Tomáš Mózes</name> </maintainer> - <maintainer type="project"> + <maintainer type="project" proxied="proxy"> <email>proxy-maint@gentoo.org</email> <name>Proxy Maintainers</name> </maintainer> diff --git a/net-analyzer/macchanger/macchanger-1.7.0_p5_p4-r2.ebuild b/net-analyzer/macchanger/macchanger-1.7.0_p5_p4-r2.ebuild new file mode 100644 index 000000000000..5ec79a35f5a7 --- /dev/null +++ b/net-analyzer/macchanger/macchanger-1.7.0_p5_p4-r2.ebuild @@ -0,0 +1,49 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DESCRIPTION="Utility for viewing/manipulating the MAC address of network interfaces" +OUI_DATE="20091029" # Generated with tools/IEEE_OUI.py in the source +OUI_FILE="OUI.list-${OUI_DATE}" +HOMEPAGE="https://github.com/alobbs/macchanger" +SRC_URI=" + https://github.com/alobbs/macchanger/releases/download/${PV/_p*}/${P/_p*}.tar.gz + 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" +SLOT="0" +IUSE="split-usr" + +PATCHES=( + "${FILESDIR}"/${PN}-1.7.0-fix-caddr_t.patch + "${WORKDIR}"/debian/patches/02-fix_usage_message.patch + "${WORKDIR}"/debian/patches/06-update_OUI_list.patch + "${WORKDIR}"/debian/patches/08-fix_random_MAC_choice.patch + "${WORKDIR}"/debian/patches/check-random-device-read-errors.patch + "${WORKDIR}"/debian/patches/verify-changed-MAC.patch + +) +S=${WORKDIR}/${P/_p*} + +src_configure() { + # Shared data is installed below /lib, see Bug #57046 + econf \ + --bindir="${EPREFIX}/sbin" \ + --datadir="${EPREFIX}/lib" +} + +src_install() { + default + + newdoc "${WORKDIR}"/debian/changelog debian.changelog + + # Can cleanup a while after bug #889922 is fixed + if use split-usr ; then + dodir /usr/bin + dosym -r /sbin/macchanger /usr/bin/macchanger + fi + + dosym ../../lib/macchanger /usr/share/macchanger +} 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 new file mode 100644 index 000000000000..3797d8ce8d40 --- /dev/null +++ b/net-analyzer/macchanger/macchanger-1.7.0_p5_p4-r3.ebuild @@ -0,0 +1,42 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DESCRIPTION="Utility for viewing/manipulating the MAC address of network interfaces" +OUI_DATE="20091029" # Generated with tools/IEEE_OUI.py in the source +OUI_FILE="OUI.list-${OUI_DATE}" +HOMEPAGE="https://github.com/alobbs/macchanger" +SRC_URI=" + https://github.com/alobbs/macchanger/releases/download/${PV/_p*}/${P/_p*}.tar.gz + 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" +SLOT="0" + +PATCHES=( + "${FILESDIR}"/${PN}-1.7.0-fix-caddr_t.patch + "${WORKDIR}"/debian/patches/02-fix_usage_message.patch + "${WORKDIR}"/debian/patches/06-update_OUI_list.patch + "${WORKDIR}"/debian/patches/08-fix_random_MAC_choice.patch + "${WORKDIR}"/debian/patches/check-random-device-read-errors.patch + "${WORKDIR}"/debian/patches/verify-changed-MAC.patch + +) +S=${WORKDIR}/${P/_p*} + +src_configure() { + # Shared data is installed below /lib, see Bug #57046 + econf \ + --bindir="${EPREFIX}/sbin" \ + --datadir="${EPREFIX}/lib" +} + +src_install() { + default + + newdoc "${WORKDIR}"/debian/changelog debian.changelog + + dosym ../../lib/macchanger /usr/share/macchanger +} diff --git a/net-analyzer/macchanger/macchanger-1.7.0_p5_p4.ebuild b/net-analyzer/macchanger/macchanger-1.7.0_p5_p4.ebuild deleted file mode 100644 index 93a8476bcb30..000000000000 --- a/net-analyzer/macchanger/macchanger-1.7.0_p5_p4.ebuild +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DESCRIPTION="Utility for viewing/manipulating the MAC address of network interfaces" -OUI_DATE="20091029" # Generated with tools/IEEE_OUI.py in the source -OUI_FILE="OUI.list-${OUI_DATE}" -HOMEPAGE="https://github.com/alobbs/macchanger" -SRC_URI=" - https://github.com/alobbs/macchanger/releases/download/${PV/_p*}/${P/_p*}.tar.gz - 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 sparc x86" -SLOT="0" - -PATCHES=( - "${FILESDIR}"/${PN}-1.7.0-fix-caddr_t.patch - "${WORKDIR}"/debian/patches/02-fix_usage_message.patch - "${WORKDIR}"/debian/patches/06-update_OUI_list.patch - "${WORKDIR}"/debian/patches/08-fix_random_MAC_choice.patch - "${WORKDIR}"/debian/patches/check-random-device-read-errors.patch - "${WORKDIR}"/debian/patches/verify-changed-MAC.patch - -) -S=${WORKDIR}/${P/_p*} - -src_configure() { - # Shared data is installed below /lib, see Bug #57046 - econf \ - --bindir="${EPREFIX}/sbin" \ - --datadir="${EPREFIX}/lib" -} - -src_install() { - default - - newdoc "${WORKDIR}"/debian/changelog debian.changelog - - dodir /usr/bin - dosym ../../sbin/macchanger /usr/bin/macchanger - dosym ../../lib/macchanger /usr/share/macchanger -} diff --git a/net-analyzer/macchanger/metadata.xml b/net-analyzer/macchanger/metadata.xml index 27fa81884460..d7c1ebb0a46c 100644 --- a/net-analyzer/macchanger/metadata.xml +++ b/net-analyzer/macchanger/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> <email>robbat2@gentoo.org</email> diff --git a/net-analyzer/masscan/Manifest b/net-analyzer/masscan/Manifest index 29f988e17eb1..dc829a5d3237 100644 --- a/net-analyzer/masscan/Manifest +++ b/net-analyzer/masscan/Manifest @@ -1,3 +1 @@ -DIST masscan-1.0.4.tar.gz 343513 BLAKE2B e50789c8a2246c4109990e93c9c53cf68b2b555955f675e1a9acd4074c2b85773aba58f3644db1f98a88c4cff85cff5a9035f2fbc56978103458dc34e6dc353a SHA512 eb82d8ad4d6a5c77cf79197e18470a68f7c361f0785180d631e9625578e90af6ffdaa45b728349da5a1cb945a8f902541b8f708be8a4075737ccb06e948d6e2b -DIST masscan-1.0.5.tar.gz 353901 BLAKE2B 83145955b42f660788fdd7687b0a88ad84d6f31a4f99fc1fe4691f266f3c3492882334d9f0b4acf3c31d33950daedda56b6623cd3ba6ef9a27914613f09d485b SHA512 55d58234994ebea10bcb3f45a24cdb51b020350faa116aee3a48861a119f66c339d1f533c978f52e37ccf5266be6fd2802765f13461d94eb28ec8d18c68e2f88 -DIST masscan-1.3.0.tar.gz 451097 BLAKE2B 1d64a80345aa18cc0fdd00b5fca6708bcabded62571887e7171f6ac9e9f77f6d9f5bcca9c0ee04f67fcdf3ead1d6b242dc5129c6c9a94e560ac5380904a5a02a SHA512 dbf489d1fb1c882873071073ef8e65723bf3b805c794a5d13dfdcea539558f049845b5bc02ada1e313729954fe7ba29be727a777937b8e4d41778c9175d13824 +DIST masscan-1.3.2.tar.gz 463449 BLAKE2B 5509027c00871b2242e419ab7cf3f775d7ee46e1882a27c52447ca442432712d742c686acbf4daa7307b791da06effa23b8790fc0561a42a4e8ed4c2f0be7713 SHA512 b0709f6f937a0e86c6913407c3bc60187074395ffff7a7a2bb54b23824d72982510e44fb1b1e7dcba85c4ad25ab1a623597661db43d9046165ba865cd9bd5b27 diff --git a/net-analyzer/masscan/masscan-1.0.4.ebuild b/net-analyzer/masscan/masscan-1.0.4.ebuild deleted file mode 100644 index fda9eec41325..000000000000 --- a/net-analyzer/masscan/masscan-1.0.4.ebuild +++ /dev/null @@ -1,41 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit toolchain-funcs - -DESCRIPTION="Mass IP port scanner" -HOMEPAGE="https://github.com/robertdavidgraham/masscan" -SRC_URI="https://github.com/robertdavidgraham/masscan/archive/${PV}.tar.gz -> ${P}.tar.gz" - -SLOT="0" -LICENSE="AGPL-3" -KEYWORDS="~amd64 ~x86" - -RDEPEND="net-libs/libpcap" - -src_prepare() { - default - - sed -i \ - -e '/$(CC)/s!$(CFLAGS)!$(LDFLAGS) $(CFLAGS)!g' \ - -e '/^GITVER :=/s!= .(.*!=!g' \ - -e '/^SYS/s|gcc|$(CC)|g' \ - -e '/^CFLAGS =/{s,=,+=,;s,-g -ggdb,,;s,-O3,,;}' \ - Makefile || die - - tc-export CC -} - -src_install() { - dobin bin/masscan - - insinto /etc/masscan - doins data/exclude.conf - doins "${FILESDIR}"/masscan.conf - - mv doc/bot.{hml,html} || die - dodoc doc/bot.html *.md - - doman doc/masscan.8 -} diff --git a/net-analyzer/masscan/masscan-1.0.5.ebuild b/net-analyzer/masscan/masscan-1.0.5.ebuild deleted file mode 100644 index 96cf9afa0476..000000000000 --- a/net-analyzer/masscan/masscan-1.0.5.ebuild +++ /dev/null @@ -1,41 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit toolchain-funcs - -DESCRIPTION="Mass IP port scanner" -HOMEPAGE="https://github.com/robertdavidgraham/masscan" -SRC_URI="https://github.com/robertdavidgraham/masscan/archive/${PV}.tar.gz -> ${P}.tar.gz" - -SLOT="0" -LICENSE="AGPL-3" -KEYWORDS="~amd64 ~x86" - -RDEPEND="net-libs/libpcap" - -src_prepare() { - default - - sed -i \ - -e '/$(CC)/s!$(CFLAGS)!$(LDFLAGS) $(CFLAGS)!g' \ - -e '/^GITVER :=/s!= .(.*!=!g' \ - -e '/^SYS/s|gcc|$(CC)|g' \ - -e '/^CFLAGS =/{s,=,+=,;s,-g -ggdb,,;s,-O3,,;}' \ - -e '/^CC =/d' \ - Makefile || die - - tc-export CC -} - -src_install() { - dobin bin/masscan - - insinto /etc/masscan - doins data/exclude.conf - doins "${FILESDIR}"/masscan.conf - - dodoc doc/bot.html *.md - - doman doc/masscan.8 -} diff --git a/net-analyzer/masscan/masscan-1.3.0.ebuild b/net-analyzer/masscan/masscan-1.3.2.ebuild index 6a290f96f458..6a290f96f458 100644 --- a/net-analyzer/masscan/masscan-1.3.0.ebuild +++ b/net-analyzer/masscan/masscan-1.3.2.ebuild diff --git a/net-analyzer/masscan/metadata.xml b/net-analyzer/masscan/metadata.xml index 0009b85ef1f3..f43206ae9b97 100644 --- a/net-analyzer/masscan/metadata.xml +++ b/net-analyzer/masscan/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> <email>robbat2@gentoo.org</email> diff --git a/net-analyzer/mbrowse/mbrowse-0.4.3-r1.ebuild b/net-analyzer/mbrowse/mbrowse-0.4.3-r1.ebuild index e19a12d41812..4c72d7daca60 100644 --- a/net-analyzer/mbrowse/mbrowse-0.4.3-r1.ebuild +++ b/net-analyzer/mbrowse/mbrowse-0.4.3-r1.ebuild @@ -1,7 +1,8 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 + inherit autotools DESCRIPTION="MBrowse is a graphical MIB browser" @@ -21,6 +22,7 @@ DEPEND=" RDEPEND="${DEPEND}" DOCS=( AUTHORS README ChangeLog ) + PATCHES=( "${FILESDIR}"/${PN}-0.4.3-flags.patch "${FILESDIR}"/${PN}-0.4.3-fno-common.patch @@ -32,6 +34,5 @@ src_prepare() { } src_configure() { - econf \ - --with-snmp-lib="${EPREFIX}/usr/$(get_libdir)" + econf --with-snmp-lib="${EPREFIX}/usr/$(get_libdir)" } diff --git a/net-analyzer/mbrowse/metadata.xml b/net-analyzer/mbrowse/metadata.xml index 600ef9a54661..89fe5c5b52d8 100644 --- a/net-analyzer/mbrowse/metadata.xml +++ b/net-analyzer/mbrowse/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>netmon@gentoo.org</email> diff --git a/net-analyzer/mdns-scan/mdns-scan-0.5.ebuild b/net-analyzer/mdns-scan/mdns-scan-0.5.ebuild index 7bfcea86d3db..4f83216b0ca3 100644 --- a/net-analyzer/mdns-scan/mdns-scan-0.5.ebuild +++ b/net-analyzer/mdns-scan/mdns-scan-0.5.ebuild @@ -1,4 +1,4 @@ -# Copyright 2019 Gentoo Authors +# Copyright 2019-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -12,10 +12,6 @@ SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="" -DEPEND="" -RDEPEND="${DEPEND}" -BDEPEND="" - src_prepare() { sed -i "s#-Wall -W -g -O0 -pipe#${CFLAGS} ${LDFLAGS}#" Makefile sed -i "s#-o #${CFLAGS} ${LDFLAGS} -o #" Makefile diff --git a/net-analyzer/mdns-scan/metadata.xml b/net-analyzer/mdns-scan/metadata.xml index f4c696b2c619..a0fddf470150 100644 --- a/net-analyzer/mdns-scan/metadata.xml +++ b/net-analyzer/mdns-scan/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> <name>Rick Farina</name> diff --git a/net-analyzer/metadata.xml b/net-analyzer/metadata.xml index 58f5863c9fea..a1913be1786e 100644 --- a/net-analyzer/metadata.xml +++ b/net-analyzer/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE catmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE catmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <catmetadata> <longdescription lang="en"> The net-analyzer category contains network analysis software. @@ -29,4 +29,3 @@ Kategoria net-analyzer zawiera programy do analizowania sieci. </longdescription> </catmetadata> - diff --git a/net-analyzer/monitoring-plugins/Manifest b/net-analyzer/monitoring-plugins/Manifest index 8576df0da903..545a0d98a9f7 100644 --- a/net-analyzer/monitoring-plugins/Manifest +++ b/net-analyzer/monitoring-plugins/Manifest @@ -1 +1,2 @@ -DIST monitoring-plugins-2.2.tar.gz 2461548 BLAKE2B 0f68b492e089c6dfd09db6aab78ab4490f2e8983677c70dda4c3800a06380c066865587536a44f135d0e314006ed81a757cbfbd918f53e009f9d2c50b8e58db0 SHA512 5f8cfa132891d6d96e69bee3f2c26f7d4546f572be6a18f25ea5d9069f162cb2e424361289a5c26bec60d7b63d28a269437fd6f25645903a1c142fdcbbf77f27 +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/define-own-mysql-port-constant.patch b/net-analyzer/monitoring-plugins/files/define-own-mysql-port-constant.patch deleted file mode 100644 index b7406bc9af80..000000000000 --- a/net-analyzer/monitoring-plugins/files/define-own-mysql-port-constant.patch +++ /dev/null @@ -1,102 +0,0 @@ -From d6bd787123aa9ccd96edec8286ec22dd0442c620 Mon Sep 17 00:00:00 2001 -From: Michael Orlitzky <michael@orlitzky.com> -Date: Fri, 27 Oct 2017 07:58:43 -0400 -Subject: [PATCH 1/3] plugins/check_mysql*.c: define our own default MySQL - port. - -The MYSQL_PORT constant used to be defined in mysql.h, and was used as -the default port in the two plugins check_mysql and check_mysql_query. -Now that mysql.h no longer defines that constant, our plugins fail to -build against newer versions of MySQL and MariaDB. - -Since MYSQL_PORT used the "default port" on the local system, it -actually was not the best choice as the default for the check plugins: -when monitoring remote MySQL servers, the usual default of 3306 is -more likely to be correct than whatever the local server happens to be -listening on. - -As a result, we fix the issue by defining our own constant, called -CHECK_PORT_DEFAULT, as "3306" at the top of both check_mysql.c and -check_mysql_query.c. The existing uses of MYSQL_PORT have been changed -to use the new CHECK_PORT_DEFAULT. - -This change is backwards-incompatible: any users who compiled in a -MYSQL_PORT other than 3306 and who were running their checks on the -same server as the database will now need to specify that port -explicitly. - -Closes: https://github.com/monitoring-plugins/monitoring-plugins/issues/1508 ---- - plugins/check_mysql.c | 8 ++++++-- - plugins/check_mysql_query.c | 8 ++++++-- - 2 files changed, 12 insertions(+), 4 deletions(-) - -diff --git a/plugins/check_mysql.c b/plugins/check_mysql.c -index 5773afd9..c44919d0 100644 ---- a/plugins/check_mysql.c -+++ b/plugins/check_mysql.c -@@ -36,6 +36,10 @@ const char *email = "devel@monitoring-plugins.org"; - - #define SLAVERESULTSIZE 70 - -+/* The default port that MySQL servers listen on. */ -+#define CHECK_PORT_DEFAULT 3306 -+ -+ - #include "common.h" - #include "utils.h" - #include "utils_base.h" -@@ -58,7 +62,7 @@ char *ciphers = NULL; - bool ssl = false; - char *opt_file = NULL; - char *opt_group = NULL; --unsigned int db_port = MYSQL_PORT; -+unsigned int db_port = CHECK_PORT_DEFAULT; - int check_slave = 0, warn_sec = 0, crit_sec = 0; - int ignore_auth = 0; - int verbose = 0; -@@ -505,7 +509,7 @@ void - print_help (void) - { - char *myport; -- xasprintf (&myport, "%d", MYSQL_PORT); -+ xasprintf (&myport, "%d", CHECK_PORT_DEFAULT); - - print_revision (progname, NP_VERSION); - -diff --git a/plugins/check_mysql_query.c b/plugins/check_mysql_query.c -index 49a14dd3..6f492442 100644 ---- a/plugins/check_mysql_query.c -+++ b/plugins/check_mysql_query.c -@@ -33,6 +33,10 @@ const char *progname = "check_mysql_query"; - const char *copyright = "1999-2007"; - const char *email = "devel@monitoring-plugins.org"; - -+/* The default port that MySQL servers listen on. */ -+#define CHECK_PORT_DEFAULT 3306 -+ -+ - #include "common.h" - #include "utils.h" - #include "utils_base.h" -@@ -48,7 +52,7 @@ char *db_pass = NULL; - char *db = NULL; - char *opt_file = NULL; - char *opt_group = NULL; --unsigned int db_port = MYSQL_PORT; -+unsigned int db_port = CHECK_PORT_DEFAULT; - - int process_arguments (int, char **); - int validate_arguments (void); -@@ -299,7 +303,7 @@ void - print_help (void) - { - char *myport; -- xasprintf (&myport, "%d", MYSQL_PORT); -+ xasprintf (&myport, "%d", CHECK_PORT_DEFAULT); - - print_revision (progname, NP_VERSION); - --- -2.13.6 - 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 new file mode 100644 index 000000000000..34e539f51e2d --- /dev/null +++ b/net-analyzer/monitoring-plugins/files/monitoring-plugins-fix-check-http-segfault.patch @@ -0,0 +1,23 @@ +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 new file mode 100644 index 000000000000..00415f0b7111 --- /dev/null +++ b/net-analyzer/monitoring-plugins/files/monitoring-plugins-gnutls.patch @@ -0,0 +1,21 @@ +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 654cb6c8c64d..37237fb7544c 100644 --- a/net-analyzer/monitoring-plugins/metadata.xml +++ b/net-analyzer/monitoring-plugins/metadata.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> + <maintainer type="person" proxied="yes"> <email>hydrapolic@gmail.com</email> <name>Tomas Mozes</name> </maintainer> @@ -9,7 +9,7 @@ <email>mjo@gentoo.org</email> <name>Michael Orlitzky</name> </maintainer> - <maintainer type="project"> + <maintainer type="project" proxied="proxy"> <email>proxy-maint@gentoo.org</email> <name>Proxy Maintainers</name> </maintainer> @@ -36,4 +36,7 @@ values. Disabling the flag does not remove any plugins. </flag> </use> + <upstream> + <remote-id type="github">monitoring-plugins/monitoring-plugins</remote-id> + </upstream> </pkgmetadata> diff --git a/net-analyzer/monitoring-plugins/monitoring-plugins-2.2-r2.ebuild b/net-analyzer/monitoring-plugins/monitoring-plugins-2.2-r2.ebuild deleted file mode 100644 index 3670a8df9283..000000000000 --- a/net-analyzer/monitoring-plugins/monitoring-plugins-2.2-r2.ebuild +++ /dev/null @@ -1,104 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit eutils flag-o-matic multilib user - -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="gnutls ipv6 ldap libressl 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 - ldap? ( net-nds/openldap ) - mysql? ( virtual/mysql ) - postgres? ( dev-db/postgresql:= ) - ssl? ( - !gnutls? ( - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:= ) - ) - 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? ( net-misc/openssh ) - snmp? ( dev-perl/Net-SNMP - net-analyzer/net-snmp[-minimal] )" - -# Basically everything collides with nagios-plugins. -RDEPEND="${DEPEND} - !net-analyzer/nagios-plugins" - -# At least one test is interactive. -RESTRICT="test" - -PATCHES=( "${FILESDIR}/define-own-mysql-port-constant.patch" ) - -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. - myconf+=( --with-ping-command="/bin/ping -n -U -w %d -c %d %s" ) - - if use ipv6; then - myconf+=( --with-ping6-command="/bin/ping6 -n -U -w %d -c %d %s" ) - fi - - econf \ - $(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_preinst() { - enewgroup nagios - enewuser nagios -1 /bin/bash /var/nagios/home nagios -} - -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.2-r3.ebuild b/net-analyzer/monitoring-plugins/monitoring-plugins-2.2-r3.ebuild deleted file mode 100644 index cf357d910b21..000000000000 --- a/net-analyzer/monitoring-plugins/monitoring-plugins-2.2-r3.ebuild +++ /dev/null @@ -1,104 +0,0 @@ -# Copyright 1999-2018 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit eutils flag-o-matic multilib user - -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="gnutls ipv6 ldap libressl 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 - ldap? ( net-nds/openldap ) - mysql? ( dev-db/mysql-connector-c:= ) - postgres? ( dev-db/postgresql:= ) - ssl? ( - !gnutls? ( - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:= ) - ) - 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? ( net-misc/openssh ) - snmp? ( dev-perl/Net-SNMP - net-analyzer/net-snmp[-minimal] )" - -# Basically everything collides with nagios-plugins. -RDEPEND="${DEPEND} - !net-analyzer/nagios-plugins" - -# At least one test is interactive. -RESTRICT="test" - -PATCHES=( "${FILESDIR}/define-own-mysql-port-constant.patch" ) - -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. - myconf+=( --with-ping-command="/bin/ping -n -U -w %d -c %d %s" ) - - if use ipv6; then - myconf+=( --with-ping6-command="/bin/ping6 -n -U -w %d -c %d %s" ) - fi - - econf \ - $(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_preinst() { - enewgroup nagios - enewuser nagios -1 /bin/bash /var/nagios/home nagios -} - -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.2-r4.ebuild b/net-analyzer/monitoring-plugins/monitoring-plugins-2.2-r4.ebuild deleted file mode 100644 index 405873b347c7..000000000000 --- a/net-analyzer/monitoring-plugins/monitoring-plugins-2.2-r4.ebuild +++ /dev/null @@ -1,104 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit eutils flag-o-matic multilib user - -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="gnutls ipv6 ldap libressl 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 - ldap? ( net-nds/openldap ) - mysql? ( dev-db/mysql-connector-c:= ) - postgres? ( dev-db/postgresql:= ) - ssl? ( - !gnutls? ( - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:= ) - ) - 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? ( net-misc/openssh ) - snmp? ( dev-perl/Net-SNMP - net-analyzer/net-snmp[-minimal] )" - -# Basically everything collides with nagios-plugins. -RDEPEND="${DEPEND} - !net-analyzer/nagios-plugins" - -# At least one test is interactive. -RESTRICT="test" - -PATCHES=( "${FILESDIR}/define-own-mysql-port-constant.patch" ) - -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. - myconf+=( --with-ping-command="/bin/ping -4 -n -U -w %d -c %d %s" ) - - if use ipv6; then - myconf+=( --with-ping6-command="/bin/ping -6 -n -U -w %d -c %d %s" ) - fi - - econf \ - $(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_preinst() { - enewgroup nagios - enewuser nagios -1 /bin/bash /var/nagios/home nagios -} - -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.3-r2.ebuild b/net-analyzer/monitoring-plugins/monitoring-plugins-2.3.3-r2.ebuild new file mode 100644 index 000000000000..e364f28aa4cc --- /dev/null +++ b/net-analyzer/monitoring-plugins/monitoring-plugins-2.3.3-r2.ebuild @@ -0,0 +1,110 @@ +# 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 new file mode 100644 index 000000000000..c09500eb8d38 --- /dev/null +++ b/net-analyzer/monitoring-plugins/monitoring-plugins-2.3.5.ebuild @@ -0,0 +1,105 @@ +# 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" + +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/mping/metadata.xml b/net-analyzer/mping/metadata.xml index 583e01eed1e7..af8bcc27caa3 100644 --- a/net-analyzer/mping/metadata.xml +++ b/net-analyzer/mping/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>netmon@gentoo.org</email> diff --git a/net-analyzer/mping/mping-2.01.ebuild b/net-analyzer/mping/mping-2.01.ebuild index 3133eb907421..7a8b952a08c5 100644 --- a/net-analyzer/mping/mping-2.01.ebuild +++ b/net-analyzer/mping/mping-2.01.ebuild @@ -1,8 +1,7 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 -inherit eutils +EAPI=7 DESCRIPTION="IPv4/6 round-robin multiping client" HOMEPAGE="http://mping.uninett.no" @@ -12,8 +11,6 @@ LICENSE="GPL-2" SLOT="0" KEYWORDS="amd64 ppc ppc64 sparc x86" -DOCS=( AUTHORS ChangeLog NEWS README TODO ) - -src_prepare() { - epatch "${FILESDIR}"/${P}-RFC3542.patch -} +PATCHES=( + "${FILESDIR}"/${P}-RFC3542.patch +) diff --git a/net-analyzer/mrtg-ping-probe/metadata.xml b/net-analyzer/mrtg-ping-probe/metadata.xml index 74c2baebb4ec..dce3f3be66c0 100644 --- a/net-analyzer/mrtg-ping-probe/metadata.xml +++ b/net-analyzer/mrtg-ping-probe/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>netmon@gentoo.org</email> diff --git a/net-analyzer/mrtg-ping-probe/mrtg-ping-probe-2.2.0-r1.ebuild b/net-analyzer/mrtg-ping-probe/mrtg-ping-probe-2.2.0-r1.ebuild new file mode 100644 index 000000000000..12267a6386cc --- /dev/null +++ b/net-analyzer/mrtg-ping-probe/mrtg-ping-probe-2.2.0-r1.ebuild @@ -0,0 +1,33 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DESCRIPTION="Addon mrtg contrib for stats ping/loss packets" +HOMEPAGE="http://pwo.de/projects/mrtg/" +SRC_URI="ftp://ftp.pwo.de/pub/pwo/mrtg/${PN}/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~x86" + +BDEPEND="dev-lang/perl" +RDEPEND=" + net-analyzer/mrtg +" + +src_prepare() { + default + sed -i check-ping-fmt \ + -e 's:#!/usr/local/bin/perl -w:#!/usr/bin/perl -w:' \ + || die + sed -i mrtg-ping-probe \ + -e 's:#!/bin/perl:#!/usr/bin/perl:' \ + || die +} + +src_install() { + dodoc ChangeLog NEWS README TODO mrtg.cfg-ping + doman mrtg-ping-probe.1 + dobin check-ping-fmt mrtg-ping-probe "${FILESDIR}"/mrtg-ping-cfg +} diff --git a/net-analyzer/mrtg-ping-probe/mrtg-ping-probe-2.2.0.ebuild b/net-analyzer/mrtg-ping-probe/mrtg-ping-probe-2.2.0.ebuild deleted file mode 100644 index 98d1db01c9ce..000000000000 --- a/net-analyzer/mrtg-ping-probe/mrtg-ping-probe-2.2.0.ebuild +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -DESCRIPTION="Addon mrtg contrib for stats ping/loss packets" -SRC_URI="ftp://ftp.pwo.de/pub/pwo/mrtg/${PN}/${P}.tar.gz" -HOMEPAGE="http://pwo.de/projects/mrtg/" - -KEYWORDS="~x86" -LICENSE="GPL-2" -SLOT="0" - -DEPEND="dev-lang/perl" -RDEPEND=" - ${DEPEND} - net-analyzer/mrtg -" - -src_prepare() { - sed -i check-ping-fmt \ - -e 's:#!/usr/local/bin/perl -w:#!/usr/bin/perl -w:' \ - || die - sed -i mrtg-ping-probe \ - -e 's:#!/bin/perl:#!/usr/bin/perl:' \ - || die -} - -src_install() { - dodoc ChangeLog NEWS README TODO mrtg.cfg-ping - doman mrtg-ping-probe.1 - dobin check-ping-fmt mrtg-ping-probe "${FILESDIR}"/mrtg-ping-cfg -} diff --git a/net-analyzer/mrtg/Manifest b/net-analyzer/mrtg/Manifest index 5e45e92440e8..6a206f519059 100644 --- a/net-analyzer/mrtg/Manifest +++ b/net-analyzer/mrtg/Manifest @@ -1 +1 @@ -DIST mrtg-2.17.7.tar.gz 1098650 BLAKE2B f8191296fc163b950792b8ecee773cfe643a7390d49444ce8b5012b2dbd932093cb4f71745ba2c86bda579fbcd3c73a4f9cebc1fa4e7f791a7b4461ae92ac191 SHA512 b25ab38416213bc5128612724530f36f4a855bb66a65f8bbe4bdafef05d2688eed68f5c3df1e13193102507a4114e71ec226ad32dd6b4d3ae2e2291320d8e768 +DIST mrtg-2.17.10.tar.gz 1084792 BLAKE2B a2e69c651a1428514fbe1f4d04cbddde9c7ed3b865d57f204814ec797dabd414c16b03d34bd19a005257938dd9bd2de0e99f641222f240c907fa5f67429710f1 SHA512 b1c5232f1b3dcec39adc4fb5a423738f9470ad470e91c6a918cf3f875e71af263d8e03694c3d66129b2653fa498d8d9d9b95349fe90e9d2e0b3ed6c09d06e080 diff --git a/net-analyzer/mrtg/metadata.xml b/net-analyzer/mrtg/metadata.xml index 74c2baebb4ec..dfef87e6bc6a 100644 --- a/net-analyzer/mrtg/metadata.xml +++ b/net-analyzer/mrtg/metadata.xml @@ -1,8 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!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> + <maintainer type="project"> + <email>netmon@gentoo.org</email> + <name>Gentoo network monitoring and analysis project</name> + </maintainer> + <upstream> + <remote-id type="github">oetiker/mrtg</remote-id> + </upstream> </pkgmetadata> diff --git a/net-analyzer/mrtg/mrtg-2.17.10.ebuild b/net-analyzer/mrtg/mrtg-2.17.10.ebuild new file mode 100644 index 000000000000..3884adeb3802 --- /dev/null +++ b/net-analyzer/mrtg/mrtg-2.17.10.ebuild @@ -0,0 +1,45 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DESCRIPTION="A tool to monitor the traffic load on network-links" +HOMEPAGE="https://oss.oetiker.ch/mrtg/" +SRC_URI="https://oss.oetiker.ch/mrtg/pub/${P}.tar.gz https://github.com/oetiker/mrtg/releases/download/v${PV}/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha amd64 ~arm ~hppa ppc ppc64 sparc x86" +IUSE="selinux" + +DEPEND="dev-lang/perl + >=dev-perl/SNMP_Session-1.13-r2 + >=dev-perl/Socket6-0.23 + media-libs/gd[png]" +RDEPEND="${DEPEND} + selinux? ( sec-policy/selinux-mrtg )" + +PATCHES=( + "${FILESDIR}"/${PN}-2.17.4-socket6.patch +) + +src_prepare() { + default + + rm ./lib/mrtg2/{SNMP_{Session,util},BER}.pm || die + + sed -i \ + -e 's|main::SL}lib${main::SL|main::SL}'"$(get_libdir)"'${main::SL|g' \ + $(find bin -type f) contrib/cfgmaker_dlci/cfgmaker_dlci || die +} + +src_install() { + keepdir /var/lib/mrtg + + default + + mv "${ED}"/usr/share/doc/{mrtg2,${PF}} || die + + newinitd "${FILESDIR}/mrtg.rc" ${PN} + newconfd "${FILESDIR}/mrtg.confd" ${PN} +} diff --git a/net-analyzer/mrtg/mrtg-2.17.7.ebuild b/net-analyzer/mrtg/mrtg-2.17.7.ebuild deleted file mode 100644 index 0f9883018fc0..000000000000 --- a/net-analyzer/mrtg/mrtg-2.17.7.ebuild +++ /dev/null @@ -1,49 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit multilib - -DESCRIPTION="A tool to monitor the traffic load on network-links" -HOMEPAGE="https://oss.oetiker.ch/mrtg/" -SRC_URI="https://oss.oetiker.ch/mrtg/pub/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~hppa ppc ppc64 sparc x86" -IUSE="selinux" - -DEPEND=" - >=dev-perl/SNMP_Session-1.13-r2 - >=dev-perl/Socket6-0.23 - dev-lang/perl - media-libs/gd[png] -" -RDEPEND=" - ${DEPEND} - selinux? ( sec-policy/selinux-mrtg ) -" -PATCHES=( - "${FILESDIR}"/${PN}-2.17.4-socket6.patch -) - -src_prepare() { - rm ./lib/mrtg2/{SNMP_{Session,util},BER}.pm || die - - sed -i \ - -e 's|main::SL}lib${main::SL|main::SL}'"$(get_libdir)"'${main::SL|g' \ - $(find bin -type f) contrib/cfgmaker_dlci/cfgmaker_dlci || die - - default -} - -src_install() { - keepdir /var/lib/mrtg - - default - - mv "${ED}"/usr/share/doc/{mrtg2,${PF}} || die - - newinitd "${FILESDIR}/mrtg.rc" ${PN} - newconfd "${FILESDIR}/mrtg.confd" ${PN} -} diff --git a/net-analyzer/mtr/Manifest b/net-analyzer/mtr/Manifest index 69472acc09a0..056c1c39aa39 100644 --- a/net-analyzer/mtr/Manifest +++ b/net-analyzer/mtr/Manifest @@ -1 +1 @@ -DIST mtr-0.94.tar.gz 143616 BLAKE2B e9b4619a85a515d729f0987d5882fb91e4bfa3be82476efbfdb832d0b13ed334be1c1a1bcf8ab4ca820002e79ca4a24d0b50f2739d9284b7dec0b8852a1a91e0 SHA512 0e58bd79562ff80f9308135562ab22aa1f1eea686aefd3aef07bac05e661e34b60fde7c66c96bf4f0919f546376fbd6106ecd8fa92328c24f6f903097496bf11 +DIST mtr-0.95.tar.gz 144541 BLAKE2B 3c972675b97945b96562802c5d0f10de963160682c93c0ea2991b72eca33d136d18948c5e746ca3dfb280ebc9c3ab154e7774f8409ed4e5f7470a8feb128e71b SHA512 a7d69e0c551a10ae80a650a34588119e6c6b124a8c2c93d3de29e5daa6ef99f9217d875529d443c3760cd6fd7bd04d1e9abe33ef12635826c66a98bd776c1690 diff --git a/net-analyzer/mtr/files/mtr-0.88-tinfo.patch b/net-analyzer/mtr/files/mtr-0.88-tinfo.patch index c7252b74435e..fb50c7e9a0b3 100644 --- a/net-analyzer/mtr/files/mtr-0.88-tinfo.patch +++ b/net-analyzer/mtr/files/mtr-0.88-tinfo.patch @@ -1,3 +1,4 @@ +https://github.com/traviscross/mtr/pull/368 --- a/configure.ac +++ b/configure.ac @@ -101,7 +101,10 @@ diff --git a/net-analyzer/mtr/files/mtr-0.95-fortify-source-3.patch b/net-analyzer/mtr/files/mtr-0.95-fortify-source-3.patch new file mode 100644 index 000000000000..0c3d593915e4 --- /dev/null +++ b/net-analyzer/mtr/files/mtr-0.95-fortify-source-3.patch @@ -0,0 +1,34 @@ +https://bugs.gentoo.org/911389 +https://github.com/traviscross/mtr/pull/468 +https://github.com/traviscross/mtr/commit/a1548b40c0dcf6dd44c5e6906f829e249428436b + +From 5908af4c19188cb17b62f23368b6ef462831a0cb Mon Sep 17 00:00:00 2001 +From: Marcus Meissner <meissner@suse.de> +Date: Tue, 11 Apr 2023 16:05:36 +0200 +Subject: [PATCH] fixed the sizes passed into snprintf + +--- a/ui/report.c ++++ b/ui/report.c +@@ -140,7 +140,7 @@ void report_close( + continue; + + snprintf(fmt, sizeof(fmt), "%%%ds", data_fields[j].length); +- snprintf(buf + len, sizeof(buf), fmt, data_fields[j].title); ++ snprintf(buf + len, sizeof(buf) - len, fmt, data_fields[j].title); + len += data_fields[j].length; + } + printf("%s\n", buf); +@@ -172,10 +172,10 @@ void report_close( + + /* 1000.0 is a temporary hack for stats usec to ms, impacted net_loss. */ + if (strchr(data_fields[j].format, 'f')) { +- snprintf(buf + len, sizeof(buf), data_fields[j].format, ++ snprintf(buf + len, sizeof(buf) - len, data_fields[j].format, + data_fields[j].net_xxx(at) / 1000.0); + } else { +- snprintf(buf + len, sizeof(buf), data_fields[j].format, ++ snprintf(buf + len, sizeof(buf) - len, data_fields[j].format, + data_fields[j].net_xxx(at)); + } + len += data_fields[j].length; + diff --git a/net-analyzer/mtr/metadata.xml b/net-analyzer/mtr/metadata.xml index 88e5dd2b473f..8fd4b1f5e8e8 100644 --- a/net-analyzer/mtr/metadata.xml +++ b/net-analyzer/mtr/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> <email>sam@gentoo.org</email> @@ -10,8 +10,8 @@ <name>Gentoo network monitoring and analysis project</name> </maintainer> <use> - <flag name='ipinfo'>Disable support for IP address lookups</flag> - <flag name='jansson'>Enable JSON output support through <pkg>dev-libs/jansson</pkg></flag> + <flag name="ipinfo">Disable support for IP address lookups</flag> + <flag name="jansson">Enable JSON output support through <pkg>dev-libs/jansson</pkg></flag> </use> <upstream> <remote-id type="github">traviscross/mtr</remote-id> diff --git a/net-analyzer/mtr/mtr-0.94.ebuild b/net-analyzer/mtr/mtr-0.94.ebuild deleted file mode 100644 index b23e88ccf2cc..000000000000 --- a/net-analyzer/mtr/mtr-0.94.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 bash-completion-r1 fcaps - -DESCRIPTION="My TraceRoute, an Excellent network diagnostic tool" -HOMEPAGE="https://www.bitwizard.nl/mtr/" -SRC_URI="https://github.com/traviscross/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" -IUSE="gtk +ipinfo +ipv6 jansson ncurses" -# This is an inherited RESTRICT - figure out why! -RESTRICT="test" - -RDEPEND=" - gtk? ( - dev-libs/glib:2 - x11-libs/gtk+:3 - ) - jansson? ( dev-libs/jansson ) - ncurses? ( sys-libs/ncurses:0= ) -" -DEPEND="${RDEPEND}" -BDEPEND="virtual/pkgconfig" - -DOCS=( AUTHORS FORMATS NEWS README.md SECURITY TODO ) -FILECAPS=( cap_net_raw usr/sbin/mtr-packet ) - -PATCHES=( - "${FILESDIR}"/${PN}-0.88-tinfo.patch -) - -src_prepare() { - default - - eautoreconf -} - -src_configure() { - econf \ - $(use_enable ipv6) \ - $(use_with gtk) \ - $(use_with ipinfo) \ - $(use_with jansson) \ - $(use_with ncurses) \ - --with-bashcompletiondir="$(get_bashcompdir)" -} - -pkg_postinst() { - fcaps_pkg_postinst - - if use prefix && [[ ${CHOST} == *-darwin* ]] ; then - ewarn "mtr needs root privileges to run. To grant them:" - ewarn " % sudo chown root ${EPREFIX}/usr/sbin/mtr" - ewarn " % sudo chmod u+s ${EPREFIX}/usr/sbin/mtr" - fi -} diff --git a/net-analyzer/mtr/mtr-0.95-r1.ebuild b/net-analyzer/mtr/mtr-0.95-r1.ebuild new file mode 100644 index 000000000000..a2c2010db273 --- /dev/null +++ b/net-analyzer/mtr/mtr-0.95-r1.ebuild @@ -0,0 +1,68 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools bash-completion-r1 fcaps + +DESCRIPTION="My TraceRoute, an Excellent network diagnostic tool" +HOMEPAGE="https://www.bitwizard.nl/mtr/" + +if [[ ${PV} == *9999* ]] ; then + EGIT_REPO_URI="https://github.com/traviscross/mtr" + inherit git-r3 +else + SRC_URI="https://github.com/traviscross/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" +fi + +LICENSE="GPL-2" +SLOT="0" +IUSE="gtk +ipinfo +ipv6 jansson ncurses" +# TODO: This is an inherited RESTRICT - figure out why! +RESTRICT="test" + +RDEPEND=" + gtk? ( + dev-libs/glib:2 + x11-libs/gtk+:3 + ) + jansson? ( dev-libs/jansson:= ) + ncurses? ( sys-libs/ncurses:= ) +" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" + +DOCS=( AUTHORS FORMATS NEWS README.md SECURITY TODO ) +FILECAPS=( cap_net_raw usr/sbin/mtr-packet ) + +PATCHES=( + "${FILESDIR}"/${PN}-0.88-tinfo.patch + "${FILESDIR}"/${P}-fortify-source-3.patch +) + +src_prepare() { + default + + eautoreconf +} + +src_configure() { + econf \ + $(use_enable ipv6) \ + $(use_with gtk) \ + $(use_with ipinfo) \ + $(use_with jansson) \ + $(use_with ncurses) \ + --with-bashcompletiondir="$(get_bashcompdir)" +} + +pkg_postinst() { + fcaps_pkg_postinst + + if use prefix && [[ ${CHOST} == *-darwin* ]] ; then + ewarn "mtr needs root privileges to run. To grant them:" + ewarn " % sudo chown root ${EPREFIX}/usr/sbin/mtr" + ewarn " % sudo chmod u+s ${EPREFIX}/usr/sbin/mtr" + fi +} diff --git a/net-analyzer/mtr/mtr-9999.ebuild b/net-analyzer/mtr/mtr-9999.ebuild index bf0d00068f92..af05bfe6419c 100644 --- a/net-analyzer/mtr/mtr-9999.ebuild +++ b/net-analyzer/mtr/mtr-9999.ebuild @@ -1,13 +1,20 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -inherit autotools bash-completion-r1 fcaps git-r3 +inherit autotools bash-completion-r1 fcaps DESCRIPTION="My TraceRoute, an Excellent network diagnostic tool" HOMEPAGE="https://www.bitwizard.nl/mtr/" -EGIT_REPO_URI="https://github.com/traviscross/mtr" + +if [[ ${PV} == *9999* ]] ; then + EGIT_REPO_URI="https://github.com/traviscross/mtr" + inherit git-r3 +else + SRC_URI="https://github.com/traviscross/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" +fi LICENSE="GPL-2" SLOT="0" @@ -20,8 +27,8 @@ RDEPEND=" dev-libs/glib:2 x11-libs/gtk+:3 ) - jansson? ( dev-libs/jansson ) - ncurses? ( sys-libs/ncurses:0= ) + jansson? ( dev-libs/jansson:= ) + ncurses? ( sys-libs/ncurses:= ) " DEPEND="${RDEPEND}" BDEPEND="virtual/pkgconfig" diff --git a/net-analyzer/multimon-ng/Manifest b/net-analyzer/multimon-ng/Manifest index 59bc5904a3ff..a52bf29cdaf9 100644 --- a/net-analyzer/multimon-ng/Manifest +++ b/net-analyzer/multimon-ng/Manifest @@ -1 +1 @@ -DIST multimon-ng-1.1.8.tar.gz 2430488 BLAKE2B 82bc0be58e2f7d596363fc916c11584cbd1335e7984194af22955587877ad1cba2a0cca819467061bb18b97ca70f5c2adfd73ccbf159fbc27348d59429959ada SHA512 9cf93362555e5dc465a9ec60dff27b9875879afd954e810069022b3c003eca4c3ab2a833f1c00fef877175bc72e2d378bbb53380ada54542ae29d257a7d2bd1b +DIST multimon-ng-1.3.0.tar.gz 2447632 BLAKE2B 6607c53677e746fc22baaca708cffab97bd1a411032e8bd6ec15410571a7c5dfaa92a2ab5d61199859acc8ffa63ee6ac97f54dde966daf4984d62ae1dfedc902 SHA512 1dad367d6de1c84c22523b7bdffff2835de496b2250a6642b6da950f1dc6d64b0c5e8e3ab7729032a8a386740d6c1c64afcd5514e131777df0123e4a29f33827 diff --git a/net-analyzer/multimon-ng/metadata.xml b/net-analyzer/multimon-ng/metadata.xml index e2d083399d83..fef58098b169 100644 --- a/net-analyzer/multimon-ng/metadata.xml +++ b/net-analyzer/multimon-ng/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> <email>zerochaos@gentoo.org</email> diff --git a/net-analyzer/multimon-ng/multimon-ng-1.1.8.ebuild b/net-analyzer/multimon-ng/multimon-ng-1.1.8.ebuild deleted file mode 100644 index da7b10babdb7..000000000000 --- a/net-analyzer/multimon-ng/multimon-ng-1.1.8.ebuild +++ /dev/null @@ -1,32 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake-utils - -DESCRIPTION="a fork of multimon, decodes multiple digital transmission modes" -HOMEPAGE="https://github.com/EliasOenal/multimon-ng" - -if [[ ${PV} == 9999* ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/EliasOenal/multimon-ng.git" - KEYWORDS="" -else - SRC_URI="https://github.com/EliasOenal/multimonNG/archive/${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~arm ~x86" -fi - -LICENSE="GPL-2" -SLOT="0" -IUSE="pulseaudio X" - -DEPEND="pulseaudio? ( media-sound/pulseaudio ) - X? ( x11-libs/libX11 )" -RDEPEND="${DEPEND}" - -src_prepare() { - use pulseaudio || sed -i '/find_package( PulseAudio )/d' CMakeLists.txt - use X || sed -i '/find_package( X11 )/d' CMakeLists.txt - cmake-utils_src_prepare -} diff --git a/net-analyzer/multimon-ng/multimon-ng-1.3.0.ebuild b/net-analyzer/multimon-ng/multimon-ng-1.3.0.ebuild new file mode 100644 index 000000000000..64933423f307 --- /dev/null +++ b/net-analyzer/multimon-ng/multimon-ng-1.3.0.ebuild @@ -0,0 +1,32 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake + +DESCRIPTION="a fork of multimon, decodes multiple digital transmission modes" +HOMEPAGE="https://github.com/EliasOenal/multimon-ng" + +if [[ ${PV} == 9999* ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/EliasOenal/multimon-ng.git" +else + SRC_URI="https://github.com/EliasOenal/multimonNG/archive/${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~arm ~x86" +fi + +LICENSE="GPL-2" +SLOT="0" +IUSE="pulseaudio X" + +DEPEND="pulseaudio? ( media-libs/libpulse ) + X? ( x11-libs/libX11 )" +RDEPEND="${DEPEND} + media-sound/sox" + +src_prepare() { + use pulseaudio || sed -i '/find_package( PulseAudio )/d' CMakeLists.txt + use X || sed -i '/find_package( X11 )/d' CMakeLists.txt + cmake_src_prepare +} diff --git a/net-analyzer/multimon-ng/multimon-ng-9999.ebuild b/net-analyzer/multimon-ng/multimon-ng-9999.ebuild index da7b10babdb7..8144bfe94435 100644 --- a/net-analyzer/multimon-ng/multimon-ng-9999.ebuild +++ b/net-analyzer/multimon-ng/multimon-ng-9999.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -inherit cmake-utils +inherit cmake DESCRIPTION="a fork of multimon, decodes multiple digital transmission modes" HOMEPAGE="https://github.com/EliasOenal/multimon-ng" @@ -11,7 +11,6 @@ HOMEPAGE="https://github.com/EliasOenal/multimon-ng" if [[ ${PV} == 9999* ]]; then inherit git-r3 EGIT_REPO_URI="https://github.com/EliasOenal/multimon-ng.git" - KEYWORDS="" else SRC_URI="https://github.com/EliasOenal/multimonNG/archive/${PV}.tar.gz -> ${P}.tar.gz" KEYWORDS="~amd64 ~arm ~x86" @@ -21,12 +20,13 @@ LICENSE="GPL-2" SLOT="0" IUSE="pulseaudio X" -DEPEND="pulseaudio? ( media-sound/pulseaudio ) +DEPEND="pulseaudio? ( media-libs/libpulse ) X? ( x11-libs/libX11 )" -RDEPEND="${DEPEND}" +RDEPEND="${DEPEND} + media-sound/sox" src_prepare() { use pulseaudio || sed -i '/find_package( PulseAudio )/d' CMakeLists.txt use X || sed -i '/find_package( X11 )/d' CMakeLists.txt - cmake-utils_src_prepare + cmake_src_prepare } diff --git a/net-analyzer/multipath-tcp-tools/metadata.xml b/net-analyzer/multipath-tcp-tools/metadata.xml index c7fb82034f95..62a6bcb8233e 100644 --- a/net-analyzer/multipath-tcp-tools/metadata.xml +++ b/net-analyzer/multipath-tcp-tools/metadata.xml @@ -1,11 +1,14 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type="project"> -<email>netmon@gentoo.org</email> -</maintainer> -<longdescription> -Th[is package] contains a collection of applications written in C to help -both analyze and visualize MPTCP packet traces. -</longdescription> + <maintainer type="project"> + <email>netmon@gentoo.org</email> + </maintainer> + <longdescription> + Contains a collection of applications written in C to help + both analyze and visualize MPTCP packet traces. + </longdescription> + <upstream> + <remote-id type="github">nasa/multipath-tcp-tools</remote-id> + </upstream> </pkgmetadata> diff --git a/net-analyzer/multipath-tcp-tools/multipath-tcp-tools-2018_p12_p21-r1.ebuild b/net-analyzer/multipath-tcp-tools/multipath-tcp-tools-2018_p12_p21-r1.ebuild new file mode 100644 index 000000000000..ad249861ca1a --- /dev/null +++ b/net-analyzer/multipath-tcp-tools/multipath-tcp-tools-2018_p12_p21-r1.ebuild @@ -0,0 +1,46 @@ +# Copyright 2021-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +inherit flag-o-matic toolchain-funcs + +DESCRIPTION="Analysis tools for Multipath Transmission Control Protocol (MPTCP)" +HOMEPAGE="https://github.com/nasa/multipath-tcp-tools" +SRC_URI="https://github.com/nasa/multipath-tcp-tools/archive/v${PV//_p/-}.tar.gz -> ${P}.tar.gz" + +LICENSE="NOSA" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +DEPEND=" + dev-libs/openssl:= + net-libs/libpcap +" +RDEPEND=" + ${DEPEND} +" +S=${WORKDIR}/${P//_p/-}/network-traffic-analysis-tools + +src_prepare() { + sed -i \ + -e 's|/man/man1|/share&|g' \ + -e 's|$(LDLIBS)|$(LDFLAGS) &|g' \ + Makefile || die + + default +} + +src_compile() { + # bug #861179 + append-flags -fno-strict-aliasing + + emake \ + CXX="$(tc-getCXX)" \ + CXXFLAGS="${CXXFLAGS}" +} + +src_install() { + emake PREFIX="${D}/${EPREFIX}/usr" install + + dodoc README +} diff --git a/net-analyzer/multipath-tcp-tools/multipath-tcp-tools-2018_p12_p21.ebuild b/net-analyzer/multipath-tcp-tools/multipath-tcp-tools-2018_p12_p21.ebuild deleted file mode 100644 index 4e226a41ad29..000000000000 --- a/net-analyzer/multipath-tcp-tools/multipath-tcp-tools-2018_p12_p21.ebuild +++ /dev/null @@ -1,43 +0,0 @@ -# Copyright 2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit toolchain-funcs - -DESCRIPTION="Analysis tools for Multipath Transmission Control Protocol (MPTCP)" -HOMEPAGE="https://github.com/nasa/multipath-tcp-tools" -SRC_URI="https://github.com/nasa/multipath-tcp-tools/archive/v${PV//_p/-}.tar.gz -> ${P}.tar.gz" - -LICENSE="NOSA" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -DEPEND=" - dev-libs/openssl:* - net-libs/libpcap -" -RDEPEND=" - ${DEPEND} -" -S=${WORKDIR}/${P//_p/-}/network-traffic-analysis-tools - -src_prepare() { - sed -i \ - -e 's|/man/man1|/share&|g' \ - -e 's|$(LDLIBS)|$(LDFLAGS) &|g' \ - Makefile || die - - default -} - -src_compile() { - emake \ - CXX="$(tc-getCXX)" \ - CXXFLAGS="${CXXFLAGS}" -} - -src_install() { - emake PREFIX="${D}/${EPREFIX}/usr" install - - dodoc README -} diff --git a/net-analyzer/multipath-tcp-tools/multipath-tcp-tools-999999.ebuild b/net-analyzer/multipath-tcp-tools/multipath-tcp-tools-999999.ebuild index edabbb51709a..3178d81adff6 100644 --- a/net-analyzer/multipath-tcp-tools/multipath-tcp-tools-999999.ebuild +++ b/net-analyzer/multipath-tcp-tools/multipath-tcp-tools-999999.ebuild @@ -1,8 +1,8 @@ -# Copyright 2020 Gentoo Authors +# Copyright 2021-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -inherit git-r3 toolchain-funcs +inherit git-r3 flag-o-matic toolchain-funcs DESCRIPTION="Analysis tools for Multipath Transmission Control Protocol (MPTCP)" HOMEPAGE="https://github.com/nasa/multipath-tcp-tools" @@ -13,7 +13,7 @@ SLOT="0" KEYWORDS="" DEPEND=" - dev-libs/openssl:* + dev-libs/openssl:= net-libs/libpcap " RDEPEND=" @@ -31,6 +31,9 @@ src_prepare() { } src_compile() { + # bug #861179 + append-flags -fno-strict-aliasing + emake \ CXX="$(tc-getCXX)" \ CXXFLAGS="${CXXFLAGS}" diff --git a/net-analyzer/munin-plugins-zfs/metadata.xml b/net-analyzer/munin-plugins-zfs/metadata.xml index b1859d9d69c6..18679fa7d735 100644 --- a/net-analyzer/munin-plugins-zfs/metadata.xml +++ b/net-analyzer/munin-plugins-zfs/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> <email>graaff@gentoo.org</email> 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.ebuild index e552781d0f00..bec89a7e2c74 100644 --- a/net-analyzer/munin-plugins-zfs/munin-plugins-zfs-0.20170127.ebuild +++ b/net-analyzer/munin-plugins-zfs/munin-plugins-zfs-0.20170127.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -16,7 +16,7 @@ KEYWORDS="~amd64" DEPEND="net-analyzer/munin" RDEPEND="${DEPEND} - sys-devel/bc + app-alternatives/bc " diff --git a/net-analyzer/munin/Manifest b/net-analyzer/munin/Manifest index 3f9d2969e35f..bce724fcc09e 100644 --- a/net-analyzer/munin/Manifest +++ b/net-analyzer/munin/Manifest @@ -1,8 +1,6 @@ -DIST munin-2.0.59-gentoo-1.tar.xz 3980 BLAKE2B 5aae9c29befa761f797d362c90d810051a7f3a5dc8250776ab6ae1659197d795dfb87274db66ff0a3deb4e10e14ced5b3765551a3f29357c436968a848f450ea SHA512 b21d6590bb9e1da127066a06818f1f3157362762f80526e2231b926956959e62af575f38235f72326376dc21bba63f9767efa379f1f2558ca9b20ddf5395e851 -DIST munin-2.0.59.tar.gz 2276011 BLAKE2B 0681cd838daaa056418258d473825642e2aa6b7a3ac7a435859033a467351145be73df327d3149b46c53f5a04c602bea57bc5af428cafb7b5bf1e9c780915ddf SHA512 5597db797f7a0de3581a17be13b079a3fd1e50903014d67d81a262e921fdfca84eee8ec65e3927438db0e01525d16faaabc7e3f7d4cad1a73e7e14002b10478f -DIST munin-2.0.64-gentoo-1.tar.xz 3980 BLAKE2B 5aae9c29befa761f797d362c90d810051a7f3a5dc8250776ab6ae1659197d795dfb87274db66ff0a3deb4e10e14ced5b3765551a3f29357c436968a848f450ea SHA512 b21d6590bb9e1da127066a06818f1f3157362762f80526e2231b926956959e62af575f38235f72326376dc21bba63f9767efa379f1f2558ca9b20ddf5395e851 -DIST munin-2.0.64.tar.gz 2256519 BLAKE2B 6a48327672ab7cf20be7a47d489467d0b888e00c01ca0ce8b0bc47a03b63087cf61de4aaf8ae0f18d8e5ef95c49f85092d719ae7de6fe51bcb5e60d138caa519 SHA512 d5f8fb04a601b053844b04850416f09b9f682b83298e35b973ee495cc60477720dc0483f73809db5ca24ba6b9fa1520f026a3f187db01b0c946cce756e4e401f -DIST munin-2.0.65-gentoo-1.tar.xz 3980 BLAKE2B 5aae9c29befa761f797d362c90d810051a7f3a5dc8250776ab6ae1659197d795dfb87274db66ff0a3deb4e10e14ced5b3765551a3f29357c436968a848f450ea SHA512 b21d6590bb9e1da127066a06818f1f3157362762f80526e2231b926956959e62af575f38235f72326376dc21bba63f9767efa379f1f2558ca9b20ddf5395e851 -DIST munin-2.0.65.tar.gz 2255611 BLAKE2B b506dd12e527bd42f7f8cd9766f260b68bdd08114261b6e1e35316d12d501ac86d1aa7f4c461ab4f3f73490bafde870420e69fbed68f2b663e5e1e011b7bb4ca SHA512 8a0dc93de878e1d502467f4e8589a0af2b809ec7282033534de2fd17b842bbf864d900136516a668a8e3f80e99215062620a503c5f664c799892f77950b4859a -DIST munin-2.0.66-gentoo-1.tar.xz 3980 BLAKE2B 5aae9c29befa761f797d362c90d810051a7f3a5dc8250776ab6ae1659197d795dfb87274db66ff0a3deb4e10e14ced5b3765551a3f29357c436968a848f450ea SHA512 b21d6590bb9e1da127066a06818f1f3157362762f80526e2231b926956959e62af575f38235f72326376dc21bba63f9767efa379f1f2558ca9b20ddf5395e851 -DIST munin-2.0.66.tar.gz 2257034 BLAKE2B b0c5412f32a54857acbe4baa5cf1447c7cf7053cad79ac09216ddc1aa8696ced813c3ad373517a8a48c5a08fae76154a0dda069efc036b7773e0557f078f8ff2 SHA512 928f727c558db6699524f3f3c2822404638e10e95678f4f211ec445ad6fbbdb7685a3d28343dbce616f60ced3cabff3b44e21a0a0e84b1d05032d295b81afab0 +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 diff --git a/net-analyzer/munin/files/logrotate.d-munin.3 b/net-analyzer/munin/files/logrotate.d-munin.3 index e7e1dda3fc65..5133c47e8ba1 100644 --- a/net-analyzer/munin/files/logrotate.d-munin.3 +++ b/net-analyzer/munin/files/logrotate.d-munin.3 @@ -3,7 +3,7 @@ missingok rotate 7 compress - copytruncate + delaycompress notifempty create 640 root root postrotate @@ -17,6 +17,7 @@ missingok rotate 7 compress + delaycompress notifempty nocreate } @@ -26,6 +27,7 @@ missingok rotate 7 compress + delaycompress notifempty create 640 @CGIUSER@ } diff --git a/net-analyzer/munin/files/munin-asyncd.init.2 b/net-analyzer/munin/files/munin-asyncd.init.2 index 59ef4c6b0280..c9fc267f12ea 100644 --- a/net-analyzer/munin/files/munin-asyncd.init.2 +++ b/net-analyzer/munin/files/munin-asyncd.init.2 @@ -1,11 +1,12 @@ #!/sbin/openrc-run -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 command=/usr/libexec/munin/munin-asyncd command_args="--fork" pidfile="/run/munin-asyncd.pid" -start_stop_daemon_args="--background --make-pidfile --user munin-async" +command_background="yes" +command_user="munin-async" depend() { need munin-node diff --git a/net-analyzer/munin/files/munin-node_init.d_2.0.73 b/net-analyzer/munin/files/munin-node_init.d_2.0.73 new file mode 100644 index 000000000000..ef9ff691adeb --- /dev/null +++ b/net-analyzer/munin/files/munin-node_init.d_2.0.73 @@ -0,0 +1,27 @@ +#!/sbin/openrc-run +# Copyright 1999-2023 Gentoo Authors +# 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 + need hostname net + + [ "$(get_munin_config log_file)" = "Sys::Syslog" ] && \ + use logger +} + +# vim: filetype=gentoo-init-d: diff --git a/net-analyzer/munin/files/munin.apache.include-2.4-r1 b/net-analyzer/munin/files/munin.apache.include-2.4-r1 new file mode 100644 index 000000000000..290c2818eb9d --- /dev/null +++ b/net-analyzer/munin/files/munin.apache.include-2.4-r1 @@ -0,0 +1,29 @@ +# -*- apache -*- + +<IfDefine MUNIN_HTML_CGI> +RewriteEngine on + +RewriteRule ^/favicon.ico /static/favicon.ico [L] + +RewriteCond %{REQUEST_URI} (/|\.html)$ +RewriteCond %{REQUEST_URI} !/static +RewriteRule ^/(.*) /munin-cgi/munin-cgi-html/$1 [PT,L] +RewriteRule ^/munin-cgi/munin-cgi-graph/(.*) /$1 +RewriteCond %{REQUEST_URI} !^/static +RewriteRule ^/(.*.png) /munin-cgi/munin-cgi-graph/$1? [L,PT] + +ScriptAlias /munin-cgi/munin-cgi-graph /usr/libexec/munin/cgi/munin-cgi-graph +ScriptAlias /munin-cgi/munin-cgi-html /usr/libexec/munin/cgi/munin-cgi-html +</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> diff --git a/net-analyzer/munin/files/patches/0002-build-create-an-install-minimal-target-that-only-ins.patch b/net-analyzer/munin/files/patches/0002-build-create-an-install-minimal-target-that-only-ins.patch new file mode 100644 index 000000000000..fee72bc23ad3 --- /dev/null +++ b/net-analyzer/munin/files/patches/0002-build-create-an-install-minimal-target-that-only-ins.patch @@ -0,0 +1,36 @@ +From 75ae794b1c497a82c4ce8f63c9d016cd11d3c7ba Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Diego=20Elio=20Petten=C3=B2?= <flameeyes@flameeyes.eu> +Date: Sun, 21 Oct 2012 13:39:21 -0700 +Subject: [PATCH 2/7] build: create an install-minimal target that only + installs the Node components +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +This is what Gentoo does right now manually, it's easier to maintain +here though, and users might want to do the same if they are +installing from sources, and only want a node. + +Signed-off-by: Diego Elio Pettenò <flameeyes@flameeyes.eu> +--- + Makefile | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/Makefile b/Makefile +index cdc3577..c119d38 100644 +--- a/Makefile ++++ b/Makefile +@@ -64,7 +64,9 @@ tags: + + ###################################################################### + +-install: install-master-prime install-common-prime install-node-prime install-plugins-prime $(JAVA_INSTALL) install-man install-async-prime ++install: install-master-prime install-minimal install-man ++ ++install-minimal: install-common-prime install-node-prime install-plugins-prime $(JAVA_INSTALL) install-async-prime + + install-pre: Makefile Makefile.config + @$(CHECKUSER) +-- +2.2.1 + diff --git a/net-analyzer/munin/files/patches/0003-master-make-it-possible-to-configure-the-default-cgi.patch b/net-analyzer/munin/files/patches/0003-master-make-it-possible-to-configure-the-default-cgi.patch new file mode 100644 index 000000000000..63897f552c9a --- /dev/null +++ b/net-analyzer/munin/files/patches/0003-master-make-it-possible-to-configure-the-default-cgi.patch @@ -0,0 +1,113 @@ +From b634d1396bc2fba170b414f09ea07d0de702fdb8 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Diego=20Elio=20Petten=C3=B2?= <flameeyes@flameeyes.eu> +Date: Sun, 4 Nov 2012 11:18:11 -0800 +Subject: [PATCH 3/7] master: make it possible to configure the default cgi-tmp + directory. +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +This allows distributions to use, for instance, /var/cache/munin-cgi, +so that /var/lib preserves its designed purpose. + +Signed-off-by: Diego Elio Pettenò <flameeyes@flameeyes.eu> +--- + Makefile | 7 ++++--- + Makefile.config | 3 +++ + common/lib/Munin/Common/Defaults.pm | 2 +- + master/_bin/munin-cgi-graph.in | 2 +- + master/lib/Munin/Master/Config.pm | 2 +- + master/munin.conf.in | 2 +- + 6 files changed, 11 insertions(+), 7 deletions(-) + +diff --git a/Makefile b/Makefile +index c119d38..2e30052 100644 +--- a/Makefile ++++ b/Makefile +@@ -87,14 +87,14 @@ install-master-prime: $(INFILES_MASTER) install-pre install-master + mkdir -p $(PERLLIB)/Munin/Master + mkdir -p $(HTMLDIR) + mkdir -p $(DBDIR) +- mkdir -p $(DBDIR)/cgi-tmp ++ mkdir -p $(CGITMPDIR) + mkdir -p $(CGIDIR) + + $(CHOWN) $(USER) $(HTMLDIR) $(DBDIR) + $(CHMOD) 0755 $(DBDIR) + +- $(CHOWN) $(CGIUSER) $(DBDIR)/cgi-tmp +- $(CHMOD) 0755 $(DBDIR)/cgi-tmp ++ $(CHOWN) $(CGIUSER) $(CGITMPDIR) ++ $(CHMOD) 0755 $(CGITMPDIR) + + for p in master/www/*.tmpl ; do \ + $(INSTALL) -m 0644 "$$p" $(CONFDIR)/templates/ ; \ +diff --git a/Makefile.config b/Makefile.config +index f5557ea..4378b60 100644 +--- a/Makefile.config ++++ b/Makefile.config +@@ -44,6 +44,9 @@ CGIDIR = $(PREFIX)/www/cgi + # Where to put internal data for master (RRD, internal files, ...) + DBDIR = $(DESTDIR)/var/opt/munin + ++# Where to put CGI cached files (for master only) ++CGITMPDIR = $(DBDIR)/cgi-tmp ++ + # Where to put internal data for node (plugin state, ...) + DBDIRNODE = $(DESTDIR)/var/opt/munin-node + +diff --git a/common/lib/Munin/Common/Defaults.pm b/common/lib/Munin/Common/Defaults.pm +index 131f52c..787b596 100644 +--- a/common/lib/Munin/Common/Defaults.pm ++++ b/common/lib/Munin/Common/Defaults.pm +@@ -25,7 +25,7 @@ our $MUNIN_DOCDIR = ''; + our $MUNIN_LIBDIR = ''; + our $MUNIN_HTMLDIR = ''; + our $MUNIN_CGIDIR = ''; +-our $MUNIN_CGITMPDIR = ''; ++our $MUNIN_CGITMPDIR = ''; + our $MUNIN_DBDIR = ''; + our $MUNIN_PLUGSTATE = ''; + our $MUNIN_SPOOLDIR = ''; +diff --git a/master/_bin/munin-cgi-graph.in b/master/_bin/munin-cgi-graph.in +index 651cf8c..f5a7ccd 100755 +--- a/master/_bin/munin-cgi-graph.in ++++ b/master/_bin/munin-cgi-graph.in +@@ -337,7 +337,7 @@ sub get_picture_filename { + my $params = shift; + + # XXX - hack to fix cgitmpdir default +- $config->{cgitmpdir} ||= "$Munin::Common::Defaults::MUNIN_DBDIR/cgi-tmp"; ++ $config->{cgitmpdir} ||= "$Munin::Common::Defaults::MUNIN_CGITMPDIR"; + my $cgi_tmp_dir = $config->{cgitmpdir} . "/munin-cgi-graph"; + + $params = $params ? "?$params" : ""; +diff --git a/master/lib/Munin/Master/Config.pm b/master/lib/Munin/Master/Config.pm +index 291ffaf..b5c0813 100644 +--- a/master/lib/Munin/Master/Config.pm 2017-03-03 01:02:39.000000000 +0100 ++++ b/master/lib/Munin/Master/Config.pm 2017-07-18 19:29:44.861742592 +0200 +@@ -161,7 +161,7 @@ + tls_verify_depth => 5, + tmpldir => "$Munin::Common::Defaults::MUNIN_CONFDIR/templates", + staticdir => "$Munin::Common::Defaults::MUNIN_CONFDIR/static", +- cgitmpdir => "$Munin::Common::Defaults::MUNIN_DBDIR/cgi-tmp", ++ cgitmpdir => "$Munin::Common::Defaults::MUNIN_CGITMPDIR", + ssh_command => "ssh", + ssh_options => "-o ChallengeResponseAuthentication=no -o StrictHostKeyChecking=no", + }, $class ), +diff --git a/master/munin.conf.in b/master/munin.conf.in +index 8d1a75f..046f369 100644 +--- a/master/munin.conf.in ++++ b/master/munin.conf.in +@@ -21,7 +21,7 @@ + # temporary cgi files are here. note that it has to be writable by + # the cgi user (usually nobody or httpd). + # +-# cgitmpdir @@DBDIR@@/cgi-tmp ++# cgitmpdir @@CGITMPDIR@@ + + # (Exactly one) directory to include all files from. + includedir @@CONFDIR@@/munin-conf.d +-- +2.2.1 + diff --git a/net-analyzer/munin/files/patches/0005-node-use-Net-Domain-hostfqdn-instead-of-Sys-Hostname.patch b/net-analyzer/munin/files/patches/0005-node-use-Net-Domain-hostfqdn-instead-of-Sys-Hostname.patch new file mode 100644 index 000000000000..214cc4c4e6b8 --- /dev/null +++ b/net-analyzer/munin/files/patches/0005-node-use-Net-Domain-hostfqdn-instead-of-Sys-Hostname.patch @@ -0,0 +1,44 @@ +From e504b83d0db596a39f32227d4c473575e227037a Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Diego=20Elio=20Petten=C3=B2?= <flameeyes@flameeyes.eu> +Date: Sun, 11 Nov 2012 14:38:16 -0800 +Subject: [PATCH 5/7] node: use Net::Domain::hostfqdn instead of + Sys::Hostname::hostname to get the hostname. +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +This actually makes the test work correctly, but might change the +returned values for some hosts. + +Signed-off-by: Diego Elio Pettenò <flameeyes@flameeyes.eu> +--- + node/lib/Munin/Node/OS.pm | 6 ++---- + 1 file changed, 2 insertions(+), 4 deletions(-) + +diff --git a/node/lib/Munin/Node/OS.pm b/node/lib/Munin/Node/OS.pm +index 31bebac..b8fa58a 100644 +--- a/node/lib/Munin/Node/OS.pm ++++ b/node/lib/Munin/Node/OS.pm +@@ -12,7 +12,7 @@ use Munin::Node::Config; + use Munin::Common::Timeout; + + use POSIX (); +-use Sys::Hostname; ++use Net::Domain qw(hostfqdn); + + sub get_uid { + my ($class, $user) = @_; +@@ -38,9 +38,7 @@ sub _get_xid { + } + + sub get_fq_hostname { +- my $short = Sys::Hostname::hostname(); +- +- return (gethostbyname $short)[0] || $short || "unknown"; ++ return hostfqdn || "unknown"; + } + + sub check_perms_if_paranoid +-- +2.2.1 + diff --git a/net-analyzer/munin/files/patches/0007-node-always-use-the-Effective-UID-not-just-the-UID.patch b/net-analyzer/munin/files/patches/0007-node-always-use-the-Effective-UID-not-just-the-UID.patch new file mode 100644 index 000000000000..07b86e4a9f60 --- /dev/null +++ b/net-analyzer/munin/files/patches/0007-node-always-use-the-Effective-UID-not-just-the-UID.patch @@ -0,0 +1,139 @@ +From 50ca7989a481e31d2434f755812070ac8f4e14c5 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Diego=20Elio=20Petten=C3=B2?= <flameeyes@flameeyes.eu> +Date: Sun, 11 Nov 2012 15:18:51 -0800 +Subject: [PATCH 7/7] node: always use the Effective UID not just the UID. +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Signed-off-by: Diego Elio Pettenò <flameeyes@flameeyes.eu> +--- + common/lib/Munin/Common/Defaults.pm | 6 +++--- + node/t/munin_node_config.t | 12 ++++++------ + node/t/munin_node_os.t | 6 +++--- + node/t/munin_node_service.t | 14 +++++++------- + 4 files changed, 19 insertions(+), 19 deletions(-) + +diff --git a/common/lib/Munin/Common/Defaults.pm b/common/lib/Munin/Common/Defaults.pm +index 787b596..0f7f292 100644 +--- a/common/lib/Munin/Common/Defaults.pm ++++ b/common/lib/Munin/Common/Defaults.pm +@@ -32,9 +32,9 @@ our $MUNIN_SPOOLDIR = ''; + our $MUNIN_MANDIR = ''; + our $MUNIN_LOGDIR = "$COMPONENT_ROOT/log/"; + our $MUNIN_STATEDIR = ''; +-our $MUNIN_USER = getpwuid $UID; +-our $MUNIN_GROUP = getgrgid $GID; +-our $MUNIN_PLUGINUSER = getpwuid $UID; ++our $MUNIN_USER = getpwuid $EUID; ++our $MUNIN_GROUP = getgrgid $EGID; ++our $MUNIN_PLUGINUSER = getpwuid $EUID; + our $MUNIN_VERSION = 'svn'; + our $MUNIN_PERL = '/usr/bin/perl'; + our $MUNIN_PERLLIB = ''; +diff --git a/node/t/munin_node_config.t b/node/t/munin_node_config.t +index b8b6564..3d5530f 100644 +--- a/node/t/munin_node_config.t ++++ b/node/t/munin_node_config.t +@@ -43,13 +43,13 @@ isa_ok($conf, 'Munin::Node::Config'); + + ### Default user + { +- my $uname = getpwuid $UID; ++ my $uname = getpwuid $EUID; + + my @res = $conf->_parse_line("default_client_user $uname"); +- is_deeply(\@res, [defuser => $UID], 'Parsing default user name'); ++ is_deeply(\@res, [defuser => $EUID], 'Parsing default user name'); + + @res = $conf->_parse_line("default_client_user $UID"); +- is_deeply(\@res, [defuser => $UID], 'Parsing default user ID'); ++ is_deeply(\@res, [defuser => $EUID], 'Parsing default user ID'); + + eval { $conf->_parse_line("default_client_user xxxyyyzzz") }; + like($@, qr{Default user does not exist}, "Default user exists"); +@@ -184,13 +184,13 @@ isa_ok($conf, 'Munin::Node::Config'); + + ### user + { +- my $uname = getpwuid $UID; ++ my $uname = getpwuid $EUID; + + my @res = $conf->_parse_plugin_line("user $uname"); + is_deeply(\@res, [user => $uname], 'Parsing plugin user name'); + +- @res = $conf->_parse_plugin_line("user $UID"); +- is_deeply(\@res, [user => $UID], 'Parsing plugin user ID'); ++ @res = $conf->_parse_plugin_line("user $EUID"); ++ is_deeply(\@res, [user => $EUID], 'Parsing plugin user ID'); + } + + ### group +diff --git a/node/t/munin_node_os.t b/node/t/munin_node_os.t +index 96d7c74..e10d9e6 100644 +--- a/node/t/munin_node_os.t ++++ b/node/t/munin_node_os.t +@@ -13,10 +13,10 @@ my $os = 'Munin::Node::OS'; + + ### get_uid + { +- my $uname = getpwuid $UID; ++ my $uname = getpwuid $EUID; + +- is($os->get_uid($uname), $UID, 'Lookup by user name'); +- is($os->get_uid($UID), $UID, 'Lookup by user ID'); ++ is($os->get_uid($uname), $EUID, 'Lookup by user name'); ++ is($os->get_uid($EUID), $EUID, 'Lookup by user ID'); + + is($os->get_uid('%%SSKK¤¤'), undef, 'Nonexistent user name'); + is($os->get_uid(999999999), undef, 'Nonexistent user ID'); +diff --git a/node/t/munin_node_service.t b/node/t/munin_node_service.t +index 18bda89..7fa050e 100644 +--- a/node/t/munin_node_service.t ++++ b/node/t/munin_node_service.t +@@ -12,8 +12,8 @@ use Munin::Node::Service; + + use English qw(-no_match_vars); + +-my $uname = getpwuid $UID; +-my $gid = (split / /, $GID)[0]; ++my $uname = getpwuid $EUID; ++my $gid = (split / /, $EGID)[0]; + my $gname = getgrgid $gid; + + +@@ -39,7 +39,7 @@ $config->reinitialize({ + + # testing user resolution + uname => { user => $uname }, +- uid => { user => $UID }, ++ uid => { user => $EUID }, + bad_uname => { user => '%%SSKK¤¤' }, + bad_uid => { user => 999999999 }, + +@@ -155,7 +155,7 @@ $ENV{MUNIN_MASTER_IP} = ''; + + ### export_service_environment + { +- my $services = Munin::Node::Service->new(defuser => $UID); ++ my $services = Munin::Node::Service->new(defuser => $EUID); + + $services->export_service_environment('test'); + is($ENV{test_environment_variable}, 'fnord', 'Service-specific environment is exported'); +@@ -164,10 +164,10 @@ $ENV{MUNIN_MASTER_IP} = ''; + + ### _resolve_uid + { +- my $services = Munin::Node::Service->new(defuser => $UID); ++ my $services = Munin::Node::Service->new(defuser => $EUID); + +- is($services->_resolve_uid('uname'), $UID, 'Lookup by service-specific username'); +- is($services->_resolve_uid('uid'), $UID, 'Lookup by service-specific username'); ++ is($services->_resolve_uid('uname'), $EUID, 'Lookup by service-specific username'); ++ is($services->_resolve_uid('uid'), $EUID, 'Lookup by service-specific username'); + + $services->{defuser} = 0; + +-- +2.2.1 + diff --git a/net-analyzer/munin/files/patches/0009-perl-526.patch b/net-analyzer/munin/files/patches/0009-perl-526.patch new file mode 100644 index 000000000000..d3cabb9906c3 --- /dev/null +++ b/net-analyzer/munin/files/patches/0009-perl-526.patch @@ -0,0 +1,26 @@ + + +diff -ruN munin-2.0.33.orig/master/Build.PL munin-2.0.33/master/Build.PL +--- munin-2.0.33.orig/master/Build.PL 2017-03-03 00:02:39.000000000 -0000 ++++ munin-2.0.33/master/Build.PL 2017-08-05 15:06:55.799816839 -0000 +@@ -1,3 +1,4 @@ ++use lib q[.]; + use MasterBuilder; + + use warnings; +diff -ruN munin-2.0.33.orig/node/Build.PL munin-2.0.33/node/Build.PL +--- munin-2.0.33.orig/node/Build.PL 2017-03-03 00:02:39.000000000 -0000 ++++ munin-2.0.33/node/Build.PL 2017-08-05 15:11:07.689824612 -0000 +@@ -1,3 +1,4 @@ ++use lib q[.]; + use NodeBuilder; + + use warnings; +diff -ruN munin-2.0.33.orig/plugins/Build.PL munin-2.0.33/plugins/Build.PL +--- munin-2.0.33.orig/plugins/Build.PL 2017-03-03 00:02:39.000000000 -0000 ++++ munin-2.0.33/plugins/Build.PL 2017-08-05 15:13:57.056168401 -0000 +@@ -1,3 +1,4 @@ ++use lib q[.]; + use PluginsBuilder; + + use warnings; diff --git a/net-analyzer/munin/metadata.xml b/net-analyzer/munin/metadata.xml index 591d8ce60e47..9116c71a1546 100644 --- a/net-analyzer/munin/metadata.xml +++ b/net-analyzer/munin/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>sysadmin@gentoo.org</email> @@ -90,6 +90,6 @@ </flag> </use> <upstream> - <remote-id type="sourceforge">munin</remote-id> + <remote-id type="github">munin-monitoring/munin</remote-id> </upstream> </pkgmetadata> diff --git a/net-analyzer/munin/munin-2.0.59.ebuild b/net-analyzer/munin/munin-2.0.59.ebuild deleted file mode 100644 index 5e64da737295..000000000000 --- a/net-analyzer/munin/munin-2.0.59.ebuild +++ /dev/null @@ -1,417 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PATCHSET=1 - -inherit java-pkg-opt-2 systemd - -MY_P=${P/_/-} - -DESCRIPTION="Munin Server Monitoring Tool" -HOMEPAGE="http://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" - -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/Date-Manip - 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(-)?] - 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.5 ) - 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} - virtual/awk - ipmi? ( >=sys-libs/freeipmi-1.1.6-r1 ) - java? ( - >=virtual/jre-1.5 - || ( 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 - - 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 - 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 - - dodir /usr/lib/tmpfiles.d - cat > "${D}"/usr/lib/tmpfiles.d/${CATEGORY}:${PN}:${SLOT}.conf <<- EOF - 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 - - keepdir /var/cache/munin-cgi - touch "${D}"/var/log/munin/munin-cgi-{graph,html}.log - fowners $(usex apache2 apache munin) \ - /var/cache/munin-cgi \ - /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() { - 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/cache/munin-cgi \ - "${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.64.ebuild b/net-analyzer/munin/munin-2.0.64.ebuild deleted file mode 100644 index acaf9f6d9f0c..000000000000 --- a/net-analyzer/munin/munin-2.0.64.ebuild +++ /dev/null @@ -1,417 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PATCHSET=1 - -inherit java-pkg-opt-2 systemd - -MY_P=${P/_/-} - -DESCRIPTION="Munin Server Monitoring Tool" -HOMEPAGE="http://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" - -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/Date-Manip - 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(-)?] - 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.5 ) - 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} - virtual/awk - ipmi? ( >=sys-libs/freeipmi-1.1.6-r1 ) - java? ( - >=virtual/jre-1.5 - || ( 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 - - 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 - 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 - - dodir /usr/lib/tmpfiles.d - cat > "${D}"/usr/lib/tmpfiles.d/${CATEGORY}:${PN}:${SLOT}.conf <<- EOF - 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 - - keepdir /var/cache/munin-cgi - touch "${D}"/var/log/munin/munin-cgi-{graph,html}.log - fowners $(usex apache2 apache munin) \ - /var/cache/munin-cgi \ - /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() { - 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/cache/munin-cgi \ - "${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.65.ebuild b/net-analyzer/munin/munin-2.0.65.ebuild deleted file mode 100644 index acaf9f6d9f0c..000000000000 --- a/net-analyzer/munin/munin-2.0.65.ebuild +++ /dev/null @@ -1,417 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PATCHSET=1 - -inherit java-pkg-opt-2 systemd - -MY_P=${P/_/-} - -DESCRIPTION="Munin Server Monitoring Tool" -HOMEPAGE="http://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" - -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/Date-Manip - 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(-)?] - 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.5 ) - 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} - virtual/awk - ipmi? ( >=sys-libs/freeipmi-1.1.6-r1 ) - java? ( - >=virtual/jre-1.5 - || ( 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 - - 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 - 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 - - dodir /usr/lib/tmpfiles.d - cat > "${D}"/usr/lib/tmpfiles.d/${CATEGORY}:${PN}:${SLOT}.conf <<- EOF - 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 - - keepdir /var/cache/munin-cgi - touch "${D}"/var/log/munin/munin-cgi-{graph,html}.log - fowners $(usex apache2 apache munin) \ - /var/cache/munin-cgi \ - /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() { - 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/cache/munin-cgi \ - "${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.66.ebuild b/net-analyzer/munin/munin-2.0.66.ebuild deleted file mode 100644 index d589b34da0d2..000000000000 --- a/net-analyzer/munin/munin-2.0.66.ebuild +++ /dev/null @@ -1,417 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PATCHSET=1 - -inherit java-pkg-opt-2 systemd - -MY_P=${P/_/-} - -DESCRIPTION="Munin Server Monitoring Tool" -HOMEPAGE="http://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" - -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/Date-Manip - 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(-)?] - 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.5 ) - 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} - virtual/awk - ipmi? ( >=sys-libs/freeipmi-1.1.6-r1 ) - java? ( - >=virtual/jre-1.5 - || ( 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 - - 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 - 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 - - dodir /usr/lib/tmpfiles.d - cat > "${D}"/usr/lib/tmpfiles.d/${CATEGORY}:${PN}:${SLOT}.conf <<- EOF - 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 - - keepdir /var/cache/munin-cgi - touch "${D}"/var/log/munin/munin-cgi-{graph,html}.log - fowners $(usex apache2 apache munin) \ - /var/cache/munin-cgi \ - /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() { - 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/cache/munin-cgi \ - "${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.69-r1.ebuild b/net-analyzer/munin/munin-2.0.69-r1.ebuild new file mode 100644 index 000000000000..a2e3e857ae21 --- /dev/null +++ b/net-analyzer/munin/munin-2.0.69-r1.ebuild @@ -0,0 +1,420 @@ +# 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.73-r4.ebuild b/net-analyzer/munin/munin-2.0.73-r4.ebuild new file mode 100644 index 000000000000..de992a88997d --- /dev/null +++ b/net-analyzer/munin/munin-2.0.73-r4.ebuild @@ -0,0 +1,418 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +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 + " + +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/Date-Manip + 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 "${FILESDIR}"/patches/*.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 cgiuser=$(usex apache2 apache munin) + + 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 and /var/cache from the install, as it's not the + # package's to deal with. + rm -rf "${D}"/run "${D}"/var/cache || 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.73 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 - - + d /var/cache/munin-cgi 0755 ${cgiuser} 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-2.4-r1 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" + elog "/etc/apache2/vhosts.d/munin-2.4.include 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.74.ebuild b/net-analyzer/munin/munin-2.0.74.ebuild new file mode 100644 index 000000000000..d81f16efcec8 --- /dev/null +++ b/net-analyzer/munin/munin-2.0.74.ebuild @@ -0,0 +1,418 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +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 + " + +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/Date-Manip + 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 "${FILESDIR}"/patches/*.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 cgiuser=$(usex apache2 apache munin) + + 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 and /var/cache from the install, as it's not the + # package's to deal with. + rm -rf "${D}"/run "${D}"/var/cache || 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.73 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 - - + d /var/cache/munin-cgi 0755 ${cgiuser} 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-2.4-r1 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" + elog "/etc/apache2/vhosts.d/munin-2.4.include 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 new file mode 100644 index 000000000000..5163d71d6fe0 --- /dev/null +++ b/net-analyzer/munin/munin-2.0.75.ebuild @@ -0,0 +1,417 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +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 + " + +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 "${FILESDIR}"/patches/*.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 cgiuser=$(usex apache2 apache munin) + + 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 and /var/cache from the install, as it's not the + # package's to deal with. + rm -rf "${D}"/run "${D}"/var/cache || 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.73 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 - - + d /var/cache/munin-cgi 0755 ${cgiuser} 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-2.4-r1 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" + elog "/etc/apache2/vhosts.d/munin-2.4.include 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/nagios-check_dnssec/metadata.xml b/net-analyzer/nagios-check_dnssec/metadata.xml index a15e870b6e07..9a52f67622ec 100644 --- a/net-analyzer/nagios-check_dnssec/metadata.xml +++ b/net-analyzer/nagios-check_dnssec/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>sysadmin@gentoo.org</email> diff --git a/net-analyzer/nagios-check_fail2ban/Manifest b/net-analyzer/nagios-check_fail2ban/Manifest deleted file mode 100644 index 7c3c26d68eab..000000000000 --- a/net-analyzer/nagios-check_fail2ban/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST nagios-check_fail2ban-3.tar.gz 1848 BLAKE2B 61c1683bfa1e41ea27caa58ce9491d531751d96c4646e1d618a0f92bef2fe65b31c1d4bcebfe9c9c0b2498f7ad810d4dcabaf723e34bbde7e229020789e7b538 SHA512 a032042f8588575ef70c6644c5d385a18b25b89d71b067cdfe78230e5e53c2fb5bf88de1d97aa9411bfec00b213f6e1eae800e9545f0d8d4bad4e3c878927f9c diff --git a/net-analyzer/nagios-check_fail2ban/metadata.xml b/net-analyzer/nagios-check_fail2ban/metadata.xml deleted file mode 100644 index 42237b76505e..000000000000 --- a/net-analyzer/nagios-check_fail2ban/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> -<!-- maintainer-needed --> - <upstream> - <remote-id type="github">hollow/check_fail2ban</remote-id> - </upstream> -</pkgmetadata> diff --git a/net-analyzer/nagios-check_fail2ban/nagios-check_fail2ban-3.ebuild b/net-analyzer/nagios-check_fail2ban/nagios-check_fail2ban-3.ebuild deleted file mode 100644 index ac86c2830797..000000000000 --- a/net-analyzer/nagios-check_fail2ban/nagios-check_fail2ban-3.ebuild +++ /dev/null @@ -1,32 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit multilib autotools - -GITHUB_AUTHOR="hollow" -GITHUB_PROJECT="check_fail2ban" -GITHUB_COMMIT="c554837" - -DESCRIPTION="A nagios plugin for checking the fail2ban daemon" -HOMEPAGE="https://github.com/hollow/check_fail2ban" -SRC_URI="https://nodeload.github.com/${GITHUB_AUTHOR}/${GITHUB_PROJECT}/tarball/v${PV} -> ${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -DEPEND="|| ( >=net-analyzer/nagios-plugins-1.4.13-r1 >=net-analyzer/monitoring-plugins-2 )" -RDEPEND="${DEPEND}" - -S="${WORKDIR}"/${GITHUB_AUTHOR}-${GITHUB_PROJECT}-${GITHUB_COMMIT} - -src_prepare() { - eautoreconf -} - -src_install() { - emake DESTDIR="${D}" install -} diff --git a/net-analyzer/nagios-check_glsa2/metadata.xml b/net-analyzer/nagios-check_glsa2/metadata.xml index d01f11d38ed2..8bf8203f36ea 100644 --- a/net-analyzer/nagios-check_glsa2/metadata.xml +++ b/net-analyzer/nagios-check_glsa2/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>sysadmin@gentoo.org</email> diff --git a/net-analyzer/nagios-check_ipmi_sensor/Manifest b/net-analyzer/nagios-check_ipmi_sensor/Manifest index d625aa728559..45e45ed8c88f 100644 --- a/net-analyzer/nagios-check_ipmi_sensor/Manifest +++ b/net-analyzer/nagios-check_ipmi_sensor/Manifest @@ -1,2 +1 @@ -DIST check_ipmi_sensor_v3-14e6586.tgz 21836 BLAKE2B f56a44c5afd4583e64bd0e938aa03ec51a659a5f18c01685e3e03115f46ceda62ae899be677b1ba993cc0543c8cb775c9cc0c35c4b862b678a873e57e0361d21 SHA512 ac0744348e4d68459326396ee7fcc98bb0c3d2115fcf9724c7391f6f8dc9c0e2bb89a832822424b415acc3062201fb67d7eaceb4b9f2f41526e5fe8823187a0e -DIST check_ipmi_sensor_v3-8120430.tgz 20620 BLAKE2B 2542c4320498700362e8e7c1cfe0d00d98e4894e987aac002f0e2db499fdab4c27b33ff587349a836ae18d7b89939a96f6a66484b46486caa0d548c3e794d1c3 SHA512 89b3fd7ae2d523e1510c528d44d03ad9af5bc174bb325393f50a4a95380c996867b4502b55f38712515f556fe0f2019e15f6800ca1db00a9bbbcef655f1fd845 +DIST check_ipmi_sensor_v3-3.13.tar.gz 27079 BLAKE2B 19f2eddeeb43a73eb8faa2907b53f2b0514a19a3313e90487082c463ef12a128cb3b252457768c1afcacd06402b572f54cab7c05d159df4e6f7881b191663046 SHA512 b117ca13936e8c2201f3262302004bd0f903d19ee7289222962ee6b53119ba8306cdf355292c63b9d7639d850bd59c24b2875ccb8b3c408bdac60d144837e97a diff --git a/net-analyzer/nagios-check_ipmi_sensor/metadata.xml b/net-analyzer/nagios-check_ipmi_sensor/metadata.xml index 465282765dab..fa9820eeefb9 100644 --- a/net-analyzer/nagios-check_ipmi_sensor/metadata.xml +++ b/net-analyzer/nagios-check_ipmi_sensor/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> <email>idl0r@gentoo.org</email> diff --git a/net-analyzer/nagios-check_ipmi_sensor/nagios-check_ipmi_sensor-3.13.ebuild b/net-analyzer/nagios-check_ipmi_sensor/nagios-check_ipmi_sensor-3.13.ebuild new file mode 100644 index 000000000000..994a1a52d408 --- /dev/null +++ b/net-analyzer/nagios-check_ipmi_sensor/nagios-check_ipmi_sensor-3.13.ebuild @@ -0,0 +1,29 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +MY_P="${PN#nagios-}_v$(ver_cut 1)-${PV}" + +DESCRIPTION="IPMI Sensor Monitoring Plugin for Nagios/Icinga" +HOMEPAGE="http://www.thomas-krenn.com/en/oss/ipmi-plugin/" +SRC_URI="https://github.com/thomas-krenn/check_ipmi_sensor_v3/archive/refs/tags/v${PV}.tar.gz -> ${MY_P}.tar.gz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="amd64 hppa x86" +IUSE="" + +DEPEND="" +RDEPEND="dev-lang/perl + dev-perl/IPC-Run + sys-libs/freeipmi" + +S="${WORKDIR}/${MY_P}" + +src_install() { + exeinto /usr/$(get_libdir)/nagios/plugins + doexe check_ipmi_sensor + + dodoc changelog +} diff --git a/net-analyzer/nagios-check_ipmi_sensor/nagios-check_ipmi_sensor-3.2.ebuild b/net-analyzer/nagios-check_ipmi_sensor/nagios-check_ipmi_sensor-3.2.ebuild deleted file mode 100644 index 331c378057a1..000000000000 --- a/net-analyzer/nagios-check_ipmi_sensor/nagios-check_ipmi_sensor-3.2.ebuild +++ /dev/null @@ -1,32 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit multilib versionator - -MY_COMMIT="8120430" -MY_P="${PN#nagios-}_v$(get_major_version $PV)-${MY_COMMIT}" - -DESCRIPTION="IPMI Sensor Monitoring Plugin for Nagios/Icinga" -HOMEPAGE="http://www.thomas-krenn.com/en/oss/ipmi-plugin/" -SRC_URI="http://git.thomas-krenn.com/?p=check_ipmi_sensor_v3.git;a=snapshot;h=${MY_COMMIT};sf=tgz -> ${MY_P}.tgz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="amd64 hppa x86" -IUSE="" - -DEPEND="" -RDEPEND="dev-lang/perl - dev-perl/IPC-Run - sys-libs/freeipmi" - -S="${WORKDIR}/${MY_P}" - -src_install() { - exeinto /usr/$(get_libdir)/nagios/plugins - doexe check_ipmi_sensor - - dodoc changelog.txt -} diff --git a/net-analyzer/nagios-check_ipmi_sensor/nagios-check_ipmi_sensor-3.6.ebuild b/net-analyzer/nagios-check_ipmi_sensor/nagios-check_ipmi_sensor-3.6.ebuild deleted file mode 100644 index d549df34bd51..000000000000 --- a/net-analyzer/nagios-check_ipmi_sensor/nagios-check_ipmi_sensor-3.6.ebuild +++ /dev/null @@ -1,32 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit multilib versionator - -MY_COMMIT="14e6586" -MY_P="${PN#nagios-}_v$(get_major_version $PV)-${MY_COMMIT}" - -DESCRIPTION="IPMI Sensor Monitoring Plugin for Nagios/Icinga" -HOMEPAGE="http://www.thomas-krenn.com/en/oss/ipmi-plugin/" -SRC_URI="http://git.thomas-krenn.com/?p=check_ipmi_sensor_v3.git;a=snapshot;h=${MY_COMMIT};sf=tgz -> ${MY_P}.tgz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~hppa ~x86" -IUSE="" - -DEPEND="" -RDEPEND="dev-lang/perl - dev-perl/IPC-Run - sys-libs/freeipmi" - -S="${WORKDIR}/${MY_P}" - -src_install() { - exeinto /usr/$(get_libdir)/nagios/plugins - doexe check_ipmi_sensor - - dodoc changelog.txt -} diff --git a/net-analyzer/nagios-check_linux_bonding/Manifest b/net-analyzer/nagios-check_linux_bonding/Manifest index b57e8c706be7..b567506ad048 100644 --- a/net-analyzer/nagios-check_linux_bonding/Manifest +++ b/net-analyzer/nagios-check_linux_bonding/Manifest @@ -1 +1 @@ -DIST check_linux_bonding-1.4.tar.gz 24670 BLAKE2B 6f136043fdcc74f677963ad4798ea18a8f813c3bf6cf1d00f6649d72dfc7d953c01a43bd3050758a8461f255ce3a9d3ddbdd1bcb29de316ea6438f20409ce699 SHA512 2b1e11007680accd8667ceb8710c7a7448766fd0c5aa3be60a34209f1b25892e7fecc46f9fc5e7cc0d4776f68cc17f8db8d8f2758695c82045a5832e8a4c7e81 +DIST check_linux_bonding-1.4.gh.tar.gz 24921 BLAKE2B ef582184471e4ca9d4b9a1d5cdee481852f1f452806ca081e04e74b7b469109f3a5998708cdb7ee6d3ffa9240cdbf721f0cbf6b3f4be2c4cc62042fce6647ccd SHA512 e8195d012a3da53983acdb8ea54d87995541e4e303dce28683ca04b6a6f84826c37db42c295b7e121092482a49268f57355284b57bb77a2212c46b834dd57088 diff --git a/net-analyzer/nagios-check_linux_bonding/metadata.xml b/net-analyzer/nagios-check_linux_bonding/metadata.xml index 7a38bb900964..ace7a7a10525 100644 --- a/net-analyzer/nagios-check_linux_bonding/metadata.xml +++ b/net-analyzer/nagios-check_linux_bonding/metadata.xml @@ -1,5 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <!-- maintainer-needed --> + <upstream> + <remote-id type="github">glynastill/check_linux_bonding-1.4</remote-id> + </upstream> </pkgmetadata> diff --git a/net-analyzer/nagios-check_linux_bonding/nagios-check_linux_bonding-1.4-r1.ebuild b/net-analyzer/nagios-check_linux_bonding/nagios-check_linux_bonding-1.4-r1.ebuild new file mode 100644 index 000000000000..558d1eb00b93 --- /dev/null +++ b/net-analyzer/nagios-check_linux_bonding/nagios-check_linux_bonding-1.4-r1.ebuild @@ -0,0 +1,32 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +EGIT_COMMIT="fde23cba225870ceb1162d918a6307c608e654a5" +MY_P="${P/nagios-/}" + +DESCRIPTION="Nagios plugin to monitor bonding status of network interfaces" +HOMEPAGE="https://github.com/glynastill/check_linux_bonding-1.4" +SRC_URI="https://github.com/glynastill/${MY_P}/archive/${EGIT_COMMIT}.tar.gz -> ${MY_P}.gh.tar.gz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="amd64 x86" + +RDEPEND="dev-lang/perl" +DEPEND="${RDEPEND}" + +S="${WORKDIR}"/${MY_P}-${EGIT_COMMIT} + +src_install() { + default + + local nagiosplugindir=/usr/$(get_libdir)/nagios/plugins + dodir "${nagiosplugindir}" + exeinto ${nagiosplugindir} + doexe check_linux_bonding + + dodoc CHANGES + doman man/check_linux_bonding.8 +} diff --git a/net-analyzer/nagios-check_linux_bonding/nagios-check_linux_bonding-1.4.ebuild b/net-analyzer/nagios-check_linux_bonding/nagios-check_linux_bonding-1.4.ebuild deleted file mode 100644 index f5b6af3adc6b..000000000000 --- a/net-analyzer/nagios-check_linux_bonding/nagios-check_linux_bonding-1.4.ebuild +++ /dev/null @@ -1,34 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit multilib - -MY_P=${P/nagios-/} - -DESCRIPTION="Nagios plugin to monitor bonding status of network interfaces" -HOMEPAGE="http://folk.uio.no/trondham/software/check_linux_bonding.html" -SRC_URI="http://folk.uio.no/trondham/software/files/${MY_P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="" - -RDEPEND="dev-lang/perl" -DEPEND="${RDEPEND}" - -S="${WORKDIR}/${MY_P}" - -src_install() { - default - - local nagiosplugindir=/usr/$(get_libdir)/nagios/plugins - dodir "${nagiosplugindir}" - exeinto ${nagiosplugindir} - doexe check_linux_bonding - - dodoc CHANGES - doman man/check_linux_bonding.8 -} diff --git a/net-analyzer/nagios-check_logfiles/Manifest b/net-analyzer/nagios-check_logfiles/Manifest index cec2e146f4c3..79e3ec445ea2 100644 --- a/net-analyzer/nagios-check_logfiles/Manifest +++ b/net-analyzer/nagios-check_logfiles/Manifest @@ -1 +1 @@ -DIST nagios-check_logfiles-3.7.6.3.tar.gz 238683 BLAKE2B c2bd47a13263ac76c1bbced7a1410416c07ef35b39ea60bbf6037de3c10dd00df30a215f461270501240d5eb35e2b687fd5590d291028d7975c15470c06177a4 SHA512 2f72d571bfc0815e12b5c9a6e178b7b9b6e58d69e2d1a3efc560dd6b7bfd3d04a705d15e93069959611be1981941866e8775ee7d67c5dbf3983a155ab2ec3c91 +DIST nagios-check_logfiles-4.0.1.3.tar.gz 254371 BLAKE2B d4219e03ac2b981b08866baa4eab4fb16857215cb817ee44f23690094a3b29bf806caa6c1cd98c439ba81fa31cd63ce1fcfca5c92d1aad260490db087a560fd7 SHA512 1893e67d9b27939fae6f330b1f796e98becbb1c4bd1dfe11811236b0d9bcdab0b2fea2a49f7b90302d15c75328422f479d1a26a486cfbe1ec0d3b8f9b71a5150 diff --git a/net-analyzer/nagios-check_logfiles/metadata.xml b/net-analyzer/nagios-check_logfiles/metadata.xml index 599b5a1c1aec..78600c1844fe 100644 --- a/net-analyzer/nagios-check_logfiles/metadata.xml +++ b/net-analyzer/nagios-check_logfiles/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>sysadmin@gentoo.org</email> diff --git a/net-analyzer/nagios-check_logfiles/nagios-check_logfiles-3.7.6.3.ebuild b/net-analyzer/nagios-check_logfiles/nagios-check_logfiles-3.7.6.3.ebuild deleted file mode 100644 index bf4835955eaa..000000000000 --- a/net-analyzer/nagios-check_logfiles/nagios-check_logfiles-3.7.6.3.ebuild +++ /dev/null @@ -1,25 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -DESCRIPTION="A nagios plugin for checking logfiles" -HOMEPAGE="https://labs.consol.de/nagios/check_logfiles/index.html" - -MY_P=${P/nagios-/} - -SRC_URI="https://labs.consol.de/assets/downloads/nagios/${MY_P}.tar.gz -> ${P}.tar.gz" -LICENSE="GPL-3" -SLOT="0" - -KEYWORDS="~alpha amd64 ~ppc ppc64 ~sparc x86" - -RDEPEND="|| ( >=net-analyzer/nagios-plugins-1.4.13-r1 >=net-analyzer/monitoring-plugins-2 )" - -S="${WORKDIR}/${MY_P}" - -src_configure() { - econf \ - --libexecdir="${EPREFIX}/usr/$(get_libdir)/nagios/plugins" \ - --sysconfdir="${EPREFIX}/etc/nagios" -} diff --git a/net-analyzer/nagios-check_logfiles/nagios-check_logfiles-4.0.1.3.ebuild b/net-analyzer/nagios-check_logfiles/nagios-check_logfiles-4.0.1.3.ebuild new file mode 100644 index 000000000000..654975febfc5 --- /dev/null +++ b/net-analyzer/nagios-check_logfiles/nagios-check_logfiles-4.0.1.3.ebuild @@ -0,0 +1,25 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DESCRIPTION="A nagios plugin for checking logfiles" +HOMEPAGE="https://labs.consol.de/nagios/check_logfiles/index.html" + +MY_P=${P/nagios-/} + +SRC_URI="https://labs.consol.de/assets/downloads/nagios/${MY_P}.tar.gz -> ${P}.tar.gz" +LICENSE="GPL-3" +SLOT="0" + +KEYWORDS="~alpha amd64 ~ppc ppc64 ~sparc x86" + +RDEPEND="|| ( >=net-analyzer/nagios-plugins-1.4.13-r1 >=net-analyzer/monitoring-plugins-2 )" + +S="${WORKDIR}/${MY_P}" + +src_configure() { + econf \ + --libexecdir="${EPREFIX}/usr/$(get_libdir)/nagios/plugins" \ + --sysconfdir="${EPREFIX}/etc/nagios" +} diff --git a/net-analyzer/nagios-check_multiple/metadata.xml b/net-analyzer/nagios-check_multiple/metadata.xml index 9956f0ad2444..15b67112297a 100644 --- a/net-analyzer/nagios-check_multiple/metadata.xml +++ b/net-analyzer/nagios-check_multiple/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> <email>mjo@gentoo.org</email> diff --git a/net-analyzer/nagios-check_multiple/nagios-check_multiple-0.0.1-r3.ebuild b/net-analyzer/nagios-check_multiple/nagios-check_multiple-0.0.1-r3.ebuild new file mode 100644 index 000000000000..8444b98c88c4 --- /dev/null +++ b/net-analyzer/nagios-check_multiple/nagios-check_multiple-0.0.1-r3.ebuild @@ -0,0 +1,46 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python{3_10,3_11,3_12} ) +DISTUTILS_USE_PEP517=setuptools +inherit distutils-r1 + +MY_PN="check_multiple" +DESCRIPTION="A Nagios plugin to execute multiple checks in parallel" +HOMEPAGE="https://github.com/clarkbox/check_multiple" +SRC_URI="https://github.com/clarkbox/check_multiple/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="amd64" +IUSE="test" +RESTRICT="!test? ( test )" + +S="${WORKDIR}/${MY_PN}-${PV}" + +src_install() { + distutils-r1_src_install + + local nagiosplugindir="/usr/$(get_libdir)/nagios/plugins" + dodir "${nagiosplugindir}" + + # Create a symlink from the nagios plugin directory to the /usr/bin + # location. The "binary" in /usr/bin should also be a symlink, since + # the python machinery allows the user to switch out the + # interpreter. We don't want to mess with any of that, so we just + # point to whatever the system would use if the user executed + # ${MY_PN}. + # + # The relative symlink is preferred so that if the package is + # installed e.g. while in a chroot, the symlink will never point + # outside of that chroot. + # + dosym "../../../bin/${MY_PN}" "${nagiosplugindir}/${MY_PN}" +} + +python_test() { + "${EPYTHON}" -m unittest -v lib/check_multiple/check_multiple.py \ + || die "test suite failed" +} diff --git a/net-analyzer/nagios-check_multiple/nagios-check_multiple-0.0.1.ebuild b/net-analyzer/nagios-check_multiple/nagios-check_multiple-0.0.1.ebuild deleted file mode 100644 index 52195f5d2614..000000000000 --- a/net-analyzer/nagios-check_multiple/nagios-check_multiple-0.0.1.ebuild +++ /dev/null @@ -1,46 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python{3_6,3_7,3_8} ) -DISTUTILS_USE_SETUPTOOLS=no -inherit distutils-r1 - -MY_PN="check_multiple" -DESCRIPTION="A Nagios plugin to execute multiple checks in parallel" -HOMEPAGE="https://github.com/clarkbox/check_multiple" -SRC_URI="https://github.com/clarkbox/check_multiple/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="amd64" -IUSE="test" -RESTRICT="!test? ( test )" - -S="${WORKDIR}/${MY_PN}-${PV}" - -src_install() { - distutils-r1_src_install - - local nagiosplugindir="/usr/$(get_libdir)/nagios/plugins" - dodir "${nagiosplugindir}" - - # Create a symlink from the nagios plugin directory to the /usr/bin - # location. The "binary" in /usr/bin should also be a symlink, since - # the python machinery allows the user to switch out the - # interpreter. We don't want to mess with any of that, so we just - # point to whatever the system would use if the user executed - # ${MY_PN}. - # - # The relative symlink is preferred so that if the package is - # installed e.g. while in a chroot, the symlink will never point - # outside of that chroot. - # - dosym "../../../bin/${MY_PN}" "${nagiosplugindir}/${MY_PN}" -} - -python_test() { - "${EPYTHON}" -m unittest -v lib/check_multiple/check_multiple.py \ - || die "test suite failed" -} diff --git a/net-analyzer/nagios-check_mysql_health/metadata.xml b/net-analyzer/nagios-check_mysql_health/metadata.xml index 1e9767fee723..81522baa168e 100644 --- a/net-analyzer/nagios-check_mysql_health/metadata.xml +++ b/net-analyzer/nagios-check_mysql_health/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> <email>mjo@gentoo.org</email> diff --git a/net-analyzer/nagios-check_mysql_health/nagios-check_mysql_health-2.2.2-r1.ebuild b/net-analyzer/nagios-check_mysql_health/nagios-check_mysql_health-2.2.2-r1.ebuild new file mode 100644 index 000000000000..3de8e319875f --- /dev/null +++ b/net-analyzer/nagios-check_mysql_health/nagios-check_mysql_health-2.2.2-r1.ebuild @@ -0,0 +1,39 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +MY_PN="${PN#nagios-}" +MY_P="${MY_PN}-${PV}" + +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" + +# Found by grepping for "use " in the built +# plugins-scripts/check_mysql_health. +RDEPEND=" + dev-perl/DBD-mysql + dev-perl/DBI + virtual/perl-Data-Dumper + virtual/perl-File-Temp + virtual/perl-Net-Ping + virtual/perl-Time-HiRes + " + +src_configure() { + # Should match net-analyzer/{monitoring,nagios}-plugins. + econf --libexecdir="/usr/$(get_libdir)/nagios/plugins" +} + +# Here we should have a pkg_preinst() that creates the nagios user/group +# (using the same command from e.g. net-analyzer/nagios-plugins). But +# right now, the build system for check_mysql_health has a bug: it +# doesn't use the configured user (INSTALL_OPTIONS aren't passed to +# /usr/bin/install), so it's pointless. Don't forget to inherit +# user.eclass! diff --git a/net-analyzer/nagios-check_pidfile/Manifest b/net-analyzer/nagios-check_pidfile/Manifest deleted file mode 100644 index 00126e06f315..000000000000 --- a/net-analyzer/nagios-check_pidfile/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST nagios-check_pidfile-1.tar.gz 2137 BLAKE2B bb0b7239ab9dfb4acb3a40f16cc5537605c60256f6c1efcddc9b6001dffc71f7e7ae8f58b6cbb568afd71200e672e3b348ce3b9c360407b731d3f40ab81fa514 SHA512 a24493a72f6d9fb4daf606a131a3a6cafe6085b1d47f7b0f7944642929e86b5d29cf46fb28c20b7683ea5b9a99beb93bb5f32a08542e2e9af613e4cc62197ffe diff --git a/net-analyzer/nagios-check_pidfile/metadata.xml b/net-analyzer/nagios-check_pidfile/metadata.xml deleted file mode 100644 index b0bc64ef4267..000000000000 --- a/net-analyzer/nagios-check_pidfile/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> -<!-- maintainer-needed --> - <upstream> - <remote-id type="github">hollow/check_pidfile</remote-id> - </upstream> -</pkgmetadata> diff --git a/net-analyzer/nagios-check_pidfile/nagios-check_pidfile-1.ebuild b/net-analyzer/nagios-check_pidfile/nagios-check_pidfile-1.ebuild deleted file mode 100644 index 0c557fdb768e..000000000000 --- a/net-analyzer/nagios-check_pidfile/nagios-check_pidfile-1.ebuild +++ /dev/null @@ -1,28 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit autotools - -DESCRIPTION="A nagios plugin for checking daemons via pidfiles" -HOMEPAGE="https://github.com/hollow/check_pidfile" -SRC_URI="https://github.com/hollow/check_pidfile/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -DEPEND="|| ( >=net-analyzer/nagios-plugins-1.4.13-r1 net-analyzer/monitoring-plugins )" -RDEPEND="${DEPEND}" - -S="${WORKDIR}"/check_pidfile-${PV} - -src_prepare() { - eautoreconf -} - -src_install() { - emake DESTDIR="${D}" install -} diff --git a/net-analyzer/nagios-check_rbl/Manifest b/net-analyzer/nagios-check_rbl/Manifest index 1b3800e794d7..49b67622e22b 100644 --- a/net-analyzer/nagios-check_rbl/Manifest +++ b/net-analyzer/nagios-check_rbl/Manifest @@ -1 +1 @@ -DIST check_rbl-1.4.1.tar.gz 47585 BLAKE2B 24979d1579ef46f6d0626700bb8b9aa3f3acd4b422398ecbfa98909248fd6ffe61a763e377e7942d3078d8b91488f3fc0e2ab25f7c4821bcfa5cde08d000bd5c SHA512 3023aab6ba42dec46cb93eb2ef15e1998a1b3226bd1f143441e14a4271279ac9b24b85b9fc41a382eb203e5d2846b7f4ea4fe27db99d75b104d9182ea53079cb +DIST check_rbl-1.7.0.tar.gz 51673 BLAKE2B 7e2d23ea5cd44082ebe9963326bc2a8517c737640fada229d0b65d64ac92ce50e80b675834f4bd7dbc56d653e0243558fe6f1c402b11498d48bc948d3facda57 SHA512 5b219362bfa736832e935c64019ee50b87d4f9cc2bce0ab4795eb4c59e03712adc9461cdd6624cbaf1d98a5afdd9f611dbdc58fd913a4478b0fef0664cddcf80 diff --git a/net-analyzer/nagios-check_rbl/metadata.xml b/net-analyzer/nagios-check_rbl/metadata.xml index 366e3f343c3c..4590e0aecc4c 100644 --- a/net-analyzer/nagios-check_rbl/metadata.xml +++ b/net-analyzer/nagios-check_rbl/metadata.xml @@ -1,5 +1,5 @@ -<?xml version='1.0' encoding='UTF-8'?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> <email>mjo@gentoo.org</email> diff --git a/net-analyzer/nagios-check_rbl/nagios-check_rbl-1.4.1.ebuild b/net-analyzer/nagios-check_rbl/nagios-check_rbl-1.4.1.ebuild deleted file mode 100644 index 8f6e17721ea9..000000000000 --- a/net-analyzer/nagios-check_rbl/nagios-check_rbl-1.4.1.ebuild +++ /dev/null @@ -1,56 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -DESCRIPTION="Monitor whether or not a host is blacklisted" -HOMEPAGE="https://github.com/matteocorti/check_rbl" - -MY_P="${P/nagios-/}" -SRC_URI="https://github.com/matteocorti/check_rbl/releases/download/v${PV}/${MY_P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" - -KEYWORDS="amd64 ~hppa sparc x86" -IUSE="" - -# No, this is not redundant -- see bug 627082. -RESTRICT=test - -# The package's INSTALL/Makefile.PL files specify its dependencies. -# -# * Data::Validate::Domain (dev-perl/Data-Validate-Domain) -# * Data::Validate::IP (dev-perl/Data-Validate-IP) -# * IO::Select (dev-lang/perl) -# * Monitoring::Plugin (dev-perl/Monitoring-Plugin) -# * Monitoring::Plugin::Getopt (dev-perl/Monitoring-Plugin) -# * Monitoring::Plugin::Threshold (dev-perl/Monitoring-Plugin) -# * Net::DNS (dev-perl/Net-DNS) -# * Net::IP (dev-perl/Net-IP) -# * Readonly (dev-perl/Readonly) -# -RDEPEND="dev-lang/perl - dev-perl/Data-Validate-Domain - dev-perl/Data-Validate-IP - dev-perl/Monitoring-Plugin - dev-perl/Net-DNS - dev-perl/Net-IP - dev-perl/Readonly" -DEPEND="${RDEPEND}" - -S="${WORKDIR}/${MY_P}" - -src_configure() { - perl Makefile.PL INSTALLDIRS=vendor || die -} - -src_install() { - default - - local nagiosplugindir=/usr/$(get_libdir)/nagios/plugins - - # It's simplest to move this file after it's been installed. - dodir "${nagiosplugindir}" - mv "${D}"/usr/bin/check_rbl "${D}"/"${nagiosplugindir}" || die -} diff --git a/net-analyzer/nagios-check_rbl/nagios-check_rbl-1.7.0.ebuild b/net-analyzer/nagios-check_rbl/nagios-check_rbl-1.7.0.ebuild new file mode 100644 index 000000000000..96510e0ddb18 --- /dev/null +++ b/net-analyzer/nagios-check_rbl/nagios-check_rbl-1.7.0.ebuild @@ -0,0 +1,60 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DESCRIPTION="Monitor whether or not a host is blacklisted" +HOMEPAGE="https://github.com/matteocorti/check_rbl" + +MY_P="${P/nagios-/}" +SRC_URI="https://github.com/matteocorti/check_rbl/releases/download/v${PV}/${MY_P}.tar.gz" + +LICENSE="GPL-3" +SLOT="0" + +KEYWORDS="amd64 ~hppa sparc x86" +IUSE="" + +# No, this is not redundant -- see bug 627082. +RESTRICT=test + +# The package's INSTALL/Makefile.PL files specify its dependencies. +# +# * Capture::Tiny (dev-perl/Capture-Tiny) +# * Data::Validate::Domain (dev-perl/Data-Validate-Domain) +# * Data::Validate::IP (dev-perl/Data-Validate-IP) +# * IO::Select (dev-lang/perl) +# * Monitoring::Plugin (dev-perl/Monitoring-Plugin) +# * Monitoring::Plugin::Getopt (dev-perl/Monitoring-Plugin) +# * Monitoring::Plugin::Threshold (dev-perl/Monitoring-Plugin) +# * Net::DNS (dev-perl/Net-DNS) +# * Net::IP (dev-perl/Net-IP) +# * Readonly (dev-perl/Readonly) +# * Socket (virtual/perl-Socket) +# +RDEPEND="dev-lang/perl + dev-perl/Capture-Tiny + dev-perl/Data-Validate-Domain + dev-perl/Data-Validate-IP + dev-perl/Monitoring-Plugin + dev-perl/Net-DNS + dev-perl/Net-IP + dev-perl/Readonly + virtual/perl-Socket" +DEPEND="${RDEPEND}" + +S="${WORKDIR}/${MY_P}" + +src_configure() { + perl Makefile.PL INSTALLDIRS=vendor || die +} + +src_install() { + default + + local nagiosplugindir=/usr/$(get_libdir)/nagios/plugins + + # It's simplest to move this file after it's been installed. + dodir "${nagiosplugindir}" + mv "${D}"/usr/bin/check_rbl "${D}"/"${nagiosplugindir}" || die +} diff --git a/net-analyzer/nagios-core/Manifest b/net-analyzer/nagios-core/Manifest index 8e5831ec7d2d..6a4ac48da0dc 100644 --- a/net-analyzer/nagios-core/Manifest +++ b/net-analyzer/nagios-core/Manifest @@ -1,2 +1,3 @@ -DIST nagios-4.4.6.tar.gz 11333414 BLAKE2B b64d34c9267349582cb43500b7b90f7948152b5fd9b28ecb0a376d0255ec9774e693beba9205512294b07dddc4702f37d0f45b3c3fcc6abbf8e8b4d9236d0ace SHA512 6ceb582816ec741439963bde1fe8d85fa3bc4ed3c2238fb818db0c4f4224a4333d153040c11a7f4d783e919c11f9ff45907bdc478504e4155f64a4c575f80550 +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/metadata.xml b/net-analyzer/nagios-core/metadata.xml index 2837e2b7ed5c..a696209a6257 100644 --- a/net-analyzer/nagios-core/metadata.xml +++ b/net-analyzer/nagios-core/metadata.xml @@ -1,5 +1,5 @@ -<?xml version='1.0' encoding='UTF-8'?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> <email>mjo@gentoo.org</email> diff --git a/net-analyzer/nagios-core/nagios-core-4.4.14.ebuild b/net-analyzer/nagios-core/nagios-core-4.4.14.ebuild new file mode 100644 index 000000000000..14dbc007802e --- /dev/null +++ b/net-analyzer/nagios-core/nagios-core-4.4.14.ebuild @@ -0,0 +1,266 @@ +# 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="mirror://sourceforge/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}" + +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-core/nagios-core-4.4.6-r1.ebuild b/net-analyzer/nagios-core/nagios-core-4.4.6-r1.ebuild deleted file mode 100644 index b345507323e7..000000000000 --- a/net-analyzer/nagios-core/nagios-core-4.4.6-r1.ebuild +++ /dev/null @@ -1,260 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit 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="mirror://sourceforge/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 perl +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 - perl? ( 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}" - -src_configure() { - local myconf - - if use perl; then - myconf="${myconf} --enable-embedded-perl --with-perlcache" - fi - - 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 - - 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" - - # 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) DESTDIR="${D}" 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 - - newinitd startup/openrc-init nagios - - 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-core/nagios-core-4.4.6.ebuild b/net-analyzer/nagios-core/nagios-core-4.4.6.ebuild deleted file mode 100644 index e0fac4bf5ebd..000000000000 --- a/net-analyzer/nagios-core/nagios-core-4.4.6.ebuild +++ /dev/null @@ -1,252 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit 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="mirror://sourceforge/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 perl +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 - perl? ( 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. -BDEPEND="${CONFIGURE_DEPEND} 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}" - -src_configure() { - local myconf - - if use perl; then - myconf="${myconf} --enable-embedded-perl --with-perlcache" - fi - - 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 - - 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" - - # 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) DESTDIR="${D}" 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 - - newinitd startup/openrc-init nagios - - 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-core/nagios-core-4.5.1.ebuild b/net-analyzer/nagios-core/nagios-core-4.5.1.ebuild new file mode 100644 index 000000000000..968007cec951 --- /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="mirror://sourceforge/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/metadata.xml b/net-analyzer/nagios-icinga-openvpn/metadata.xml index 45125b9b6e99..e8fbfcfe3519 100644 --- a/net-analyzer/nagios-icinga-openvpn/metadata.xml +++ b/net-analyzer/nagios-icinga-openvpn/metadata.xml @@ -1,8 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> <email>mjo@gentoo.org</email> <name>Michael Orlitzky</name> </maintainer> + <upstream> + <remote-id type="github">liquidat/nagios-icinga-openvpn</remote-id> + </upstream> </pkgmetadata> diff --git a/net-analyzer/nagios-icinga-openvpn/nagios-icinga-openvpn-0.0.1-r1.ebuild b/net-analyzer/nagios-icinga-openvpn/nagios-icinga-openvpn-0.0.1-r1.ebuild deleted file mode 100644 index 48966a0e20d0..000000000000 --- a/net-analyzer/nagios-icinga-openvpn/nagios-icinga-openvpn-0.0.1-r1.ebuild +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_6 python3_7 python3_8 ) -DISTUTILS_USE_SETUPTOOLS=no -inherit distutils-r1 - -MY_PN="check_openvpn" -DESCRIPTION="A Nagios plugin to check whether an OpenVPN server is alive" -HOMEPAGE="https://github.com/liquidat/nagios-icinga-openvpn" -SRC_URI="https://github.com/liquidat/nagios-icinga-openvpn/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="amd64" -IUSE="" - -src_install() { - distutils-r1_src_install - - local nagiosplugindir="/usr/$(get_libdir)/nagios/plugins" - dodir "${nagiosplugindir}" - - # Create a symlink from the nagios plugin directory to the /usr/bin - # location. The "binary" in /usr/bin should also be a symlink, since - # the python machinery allows the user to switch out the - # interpreter. We don't want to mess with any of that, so we just - # point to whatever the system would use if the user executed - # ${MY_PN}. - # - # The relative symlink is preferred so that if the package is - # installed e.g. while in a chroot, the symlink will never point - # outside of that chroot. - # - dosym "../../../bin/${MY_PN}" "${nagiosplugindir}/${MY_PN}" -} diff --git a/net-analyzer/nagios-icinga-openvpn/nagios-icinga-openvpn-0.0.1-r4.ebuild b/net-analyzer/nagios-icinga-openvpn/nagios-icinga-openvpn-0.0.1-r4.ebuild new file mode 100644 index 000000000000..f2cd71d9e794 --- /dev/null +++ b/net-analyzer/nagios-icinga-openvpn/nagios-icinga-openvpn-0.0.1-r4.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 python3_11 python3_12 ) +DISTUTILS_USE_PEP517=setuptools +inherit distutils-r1 + +MY_PN="check_openvpn" +DESCRIPTION="A Nagios plugin to check whether an OpenVPN server is alive" +HOMEPAGE="https://github.com/liquidat/nagios-icinga-openvpn" +SRC_URI="https://github.com/liquidat/nagios-icinga-openvpn/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="amd64" + +src_install() { + distutils-r1_src_install + + local nagiosplugindir="/usr/$(get_libdir)/nagios/plugins" + dodir "${nagiosplugindir}" + + # Create a symlink from the nagios plugin directory to the /usr/bin + # location. The "binary" in /usr/bin should also be a symlink, since + # the python machinery allows the user to switch out the + # interpreter. We don't want to mess with any of that, so we just + # point to whatever the system would use if the user executed + # ${MY_PN}. + # + # The relative symlink is preferred so that if the package is + # installed e.g. while in a chroot, the symlink will never point + # outside of that chroot. + # + dosym "../../../bin/${MY_PN}" "${nagiosplugindir}/${MY_PN}" +} diff --git a/net-analyzer/nagios-plugin-check_lm_sensors/metadata.xml b/net-analyzer/nagios-plugin-check_lm_sensors/metadata.xml index 3ded77e652ff..14eeb18b6469 100644 --- a/net-analyzer/nagios-plugin-check_lm_sensors/metadata.xml +++ b/net-analyzer/nagios-plugin-check_lm_sensors/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> <email>sbraz@gentoo.org</email> diff --git a/net-analyzer/nagios-plugin-check_raid/Manifest b/net-analyzer/nagios-plugin-check_raid/Manifest index 608fac71c877..4eeb321c9ee5 100644 --- a/net-analyzer/nagios-plugin-check_raid/Manifest +++ b/net-analyzer/nagios-plugin-check_raid/Manifest @@ -1,2 +1 @@ DIST nagios-plugin-check_raid-4.0.10.tar.gz 54895 BLAKE2B 6432624de419fca2d376362e5d13031272b6feeccdc6202b8a7eec92ab1f6c362ab88f9c912b10695c34347388dd154b12757a8b4268d30c0436589da060d5cc SHA512 1b8c353fbd0dff6fea5311c4149af16b1e1a5778794ef0085dcd8ee18f196579cca0b9f8c1ecef51f3ee36665aec6069f64ebe4d2e565bf7223bed59f2de5ee1 -DIST nagios-plugin-check_raid-4.0.8.tar.gz 53803 BLAKE2B debc312ccf688c6ed4c4d89d77efbf454ae030260741277f1f10966d28348a317255a69a932ceba69300c37b98448ebb3ca3a0b463d64814a4ca11043bdc5850 SHA512 237cbe798aa6c65b4bd6b9c9e24923e172d3d62c50afd7df23e2b6c8888041368025860edf5f826a77c6858e6312bba05225f0e20787e1bb579d833950b324ee diff --git a/net-analyzer/nagios-plugin-check_raid/metadata.xml b/net-analyzer/nagios-plugin-check_raid/metadata.xml index 512cb3611534..92b1823c07b8 100644 --- a/net-analyzer/nagios-plugin-check_raid/metadata.xml +++ b/net-analyzer/nagios-plugin-check_raid/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> <email>robbat2@gentoo.org</email> @@ -14,14 +14,13 @@ <remote-id type="github">glensc/nagios-plugin-check_raid</remote-id> </upstream> <use> - <flag name='3ware'>Support 3ware RAID controllers</flag> - <flag name='aacraid'>Support Adaptec AAC-RAID controllers</flag> - <flag name='dmraid'>Support Device-Mapper RAID</flag> - <flag name='hpa'>Support HP Array controllers</flag> - <flag name='hpsa'>Support HP SmartArray (CCISS) controllers</flag> - <flag name='megaraid-sas'>Support LSI MegaRAID SAS controllers</flag> - <flag name='megaraid-scsi'>Support LSI MegaRAID SCSI controllers</flag> - <flag name='mpt-sas2'>Support LSI SAS-2 controllers</flag> - <flag name='mpt'>Support LSI MPT Fusion controllers</flag> + <flag name="3ware">Support 3ware RAID controllers</flag> + <flag name="aacraid">Support Adaptec AAC-RAID controllers</flag> + <flag name="dmraid">Support Device-Mapper RAID</flag> + <flag name="hpa">Support HP Array controllers</flag> + <flag name="hpsa">Support HP SmartArray (CCISS) controllers</flag> + <flag name="megaraid-sas">Support LSI MegaRAID SAS controllers</flag> + <flag name="mpt-sas2">Support LSI SAS-2 controllers</flag> + <flag name="mpt">Support LSI MPT Fusion controllers</flag> </use> </pkgmetadata> diff --git a/net-analyzer/nagios-plugin-check_raid/nagios-plugin-check_raid-4.0.10-r3.ebuild b/net-analyzer/nagios-plugin-check_raid/nagios-plugin-check_raid-4.0.10-r3.ebuild new file mode 100644 index 000000000000..e5295fefced0 --- /dev/null +++ b/net-analyzer/nagios-plugin-check_raid/nagios-plugin-check_raid-4.0.10-r3.ebuild @@ -0,0 +1,66 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit perl-module + +#COMMIT="" +MY_PV="${COMMIT:-${PV}}" +MY_P="${PN}-${MY_PV}" + +DESCRIPTION="Nagios/Icinga plugin to check current server's RAID status" +HOMEPAGE="https://github.com/glensc/nagios-plugin-check_raid" +SRC_URI="https://github.com/glensc/nagios-plugin-check_raid/archive/${MY_PV}.tar.gz -> ${MY_P}.tar.gz" +S="${WORKDIR}/${MY_P}" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~sparc ~x86" +IUSE="3ware aacraid dmraid hpa hpsa megaraid-sas mpt mpt-sas2" + +DEPEND=" + dev-perl/Monitoring-Plugin + dev-perl/Module-Pluggable" +RDEPEND="${DEPEND} + sys-apps/smartmontools + sys-fs/lsscsi + 3ware? ( sys-block/tw_cli ) + aacraid? ( sys-block/arcconf ) + dmraid? ( sys-fs/dmraid ) + hpa? ( sys-block/hpacucli ) + hpsa? ( sys-apps/cciss_vol_status ) + megaraid-sas? ( sys-block/megacli ) + mpt-sas2? ( sys-block/sas2ircu ) + mpt? ( sys-block/mpt-status )" + +src_prepare() { + default + + # Upstream has a custom Makefile that is meant to build bundles + sed -i '/CPANfile/d' Makefile.PL || die +} + +src_install() { + default + dodoc README.md CHANGELOG.md CONTRIBUTING.md check_raid.cfg + + local plugindir="/usr/$(get_libdir)/nagios/plugins" + dodir "${plugindir}" + mv -f "${ED}"/usr/bin/check_raid.pl "${ED}/${plugindir}" || die +} + +pkg_postinst() { + einfo "The following RAID controllers are supported without special tools:" + einfo "GDT (Intel/ICP) RAID Controller" + einfo "HP MSA (special configuration needed)" + einfo "The following RAID controllers do not have tools packaged in Gentoo, but ARE supported by this tool:" + einfo "Intel: CmdTool2" + einfo "Areca: areca-cli" + einfo "See https://github.com/glensc/nagios-plugin-check_raid/issues/10" + einfo "Marvell RAID: mvcli" + einfo "See https://github.com/glensc/nagios-plugin-check_raid/issues/92" + einfo "Adaptec ServeRAID: aaccli" + einfo "Adaptec AACRAID: afacli (* some controllers supported by USE=aacraid, sys-block/arcconf)" + einfo "Adaptec ServeRAID 7k: ipssend" +} diff --git a/net-analyzer/nagios-plugin-check_raid/nagios-plugin-check_raid-4.0.10.ebuild b/net-analyzer/nagios-plugin-check_raid/nagios-plugin-check_raid-4.0.10.ebuild deleted file mode 100644 index 26049ac2dfbc..000000000000 --- a/net-analyzer/nagios-plugin-check_raid/nagios-plugin-check_raid-4.0.10.ebuild +++ /dev/null @@ -1,66 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit eutils perl-module - -DESCRIPTION="Nagios/Icinga plugin to check current server's RAID status" -HOMEPAGE="https://github.com/glensc/nagios-plugin-check_raid" -#COMMIT="" -MY_PV="${COMMIT:-$PV}" -MY_P="${PN}-${MY_PV}" -SRC_URI="https://github.com/glensc/nagios-plugin-check_raid/archive/${MY_PV}.tar.gz -> ${MY_P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~sparc ~x86" -IUSE="3ware aacraid dmraid hpa hpsa megaraid-sas megaraid-scsi mpt mpt-sas2" - -DEPEND="dev-perl/Monitoring-Plugin - dev-perl/Module-Pluggable" -RDEPEND="${DEPEND} - sys-apps/smartmontools - sys-fs/lsscsi - 3ware? ( sys-block/tw_cli ) - aacraid? ( sys-block/arcconf ) - dmraid? ( sys-fs/dmraid ) - hpa? ( sys-block/hpacucli ) - hpsa? ( sys-apps/cciss_vol_status ) - megaraid-sas? ( sys-block/megacli ) - megaraid-scsi? ( sys-block/megarc ) - mpt-sas2? ( sys-block/sas2ircu ) - mpt? ( sys-block/mpt-status ) - " - -S="${WORKDIR}/${MY_P}" - -src_prepare() { - # Upstream has a custom Makefile that is meant to build bundles. - mv -f Makefile Makefile.upstream - sed -i '/CPANfile/d' Makefile.PL - default -} - -src_install() { - default - plugindir="/usr/$(get_libdir)/nagios/plugins" - dodir "$plugindir" - mv -f "${D}"/usr/bin/check_raid.pl "${D}"/"${plugindir}" - dodoc README.md CHANGELOG.md CONTRIBUTING.md check_raid.cfg -} - -pkg_postinst() { - einfo "The following RAID controllers are supported without special tools:" - einfo "GDT (Intel/ICP) RAID Controller" - einfo "HP MSA (special configuration needed)" - einfo "The following RAID controllers do not have tools packaged in Gentoo, but ARE supported by this tool:" - einfo "Intel: CmdTool2" - einfo "Areca: areca-cli" - einfo "See https://github.com/glensc/nagios-plugin-check_raid/issues/10" - einfo "Marvell RAID: mvcli" - einfo "See https://github.com/glensc/nagios-plugin-check_raid/issues/92" - einfo "Adaptec ServeRAID: aaccli" - einfo "Adaptec AACRAID: afacli (* some controllers supported by USE=aacraid, sys-block/arcconf)" - einfo "Adaptec ServeRAID 7k: ipssend" -} diff --git a/net-analyzer/nagios-plugin-check_raid/nagios-plugin-check_raid-4.0.8.ebuild b/net-analyzer/nagios-plugin-check_raid/nagios-plugin-check_raid-4.0.8.ebuild deleted file mode 100644 index 26049ac2dfbc..000000000000 --- a/net-analyzer/nagios-plugin-check_raid/nagios-plugin-check_raid-4.0.8.ebuild +++ /dev/null @@ -1,66 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit eutils perl-module - -DESCRIPTION="Nagios/Icinga plugin to check current server's RAID status" -HOMEPAGE="https://github.com/glensc/nagios-plugin-check_raid" -#COMMIT="" -MY_PV="${COMMIT:-$PV}" -MY_P="${PN}-${MY_PV}" -SRC_URI="https://github.com/glensc/nagios-plugin-check_raid/archive/${MY_PV}.tar.gz -> ${MY_P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~sparc ~x86" -IUSE="3ware aacraid dmraid hpa hpsa megaraid-sas megaraid-scsi mpt mpt-sas2" - -DEPEND="dev-perl/Monitoring-Plugin - dev-perl/Module-Pluggable" -RDEPEND="${DEPEND} - sys-apps/smartmontools - sys-fs/lsscsi - 3ware? ( sys-block/tw_cli ) - aacraid? ( sys-block/arcconf ) - dmraid? ( sys-fs/dmraid ) - hpa? ( sys-block/hpacucli ) - hpsa? ( sys-apps/cciss_vol_status ) - megaraid-sas? ( sys-block/megacli ) - megaraid-scsi? ( sys-block/megarc ) - mpt-sas2? ( sys-block/sas2ircu ) - mpt? ( sys-block/mpt-status ) - " - -S="${WORKDIR}/${MY_P}" - -src_prepare() { - # Upstream has a custom Makefile that is meant to build bundles. - mv -f Makefile Makefile.upstream - sed -i '/CPANfile/d' Makefile.PL - default -} - -src_install() { - default - plugindir="/usr/$(get_libdir)/nagios/plugins" - dodir "$plugindir" - mv -f "${D}"/usr/bin/check_raid.pl "${D}"/"${plugindir}" - dodoc README.md CHANGELOG.md CONTRIBUTING.md check_raid.cfg -} - -pkg_postinst() { - einfo "The following RAID controllers are supported without special tools:" - einfo "GDT (Intel/ICP) RAID Controller" - einfo "HP MSA (special configuration needed)" - einfo "The following RAID controllers do not have tools packaged in Gentoo, but ARE supported by this tool:" - einfo "Intel: CmdTool2" - einfo "Areca: areca-cli" - einfo "See https://github.com/glensc/nagios-plugin-check_raid/issues/10" - einfo "Marvell RAID: mvcli" - einfo "See https://github.com/glensc/nagios-plugin-check_raid/issues/92" - einfo "Adaptec ServeRAID: aaccli" - einfo "Adaptec AACRAID: afacli (* some controllers supported by USE=aacraid, sys-block/arcconf)" - einfo "Adaptec ServeRAID 7k: ipssend" -} diff --git a/net-analyzer/nagios-plugins-linux-madrisan/Manifest b/net-analyzer/nagios-plugins-linux-madrisan/Manifest index 05211a1f35d1..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-27.tar.xz 385324 BLAKE2B ef207e365d044fefa8c0dbef7aae8a50ec9b6c70d60d069574ed423646d1e936e0bd6bbb316070d94f354236f815e508da4ec1b298e89958c8393a041f98a908 SHA512 5d93912f2237449e29e963cca260fbe7a735f47e7c2752402e2f371289e2875e4fea35f191705d7a2f01ac49381e039b720f43c8c794e85ee0bbbb01d212a10a -DIST nagios-plugins-linux-madrisan-28.tar.xz 390428 BLAKE2B bc41fb7d3b639fe2d133c2ff6643562ce94e5523b13aa18045d7265ae8d9d80873b0611aaee0f0fa8b959e0da3e2c350868574a8986c0d9436b6bd4e4154d908 SHA512 c72065ade12ec60c86479276370215bc0dc419ae9681d7260c550f8985300c39c1c8e39537c51c56e0c1ae61283befc5d111ffd47394de7dc7f7daa5993254fc +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-rename-with-systemd.patch b/net-analyzer/nagios-plugins-linux-madrisan/files/nagios-plugins-linux-madrisan-32-rename-with-systemd.patch new file mode 100644 index 000000000000..f47319dcd39a --- /dev/null +++ b/net-analyzer/nagios-plugins-linux-madrisan/files/nagios-plugins-linux-madrisan-32-rename-with-systemd.patch @@ -0,0 +1,86 @@ +https://github.com/madrisan/nagios-plugins-linux/commit/63914284097e3a59e3407bf894376b859a0d1a2e + +From 63914284097e3a59e3407bf894376b859a0d1a2e Mon Sep 17 00:00:00 2001 +From: Davide Madrisan <d.madrisan@proton.me> +Date: Tue, 30 Jan 2024 18:57:16 +0100 +Subject: [PATCH] fix(configure): rename cmdline option --with-systemd + + Rename --with-systemd to --enable-systemd for consistency + with the other optional boolean options. + +Signed-off-by: Davide Madrisan <d.madrisan@proton.me> +--- a/configure.ac ++++ b/configure.ac +@@ -337,7 +337,7 @@ AC_CHECK_DECLS([CPU_ALLOC], [], [], + + dnl Check for libcurl + AC_ARG_ENABLE([libcurl], +- AS_HELP_STRING([--enable-libcurl], [Enable libcurl])) ++ AS_HELP_STRING([--enable-libcurl], [enable libcurl])) + AS_IF([test "x$enable_libcurl" = "xyes"], [ + LIBCURL_CHECK_CONFIG([], [7.40.0], [], + [AC_MSG_ERROR([Missing required libcurl >= 7.40.0])]) +@@ -346,27 +346,9 @@ AS_IF([test "x$enable_libcurl" = "xyes"], [ + AM_CONDITIONAL(HAVE_LIBCURL, [test "$libcurl_cv_lib_curl_usable" = "yes"]) + ], [AM_CONDITIONAL(HAVE_LIBCURL, false)]) + +-dnl Check for systemd-login libraries +-AC_ARG_WITH([systemd], +- AS_HELP_STRING([--without-systemd], [do not build with systemd support]), +- [], [with_systemd=check] +-) +-have_systemd=no +-AS_IF([test "x$with_systemd" != "xno"], [ +- PKG_CHECK_MODULES([SYSTEMD], [libsystemd], [have_systemd=yes], [have_systemd=no]) +- AS_CASE([$with_systemd:$have_systemd], +- [yes:no], +- [AC_MSG_ERROR([systemd expected but libsystemd not found])], +- [*:yes], +- AC_DEFINE([HAVE_LIBSYSTEMD], [1], [Define if libsystemd is available]) +- AC_DEFINE([USE_SYSTEMD], [1], [Define if systemd support is wanted ]) +- ) +-]) +-AM_CONDITIONAL([HAVE_SYSTEMD], [test "x$have_systemd" = "xyes"]) +- + dnl Check for libvarlink + AC_ARG_ENABLE([libvarlink], +- AS_HELP_STRING([--enable-libvarlink], [Enable libvarlink])) ++ AS_HELP_STRING([--enable-libvarlink], [enable libvarlink])) + AS_IF([test "x$enable_libvarlink" = "xyes"], [ + PKG_CHECK_EXISTS([libvarlink], + [PKG_CHECK_MODULES(LIBVARLINK, [libvarlink >= 18], +@@ -394,6 +376,24 @@ AS_IF([test "x$enable_libprocps" = "xyes"], [ + ]) + AM_CONDITIONAL(HAVE_LIBPROCPS, [test "$have_libprocps" = "yes"]) + ++dnl Check for systemd-login libraries ++AC_ARG_ENABLE([systemd], ++ AS_HELP_STRING([--enable-systemd], [enable systemd related features]), ++ [], [enable_systemd=check] ++) ++have_systemd=no ++AS_IF([test "x$enable_systemd" != "xno"], [ ++ PKG_CHECK_MODULES([SYSTEMD], [libsystemd], [have_systemd=yes], [have_systemd=no]) ++ AS_CASE([$enable_systemd:$have_systemd], ++ [yes:no], ++ [AC_MSG_ERROR([systemd expected but libsystemd not found])], ++ [*:yes], ++ AC_DEFINE([HAVE_LIBSYSTEMD], [1], [Define if libsystemd is available]) ++ AC_DEFINE([USE_SYSTEMD], [1], [Define if systemd support is wanted]) ++ ) ++]) ++AM_CONDITIONAL([HAVE_SYSTEMD], [test "x$have_systemd" = "xyes"]) ++ + dnl Add the option '--with-proc-meminfo=PATH' + AC_ARG_WITH(proc-meminfo, + AS_HELP_STRING([--with-proc-meminfo=PATH], +@@ -604,3 +604,9 @@ if test "$have_libvarlink" = "yes"; then + echo " VARLINK_ADDRESS = $VARLINK_ADDRESS" + echo + fi ++ ++if test "$have_systemd" = "yes"; then ++ echo "Optional systemd library support is enabled:" ++ echo " SYSTEMD_CFLAGS = $SYSTEMD_CFLAGS" ++ echo " SYSTEMD_LIBS = $SYSTEMD_LIBS" ++fi 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 380090a8861e..e1a109026d7c 100644 --- a/net-analyzer/nagios-plugins-linux-madrisan/metadata.xml +++ b/net-analyzer/nagios-plugins-linux-madrisan/metadata.xml @@ -1,12 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> <email>sbraz@gentoo.org</email> <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-27.ebuild b/net-analyzer/nagios-plugins-linux-madrisan/nagios-plugins-linux-madrisan-27.ebuild deleted file mode 100644 index f76ea708a821..000000000000 --- a/net-analyzer/nagios-plugins-linux-madrisan/nagios-plugins-linux-madrisan-27.ebuild +++ /dev/null @@ -1,49 +0,0 @@ -# Copyright 2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -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" - -LICENSE="GPL-3+" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="curl varlink" - -DEPEND=" - curl? ( net-misc/curl:0= ) - varlink? ( dev-libs/libvarlink:= ) -" -RDEPEND="${DEPEND}" - -S="${WORKDIR}/${MY_P}" - -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 varlink libvarlink) - ) - econf "${myconf[@]}" -} - -src_test() { - emake check VERBOSE=1 -} diff --git a/net-analyzer/nagios-plugins-linux-madrisan/nagios-plugins-linux-madrisan-28.ebuild b/net-analyzer/nagios-plugins-linux-madrisan/nagios-plugins-linux-madrisan-28.ebuild deleted file mode 100644 index a0e44b8d7feb..000000000000 --- a/net-analyzer/nagios-plugins-linux-madrisan/nagios-plugins-linux-madrisan-28.ebuild +++ /dev/null @@ -1,48 +0,0 @@ -# Copyright 2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -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 ~x86" -IUSE="curl varlink" - -DEPEND=" - curl? ( net-misc/curl:0= ) - varlink? ( dev-libs/libvarlink:= ) -" -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 varlink libvarlink) - ) - econf "${myconf[@]}" -} - -src_test() { - emake check VERBOSE=1 -} diff --git a/net-analyzer/nagios-plugins-linux-madrisan/nagios-plugins-linux-madrisan-31.ebuild b/net-analyzer/nagios-plugins-linux-madrisan/nagios-plugins-linux-madrisan-31.ebuild new file mode 100644 index 000000000000..6e71445b286d --- /dev/null +++ b/net-analyzer/nagios-plugins-linux-madrisan/nagios-plugins-linux-madrisan-31.ebuild @@ -0,0 +1,48 @@ +# Copyright 2022 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 ~x86" +IUSE="curl varlink" + +DEPEND=" + curl? ( net-misc/curl:0= ) + varlink? ( dev-libs/libvarlink:= ) +" +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 varlink libvarlink) + ) + econf "${myconf[@]}" +} + +src_test() { + emake check VERBOSE=1 +} diff --git a/net-analyzer/nagios-plugins-linux-madrisan/nagios-plugins-linux-madrisan-32-r1.ebuild b/net-analyzer/nagios-plugins-linux-madrisan/nagios-plugins-linux-madrisan-32-r1.ebuild new file mode 100644 index 000000000000..bcd369b7e003 --- /dev/null +++ b/net-analyzer/nagios-plugins-linux-madrisan/nagios-plugins-linux-madrisan-32-r1.ebuild @@ -0,0 +1,55 @@ +# 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 ~x86" +IUSE="curl systemd varlink" + +DEPEND=" + curl? ( net-misc/curl:0= ) + systemd? ( sys-apps/systemd:= ) + varlink? ( dev-libs/libvarlink:= ) +" +RDEPEND="${DEPEND}" + +PATCHES=( + "${FILESDIR}/${P}-rename-with-systemd.patch" + "${FILESDIR}/${P}-x86-fixes.patch" +) + +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) + $(use_enable varlink libvarlink) + ) + econf "${myconf[@]}" +} + +src_test() { + emake check VERBOSE=1 +} 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..4e7690db9073 --- /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 ~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-plugins-snmp/metadata.xml b/net-analyzer/nagios-plugins-snmp/metadata.xml index a15e870b6e07..9a52f67622ec 100644 --- a/net-analyzer/nagios-plugins-snmp/metadata.xml +++ b/net-analyzer/nagios-plugins-snmp/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>sysadmin@gentoo.org</email> diff --git a/net-analyzer/nagios-plugins/Manifest b/net-analyzer/nagios-plugins/Manifest index b54c98b7a970..1b065025a063 100644 --- a/net-analyzer/nagios-plugins/Manifest +++ b/net-analyzer/nagios-plugins/Manifest @@ -1 +1 @@ -DIST nagios-plugins-2.3.1.tar.gz 2833267 BLAKE2B f89eda7a29558dd33dedbf0de150b6a13ba66d213d74041d9eb8c680880b3825bcc9312d251d22f3b483a14c0de7c59d7801954e7563c16352bfc38236676863 SHA512 89208f211e51db4e0d56725a6ff6d2fcf4eb2207f877a2b8f130cda8480a70f318eceb94140eb4f2a17fe3dd967bb3615ccc366c1a531ebd4ff0a04b60c61b8a +DIST nagios-plugins-2.4.6.tar.gz 2751770 BLAKE2B a85da8eaa8d926e2ccae3451d9faa680b75ebd736ba1306c69e7d3b2b8749787743dd6e26013d3a72fba12ef49fdf635c60052791fab558eb49c379bdbb6bac7 SHA512 f2a12a5b6a70849d7233debd1ca95667df981d3627287e3b8813d8fd709c4f4a26cf2128851837f33e0df3132132a4f891edef90e220bc16b1a6351d514faa43 diff --git a/net-analyzer/nagios-plugins/files/define-own-mysql-port-constant.patch b/net-analyzer/nagios-plugins/files/define-own-mysql-port-constant.patch deleted file mode 100644 index 67bc65cad880..000000000000 --- a/net-analyzer/nagios-plugins/files/define-own-mysql-port-constant.patch +++ /dev/null @@ -1,100 +0,0 @@ -From 43ff2e8607c0b7095c2a4dcab6e466bc67e2e2ff Mon Sep 17 00:00:00 2001 -From: Michael Orlitzky <michael@orlitzky.com> -Date: Thu, 26 Oct 2017 15:01:17 -0400 -Subject: [PATCH 1/3] plugins/check_mysql*.c: define our own default MySQL - port. - -The MYSQL_PORT constant used to be defined in mysql.h, and was used as -the default port in the two plugins check_mysql and check_mysql_query. -Now that mysql.h no longer defines that constant, our plugins fail to -build against newer versions of MySQL and MariaDB. - -Since MYSQL_PORT used the "default port" on the local system, it -actually was not the best choice as the default for the check plugins: -when monitoring remote MySQL servers, the usual default of 3306 is -more likely to be correct than whatever the local server happens to be -listening on. - -As a result, we fix the issue by defining our own constant, called -CHECK_PORT_DEFAULT, as "3306" at the top of both check_mysql.c and -check_mysql_query.c. The existing uses of MYSQL_PORT have been changed -to use the new CHECK_PORT_DEFAULT. - -This change is backwards-incompatible: any users who compiled in a -MYSQL_PORT other than 3306 and who were running their checks on the -same server as the database will now need to specify that port -explicitly. - -Closes: https://github.com/nagios-plugins/nagios-plugins/issues/288 ---- - plugins/check_mysql.c | 7 +++++-- - plugins/check_mysql_query.c | 7 +++++-- - 2 files changed, 10 insertions(+), 4 deletions(-) - -diff --git a/plugins/check_mysql.c b/plugins/check_mysql.c -index 83f89c85..c0b61292 100644 ---- a/plugins/check_mysql.c -+++ b/plugins/check_mysql.c -@@ -36,6 +36,9 @@ const char *email = "devel@nagios-plugins.org"; - - #define SLAVERESULTSIZE 70 - -+/* The default port that MySQL servers listen on. */ -+#define CHECK_PORT_DEFAULT 3306 -+ - #include "common.h" - #include "utils.h" - #include "utils_base.h" -@@ -58,7 +61,7 @@ char *ciphers = NULL; - bool ssl = false; - char *opt_file = NULL; - char *opt_group = NULL; --unsigned int db_port = MYSQL_PORT; -+unsigned int db_port = CHECK_PORT_DEFAULT; - int check_slave = 0, warn_sec = 0, crit_sec = 0; - int ignore_auth = 0; - int verbose = 0; -@@ -505,7 +508,7 @@ void - print_help (void) - { - char *myport; -- xasprintf (&myport, "%d", MYSQL_PORT); -+ xasprintf (&myport, "%d", CHECK_PORT_DEFAULT); - - print_revision (progname, NP_VERSION); - -diff --git a/plugins/check_mysql_query.c b/plugins/check_mysql_query.c -index 436e0685..e9c3acfb 100644 ---- a/plugins/check_mysql_query.c -+++ b/plugins/check_mysql_query.c -@@ -33,6 +33,9 @@ const char *progname = "check_mysql_query"; - const char *copyright = "1999-2014"; - const char *email = "devel@nagios-plugins.org"; - -+/* The default port that MySQL servers listen on. */ -+#define CHECK_PORT_DEFAULT 3306 -+ - #include "common.h" - #include "utils.h" - #include "utils_base.h" -@@ -48,7 +51,7 @@ char *db_pass = NULL; - char *db = NULL; - char *opt_file = NULL; - char *opt_group = NULL; --unsigned int db_port = MYSQL_PORT; -+unsigned int db_port = CHECK_PORT_DEFAULT; - - int process_arguments (int, char **); - int validate_arguments (void); -@@ -300,7 +303,7 @@ void - print_help (void) - { - char *myport; -- xasprintf (&myport, "%d", MYSQL_PORT); -+ xasprintf (&myport, "%d", CHECK_PORT_DEFAULT); - - print_revision (progname, NP_VERSION); - --- -2.13.6 - diff --git a/net-analyzer/nagios-plugins/metadata.xml b/net-analyzer/nagios-plugins/metadata.xml index 21e64f4399ba..10fc78d5339d 100644 --- a/net-analyzer/nagios-plugins/metadata.xml +++ b/net-analyzer/nagios-plugins/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> <email>mjo@gentoo.org</email> @@ -10,6 +10,10 @@ <name>Gentoo Sysadmin Project</name> </maintainer> <use> + <!-- leave this global flag defined here to avoid a pkgcheck warning --> + <flag name="ipv6"> + Enable ipv6 checks. + </flag> <flag name="nagios-dns"> Install <pkg>net-dns/bind-tools</pkg> required for monitoring DNS servers. Disabling the flag does not remove any plugin file. diff --git a/net-analyzer/nagios-plugins/nagios-plugins-2.3.1-r1.ebuild b/net-analyzer/nagios-plugins/nagios-plugins-2.3.1-r1.ebuild deleted file mode 100644 index 8f1178da010c..000000000000 --- a/net-analyzer/nagios-plugins/nagios-plugins-2.3.1-r1.ebuild +++ /dev/null @@ -1,113 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DESCRIPTION="Official plugins for Nagios" -HOMEPAGE="http://nagios-plugins.org/" -SRC_URI="http://nagios-plugins.org/download/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ppc ppc64 sparc x86" -IUSE="ipv6 ldap libressl mysql nagios-dns nagios-ping nagios-game postgres radius samba selinux 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. -AUTOMAGIC_DEPEND=" - nagios-dns? ( net-dns/bind-tools ) - nagios-game? ( games-util/qstat ) - nagios-ping? ( net-analyzer/fping ) - samba? ( net-fs/samba ) - ssh? ( net-misc/openssh ) - snmp? ( dev-perl/Net-SNMP - net-analyzer/net-snmp[-minimal] )" - -# Perl really needs to run during the build... -BDEPEND="${AUTOMAGIC_DEPEND} - dev-lang/perl" - -DEPEND=" - ldap? ( net-nds/openldap ) - mysql? ( dev-db/mysql-connector-c ) - postgres? ( dev-db/postgresql:* ) - ssl? ( - !libressl? ( dev-libs/openssl:0 ) - libressl? ( dev-libs/libressl ) - ) - radius? ( net-dialup/freeradius-client )" - -# Basically everything in net-analyzer/monitoring-plugins collides with -# nagios-plugins. Perl (from BDEPEND) is needed at runtime, too. -RDEPEND="${BDEPEND} - ${DEPEND} - !net-analyzer/monitoring-plugins - selinux? ( sec-policy/selinux-nagios )" - -# At least one test is interactive. -RESTRICT="test" - -DOCS=( - ACKNOWLEDGEMENTS - AUTHORS - CODING - ChangeLog - FAQ - NEWS - README - REQUIREMENTS - SUPPORT - THANKS -) - -PATCHES=( "${FILESDIR}/define-own-mysql-port-constant.patch" ) - -src_prepare() { - default - - # Fix the path to our perl interpreter - sed -i -e "1s:/usr/local/bin/perl:/usr/bin/perl:" \ - "${S}"/plugins-scripts/*.pl \ - || die 'failed to fix perl interpreter path' -} - -src_configure() { - # Use an array to prevent econf from mangling the ping args. - local myconf=() - - if use ssl; then - myconf+=( $(use_with ssl openssl /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. - myconf+=( --with-ping-command="/bin/ping -n -U -w %d -c %d %s" ) - - if use ipv6; then - myconf+=( --with-ping6-command="/bin/ping6 -n -U -w %d -c %d %s" ) - fi - - econf \ - $(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" -} - -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 ${ROOT}/usr/$(get_libdir)/nagios/plugins" -} diff --git a/net-analyzer/nagios-plugins/nagios-plugins-2.4.6.ebuild b/net-analyzer/nagios-plugins/nagios-plugins-2.4.6.ebuild new file mode 100644 index 000000000000..e7c725947880 --- /dev/null +++ b/net-analyzer/nagios-plugins/nagios-plugins-2.4.6.ebuild @@ -0,0 +1,121 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DESCRIPTION="Official plugins for Nagios" +HOMEPAGE="https://nagios-plugins.org/" +SRC_URI="https://github.com/${PN}/${PN}/releases/download/release-${PV}/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ppc ppc64 sparc x86" +IUSE="ipv6 ldap mysql nagios-dns nagios-ping nagios-game postgres radius samba selinux 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. +AUTOMAGIC_DEPEND=" + nagios-dns? ( net-dns/bind-tools ) + nagios-game? ( games-util/qstat ) + nagios-ping? ( net-analyzer/fping ) + samba? ( net-fs/samba ) + ssh? ( virtual/openssh ) + snmp? ( dev-perl/Net-SNMP + net-analyzer/net-snmp[-minimal] )" + +# Perl really needs to run during the build... +BDEPEND="${AUTOMAGIC_DEPEND} + dev-lang/perl" + +DEPEND=" + ldap? ( net-nds/openldap:= ) + mysql? ( dev-db/mysql-connector-c:= ) + postgres? ( dev-db/postgresql:* ) + ssl? ( + dev-libs/openssl:0= + ) + radius? ( net-dialup/freeradius-client )" + +# Basically everything in net-analyzer/monitoring-plugins collides with +# nagios-plugins. Perl (from BDEPEND) is needed at runtime, too. +RDEPEND="${BDEPEND} + ${DEPEND} + !net-analyzer/monitoring-plugins + selinux? ( sec-policy/selinux-nagios )" + +# At least one test is interactive. +RESTRICT="test" + +DOCS=( + ACKNOWLEDGEMENTS + AUTHORS + CODING + ChangeLog + FAQ + NEWS + README + REQUIREMENTS + SUPPORT + THANKS +) + +# These all come from gnulib and the ./configure checks are working as +# intended when the functions aren't present. Bugs 907755 and 924341. +QA_CONFIG_IMPL_DECL_SKIP=( + statvfs64 + re_set_syntax + re_compile_pattern + re_search + re_match +) + +src_prepare() { + default + + # Fix the path to our perl interpreter + sed -i -e "1s:/usr/local/bin/perl:/usr/bin/perl:" \ + "${S}"/plugins-scripts/*.pl \ + || die 'failed to fix perl interpreter path' +} + +src_configure() { + # Use an array to prevent econf from mangling the ping args. + local myconf=() + + if use ssl; then + myconf+=( $(use_with ssl openssl /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 #883765). + myconf+=( --with-ping-command="$(command -v ping) -n -U -w %d -c %d %s" ) + + if use ipv6; then + myconf+=( --with-ping6-command="$(command -v ping6) -n -U -w %d -c %d %s" ) + fi + + econf \ + $(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" +} + +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 ${ROOT}/usr/$(get_libdir)/nagios/plugins" +} diff --git a/net-analyzer/nagios/metadata.xml b/net-analyzer/nagios/metadata.xml index 6d334d5e5ae3..1c4f635649ea 100644 --- a/net-analyzer/nagios/metadata.xml +++ b/net-analyzer/nagios/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> <email>mjo@gentoo.org</email> diff --git a/net-analyzer/nagios/nagios-4.4.14.ebuild b/net-analyzer/nagios/nagios-4.4.14.ebuild new file mode 100644 index 000000000000..6369ad6956d0 --- /dev/null +++ b/net-analyzer/nagios/nagios-4.4.14.ebuild @@ -0,0 +1,15 @@ +# 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" +IUSE="" + +RDEPEND="~net-analyzer/nagios-core-${PV} + || ( net-analyzer/nagios-plugins net-analyzer/monitoring-plugins )" diff --git a/net-analyzer/nagios/nagios-4.4.6.ebuild b/net-analyzer/nagios/nagios-4.4.6.ebuild deleted file mode 100644 index dfde78da41e9..000000000000 --- a/net-analyzer/nagios/nagios-4.4.6.ebuild +++ /dev/null @@ -1,15 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DESCRIPTION="The Nagios metapackage" -HOMEPAGE="https://www.nagios.org/" - -LICENSE="metapackage" -SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~arm64 ppc ppc64 sparc x86" -IUSE="" - -RDEPEND="~net-analyzer/nagios-core-${PV} - || ( net-analyzer/nagios-plugins net-analyzer/monitoring-plugins )" 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/nagircbot/metadata.xml b/net-analyzer/nagircbot/metadata.xml index 1d0d59c9a025..c4359a0e38d8 100644 --- a/net-analyzer/nagircbot/metadata.xml +++ b/net-analyzer/nagircbot/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>sysadmin@gentoo.org</email> diff --git a/net-analyzer/nagircbot/nagircbot-0.0.33.ebuild b/net-analyzer/nagircbot/nagircbot-0.0.33.ebuild index 6d748bc63809..74adb3d2cf47 100644 --- a/net-analyzer/nagircbot/nagircbot-0.0.33.ebuild +++ b/net-analyzer/nagircbot/nagircbot-0.0.33.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=8 inherit toolchain-funcs @@ -12,26 +12,25 @@ SRC_URI="http://www.vanheusden.com/nagircbot/${P}.tgz" LICENSE="GPL-2" # GPL-2 only SLOT="0" KEYWORDS="~amd64 ~ppc ~x86" -IUSE="libressl" -CDEPEND=" - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= )" -DEPEND="virtual/pkgconfig - ${CDEPEND}" -RDEPEND="net-analyzer/nagios-core - ${CDEPEND}" +DEPEND="dev-libs/openssl:0=" +RDEPEND="${DEPEND} +net-analyzer/nagios-core" +BDEPEND="virtual/pkgconfig" src_prepare() { -cp -av Makefile{,.org} + default + cp -av Makefile{,.org} || die + sed -i Makefile \ - -e 's:-lcrypto -lssl:$(shell pkg-config --libs openssl):g' \ + -e 's:-lcrypto -lssl:$(shell ${PKG_CONFIG} --libs openssl):g' \ -e 's:-O2::g;s:-g::g' \ || die } src_compile() { - emake CC=$(tc-getCC) CXX=$(tc-getCXX) + tc-export PKG_CONFIG + emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" } src_install() { diff --git a/net-analyzer/nagstamon/Manifest b/net-analyzer/nagstamon/Manifest index b7a773ddc3ea..ff966dc10895 100644 --- a/net-analyzer/nagstamon/Manifest +++ b/net-analyzer/nagstamon/Manifest @@ -1 +1,2 @@ -DIST Nagstamon-3.4.1.tar.gz 563745 BLAKE2B 3ac35c90757eb525e7e7953f63a8798a0087470e4a94161987f3c382b6be43240aa8b5c44f279d23d841dbf9e4536f38d3f5e2f63234538a00fe6b6e0ee9c680 SHA512 68f8a7345c606b8ad4511b34e2d76383faf8831202c9429ab24eeb215073984f00f580c83a7f5e348f7d4104d3c82bd6f4661939801444e463c3fcf64c8240bd +DIST nagstamon-3.12.0.tar.gz 581087 BLAKE2B 1f54decdd6cf1fdba8abd7f97102cd84d9f38e68391c31f413860d7c80410e38ee8929cf4d1bfbf7cca1fa54b9088409a47ba669c6ff78d8edecb3313a7e5690 SHA512 029d3dcf5ea5a512940b8e6ed0d3a146e727b3c8ffcbd530fc28f4a896a1a801bb0029a33b62e311c1b0c281810bd001f323c9e3e4c4fc9199bacc7b962ff794 +DIST nagstamon-3.14.0.tar.gz 585452 BLAKE2B a05c6a5a4a2b1e98d2831bef8000f81e306807f0706915d73bcf04f67a070fbd1787d0f98f8650b08bcd94a13b13f21c2b36ef79ee820bb526ff7074b5b5d996 SHA512 6896b0c1a58f1ee6f597ff5022d3bd675760a2c7a0403fc72f0e5c7edde6e2177f0eddb2af5a66e0fbe6166d85394fdcedc92cc0e64e0ac469681a380879a0ab diff --git a/net-analyzer/nagstamon/files/nagstamon-3.0-setup.patch b/net-analyzer/nagstamon/files/nagstamon-3.0-setup.patch deleted file mode 100644 index 26bb22fec4df..000000000000 --- a/net-analyzer/nagstamon/files/nagstamon-3.0-setup.patch +++ /dev/null @@ -1,27 +0,0 @@ -diff --git a/setup.py b/setup.py -index 267ced2..538c5bb 100644 ---- a/setup.py -+++ b/setup.py -@@ -37,7 +37,7 @@ if OS not in ['Windows', 'Darwin']: - NAME = NAME.lower() - VERSION = AppInfo.VERSION.replace('-', '.') + '.' + DIST + DIST_VERSION - --NAGSTAMON_SCRIPT = 'nagstamon.py' -+NAGSTAMON_SCRIPT = 'nagstamon' - - # workaround to get directory of Qt5 plugins to add missing 'mediaservice' folder needed for audio on OSX and Windows - from PyQt5 import QtCore -@@ -130,12 +130,7 @@ setup(name=NAME, - packages=['Nagstamon', - 'Nagstamon.QUI', - 'Nagstamon.Servers', -- 'Nagstamon.thirdparty', -- 'Nagstamon.thirdparty.Xlib', -- 'Nagstamon.thirdparty.Xlib.ext', -- 'Nagstamon.thirdparty.Xlib.protocol', -- 'Nagstamon.thirdparty.Xlib.support', -- 'Nagstamon.thirdparty.Xlib.xobject'], -+ 'Nagstamon.thirdparty',], - package_dir={'Nagstamon': 'Nagstamon'}, - package_data={'Nagstamon': ['resources/*']}, - data_files=[('%s/share/man/man1' % sys.prefix, ['Nagstamon/resources/nagstamon.1.gz']), diff --git a/net-analyzer/nagstamon/files/nagstamon-3.12.0-setup.patch b/net-analyzer/nagstamon/files/nagstamon-3.12.0-setup.patch new file mode 100644 index 000000000000..f9fe785df978 --- /dev/null +++ b/net-analyzer/nagstamon/files/nagstamon-3.12.0-setup.patch @@ -0,0 +1,27 @@ +--- a/setup.py 2023-01-29 09:29:13.885165525 +0100 ++++ b/setup.py 2023-01-29 09:30:32.585630680 +0100 +@@ -45,9 +45,9 @@ + else: + DIST, DIST_VERSION, DIST_NAME = platform.dist() + NAME = NAME.lower() + #VERSION = AppInfo.VERSION.replace('-', '.') + '.' + DIST + DIST_VERSION + VERSION = AppInfo.VERSION.replace('-', '.') +-NAGSTAMON_SCRIPT = 'nagstamon.py' ++NAGSTAMON_SCRIPT = 'nagstamon' + + from setuptools import setup + +@@ -120,12 +120,7 @@ + 'Nagstamon.Servers', + 'Nagstamon.Servers.Alertmanager', + 'Nagstamon.Servers.Centreon', +- 'Nagstamon.thirdparty', +- 'Nagstamon.thirdparty.Xlib', +- 'Nagstamon.thirdparty.Xlib.ext', +- 'Nagstamon.thirdparty.Xlib.protocol', +- 'Nagstamon.thirdparty.Xlib.support', +- 'Nagstamon.thirdparty.Xlib.xobject'], ++ 'Nagstamon.thirdparty'], + package_dir={'Nagstamon': 'Nagstamon'}, + package_data={'Nagstamon': ['resources/*.*', + 'resources/qui/*', diff --git a/net-analyzer/nagstamon/files/nagstamon-3.14.0-setup.patch b/net-analyzer/nagstamon/files/nagstamon-3.14.0-setup.patch new file mode 100644 index 000000000000..1bb994201637 --- /dev/null +++ b/net-analyzer/nagstamon/files/nagstamon-3.14.0-setup.patch @@ -0,0 +1,24 @@ +--- a/setup.py 2023-01-29 09:29:13.885165525 +0100 ++++ b/setup.py 2023-01-29 09:30:32.585630680 +0100 +@@ -45,6 +45,6 @@ + #VERSION = AppInfo.VERSION.replace('-', '.') + '.' + DIST + DIST_VERSION + VERSION = AppInfo.VERSION.replace('-', '.') +-NAGSTAMON_SCRIPT = 'nagstamon.py' ++NAGSTAMON_SCRIPT = 'nagstamon' + + from setuptools import setup + +@@ -120,12 +120,7 @@ + 'Nagstamon.Servers', + 'Nagstamon.Servers.Alertmanager', + 'Nagstamon.Servers.Centreon', +- 'Nagstamon.thirdparty', +- 'Nagstamon.thirdparty.Xlib', +- 'Nagstamon.thirdparty.Xlib.ext', +- 'Nagstamon.thirdparty.Xlib.protocol', +- 'Nagstamon.thirdparty.Xlib.support', +- 'Nagstamon.thirdparty.Xlib.xobject'], ++ 'Nagstamon.thirdparty'], + package_dir={'Nagstamon': 'Nagstamon'}, + package_data={'Nagstamon': ['resources/*.*', + 'resources/qui/*', diff --git a/net-analyzer/nagstamon/files/nagstamon-3.4.1-unknown-version-id.patch b/net-analyzer/nagstamon/files/nagstamon-3.4.1-unknown-version-id.patch deleted file mode 100644 index a71d9d97e5b1..000000000000 --- a/net-analyzer/nagstamon/files/nagstamon-3.4.1-unknown-version-id.patch +++ /dev/null @@ -1,14 +0,0 @@ -Fix for unknown VERSION_ID which is now a fatal error in python -3.7. Backported from upstream 638c7c7a22156ca7e542725d32dbbc71f2f008a9 - ---- a/Nagstamon/Helpers.py.~1~ 2020-01-24 16:12:12.000000000 +0100 -+++ b/Nagstamon/Helpers.py 2020-08-29 07:39:26.999988228 +0200 -@@ -454,7 +454,7 @@ - for property in os_release_file.read_text().splitlines(): - key, value = property.split('=', 1) - os_release_dict[key] = value.strip('"').strip("'") -- return (os_release_dict['ID'], os_release_dict['VERSION_ID'], os_release_dict['NAME']) -+ return (os_release_dict['ID'], os_release_dict.get('VERSION_ID', 'unknown'), os_release_dict['NAME']) - else: - return False - else: diff --git a/net-analyzer/nagstamon/metadata.xml b/net-analyzer/nagstamon/metadata.xml index 7efaea2acc46..a3a1f9a6d9b5 100644 --- a/net-analyzer/nagstamon/metadata.xml +++ b/net-analyzer/nagstamon/metadata.xml @@ -1,11 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> - <email>idl0r@gentoo.org</email> - <name>Christian Ruppert</name> - </maintainer> - <maintainer type="person"> <email>graaff@gentoo.org</email> <name>Hans de Graaff</name> </maintainer> diff --git a/net-analyzer/nagstamon/nagstamon-3.12.0-r1.ebuild b/net-analyzer/nagstamon/nagstamon-3.12.0-r1.ebuild new file mode 100644 index 000000000000..7745a3ac4a41 --- /dev/null +++ b/net-analyzer/nagstamon/nagstamon-3.12.0-r1.ebuild @@ -0,0 +1,74 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..11} ) +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 ~x86" +IUSE="test" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +RDEPEND="${PYTHON_DEPS} + dev-python/lxml[${PYTHON_USEDEP}] + || ( + dev-python/PyQt6[gui,multimedia,svg,widgets,${PYTHON_USEDEP}] + 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.12.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/nagstamon/nagstamon-3.12.0.ebuild b/net-analyzer/nagstamon/nagstamon-3.12.0.ebuild new file mode 100644 index 000000000000..132181cc389e --- /dev/null +++ b/net-analyzer/nagstamon/nagstamon-3.12.0.ebuild @@ -0,0 +1,64 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..11} ) +DISTUTILS_USE_PEP517=setuptools + +inherit 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 x86" +IUSE="test" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +RDEPEND="${PYTHON_DEPS} + dev-python/lxml[${PYTHON_USEDEP}] + || ( + dev-python/PyQt6[gui,multimedia,svg,widgets,${PYTHON_USEDEP}] + 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.12.0-setup.patch" ) + +src_prepare() { + default_src_prepare + + # pre-compressed already + rm Nagstamon/resources/nagstamon.1.gz || die + sed -i -e 's:\(nagstamon\.1\)\.gz:\1:' setup.py || die + + mv ${PN}.py ${PN} || die + + rm -rf "${S}/Nagstamon/thirdparty/Xlib/" || die +} + +python_test() { + virtx epytest +} diff --git a/net-analyzer/nagstamon/nagstamon-3.14.0.ebuild b/net-analyzer/nagstamon/nagstamon-3.14.0.ebuild new file mode 100644 index 000000000000..5f85aa5424c7 --- /dev/null +++ b/net-analyzer/nagstamon/nagstamon-3.14.0.ebuild @@ -0,0 +1,74 @@ +# 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 ~x86" +IUSE="test" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +RDEPEND="${PYTHON_DEPS} + dev-python/lxml[${PYTHON_USEDEP}] + || ( + dev-python/PyQt6[gui,multimedia,svg,widgets,${PYTHON_USEDEP}] + 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/nagstamon/nagstamon-3.4.1-r1.ebuild b/net-analyzer/nagstamon/nagstamon-3.4.1-r1.ebuild deleted file mode 100644 index 93f2833540ea..000000000000 --- a/net-analyzer/nagstamon/nagstamon-3.4.1-r1.ebuild +++ /dev/null @@ -1,53 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{6,7,8} ) - -inherit python-r1 distutils-r1 - -MY_PN="Nagstamon" -MY_P="${MY_PN}-${PV/_p/-}" - -DESCRIPTION="status monitor for the desktop" -DESCRIPTION="systray monitor for displaying realtime status of several monitoring systems" -HOMEPAGE="https://nagstamon.ifw-dresden.de" -SRC_URI="https://nagstamon.ifw-dresden.de/files/stable/${MY_P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -RDEPEND="${PYTHON_DEPS} - dev-python/lxml[${PYTHON_USEDEP}] - dev-python/PyQt5[gui,multimedia,svg,widgets,${PYTHON_USEDEP}] - dev-python/beautifulsoup:4[${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/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}]" - -S="${WORKDIR}/${MY_PN}" - -PATCHES=( "${FILESDIR}/${PN}-3.0-setup.patch" "${FILESDIR}/${PN}-3.4.1-unknown-version-id.patch" ) - -src_prepare() { - default_src_prepare - - # pre-compressed already - rm Nagstamon/resources/nagstamon.1.gz || die - sed -i -e 's:\(nagstamon\.1\)\.gz:\1:' setup.py || die - - mv ${PN}.py ${PN} || die - - rm -rf "${S}/Nagstamon/thirdparty/Xlib/" || die -} diff --git a/net-analyzer/nagtrap/metadata.xml b/net-analyzer/nagtrap/metadata.xml index 6f49eba8f496..85e4ed814fa2 100644 --- a/net-analyzer/nagtrap/metadata.xml +++ b/net-analyzer/nagtrap/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <!-- maintainer-needed --> </pkgmetadata> diff --git a/net-analyzer/nagtrap/nagtrap-0.1.3-r1.ebuild b/net-analyzer/nagtrap/nagtrap-0.1.3-r1.ebuild index 203d35be9af9..8f20f2c81674 100644 --- a/net-analyzer/nagtrap/nagtrap-0.1.3-r1.ebuild +++ b/net-analyzer/nagtrap/nagtrap-0.1.3-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -22,8 +22,8 @@ src_install() { dodoc ChangeLog THANKS dodir /usr/share/nagtrap - cp -r {db,nagtrap} "${D}"/usr/share/nagtrap/ - fperms 640 "${D}"/usr/share/nagtrap/nagtrap/etc/config.ini.php-dist + cp -r {db,nagtrap} "${ED}"/usr/share/nagtrap/ || die + fperms 640 /usr/share/nagtrap/nagtrap/etc/config.ini.php-dist sed -i -e 's#use lib.*#use lib "/usr/lib/nagios/plugins";#g' \ plugin/check_snmptraps.pl || die "sed failed" @@ -35,10 +35,10 @@ src_install() { pkg_postinst() { elog "Before running NagTrap for the first time, you will need setup its configuration" - elog "/usr/share/nagtrap/nagtrap/etc/config.ini.php" + elog "${EROOT}/usr/share/nagtrap/nagtrap/etc/config.ini.php" elog "A sample is installed in" - elog "/usr/share/nagtrap/nagtrap/etc/config.ini.php-sample" + elog "${EROOT}/usr/share/nagtrap/nagtrap/etc/config.ini.php-sample" elog elog "NagTrap requires snmptt to write traps into a MySQL database." - elog "A database schema is available in {$D}usr/share/nagtrap/db" + elog "A database schema is available in ${EROOT}/usr/share/nagtrap/db" } diff --git a/net-analyzer/nast/metadata.xml b/net-analyzer/nast/metadata.xml index 01ab90fe15dc..b5b76fdc2ceb 100644 --- a/net-analyzer/nast/metadata.xml +++ b/net-analyzer/nast/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>netmon@gentoo.org</email> diff --git a/net-analyzer/nast/nast-0.2.0-r2.ebuild b/net-analyzer/nast/nast-0.2.0-r2.ebuild deleted file mode 100644 index bc1d6e76e220..000000000000 --- a/net-analyzer/nast/nast-0.2.0-r2.ebuild +++ /dev/null @@ -1,46 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -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" -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~ppc64 x86" -IUSE="ncurses" - -RDEPEND=" - >=net-libs/libnet-1.1.1 - net-libs/libpcap - ncurses? ( >=sys-libs/ncurses-5.4:= ) -" -DEPEND=" - ${RDEPEND} - virtual/pkgconfig -" -PATCHES=( - "${FILESDIR}"/${P}-gentoo.patch -) - -src_prepare() { - default - eautoreconf -} - -src_configure() { - append-cflags -fcommon - default -} - -src_compile() { - emake CFLAGS="${CFLAGS}" -} - -src_install() { - dosbin nast - doman nast.8 - dodoc AUTHORS BUGS CREDITS ChangeLog NCURSES_README README TODO -} diff --git a/net-analyzer/nast/nast-0.2.0-r3.ebuild b/net-analyzer/nast/nast-0.2.0-r3.ebuild new file mode 100644 index 000000000000..9be8146f5f8b --- /dev/null +++ b/net-analyzer/nast/nast-0.2.0-r3.ebuild @@ -0,0 +1,47 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +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" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~ppc64 x86" +IUSE="ncurses" + +RDEPEND=" + >=net-libs/libnet-1.1.1 + net-libs/libpcap + ncurses? ( >=sys-libs/ncurses-5.4:= ) +" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" + +PATCHES=( + "${FILESDIR}"/${P}-gentoo.patch +) + +src_prepare() { + default + eautoreconf +} + +src_configure() { + append-cflags -fcommon + default +} + +src_compile() { + emake CFLAGS="${CFLAGS}" +} + +src_install() { + dosbin nast + doman nast.8 + dodoc AUTHORS BUGS CREDITS ChangeLog NCURSES_README README TODO +} diff --git a/net-analyzer/nbtscan/Manifest b/net-analyzer/nbtscan/Manifest index 15c4906f4d6a..b7743fc91159 100644 --- a/net-analyzer/nbtscan/Manifest +++ b/net-analyzer/nbtscan/Manifest @@ -1 +1 @@ -DIST nbtscan-1.6.tar.gz 27290 BLAKE2B 3e38e946aa875be2bca8ad0155a5bf4c612cecda3761623d75657b2ab54aa7a7526d284a78db764518748e092c2719a4c02bcdce32095c87537c9979571c10f7 SHA512 b791357160ae7fe784ebf3b74df551c0b7dcaeefae2ddd585a9e5ac0fe7dd1bb32f00d2b898dcd700e74809708f42fc8e5f0022254e1282914b3f668564b4bcb +DIST nbtscan-1.7.2.tar.gz 29758 BLAKE2B 8e6af433a600865c391d0f7a72a8aa0b82d6ae61abedec8c2dc5cc89515f92c2ebdfd4868d578d4028b9aee4224b2f972bd574040db3c30caf9e0e59f9eb303a SHA512 b20eafe6737aa378e230dd2842e045bf2a48497e21b87ce6c534366cbb162862168a5c8143c0a69d495525caca75e91e437b87d9778e4cfe573b20461e2ccbbf diff --git a/net-analyzer/nbtscan/files/nbtscan-1.5.1-gentoo.patch b/net-analyzer/nbtscan/files/nbtscan-1.5.1-gentoo.patch deleted file mode 100644 index dbf2457bc29f..000000000000 --- a/net-analyzer/nbtscan/files/nbtscan-1.5.1-gentoo.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- a/Makefile.in -+++ b/Makefile.in -@@ -11,10 +11,10 @@ - BINDIR = @bindir@ - - nbtscan: $(OBJECTS) -- $(CC) $(CFLAGS) -o nbtscan $(OBJECTS) $(LIBS) -+ $(CC) $(CFLAGS) $(LDFLAGS) -o nbtscan $(OBJECTS) $(LIBS) - - install: -- $(INSTALL) $(TARGET) $(BINDIR)/$(TARGET) -+ $(INSTALL) $(TARGET) $(DESTDIR)/$(BINDIR)/$(TARGET) - - nbtscan.o: nbtscan.c statusq.h range.h list.h - $(CC) $(CFLAGS) $(DEFS) -c nbtscan.c diff --git a/net-analyzer/nbtscan/files/nbtscan-1.5.1-includes-declarations.patch b/net-analyzer/nbtscan/files/nbtscan-1.5.1-includes-declarations.patch deleted file mode 100644 index a585d4495fb5..000000000000 --- a/net-analyzer/nbtscan/files/nbtscan-1.5.1-includes-declarations.patch +++ /dev/null @@ -1,42 +0,0 @@ ---- a/list.h -+++ b/list.h -@@ -19,3 +19,5 @@ - int compare(struct list_item* item1, struct list_item* item2); - - int insert(struct list* lst, unsigned long content); -+ -+int in_list(struct list* lst, unsigned long content); ---- a/nbtscan.c -+++ b/nbtscan.c -@@ -5,6 +5,8 @@ - #include <stdlib.h> - #include <sys/time.h> - #include <string.h> -+#include <ctype.h> -+#include <unistd.h> - #if HAVE_STDINT_H - #include <stdint.h> - #endif ---- a/statusq.h -+++ b/statusq.h -@@ -103,4 +103,10 @@ - char* service_name; - } nb_service_t ; - -+char* getnbservicename(my_uint8_t service, int unique, char* name); -+ -+struct nb_host_info* parse_response(char* buff, int buffsize); -+ -+int send_query(int sock, struct in_addr dest_addr, my_uint32_t rtt_base); -+ - #endif /* STATUSQ_H */ ---- a/statusq.c -+++ b/statusq.c -@@ -29,6 +29,7 @@ - #include <sys/time.h> - #include "statusq.h" - #include <string.h> -+#include <ctype.h> - #include <stdio.h> - #include <stddef.h> - #include "errors.h" diff --git a/net-analyzer/nbtscan/files/nbtscan-1.5.1-script-whitespace.patch b/net-analyzer/nbtscan/files/nbtscan-1.5.1-script-whitespace.patch deleted file mode 100644 index 4aca976dcd38..000000000000 --- a/net-analyzer/nbtscan/files/nbtscan-1.5.1-script-whitespace.patch +++ /dev/null @@ -1,119 +0,0 @@ ---- a/nbtscan.c -+++ b/nbtscan.c -@@ -86,7 +86,7 @@ - int d_print_hostinfo(struct in_addr addr, const struct nb_host_info* hostinfo) { - int i; - unsigned char service; /* 16th byte of NetBIOS name */ -- char name[16]; -+ char comp_name[16]; - - printf("\nPacket dump for Host %s:\n\n", inet_ntoa(addr)); - if(hostinfo->is_broken) printf("Incomplete packet, %d bytes long.\n", hostinfo->is_broken); -@@ -110,9 +110,9 @@ - printf("Names received:\n"); - for(i=0; i< hostinfo->header->number_of_names; i++) { - service = hostinfo->names[i].ascii_name[15]; -- strncpy(name, hostinfo->names[i].ascii_name, 15); -- name[16]=0; -- printf("%-17s Service: 0x%02x Flags: 0x%04x\n", name, service, hostinfo->names[i].rr_flags); -+ strncpy(comp_name, hostinfo->names[i].ascii_name, 15); -+ comp_name[15]=0; -+ printf("%-17s Service: 0x%02x Flags: 0x%04x\n", comp_name, service, hostinfo->names[i].rr_flags); - } - }; - -@@ -147,9 +147,9 @@ - - - int v_print_hostinfo(struct in_addr addr, const struct nb_host_info* hostinfo, char* sf, int hr) { -- int i, unique; -+ int i, j, unique; - my_uint8_t service; /* 16th byte of NetBIOS name */ -- char name[16]; -+ char comp_name[16]; - char* sname; - - if(!sf) { -@@ -163,20 +163,27 @@ - if(hostinfo->header && hostinfo->names) { - for(i=0; i< hostinfo->header->number_of_names; i++) { - service = hostinfo->names[i].ascii_name[15]; -- strncpy(name, hostinfo->names[i].ascii_name, 15); -- name[16]=0; -+ strncpy(comp_name, hostinfo->names[i].ascii_name, 15); -+ -+ // Eliminate trailing spaces -+ for(j=0; j < 15; j++) { -+ if (comp_name[j] == ' ') -+ break; -+ } -+ comp_name[j] = 0; -+ - unique = !(hostinfo->names[i].rr_flags & 0x0080); - if(sf) { -- printf("%s%s%s%s", inet_ntoa(addr), sf, name, sf); -- if(hr) printf("%s\n", (char*)getnbservicename(service, unique, name)); -+ printf("%s%s%s%s", inet_ntoa(addr), sf, comp_name, sf); -+ if(hr) printf("%s\n", (char*)getnbservicename(service, unique, comp_name)); - else { - printf("%02x", service); - if(unique) printf("U\n"); - else printf("G\n"); - } - } else { -- printf("%-17s", name); -- if(hr) printf("%s\n", (char*)getnbservicename(service, unique, name)); -+ printf("%-17s", comp_name); -+ if(hr) printf("%s\n", (char*)getnbservicename(service, unique, comp_name)); - else { - printf("<%02x>", service); - if(unique) printf(" UNIQUE\n"); -@@ -199,7 +206,7 @@ - }; - - int print_hostinfo(struct in_addr addr, struct nb_host_info* hostinfo, char* sf) { -- int i; -+ int i,j; - unsigned char service; /* 16th byte of NetBIOS name */ - char comp_name[16], user_name[16]; - int is_server=0; -@@ -215,7 +222,13 @@ - if(service == 0 && unique && first_name) { - /* Unique name, workstation service - this is computer name */ - strncpy(comp_name, hostinfo->names[i].ascii_name, 15); -- comp_name[15] = 0; -+ -+ // Eliminate trailing spaces -+ for(j=0; j < 15; j++) { -+ if (comp_name[j] == ' ') -+ break; -+ } -+ comp_name[j] = 0; - first_name = 0; - }; - if(service == 0x20 && unique) { -@@ -252,7 +265,7 @@ - /* If l is true adds #PRE to each line of output (for lmhosts) */ - - int l_print_hostinfo(struct in_addr addr, struct nb_host_info* hostinfo, int l) { -- int i; -+ int i,j; - unsigned char service; /* 16th byte of NetBIOS name */ - char comp_name[16]; - int is_server=0; -@@ -268,7 +281,13 @@ - if(service == 0 && unique && first_name) { - /* Unique name, workstation service - this is computer name */ - strncpy(comp_name, hostinfo->names[i].ascii_name, 15); -- comp_name[15]=0; -+ -+ // Eliminate trailing spaces -+ for(j=0; j < 15; j++) { -+ if (comp_name[j] == ' ') -+ break; -+ } -+ comp_name[j] = 0; - first_name = 0; - }; - }; - diff --git a/net-analyzer/nbtscan/metadata.xml b/net-analyzer/nbtscan/metadata.xml index 74c2baebb4ec..932760670984 100644 --- a/net-analyzer/nbtscan/metadata.xml +++ b/net-analyzer/nbtscan/metadata.xml @@ -1,8 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!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> + <maintainer type="project"> + <email>netmon@gentoo.org</email> + <name>Gentoo network monitoring and analysis project</name> + </maintainer> + <upstream> + <remote-id type="github">resurrecting-open-source-projects/nbtscan</remote-id> + </upstream> </pkgmetadata> diff --git a/net-analyzer/nbtscan/nbtscan-1.6.ebuild b/net-analyzer/nbtscan/nbtscan-1.6.ebuild deleted file mode 100644 index c8ce98992d77..000000000000 --- a/net-analyzer/nbtscan/nbtscan-1.6.ebuild +++ /dev/null @@ -1,32 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit autotools - -DESCRIPTION="NBTscan is a program for scanning IP networks for NetBIOS name information" -HOMEPAGE="https://github.com/resurrecting-open-source-projects/nbtscan" -SRC_URI="https://github.com/resurrecting-open-source-projects/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos" -PATCHES=( -# "${FILESDIR}"/${PN}-1.5.1-script-whitespace.patch -) -DOCS=( - AUTHORS - CONTRIBUTING.md - ChangeLog - NEWS - README.md -) - -src_prepare() { - default - eautoreconf -} - -src_install() { - default -} diff --git a/net-analyzer/nbtscan/nbtscan-1.7.2.ebuild b/net-analyzer/nbtscan/nbtscan-1.7.2.ebuild new file mode 100644 index 000000000000..567fd3977c0b --- /dev/null +++ b/net-analyzer/nbtscan/nbtscan-1.7.2.ebuild @@ -0,0 +1,22 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools + +DESCRIPTION="NBTscan is a program for scanning IP networks for NetBIOS name information" +HOMEPAGE="https://github.com/resurrecting-open-source-projects/nbtscan" +SRC_URI="https://github.com/resurrecting-open-source-projects/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos" + +DOCS=( AUTHORS CONTRIBUTING.md ChangeLog NEWS README.md ) + +src_prepare() { + default + + eautoreconf +} diff --git a/net-analyzer/nbwmon/metadata.xml b/net-analyzer/nbwmon/metadata.xml index 07903da6f676..064f3550e966 100644 --- a/net-analyzer/nbwmon/metadata.xml +++ b/net-analyzer/nbwmon/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>netmon@gentoo.org</email> diff --git a/net-analyzer/nbwmon/nbwmon-0.5.2.ebuild b/net-analyzer/nbwmon/nbwmon-0.5.2.ebuild index f2c7742f396c..613256373c42 100644 --- a/net-analyzer/nbwmon/nbwmon-0.5.2.ebuild +++ b/net-analyzer/nbwmon/nbwmon-0.5.2.ebuild @@ -1,27 +1,26 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 -inherit eutils toolchain-funcs +EAPI=7 + +inherit toolchain-funcs DESCRIPTION="ncurses bandwidth monitor" -HOMEPAGE="http://causes.host.funtoo.org/?p=nbwmon https://github.com/causes-/nbwmon" +HOMEPAGE="https://github.com/causes-/nbwmon" SRC_URI="https://github.com/causes-/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" LICENSE="MIT" SLOT="0" KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" -RDEPEND=" - sys-libs/ncurses -" -DEPEND=" - ${RDEPEND} - virtual/pkgconfig -" +RDEPEND="sys-libs/ncurses" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" + +PATCHES=( "${FILESDIR}"/${PN}-0.5.2-tinfo.patch ) src_prepare() { - epatch "${FILESDIR}"/${PN}-0.5.2-tinfo.patch + default tc-export CC PKG_CONFIG } 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/metadata.xml b/net-analyzer/ndoutils/metadata.xml index 5c2264521203..704d45ff9538 100644 --- a/net-analyzer/ndoutils/metadata.xml +++ b/net-analyzer/ndoutils/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>netmon@gentoo.org</email> diff --git a/net-analyzer/ndoutils/ndoutils-2.1.3-r2.ebuild b/net-analyzer/ndoutils/ndoutils-2.1.3-r2.ebuild deleted file mode 100644 index 784309fee43a..000000000000 --- a/net-analyzer/ndoutils/ndoutils-2.1.3-r2.ebuild +++ /dev/null @@ -1,95 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit systemd - -DESCRIPTION="Nagios addon to store Nagios data in a MySQL database" -HOMEPAGE="https://www.nagios.org/" -SRC_URI="https://github.com/NagiosEnterprises/${PN}/archive/${P}.tar.gz" - -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" -RDEPEND="${DEPEND} - virtual/mysql" - -S="${WORKDIR}/${PN}-${P}" - -DOCS=( - Changelog - README - THANKS - TODO - UPGRADING - "docs/NDOUTILS DB Model.pdf" - "docs/NDOUtils Documentation.pdf" -) - -PATCHES=( - "${FILESDIR}/format-security.patch" - "${FILESDIR}/ndoutils-2.0.0-asprintf.patch" - "${FILESDIR}/sample-config-piddir.patch" - "${FILESDIR}/openrc-init.patch" -) - -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" - # user will be able to write. - # - # 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. - econf --enable-mysql \ - --localstatedir=/var/lib/nagios \ - --sysconfdir=/etc/nagios \ - --with-piddir=/var/lib/nagios -} - -src_compile() { - # Avoid "emake all" so that we don't build the stuff for nagios-2.x - # and nagios-3.x, some of which throws QA warnings. We don't use it - # anyway. - pushd src - emake file2sock log2ndo ndo2db-4x ndomod-4x.o sockdebug - popd -} - -src_install() { - default - insinto /etc/nagios - newins config/ndo2db.cfg-sample ndo2db.cfg - newins config/ndomod.cfg-sample ndomod.cfg - newinitd "startup/openrc-init" ndo2db - newconfd "startup/openrc-conf" ndo2db - systemd_newunit "startup/default-service" "${PN}.service" - - # The documentation isn't installed by the build system - dodoc -r docs/html - - insinto "/usr/share/${PN}" - doins -r db - - # These need to be executable... - exeinto "/usr/share/${PN}/db" - doexe db/{installdb,prepsql,upgradedb} - - # Use symlinks because the installdb/upgradedb scripts use relative - # paths to the SQL queries. - dosym "../share/${PN}/db/installdb" /usr/bin/ndoutils-installdb - dosym "../share/${PN}/db/upgradedb" /usr/bin/ndoutils-upgradedb -} - -pkg_postinst() { - elog "To include NDO in your Nagios setup, you'll need to activate" - elog "the NDO broker module in /etc/nagios/nagios.cfg:" - elog " broker_module=/usr/bin/ndomod.o config_file=/etc/nagios/ndomod.cfg" -} diff --git a/net-analyzer/ndoutils/ndoutils-2.1.3-r4.ebuild b/net-analyzer/ndoutils/ndoutils-2.1.3-r4.ebuild new file mode 100644 index 000000000000..32d8d3bd8c57 --- /dev/null +++ b/net-analyzer/ndoutils/ndoutils-2.1.3-r4.ebuild @@ -0,0 +1,102 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools systemd + +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}" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~x86" + +DEPEND=" + dev-db/mysql-connector-c + dev-perl/DBD-mysql + 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=( + "${FILESDIR}"/format-security.patch + "${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" + # user will be able to write. + # + # 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 \ + --with-piddir=/var/lib/nagios +} + +src_compile() { + # Avoid "emake all" so that we don't build the stuff for nagios-2.x + # and nagios-3.x, some of which throws QA warnings. We don't use it + # anyway. + emake -C src file2sock log2ndo ndo2db-4x ndomod-4x.o sockdebug +} + +src_install() { + # The documentation isn't installed by the build system + HTML_DOCS=( docs/html/. ) + default + + dodoc Changelog UPGRADING \ + "docs/NDOUTILS DB Model.pdf" "docs/NDOUtils Documentation.pdf" + + systemd_newunit startup/default-service ndoutils.service + + insinto /etc/nagios + newins config/ndo2db.cfg-sample ndo2db.cfg + newins config/ndomod.cfg-sample ndomod.cfg + newinitd startup/openrc-init ndo2db + newconfd startup/openrc-conf ndo2db + + insinto /usr/share/ndoutils + doins -r db + + # These need to be executable... + exeinto /usr/share/ndoutils/db + doexe db/{installdb,prepsql,upgradedb} + + # Use symlinks because the installdb/upgradedb scripts use relative + # paths to the SQL queries. + dosym ../share/ndoutils/db/installdb /usr/bin/ndoutils-installdb + dosym ../share/ndoutils/db/upgradedb /usr/bin/ndoutils-upgradedb + + keepdir /var/lib/nagios +} + +pkg_postinst() { + elog "To include NDO in your Nagios setup, you'll need to activate" + elog "the NDO broker module in /etc/nagios/nagios.cfg:" + elog " broker_module=/usr/bin/ndomod.o config_file=/etc/nagios/ndomod.cfg" +} diff --git a/net-analyzer/ndsad/metadata.xml b/net-analyzer/ndsad/metadata.xml index 18ff97735235..f5859181ac93 100644 --- a/net-analyzer/ndsad/metadata.xml +++ b/net-analyzer/ndsad/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>netmon@gentoo.org</email> diff --git a/net-analyzer/nessus-agent-bin/Manifest b/net-analyzer/nessus-agent-bin/Manifest index b5e0bd814613..394824b917b2 100644 --- a/net-analyzer/nessus-agent-bin/Manifest +++ b/net-analyzer/nessus-agent-bin/Manifest @@ -1 +1,2 @@ -DIST NessusAgent-8.2.1-es8.x86_64.rpm 14895872 BLAKE2B fce714456a6cbf7b4f6bc8171e5461591761e5b16683b253c723738b3afe9624caa8d0dbf153c665f1cd696da48c44e1d0ddd7a9f3355faeb52b8bf285f749b0 SHA512 357cb33527411eb698879f4af329906e4ce677a4b4d70099f4d4933d0eed3a5330541def3a20d1a72aee6be1c4b5c9cb81dfe125d12e562fe0ad27a81605bd8c +DIST NessusAgent-10.6.1-el8.aarch64.rpm 18910012 BLAKE2B 810d8aed4391ef9782d19a9963ee0f3582b4aced89ccf7a12950e286eb42b1e314a0cba480982a681b413da73f060cdd909dd675702c2261d1406b2866617673 SHA512 81e91d0cc9bfe89a65ad1b83acad8512dcfbafa68a4f9b6311b31475c5b36ae44be4a82c32e359f60842d97b3e65c5ba75e1211de9d8025c194bf41464659c73 +DIST NessusAgent-10.6.1-el8.x86_64.rpm 20397988 BLAKE2B 5d75a5b21ed9ec4c4d4b4142cd37000e304c765a334118dd149f69b0c8dd2b729e08bd3a40ad5df5ed02ed43b336baed3edf3103b455aeb7f45dce4ca2a8f591 SHA512 51edba9a836b80a2ece40ff3b4995b2b8351e3cd8e637d04c3a55f5b90814cea453ee836ba71d691a6076032fd0d9b95c694c1ebed66c4fe75f821e23b2bd757 diff --git a/net-analyzer/nessus-agent-bin/metadata.xml b/net-analyzer/nessus-agent-bin/metadata.xml index c8e172bcbf62..8dbe725d1f4e 100644 --- a/net-analyzer/nessus-agent-bin/metadata.xml +++ b/net-analyzer/nessus-agent-bin/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> <email>marecki@gentoo.org</email> diff --git a/net-analyzer/nessus-agent-bin/nessus-agent-bin-10.6.1.ebuild b/net-analyzer/nessus-agent-bin/nessus-agent-bin-10.6.1.ebuild new file mode 100644 index 000000000000..fcc153bf0cb4 --- /dev/null +++ b/net-analyzer/nessus-agent-bin/nessus-agent-bin-10.6.1.ebuild @@ -0,0 +1,64 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit rpm systemd + +MY_P="NessusAgent-${PV}-el8" + +DESCRIPTION="A remote security scanner for Linux - agent component" +HOMEPAGE="https://www.tenable.com/" +SRC_URI=" + amd64? ( https://www.tenable.com/downloads/api/v2/pages/${PN/-bin/s}/files/${MY_P}.x86_64.rpm ) + arm64? ( https://www.tenable.com/downloads/api/v2/pages/${PN/-bin/s}/files/${MY_P}.aarch64.rpm ) +" + +LICENSE="GPL-2 Tenable-Master-Agreement" +SLOT="0" +KEYWORDS="-* ~amd64 ~arm64" + +RESTRICT="mirror strip" + +QA_PREBUILT="opt/nessus_agent/bin/* + opt/nessus_agent/lib/nessus/*.so + opt/nessus_agent/lib/nessus/iconv/*.so + opt/nessus_agent/lib/nessus/libjemalloc.so.* + opt/nessus_agent/sbin/*" + +S="${WORKDIR}" + +src_install() { + # Using doins -r would strip executable bits from all binaries + cp -pPR "${S}"/opt "${D}"/ || die "Failed to copy files" + + # Make sure these originally empty directories do not vanish, + # Nessus will not run properly without them + keepdir /opt/nessus_agent/com/nessus/CA + keepdir /opt/nessus_agent/etc/nessus + keepdir /opt/nessus_agent/var/nessus/logs + keepdir /opt/nessus_agent/var/nessus/tmp + keepdir /opt/nessus_agent/var/nessus/users + + newinitd "${FILESDIR}"/nessusagent.initd nessusagent + systemd_dounit usr/lib/systemd/system/nessusagent.service +} + +pkg_postinst() { + # Actually update Nessus core components. According to upstream packages, + # harmless to invoke on fresh installations too - and it may make life easier + # for people who had restored Nessus state from backups, had it lying around + # from older installations and so on. + "${EROOT}"/opt/nessus_agent/sbin/nessuscli install "${EROOT}"/opt/nessus_agent/var/nessus/plugins-core.tar.gz + + if [[ -z "${REPLACING_VERSIONS}" ]]; then + elog "In order to link the agent to Tenable.io or an instance of Nessus Manager," + elog "obtain an appropriate linking key and run" + elog "" + elog " /opt/nessus_agent/sbin/nessuscli agent link --key=<key> --host=<host> --port=<port> [optional parameters]" + elog "" + elog "This can be done before the agent is started." + else + elog "Please restart the nessusagent service to complete the update process" + fi +} diff --git a/net-analyzer/nessus-agent-bin/nessus-agent-bin-8.2.1.ebuild b/net-analyzer/nessus-agent-bin/nessus-agent-bin-8.2.1.ebuild deleted file mode 100644 index 9436416d89df..000000000000 --- a/net-analyzer/nessus-agent-bin/nessus-agent-bin-8.2.1.ebuild +++ /dev/null @@ -1,70 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit rpm systemd - -MY_P="NessusAgent-${PV}-es8" - -DESCRIPTION="A remote security scanner for Linux - agent component" -HOMEPAGE="https://www.tenable.com/" -SRC_URI="${MY_P}.x86_64.rpm" - -LICENSE="GPL-2 Nessus-EULA" -SLOT="0" -KEYWORDS="~amd64" - -RESTRICT="mirror fetch strip" - -QA_PREBUILT="opt/nessus_agent/bin/nasl - opt/nessus_agent/bin/nessus-mkrand - opt/nessus_agent/lib/nessus/libjemalloc.so.* - opt/nessus_agent/lib/nessus/libnessus-glibc-fix.so - opt/nessus_agent/lib/nessus/iconv/*.so - opt/nessus_agent/sbin/nessus-check-signature - opt/nessus_agent/sbin/nessus-service - opt/nessus_agent/sbin/nessuscli - opt/nessus_agent/sbin/nessusd" - -S="${WORKDIR}" - -pkg_nofetch() { - einfo "Please download ${A} from ${HOMEPAGE}downloads/nessus-agents" - einfo "The archive should then be placed into your DISTDIR directory." -} - -src_install() { - # Using doins -r would strip executable bits from all binaries - cp -pPR "${S}"/opt "${D}"/ || die "Failed to copy files" - - # Make sure these originally empty directories do not vanish, - # Nessus will not run properly without them - keepdir /opt/nessus_agent/com/nessus/CA - keepdir /opt/nessus_agent/etc/nessus - keepdir /opt/nessus_agent/var/nessus/logs - keepdir /opt/nessus_agent/var/nessus/tmp - keepdir /opt/nessus_agent/var/nessus/users - - newinitd "${FILESDIR}"/nessusagent.initd nessusagent - systemd_dounit usr/lib/systemd/system/nessusagent.service -} - -pkg_postinst() { - # Actually update Nessus core components. According to upstream packages, - # harmless to invoke on fresh installations too - and it may make life easier - # for people who had restored Nessus state from backups, had it lying around - # from older installations and so on. - "${EROOT}"/opt/nessus_agent/sbin/nessuscli install "${EROOT}"/opt/nessus_agent/var/nessus/plugins-core.tar.gz - - if [[ -z "${REPLACING_VERSIONS}" ]]; then - elog "In order to link the agent to Tenable.io or an instance of Nessus Manager," - elog "obtain an appropriate linking key and run" - elog "" - elog " /opt/nessus_agent/sbin/nessuscli agent link --key=<key> --host=<host> --port=<port> [optional parameters]" - elog "" - elog "This can be done before the agent is started." - else - elog "Please restart the nessusagent service to complete the update process" - fi -} diff --git a/net-analyzer/nessus-bin/Manifest b/net-analyzer/nessus-bin/Manifest index b7de8f360248..4fb920a6d1f7 100644 --- a/net-analyzer/nessus-bin/Manifest +++ b/net-analyzer/nessus-bin/Manifest @@ -1 +1,2 @@ -DIST Nessus-8.13.1-es8.x86_64.rpm 41186604 BLAKE2B 462cc6bd9c2f5b50fce330fa5919e9b6e5c93285361c385d06d6f0377ecb9fa8ce349714b71d0f97604c4e755d54e510edb5561c9dccfdb1fad3e35a7e6504d6 SHA512 d2a2b3a94b78bbf6261ae0ad4f66475cf0aea14316de1f2133795767c14048cb12b9857e497182770b04e006c00f65a7fe592f4fce0c480d08efafb2c17ad7a2 +DIST Nessus-10.7.2-el8.aarch64.rpm 62540368 BLAKE2B 6f8ce0cdbf4c4805da666ba954fc717296e325dc693b1301e2586e9bbb880e85edf6f65a246d782663d6964d1f8c508bd57cc797801853163a39309b399d2e86 SHA512 10896aedd260cdb3cecdbf3fe2cbd9ea904c880935969f44d776be8e5326abbb7e31ea177afff2bfb65589bbb03d92f4b99a59c3c714a9671cc40589e2e22bf1 +DIST Nessus-10.7.2-el8.x86_64.rpm 63974168 BLAKE2B 34e765cbda0484d67e8c119661dde82c27056a383eef7eca019fd570905988cd76776b2ab2c90c1b25c4effa026b59b501a4d133f038aeba6978a758ff3f0aab SHA512 0caa0c28189560cee6058d309f821d9a287c72c9dcb177d1686dbc61173bc44a462b22c714a9e34989cfa579009e87722249e5314326ccd398c99a0fc07c9acb diff --git a/net-analyzer/nessus-bin/metadata.xml b/net-analyzer/nessus-bin/metadata.xml index 240647db5de6..3a59c704b098 100644 --- a/net-analyzer/nessus-bin/metadata.xml +++ b/net-analyzer/nessus-bin/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> <email>marecki@gentoo.org</email> diff --git a/net-analyzer/nessus-bin/nessus-bin-10.7.2.ebuild b/net-analyzer/nessus-bin/nessus-bin-10.7.2.ebuild new file mode 100644 index 000000000000..3fe24e9b4ae0 --- /dev/null +++ b/net-analyzer/nessus-bin/nessus-bin-10.7.2.ebuild @@ -0,0 +1,59 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit rpm systemd + +MY_P="Nessus-${PV}-el8" + +DESCRIPTION="A remote security scanner for Linux" +HOMEPAGE="https://www.tenable.com/" +SRC_URI=" + amd64? ( https://www.tenable.com/downloads/api/v2/pages/${PN%-bin}/files/${MY_P}.x86_64.rpm ) + arm64? ( https://www.tenable.com/downloads/api/v2/pages/${PN%-bin}/files/${MY_P}.aarch64.rpm ) +" + +LICENSE="GPL-2 Tenable-Master-Agreement" +SLOT="0" +KEYWORDS="-* ~amd64 ~arm64" + +RESTRICT="mirror strip" + +QA_PREBUILT="opt/nessus/bin/* + opt/nessus/lib/nessus/*.so + opt/nessus/lib/nessus/iconv/*.so + opt/nessus/lib/nessus/libjemalloc.so.* + opt/nessus/sbin/*" + +S="${WORKDIR}" + +src_install() { + # Using doins -r would strip executable bits from all binaries + cp -pPR "${S}"/opt "${D}"/ || die "Failed to copy files" + + # Make sure these originally empty directories do not vanish, + # Nessus will not run properly without them + keepdir /opt/nessus/com/nessus/CA + keepdir /opt/nessus/etc/nessus + keepdir /opt/nessus/var/nessus/logs + keepdir /opt/nessus/var/nessus/tmp + + newinitd "${FILESDIR}"/nessusd-initd nessusd-bin + systemd_newunit usr/lib/systemd/system/nessusd.service nessusd-bin.service +} + +pkg_postinst() { + # Actually update Nessus core components. According to upstream packages, + # harmless to invoke on fresh installations too - and it may make life easier + # for people who had restored Nessus state from backups, had it lying around + # from older installations and so on. + "${EROOT}"/opt/nessus/sbin/nessuscli install "${EROOT}"/opt/nessus/var/nessus/plugins-core.tar.gz + + if [[ -z "${REPLACING_VERSIONS}" ]]; then + elog "To get started launch the nessusd-bin service, then point your Web browser to" + elog " https://<yourhost>:8834/" + else + elog "Please restart the nessusd-bin service to use the new version of Nessus" + fi +} diff --git a/net-analyzer/nessus-bin/nessus-bin-8.13.1.ebuild b/net-analyzer/nessus-bin/nessus-bin-8.13.1.ebuild deleted file mode 100644 index 1e569f0e0f10..000000000000 --- a/net-analyzer/nessus-bin/nessus-bin-8.13.1.ebuild +++ /dev/null @@ -1,65 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit rpm systemd - -MY_P="Nessus-${PV}-es8" - -DESCRIPTION="A remote security scanner for Linux" -HOMEPAGE="https://www.tenable.com/" -SRC_URI="${MY_P}.x86_64.rpm" - -LICENSE="GPL-2 Nessus-EULA" -SLOT="0" -KEYWORDS="~amd64" - -RESTRICT="mirror fetch strip" - -QA_PREBUILT="opt/nessus/bin/nasl - opt/nessus/bin/ndbg - opt/nessus/bin/nessus-mkrand - opt/nessus/lib/nessus/libjemalloc.so.2 - opt/nessus/lib/nessus/libnessus-glibc-fix.so - opt/nessus/lib/nessus/iconv/*.so - opt/nessus/sbin/nessus-service - opt/nessus/sbin/nessuscli - opt/nessus/sbin/nessusd" - -S="${WORKDIR}" - -pkg_nofetch() { - einfo "Please download ${A} from ${HOMEPAGE}downloads/nessus" - einfo "The archive should then be placed into your DISTDIR directory." -} - -src_install() { - # Using doins -r would strip executable bits from all binaries - cp -pPR "${S}"/opt "${D}"/ || die "Failed to copy files" - - # Make sure these originally empty directories do not vanish, - # Nessus will not run properly without them - keepdir /opt/nessus/com/nessus/CA - keepdir /opt/nessus/etc/nessus - keepdir /opt/nessus/var/nessus/logs - keepdir /opt/nessus/var/nessus/tmp - - newinitd "${FILESDIR}"/nessusd-initd nessusd-bin - systemd_newunit usr/lib/systemd/system/nessusd.service nessusd-bin.service -} - -pkg_postinst() { - # Actually update Nessus core components. According to upstream packages, - # harmless to invoke on fresh installations too - and it may make life easier - # for people who had restored Nessus state from backups, had it lying around - # from older installations and so on. - "${EROOT}"/opt/nessus/sbin/nessuscli install "${EROOT}"/opt/nessus/var/nessus/plugins-core.tar.gz - - if [[ -z "${REPLACING_VERSIONS}" ]]; then - elog "To get started launch the nessusd-bin service, then point your Web browser to" - elog " https://<yourhost>:8834/" - else - elog "Please restart the nessusd-bin service to use the new version of Nessus" - fi -} diff --git a/net-analyzer/net-snmp/Manifest b/net-analyzer/net-snmp/Manifest index 1d806f075850..b0d07d45b397 100644 --- a/net-analyzer/net-snmp/Manifest +++ b/net-analyzer/net-snmp/Manifest @@ -1,2 +1,3 @@ DIST net-snmp-5.7.3-patches-3.tar.xz 3176 BLAKE2B 1a71d6743afb841f664c6058e32c7c411af62b0f36acd3bb9251804893ed12f462a0c5bab828e309eeec7824def2dca8fa866350b90a62ec4f0df1141b51ecae SHA512 d8a91b9668320a1e19d062eb86dd4d16beb7c2d15ac7ebbb9d2a4bd298af39bbb0a2613504dbb0057cccdec731f08f2308c5a15395e1fbc29bb0611ed8aca636 -DIST net-snmp-5.9.tar.xz 4082580 BLAKE2B 9dfd5a7dfe4ca18b16c71c9f5cb70c540d16aa36a0b2dacd3ddc465934f96ac473f77490af78d202bf6dad4eddea5d75665a770df74132aafda39f5f3a87d835 SHA512 3f1e27caa8e5306d451b61b08c2daf007929a850661962fcd29b528a80332a980184303a7e87c96d8d2774181758889dc825cb08e3c3b353c5e7ca1ebcc09173 +DIST net-snmp-5.9.3.tar.gz 6646950 BLAKE2B b8e3de60e178ec16ad2848ad77f3bd4cbd35eaa9be103c0fa5d17514c29df4e69015ac53b54c9e565e3032b0c0bb47c19729e65310a6acefae901e101ea49451 SHA512 a476df4967029a2eb03d27b0e250170785d0a8c143d49b900ee958c3cbdfaccd415b70af40f6fbed9cb8819d522c35a6073a431091d908ccc7c018fa0aaa2abc +DIST net-snmp-5.9.4.tar.gz 6681606 BLAKE2B 2f3dfdc4ce2f4d9a1a771a77e0b0c427a89e3de6dc217009df385baabc7d860ca7714fa76360a4d14521f1b88c9c13ad46b25d3975e33e8bc4bce3eb3b27b99d SHA512 a510fa91a21e9ddc86a12fd1d0bc6b356e63f3ea53f184d2e31439004d41d902390664134dc40b3b828eabb4282eaf3da628a07c4d480fa00eff7e700950c423 diff --git a/net-analyzer/net-snmp/files/net-snmp-5.7.3-include-limits.patch b/net-analyzer/net-snmp/files/net-snmp-5.7.3-include-limits.patch deleted file mode 100644 index 04eafbbe9c5d..000000000000 --- a/net-analyzer/net-snmp/files/net-snmp-5.7.3-include-limits.patch +++ /dev/null @@ -1,15 +0,0 @@ -POSIX requires <limits.h> for PATH_MAX and NAME_MAX - -Author: Anthony G. Basile <blueness@gentoo.org> - -diff -Naur net-snmp-5.7.3.orig/agent/mibgroup/util_funcs/get_pid_from_inode.c net-snmp-5.7.3/agent/mibgroup/util_funcs/get_pid_from_inode.c ---- net-snmp-5.7.3.orig/agent/mibgroup/util_funcs/get_pid_from_inode.c 2014-12-08 15:23:22.000000000 -0500 -+++ net-snmp-5.7.3/agent/mibgroup/util_funcs/get_pid_from_inode.c 2018-02-21 15:34:06.237028136 -0500 -@@ -6,6 +6,7 @@ - - #include <ctype.h> - #include <stdio.h> -+#include <limits.h> - #if HAVE_STDLIB_H - #include <stdlib.h> - #endif diff --git a/net-analyzer/net-snmp/files/net-snmp-5.8-do-not-conflate-LDFLAGS-and-LIBS.patch b/net-analyzer/net-snmp/files/net-snmp-5.8-do-not-conflate-LDFLAGS-and-LIBS.patch deleted file mode 100644 index 4e3001e1e473..000000000000 --- a/net-analyzer/net-snmp/files/net-snmp-5.8-do-not-conflate-LDFLAGS-and-LIBS.patch +++ /dev/null @@ -1,34 +0,0 @@ ---- a/net-snmp-config.in -+++ b/net-snmp-config.in -@@ -190,13 +190,13 @@ - #################################################### client lib - --libs) - # use this one == --netsnmp-libs + --external-libs -- echo $NSC_LDFLAGS $NSC_LIBDIR $NSC_SNMPLIBS $NSC_LIBS -+ echo $NSC_LIBDIR $NSC_SNMPLIBS $NSC_LIBS - ;; - --netsnmp-libs) - echo $NSC_LIBDIR $NSC_BASE_SNMP_LIBS - ;; - --external-libs) -- echo $NSC_LDFLAGS $NSC_LNETSNMPLIBS $NSC_LIBS @PERLLDOPTS_FOR_APPS@ -+ echo $NSC_LNETSNMPLIBS $NSC_LIBS @PERLLDOPTS_FOR_APPS@ - ;; - #################################################### agent lib - --base-agent-libs) -@@ -207,13 +207,13 @@ - ;; - --agent-libs) - # use this one == --netsnmp-agent-libs + --external-libs -- echo $NSC_LDFLAGS $NSC_LIBDIR $NSC_AGENTLIBS $NSC_LIBS -+ echo $NSC_LIBDIR $NSC_AGENTLIBS $NSC_LIBS - ;; - --netsnmp-agent-libs) - echo $NSC_LIBDIR $NSC_BASE_AGENT_LIBS - ;; - --external-agent-libs) -- echo $NSC_LDFLAGS $NSC_LMIBLIBS $NSC_LAGENTLIBS $NSC_LNETSNMPLIBS $NSC_LIBS -+ echo $NSC_LMIBLIBS $NSC_LAGENTLIBS $NSC_LNETSNMPLIBS $NSC_LIBS - ;; - #################################################### - --version|--ver*) diff --git a/net-analyzer/net-snmp/files/net-snmp-5.8.1-net-snmp-config-libdir.patch b/net-analyzer/net-snmp/files/net-snmp-5.8.1-net-snmp-config-libdir.patch deleted file mode 100644 index 73d420531bb3..000000000000 --- a/net-analyzer/net-snmp/files/net-snmp-5.8.1-net-snmp-config-libdir.patch +++ /dev/null @@ -1,37 +0,0 @@ ---- a/net-snmp-config.in -+++ b/net-snmp-config.in -@@ -193,10 +193,10 @@ - #################################################### client lib - --libs) - # use this one == --netsnmp-libs + --external-libs -- echo $NSC_LIBDIR $NSC_SNMPLIBS $NSC_LIBS -+ echo $NSC_SNMPLIBS $NSC_LIBS - ;; - --netsnmp-libs) -- echo $NSC_LIBDIR $NSC_BASE_SNMP_LIBS -+ echo $NSC_BASE_SNMP_LIBS - ;; - --external-libs) - echo $NSC_LNETSNMPLIBS $NSC_LIBS @PERLLDOPTS_FOR_APPS@ -@@ -210,10 +210,10 @@ - ;; - --agent-libs) - # use this one == --netsnmp-agent-libs + --external-libs -- echo $NSC_LIBDIR $NSC_AGENTLIBS $NSC_LIBS -+ echo $NSC_AGENTLIBS $NSC_LIBS - ;; - --netsnmp-agent-libs) -- echo $NSC_LIBDIR $NSC_BASE_AGENT_LIBS -+ echo $NSC_BASE_AGENT_LIBS - ;; - --external-agent-libs) - echo $NSC_LMIBLIBS $NSC_LAGENTLIBS $NSC_LNETSNMPLIBS $NSC_LIBS -@@ -660,7 +660,7 @@ - echo "Ack. Can't create $tmpfile." - exit 1 - fi -- cmd="@CC@ $cflags @CFLAGS@ @DEVFLAGS@ -I. -I${NSC_INCLUDEDIR} -o $outname $tmpfile $cfiles $NSC_LDFLAGS $NSC_LIBDIR $NSC_BASE_AGENT_LIBS $NSC_AGENTLIBS $ldflags" -+ cmd="@CC@ $cflags @CFLAGS@ @DEVFLAGS@ -I. -I${NSC_INCLUDEDIR} -o $outname $tmpfile $cfiles $ldflags $NSC_LDFLAGS $NSC_BASE_AGENT_LIBS $NSC_AGENTLIBS" - echo "running: $cmd" - echo `$cmd` - result=$? diff --git a/net-analyzer/net-snmp/files/net-snmp-5.8.1-pkg-config.patch b/net-analyzer/net-snmp/files/net-snmp-5.8.1-pkg-config.patch deleted file mode 100644 index acda136a22cd..000000000000 --- a/net-analyzer/net-snmp/files/net-snmp-5.8.1-pkg-config.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- a/netsnmp-agent.pc.in -+++ b/netsnmp-agent.pc.in -@@ -8,5 +8,5 @@ - URL: http://www.net-snmp.org - Version: @PACKAGE_VERSION@ - Cflags: -I${includedir} --Libs: -L${libdir} -lnetsnmpmibs -lnetsnmpagent -lnetsnmp --Libs.private: @LDFLAGS@ @LMIBLIBS@ @LAGENTLIBS@ @PERLLDOPTS_FOR_APPS@ @LNETSNMPLIBS@ @LIBS@ -+Libs: -lnetsnmpmibs -lnetsnmpagent -lnetsnmp -+Libs.private: @LMIBLIBS@ @LAGENTLIBS@ @PERLLDOPTS_FOR_APPS@ @LNETSNMPLIBS@ @LIBS@ ---- a/netsnmp.pc.in -+++ b/netsnmp.pc.in -@@ -8,5 +8,5 @@ - URL: http://www.net-snmp.org - Version: @PACKAGE_VERSION@ - Cflags: -I${includedir} --Libs: -L${libdir} -lnetsnmp --Libs.private: @LDFLAGS@ @LNETSNMPLIBS@ @LIBS@ @PERLLDOPTS_FOR_APPS@ -+Libs: -lnetsnmp -+Libs.private: @LNETSNMPLIBS@ @LIBS@ @PERLLDOPTS_FOR_APPS@ diff --git a/net-analyzer/net-snmp/files/net-snmp-5.9.3-0001-Fix-LDFLAGS-vs-LIBS-ordering.patch b/net-analyzer/net-snmp/files/net-snmp-5.9.3-0001-Fix-LDFLAGS-vs-LIBS-ordering.patch new file mode 100644 index 000000000000..785f5ee57d1c --- /dev/null +++ b/net-analyzer/net-snmp/files/net-snmp-5.9.3-0001-Fix-LDFLAGS-vs-LIBS-ordering.patch @@ -0,0 +1,231 @@ +https://github.com/net-snmp/net-snmp/pull/493 + +From 1151979ecfba1ef10627175549d052cb76ef9d21 Mon Sep 17 00:00:00 2001 +From: Sam James <sam@gentoo.org> +Date: Fri, 2 Dec 2022 02:26:29 +0000 +Subject: [PATCH 1/4] Fix LDFLAGS vs LIBS ordering + +LDFLAGS must come before both LIBS & any listed objects in order +for certain valid LDFLAGS, like '-Wl,--as-needed' to work correctly +(otherwise it'll either take no effect or discard libraries when +they're needed). + +Gentoo has been carrying this patch for a while. + +Signed-off-by: Sam James <sam@gentoo.org> +--- a/Makefile.top ++++ b/Makefile.top +@@ -86,11 +86,11 @@ LIBCURRENT = 40 + LIBAGE = 0 + LIBREVISION = 0 + +-LIB_LD_CMD = $(LIBTOOL) --mode=link $(LINKCC) $(CFLAGS) -rpath $(libdir) -version-info $(LIBCURRENT):$(LIBREVISION):$(LIBAGE) @LD_NO_UNDEFINED@ -o ++LIB_LD_CMD = $(LIBTOOL) --mode=link $(LINKCC) $(CFLAGS) $(LDFLAGS) -rpath $(libdir) -version-info $(LIBCURRENT):$(LIBREVISION):$(LIBAGE) @LD_NO_UNDEFINED@ -o + LIB_EXTENSION = la + LIB_VERSION = + LIB_LDCONFIG_CMD = $(LIBTOOL) --mode=finish $(INSTALL_PREFIX)$(libdir) +-LINK = $(LIBTOOL) --mode=link $(LINKCC) ++LINK = $(LIBTOOL) --mode=link $(LINKCC) $(LDFLAGS) + # RANLIB = @RANLIB@ + RANLIB = : + +--- a/agent/Makefile.in ++++ b/agent/Makefile.in +@@ -288,26 +288,26 @@ all: agentlib subdirs miblib $(INSTALLBINPROGS) $(INSTALLSBINPROGS) + # build stuff targets + # + getkstat: getkstat.o +- $(CC) $(CFLAGS) -o $@ $? $(LIBS) ++ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $? $(LIBS) + + getkstat.o: mibgroup/kernel_sunos5.c +- $(CC) $(CFLAGS) -o $@ -D_GETKSTAT_TEST -DDODEBUG -c $? ++ $(CC) $(CFLAGS) -o $@ -D_GETKSTAT_TEST -DDODEBUG -c $? + + getmibstat: getmibstat.o +- $(CC) $(CFLAGS) -o $@ $? $(LIBS) ++ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $? $(LIBS) + + getmibstat.o: mibgroup/kernel_sunos5.c +- $(CC) $(CFLAGS) -o $@ -D_GETMIBSTAT_TEST -DDODEBUG -c $? ++ $(CC) $(CFLAGS) -o $@ -D_GETMIBSTAT_TEST -DDODEBUG -c $? + +-snmpd$(EXEEXT): ${LAGENTOBJS} $(USELIBS) $(AGENTLIB) $(HELPERLIB) $(MIBLIB) $(LIBTARG) +- $(LINK) $(CFLAGS) -o $@ ${LAGENTOBJS} ${LDFLAGS} ${OUR_AGENT_LIBS} ++snmpd$(EXEEXT): ${LAGENTOBJS} $(USELIBS) $(AGENTLIB) $(HELPERLIB) $(MIBLIB) $(LIBTARG) ++ $(LINK) $(CFLAGS) $(LDFLAGS) -o $@ ${LAGENTOBJS} ${OUR_AGENT_LIBS} + + libnetsnmpagent.$(LIB_EXTENSION)$(LIB_VERSION): ${LLIBAGENTOBJS} $(USELIBS) +- $(LIB_LD_CMD) $(AGENTLIB) ${LLIBAGENTOBJS} $(USELIBS) ${LAGENTLIBS} $(LDFLAGS) $(PERLLDOPTS_FOR_LIBS) @AGENTLIBS@ ++ $(LIB_LD_CMD) $(AGENTLIB) $(LDFLAGS) ${LLIBAGENTOBJS} $(USELIBS) ${LAGENTLIBS} $(PERLLDOPTS_FOR_LIBS) @AGENTLIBS@ + $(RANLIB) $(AGENTLIB) + + libnetsnmpmibs.$(LIB_EXTENSION)$(LIB_VERSION): ${LMIBOBJS} $(AGENTLIB) $(USELIBS) subdirs +- $(LIB_LD_CMD) $(MIBLIB) ${LMIBOBJS} $(AGENTLIB) $(USELIBS) $(LDFLAGS) ${LMIBLIBS} $(PERLLDOPTS_FOR_LIBS) @AGENTLIBS@ ++ $(LIB_LD_CMD) $(MIBLIB) $(LDFLAGS) ${LMIBOBJS} $(AGENTLIB) $(USELIBS) ${LMIBLIBS} $(PERLLDOPTS_FOR_LIBS) @AGENTLIBS@ + $(RANLIB) $(MIBLIB) + + agentlib: $(AGENTLIB) +--- a/agent/helpers/Makefile.in ++++ b/agent/helpers/Makefile.in +@@ -32,5 +32,5 @@ LOBJS = dummy.lo + all: standardall + + libnetsnmphelpers.$(LIB_EXTENSION)$(LIB_VERSION): $(LOBJS) +- $(LIB_LD_CMD) $@ $(LOBJS) $(LDFLAGS) ++ $(LIB_LD_CMD) $@ $(LDFLAGS) $(LOBJS) + $(RANLIB) $@ +--- a/apps/Makefile.in ++++ b/apps/Makefile.in +@@ -163,37 +163,37 @@ OTHERUNINSTALL=snmpinformuninstall snmptrapdperluninstall \ + # build rules + # + snmpwalk$(EXEEXT): snmpwalk.$(OSUFFIX) $(USELIBS) +- $(LINK) ${CFLAGS} -o $@ snmpwalk.$(OSUFFIX) ${LDFLAGS} ${LIBS} ++ $(LINK) ${CFLAGS} ${LDFLAGS} -o $@ snmpwalk.$(OSUFFIX) ${LIBS} + + snmpbulkwalk$(EXEEXT): snmpbulkwalk.$(OSUFFIX) $(USELIBS) +- $(LINK) ${CFLAGS} -o $@ snmpbulkwalk.$(OSUFFIX) ${LDFLAGS} ${LIBS} ++ $(LINK) ${CFLAGS} ${LDFLAGS} -o $@ snmpbulkwalk.$(OSUFFIX) ${LIBS} + + snmpbulkget$(EXEEXT): snmpbulkget.$(OSUFFIX) $(USELIBS) +- $(LINK) ${CFLAGS} -o $@ snmpbulkget.$(OSUFFIX) ${LDFLAGS} ${LIBS} ++ $(LINK) ${CFLAGS} ${LDFLAGS} -o $@ snmpbulkget.$(OSUFFIX) ${LIBS} + + snmptranslate$(EXEEXT): snmptranslate.$(OSUFFIX) $(USELIBS) +- $(LINK) ${CFLAGS} -o $@ snmptranslate.$(OSUFFIX) ${LDFLAGS} ${LIBS} ++ $(LINK) ${CFLAGS} ${LDFLAGS} -o $@ snmptranslate.$(OSUFFIX) ${LIBS} + + snmpstatus$(EXEEXT): snmpstatus.$(OSUFFIX) $(USELIBS) +- $(LINK) ${CFLAGS} -o $@ snmpstatus.$(OSUFFIX) ${LDFLAGS} ${LIBS} ++ $(LINK) ${CFLAGS} ${LDFLAGS} -o $@ snmpstatus.$(OSUFFIX) ${LIBS} + + snmpget$(EXEEXT): snmpget.$(OSUFFIX) $(USELIBS) +- $(LINK) ${CFLAGS} -o $@ snmpget.$(OSUFFIX) ${LDFLAGS} ${LIBS} ++ $(LINK) ${CFLAGS} ${LDFLAGS} -o $@ snmpget.$(OSUFFIX) ${LIBS} + + snmpdelta$(EXEEXT): snmpdelta.$(OSUFFIX) $(USELIBS) +- $(LINK) ${CFLAGS} -o $@ snmpdelta.$(OSUFFIX) ${LDFLAGS} ${LIBS} ++ $(LINK) ${CFLAGS} ${LDFLAGS} -o $@ snmpdelta.$(OSUFFIX) ${LIBS} + + snmptable$(EXEEXT): snmptable.$(OSUFFIX) $(USELIBS) +- $(LINK) ${CFLAGS} -o $@ snmptable.$(OSUFFIX) ${LDFLAGS} ${LIBS} ++ $(LINK) ${CFLAGS} ${LDFLAGS} -o $@ snmptable.$(OSUFFIX) ${LIBS} + + snmptest$(EXEEXT): snmptest.$(OSUFFIX) $(USELIBS) +- $(LINK) ${CFLAGS} -o $@ snmptest.$(OSUFFIX) ${LDFLAGS} ${LIBS} ++ $(LINK) ${CFLAGS} ${LDFLAGS} -o $@ snmptest.$(OSUFFIX) ${LIBS} + + snmptrapd$(EXEEXT): $(TRAPD_OBJECTS) $(USETRAPLIBS) $(INSTALLLIBS) +- $(LINK) ${CFLAGS} -o $@ $(TRAPD_OBJECTS) $(INSTALLLIBS) ${LDFLAGS} ${TRAPLIBS} ++ $(LINK) ${CFLAGS} ${LDFLAGS} -o $@ $(TRAPD_OBJECTS) $(INSTALLLIBS) ${TRAPLIBS} + + snmptrap$(EXEEXT): snmptrap.$(OSUFFIX) $(USELIBS) +- $(LINK) ${CFLAGS} -o $@ snmptrap.$(OSUFFIX) ${LDFLAGS} ${LIBS} ++ $(LINK) ${CFLAGS} ${LDFLAGS} -o $@ snmptrap.$(OSUFFIX) ${LIBS} + + snmpinform$(EXEEXT): snmptrap$(EXEEXT) + rm -f snmpinform +@@ -204,40 +204,40 @@ snmptop$(EXEEXT): snmpps$(EXEEXT) + $(LN_S) snmpps$(EXEEXT) snmptop$(EXEEXT) + + snmpset$(EXEEXT): snmpset.$(OSUFFIX) $(USELIBS) +- $(LINK) ${CFLAGS} -o $@ snmpset.$(OSUFFIX) ${LDFLAGS} ${LIBS} ++ $(LINK) ${CFLAGS} ${LDFLAGS} -o $@ snmpset.$(OSUFFIX) ${LIBS} + + snmpusm$(EXEEXT): snmpusm.$(OSUFFIX) $(USELIBS) +- $(LINK) ${CFLAGS} -o $@ snmpusm.$(OSUFFIX) ${LDFLAGS} ${LIBS} ++ $(LINK) ${CFLAGS} ${LDFLAGS} -o $@ snmpusm.$(OSUFFIX) ${LIBS} + + snmpvacm$(EXEEXT): snmpvacm.$(OSUFFIX) $(USELIBS) +- $(LINK) ${CFLAGS} -o $@ snmpvacm.$(OSUFFIX) ${LDFLAGS} ${LIBS} ++ $(LINK) ${CFLAGS} ${LDFLAGS} -o $@ snmpvacm.$(OSUFFIX) ${LIBS} + + snmptls$(EXEEXT): snmptls.$(OSUFFIX) $(USELIBS) +- $(LINK) ${CFLAGS} -o $@ snmptls.$(OSUFFIX) ${LDFLAGS} ${LIBS} ++ $(LINK) ${CFLAGS} ${LDFLAGS} -o $@ snmptls.$(OSUFFIX) ${LIBS} + + agentxtrap$(EXEEXT): agentxtrap.$(OSUFFIX) $(USEAGENTLIBS) +- $(LINK) ${CFLAGS} -o $@ agentxtrap.$(OSUFFIX) ${LDFLAGS} $(USEAGENTLIBS) $(PERLLDOPTS_FOR_APPS) ${LIBS} ++ $(LINK) ${CFLAGS} ${LDFLAGS} -o $@ agentxtrap.$(OSUFFIX) $(USEAGENTLIBS) $(PERLLDOPTS_FOR_APPS) ${LIBS} + + snmpgetnext$(EXEEXT): snmpgetnext.$(OSUFFIX) $(USELIBS) +- $(LINK) ${CFLAGS} -o $@ snmpgetnext.$(OSUFFIX) ${LDFLAGS} ${LIBS} ++ $(LINK) ${CFLAGS} ${LDFLAGS} -o $@ snmpgetnext.$(OSUFFIX) ${LIBS} + + encode_keychange$(EXEEXT): encode_keychange.$(OSUFFIX) $(USELIBS) +- $(LINK) ${CFLAGS} -o $@ encode_keychange.$(OSUFFIX) ${LDFLAGS} ${LIBS} ++ $(LINK) ${CFLAGS} ${LDFLAGS} -o $@ encode_keychange.$(OSUFFIX) ${LIBS} + + snmpdf$(EXEEXT): snmpdf.$(OSUFFIX) $(USELIBS) +- $(LINK) ${CFLAGS} -o $@ snmpdf.$(OSUFFIX) ${LDFLAGS} ${LIBS} ++ $(LINK) ${CFLAGS} ${LDFLAGS} -o $@ snmpdf.$(OSUFFIX) ${LIBS} + + snmpps$(EXEEXT): snmpps.$(OSUFFIX) $(USELIBS) +- $(LINK) ${CFLAGS} -o $@ snmpps.$(OSUFFIX) ${LDFLAGS} @LIBCURSES@ ${LIBS} ++ $(LINK) ${CFLAGS} ${LDFLAGS} -o $@ snmpps.$(OSUFFIX) @LIBCURSES@ ${LIBS} + + snmpping$(EXEEXT): snmpping.$(OSUFFIX) $(USELIBS) +- $(LINK) ${CFLAGS} -o $@ snmpping.$(OSUFFIX) ${LDFLAGS} ${LIBS} -lm ++ $(LINK) ${CFLAGS} ${LDFLAGS} -o $@ snmpping.$(OSUFFIX) ${LIBS} -lm + + snmppcap$(EXEEXT): snmppcap.$(OSUFFIX) $(USEAGENTLIBS) +- $(LINK) ${CFLAGS} -o $@ snmppcap.$(OSUFFIX) ${LDFLAGS} ${USEAGENTLIBS} ${LIBS} -lpcap ++ $(LINK) ${CFLAGS} ${LDFLAGS} -o $@ snmppcap.$(OSUFFIX) ${USEAGENTLIBS} ${LIBS} -lpcap + + libnetsnmptrapd.$(LIB_EXTENSION)$(LIB_VERSION): $(LLIBTRAPD_OBJS) +- $(LIB_LD_CMD) $@ ${LLIBTRAPD_OBJS} $(MIBLIB) $(MYSQL_LIBS) $(USELIBS) $(PERLLDOPTS_FOR_LIBS) $(LDFLAGS) ++ $(LIB_LD_CMD) $@ $(LDFLAGS) ${LLIBTRAPD_OBJS} $(MIBLIB) $(MYSQL_LIBS) $(USELIBS) $(PERLLDOPTS_FOR_LIBS) + $(RANLIB) $@ + + snmpinforminstall: +--- a/apps/snmpnetstat/Makefile.in ++++ b/apps/snmpnetstat/Makefile.in +@@ -34,4 +34,4 @@ LIBS= ../../snmplib/libnetsnmp.$(LIB_EXTENSION)$(LIB_VERSION) $(VAL_LIBS) @LIBS + all: standardall + + snmpnetstat$(EXEEXT): ${LOBJS} ${USELIBS} +- ${LINK} ${CFLAGS} -o $@ ${LOBJS} ${LOCAL_LIBS} ${LDFLAGS} ${LIBS} ++ ${LINK} ${CFLAGS} ${LDFLAGS} -o $@ ${LOBJS} ${LOCAL_LIBS} ${LIBS} +--- a/snmplib/Makefile.in ++++ b/snmplib/Makefile.in +@@ -229,11 +229,11 @@ all: standardall + + # how to build the libraries. + libnetsnmp.$(LIB_EXTENSION)$(LIB_VERSION): $(TOBJS) +- $(LIB_LD_CMD) $@ $(TOBJS) $(LDFLAGS) @LNETSNMPLIBS@ ++ $(LIB_LD_CMD) $@ $(LDFLAGS) $(TOBJS) @LNETSNMPLIBS@ + $(RANLIB) $@ + + libsnmp.$(LIB_EXTENSION)$(LIB_VERSION): $(TOBJS) +- $(LIB_LD_CMD) $@ $(TOBJS) $(LDFLAGS) @LNETSNMPLIBS@ ++ $(LIB_LD_CMD) $@ $(LDFLAGS) $(TOBJS) @LNETSNMPLIBS@ + $(RANLIB) $@ + + # +--- a/testing/Makefile.in ++++ b/testing/Makefile.in +@@ -64,16 +64,16 @@ test-mibs: + cd $(srcdir)/rfc1213 ; ./run + + etest: etimetest.o $(PARSEOBJS) $(USELIBS) +- ${CC} -o $@ etimetest.o $(PARSEOBJS) ${LDFLAGS} ${LIBS} ++ ${CC} ${LDFLAGS} -o $@ etimetest.o $(PARSEOBJS) ${LIBS} + + ktest: keymanagetest.o $(PARSEOBJS) $(USELIBS) +- ${CC} -o $@ keymanagetest.o $(PARSEOBJS) ${LDFLAGS} ${LIBS} ++ ${CC} ${LDFLAGS} -o $@ keymanagetest.o $(PARSEOBJS) ${LIBS} + + misctest: misctest.o $(PARSEOBJS) $(USELIBS) +- ${CC} -o $@ misctest.o $(PARSEOBJS) ${LDFLAGS} ${LIBS} ++ ${CC} ${LDFLAGS} -o $@ misctest.o $(PARSEOBJS) ${LIBS} + + stest: scapitest.o $(PARSEOBJS) $(USELIBS) +- ${CC} -o $@ scapitest.o $(PARSEOBJS) ${LDFLAGS} ${LIBS} ++ ${CC} ${LDFLAGS} -o $@ scapitest.o $(PARSEOBJS) ${LIBS} + + clean: testclean + rm -f *.o core *.core $(TARG) +-- +2.38.1 + diff --git a/net-analyzer/net-snmp/files/net-snmp-5.9.3-0002-Tidy-up-net-snmp-config-output.patch b/net-analyzer/net-snmp/files/net-snmp-5.9.3-0002-Tidy-up-net-snmp-config-output.patch new file mode 100644 index 000000000000..83d05a86f0ac --- /dev/null +++ b/net-analyzer/net-snmp/files/net-snmp-5.9.3-0002-Tidy-up-net-snmp-config-output.patch @@ -0,0 +1,51 @@ +https://github.com/net-snmp/net-snmp/pull/493 + +From a73bda5ca7afbeaf3cf3b73101f7541cf92147ef Mon Sep 17 00:00:00 2001 +From: Sam James <sam@gentoo.org> +Date: Fri, 2 Dec 2022 02:27:21 +0000 +Subject: [PATCH 2/4] Tidy up net-snmp-config output + +`net-snmp-config --libs` should return only the needed libraries linked to +libraries which external consumers should use. + +Gentoo has been carrying this patch for a while, as has Fedora. + +Bug: https://bugs.gentoo.org/693970 +Signed-off-by: Sam James <sam@gentoo.org> +--- a/net-snmp-config.in ++++ b/net-snmp-config.in +@@ -193,13 +193,13 @@ else + #################################################### client lib + --libs) + # use this one == --netsnmp-libs + --external-libs +- echo $NSC_LDFLAGS $NSC_LIBDIR $NSC_SNMPLIBS $NSC_LIBS ++ echo $NSC_LIBDIR $NSC_SNMPLIBS $NSC_LIBS + ;; + --netsnmp-libs) + echo $NSC_LIBDIR $NSC_BASE_SNMP_LIBS + ;; + --external-libs) +- echo $NSC_LDFLAGS $NSC_LNETSNMPLIBS $NSC_LIBS @PERLLDOPTS_FOR_APPS@ ++ echo $NSC_LNETSNMPLIBS $NSC_LIBS @PERLLDOPTS_FOR_APPS@ + ;; + #################################################### agent lib + --base-agent-libs) +@@ -210,13 +210,13 @@ else + ;; + --agent-libs) + # use this one == --netsnmp-agent-libs + --external-libs +- echo $NSC_LDFLAGS $NSC_LIBDIR $NSC_AGENTLIBS $NSC_LIBS ++ echo $NSC_LIBDIR $NSC_AGENTLIBS $NSC_LIBS + ;; + --netsnmp-agent-libs) + echo $NSC_LIBDIR $NSC_BASE_AGENT_LIBS + ;; + --external-agent-libs) +- echo $NSC_LDFLAGS $NSC_LMIBLIBS $NSC_LAGENTLIBS $NSC_LNETSNMPLIBS $NSC_LIBS ++ echo $NSC_LMIBLIBS $NSC_LAGENTLIBS $NSC_LNETSNMPLIBS $NSC_LIBS + ;; + #################################################### + --version|--ver*) +-- +2.38.1 + diff --git a/net-analyzer/net-snmp/files/net-snmp-5.9.3-0003-Prune-Libs.private-entries-in-netsnmp-.pc.in.patch b/net-analyzer/net-snmp/files/net-snmp-5.9.3-0003-Prune-Libs.private-entries-in-netsnmp-.pc.in.patch new file mode 100644 index 000000000000..8b825ae8cf5d --- /dev/null +++ b/net-analyzer/net-snmp/files/net-snmp-5.9.3-0003-Prune-Libs.private-entries-in-netsnmp-.pc.in.patch @@ -0,0 +1,30 @@ +https://github.com/net-snmp/net-snmp/pull/493 + +From 7261ea344004ac42b6099acfba49c0ea731d049c Mon Sep 17 00:00:00 2001 +From: Sam James <sam@gentoo.org> +Date: Fri, 2 Dec 2022 02:29:45 +0000 +Subject: [PATCH 3/4] Prune Libs.private entries in netsnmp*.pc.in + +Gentoo has been carrying this patch for a while, as has Fedora. + +Bug: https://bugs.gentoo.org/693970 +Signed-off-by: Sam James <sam@gentoo.org> +--- a/netsnmp-agent.pc.in ++++ b/netsnmp-agent.pc.in +@@ -9,4 +9,4 @@ URL: http://www.net-snmp.org + Version: @PACKAGE_VERSION@ + Cflags: -I${includedir} + Libs: -L${libdir} -lnetsnmpmibs -lnetsnmpagent -lnetsnmp +-Libs.private: @LDFLAGS@ @LMIBLIBS@ @LAGENTLIBS@ @PERLLDOPTS_FOR_APPS@ @LNETSNMPLIBS@ @LIBS@ ++Libs.private: @LMIBLIBS@ @LAGENTLIBS@ @LNETSNMPLIBS@ @LIBS@ +--- a/netsnmp.pc.in ++++ b/netsnmp.pc.in +@@ -9,4 +9,4 @@ URL: http://www.net-snmp.org + Version: @PACKAGE_VERSION@ + Cflags: -I${includedir} + Libs: -L${libdir} -lnetsnmp +-Libs.private: @LDFLAGS@ @LNETSNMPLIBS@ @LIBS@ @PERLLDOPTS_FOR_APPS@ ++Libs.private: @LNETSNMPLIBS@ @LIBS@ +-- +2.38.1 + diff --git a/net-analyzer/net-snmp/files/net-snmp-5.9.3-0004-Search-for-ltinfo-in-configure-if-needed.patch b/net-analyzer/net-snmp/files/net-snmp-5.9.3-0004-Search-for-ltinfo-in-configure-if-needed.patch new file mode 100644 index 000000000000..c92c88cfbb2f --- /dev/null +++ b/net-analyzer/net-snmp/files/net-snmp-5.9.3-0004-Search-for-ltinfo-in-configure-if-needed.patch @@ -0,0 +1,24 @@ +https://github.com/net-snmp/net-snmp/pull/493 + +From 6b70bd4ffa7a905700807eecd3e07a472e2eda55 Mon Sep 17 00:00:00 2001 +From: Sam James <sam@gentoo.org> +Date: Fri, 2 Dec 2022 02:31:15 +0000 +Subject: [PATCH 4/4] Search for -ltinfo in configure if needed + +Gentoo has been carrying this patch for a while. + +Bug: https://bugs.gentoo.org/883945 +Signed-off-by: Sam James <sam@gentoo.org> +--- a/configure.d/config_os_libs2 ++++ b/configure.d/config_os_libs2 +@@ -774,6 +774,7 @@ NETSNMP_SEARCH_LIBS([endwin], [curses ncurses], [ + [HAVE_LIBCURSES=FALSE],, + [LIBCURSES]) + AC_SUBST([HAVE_LIBCURSES]) ++NETSNMP_SEARCH_LIBS([cbreak], [tinfo],[LIBCURSES="$LIBCURSES -ltinfo"],,,) + AC_SUBST([LIBCURSES]) + + # libm for ceil +-- +2.38.1 + diff --git a/net-analyzer/net-snmp/files/net-snmp-5.9.3-configure-clang16.patch b/net-analyzer/net-snmp/files/net-snmp-5.9.3-configure-clang16.patch new file mode 100644 index 000000000000..1eb880bb9604 --- /dev/null +++ b/net-analyzer/net-snmp/files/net-snmp-5.9.3-configure-clang16.patch @@ -0,0 +1,160 @@ +https://bugs.gentoo.org/879715 +https://github.com/net-snmp/net-snmp/commit/ddec5fa0ed1c76fde5eea9b974442faeec008526 +https://github.com/net-snmp/net-snmp/commit/fec0f9ee59d5d89c28d70bb35fad29a0013d048c +https://github.com/net-snmp/net-snmp/commit/f362b354ce993d7394bf77db41bb27cfe8d1e307 + +From ddec5fa0ed1c76fde5eea9b974442faeec008526 Mon Sep 17 00:00:00 2001 +From: Sam James <sam@gentoo.org> +Date: Thu, 17 Nov 2022 00:10:09 +0000 +Subject: [PATCH] configure.d: fix compatibility with Clang 16 + +Clang 16 makes -Wimplicit-function-declaration and -Wimplicit-int an error by +default. Unfortunately, this can lead to misconfiguration or miscompilation of +software as configure tests may then return the wrong result. + +We also fix -Wstrict-prototypes while here as it's easy to do and it prepares +us for C23. + +For more information, see LWN.net [0] or LLVM's Discourse [1], the Gentoo wiki +[2], or the (new) c-std-porting mailing list [3]. + +[0] https://lwn.net/Articles/913505/ +[1] https://discourse.llvm.org/t/configure-script-breakage-with-the-new-werror-implicit-function-declaration/65213 +[2] https://wiki.gentoo.org/wiki/Modern_C_porting +[3] hosted at lists.linux.dev. + +Bug: https://bugs.gentoo.org/879715 +Signed-off-by: Sam James <sam@gentoo.org> +[ bvanassche: removed two header file guards ] +--- a/configure ++++ b/configure +@@ -28483,7 +28483,14 @@ else + #ifdef HAVE_SYS_FS_TYPES_H + #include <sys/fs_types.h> + #endif +-int main () ++#ifdef HAVE_SYS_STATFS_H ++#include <sys/statfs.h> ++#endif ++#ifdef HAVE_SYS_STATVFS_H ++#include <sys/statvfs.h> ++#endif ++ ++int main(void) + { + struct fs_data fsd; + /* Ultrix's statfs returns 1 for success, +@@ -31851,8 +31858,10 @@ else + #if HAVE_SYS_SYSCTL_H + # include <sys/sysctl.h> + #endif ++#include <stddef.h> ++#include <stdlib.h> + +-int main(int argc, char **argv) ++int main(void) + { + int mib[2]; + size_t len; +--- a/configure.d/config_os_functions ++++ b/configure.d/config_os_functions +@@ -216,7 +216,14 @@ AC_CACHE_VAL( + #ifdef HAVE_SYS_FS_TYPES_H + #include <sys/fs_types.h> + #endif +-int main () ++#ifdef HAVE_SYS_STATFS_H ++#include <sys/statfs.h> ++#endif ++#ifdef HAVE_SYS_STATVFS_H ++#include <sys/statvfs.h> ++#endif ++ ++int main(void) + { + struct fs_data fsd; + /* Ultrix's statfs returns 1 for success, +--- a/configure.d/config_os_misc4 ++++ b/configure.d/config_os_misc4 +@@ -185,8 +185,10 @@ else + #if HAVE_SYS_SYSCTL_H + # include <sys/sysctl.h> + #endif ++#include <stddef.h> ++#include <stdlib.h> + +-int main(int argc, char **argv) ++int main(void) + { + int mib[2]; + size_t len; + +From fec0f9ee59d5d89c28d70bb35fad29a0013d048c Mon Sep 17 00:00:00 2001 +From: Sam James <sam@gentoo.org> +Date: Thu, 17 Nov 2022 00:13:55 +0000 +Subject: [PATCH] agent/mibgroup: fix -Wstrict-prototypes + +Clang 16 warns on this. Fix it in preparation for C23. + +Signed-off-by: Sam James <sam@gentoo.org> +[ bvanassche: minor formatting changes ] +--- a/agent/mibgroup/agentx/protocol.c ++++ b/agent/mibgroup/agentx/protocol.c +@@ -1895,7 +1895,7 @@ agentx_parse(netsnmp_session * session, netsnmp_pdu *pdu, u_char * data, + + #ifdef TESTING + +-testit(netsnmp_pdu *pdu1) ++void testit(netsnmp_pdu *pdu1) + { + char packet1[BUFSIZ]; + char packet2[BUFSIZ]; +@@ -1964,7 +1964,7 @@ testit(netsnmp_pdu *pdu1) + + + +-main() ++int main(void) + { + netsnmp_pdu pdu1; + oid oid_buf[] = { 1, 3, 6, 1, 2, 1, 10 }; +--- a/agent/mibgroup/header_complex.c ++++ b/agent/mibgroup/header_complex.c +@@ -569,7 +569,7 @@ header_complex_dump(struct header_complex_index *thestuff) + } + } + +-main() ++int main(void) + { + oid oidsave[MAX_OID_LEN]; + int len = MAX_OID_LEN, len2; + +From f362b354ce993d7394bf77db41bb27cfe8d1e307 Mon Sep 17 00:00:00 2001 +From: Sam James <sam@gentoo.org> +Date: Thu, 17 Nov 2022 00:20:04 +0000 +Subject: [PATCH] agent: fix -Wincompatible-function-pointer-types + +Clang 16 makes -Wincompatible-function-pointer-types an error by default. + +Fixes the following error: +``` +mibgroup/if-mib/data_access/interface_linux.c:159:23: error: incompatible function pointer types assigning to 'void (*)(char *, ...) __attribute__((noreturn))' from 'void (char *, ...)' [-Wincompatible-function-pointer-types] + pci_access->error = netsnmp_pci_error; + ^ ~~~~~~~~~~~~~~~~~ +1 error generated. +``` + +Signed-off-by: Sam James <sam@gentoo.org> +--- a/agent/mibgroup/if-mib/data_access/interface_linux.c ++++ b/agent/mibgroup/if-mib/data_access/interface_linux.c +@@ -31,7 +31,7 @@ static struct pci_access *pci_access; + /* Avoid letting libpci call exit(1) when no PCI bus is available. */ + static int do_longjmp =0; + static jmp_buf err_buf; +-static void ++PCI_NONRET static void + netsnmp_pci_error(char *msg, ...) + { + va_list args; + diff --git a/net-analyzer/net-snmp/files/net-snmp-99999999-tinfo.patch b/net-analyzer/net-snmp/files/net-snmp-99999999-tinfo.patch deleted file mode 100644 index 2eb4ccca6313..000000000000 --- a/net-analyzer/net-snmp/files/net-snmp-99999999-tinfo.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/configure.d/config_os_libs2 -+++ b/configure.d/config_os_libs2 -@@ -601,6 +601,7 @@ - [HAVE_LIBCURSES=FALSE],, - [LIBCURSES]) - AC_SUBST([HAVE_LIBCURSES]) -+NETSNMP_SEARCH_LIBS([cbreak], [tinfo],[LIBCURSES="$LIBCURSES -ltinfo"],,,) - AC_SUBST([LIBCURSES]) - - # libm for ceil diff --git a/net-analyzer/net-snmp/metadata.xml b/net-analyzer/net-snmp/metadata.xml index f3f6819a5361..94bf5790a1bf 100644 --- a/net-analyzer/net-snmp/metadata.xml +++ b/net-analyzer/net-snmp/metadata.xml @@ -1,22 +1,25 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!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> -<use> -<flag name="elf">Enable the use of elf utils to check uptime on some systems</flag> -<flag name="kmem">Enable usage of /dev/kmem</flag> -<flag name="mfd-rewrites">Use MFD rewrites of mib modules where available</flag> -<flag name="netlink">Use <pkg>dev-libs/libnl</pkg> to fetch TCP statistics instead of using /proc/net/tcp (Linux only).</flag> -<flag name="pcap">Install snmppcap which reads from PCAP files and writes to the SNMP transport</flag> -<flag name="pci">Use libpci (from <pkg>sys-apps/pciutils</pkg>) to look up network interface description. This feature is only available on Linux.</flag> -<flag name="rpm">Enable monitoring of <pkg>app-arch/rpm</pkg>. This flag requires the bzip2 and zlib flags to be enabled as well.</flag> -<flag name="smux">Enable support for the legacy smux protocol (superseded by agentx)</flag> -<flag name="ucd-compat">Build UCD compatibility library. Increases significantly the install size.</flag> -</use> -<upstream> -<remote-id type="sourceforge">net-snmp</remote-id> -</upstream> + <maintainer type="project"> + <email>netmon@gentoo.org</email> + <name>Gentoo network monitoring and analysis project</name> + </maintainer> + <use> + <flag name="elf">Enable the use of elf utils to check uptime on some systems</flag> + <flag name="kmem">Enable usage of /dev/kmem</flag> + <flag name="mfd-rewrites">Use MFD rewrites of mib modules where available</flag> + <flag name="netlink">Use <pkg>dev-libs/libnl</pkg> to fetch TCP statistics instead of using /proc/net/tcp (Linux only).</flag> + <flag name="pcap">Install snmppcap which reads from PCAP files and writes to the SNMP transport</flag> + <flag name="pci">Use libpci (from <pkg>sys-apps/pciutils</pkg>) to look up network interface description. This feature is only available on Linux.</flag> + <flag name="pcre">Add support for Perl Compatible Regular Expressions in process table filtering.</flag> + <flag name="rpm">Enable monitoring of <pkg>app-arch/rpm</pkg>. This flag requires the bzip2 and zlib flags to be enabled as well.</flag> + <flag name="smux">Enable support for the legacy smux protocol (superseded by agentx)</flag> + <flag name="ucd-compat">Build UCD compatibility library. Increases significantly the install size.</flag> + </use> + <upstream> + <remote-id type="github">net-snmp/net-snmp</remote-id> + <remote-id type="sourceforge">net-snmp</remote-id> + <remote-id type="cpe">cpe:/a:net-snmp:net-snmp</remote-id> + </upstream> </pkgmetadata> diff --git a/net-analyzer/net-snmp/net-snmp-5.9-r2.ebuild b/net-analyzer/net-snmp/net-snmp-5.9-r2.ebuild deleted file mode 100644 index c83f4f58bfd9..000000000000 --- a/net-analyzer/net-snmp/net-snmp-5.9-r2.ebuild +++ /dev/null @@ -1,212 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -DISTUTILS_OPTIONAL=yesplz -DISTUTILS_SINGLE_IMPL=yesplz -GENTOO_DEPEND_ON_PERL=no -PATCHSET=3 -PYTHON_COMPAT=( python3_{6,7,8} ) -WANT_AUTOMAKE=none -inherit autotools distutils-r1 perl-module systemd - -DESCRIPTION="Software for generating and retrieving SNMP data" -HOMEPAGE="http://www.net-snmp.org/" -SRC_URI=" - https://dev.gentoo.org/~jer/${PN}-5.7.3-patches-3.tar.xz - https://dev.gentoo.org/~jer/${P}.tar.xz -" - -# GPL-2 for the init scripts -LICENSE="HPND BSD GPL-2" -SLOT="0/40" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86" -IUSE=" - X bzip2 doc elf kmem ipv6 libressl lm-sensors mfd-rewrites minimal mysql - netlink pcap pci perl python rpm selinux smux ssl tcpd ucd-compat zlib -" -REQUIRED_USE=" - python? ( ${PYTHON_REQUIRED_USE} ) - rpm? ( bzip2 zlib ) -" - -COMMON_DEPEND=" - 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 ) - perl? ( dev-lang/perl:= ) - python? ( - $(python_gen_cond_dep ' - dev-python/setuptools[${PYTHON_MULTI_USEDEP}] - ') - ${PYTHON_DEPS} - ) - rpm? ( - app-arch/rpm - dev-libs/popt - ) - ssl? ( - !libressl? ( >=dev-libs/openssl-0.9.6d:0= ) - libressl? ( dev-libs/libressl:= ) - ) - tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) - zlib? ( >=sys-libs/zlib-1.1.4 ) -" -DEPEND=" - ${COMMON_DEPEND} - doc? ( app-doc/doxygen ) -" -RDEPEND=" - ${COMMON_DEPEND} - perl? ( - X? ( dev-perl/Tk ) - !minimal? ( dev-perl/TermReadKey ) - ) - selinux? ( sec-policy/selinux-snmp ) -" -RESTRICT=test -PATCHES=( - "${FILESDIR}"/${PN}-5.7.3-include-limits.patch - "${FILESDIR}"/${PN}-5.8-do-not-conflate-LDFLAGS-and-LIBS.patch - "${FILESDIR}"/${PN}-5.8-pcap.patch - "${FILESDIR}"/${PN}-5.8.1-pkg-config.patch - "${FILESDIR}"/${PN}-5.8.1-net-snmp-config-libdir.patch - "${FILESDIR}"/${PN}-5.8.1-mysqlclient.patch - "${FILESDIR}"/${PN}-5.9-MakeMaker.patch - "${FILESDIR}"/${PN}-99999999-tinfo.patch -) - -pkg_setup() { - use python && python-single-r1_pkg_setup -} - -src_prepare() { - # snmpconf generates config files with proper selinux context - use selinux && eapply "${FILESDIR}"/${PN}-5.1.2-snmpconf-selinux.patch - - 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 - eapply "${WORKDIR}"/patches/*.patch - - default - - eautoconf -} - -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 - - 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 perl perl-modules INSTALLDIRS=vendor) \ - $(use_with python python-modules) \ - $(use_with rpm) \ - $(use_with ssl openssl) \ - $(use_with tcpd libwrap) \ - $(use_with zlib) \ - --disable-static \ - --enable-shared \ - --with-default-snmp-version="3" \ - --with-install-prefix="${D}" \ - --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.3-r3.ebuild b/net-analyzer/net-snmp/net-snmp-5.9.3-r3.ebuild new file mode 100644 index 000000000000..190fd8f58816 --- /dev/null +++ b/net-analyzer/net-snmp/net-snmp-5.9.3-r3.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..11} ) +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="mirror://sourceforge/${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 + "${FILESDIR}"/${P}-configure-clang16.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 +) + +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 new file mode 100644 index 000000000000..6ac66018c501 --- /dev/null +++ b/net-analyzer/net-snmp/net-snmp-5.9.4.ebuild @@ -0,0 +1,240 @@ +# 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..11} ) +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="mirror://sourceforge/${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 +) + +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-9999.ebuild b/net-analyzer/net-snmp/net-snmp-9999.ebuild new file mode 100644 index 000000000000..e13d3ad68864 --- /dev/null +++ b/net-analyzer/net-snmp/net-snmp-9999.ebuild @@ -0,0 +1,235 @@ +# 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..11} ) +WANT_AUTOMAKE=none + +inherit autotools distutils-r1 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="mirror://sourceforge/${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/libpcre2 ) + 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 +) + +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 +} + +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 pcre2-8) \ + --without-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-99999999.ebuild b/net-analyzer/net-snmp/net-snmp-99999999.ebuild deleted file mode 100644 index 638e5357bb17..000000000000 --- a/net-analyzer/net-snmp/net-snmp-99999999.ebuild +++ /dev/null @@ -1,217 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -DISTUTILS_OPTIONAL=yesplz -DISTUTILS_SINGLE_IMPL=yesplz -GENTOO_DEPEND_ON_PERL=no -PATCHSET=3 -PYTHON_COMPAT=( python3_{6,7,8} ) -WANT_AUTOMAKE=none -inherit autotools distutils-r1 git-r3 perl-module systemd - -DESCRIPTION="Software for generating and retrieving SNMP data" -HOMEPAGE="http://www.net-snmp.org/" -EGIT_REPO_URI="https://github.com/net-snmp/net-snmp" -SRC_URI=" - https://dev.gentoo.org/~jer/${PN}-5.7.3-patches-3.tar.xz -" - -# GPL-2 for the init scripts -LICENSE="HPND BSD GPL-2" -SLOT="0/40" -KEYWORDS="" -IUSE=" - X bzip2 doc elf kmem ipv6 libressl lm-sensors mfd-rewrites minimal mysql - netlink pcap pci perl python rpm selinux smux ssl tcpd ucd-compat zlib -" -REQUIRED_USE=" - python? ( ${PYTHON_REQUIRED_USE} ) - rpm? ( bzip2 zlib ) -" - -COMMON_DEPEND=" - 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 ) - perl? ( dev-lang/perl:= ) - python? ( - $(python_gen_cond_dep ' - dev-python/setuptools[${PYTHON_MULTI_USEDEP}] - ') - ${PYTHON_DEPS} - ) - rpm? ( - app-arch/rpm - dev-libs/popt - ) - ssl? ( - !libressl? ( >=dev-libs/openssl-0.9.6d:0= ) - libressl? ( dev-libs/libressl:= ) - ) - tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) - zlib? ( >=sys-libs/zlib-1.1.4 ) -" -DEPEND=" - ${COMMON_DEPEND} - doc? ( app-doc/doxygen ) -" -RDEPEND=" - ${COMMON_DEPEND} - perl? ( - X? ( dev-perl/Tk ) - !minimal? ( dev-perl/TermReadKey ) - ) - selinux? ( sec-policy/selinux-snmp ) -" -RESTRICT=test -PATCHES=( - "${FILESDIR}"/${PN}-5.7.3-include-limits.patch - "${FILESDIR}"/${PN}-5.8-do-not-conflate-LDFLAGS-and-LIBS.patch - "${FILESDIR}"/${PN}-5.8-pcap.patch - "${FILESDIR}"/${PN}-5.8.1-pkg-config.patch - "${FILESDIR}"/${PN}-5.8.1-net-snmp-config-libdir.patch - "${FILESDIR}"/${PN}-5.8.1-mysqlclient.patch - "${FILESDIR}"/${PN}-5.9-MakeMaker.patch - "${FILESDIR}"/${PN}-99999999-tinfo.patch -) - -pkg_setup() { - use python && python-single-r1_pkg_setup -} - -src_unpack() { - default - 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/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 - eapply "${WORKDIR}"/patches/*.patch - - default - - eautoconf -} - -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 - - 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 perl perl-modules INSTALLDIRS=vendor) \ - $(use_with python python-modules) \ - $(use_with rpm) \ - $(use_with ssl openssl) \ - $(use_with tcpd libwrap) \ - $(use_with zlib) \ - --disable-static \ - --enable-shared \ - --with-default-snmp-version="3" \ - --with-install-prefix="${D}" \ - --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/netcat/files/netcat-110.20180111-variadic-holler.patch b/net-analyzer/netcat/files/netcat-110.20180111-variadic-holler.patch new file mode 100644 index 000000000000..36fda8614eef --- /dev/null +++ b/net-analyzer/netcat/files/netcat-110.20180111-variadic-holler.patch @@ -0,0 +1,88 @@ +Subject: [PATCH] Convert holler and bail to variadic function + +Both functions usually consume different types than char * which is +problematic for some compliers like clang-16 where -Werror=implicit-int +is enabled by default. + +The fix is done in such a way that original holler function is converted +to vholer which uses va_list from stdarg.h and holler and bail are +converted to variadic functions that utilize vholler for printing. + +Bug: https://bugs.gentoo.org/871003 + +diff --git a/netcat.c b/netcat.c +index 992c42b..b4d6fd8 100644 +--- a/netcat.c ++++ b/netcat.c +@@ -80,6 +80,7 @@ + #include <signal.h> + #include <fcntl.h> /* O_WRONLY et al */ + #include <unistd.h> ++#include <stdarg.h> + + /* handy stuff: */ + #define SA struct sockaddr /* socket overgeneralization braindeath */ +@@ -215,23 +216,18 @@ int o_quit = -1; /* 0 == quit-now; >0 == quit after o_quit seconds */ + /* support routines -- the bulk of this thing. Placed in such an order that + we don't have to forward-declare anything: */ + +-/* holler : +- fake varargs -- need to do this way because we wind up calling through +- more levels of indirection than vanilla varargs can handle, and not all +- machines have vfprintf/vsyslog/whatever! 6 params oughta be enough. */ +-void holler (str, p1, p2, p3, p4, p5, p6) +- char * str; +- char * p1, * p2, * p3, * p4, * p5, * p6; ++/* vholler : */ ++void vholler(const char * str, va_list ap) + { + FILE *o_holler_out = (o_holler_stderr ? stderr : stdout); + if (o_verbose) { +- fprintf (o_holler_out, str, p1, p2, p3, p4, p5, p6); ++ vfprintf (o_holler_out, str, ap); + #ifdef HAVE_BIND + if (h_errno) { /* if host-lookup variety of error ... */ + if (h_errno > 4) /* oh no you don't, either */ + fprintf (o_holler_out, "preposterous h_errno: %d", h_errno); + else +- fprintf (o_holler_out, h_errs[h_errno]); /* handle it here */ ++ fputs (h_errs[h_errno], o_holler_out); /* handle it here */ + h_errno = 0; /* and reset for next call */ + } + #endif +@@ -241,16 +237,27 @@ void holler (str, p1, p2, p3, p4, p5, p6) + fprintf (o_holler_out, "\n"); + fflush (o_holler_out); + } +-} /* holler */ ++} /* vholler */ ++ ++void holler(const char * fmt, ...) ++{ ++ va_list ap; ++ va_start(ap, fmt); ++ vholler(fmt, ap); ++ va_end(ap); ++} + + /* bail : + error-exit handler, callable from anywhere */ +-void bail (str, p1, p2, p3, p4, p5, p6) +- char * str; +- char * p1, * p2, * p3, * p4, * p5, * p6; ++void bail (const char * fmt, ...) + { + o_verbose = 1; +- holler (str, p1, p2, p3, p4, p5, p6); ++ va_list ap; ++ ++ va_start(ap, fmt); ++ vholler(fmt, ap); ++ va_end(ap); ++ + close (netfd); + exit (1); + } /* bail */ +-- +2.35.1 + diff --git a/net-analyzer/netcat/metadata.xml b/net-analyzer/netcat/metadata.xml index a1937487a94a..b2bd15c6d936 100644 --- a/net-analyzer/netcat/metadata.xml +++ b/net-analyzer/netcat/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> <email>sam@gentoo.org</email> diff --git a/net-analyzer/netcat/netcat-110-r9.ebuild b/net-analyzer/netcat/netcat-110-r9.ebuild index 78f65ab4a9e0..5d09841d909d 100644 --- a/net-analyzer/netcat/netcat-110-r9.ebuild +++ b/net-analyzer/netcat/netcat-110-r9.ebuild @@ -1,45 +1,67 @@ # Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 -inherit eutils toolchain-funcs flag-o-matic +inherit toolchain-funcs PATCH_VER="1.0" MY_P=nc${PV} -DESCRIPTION="the network swiss army knife" -HOMEPAGE="http://nc110.sourceforge.net/" +DESCRIPTION="The network swiss army knife" +HOMEPAGE="https://nc110.sourceforge.io" SRC_URI="mirror://sourceforge/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" + mirror://gentoo/${P}-patches-${PATCH_VER}.tar.bz2 +" +S="${WORKDIR}" LICENSE="netcat" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc64-solaris ~x64-solaris" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris" IUSE="crypt ipv6 static" LIB_DEPEND="crypt? ( dev-libs/libmix[static-libs(+)] )" RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )" -DEPEND="${RDEPEND} - static? ( ${LIB_DEPEND} )" - -S=${WORKDIR} +DEPEND=" + ${RDEPEND} + static? ( ${LIB_DEPEND} ) +" src_prepare() { - epatch "${DISTDIR}"/nc-v6-20000918.patch.gz patch + default + + eapply "${WORKDIR}"/nc-v6-20000918.patch + sed -i 's:#define HAVE_BIND:#undef HAVE_BIND:' netcat.c - sed -i 's:#define FD_SETSIZE 16:#define FD_SETSIZE 1024:' netcat.c #34250 - [[ ${CHOST} == *-solaris* ]] && \ - sed -i 's:gethostbyname2(\([^)]\+\)):getipnodebyname(\1, AI_DEFAULT, NULL):' netcat.c + # bug 34250 + sed -i 's:#define FD_SETSIZE 16:#define FD_SETSIZE 1024:' netcat.c + + if [[ ${CHOST} == *-solaris* ]] ; then + sed -i 's:gethostbyname2(\([^)]\+\)):getipnodebyname(\1, AI_DEFAULT, NULL):' netcat.c || die + fi } src_compile() { export XLIBS="" export XFLAGS="-DLINUX -DTELNET -DGAPING_SECURITY_HOLE" - use ipv6 && XFLAGS="${XFLAGS} -DINET6" - use static && export STATIC="-static" - use crypt && XFLAGS="${XFLAGS} -DAESCRYPT" && XLIBS="${XLIBS} -lmix" - [[ ${CHOST} == *-solaris* ]] && XLIBS="${XLIBS} -lnsl -lsocket" + + if use ipv6 ; then + XFLAGS+=" -DINET6" + fi + + if use static ; then + export STATIC="-static" + fi + + if use crypt ; then + XFLAGS+=" -DAESCRYPT" + XLIBS+=" -lmix" + fi + + if [[ ${CHOST} == *-solaris* ]] ; then + XLIBS+=" -lnsl -lsocket" + fi + emake -e CC="$(tc-getCC) ${CFLAGS} ${LDFLAGS}" nc } diff --git a/net-analyzer/netcat/netcat-110.20180111-r1.ebuild b/net-analyzer/netcat/netcat-110.20180111-r1.ebuild new file mode 100644 index 000000000000..aab71e105011 --- /dev/null +++ b/net-analyzer/netcat/netcat-110.20180111-r1.ebuild @@ -0,0 +1,62 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=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" +S="${WORKDIR}/nc110" + +LICENSE="netcat" +SLOT="0" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris" +IUSE="ipv6 static" + +src_prepare() { + default + + sed -i \ + -e '/#define HAVE_BIND/s:#define:#undef:' \ + -e '/#define FD_SETSIZE 16/s:16:1024: #34250' \ + netcat.c || die + + if [[ ${CHOST} == *-solaris* ]] ; then + sed -i 's:gethostbyname2 *(\([^)]\+\)):getipnodebyname (\1, AI_DEFAULT, NULL):' netcat.c || die + fi +} + +src_configure() { + if ! use ipv6 ; then + sed -i '/#define INET6/d' generic.h || die + fi + + append-cppflags -DTELNET -DGAPING_SECURITY_HOLE +} + +src_compile() { + local xlibs + + [[ ${CHOST} == *-solaris* ]] && xlibs+=" -lnsl -lsocket" + + emake \ + LD="$(tc-getCC) ${LDFLAGS}" \ + DFLAGS="${CPPFLAGS}" \ + XFLAGS="${CFLAGS}" \ + STATIC=$(usex static '-static' '') \ + XLIBS="${xlibs}" \ + nc +} + +src_install() { + dobin nc + + dodoc README* netcat.blurb + doman nc.1 + + docinto scripts + dodoc scripts/* +} diff --git a/net-analyzer/netcat/netcat-110.20180111-r2.ebuild b/net-analyzer/netcat/netcat-110.20180111-r2.ebuild new file mode 100644 index 000000000000..be9afada5592 --- /dev/null +++ b/net-analyzer/netcat/netcat-110.20180111-r2.ebuild @@ -0,0 +1,66 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +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" +S="${WORKDIR}/nc110" + +LICENSE="netcat" +SLOT="0" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris" +IUSE="ipv6 static" + +PATCHES=( + "${FILESDIR}/${P}-variadic-holler.patch" +) + +src_prepare() { + default + + sed -i \ + -e '/#define HAVE_BIND/s:#define:#undef:' \ + -e '/#define FD_SETSIZE 16/s:16:1024: #34250' \ + netcat.c || die + + if [[ ${CHOST} == *-solaris* ]] ; then + sed -i 's:gethostbyname2 *(\([^)]\+\)):getipnodebyname (\1, AI_DEFAULT, NULL):' netcat.c || die + fi +} + +src_configure() { + if ! use ipv6 ; then + sed -i '/#define INET6/d' generic.h || die + fi + + append-cppflags -DTELNET -DGAPING_SECURITY_HOLE +} + +src_compile() { + local xlibs + + [[ ${CHOST} == *-solaris* ]] && xlibs+=" -lnsl -lsocket" + + emake \ + LD="$(tc-getCC) ${LDFLAGS}" \ + DFLAGS="${CPPFLAGS}" \ + XFLAGS="${CFLAGS}" \ + STATIC=$(usex static '-static' '') \ + XLIBS="${xlibs}" \ + nc +} + +src_install() { + dobin nc + + dodoc README* netcat.blurb + doman nc.1 + + docinto scripts + dodoc scripts/* +} diff --git a/net-analyzer/netcat/netcat-110.20180111.ebuild b/net-analyzer/netcat/netcat-110.20180111.ebuild deleted file mode 100644 index fe1f70df7679..000000000000 --- a/net-analyzer/netcat/netcat-110.20180111.ebuild +++ /dev/null @@ -1,52 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" - -inherit toolchain-funcs flag-o-matic - -MY_P="nc${PV}" -DESCRIPTION="the network swiss army knife" -HOMEPAGE="http://nc110.sourceforge.net/" -SRC_URI="mirror://sourceforge/nc110/${MY_P}.tar.xz" - -LICENSE="netcat" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc64-solaris ~x64-solaris" -IUSE="ipv6 static" - -S=${WORKDIR}/nc110 - -src_prepare() { - sed -i \ - -e '/#define HAVE_BIND/s:#define:#undef:' \ - -e '/#define FD_SETSIZE 16/s:16:1024: #34250' \ - netcat.c || die - [[ ${CHOST} == *-solaris* ]] && \ - sed -i 's:gethostbyname2 *(\([^)]\+\)):getipnodebyname (\1, AI_DEFAULT, NULL):' netcat.c -} - -src_configure() { - use ipv6 || sed -i '/#define INET6/d' generic.h - append-cppflags -DTELNET -DGAPING_SECURITY_HOLE -} - -src_compile() { - local xlibs - [[ ${CHOST} == *-solaris* ]] && xlibs+=" -lnsl -lsocket" - emake \ - LD="$(tc-getCC) ${LDFLAGS}" \ - DFLAGS="${CPPFLAGS}" \ - XFLAGS="${CFLAGS}" \ - STATIC=$(usex static '-static' '') \ - XLIBS="${xlibs}" \ - nc -} - -src_install() { - dobin nc - dodoc README* netcat.blurb - doman nc.1 - docinto scripts - dodoc scripts/* -} diff --git a/net-analyzer/netdata-go-plugin/Manifest b/net-analyzer/netdata-go-plugin/Manifest new file mode 100644 index 000000000000..a04419a89f6c --- /dev/null +++ b/net-analyzer/netdata-go-plugin/Manifest @@ -0,0 +1,2 @@ +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/metadata.xml b/net-analyzer/netdata-go-plugin/metadata.xml new file mode 100644 index 000000000000..282de65d53a2 --- /dev/null +++ b/net-analyzer/netdata-go-plugin/metadata.xml @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="person"> + <email>arkamar@gentoo.org</email> + <name>Petr Vaněk</name> + </maintainer> + <upstream> + <remote-id type="github">netdata/go.d.plugin</remote-id> + </upstream> +</pkgmetadata> 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 new file mode 100644 index 000000000000..70f99d0fda15 --- /dev/null +++ b/net-analyzer/netdata-go-plugin/netdata-go-plugin-0.58.1.ebuild @@ -0,0 +1,51 @@ +# 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 0d812ef0968f..a47188584cd2 100644 --- a/net-analyzer/netdata/Manifest +++ b/net-analyzer/netdata/Manifest @@ -1 +1 @@ -DIST netdata-1.28.0.tar.gz 6218048 BLAKE2B 9ee0eea1a17df207ffbc934b3c0dfe261fb3c3a51312947df0e287fc29c4dacf35e414593da0b3829999cea6bb03eab89fe7f1743fdcc3be39d532427a9239b2 SHA512 98048ebb10ff9db9cd273fb7b66e30aa14f6cd71e53a0c80c7ac5bd45c9f85b64b1d2d5fd12734921a11b584f67435563e26f0249aab61458b563405bbc54b17 +DIST netdata-1.45.3.tar.gz 74876663 BLAKE2B 2e181daea72b9f03c74bc8f8a4dac81f0915a080295b914486d8aa732742099a7758795386b27576693723e1990455d0d869ed21150a41ebae030714ee339ca9 SHA512 5d293949632caa8660632247460d08300123c1375e1f24f759ebe16fc40a7e35afe04f948bf431819076f82d9fff315d45a42db582636e89b351b167d7e64498 diff --git a/net-analyzer/netdata/files/netdata-1.44.0-dbengine.patch b/net-analyzer/netdata/files/netdata-1.44.0-dbengine.patch new file mode 100644 index 000000000000..3119094f64bc --- /dev/null +++ b/net-analyzer/netdata/files/netdata-1.44.0-dbengine.patch @@ -0,0 +1,47 @@ +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 7eb822608727..ea8a63a7fd26 100644 --- a/net-analyzer/netdata/metadata.xml +++ b/net-analyzer/netdata/metadata.xml @@ -1,17 +1,18 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> <email>candrews@gentoo.org</email> <name>Craig Andrews</name> </maintainer> <use> + <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="kinesis">Enable support for Amazon Kenesis as a backend</flag> - <flag name="lto">Build with Link Time Optimization (LTO)</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> @@ -21,5 +22,6 @@ </use> <upstream> <remote-id type="github">netdata/netdata</remote-id> + <remote-id type="cpe">cpe:/a:netdata:netdata</remote-id> </upstream> </pkgmetadata> diff --git a/net-analyzer/netdata/netdata-1.28.0.ebuild b/net-analyzer/netdata/netdata-1.28.0.ebuild deleted file mode 100644 index 7690ff9704cf..000000000000 --- a/net-analyzer/netdata/netdata-1.28.0.ebuild +++ /dev/null @@ -1,138 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -PYTHON_COMPAT=( python{3_6,3_7,3_8,3_9} ) - -inherit autotools fcaps linux-info 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}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~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="caps +compression cpu_flags_x86_sse2 cups +dbengine ipmi +jsonc kinesis +lto mongodb mysql nfacct nodejs postgres prometheus +python 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 - virtual/awk - caps? ( sys-libs/libcap ) - cups? ( net-print/cups ) - dbengine? ( - app-arch/lz4 - dev-libs/judy - dev-libs/openssl:= - ) - dev-libs/libuv - compression? ( sys-libs/zlib ) - ipmi? ( sys-libs/freeipmi ) - jsonc? ( dev-libs/json-c:= ) - kinesis? ( dev-libs/aws-sdk-cpp[kinesis] ) - mongodb? ( dev-libs/mongo-c-driver ) - nfacct? ( - net-firewall/nfacct - net-libs/libmnl - ) - nodejs? ( net-libs/nodejs ) - prometheus? ( - dev-libs/protobuf:= - app-arch/snappy - ) - python? ( - ${PYTHON_DEPS} - $(python_gen_cond_dep 'dev-python/pyyaml[${PYTHON_MULTI_USEDEP}]') - mysql? ( $(python_gen_cond_dep 'dev-python/mysqlclient[${PYTHON_MULTI_USEDEP}]') ) - postgres? ( $(python_gen_cond_dep 'dev-python/psycopg:2[${PYTHON_MULTI_USEDEP}]') ) - tor? ( $(python_gen_cond_dep 'net-libs/stem[${PYTHON_MULTI_USEDEP}]') ) - ) - xen? ( - app-emulation/xen-tools - dev-libs/yajl - )" -DEPEND="${RDEPEND} - virtual/pkgconfig" - -FILECAPS=( - 'cap_dac_read_search,cap_sys_ptrace+ep' 'usr/libexec/netdata/plugins.d/apps.plugin' -) - -pkg_setup() { - use python && python-single-r1_pkg_setup - linux-info_pkg_setup -} - -src_prepare() { - default - eautoreconf -} - -src_configure() { - # --disable-cloud: https://github.com/netdata/netdata/issues/8961 - econf \ - --localstatedir="${EPREFIX}"/var \ - --with-user=netdata \ - --disable-cloud \ - $(use_enable jsonc) \ - $(use_enable cups plugin-cups) \ - $(use_enable dbengine) \ - $(use_enable nfacct plugin-nfacct) \ - $(use_enable ipmi plugin-freeipmi) \ - $(use_enable kinesis backend-kinesis) \ - $(use_enable lto lto) \ - $(use_enable mongodb backend-mongodb) \ - $(use_enable prometheus backend-prometheus-remote-write) \ - $(use_enable xen plugin-xenstat) \ - $(use_enable cpu_flags_x86_sse2 x86-sse) \ - $(use_with compression zlib) -} - -src_install() { - default - - rm -rf "${D}/var/cache" || die - - keepdir /var/log/netdata - fowners -Rc netdata:netdata /var/log/netdata - keepdir /var/lib/netdata - keepdir /var/lib/netdata/registry - fowners -Rc netdata:netdata /var/lib/netdata - - fowners -Rc root:netdata /usr/share/${PN} - - newinitd system/netdata-openrc ${PN} - systemd_dounit system/netdata.service - insinto /etc/netdata - doins system/netdata.conf -} - -pkg_postinst() { - fcaps_pkg_postinst - - if use xen ; then - fcaps 'cap_dac_override' 'usr/libexec/netdata/plugins.d/xenstat.plugin' - fi -} diff --git a/net-analyzer/netdata/netdata-1.45.3.ebuild b/net-analyzer/netdata/netdata-1.45.3.ebuild new file mode 100644 index 000000000000..0d57f53917bc --- /dev/null +++ b/net-analyzer/netdata/netdata-1.45.3.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} ) + +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-9999.ebuild b/net-analyzer/netdata/netdata-9999.ebuild index 7690ff9704cf..0d57f53917bc 100644 --- a/net-analyzer/netdata/netdata-9999.ebuild +++ b/net-analyzer/netdata/netdata-9999.ebuild @@ -1,17 +1,18 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 -PYTHON_COMPAT=( python{3_6,3_7,3_8,3_9} ) +EAPI=8 +PYTHON_COMPAT=( python{3_9,3_10,3_11} ) -inherit autotools fcaps linux-info python-single-r1 systemd +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}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~x86" + 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!" @@ -19,7 +20,7 @@ HOMEPAGE="https://github.com/netdata/netdata https://my-netdata.io/" LICENSE="GPL-3+ MIT BSD" SLOT="0" -IUSE="caps +compression cpu_flags_x86_sse2 cups +dbengine ipmi +jsonc kinesis +lto 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} ) @@ -39,45 +40,53 @@ RDEPEND=" net-misc/curl net-misc/wget sys-apps/util-linux - virtual/awk - caps? ( sys-libs/libcap ) + app-alternatives/awk + 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/libuv - compression? ( sys-libs/zlib ) + dev-libs/libpcre2:= + dev-libs/libuv:= + dev-libs/libyaml + dev-libs/protobuf:= + bpf? ( virtual/libelf:= ) + sys-libs/zlib ipmi? ( sys-libs/freeipmi ) - jsonc? ( dev-libs/json-c:= ) - kinesis? ( dev-libs/aws-sdk-cpp[kinesis] ) + dev-libs/json-c:= mongodb? ( dev-libs/mongo-c-driver ) nfacct? ( net-firewall/nfacct - net-libs/libmnl + net-libs/libmnl:= ) nodejs? ( net-libs/nodejs ) prometheus? ( + app-arch/snappy:= dev-libs/protobuf:= - app-arch/snappy ) python? ( ${PYTHON_DEPS} - $(python_gen_cond_dep 'dev-python/pyyaml[${PYTHON_MULTI_USEDEP}]') - mysql? ( $(python_gen_cond_dep 'dev-python/mysqlclient[${PYTHON_MULTI_USEDEP}]') ) - postgres? ( $(python_gen_cond_dep 'dev-python/psycopg:2[${PYTHON_MULTI_USEDEP}]') ) - tor? ( $(python_gen_cond_dep 'net-libs/stem[${PYTHON_MULTI_USEDEP}]') ) + $(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' + 'cap_dac_read_search,cap_sys_ptrace+ep' + 'usr/libexec/netdata/plugins.d/apps.plugin' + 'usr/libexec/netdata/plugins.d/debugfs.plugin' ) pkg_setup() { @@ -85,46 +94,52 @@ pkg_setup() { linux-info_pkg_setup } -src_prepare() { - default - eautoreconf -} - src_configure() { - # --disable-cloud: https://github.com/netdata/netdata/issues/8961 - econf \ - --localstatedir="${EPREFIX}"/var \ - --with-user=netdata \ - --disable-cloud \ - $(use_enable jsonc) \ - $(use_enable cups plugin-cups) \ - $(use_enable dbengine) \ - $(use_enable nfacct plugin-nfacct) \ - $(use_enable ipmi plugin-freeipmi) \ - $(use_enable kinesis backend-kinesis) \ - $(use_enable lto lto) \ - $(use_enable mongodb backend-mongodb) \ - $(use_enable prometheus backend-prometheus-remote-write) \ - $(use_enable xen plugin-xenstat) \ - $(use_enable cpu_flags_x86_sse2 x86-sse) \ - $(use_with compression zlib) + # -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() { - 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/netdata-openrc ${PN} - systemd_dounit system/netdata.service + 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 } @@ -132,7 +147,17 @@ src_install() { 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/netdiscover/metadata.xml b/net-analyzer/netdiscover/metadata.xml index 74c2baebb4ec..f15ddc719661 100644 --- a/net-analyzer/netdiscover/metadata.xml +++ b/net-analyzer/netdiscover/metadata.xml @@ -1,8 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!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> +<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/nethogs/Manifest b/net-analyzer/nethogs/Manifest index 16ce4054f3e5..c56737e97dda 100644 --- a/net-analyzer/nethogs/Manifest +++ b/net-analyzer/nethogs/Manifest @@ -1,2 +1 @@ -DIST nethogs-0.8.5.tar.gz 112385 BLAKE2B 1d4867447455720a11f3131787b731428550f03d106ad476367ae356954c6c9895d02a8e730488b3deb9638d54bd60765cb63bcf599f4ec73c0bdc8da3d52cae SHA512 a2be81fcebc9925dd8a0fd9f71c6e790206819e0cc5efeeeb0c741baa9fd25ec685a1784b6d331d938cf14381403f9c13d619509d0ffe713ce8786a83a380908 -DIST nethogs-0.8.6.tar.gz 116720 BLAKE2B 2d3695c2138f4e88c11a8c515156a430015c2844e09dd599091ff090fd87a3c12a1c5a7d1d9d32d302512a4e027a739a6b864f8d1e549593c6f86ab749989662 SHA512 1116f2e57bbf4d9213080598d04ff41c9ae28bd3e5c45c99068c783beb109eff3ffb02f9c3610f20ef0aa53606b3c500917d5d6983496599904d8c5a35cf2a6f +DIST nethogs-0.8.7.tar.gz 270631 BLAKE2B 179227d4b1fde5328e4885ce72bb28ac20482fa161afee7562546af5b403be1e851533e3861dfa2f514968aebe91a822e6b792520407853dfb1055c6d29ad121 SHA512 d965f3fa439ea9fbba83578b4272d03f396bf3cff9ae73a94936d47a3422d066d885c7f6f2a47fbe2f445a017bffa3fb3a1215976522ef0ad120fae3b95b31a2 diff --git a/net-analyzer/nethogs/metadata.xml b/net-analyzer/nethogs/metadata.xml index 03dae9d25e4b..ee44ac098c0e 100644 --- a/net-analyzer/nethogs/metadata.xml +++ b/net-analyzer/nethogs/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>netmon@gentoo.org</email> diff --git a/net-analyzer/nethogs/nethogs-0.8.5-r1.ebuild b/net-analyzer/nethogs/nethogs-0.8.5-r1.ebuild deleted file mode 100644 index ac684149d33f..000000000000 --- a/net-analyzer/nethogs/nethogs-0.8.5-r1.ebuild +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit toolchain-funcs - -DESCRIPTION="A small 'net top' tool, grouping bandwidth by process" -HOMEPAGE="https://github.com/raboof/nethogs" -SRC_URI="https://github.com/raboof/nethogs/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ~arm ~ia64 x86" - -RDEPEND=" - net-libs/libpcap - sys-libs/ncurses:0= -" -DEPEND=" - ${RDEPEND} - virtual/pkgconfig -" - -src_compile() { - tc-export CC CXX - emake NCURSES_LIBS="$( $(tc-getPKG_CONFIG) --libs ncurses )" ${PN} -} - -src_install() { - emake DESTDIR="${ED}" PREFIX="/usr" install - dodoc Changelog DESIGN README.decpcap.txt README.md -} diff --git a/net-analyzer/nethogs/nethogs-0.8.6.ebuild b/net-analyzer/nethogs/nethogs-0.8.6.ebuild deleted file mode 100644 index bef9dec145fd..000000000000 --- a/net-analyzer/nethogs/nethogs-0.8.6.ebuild +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit toolchain-funcs - -DESCRIPTION="A small 'net top' tool, grouping bandwidth by process" -HOMEPAGE="https://github.com/raboof/nethogs" -SRC_URI="https://github.com/raboof/nethogs/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ~arm ~ia64 x86" - -RDEPEND=" - net-libs/libpcap - sys-libs/ncurses:0= -" -DEPEND=" - ${RDEPEND} - virtual/pkgconfig -" - -src_compile() { - tc-export CC CXX - emake NCURSES_LIBS="$( $(tc-getPKG_CONFIG) --libs ncurses )" ${PN} -} - -src_install() { - emake DESTDIR="${ED}" PREFIX="/usr" install - dodoc DESIGN README.decpcap.txt README.md -} diff --git a/net-analyzer/nethogs/nethogs-0.8.7.ebuild b/net-analyzer/nethogs/nethogs-0.8.7.ebuild new file mode 100644 index 000000000000..972b2b07b03b --- /dev/null +++ b/net-analyzer/nethogs/nethogs-0.8.7.ebuild @@ -0,0 +1,36 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit fcaps toolchain-funcs + +DESCRIPTION="A small 'net top' tool, grouping bandwidth by process" +HOMEPAGE="https://github.com/raboof/nethogs" +SRC_URI="https://github.com/raboof/nethogs/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64 ~arm ~arm64 ~ia64 x86" + +RDEPEND="net-libs/libpcap + sys-libs/ncurses:=" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" + +DOCS=( DESIGN README.decpcap.txt README.md ) + +FILECAPS=( + cap_net_admin,cap_net_raw usr/sbin/nethogs +) + +src_compile() { + tc-export CC CXX + + emake NCURSES_LIBS="$( $(tc-getPKG_CONFIG) --libs ncurses )" ${PN} +} + +src_install() { + emake DESTDIR="${ED}" PREFIX="/usr" install + einstalldocs +} diff --git a/net-analyzer/neti/Manifest b/net-analyzer/neti/Manifest deleted file mode 100644 index d29bf75f1503..000000000000 --- a/net-analyzer/neti/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST neti-2.0.tar.gz 383442 BLAKE2B a76977f6eb16b729e67cf4c98c2b1497d76572374b825bd7200b9d8f3b24634b3bcdae5e611dc3fa145f1cc4d5130d5e8501b017c529a72212a865c845cd01c6 SHA512 5a1156195106e8dcb738c5d2efdd88b77803fa16145db182f2d782a21316fac18af6812b264ece3bc49a5d6713b2aa86aca13129edd01753bf5cf0dd33b1aeb5 diff --git a/net-analyzer/neti/files/neti-init2 b/net-analyzer/neti/files/neti-init2 deleted file mode 100644 index 556660cae489..000000000000 --- a/net-analyzer/neti/files/neti-init2 +++ /dev/null @@ -1,19 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2004 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -depend() { - need net -} - -start() { - ebegin "Starting netiathome" - start-stop-daemon --start --quiet --exec /usr/sbin/neti -- -D - eend $? -} - -stop() { - ebegin "Stopping netiathome" - start-stop-daemon --stop --quiet --exec /usr/sbin/neti - eend $? -} diff --git a/net-analyzer/neti/metadata.xml b/net-analyzer/neti/metadata.xml deleted file mode 100644 index 95148c0af8a3..000000000000 --- a/net-analyzer/neti/metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>netmon@gentoo.org</email> - <name>Gentoo network monitoring and analysis project</name> - </maintainer> - <upstream> - <remote-id type="sourceforge">neti</remote-id> - </upstream> -</pkgmetadata> diff --git a/net-analyzer/neti/neti-2.0-r1.ebuild b/net-analyzer/neti/neti-2.0-r1.ebuild deleted file mode 100644 index bea83118f9b6..000000000000 --- a/net-analyzer/neti/neti-2.0-r1.ebuild +++ /dev/null @@ -1,54 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -DESCRIPTION="NETI@Home research project from GATech" -HOMEPAGE="http://www.neti.gatech.edu" -SRC_URI="mirror://sourceforge/neti/${P}.tar.gz" - -KEYWORDS="~ppc x86" -LICENSE="GPL-2" -SLOT="0" -IUSE="zlib java" - -DEPEND=" - java? ( || ( >=virtual/jdk-1.2 >=virtual/jre-1.2 ) ) - net-libs/libpcap -" -RDEPEND="${DEPEND}" - -RESTRICT="test" - -src_configure() { - econf $(use_with zlib) -} - -src_compile() { - emake NETILogParse neti - - use java && emake javadir=/usr/share/${PN} classjava.stamp -} - -src_install() { - emake \ - DESTDIR="${D}" \ - install-sbinPROGRAMS \ - install-sysconfDATA \ - install-man \ - install-info - - if use java; then - emake \ - DESTDIR="${D}" \ - javadir=/usr/share/${PN} \ - install-javaJAVA \ - install-javaDATA - - echo cd /usr/share/${PN}\;java -cp /usr/share/${PN} NETIMap > "${WORKDIR}"/NETIMap - dobin "${WORKDIR}"/NETIMap - fi - - dodoc README AUTHORS - newinitd "${FILESDIR}"/neti-init2 neti -} diff --git a/net-analyzer/netio/Manifest b/net-analyzer/netio/Manifest deleted file mode 100644 index ade3fa30d715..000000000000 --- a/net-analyzer/netio/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST netio132.zip 162484 BLAKE2B 921b28d25a8042b5567393b088fbede3f8bff2d4bf6c8afcaab03a76487ddc48e6cd640b2cbe7114b022cacef9fcf5ccc3deaa9eed2b648898d7f2dfb40e133c SHA512 3473b6b41c4a1e054fa0eb3316bc16e799034b4b9402c7751f29724d8ec70c674d3de59140fdbdc301c53f2a24b44d58e8cd50a68f107bd892b1d17b6e695232 -DIST netio133.zip 235931 BLAKE2B e664700b5991e38ad056333b13ba6ec40efd2a9a496dd9235ad40482b281f21ca54f49e037a0155d3ca0b1d77bd54330462d08abe5f809c6ee337b672c979995 SHA512 79a4d8ad5a5d9750a19bf7f8f4cc762e6d1a866a63138bfc1cf8614057eb8ade147817e489f93210990ce9d82be03a5053821663212fbee71c4cd46c2f9c9232 diff --git a/net-analyzer/netio/files/netio-1.26-linux-include.patch b/net-analyzer/netio/files/netio-1.26-linux-include.patch deleted file mode 100644 index 591cae323842..000000000000 --- a/net-analyzer/netio/files/netio-1.26-linux-include.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/netio.c -+++ b/netio.c -@@ -199,6 +199,7 @@ - #include <sys/time.h> - #include <time.h> - #include <netinet/in.h> -+#include <arpa/inet.h> - #include <netdb.h> - - #define psock_errno(x) perror(x) diff --git a/net-analyzer/netio/metadata.xml b/net-analyzer/netio/metadata.xml deleted file mode 100644 index 74c2baebb4ec..000000000000 --- a/net-analyzer/netio/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://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/netio/netio-1.32-r1.ebuild b/net-analyzer/netio/netio-1.32-r1.ebuild deleted file mode 100644 index a2016af62465..000000000000 --- a/net-analyzer/netio/netio-1.32-r1.ebuild +++ /dev/null @@ -1,48 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit eutils toolchain-funcs - -DESCRIPTION="measures net throughput with NetBIOS and TCP/IP protocols" -HOMEPAGE="https://web.ars.de/netio/" -SRC_URI="http://web.ars.de/wp-content/uploads/2017/04/${PN}${PV/./}.zip" - -LICENSE="free-noncomm" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos" -RESTRICT="mirror" # bug #391789 comment #1 - -DEPEND=" - app-arch/unzip - >=sys-apps/sed-4 -" - -S="${WORKDIR}" -PATCHES=( - "${FILESDIR}"/${PN}-1.26-linux-include.patch -) - -src_prepare() { - edos2unix *.c *.h *.doc - - default - - sed -i \ - -e "s|LFLAGS=\"\"|LFLAGS?=\"${LDFLAGS}\"|g" \ - -e 's|\(CC\)=|\1?=|g' \ - -e 's|\(CFLAGS\)=|\1+=|g' \ - Makefile || die -} - -src_compile() { - emake \ - CC="$(tc-getCC)" \ - CFLAGS="${CFLAGS}" \ - linux -} - -src_install() { - dobin netio - dodoc netio.doc -} diff --git a/net-analyzer/netio/netio-1.33.ebuild b/net-analyzer/netio/netio-1.33.ebuild deleted file mode 100644 index a5a43f45b6d2..000000000000 --- a/net-analyzer/netio/netio-1.33.ebuild +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit edos2unix toolchain-funcs - -DESCRIPTION="Network benchmark using TCP and UDP protocols" -HOMEPAGE="https://web.ars.de/netio/" -SRC_URI="https://www.ars.de/${PN}${PV/.}.zip" - -LICENSE="free-noncomm" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos" -RESTRICT="mirror" # bug #391789 comment #1 - -DEPEND=" - app-arch/unzip - >=sys-apps/sed-4 -" -S=${WORKDIR} - -src_prepare() { - edos2unix *.c *.h *.doc - - default - - sed -i \ - -e "s|LFLAGS=\"\"|LFLAGS?=\"${LDFLAGS}\"|g" \ - -e 's|\(CC\)=|\1?=|g' \ - -e 's|\(CFLAGS\)=|\1+=|g' \ - Makefile || die -} - -src_compile() { - emake \ - CC="$(tc-getCC)" \ - CFLAGS="${CFLAGS}" \ - linux -} - -src_install() { - dobin netio - dodoc netio.doc -} diff --git a/net-analyzer/netperf/files/netperf-2.7.0-fcommon.patch b/net-analyzer/netperf/files/netperf-2.7.0-fcommon.patch new file mode 100644 index 000000000000..0682c76cd89d --- /dev/null +++ b/net-analyzer/netperf/files/netperf-2.7.0-fcommon.patch @@ -0,0 +1,30 @@ +https://github.com/HewlettPackard/netperf/pull/46 +https://bugs.gentoo.org/706694 + +From c6a2e17fe35f0e68823451fedfdf5b1dbecddbe3 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Wed, 12 Aug 2020 09:57:23 -0700 +Subject: [PATCH] nettest_omni: Remove duplicate variable definitions + +These defines are already defined in nettest_bsd.c and exported by +nettest_bsd.h this should fix build with -fno-common + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- a/src/nettest_omni.c ++++ b/src/nettest_omni.c +@@ -458,14 +458,6 @@ static int client_port_max = 65535; + + /* different options for the sockets */ + +-int +- loc_nodelay, /* don't/do use NODELAY locally */ +- rem_nodelay, /* don't/do use NODELAY remotely */ +- loc_sndavoid, /* avoid send copies locally */ +- loc_rcvavoid, /* avoid recv copies locally */ +- rem_sndavoid, /* avoid send copies remotely */ +- rem_rcvavoid; /* avoid recv_copies remotely */ +- + extern int + loc_tcpcork, + rem_tcpcork, + diff --git a/net-analyzer/netperf/files/netperf-2.7.0-inline.patch b/net-analyzer/netperf/files/netperf-2.7.0-inline.patch index eb8c09b84695..eb89d34f3e8b 100644 --- a/net-analyzer/netperf/files/netperf-2.7.0-inline.patch +++ b/net-analyzer/netperf/files/netperf-2.7.0-inline.patch @@ -1,6 +1,6 @@ # Copyright Seblu 2015 ---- a/src/netlib.c 2015-08-04 20:30:43.449468815 +0200 -+++ b/src/netlib.c 2015-08-04 20:31:40.317792002 +0200 +--- a/src/netlib.c ++++ b/src/netlib.c @@ -3997,11 +3997,7 @@ } } diff --git a/net-analyzer/netperf/metadata.xml b/net-analyzer/netperf/metadata.xml index d9e80b8c44f1..3e35e2cbd3a3 100644 --- a/net-analyzer/netperf/metadata.xml +++ b/net-analyzer/netperf/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>netmon@gentoo.org</email> diff --git a/net-analyzer/netperf/netperf-2.7.0-r2.ebuild b/net-analyzer/netperf/netperf-2.7.0-r2.ebuild deleted file mode 100644 index ac656a889e76..000000000000 --- a/net-analyzer/netperf/netperf-2.7.0-r2.ebuild +++ /dev/null @@ -1,78 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit eutils flag-o-matic user - -DESCRIPTION="Network performance benchmark" -SRC_URI="ftp://ftp.netperf.org/${PN}/${P}.tar.bz2" -KEYWORDS="~alpha amd64 arm64 ~hppa ~ia64 ppc ppc64 sparc x86" - -HOMEPAGE="http://www.netperf.org/" -LICENSE="netperf" -SLOT="0" -IUSE="demo sctp" - -DEPEND=">=sys-apps/sed-4" - -pkg_setup() { - enewuser netperf - enewgroup netperf -} - -src_prepare() { - eapply \ - "${FILESDIR}"/${PN}-fix-scripts.patch \ - "${FILESDIR}"/${PN}-2.6.0-log-dir.patch \ - "${FILESDIR}"/${PN}-2.7.0-includes.patch \ - "${FILESDIR}"/${PN}-2.7.0-space.patch \ - "${FILESDIR}"/${PN}-2.7.0-inline.patch - - # Fixing paths in scripts - sed -i \ - -e 's:^\(NETHOME=\).*:\1"/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 - - eapply_user -} - -src_configure() { - append-cflags -fcommon - - # netlib.c:2292:5: warning: implicit declaration of function ‘sched_setaffinity’ - # nettest_omni.c:2943:5: warning: implicit declaration of function ‘splice’ - append-cppflags -D_GNU_SOURCE - - econf \ - $(use_enable demo) \ - $(use_enable sctp) -} - -src_install() { - default - - # move netserver into sbin as we had it before 2.4 was released with its - # autoconf goodness - dodir /usr/sbin - mv "${D}"/usr/{bin,sbin}/netserver || die - - # 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 - dodir /usr/share/doc/${PF}/examples - #Scripts no longer get installed by einstall - cp doc/examples/*_script "${D}"/usr/share/doc/${PF}/examples || die -} diff --git a/net-analyzer/netperf/netperf-2.7.0-r5.ebuild b/net-analyzer/netperf/netperf-2.7.0-r5.ebuild new file mode 100644 index 000000000000..c96a45cdd70a --- /dev/null +++ b/net-analyzer/netperf/netperf-2.7.0-r5.ebuild @@ -0,0 +1,82 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit flag-o-matic + +DESCRIPTION="Network performance benchmark" +HOMEPAGE="http://www.netperf.org/" +SRC_URI="ftp://ftp.netperf.org/${PN}/${P}.tar.bz2" + +LICENSE="netperf" +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}-2.6.0-log-dir.patch + "${FILESDIR}"/${PN}-2.7.0-includes.patch + "${FILESDIR}"/${PN}-2.7.0-space.patch + "${FILESDIR}"/${PN}-2.7.0-inline.patch + "${FILESDIR}"/${PN}-2.7.0-fcommon.patch +) + +src_prepare() { + # Fixing paths in scripts + sed -i \ + -e 's:^\(NETHOME=\).*:\1"/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 +} + +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 + + # Move netserver into sbin as we had it before 2.4 was released with its + # autoconf goodness + dodir /usr/sbin + mv "${ED}"/usr/{bin,sbin}/netserver || die + + # 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 + dodir /usr/share/doc/${PF}/examples + # Scripts no longer get installed by einstall + cp doc/examples/*_script "${ED}"/usr/share/doc/${PF}/examples || die +} diff --git a/net-analyzer/netpipe/files/netpipe-3.7.2-fix-makefile.patch b/net-analyzer/netpipe/files/netpipe-3.7.2-fix-makefile.patch index f5c61737f7ae..d1f04a33a2dc 100644 --- a/net-analyzer/netpipe/files/netpipe-3.7.2-fix-makefile.patch +++ b/net-analyzer/netpipe/files/netpipe-3.7.2-fix-makefile.patch @@ -1,5 +1,3 @@ -diff --git a/makefile b/makefile -index 16f9052..3ada81f 100644 --- a/makefile +++ b/makefile @@ -21,8 +21,6 @@ @@ -11,3 +9,36 @@ index 16f9052..3ada81f 100644 SRC = ./src # For MPI, mpicc will set up the proper include and library paths +@@ -91,26 +89,26 @@ + + + tcp: $(SRC)/tcp.c $(SRC)/netpipe.c $(SRC)/netpipe.h +- $(CC) $(CFLAGS) $(SRC)/netpipe.c $(SRC)/tcp.c -DTCP -o NPtcp -I$(SRC) ++ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) $(SRC)/netpipe.c $(SRC)/tcp.c -DTCP -o NPtcp -I$(SRC) + + tcp6: $(SRC)/tcp.c $(SRC)/netpipe.c $(SRC)/netpipe.h +- $(CC) $(CFLAGS) $(SRC)/netpipe.c $(SRC)/tcp6.c -DTCP6 \ ++ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) $(SRC)/netpipe.c $(SRC)/tcp6.c -DTCP6 \ + -o NPtcp6 -I$(SRC) + + sctp: $(SRC)/sctp.c $(SRC)/netpipe.c $(SRC)/netpipe.h +- $(CC) $(CFLAGS) $(SRC)/netpipe.c $(SRC)/sctp.c -DSCTP \ ++ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) $(SRC)/netpipe.c $(SRC)/sctp.c -DSCTP \ + -o NPsctp -I$(SRC) + + sctp6: $(SRC)/sctp6.c $(SRC)/netpipe.c $(SRC)/netpipe.h +- $(CC) $(CFLAGS) $(SRC)/netpipe.c $(SRC)/sctp6.c -DSCTP6 \ ++ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) $(SRC)/netpipe.c $(SRC)/sctp6.c -DSCTP6 \ + -o NPsctp6 -I$(SRC) + + ipx: $(SRC)/ipx.c $(SRC)/netpipe.c $(SRC)/netpipe.h +- $(CC) $(CFLAGS) $(SRC)/netpipe.c $(SRC)/ipx.c -DIPX \ ++ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) $(SRC)/netpipe.c $(SRC)/ipx.c -DIPX \ + -o NPipx -I$(SRC) -lipx + + memcpy: $(SRC)/memcpy.c $(SRC)/netpipe.c $(SRC)/netpipe.h +- $(CC) $(CFLAGS) $(SRC)/netpipe.c $(SRC)/memcpy.c \ ++ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) $(SRC)/netpipe.c $(SRC)/memcpy.c \ + -DMEMCPY -o NPmemcpy -I$(SRC) + + MP_memcpy: $(SRC)/memcpy.c $(SRC)/netpipe.c $(SRC)/netpipe.h $(SRC)/MP_memcpy.c diff --git a/net-analyzer/netpipe/metadata.xml b/net-analyzer/netpipe/metadata.xml index fd15de965046..ff4833a7522e 100644 --- a/net-analyzer/netpipe/metadata.xml +++ b/net-analyzer/netpipe/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> <email>williamh@gentoo.org</email> diff --git a/net-analyzer/netpipe/netpipe-3.7.2-r1.ebuild b/net-analyzer/netpipe/netpipe-3.7.2-r1.ebuild new file mode 100644 index 000000000000..1cda1d25fa4a --- /dev/null +++ b/net-analyzer/netpipe/netpipe-3.7.2-r1.ebuild @@ -0,0 +1,45 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit toolchain-funcs + +MY_PN="NetPIPE" +MY_P="${MY_PN}-${PV}" + +DESCRIPTION="network protocol independent performance evaluator" +HOMEPAGE="http://bitspjoule.org/netpipe/" +SRC_URI="http://bitspjoule.org/netpipe/code/${MY_P}.tar.gz" +S="${WORKDIR}/${MY_P}" + +LICENSE="GPL-1+" +SLOT="0" +KEYWORDS="~amd64" +IUSE="ipv6" + +DOCS=( + bin/feplot + bin/geplot + bin/nplaunch + dox/README + dox/netpipe_paper.ps + dox/np_cluster2002.pdf + dox/np_euro.pdf +) + +PATCHES=( "${FILESDIR}"/${P}-fix-makefile.patch ) + +src_configure() { + tc-export CC +} + +src_compile() { + emake memcpy tcp $(usev ipv6 tcp6) +} + +src_install() { + dobin NPmemcpy NPtcp $(usev ipv6 NPtcp6) + doman dox/netpipe.1 + einstalldocs +} diff --git a/net-analyzer/netpipe/netpipe-3.7.2.ebuild b/net-analyzer/netpipe/netpipe-3.7.2.ebuild deleted file mode 100644 index 894cf55c72a7..000000000000 --- a/net-analyzer/netpipe/netpipe-3.7.2.ebuild +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit toolchain-funcs - -MY_PN=NetPIPE -MY_P=${MY_PN}-${PV} - -DESCRIPTION="network protocol independent performance evaluator" -HOMEPAGE="http://bitspjoule.org/netpipe/" -SRC_URI="http://bitspjoule.org/netpipe/code/${MY_P}.tar.gz" -LICENSE="GPL-1+" -SLOT="0" -KEYWORDS="~amd64" -IUSE="ipv6" - -DOCS=( - bin/feplot - bin/geplot - bin/nplaunch - dox/README - dox/netpipe_paper.ps - dox/np_cluster2002.pdf - dox/np_euro.pdf - ) - -PATCHES=( - "${FILESDIR}"/${P}-fix-makefile.patch - ) - -S="${WORKDIR}"/${MY_P} - -src_compile() { - emake CC="$(tc-getCC)" LD="$(tc-getLD)" memcpy tcp $(usex ipv6 tcp6 '') -} - -src_install() { - dobin NPmemcpy NPtcp - use ipv6 && dobin NPtcp6 - doman dox/netpipe.1 - einstalldocs -} diff --git a/net-analyzer/netselect/metadata.xml b/net-analyzer/netselect/metadata.xml index 74c2baebb4ec..50ca2de6c5d2 100644 --- a/net-analyzer/netselect/metadata.xml +++ b/net-analyzer/netselect/metadata.xml @@ -1,8 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!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> + <maintainer type="project"> + <email>netmon@gentoo.org</email> + <name>Gentoo network monitoring and analysis project</name> + </maintainer> + <upstream> + <remote-id type="github">apenwarr/netselect</remote-id> + </upstream> </pkgmetadata> diff --git a/net-analyzer/netselect/netselect-0.4-r1.ebuild b/net-analyzer/netselect/netselect-0.4-r1.ebuild deleted file mode 100644 index 11fd0ab2cae5..000000000000 --- a/net-analyzer/netselect/netselect-0.4-r1.ebuild +++ /dev/null @@ -1,46 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit eutils toolchain-funcs - -DESCRIPTION="Ultrafast implementation of ping" -HOMEPAGE="http://apenwarr.ca/netselect/" -SRC_URI=" - https://github.com/apenwarr/${PN}/archive/${P}.tar.gz - ipv6? ( https://dev.gentoo.org/~jer/${P}-ipv6.patch.xz ) -" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" -IUSE="ipv6" - -PATCHES=( - "${FILESDIR}"/${PN}-0.4-bsd.patch - "${FILESDIR}"/${PN}-0.4-flags.patch -) -S=${WORKDIR}/${PN}-${P} - -src_prepare() { - use ipv6 && eapply "${WORKDIR}"/${PN}-0.4-ipv6.patch - - default -} - -src_compile() { - emake CC="$(tc-getCC)" LDFLAGS="${CFLAGS} ${LDFLAGS}" -} - -src_install() { - dobin netselect - - if ! use prefix ; then - fowners root:wheel /usr/bin/netselect - fperms 4711 /usr/bin/netselect - fi - - dodoc HISTORY README - - doman netselect.1 -} diff --git a/net-analyzer/netselect/netselect-0.4-r2.ebuild b/net-analyzer/netselect/netselect-0.4-r2.ebuild new file mode 100644 index 000000000000..acf571f4b070 --- /dev/null +++ b/net-analyzer/netselect/netselect-0.4-r2.ebuild @@ -0,0 +1,56 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit fcaps toolchain-funcs + +DESCRIPTION="Ultrafast implementation of ping" +HOMEPAGE="http://apenwarr.ca/netselect/" +SRC_URI=" + https://github.com/apenwarr/${PN}/archive/${P}.tar.gz + ipv6? ( https://dev.gentoo.org/~jsmolic/distfiles/${P}-ipv6.patch.xz ) +" +S="${WORKDIR}/${PN}-${P}" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" +IUSE="ipv6" + +PATCHES=( + "${FILESDIR}"/${PN}-0.4-bsd.patch + "${FILESDIR}"/${PN}-0.4-flags.patch +) + +DOCS=( HISTORY README ) + +FILECAPS=( -g wheel cap_net_raw usr/bin/netselect ) + +src_prepare() { + use ipv6 && eapply "${WORKDIR}"/${PN}-0.4-ipv6.patch + + default + + # Don't warn about "root privileges required" when running as + # an unprivileged user with filecaps + if ! use prefix && use filecaps; then + sed -i -e '/if (geteuid () != 0)/,+2d' "${S}"/netselect.c || die + fi +} + +src_compile() { + emake CC="$(tc-getCC)" LDFLAGS="${CFLAGS} ${LDFLAGS}" +} + +src_install() { + dobin netselect + + einstalldocs + + doman netselect.1 +} + +pkg_postinst() { + ! use prefix && fcaps_pkg_postinst +} diff --git a/net-analyzer/netselect/netselect-9999.ebuild b/net-analyzer/netselect/netselect-9999.ebuild index c41a3b0d656e..5ed3fc2fde64 100644 --- a/net-analyzer/netselect/netselect-9999.ebuild +++ b/net-analyzer/netselect/netselect-9999.ebuild @@ -1,21 +1,18 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -inherit git-r3 toolchain-funcs + +inherit fcaps git-r3 toolchain-funcs DESCRIPTION="Ultrafast implementation of ping" HOMEPAGE="http://apenwarr.ca/netselect/" -EGIT_REPO_URI=" - https://github.com/apenwarr/${PN} -" -SRC_URI=" - ipv6? ( https://dev.gentoo.org/~jer/${PN}-0.4-ipv6.patch.xz ) -" +EGIT_REPO_URI="https://github.com/apenwarr/${PN}" +SRC_URI="ipv6? ( https://dev.gentoo.org/~jsmolic/distfiles/${PN}-0.4-ipv6.patch.xz )" +S="${WORKDIR}/${PN}-${P}" LICENSE="BSD" SLOT="0" -KEYWORDS="" IUSE="ipv6" PATCHES=( @@ -23,15 +20,25 @@ PATCHES=( "${FILESDIR}"/${PN}-0.4-flags.patch ) +DOCS=( HISTORY README ) + +FILECAPS=( -g wheel cap_net_raw usr/bin/netselect ) + src_unpack() { use ipv6 && unpack ${A} git-r3_src_unpack } src_prepare() { - use ipv6 && PATCHES+=( "${WORKDIR}"/${PN}-0.4-ipv6.patch ) + use ipv6 && eapply "${WORKDIR}"/${PN}-0.4-ipv6.patch default + + # Don't warn about "root privileges required" when running as + # an unprivileged user with filecaps + if ! use prefix && use filecaps; then + sed -i -e '/if (geteuid () != 0)/,+2d' "${S}"/netselect.c || die + fi } src_compile() { @@ -41,12 +48,11 @@ src_compile() { src_install() { dobin netselect - if ! use prefix ; then - fowners root:wheel /usr/bin/netselect - fperms 4711 /usr/bin/netselect - fi - - dodoc HISTORY README + einstalldocs doman netselect.1 } + +pkg_postinst() { + ! use prefix && fcaps_pkg_postinst +} diff --git a/net-analyzer/nettop/metadata.xml b/net-analyzer/nettop/metadata.xml index 74c2baebb4ec..dce3f3be66c0 100644 --- a/net-analyzer/nettop/metadata.xml +++ b/net-analyzer/nettop/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>netmon@gentoo.org</email> diff --git a/net-analyzer/nettop/nettop-0.2.3-r2.ebuild b/net-analyzer/nettop/nettop-0.2.3-r2.ebuild index 9f5605fa16a6..b77fcdc473e8 100644 --- a/net-analyzer/nettop/nettop-0.2.3-r2.ebuild +++ b/net-analyzer/nettop/nettop-0.2.3-r2.ebuild @@ -1,32 +1,38 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=8 -inherit eutils toolchain-funcs +inherit autotools toolchain-funcs -DESCRIPTION="top like program for network activity" -SRC_URI="mirror://gentoo/${P}.tar.gz" +DESCRIPTION="top-like program for network activity" HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage" +SRC_URI="mirror://gentoo/${P}.tar.gz" -SLOT="0" LICENSE="BSD" -KEYWORDS="amd64 ~arm ppc x86" +SLOT="0" +KEYWORDS="amd64 ~arm ~arm64 ppc x86" -DEPEND=" +RDEPEND=" sys-libs/slang - net-libs/libpcap -" -RDEPEND="${DEPEND}" + net-libs/libpcap" +DEPEND="${RDEPEND}" + +PATCHES=( + "${FILESDIR}"/${P}-gcc411.patch + "${FILESDIR}"/${P}-offbyone.patch +) src_prepare() { - epatch \ - "${FILESDIR}"/${P}-gcc411.patch \ - "${FILESDIR}"/${P}-offbyone.patch + default + + eautoreconf #871408 + sed -i 's/configure.in/configure.ac/' Makefile.in || die + tc-export CC } src_install() { dosbin nettop - dodoc ChangeLog README THANKS + einstalldocs } diff --git a/net-analyzer/netwag/Manifest b/net-analyzer/netwag/Manifest deleted file mode 100644 index 161554360924..000000000000 --- a/net-analyzer/netwag/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST netwag-5.39.0-doc_html.tgz 46461 BLAKE2B 13d290f828043018cae6b801eed5853fb6b01b8a5b6a2fac5a132b9fe1475db180e90814c1351a8e248627320305298aba63cfd4414472b752c21529a6dbdec4 SHA512 499d201b510c5175b09c7dbcc8b9bec1d9aa2fbf90613a937f88be5835dd67acfe28e78483ce2124c4fa3b43ea8f409ce6115e48f12ae0ffc4ad684354488030 -DIST netwag-5.39.0-src.tgz 164731 BLAKE2B 861217f023bc35e996f5433657e057ca799859d1453812793941a5dcf1827ddaa827f3ae8b5f2550c85932dea3dbc0cb9b3a6687f6986c6cab09b94fab01813c SHA512 a9f0279d42666eff636bb66258a17a4e10528b7329dfe5e5d8c0ddce15048d847a2a8e892ba82a606b37ceb328b8b31be52d7e8ee7aeb6feb1f3d254aa3a2401 diff --git a/net-analyzer/netwag/metadata.xml b/net-analyzer/netwag/metadata.xml deleted file mode 100644 index cab4e9c4109e..000000000000 --- a/net-analyzer/netwag/metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>netmon@gentoo.org</email> - <name>Gentoo network monitoring and analysis project</name> - </maintainer> - <upstream> - <remote-id type="sourceforge">ntwag</remote-id> - </upstream> -</pkgmetadata> diff --git a/net-analyzer/netwag/netwag-5.39.0.ebuild b/net-analyzer/netwag/netwag-5.39.0.ebuild deleted file mode 100644 index 620bc9ee48ba..000000000000 --- a/net-analyzer/netwag/netwag-5.39.0.ebuild +++ /dev/null @@ -1,59 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -# NOTE: netwib, netwox and netwag go together, bump all or bump none - -EAPI=5 - -DESCRIPTION="Tcl/tk interface to netwox (Toolbox of 222 utilities for testing Ethernet/IP networks)" -HOMEPAGE=" - http://ntwag.sourceforge.net/ - http://www.laurentconstantin.com/en/netw/netwag/ -" -SRC_URI="mirror://sourceforge/ntwag/${P}-src.tgz - doc? ( mirror://sourceforge/ntwag/${P}-doc_html.tgz )" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~hppa ~ppc x86" -IUSE="doc" - -DEPEND=" - ~net-analyzer/netwox-${PV} - >=dev-lang/tk-8 - || ( - x11-terms/xterm - kde-apps/konsole - x11-terms/eterm - x11-terms/gnome-terminal - ) -" -RDEPEND="${DEPEND}" - -S="${WORKDIR}/${P}-src/src" - -src_prepare() { - sed -i \ - -e 's:/man$:/share/man:g' \ - -e "s:/usr/local:/usr:" \ - config.dat || die - sed -i \ - -e 's|eterm|Eterm|g' \ - genemake || die -} - -src_configure() { - sh genemake || die "problem creating Makefile" -} - -DOCS=( - "${WORKDIR}"/${P}-src/README.TXT - "${WORKDIR}"/${P}-src/doc/{changelog.txt,credits.txt} - "${WORKDIR}"/${P}-src/doc/{problemreport.txt,problemusage.txt,todo.txt} -) - -src_install() { - default - - use doc && dohtml -r "${WORKDIR}"/${P}-doc_html/* -} diff --git a/net-analyzer/netwatch/files/netwatch-1.3.0.1-clang16.patch b/net-analyzer/netwatch/files/netwatch-1.3.0.1-clang16.patch new file mode 100644 index 000000000000..e1b0cbd115b2 --- /dev/null +++ b/net-analyzer/netwatch/files/netwatch-1.3.0.1-clang16.patch @@ -0,0 +1,22 @@ +https://bugs.gentoo.org/871375 +--- a/dispdata.c ++++ b/dispdata.c +@@ -42,3 +42,3 @@ + +-extern destroy_program; ++extern int destroy_program; + extern Semaphore masterdo; +--- a/netwatch.c ++++ b/netwatch.c +@@ -608,2 +608,4 @@ + void findaddr (u_int32_t searchaddr); ++int doeth (); ++int gh (int opt); + +--- a/netwatch.h ++++ b/netwatch.h +@@ -220,2 +220,4 @@ + char *servicenm( char *s, int port); ++void uthread_wait( long usec); ++int dokeyin (int force); + diff --git a/net-analyzer/netwatch/files/netwatch-1.3.0.1-lto-mismatch.patch b/net-analyzer/netwatch/files/netwatch-1.3.0.1-lto-mismatch.patch new file mode 100644 index 000000000000..7a89ce111e9a --- /dev/null +++ b/net-analyzer/netwatch/files/netwatch-1.3.0.1-lto-mismatch.patch @@ -0,0 +1,8 @@ +Fix failure with -Werror=lto-type-mismatch +--- a/dispdata.c ++++ b/dispdata.c +@@ -96,3 +96,3 @@ + #define MAXSTATUS 14 +-#define STATUSSIZE 200 ++#define STATUSSIZE 256 + extern char status_lines[MAXSTATUS][STATUSSIZE]; diff --git a/net-analyzer/netwatch/metadata.xml b/net-analyzer/netwatch/metadata.xml index af0a0fe5e3bb..1ea14397dd8e 100644 --- a/net-analyzer/netwatch/metadata.xml +++ b/net-analyzer/netwatch/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>netmon@gentoo.org</email> diff --git a/net-analyzer/netwatch/netwatch-1.3.0.1-r4.ebuild b/net-analyzer/netwatch/netwatch-1.3.0.1-r4.ebuild deleted file mode 100644 index df2471e3538e..000000000000 --- a/net-analyzer/netwatch/netwatch-1.3.0.1-r4.ebuild +++ /dev/null @@ -1,50 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit autotools - -MY_PV=$(ver_cut 1-3)-$(ver_cut 4) - -DESCRIPTION="Ethernet/PPP IP Packet Monitor" -HOMEPAGE="http://www.slctech.org/~mackay/netwatch.html" -SRC_URI="http://www.slctech.org/~mackay/NETWATCH/${PN}-${MY_PV}.tgz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ~x86" -IUSE="doc" - -RDEPEND="sys-libs/ncurses" -DEPEND=" - ${RDEPEND} - sys-kernel/linux-headers - virtual/pkgconfig -" -PATCHES=( - "${FILESDIR}"/${P}-append_ldflags.patch - "${FILESDIR}"/${P}-open.patch - "${FILESDIR}"/${P}-fix-fortify.patch - "${FILESDIR}"/${P}-do-not-call.patch - "${FILESDIR}"/${P}-includes.patch - "${FILESDIR}"/${P}-tinfo.patch - "${FILESDIR}"/${P}-fno-common.patch -) -S=${WORKDIR}/${PN}-$(ver_cut 1-3) - -src_prepare() { - default - eautoreconf -} - -src_install() { - dosbin netresolv netwatch - - doman netwatch.1 - dodoc BUGS CHANGES README* TODO - - if use doc; then - docinto html - dodoc NetwatchKeyCommands.html - fi -} diff --git a/net-analyzer/netwatch/netwatch-1.3.0.1-r5.ebuild b/net-analyzer/netwatch/netwatch-1.3.0.1-r5.ebuild new file mode 100644 index 000000000000..a7215c4e36d0 --- /dev/null +++ b/net-analyzer/netwatch/netwatch-1.3.0.1-r5.ebuild @@ -0,0 +1,50 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools flag-o-matic + +DESCRIPTION="Ethernet/PPP IP Packet Monitor" +HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage" +SRC_URI="mirror://gentoo/${PN}-$(ver_rs 3 -).tgz" +S="${WORKDIR}/${PN}-$(ver_cut 1-3)" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64 ~x86" + +RDEPEND="sys-libs/ncurses:=" +DEPEND=" + ${RDEPEND} + sys-kernel/linux-headers" +BDEPEND="virtual/pkgconfig" + +PATCHES=( + "${FILESDIR}"/${P}-append_ldflags.patch + "${FILESDIR}"/${P}-open.patch + "${FILESDIR}"/${P}-fix-fortify.patch + "${FILESDIR}"/${P}-do-not-call.patch + "${FILESDIR}"/${P}-includes.patch + "${FILESDIR}"/${P}-tinfo.patch + "${FILESDIR}"/${P}-fno-common.patch + "${FILESDIR}"/${P}-lto-mismatch.patch + "${FILESDIR}"/${P}-clang16.patch +) + +src_prepare() { + default + + eautoreconf + + append-flags -fno-strict-aliasing #861203 +} + +src_install() { + dosbin netresolv netwatch + doman netwatch.1 + einstalldocs + + docinto html + dodoc NetwatchKeyCommands.html +} diff --git a/net-analyzer/netwox/Manifest b/net-analyzer/netwox/Manifest deleted file mode 100644 index c24f76be1fd9..000000000000 --- a/net-analyzer/netwox/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST netwox-5.39.0-doc_html.tgz 146301 BLAKE2B 5d65cce6dc36f7fb682a7ab3d51b04366a9e43541837a07ff82e7dba29367adad92fcefcd68eb68a7f30c36adbce7765ee0cbd1d77a6a873a53c0b03ee9f0f1c SHA512 1bb6c87f2aeea8b10e9bec0725ed82b21c41290d2f2626024b13525fd92596e7aa9f91788d966a51900c0e1b346ac9fb30000344fa5b1450fe9ceb724df4be56 -DIST netwox-5.39.0-src.tgz 771942 BLAKE2B f6115e799404f420fdcee4551b78f3aeb5a3db5b5d528425fd4a68f0a5509bcace2f7d66cbbd56ae380d466425791b0a0b74325967dc2248ba25b1b55b70438b SHA512 3781c1c860d1545c269b27a702c59f1cb6b12af2e66fb3cbe776f3e085681a75ed3096d64cfdf92f65eff7213ceaab474b7e15c169c12e2c05220790ce337e37 diff --git a/net-analyzer/netwox/metadata.xml b/net-analyzer/netwox/metadata.xml deleted file mode 100644 index 56958ec7b42e..000000000000 --- a/net-analyzer/netwox/metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>netmon@gentoo.org</email> - <name>Gentoo network monitoring and analysis project</name> - </maintainer> - <upstream> - <remote-id type="sourceforge">ntwox</remote-id> - </upstream> -</pkgmetadata> diff --git a/net-analyzer/netwox/netwox-5.39.0.ebuild b/net-analyzer/netwox/netwox-5.39.0.ebuild deleted file mode 100644 index 962009bd0fde..000000000000 --- a/net-analyzer/netwox/netwox-5.39.0.ebuild +++ /dev/null @@ -1,61 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -# NOTE: netwib, netwox and netwag go together, bump all or bump none - -EAPI=5 -inherit multilib toolchain-funcs - -DESCRIPTION="Toolbox of 217 utilities for testing Ethernet/IP networks" -HOMEPAGE=" - http://ntwox.sourceforge.net/ - http://www.laurentconstantin.com/en/netw/netwox/ -" -SRC_URI="mirror://sourceforge/ntwox/${P}-src.tgz - doc? ( mirror://sourceforge/ntwox/${P}-doc_html.tgz )" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~hppa ~ppc x86" -IUSE="doc" - -DEPEND=" - net-libs/libnet:1.1 - net-libs/libpcap - ~net-libs/netwib-${PV} -" -RDEPEND="${DEPEND}" - -S=${WORKDIR}/${P}-src/src - -src_prepare() { - sed -i \ - -e 's:/man$:/share/man:g' \ - -e "s:/lib:/$(get_libdir):" \ - -e "s:/usr/local:/usr:" \ - -e "s:=ar:=$(tc-getAR):" \ - -e "s:=ranlib:=$(tc-getRANLIB):" \ - -e "s:=gcc:=$(tc-getCC):" \ - -e "s:-O2:${CFLAGS}:" \ - config.dat || die - sed -i \ - -e "s:-o netwox:& \${LDFLAGS}:g" \ - -e 's: ; make: ; \\$(MAKE):g' \ - genemake || die -} - -src_configure() { - sh genemake || die -} - -DOCS=( - "${WORKDIR}"/${P}-src/README.TXT - "${WORKDIR}"/${P}-src/doc/{changelog.txt,credits.txt} - "${WORKDIR}"/${P}-src/doc/{problemreport.txt,problemusageunix.txt,todo.txt} -) - -src_install() { - default - - use doc && dohtml -r "${WORKDIR}"/${P}-doc_html/* -} diff --git a/net-analyzer/nfdump/Manifest b/net-analyzer/nfdump/Manifest index 8e6ae49f88b8..3a86012a4c87 100644 --- a/net-analyzer/nfdump/Manifest +++ b/net-analyzer/nfdump/Manifest @@ -1,3 +1 @@ -DIST nfdump-1.6.19.tar.gz 561923 BLAKE2B 458cf0e23f433c7c1c27450712a2f9f8f75a990eeaf079bac9a74bf5abf4bc22c930294494424fd8e7f7d03ffc1e5f1e35ba50e29ba4f3528f63e1739524c9ed SHA512 577c23ca3aae8ab035c734c137d3a338e09f46b5f8551946fd84b9a03fae1ef2aa80e2ab9657eb226defcd753bb63503eeb85316ca1df18d95b85270df8f379e -DIST nfdump-1.6.20.tar.gz 561053 BLAKE2B 20c8db09386a4aa6174d3c2919c33409a4b2d9b295908ae61e8ce12107c08ba7742fb7ec80bcb7bcdb15e036e6d2320c83f0446a479185cb18717720eca87c88 SHA512 8396241fa24d532540135762a81ce035586c405d4ab1e01d6e2b8226b7cc9b6784170ca1fa4c1581fb60f324473cca5ce2d3de82282313d3877f9584e449d137 -DIST nfdump-1.6.21.tar.gz 561617 BLAKE2B 61a52cb7ee724c47f93e0ce8dd0515306c16b94d8b351f9543deecc2b28c813f09f0e4ba621f2561760924af683ffd527d00936fbc5f91f83d6f727d6cf9e5d9 SHA512 c9162b7a6653267cd4d66a2d75bb2c3d65c431bb29ee549bac2a208fe7f2bc871bb91dfa6d89d6f18cd69f1d435dd25ba1c5dfe6e10b0efc4a582f2e67913a34 +DIST nfdump-1.7.2.tar.gz 697405 BLAKE2B cf52f2cca5d80070bc00c7a7a87cc4820f04904ddeeebd4fc93cf3a2433bcf5798191daa86f0bfc7ee1f2f92e5d8bb087114d2c17e32b641a224189aeb54f822 SHA512 858d0aaae24f2e38f3708db9fd5cd40e99a6a50d5da5738c8ce4bf898fb153ce439c504d5fe8fb3c296d0069511a6f229ebdfc117f849a482e5ffdf457f06003 diff --git a/net-analyzer/nfdump/files/nfcapd.confd b/net-analyzer/nfdump/files/nfcapd.confd new file mode 100644 index 000000000000..28ea35fd0741 --- /dev/null +++ b/net-analyzer/nfdump/files/nfcapd.confd @@ -0,0 +1,11 @@ +#shellcheck shell=sh +#shellcheck disable=SC2034 + +#port number to listen on +#PORT="2055" + +#maximum size of collected files +#MAX_SIZE="1G" + +#enable sending of all received packets to specified address +#REPEAT_TO="192.168.1.1/60062" diff --git a/net-analyzer/nfdump/files/nfcapd.initd b/net-analyzer/nfdump/files/nfcapd.initd new file mode 100644 index 000000000000..98d388cb710f --- /dev/null +++ b/net-analyzer/nfdump/files/nfcapd.initd @@ -0,0 +1,60 @@ +#!/sbin/openrc-run +#shellcheck shell=sh + +IDENT="${RC_SVCNAME#*.}" +PIDFILE="/run/nfcapd/${IDENT}.pid" +USER="nfcapd" +GROUP="nfcapd" + +ssd_start(){ + if [ -n "${MAX_SIZE}" ]; then + set -- "$@" -e + fi + if [ -n "${PORT}" ]; then + set -- "$@" -p "${PORT}" + fi + if [ -n "${REPEAT_TO}" ]; then + set -- "$@" -R "${REPEAT_TO}" + fi + start-stop-daemon "$@" +} + +checkconfig() { + if [ "${IDENT}" = "${RC_SVCNAME}" ]; then + eerror "You have to create an init script for each ident:" + eerror " cd /etc/init.d/; ln -s nfcapd nfcapd.ident" + return 1 + fi +} + +depend() { + need net +} + +start() { + checkconfig || return 1 + + checkpath -d -m 0750 -o nfcapd:nfcapd /run/nfcapd + checkpath -d -m 0750 -o nfcapd:nfcapd /var/tmp/nfcapd/"${IDENT}" + + if [ -n "${MAX_SIZE}" ]; then + nfexpire -u /var/tmp/nfcapd/"${IDENT}" -s "${MAX_SIZE}" \ + > /dev/null 2>&1 + chown -R ${USER}:${GROUP} /var/tmp/nfcapd/"${IDENT}" + fi + + ebegin "Starting ${RC_SVCNAME}" + ssd_start --start --quiet --exec /usr/bin/nfcapd \ + --pidfile "${PIDFILE}" -- -D -P "${PIDFILE}" -u ${USER} \ + -g ${GROUP} -I "${IDENT}" -l /var/tmp/nfcapd/"${IDENT}" + eend $? +} + +stop() { + checkconfig || return 1 + + ebegin "Stopping ${RC_SVCNAME}" + start-stop-daemon --stop --exec /usr/bin/nfcapd \ + --pidfile "${PIDFILE}" + eend $? +} diff --git a/net-analyzer/nfdump/files/nfdump-1.6.19-compiler.patch b/net-analyzer/nfdump/files/nfdump-1.6.19-compiler.patch deleted file mode 100644 index 8826c50c9dc2..000000000000 --- a/net-analyzer/nfdump/files/nfdump-1.6.19-compiler.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- a/configure.ac -+++ b/configure.ac -@@ -9,8 +9,6 @@ - AM_INIT_AUTOMAKE([subdir-objects]) - - # Checks for programs. --CFLAGS="-g -O3" --AC_PROG_CC([clang gcc]) - AX_CHECK_C11 - CFLAGS="$CFLAGS -Wall -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wmissing-noreturn -fno-strict-aliasing" - ---- a/bin/Makefile.am -+++ b/bin/Makefile.am -@@ -30,7 +30,6 @@ - LDADD = $(DEPS_LIBS) - - #Add extra debug info for gdb --AM_CFLAGS = -ggdb - - # libnfdump sources - output = output_util.h output_util.c output_raw.h output_raw.c diff --git a/net-analyzer/nfdump/metadata.xml b/net-analyzer/nfdump/metadata.xml index f785b8973856..932e8bc7cc69 100644 --- a/net-analyzer/nfdump/metadata.xml +++ b/net-analyzer/nfdump/metadata.xml @@ -1,17 +1,23 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!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> <use> - <flag name="readpcap">Build nfcapd collector to read from pcap file instead ofnetwork data</flag> <flag name="ftconv">Build the flow-tools to nfdump converter</flag> + <flag name="jnat">Build nfudmp to support JunOS NAT event logging</flag> + <flag name="nfpcapd">Build nfpcapd collector to create netflow data from precollected pcap traffic</flag> <flag name="nfprofile">Build nfprofile used by NfSen</flag> <flag name="nftrack">Build nfprofile used by PortTracker</flag> + <flag name="nsel">Build nfudmp to support NSEL/NEL event data</flag> + <flag name="readpcap">Build nfcapd collector to read from pcap file instead ofnetwork data</flag> <flag name="sflow">Build sflow collector sfcpad</flag> </use> + <longdescription>nfdump is a toolset to collect and process netflow and sflow + data, sent from netflow/sflow compatible devices. The toolset supports + netflow v1, v5/v7,v9,IPFIX and SFLOW.</longdescription> <upstream> <remote-id type="sourceforge">nfdump</remote-id> <remote-id type="github">phaag/nfdump</remote-id> diff --git a/net-analyzer/nfdump/nfdump-1.6.19.ebuild b/net-analyzer/nfdump/nfdump-1.6.19.ebuild deleted file mode 100644 index 3c3245ff7c29..000000000000 --- a/net-analyzer/nfdump/nfdump-1.6.19.ebuild +++ /dev/null @@ -1,63 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit autotools - -DESCRIPTION="A set of tools to collect and process netflow data" -HOMEPAGE="https://github.com/phaag/nfdump" -SRC_URI="https://github.com/phaag/nfdump/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="BSD" -SLOT="0/1.6.15" -KEYWORDS="amd64 x86" -IUSE="debug ftconv nfprofile nftrack readpcap sflow static-libs" - -COMMON_DEPEND=" - app-arch/bzip2 - sys-libs/zlib - ftconv? ( sys-libs/zlib net-analyzer/flow-tools ) - nfprofile? ( net-analyzer/rrdtool ) - nftrack? ( net-analyzer/rrdtool ) - readpcap? ( net-libs/libpcap ) -" -DEPEND=" - ${COMMON_DEPEND} - app-doc/doxygen - sys-devel/flex - virtual/yacc -" -RDEPEND=" - ${COMMON_DEPEND} - dev-lang/perl -" -PATCHES=( - "${FILESDIR}"/${PN}-1.6.19-compiler.patch - "${FILESDIR}"/${PN}-1.6.19-libft.patch -) -DOCS=( AUTHORS ChangeLog README.md ) - -src_prepare() { - default - - eautoreconf - - doxygen -u doc/Doxyfile.in || die -} - -src_configure() { - # --without-ftconf is not handled well #322201 - econf \ - $(use ftconv && echo "--enable-ftconv --with-ftpath=/usr") \ - $(use nfprofile && echo --enable-nfprofile) \ - $(use nftrack && echo --enable-nftrack) \ - $(use_enable debug devel) \ - $(use_enable readpcap) \ - $(use_enable sflow) \ - $(use_enable static-libs static) -} - -src_install() { - default - find "${ED}" -name '*.la' -delete || die -} diff --git a/net-analyzer/nfdump/nfdump-1.6.20.ebuild b/net-analyzer/nfdump/nfdump-1.6.20.ebuild deleted file mode 100644 index d866f89da5b1..000000000000 --- a/net-analyzer/nfdump/nfdump-1.6.20.ebuild +++ /dev/null @@ -1,63 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit autotools - -DESCRIPTION="A set of tools to collect and process netflow data" -HOMEPAGE="https://github.com/phaag/nfdump" -SRC_URI="https://github.com/phaag/nfdump/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="BSD" -SLOT="0/1.6.15" -KEYWORDS="~amd64 ~x86" -IUSE="debug ftconv nfprofile nftrack readpcap sflow static-libs" - -COMMON_DEPEND=" - app-arch/bzip2 - sys-libs/zlib - ftconv? ( sys-libs/zlib net-analyzer/flow-tools ) - nfprofile? ( net-analyzer/rrdtool ) - nftrack? ( net-analyzer/rrdtool ) - readpcap? ( net-libs/libpcap ) -" -DEPEND=" - ${COMMON_DEPEND} - app-doc/doxygen - sys-devel/flex - virtual/yacc -" -RDEPEND=" - ${COMMON_DEPEND} - dev-lang/perl -" -PATCHES=( - "${FILESDIR}"/${PN}-1.6.19-compiler.patch - "${FILESDIR}"/${PN}-1.6.19-libft.patch -) -DOCS=( AUTHORS ChangeLog README.md ) - -src_prepare() { - default - - eautoreconf - - doxygen -u doc/Doxyfile.in || die -} - -src_configure() { - # --without-ftconf is not handled well #322201 - econf \ - $(use ftconv && echo "--enable-ftconv --with-ftpath=/usr") \ - $(use nfprofile && echo --enable-nfprofile) \ - $(use nftrack && echo --enable-nftrack) \ - $(use_enable debug devel) \ - $(use_enable readpcap) \ - $(use_enable sflow) \ - $(use_enable static-libs static) -} - -src_install() { - default - find "${ED}" -name '*.la' -delete || die -} diff --git a/net-analyzer/nfdump/nfdump-1.6.21.ebuild b/net-analyzer/nfdump/nfdump-1.6.21.ebuild deleted file mode 100644 index 4c59fb92baec..000000000000 --- a/net-analyzer/nfdump/nfdump-1.6.21.ebuild +++ /dev/null @@ -1,71 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit autotools - -DESCRIPTION="A set of tools to collect and process netflow data" -HOMEPAGE="https://github.com/phaag/nfdump" -SRC_URI="https://github.com/phaag/nfdump/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="BSD" -SLOT="0/1.6.15" -KEYWORDS="~amd64 ~x86" -IUSE="debug doc ftconv nfprofile nftrack readpcap sflow static-libs" - -COMMON_DEPEND=" - app-arch/bzip2 - sys-libs/zlib - ftconv? ( sys-libs/zlib net-analyzer/flow-tools ) - nfprofile? ( net-analyzer/rrdtool ) - nftrack? ( net-analyzer/rrdtool ) - readpcap? ( net-libs/libpcap ) -" -DEPEND=" - ${COMMON_DEPEND} -" -BDEPEND=" - sys-devel/flex - virtual/yacc - doc? ( app-doc/doxygen ) -" -RDEPEND=" - ${COMMON_DEPEND} -" -PATCHES=( - "${FILESDIR}"/${PN}-1.6.19-compiler.patch - "${FILESDIR}"/${PN}-1.6.19-libft.patch -) -DOCS=( AUTHORS ChangeLog README.md ) - -src_prepare() { - default - - eautoreconf - - if use doc; then - doxygen -u doc/Doxyfile.in || die - fi -} - -src_configure() { - # --without-ftconf is not handled well #322201 - econf \ - $(use ftconv && echo "--enable-ftconv --with-ftpath=/usr") \ - $(use nfprofile && echo --enable-nfprofile) \ - $(use nftrack && echo --enable-nftrack) \ - $(use_enable debug devel) \ - $(use_enable readpcap) \ - $(use_enable sflow) \ - $(use_enable static-libs static) -} - -src_install() { - default - - find "${ED}" -name '*.la' -delete || die - - if use doc; then - dodoc -r doc/html - fi -} diff --git a/net-analyzer/nfdump/nfdump-1.7.2.ebuild b/net-analyzer/nfdump/nfdump-1.7.2.ebuild new file mode 100644 index 000000000000..140aa13598bb --- /dev/null +++ b/net-analyzer/nfdump/nfdump-1.7.2.ebuild @@ -0,0 +1,85 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools flag-o-matic toolchain-funcs + +DESCRIPTION="A set of tools to collect and process netflow data" +HOMEPAGE="https://github.com/phaag/nfdump" +SRC_URI="https://github.com/phaag/nfdump/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="BSD" +SLOT="0/${PV}" +KEYWORDS="amd64 x86" +IUSE="debug doc jnat ftconv nfpcapd nfprofile nftrack nsel readpcap sflow" + +REQUIRED_USE="?? ( jnat nsel )" + +RDEPEND=" + app-arch/bzip2 + sys-libs/zlib + elibc_musl? ( sys-libs/fts-standalone ) + ftconv? ( net-analyzer/flow-tools ) + nfpcapd? ( net-libs/libpcap ) + nfprofile? ( net-analyzer/rrdtool ) + nftrack? ( net-analyzer/rrdtool ) + readpcap? ( net-libs/libpcap ) +" +DEPEND="${RDEPEND}" +BDEPEND=" + app-alternatives/lex + app-alternatives/yacc + doc? ( + app-text/doxygen + media-gfx/graphviz + ) +" + +PATCHES=( + "${FILESDIR}"/${PN}-1.6.19-libft.patch +) + +DOCS=( AUTHORS ChangeLog README.md ) + +src_prepare() { + default + + eautoreconf + + if use doc; then + doxygen -u doc/Doxyfile.in || die + fi +} + +src_configure() { + tc-export CC + + # bug #853763 + use elibc_musl && append-libs "-lfts" + + # --without-ftconf is not handled well, bug #322201 + econf \ + $(use ftconv && echo "--enable-ftconv --with-ftpath=/usr") \ + $(use nfpcapd && echo --enable-nfpcapd) \ + $(use nfprofile && echo --enable-nfprofile) \ + $(use nftrack && echo --enable-nftrack) \ + $(use_enable debug devel) \ + $(use_enable jnat) \ + $(use_enable nsel) \ + $(use_enable readpcap) \ + $(use_enable sflow) +} + +src_install() { + default + + find "${ED}" -name '*.la' -delete || die + + newinitd "${FILESDIR}"/nfcapd.initd nfcapd + newconfd "${FILESDIR}"/nfcapd.confd nfcapd + + if use doc; then + dodoc -r doc/html + fi +} diff --git a/net-analyzer/ngrep/files/ngrep-1.47-clang16.patch b/net-analyzer/ngrep/files/ngrep-1.47-clang16.patch new file mode 100644 index 000000000000..eb3758e8db2b --- /dev/null +++ b/net-analyzer/ngrep/files/ngrep-1.47-clang16.patch @@ -0,0 +1,30 @@ +https://github.com/jpr5/ngrep/pull/28 + +From 52515bae377f221b5473d9040f5f43ab1c672672 Mon Sep 17 00:00:00 2001 +From: Florian Weimer <fweimer@redhat.com> +Date: Mon, 19 Dec 2022 11:49:06 +0100 +Subject: [PATCH] Include <err.h> and "tcpkill.h" to avoid implicit function + declarations + +Implicit function declarations are a historic language feature that +were removed from C in 1999. +--- a/ngrep.c ++++ b/ngrep.c +@@ -98,6 +98,7 @@ + #endif + + #include "ngrep.h" ++#include "tcpkill.h" + + + /* +--- a/tcpkill.c ++++ b/tcpkill.c +@@ -14,6 +14,7 @@ + #include <stdlib.h> + #include <unistd.h> + #include <string.h> ++#include <err.h> + #include <libnet.h> + #include <pcap.h> + diff --git a/net-analyzer/ngrep/metadata.xml b/net-analyzer/ngrep/metadata.xml index a8fcd8f42981..51aab562d737 100644 --- a/net-analyzer/ngrep/metadata.xml +++ b/net-analyzer/ngrep/metadata.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> + <maintainer type="person" proxied="yes"> <email>jpr5+gentoo@darkridge.com</email> <name>Jordan Ritter</name> <description>Program author who would like to be notified of bugs</description> @@ -10,11 +10,12 @@ <email>netmon@gentoo.org</email> <name>Gentoo network monitoring and analysis project</name> </maintainer> - <maintainer type="project"> + <maintainer type="project" proxied="proxy"> <email>proxy-maint@gentoo.org</email> <name>Proxy Maintainers</name> </maintainer> <upstream> <remote-id type="sourceforge">ngrep</remote-id> + <remote-id type="github">jpr5/ngrep</remote-id> </upstream> </pkgmetadata> diff --git a/net-analyzer/ngrep/ngrep-1.47-r2.ebuild b/net-analyzer/ngrep/ngrep-1.47-r2.ebuild new file mode 100644 index 000000000000..ccfd27b71f07 --- /dev/null +++ b/net-analyzer/ngrep/ngrep-1.47-r2.ebuild @@ -0,0 +1,57 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools + +DESCRIPTION="A grep for network layers" +HOMEPAGE="https://github.com/jpr5/ngrep" +SRC_URI="https://github.com/jpr5/ngrep/archive/V${PV/./_}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/${P/./_}" + +LICENSE="ngrep" +SLOT="0" +KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" +IUSE="ipv6" + +DEPEND=" + dev-libs/libpcre + net-libs/libpcap +" + +RDEPEND=" + ${DEPEND} + acct-group/ngrep + acct-user/ngrep +" + +PATCHES=( + "${FILESDIR}"/${PN}-1.47-regex.patch + "${FILESDIR}"/${PN}-1.47-clang16.patch +) + +src_prepare() { + default + + sed -i -e "s:configure.in:configure.ac:" regex*/{configure.in,Makefile.in} || die + + eautoreconf +} + +src_configure() { + local myeconfargs=( + $(use_enable ipv6) + --disable-pcap-restart + --enable-pcre + --with-dropprivs-user=ngrep + --with-pcap-includes="${EPREFIX}"/usr/include/pcap + ) + + econf "${myeconfargs[@]}" +} + +src_compile() { + emake -C regex-0.12 + emake STRIPFLAG="${CFLAGS}" +} diff --git a/net-analyzer/ngrep/ngrep-1.47.ebuild b/net-analyzer/ngrep/ngrep-1.47.ebuild deleted file mode 100644 index 6ca8a342aa3a..000000000000 --- a/net-analyzer/ngrep/ngrep-1.47.ebuild +++ /dev/null @@ -1,55 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit autotools user - -DESCRIPTION="A grep for network layers" -HOMEPAGE="https://github.com/jpr5/ngrep" -SRC_URI="https://github.com/jpr5/ngrep/archive/V${PV/./_}.tar.gz -> ${P}.tar.gz" - -LICENSE="ngrep" -SLOT="0" -KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" -IUSE="ipv6" - -DEPEND=" - dev-libs/libpcre - net-libs/libpcap -" -RDEPEND=" - ${DEPEND} -" -DOCS=( - CHANGES - CREDITS - README.md -) -S=${WORKDIR}/${P/./_} -PATCHES=( - "${FILESDIR}"/${PN}-1.47-regex.patch -) - -src_prepare() { - default - eautoreconf -} - -src_configure() { - econf \ - $(use_enable ipv6) \ - --disable-pcap-restart \ - --enable-pcre \ - --with-dropprivs-user=ngrep \ - --with-pcap-includes="${EPREFIX}"/usr/include/pcap -} - -src_compile() { - emake -C regex-0.12 - emake STRIPFLAG="${CFLAGS}" -} - -pkg_preinst() { - enewgroup ngrep - enewuser ngrep -1 -1 -1 ngrep -} diff --git a/net-analyzer/nikto/Manifest b/net-analyzer/nikto/Manifest index be93f585da68..c0a859172b2f 100644 --- a/net-analyzer/nikto/Manifest +++ b/net-analyzer/nikto/Manifest @@ -1 +1,2 @@ -DIST nikto-2.1.6_p20200901.tar.gz 521285 BLAKE2B 243f0baf5835e5586b8270fc9dd1005c08e903f478666359c34bb0d30c0645f5ab9a19109718dbbd2f6015dcb64c3a98b832b5412c9151720dedd102fb1936d1 SHA512 88b9e681ce4588e3473f90c93ea41d46fc99a54b895185465cfe1a28152ad944edbadfcf5cee4540b4ec48eb78ca73a1952637c3da9038e52d837c0de5d0260c +DIST nikto-2.1.6_p20220602.tar.gz 455528 BLAKE2B 71094c786b274069eb17aac7d367bdc8535c7730afde7c7bf36d40719e2799561eb31ad9cc09ee39c47101880795eee0f1c46ca51c00644cdc23916033cc5f7e SHA512 5c8ce194951c10b8a5f4299e088928022193aa8ae7ed4fb6b9be76bcf03a405d776d6e30274f997ad9eeb95c012c7e09b6dec7cbecbe0ab4049e5d15529ae814 +DIST nikto-2.5.0.tar.gz 435886 BLAKE2B 66e3aaab87f031daeade1a46afce5f02b296a75a542c1f781140fa9e2a2b98c7a0051f0920cd109e35684c14e4137a59ac7f26a10d98dcaf663424ee1f5e10af SHA512 8561c048b2db9b91a53f389097f6f47b06b51d0bbb06d945a26463067a1b2192ae6ad086e8f14e8775827fa8075dabfff66df8c3f79915b7a2d4eaefb09894de diff --git a/net-analyzer/nikto/metadata.xml b/net-analyzer/nikto/metadata.xml index 91f5940d4d0a..80c4aed49624 100644 --- a/net-analyzer/nikto/metadata.xml +++ b/net-analyzer/nikto/metadata.xml @@ -1,12 +1,15 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> + <maintainer type="person" proxied="yes"> <email>gentoo@retornaz.com</email> <name>Quentin Retornaz</name> </maintainer> - <maintainer type="project"> + <maintainer type="project" proxied="proxy"> <email>proxy-maint@gentoo.org</email> <name>Proxy Maintainers</name> </maintainer> + <upstream> + <remote-id type="github">sullo/nikto</remote-id> + </upstream> </pkgmetadata> diff --git a/net-analyzer/nikto/nikto-2.1.6_p20200901.ebuild b/net-analyzer/nikto/nikto-2.1.6_p20200901.ebuild deleted file mode 100644 index 1a807b7834ea..000000000000 --- a/net-analyzer/nikto/nikto-2.1.6_p20200901.ebuild +++ /dev/null @@ -1,46 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DESCRIPTION="Web server vulnerability scanner" -HOMEPAGE="https://www.cirt.net/Nikto2" -COMMIT="fb2655b8316097723d4977c792817a21117b2736" -MY_P="${PN}-${COMMIT}" -SRC_URI="https://github.com/sullo/nikto/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux" - -# nikto provides its own libwhisker, do no use net-libs/libwhisker[ssl] -# https://bugs.gentoo.org/533900 -RDEPEND=" - dev-lang/perl - dev-perl/Net-SSLeay - net-analyzer/nmap - virtual/perl-JSON-PP -" - -S="${WORKDIR}/${MY_P}/program" - -src_prepare() { - sed -i -e 's:/etc/nikto.conf:/etc/nikto/nikto.conf:' nikto.pl || die - sed -i -e 's:# EXECDIR=/opt/nikto:EXECDIR=/usr/share/nikto:' nikto.conf.default || die - - default -} - -src_install() { - insinto /etc/nikto - newins nikto.conf.default nikto.conf - - dobin nikto.pl replay.pl - dosym nikto.pl /usr/bin/nikto - - insinto /usr/share/nikto - doins -r plugins templates databases - - dodoc docs/*.txt - dodoc docs/nikto_manual.html -} diff --git a/net-analyzer/nikto/nikto-2.1.6_p20220602.ebuild b/net-analyzer/nikto/nikto-2.1.6_p20220602.ebuild new file mode 100644 index 000000000000..c5fef7c17092 --- /dev/null +++ b/net-analyzer/nikto/nikto-2.1.6_p20220602.ebuild @@ -0,0 +1,47 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DESCRIPTION="Web server vulnerability scanner" +HOMEPAGE="https://www.cirt.net/Nikto2" +COMMIT="dc98b86d3860ea18d82b5a427ab7abcd57e01552" +MY_P="${PN}-${COMMIT}" +SRC_URI="https://github.com/sullo/nikto/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux" + +# nikto provides its own libwhisker, do no use net-libs/libwhisker[ssl] +# https://bugs.gentoo.org/533900 +RDEPEND=" + dev-lang/perl + dev-perl/Net-SSLeay + net-analyzer/nmap + virtual/perl-JSON-PP +" + +S="${WORKDIR}/${MY_P}/program" + +src_prepare() { + sed -i -e 's:/etc/nikto.conf:/etc/nikto/nikto.conf:' nikto.pl || die + sed -i -e 's:# EXECDIR=/opt/nikto:EXECDIR=/usr/share/nikto:' nikto.conf.default || die + + default +} + +src_install() { + insinto /etc/nikto + newins nikto.conf.default nikto.conf + + dobin nikto.pl replay.pl + dosym nikto.pl /usr/bin/nikto + + insinto /usr/share/nikto + doins -r plugins templates databases + + dodoc docs/nikto_manual.html + dodoc docs/nikto_schema.sql + doman docs/nikto.1 +} diff --git a/net-analyzer/nikto/nikto-2.5.0.ebuild b/net-analyzer/nikto/nikto-2.5.0.ebuild new file mode 100644 index 000000000000..e7bb2ea3e968 --- /dev/null +++ b/net-analyzer/nikto/nikto-2.5.0.ebuild @@ -0,0 +1,45 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DESCRIPTION="Web server vulnerability scanner" +HOMEPAGE="https://www.cirt.net/Nikto2" +SRC_URI="https://github.com/sullo/nikto/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux" + +# nikto provides its own libwhisker, do no use net-libs/libwhisker[ssl] +# https://bugs.gentoo.org/533900 +RDEPEND=" + dev-lang/perl + dev-perl/Net-SSLeay + net-analyzer/nmap + virtual/perl-JSON-PP +" + +S="${WORKDIR}/${P}/program" + +src_prepare() { + sed -i -e 's:/etc/nikto.conf:/etc/nikto/nikto.conf:' nikto.pl || die + sed -i -e 's:# EXECDIR=/opt/nikto:EXECDIR=/usr/share/nikto:' nikto.conf.default || die + + default +} + +src_install() { + insinto /etc/nikto + newins nikto.conf.default nikto.conf + + dobin nikto.pl replay.pl + dosym nikto.pl /usr/bin/nikto + + insinto /usr/share/nikto + doins -r plugins templates databases + + doman docs/nikto.1 + dodoc docs/nikto.dtd + dodoc docs/nikto_schema.sql +} diff --git a/net-analyzer/nipper/metadata.xml b/net-analyzer/nipper/metadata.xml index fb98633af89b..5750c1f52ca0 100644 --- a/net-analyzer/nipper/metadata.xml +++ b/net-analyzer/nipper/metadata.xml @@ -1,10 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>ikelos@gentoo.org</email> - <name>Mike Auty</name> - </maintainer> + <!-- maintainer-needed --> <upstream> <remote-id type="sourceforge">nipper</remote-id> </upstream> diff --git a/net-analyzer/nipper/nipper-0.12.0.ebuild b/net-analyzer/nipper/nipper-0.12.0.ebuild index 534146bbe3d1..cb8d8c2c8668 100644 --- a/net-analyzer/nipper/nipper-0.12.0.ebuild +++ b/net-analyzer/nipper/nipper-0.12.0.ebuild @@ -1,21 +1,20 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 + +inherit cmake MY_P="${PN}-cli-${PV}" -inherit cmake-utils DESCRIPTION="Router configuration security analysis tool" HOMEPAGE="http://nipper.titania.co.uk/" SRC_URI="mirror://sourceforge/nipper/${MY_P}.tgz" +S="${WORKDIR}/${MY_P}" LICENSE="GPL-3" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="" DEPEND=">=net-libs/libnipper-0.12" RDEPEND="${DEPEND}" - -S=${WORKDIR}/${MY_P} diff --git a/net-analyzer/nload/Manifest b/net-analyzer/nload/Manifest index ccef984f664b..492a7ee2de73 100644 --- a/net-analyzer/nload/Manifest +++ b/net-analyzer/nload/Manifest @@ -1 +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/files/nload-0.7.5_pre-Makefile-spec-don-t-compress-man-page.patch b/net-analyzer/nload/files/nload-0.7.5_pre-Makefile-spec-don-t-compress-man-page.patch new file mode 100644 index 000000000000..ff97f7004f94 --- /dev/null +++ b/net-analyzer/nload/files/nload-0.7.5_pre-Makefile-spec-don-t-compress-man-page.patch @@ -0,0 +1,63 @@ +Upstream: https://github.com/rolandriegel/nload/pull/4 + +From 096df0d1282a8c8c535e730d28fe281ea290b58d 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 +--- + 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 706636e..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_builddir)/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 794e5e7..29ab486 100644 +--- a/nload.spec.in ++++ b/nload.spec.in +@@ -41,7 +41,7 @@ rm -rf %{buildroot} + %defattr(-,root,root) + %doc AUTHORS COPYING ChangeLog README.md + %attr(0755,root,root) %{_bindir}/%{name} +-%{_mandir}/man1/%{name}.1.gz ++%{_mandir}/man1/%{name}.1* + + + %changelog +-- +2.43.0 + diff --git a/net-analyzer/nload/files/nload-0.7.5_pre-tinfo.patch b/net-analyzer/nload/files/nload-0.7.5_pre-tinfo.patch new file mode 100644 index 000000000000..caf67cc76b8e --- /dev/null +++ b/net-analyzer/nload/files/nload-0.7.5_pre-tinfo.patch @@ -0,0 +1,10 @@ +--- a/configure.ac ++++ b/configure.ac +@@ -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/metadata.xml b/net-analyzer/nload/metadata.xml index 8e9e21d02085..501eefa5b6cf 100644 --- a/net-analyzer/nload/metadata.xml +++ b/net-analyzer/nload/metadata.xml @@ -1,16 +1,19 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>ahippo@yandex.ru</email> + <maintainer type="person" proxied="yes"> + <email>ahipp0@pm.me</email> <name>Andrey Mazo</name> </maintainer> <maintainer type="project"> <email>netmon@gentoo.org</email> <name>Gentoo network monitoring and analysis project</name> </maintainer> - <maintainer type="project"> + <maintainer type="project" proxied="proxy"> <email>proxy-maint@gentoo.org</email> <name>Proxy Maintainers</name> </maintainer> + <upstream> + <remote-id type="github">rolandriegel/nload</remote-id> + </upstream> </pkgmetadata> 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 new file mode 100644 index 000000000000..0764502dec28 --- /dev/null +++ b/net-analyzer/nload/nload-0.7.5_pre20180309.ebuild @@ -0,0 +1,36 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools + +GIT_REV="8f92dc04fad283abdd2a4538cd4c2093d957d9da" + +DESCRIPTION="Real time network traffic monitor for the command line interface" +HOMEPAGE="http://www.roland-riegel.de/nload/index.html https://github.com/rolandriegel/nload" +SRC_URI="https://github.com/rolandriegel/nload/archive/${GIT_REV}.tar.gz -> ${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}"/${PN}-0.7.5_pre-tinfo.patch + "${FILESDIR}"/${PN}-0.7.5_pre-Makefile-spec-don-t-compress-man-page.patch +) + +S="${WORKDIR}/${PN}-${GIT_REV}" + +src_prepare() { + default + sed -i \ + -e "/AC_INIT/ s/0\.7\.4/${PV} (Gentoo)/" \ + configure.ac \ + || die "Failed to patch configure.ac" + eautoreconf +} diff --git a/net-analyzer/nmap/Manifest b/net-analyzer/nmap/Manifest index 5451f0f7941c..49124d2a35a6 100644 --- a/net-analyzer/nmap/Manifest +++ b/net-analyzer/nmap/Manifest @@ -1,2 +1,4 @@ -DIST nmap-7.80.tar.bz2 10550327 BLAKE2B 513a5589f4dd72660d290cc03b8130da2c41e4620c5a82e125e4345259b8d0f6efa8bceef47d3c0d2b5b588888b716070e05105a09b0185622aed9268715ae2c SHA512 d4384d3ebf4f3abf3588eed5433f733874ecdceb9342a718dc36db19634b0cc819d73399974eb0a9a9c9dd9e5c88473e07644ec91db28b0c072552b54430be6b -DIST nmap-7.91.tar.bz2 10503500 BLAKE2B a758e0a20f8243b33b000c23e025b87bdb712390b82982a1aca219c9b98cd55c6ababb810328c7d0cdb5c884ef9bd5b187b9e4929454278342d7ee5ef441cded SHA512 9d59f031b5f748311e9f9a0b9d05ad4a7a70fc6ac17598d7c4c81a4825c95d53817d74435d839e67b9379a052f2d37889fd634f9c75301a851f465d60fb9974d +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 diff --git a/net-analyzer/nmap/files/nmap-5.10_beta1-string.patch b/net-analyzer/nmap/files/nmap-5.10_beta1-string.patch deleted file mode 100644 index df29db3782d5..000000000000 --- a/net-analyzer/nmap/files/nmap-5.10_beta1-string.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- nmap-5.10BETA1/Target.h.org 2009-12-08 08:21:59.000000000 +0100 -+++ nmap-5.10BETA1/Target.h 2009-12-08 08:22:02.000000000 +0100 -@@ -99,6 +99,8 @@ - - #ifndef NOLUA - #include "nse_main.h" -+#else -+#include <string> - #endif - - #include "portreasons.h" diff --git a/net-analyzer/nmap/files/nmap-5.21-python.patch b/net-analyzer/nmap/files/nmap-5.21-python.patch deleted file mode 100644 index aa0d4f9db953..000000000000 --- a/net-analyzer/nmap/files/nmap-5.21-python.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -Naurp nmap-5.21-orig/Makefile.in nmap-5.21/Makefile.in ---- nmap-5.21-orig/Makefile.in 2010-01-31 09:53:53.000000000 +0100 -+++ nmap-5.21/Makefile.in 2010-01-31 09:54:48.000000000 +0100 -@@ -253,7 +253,7 @@ build-zenmap: $(ZENMAPDIR)/setup.py $(ZE - - install-zenmap: $(ZENMAPDIR)/setup.py - $(INSTALL) -d $(DESTDIR)$(bindir) $(DESTDIR)$(mandir)/man1 -- cd $(ZENMAPDIR) && $(PYTHON) setup.py --quiet install --prefix "$(prefix)" --force $(if $(DESTDIR),--root "$(DESTDIR)") -+ cd $(ZENMAPDIR) && $(PYTHON) setup.py --quiet install --prefix "$(prefix)" --force $(if $(DESTDIR),--root "$(DESTDIR)") --no-compile - $(INSTALL) -c -m 644 docs/zenmap.1 $(DESTDIR)$(mandir)/man1/ - # Create a symlink from nmapfe to zenmap if nmapfe doesn't exist or is - # already a link. -@@ -267,7 +267,7 @@ build-ndiff: - cd $(NDIFFDIR) && $(PYTHON) setup.py build $(if $(DESTDIR),--executable "$(DEFAULT_PYTHON_PATH)") - - install-ndiff: -- cd $(NDIFFDIR) && $(PYTHON) setup.py install --prefix "$(prefix)" $(if $(DESTDIR),--root "$(DESTDIR)") -+ cd $(NDIFFDIR) && $(PYTHON) setup.py install --prefix "$(prefix)" $(if $(DESTDIR),--root "$(DESTDIR)") --no-compile - - NSE_FILES = scripts/script.db scripts/*.nse - NSE_LIB_LUA_FILES = nselib/*.lua diff --git a/net-analyzer/nmap/files/nmap-6.25-liblua-ar.patch b/net-analyzer/nmap/files/nmap-6.25-liblua-ar.patch deleted file mode 100644 index 5aa9fa7f631c..000000000000 --- a/net-analyzer/nmap/files/nmap-6.25-liblua-ar.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- a/liblua/Makefile -+++ b/liblua/Makefile -@@ -11,7 +11,7 @@ - LDFLAGS= $(SYSLDFLAGS) $(MYLDFLAGS) - LIBS= -lm $(SYSLIBS) $(MYLIBS) - --AR= ar rcu -+AR= ar - RANLIB= ranlib - RM= rm -f - -@@ -56,7 +56,7 @@ - a: $(ALL_A) - - $(LUA_A): $(BASE_O) -- $(AR) $@ $(BASE_O) -+ $(AR) rcu $@ $(BASE_O) - $(RANLIB) $@ - - $(LUA_T): $(LUA_O) $(LUA_A) diff --git a/net-analyzer/nmap/files/nmap-6.46-uninstaller.patch b/net-analyzer/nmap/files/nmap-6.46-uninstaller.patch deleted file mode 100644 index 6b43f8f5a069..000000000000 --- a/net-analyzer/nmap/files/nmap-6.46-uninstaller.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- a/zenmap/setup.py -+++ b/zenmap/setup.py -@@ -245,7 +245,6 @@ - self.set_perms() - self.set_modules_path() - self.fix_paths() -- self.create_uninstaller() - self.write_installed_files() - - def get_installed_files(self): -@@ -263,8 +262,6 @@ - os.path.join(self.install_data, data_dir)): - for dir in dirs: - installed_files.append(os.path.join(dirpath, dir)) -- installed_files.append( -- os.path.join(self.install_scripts, "uninstall_" + APP_NAME)) - return installed_files - - def create_uninstaller(self): diff --git a/net-analyzer/nmap/files/nmap-7.25-CXXFLAGS.patch b/net-analyzer/nmap/files/nmap-7.25-CXXFLAGS.patch deleted file mode 100644 index 91caad1a6734..000000000000 --- a/net-analyzer/nmap/files/nmap-7.25-CXXFLAGS.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/Makefile.in -+++ b/Makefile.in -@@ -477,7 +477,7 @@ - ./docs/style/lua-format -i scripts/*.nse - - makefile.dep: -- $(CXX) -MM $(CPPFLAGS) $(SRCS) > $@ -+ $(CXX) -MM $(CPPFLAGS) $(CXXFLAGS) $(SRCS) > $@ - -include makefile.dep - - # These the old names of scripts that have been renamed or deleted. Any diff --git a/net-analyzer/nmap/files/nmap-7.25-libpcre.patch b/net-analyzer/nmap/files/nmap-7.25-libpcre.patch deleted file mode 100644 index 9296dab7da7b..000000000000 --- a/net-analyzer/nmap/files/nmap-7.25-libpcre.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/configure.ac -+++ b/configure.ac -@@ -522,7 +522,6 @@ - - # If we still don't have it, we use our own - if test $have_pcre != yes ; then -- AC_CONFIG_SUBDIRS( libpcre ) - CPPFLAGS="-I\$(top_srcdir)/$LIBPCREDIR $CPPFLAGS" - LIBPCRE_LIBS="$LIBPCREDIR/libpcre.a" - PCRE_BUILD="build-pcre" diff --git a/net-analyzer/nmap/files/nmap-7.25-no-FORTIFY_SOURCE.patch b/net-analyzer/nmap/files/nmap-7.25-no-FORTIFY_SOURCE.patch deleted file mode 100644 index 85594038bf6f..000000000000 --- a/net-analyzer/nmap/files/nmap-7.25-no-FORTIFY_SOURCE.patch +++ /dev/null @@ -1,77 +0,0 @@ ---- a/nbase/Makefile.in -+++ b/nbase/Makefile.in -@@ -12,7 +12,7 @@ - CCOPT = - DEFS = @DEFS@ - # With GCC, add extra security checks to source code. --DEFS += -D_FORTIFY_SOURCE=2 -+DEFS += - CPPFLAGS = @CPPFLAGS@ - CFLAGS = @CFLAGS@ $(CCOPT) $(GLIB_CFLAGS) $(DEFS) $(INCLS) - STATIC = ---- a/ncat/Makefile.in -+++ b/ncat/Makefile.in -@@ -53,7 +53,7 @@ - LIBS = @LIBS@ - DEFS = @DEFS@ -DNCAT_DATADIR="\"$(pkgdatadir)\"" - # With GCC, add extra security checks to source code. --DEFS += -D_FORTIFY_SOURCE=2 -+DEFS += - INCLS = -I. -I.. -I../nsock/include/ -I$(NBASEDIR) - RM = rm -f - STRIP = @STRIP@ ---- a/nsock/src/Makefile.in -+++ b/nsock/src/Makefile.in -@@ -13,7 +13,7 @@ - CCOPT = - DEFS = @DEFS@ -DNSOCK_VERSION=\"$(NSOCK_VERSION)\" - # With GCC, add extra security checks to source code. --DEFS += -D_FORTIFY_SOURCE=2 -+DEFS += - INCLS = -I../include - CFLAGS = @CFLAGS@ $(CCOPT) - # CFLAGS = -g -Wall $(DEFS) $(INCLS) ---- a/libnetutil/Makefile.in -+++ b/libnetutil/Makefile.in -@@ -5,7 +5,7 @@ - CXXFLAGS = @CXXFLAGS@ - CPPFLAGS = @CPPFLAGS@ $(DEFS) - DEFS = @DEFS@ --DEFS += -D_FORTIFY_SOURCE=2 -+DEFS += - AR = ar - RANLIB = @RANLIB@ - ---- a/Makefile.in -+++ b/Makefile.in -@@ -41,7 +41,7 @@ - # http://gcc.gnu.org/ml/gcc-patches/2004-09/msg02055.html - # Level 1 only makes changes that don't affect "conforming" programs, - # while level 2 enforces additional restrictions. --DEFS += -D_FORTIFY_SOURCE=2 -+DEFS += - # For mtrace debugging -- see MTRACE define in main.cc for instructions - # Should only be enabled during debugging and not in any real release. - # DEFS += -DMTRACE=1 ---- a/nping/Makefile.in -+++ b/nping/Makefile.in -@@ -38,7 +38,7 @@ - # http://gcc.gnu.org/ml/gcc-patches/2004-09/msg02055.html - # Level 1 only makes changes that don't affect "conforming" programs, - # while level 2 enforces additional restrictions. --DEFS += -D_FORTIFY_SOURCE=2 -+DEFS += - # For mtrace debugging -- see MTRACE define in main.cc for instructions - # Should only be enabled during debugging and not in any real release. - # DEFS += -DMTRACE=1 ---- a/nmap-update/Makefile.in -+++ b/nmap-update/Makefile.in -@@ -12,7 +12,7 @@ - LDFLAGS = @LDFLAGS@ - MAC_FLAGS = - LIBS = @LIBS@ $(NBASELIB) $(MAC_FLAGS) --DEFS = @DEFS@ -D_FORTIFY_SOURCE=2 -+DEFS = @DEFS@ - APR_LIBS = @APR_LIBS@ - SVN_LIBS = @SVN_LIBS@ - diff --git a/net-analyzer/nmap/files/nmap-7.31-libnl.patch b/net-analyzer/nmap/files/nmap-7.31-libnl.patch deleted file mode 100644 index c16d8291ea3b..000000000000 --- a/net-analyzer/nmap/files/nmap-7.31-libnl.patch +++ /dev/null @@ -1,15 +0,0 @@ -nping does not call anything nl_* related so it should not link against libnl (bug #529244) -Patching configure.ac would be best but eautoreconf does not handle the subdirs very well. - ---- a/nping/configure.ac -+++ b/nping/configure.ac -@@ -114,9 +114,6 @@ - # OpenSSL and NSE C modules can require dlopen - AC_SEARCH_LIBS(dlopen, dl) - --# libpcap can require libnl --AC_SEARCH_LIBS(nl_handle_alloc, nl) -- - # We test whether they specified openssl desires explicitly - use_openssl="yes" - specialssldir="" diff --git a/net-analyzer/nmap/files/nmap-7.80-ac-config-subdirs.patch b/net-analyzer/nmap/files/nmap-7.80-ac-config-subdirs.patch deleted file mode 100644 index 583f7f1d1aa3..000000000000 --- a/net-analyzer/nmap/files/nmap-7.80-ac-config-subdirs.patch +++ /dev/null @@ -1,26 +0,0 @@ ---- a/configure.ac -+++ b/configure.ac -@@ -468,7 +468,6 @@ - fi - - if test $have_libpcap != yes; then -- AC_CONFIG_SUBDIRS(libpcap) - if test "${LIBPCAP_INC+set}" = "set"; then - CPPFLAGS="$CPPFLAGS -I$LIBPCAP_INC" - else -@@ -611,7 +610,6 @@ - fi - - if test $have_libz != yes; then -- AC_CONFIG_SUBDIRS(libz) - # TODO: This doesn't work because libssh2's configure script is looking for - # already-built libs. Giving up for now: build libz first or install - # headers/libs on your own if you want compression support for SSH. -@@ -697,7 +695,6 @@ - # If we still don't have it, we use our own - if test $have_libssh2 != yes; then - have_libssh2=yes -- AC_CONFIG_SUBDIRS(libssh2) - CPPFLAGS="-I\$(top_srcdir)/$LIBSSH2DIR/include $CPPFLAGS" - LIBSSH2_LIBS="$LIBSSH2DIR/lib/libssh2.a" - LIBSSH2_BUILD="build-libssh2" diff --git a/net-analyzer/nmap/files/nmap-7.91-no-FORTIFY_SOURCE.patch b/net-analyzer/nmap/files/nmap-7.91-no-FORTIFY_SOURCE.patch deleted file mode 100644 index b4c06be942ed..000000000000 --- a/net-analyzer/nmap/files/nmap-7.91-no-FORTIFY_SOURCE.patch +++ /dev/null @@ -1,66 +0,0 @@ ---- a/nbase/Makefile.in -+++ b/nbase/Makefile.in -@@ -12,7 +12,7 @@ - CCOPT = - DEFS = @DEFS@ - # With GCC, add extra security checks to source code. --DEFS += -D_FORTIFY_SOURCE=2 -+DEFS += - CPPFLAGS = @CPPFLAGS@ - CFLAGS = @CFLAGS@ $(CCOPT) $(GLIB_CFLAGS) $(DEFS) $(INCLS) - STATIC = ---- a/ncat/Makefile.in -+++ b/ncat/Makefile.in -@@ -53,7 +53,7 @@ - LIBS = @LIBS@ - DEFS = @DEFS@ -DNCAT_DATADIR="\"$(pkgdatadir)\"" - # With GCC, add extra security checks to source code. --DEFS += -D_FORTIFY_SOURCE=2 -+DEFS += - INCLS = -I. -I.. -I../nsock/include/ -I$(NBASEDIR) - RM = rm -f - STRIP = @STRIP@ ---- a/nsock/src/Makefile.in -+++ b/nsock/src/Makefile.in -@@ -13,7 +13,7 @@ - CCOPT = - DEFS = @DEFS@ -DNSOCK_VERSION=\"$(NSOCK_VERSION)\" - # With GCC, add extra security checks to source code. --DEFS += -D_FORTIFY_SOURCE=2 -+DEFS += - INCLS = -I../include - CFLAGS = @CFLAGS@ $(CCOPT) - # CFLAGS = -g -Wall $(DEFS) $(INCLS) ---- a/libnetutil/Makefile.in -+++ b/libnetutil/Makefile.in -@@ -5,7 +5,7 @@ - CXXFLAGS = @CXXFLAGS@ - CPPFLAGS = @CPPFLAGS@ $(DEFS) - DEFS = @DEFS@ --DEFS += -D_FORTIFY_SOURCE=2 -+DEFS += - AR = ar - RANLIB = @RANLIB@ - ---- a/Makefile.in -+++ b/Makefile.in -@@ -41,7 +41,7 @@ - # http://gcc.gnu.org/ml/gcc-patches/2004-09/msg02055.html - # Level 1 only makes changes that don't affect "conforming" programs, - # while level 2 enforces additional restrictions. --DEFS += -D_FORTIFY_SOURCE=2 -+DEFS += - # For mtrace debugging -- see MTRACE define in main.cc for instructions - # Should only be enabled during debugging and not in any real release. - # DEFS += -DMTRACE=1 ---- a/nping/Makefile.in -+++ b/nping/Makefile.in -@@ -38,7 +38,7 @@ - # http://gcc.gnu.org/ml/gcc-patches/2004-09/msg02055.html - # Level 1 only makes changes that don't affect "conforming" programs, - # while level 2 enforces additional restrictions. --DEFS += -D_FORTIFY_SOURCE=2 -+DEFS += - # For mtrace debugging -- see MTRACE define in main.cc for instructions - # Should only be enabled during debugging and not in any real release. - # DEFS += -DMTRACE=1 diff --git a/net-analyzer/nmap/files/nmap-7.94-autoconf-2.72.patch b/net-analyzer/nmap/files/nmap-7.94-autoconf-2.72.patch new file mode 100644 index 000000000000..bf6affb516d0 --- /dev/null +++ b/net-analyzer/nmap/files/nmap-7.94-autoconf-2.72.patch @@ -0,0 +1,33 @@ +https://github.com/nmap/nmap/pull/2763 +https://bugs.gentoo.org/920712 +--- a/libdnet-stripped/config/acinclude.m4 ++++ b/libdnet-stripped/config/acinclude.m4 +@@ -201,6 +201,8 @@ + dnl + AC_DEFUN(AC_DNET_IOCTL_ARP, + [AC_MSG_CHECKING(for arp(7) ioctls) ++ AC_PROG_EGREP ++ AC_PROG_CPP + AC_CACHE_VAL(ac_cv_dnet_ioctl_arp, + AC_EGREP_CPP(werd, [ + # include <sys/types.h> +--- a/libdnet-stripped/configure.in ++++ b/libdnet-stripped/configure.in +@@ -211,7 +211,7 @@ + AC_REPLACE_FUNCS(err strlcpy strsep) + + dnl Checks for other system-specific jonks. +-if test "$CYGWIN" != yes ; then ++AS_IF([test "$CYGWIN" != yes], [ + AC_DNET_BSD_BPF + AC_DNET_LINUX_PROCFS + AC_DNET_LINUX_PF_PACKET +@@ -221,7 +221,7 @@ + AC_DNET_RAWIP_HOST_OFFLEN + AC_DNET_RAWIP_COOKED + AC_DNET_GETKERNINFO +-fi ++]) + + dnl Check for arp interface. + if test "$ac_cv_header_Iphlpapi_h" = yes ; then diff --git a/net-analyzer/nmap/files/nmap-9999-netutil-else.patch b/net-analyzer/nmap/files/nmap-9999-netutil-else.patch deleted file mode 100644 index c9b3350d9865..000000000000 --- a/net-analyzer/nmap/files/nmap-9999-netutil-else.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/libnetutil/netutil.cc -+++ b/libnetutil/netutil.cc -@@ -2571,7 +2571,7 @@ const char *ippackethdrinfo(const u8 *packet, u32 len, int detail) { - - /* CASE 4: where we (finally!) have a full 20 byte TCP header so we can - * safely print all fields */ -- else { /* if (datalen >= 20) */ -+ else if (datalen >= 20) { - - /* TCP Flags */ - p = tflags; diff --git a/net-analyzer/nmap/metadata.xml b/net-analyzer/nmap/metadata.xml index 668d67a59b22..c93c9fdc4493 100644 --- a/net-analyzer/nmap/metadata.xml +++ b/net-analyzer/nmap/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> <email>sam@gentoo.org</email> @@ -9,16 +9,16 @@ <email>dilfridge@gentoo.org</email> <name>Andreas K. Hüttel</name> </maintainer> - <maintainer type="project"> - <email>netmon@gentoo.org</email> - <name>Gentoo network monitoring and analysis project</name> - </maintainer> <use> <flag name="libssh2">Enable SSH support through <pkg>net-libs/libssh2</pkg></flag> <flag name="ncat">Install the ncat utility</flag> - <flag name="nmap-update">Install nmap-update, which uses <pkg>dev-vcs/subversion</pkg> to update nmap scripts in your home directory</flag> + <flag name="ndiff">Install the ndiff utility</flag> <flag name="nping">Install the nping utility</flag> <flag name="nse">Include support for the Nmap Scripting Engine (NSE)</flag> - <flag name="system-lua">Use <pkg>dev-lang/lua</pkg> instead of the bundled liblua</flag> + <flag name="symlink">Install symlink to nc</flag> + <flag name="zenmap">Install the GTK+ based nmap GUI, zenmap</flag> </use> + <upstream> + <remote-id type="github">nmap/nmap</remote-id> + </upstream> </pkgmetadata> diff --git a/net-analyzer/nmap/nmap-7.80-r1.ebuild b/net-analyzer/nmap/nmap-7.80-r1.ebuild deleted file mode 100644 index 41fbe9aca700..000000000000 --- a/net-analyzer/nmap/nmap-7.80-r1.ebuild +++ /dev/null @@ -1,129 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit autotools desktop flag-o-matic toolchain-funcs - -DESCRIPTION="Network exploration tool and security / port scanner" -HOMEPAGE="https://nmap.org/" -SRC_URI="https://nmap.org/dist/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" -IUSE="ipv6 libressl libssh2 ncat nmap-update nping +nse ssl system-lua" -REQUIRED_USE="system-lua? ( nse )" - -RDEPEND=" - dev-libs/liblinear:= - dev-libs/libpcre - net-libs/libpcap - libssh2? ( - net-libs/libssh2[zlib] - sys-libs/zlib - ) - nmap-update? ( - dev-libs/apr - dev-vcs/subversion - ) - nse? ( sys-libs/zlib ) - ssl? ( - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:= ) - ) - system-lua? ( >=dev-lang/lua-5.2:*[deprecated] ) -" -DEPEND="${RDEPEND}" - -PATCHES=( - "${FILESDIR}"/${PN}-5.10_beta1-string.patch - "${FILESDIR}"/${PN}-5.21-python.patch - "${FILESDIR}"/${PN}-6.46-uninstaller.patch - "${FILESDIR}"/${PN}-6.25-liblua-ar.patch - "${FILESDIR}"/${PN}-7.25-no-FORTIFY_SOURCE.patch - "${FILESDIR}"/${PN}-7.25-CXXFLAGS.patch - "${FILESDIR}"/${PN}-7.25-libpcre.patch - "${FILESDIR}"/${PN}-7.31-libnl.patch - "${FILESDIR}"/${PN}-7.80-ac-config-subdirs.patch -) - -src_prepare() { - rm -r liblinear/ libpcap/ libpcre/ libssh2/ libz/ || die - - cat "${FILESDIR}"/nls.m4 >> "${S}"/acinclude.m4 || die - - default - - sed -i \ - -e '/^ALL_LINGUAS =/{s|$| id|g;s|jp|ja|g}' \ - Makefile.in || die - # Fix desktop files wrt bug #432714 - sed -i \ - -e 's|^Categories=.*|Categories=Network;System;Security;|g' \ - zenmap/install_scripts/unix/zenmap-root.desktop \ - zenmap/install_scripts/unix/zenmap.desktop || 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() { - # The bundled libdnet is incompatible with the version available in the - # tree, so we cannot use the system library here. - econf \ - $(use_enable ipv6) \ - $(use_with libssh2) \ - $(use_with ncat) \ - --without-ndiff \ - $(use_with nmap-update) \ - $(use_with nping) \ - $(use_with ssl openssl) \ - --without-zenmap \ - $(usex libssh2 --with-zlib) \ - $(usex nse --with-zlib) \ - $(usex nse --with-liblua=$(usex system-lua /usr included '' '') --without-liblua) \ - --cache-file="${S}"/config.cache \ - --with-libdnet=included \ - --with-pcre=/usr - # Commented out because configure does weird things - # --with-liblinear=/usr \ -} - -src_compile() { - local directory - for directory in . libnetutil nsock/src \ - $(usex ncat ncat '') \ - $(usex nmap-update nmap-update '') \ - $(usex nping nping '') - do - emake -C "${directory}" makefile.dep - done - - emake \ - AR=$(tc-getAR) \ - RANLIB=$(tc-getRANLIB) -} - -src_install() { - LC_ALL=C emake -j1 \ - DESTDIR="${D}" \ - STRIP=: \ - nmapdatadir="${EPREFIX}"/usr/share/nmap \ - install - if use nmap-update;then - LC_ALL=C emake -j1 \ - -C nmap-update \ - DESTDIR="${D}" \ - STRIP=: \ - nmapdatadir="${EPREFIX}"/usr/share/nmap \ - install - fi - - dodoc CHANGELOG HACKING docs/README docs/*.txt -} diff --git a/net-analyzer/nmap/nmap-7.80-r2.ebuild b/net-analyzer/nmap/nmap-7.80-r2.ebuild deleted file mode 100644 index 86253e24991c..000000000000 --- a/net-analyzer/nmap/nmap-7.80-r2.ebuild +++ /dev/null @@ -1,137 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -LUA_COMPAT=( lua5-3 ) -LUA_REQ_USE="deprecated" - -inherit autotools desktop flag-o-matic lua-single toolchain-funcs - -DESCRIPTION="Network exploration tool and security / port scanner" -HOMEPAGE="https://nmap.org/" -SRC_URI="https://nmap.org/dist/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" -IUSE="ipv6 libressl libssh2 ncat nmap-update nping +nse ssl +system-lua" -REQUIRED_USE="system-lua? ( nse ${LUA_REQUIRED_USE} )" - -RDEPEND=" - dev-libs/liblinear:= - dev-libs/libpcre - net-libs/libpcap - libssh2? ( - net-libs/libssh2[zlib] - sys-libs/zlib - ) - nmap-update? ( - dev-libs/apr - dev-vcs/subversion - ) - nse? ( sys-libs/zlib ) - ssl? ( - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:= ) - ) - system-lua? ( ${LUA_DEPS} ) -" -DEPEND="${RDEPEND}" - -PATCHES=( - "${FILESDIR}"/${PN}-5.10_beta1-string.patch - "${FILESDIR}"/${PN}-5.21-python.patch - "${FILESDIR}"/${PN}-6.46-uninstaller.patch - "${FILESDIR}"/${PN}-6.25-liblua-ar.patch - "${FILESDIR}"/${PN}-7.25-no-FORTIFY_SOURCE.patch - "${FILESDIR}"/${PN}-7.25-CXXFLAGS.patch - "${FILESDIR}"/${PN}-7.25-libpcre.patch - "${FILESDIR}"/${PN}-7.31-libnl.patch - "${FILESDIR}"/${PN}-7.80-ac-config-subdirs.patch -) - -pkg_setup() { - use system-lua && lua-single_pkg_setup -} - -src_prepare() { - rm -r liblinear/ libpcap/ libpcre/ libssh2/ libz/ || die - - cat "${FILESDIR}"/nls.m4 >> "${S}"/acinclude.m4 || die - - default - - sed -i \ - -e '/^ALL_LINGUAS =/{s|$| id|g;s|jp|ja|g}' \ - Makefile.in || die - # Fix desktop files wrt bug #432714 - sed -i \ - -e 's|^Categories=.*|Categories=Network;System;Security;|g' \ - zenmap/install_scripts/unix/zenmap-root.desktop \ - zenmap/install_scripts/unix/zenmap.desktop || 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() { - # The bundled libdnet is incompatible with the version available in the - # tree, so we cannot use the system library here. - econf \ - $(use_enable ipv6) \ - $(use_with libssh2) \ - $(use_with ncat) \ - --without-ndiff \ - $(use_with nmap-update) \ - $(use_with nping) \ - $(use_with ssl openssl) \ - --without-zenmap \ - $(usex libssh2 --with-zlib) \ - $(usex nse --with-zlib) \ - $(usex nse --with-liblua=$(usex system-lua yes included '' '') --without-liblua) \ - --cache-file="${S}"/config.cache \ - --with-libdnet=included \ - --with-pcre=/usr - # Commented out because configure does weird things - # --with-liblinear=/usr \ -} - -src_compile() { - local directory - for directory in . libnetutil nsock/src \ - $(usex ncat ncat '') \ - $(usex nmap-update nmap-update '') \ - $(usex nping nping '') - do - emake -C "${directory}" makefile.dep - done - - emake \ - AR=$(tc-getAR) \ - RANLIB=$(tc-getRANLIB) -} - -src_install() { - LC_ALL=C emake -j1 \ - DESTDIR="${D}" \ - STRIP=: \ - nmapdatadir="${EPREFIX}"/usr/share/nmap \ - install - if use nmap-update;then - LC_ALL=C emake -j1 \ - -C nmap-update \ - DESTDIR="${D}" \ - STRIP=: \ - nmapdatadir="${EPREFIX}"/usr/share/nmap \ - install - fi - - dodoc CHANGELOG HACKING docs/README docs/*.txt -} diff --git a/net-analyzer/nmap/nmap-7.91-r1.ebuild b/net-analyzer/nmap/nmap-7.91-r1.ebuild deleted file mode 100644 index 29cae90c6f0d..000000000000 --- a/net-analyzer/nmap/nmap-7.91-r1.ebuild +++ /dev/null @@ -1,116 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -LUA_COMPAT=( lua5-3 ) -LUA_REQ_USE="deprecated" - -inherit autotools flag-o-matic lua-single toolchain-funcs - -DESCRIPTION="Network exploration tool and security / port scanner" -HOMEPAGE="https://nmap.org/" -SRC_URI="https://nmap.org/dist/${P}.tar.bz2" - -LICENSE="NPSL" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" -IUSE="ipv6 libressl libssh2 ncat nping +nse ssl +system-lua" -REQUIRED_USE="system-lua? ( nse ${LUA_REQUIRED_USE} )" - -RDEPEND=" - dev-libs/liblinear:= - dev-libs/libpcre - net-libs/libpcap - libssh2? ( - net-libs/libssh2[zlib] - sys-libs/zlib - ) - nse? ( sys-libs/zlib ) - ssl? ( - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:= ) - ) - system-lua? ( ${LUA_DEPS} ) -" -DEPEND="${RDEPEND}" - -PATCHES=( - "${FILESDIR}"/${PN}-5.10_beta1-string.patch - "${FILESDIR}"/${PN}-5.21-python.patch - "${FILESDIR}"/${PN}-6.46-uninstaller.patch - "${FILESDIR}"/${PN}-6.25-liblua-ar.patch - "${FILESDIR}"/${PN}-7.25-CXXFLAGS.patch - "${FILESDIR}"/${PN}-7.25-libpcre.patch - "${FILESDIR}"/${PN}-7.31-libnl.patch - "${FILESDIR}"/${PN}-7.80-ac-config-subdirs.patch - "${FILESDIR}"/${PN}-7.91-no-FORTIFY_SOURCE.patch -) - -pkg_setup() { - use system-lua && lua-single_pkg_setup -} - -src_prepare() { - rm -r liblinear/ libpcap/ libpcre/ libssh2/ libz/ || die - - cat "${FILESDIR}"/nls.m4 >> "${S}"/acinclude.m4 || die - - default - - 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() { - # The bundled libdnet is incompatible with the version available in the - # tree, so we cannot use the system library here. - econf \ - $(use_enable ipv6) \ - $(use_with libssh2) \ - $(use_with ncat) \ - $(use_with nping) \ - $(use_with ssl openssl) \ - $(usex libssh2 --with-zlib) \ - $(usex nse --with-liblua=$(usex system-lua yes included '' '') --without-liblua) \ - $(usex nse --with-zlib) \ - --cache-file="${S}"/config.cache \ - --with-libdnet=included \ - --with-pcre=/usr \ - --without-ndiff \ - --without-zenmap -} - -src_compile() { - local directory - for directory in . libnetutil nsock/src \ - $(usex ncat ncat '') \ - $(usex nping nping '') - do - emake -C "${directory}" makefile.dep - done - - emake \ - AR=$(tc-getAR) \ - RANLIB=$(tc-getRANLIB) -} - -src_install() { - LC_ALL=C emake -j1 \ - DESTDIR="${D}" \ - STRIP=: \ - nmapdatadir="${EPREFIX}"/usr/share/nmap \ - install - - dodoc CHANGELOG HACKING docs/README docs/*.txt -} diff --git a/net-analyzer/nmap/nmap-7.91.ebuild b/net-analyzer/nmap/nmap-7.91.ebuild deleted file mode 100644 index 006cbe5ee03c..000000000000 --- a/net-analyzer/nmap/nmap-7.91.ebuild +++ /dev/null @@ -1,108 +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="Network exploration tool and security / port scanner" -HOMEPAGE="https://nmap.org/" -SRC_URI="https://nmap.org/dist/${P}.tar.bz2" - -LICENSE="NPSL" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" -IUSE="ipv6 libressl libssh2 ncat nping +nse ssl system-lua" -REQUIRED_USE="system-lua? ( nse )" - -RDEPEND=" - dev-libs/liblinear:= - dev-libs/libpcre - net-libs/libpcap - libssh2? ( - net-libs/libssh2[zlib] - sys-libs/zlib - ) - nse? ( sys-libs/zlib ) - ssl? ( - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:= ) - ) - system-lua? ( >=dev-lang/lua-5.2:*[deprecated] ) -" -DEPEND="${RDEPEND}" - -PATCHES=( - "${FILESDIR}"/${PN}-5.10_beta1-string.patch - "${FILESDIR}"/${PN}-5.21-python.patch - "${FILESDIR}"/${PN}-6.46-uninstaller.patch - "${FILESDIR}"/${PN}-6.25-liblua-ar.patch - "${FILESDIR}"/${PN}-7.25-CXXFLAGS.patch - "${FILESDIR}"/${PN}-7.25-libpcre.patch - "${FILESDIR}"/${PN}-7.31-libnl.patch - "${FILESDIR}"/${PN}-7.80-ac-config-subdirs.patch - "${FILESDIR}"/${PN}-7.91-no-FORTIFY_SOURCE.patch -) - -src_prepare() { - rm -r liblinear/ libpcap/ libpcre/ libssh2/ libz/ || die - - cat "${FILESDIR}"/nls.m4 >> "${S}"/acinclude.m4 || die - - default - - 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() { - # The bundled libdnet is incompatible with the version available in the - # tree, so we cannot use the system library here. - econf \ - $(use_enable ipv6) \ - $(use_with libssh2) \ - $(use_with ncat) \ - $(use_with nping) \ - $(use_with ssl openssl) \ - $(usex libssh2 --with-zlib) \ - $(usex nse --with-liblua=$(usex system-lua /usr included '' '') --without-liblua) \ - $(usex nse --with-zlib) \ - --cache-file="${S}"/config.cache \ - --with-libdnet=included \ - --with-pcre=/usr \ - --without-ndiff \ - --without-zenmap -} - -src_compile() { - local directory - for directory in . libnetutil nsock/src \ - $(usex ncat ncat '') \ - $(usex nping nping '') - do - emake -C "${directory}" makefile.dep - done - - emake \ - AR=$(tc-getAR) \ - RANLIB=$(tc-getRANLIB) -} - -src_install() { - LC_ALL=C emake -j1 \ - DESTDIR="${D}" \ - STRIP=: \ - nmapdatadir="${EPREFIX}"/usr/share/nmap \ - install - - dodoc CHANGELOG HACKING docs/README docs/*.txt -} diff --git a/net-analyzer/nmap/nmap-7.94.ebuild b/net-analyzer/nmap/nmap-7.94.ebuild new file mode 100644 index 000000000000..ffeeafdf2411 --- /dev/null +++ b/net-analyzer/nmap/nmap-7.94.ebuild @@ -0,0 +1,188 @@ +# Copyright 1999-2023 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 +) + +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-9999.ebuild b/net-analyzer/nmap/nmap-9999.ebuild index 782f91bf13e1..043bcfa6f516 100644 --- a/net-analyzer/nmap/nmap-9999.ebuild +++ b/net-analyzer/nmap/nmap-9999.ebuild @@ -1,63 +1,120 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -LUA_COMPAT=( lua5-3 ) +LUA_COMPAT=( lua5-4 ) LUA_REQ_USE="deprecated" - -inherit autotools flag-o-matic git-r3 lua-single toolchain-funcs +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 )" -EGIT_REPO_URI="https://github.com/nmap/nmap" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" +fi -LICENSE="NPSL" +SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-7.95-patches.tar.xz" + +# https://github.com/nmap/nmap/issues/2199 +LICENSE="NPSL-0.95" SLOT="0" -IUSE="ipv6 libressl libssh2 ncat nping +nse ssl +system-lua" -REQUIRED_USE="system-lua? ( nse ${LUA_REQUIRED_USE} )" +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 + dev-libs/libpcre2 net-libs/libpcap + ndiff? ( ${PYTHON_DEPS} ) libssh2? ( net-libs/libssh2[zlib] sys-libs/zlib ) - nse? ( sys-libs/zlib ) - ssl? ( - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:= ) + 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}] + ') ) - system-lua? ( ${LUA_DEPS} ) " 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=( - "${FILESDIR}"/${PN}-5.10_beta1-string.patch - "${FILESDIR}"/${PN}-5.21-python.patch - "${FILESDIR}"/${PN}-6.46-uninstaller.patch - "${FILESDIR}"/${PN}-6.25-liblua-ar.patch - "${FILESDIR}"/${PN}-7.25-CXXFLAGS.patch - "${FILESDIR}"/${PN}-7.25-libpcre.patch - "${FILESDIR}"/${PN}-7.31-libnl.patch - "${FILESDIR}"/${PN}-7.80-ac-config-subdirs.patch - "${FILESDIR}"/${PN}-7.91-no-FORTIFY_SOURCE.patch - "${FILESDIR}"/${PN}-9999-netutil-else.patch + "${WORKDIR}"/${PN}-7.95-patches ) pkg_setup() { - use system-lua && lua-single_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 - default + 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}' \ @@ -68,50 +125,63 @@ src_prepare() { eautoreconf if [[ ${CHOST} == *-darwin* ]] ; then - # we need the original for a Darwin-specific fix, bug #604432 + # We need the original for a Darwin-specific fix, bug #604432 mv libdnet-stripped/include/config.h.in{.nmap-orig,} || die fi } src_configure() { - # The bundled libdnet is incompatible with the version available in the - # tree, so we cannot use the system library here. - econf \ - $(use_enable ipv6) \ - $(use_with libssh2) \ - $(use_with ncat) \ - $(use_with nping) \ - $(use_with ssl openssl) \ - $(usex libssh2 --with-zlib) \ - $(usex nse --with-liblua=$(usex system-lua yes included '' '') --without-liblua) \ - $(usex nse --with-zlib) \ - --cache-file="${S}"/config.cache \ - --with-libdnet=included \ - --with-pcre=/usr \ - --without-ndiff \ - --without-zenmap + 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 \ - $(usex ncat ncat '') \ - $(usex nping nping '') - do + for directory in . libnetutil nsock/src $(usev ncat) $(usev nping) ; do emake -C "${directory}" makefile.dep done emake \ - AR=$(tc-getAR) \ - RANLIB=$(tc-getRANLIB) + AR="$(tc-getAR)" \ + RANLIB="$(tc-getRANLIB)" } src_install() { - LC_ALL=C emake -j1 \ + # 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/nmapsi/files/nmapsi-0.5_alpha2-no-qtscript.patch b/net-analyzer/nmapsi/files/nmapsi-0.5_alpha2-no-qtscript.patch new file mode 100644 index 000000000000..38c73b68cbb7 --- /dev/null +++ b/net-analyzer/nmapsi/files/nmapsi-0.5_alpha2-no-qtscript.patch @@ -0,0 +1,18 @@ +--- a/CMakeLists.txt 2020-05-10 15:37:19.000000000 +0200 ++++ b/CMakeLists.txt 2023-10-24 21:28:56.198123618 +0200 +@@ -18,7 +18,6 @@ + Network + WebEngineWidgets + DBus +- Script + LinguistTools + Quick + Qml +@@ -31,7 +30,6 @@ + Widgets + Network + WebEngineWidgets +- Script + LinguistTools + Quick + Qml diff --git a/net-analyzer/nmapsi/metadata.xml b/net-analyzer/nmapsi/metadata.xml index 3b15d70c8fe0..e3a0017ffab4 100644 --- a/net-analyzer/nmapsi/metadata.xml +++ b/net-analyzer/nmapsi/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>qt@gentoo.org</email> diff --git a/net-analyzer/nmapsi/nmapsi-0.5_alpha2-r1.ebuild b/net-analyzer/nmapsi/nmapsi-0.5_alpha2-r1.ebuild new file mode 100644 index 000000000000..6cf6b4ca36cc --- /dev/null +++ b/net-analyzer/nmapsi/nmapsi-0.5_alpha2-r1.ebuild @@ -0,0 +1,35 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake + +DESCRIPTION="Qt frontend to nmap" +HOMEPAGE="https://github.com/nmapsi4/nmapsi4" +SRC_URI="https://github.com/nmapsi4/nmapsi4/archive/v${PV/_/-}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/${PN}4-${PV/_/-}" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +DEPEND=" + dev-qt/qtcore:5 + dev-qt/qtdbus:5 + dev-qt/qtdeclarative:5 + dev-qt/qtgui:5 + dev-qt/qtnetwork:5 + dev-qt/qtwebengine:5[widgets] + dev-qt/qtwidgets:5 +" +RDEPEND="${DEPEND} + net-analyzer/nmap + net-dns/bind-tools +" +BDEPEND="dev-qt/linguist-tools:5" + +DOCS=( AUTHORS HACKING README.md TODO Translation ) + +PATCHES=( "${FILESDIR}/${P}-no-qtscript.patch" ) diff --git a/net-analyzer/nmapsi/nmapsi-0.5_alpha2.ebuild b/net-analyzer/nmapsi/nmapsi-0.5_alpha2.ebuild deleted file mode 100644 index 07d77fb3b796..000000000000 --- a/net-analyzer/nmapsi/nmapsi-0.5_alpha2.ebuild +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake - -DESCRIPTION="Qt frontend to nmap" -HOMEPAGE="https://github.com/nmapsi4/nmapsi4" -SRC_URI="https://github.com/nmapsi4/nmapsi4/archive/v${PV/_/-}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -BDEPEND=" - dev-qt/linguist-tools:5 -" -DEPEND=" - dev-qt/qtcore:5 - dev-qt/qtdbus:5 - dev-qt/qtdeclarative:5 - dev-qt/qtgui:5 - dev-qt/qtnetwork:5 - dev-qt/qtscript:5 - dev-qt/qtwebengine:5[widgets] - dev-qt/qtwidgets:5 -" -RDEPEND="${DEPEND} - net-analyzer/nmap - net-dns/bind-tools -" - -S="${WORKDIR}/${PN}4-${PV/_/-}" - -DOCS=( AUTHORS HACKING README.md TODO Translation ) diff --git a/net-analyzer/nmbscan/metadata.xml b/net-analyzer/nmbscan/metadata.xml index 6d85f89a0e7e..6f655e109486 100644 --- a/net-analyzer/nmbscan/metadata.xml +++ b/net-analyzer/nmbscan/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <!-- maintainer-needed --> <longdescription> diff --git a/net-analyzer/nmbscan/nmbscan-1.2.5-r1.ebuild b/net-analyzer/nmbscan/nmbscan-1.2.5-r1.ebuild index d47b82ff6739..763b105c51e1 100644 --- a/net-analyzer/nmbscan/nmbscan-1.2.5-r1.ebuild +++ b/net-analyzer/nmbscan/nmbscan-1.2.5-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -9,13 +9,13 @@ SRC_URI="http://nmbscan.g76r.eu/down/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ppc64 s390 ~sparc x86" +KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~ppc ppc64 ~sparc x86" RDEPEND="net-dns/bind-tools net-fs/samba net-misc/iputils sys-apps/net-tools - virtual/awk" + app-alternatives/awk" S=${WORKDIR} PATCHES=( "${FILESDIR}"/${P}-head.diff ) diff --git a/net-analyzer/notus-scanner/Manifest b/net-analyzer/notus-scanner/Manifest new file mode 100644 index 000000000000..79d92d27ff5d --- /dev/null +++ b/net-analyzer/notus-scanner/Manifest @@ -0,0 +1 @@ +DIST notus-scanner-22.6.2.tar.gz 316406 BLAKE2B c24ec5e4fd9f8fc181145d64580d04f7045ccf1a7570f855f0a8a79bcea842fe7a73d91fadecd61c10b94cb3ee68ecae98b0f91b4059b84258765be98c95057f SHA512 ecbbb79950908641c2b83d379d141b189b8e0e27cac17753cbb381a5f4ebf28d7100f60bd24fc284c2681abc889f6fee36a64f469ac0b37323940eaeae7e7522 diff --git a/net-analyzer/notus-scanner/files/notus-scanner-22.6.2-remove-tests.patch b/net-analyzer/notus-scanner/files/notus-scanner-22.6.2-remove-tests.patch new file mode 100644 index 000000000000..e2d3192ed295 --- /dev/null +++ b/net-analyzer/notus-scanner/files/notus-scanner-22.6.2-remove-tests.patch @@ -0,0 +1,75 @@ +Remove tests that use files not allowed by Sandbox. +Patch by Giuseppe Foti + +--- a/tests/cli/test_cli_parser.py ++++ b/tests/cli/test_cli_parser.py +@@ -28,69 +28,6 @@ class CliParserTestCase(unittest.TestCase): + def parse_args(self, args: List[str]) -> Arguments: + return self.parser.parse_arguments(args) + +- def test_mqtt_broker(self): +- args = self.parse_args(["--mqtt-broker-address=localhost"]) +- self.assertEqual("localhost", args.mqtt_broker_address) +- +- args = self.parse_args(["-b", "localhost"]) +- self.assertEqual("localhost", args.mqtt_broker_address) +- +- def test_mqtt_broker_port(self): +- args = self.parse_args(["--mqtt-broker-port=12345"]) +- self.assertEqual(args.mqtt_broker_port, 12345) +- +- args = self.parse_args(["-p", "12345"]) +- self.assertEqual(args.mqtt_broker_port, 12345) +- +- def test_correct_upper_case_log_level(self): +- args = self.parse_args(["--log-level=ERROR"]) +- self.assertEqual("ERROR", args.log_level) +- +- def test_correct_lower_case_log_level(self): +- args = self.parse_args(["-L", "info"]) +- self.assertEqual("INFO", args.log_level) +- +- def test_advisories_directory(self): +- args = self.parse_args(["--products-directory=/tmp"]) +- self.assertEqual(Path("/tmp"), args.products_directory) +- +- def test_pid_file(self): +- args = self.parse_args(["--pid-file=/foo/bar"]) +- self.assertEqual(args.pid_file, "/foo/bar") +- +- def test_log_file(self): +- args = self.parse_args(["--log-file=/foo/bar"]) +- self.assertEqual(args.log_file, "/foo/bar") +- +- args = self.parse_args(["-l", "/foo/bar"]) +- self.assertEqual(args.log_file, "/foo/bar") +- +- def test_foreground(self): +- args = self.parse_args(["--foreground"]) +- self.assertTrue(args.foreground) +- +- args = self.parse_args(["-f"]) +- self.assertTrue(args.foreground) +- +- def test_disable_hashsum_verification(self): +- args = self.parse_args(["--disable-hashsum-verification=true"]) +- self.assertTrue(args.disable_hashsum_verification) +- +- def test_defaults(self): +- args = self.parse_args([]) +- +- self.assertEqual( +- args.products_directory, Path(DEFAULT_PRODUCTS_DIRECTORY) +- ) +- self.assertIsNone(args.config) +- self.assertIsNone(args.log_file) +- self.assertEqual(args.log_level, DEFAULT_LOG_LEVEL) +- self.assertEqual(args.mqtt_broker_port, DEFAULT_MQTT_BROKER_PORT) +- self.assertEqual(args.mqtt_broker_address, DEFAULT_MQTT_BROKER_ADDRESS) +- self.assertEqual(args.pid_file, DEFAULT_PID_FILE) +- self.assertEqual(args.disable_hashsum_verification, False) +- self.assertFalse(args.foreground) +- + def test_config_file_provide_mqtt_broker_address(self): + with tempfile.NamedTemporaryFile() as fp: + fp.write(b"[notus-scanner]\nmqtt-broker-address='1.2.3.4'") diff --git a/net-analyzer/notus-scanner/files/notus-scanner.initd b/net-analyzer/notus-scanner/files/notus-scanner.initd new file mode 100644 index 000000000000..8af378b20fd6 --- /dev/null +++ b/net-analyzer/notus-scanner/files/notus-scanner.initd @@ -0,0 +1,31 @@ +#!/sbin/openrc-run +# Copyright 2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +: ${GVM_USER:=gvm} +: ${GVM_GROUP:=$(id -ng ${GVM_USER})} +: ${NOTUS_TIMEOUT:=30} + +name="Greenbone Notus Scanner" +command=/usr/bin/notus-scanner +command_user="${GVM_USER}:${GVM_GROUP}" +pidfile="/run/notus-scanner/${RC_SVCNAME}.pid" +configfile="/etc/gvm/notus-scanner.toml" +command_args="--pid-file ${pidfile} \ + --config ${configfile}" +retry="${NOTUS_TIMEOUT}" + +depend() { + after bootmisc + need localmount mosquitto +} + +start_pre() { + checkpath -d --owner ${GVM_USER} /run/notus-scanner +} + +start_post() { + ewaitfile 10 ${pidfile} + checkpath -d --owner root:root /run/notus-scanner + checkpath -f --owner root:root ${pidfile} +} diff --git a/net-analyzer/notus-scanner/files/notus-scanner.service.conf b/net-analyzer/notus-scanner/files/notus-scanner.service.conf new file mode 100644 index 000000000000..aea5c10e8fad --- /dev/null +++ b/net-analyzer/notus-scanner/files/notus-scanner.service.conf @@ -0,0 +1,7 @@ +[Unit] +PartOf=gvm.target + +[Service] +Type=forking +ExecStart= +ExecStart=/usr/bin/notus-scanner diff --git a/net-analyzer/notus-scanner/files/notus-scanner.toml b/net-analyzer/notus-scanner/files/notus-scanner.toml new file mode 100644 index 000000000000..a266784ed163 --- /dev/null +++ b/net-analyzer/notus-scanner/files/notus-scanner.toml @@ -0,0 +1,8 @@ +[notus-scanner] +mqtt-broker-address = "localhost" +mqtt-broker-port = "1883" +products-directory = "/var/lib/notus/products" +pid-file = "/run/notus-scanner/notus-scanner.pid" +log-file = "/var/log/gvm/notus-scanner.log" +log-level = "INFO" +disable-hashsum-verification = true diff --git a/net-analyzer/notus-scanner/metadata.xml b/net-analyzer/notus-scanner/metadata.xml new file mode 100644 index 000000000000..06038ba8d06e --- /dev/null +++ b/net-analyzer/notus-scanner/metadata.xml @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="person" proxied="yes"> + <email>foti.giuseppe@gmail.com</email> + <name>Giuseppe Foti</name> + </maintainer> + <maintainer type="project" proxied="proxy"> + <email>proxy-maint@gentoo.org</email> + <name>Proxy Maintainers</name> + </maintainer> + <longdescription lang="en"> + This is a new scanner that scans after every regular scan, so no user interaction is necessary. + It offers better performance due to less system resource consumption and thus, faster scanning. + </longdescription> + <upstream> + <remote-id type="github">greenbone/notus-scanner</remote-id> + </upstream> +</pkgmetadata> diff --git a/net-analyzer/notus-scanner/notus-scanner-22.6.2.ebuild b/net-analyzer/notus-scanner/notus-scanner-22.6.2.ebuild new file mode 100644 index 000000000000..f62ecf25aaa3 --- /dev/null +++ b/net-analyzer/notus-scanner/notus-scanner-22.6.2.ebuild @@ -0,0 +1,81 @@ +# 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=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" + +SLOT="0" +LICENSE="AGPL-3 AGPL-3+" +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}] + <dev-python/tomli-3[${PYTHON_USEDEP}] +" + +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/nrpe/Manifest b/net-analyzer/nrpe/Manifest index 4fab8d8b80df..f81d01f00913 100644 --- a/net-analyzer/nrpe/Manifest +++ b/net-analyzer/nrpe/Manifest @@ -1,2 +1,4 @@ DIST nrpe-4.0.0.tar.gz 523846 BLAKE2B 850a420f0550e1dfe6b0ea98a9d9cafec0ec583c115be89b3ba8e88a309c40226c87f6ae880d12c582822e492c5991e3d2444b68f5644750fc74ad75596c96fd SHA512 8773102f28f3e7e96f3637e77489eb12ffe88fe839abfe3f150d2eb3d2efe05f7f812ab4d52a64cbd8d0a5e491aed93d5300b7ce9a8dd072b3a00d885b91276b DIST nrpe-4.0.2.tar.gz 524146 BLAKE2B dc100579420eeccaaa2a913f56c76b86b6ebdce8d1afdddcc428bfd4a8c12ad19050ab0395e7a109d4e8b43ca7d6a11e13ec4a4250a91483e37725c184382ca2 SHA512 4d7cf6abc974bc79df54afc42644418e3f086a279c8c17d0fd104f19e3c21c0f3dae4fb4268dd134446ff9fe505159b0446372c5cac71cfe03a97479ed41c09b +DIST nrpe-4.0.3.tar.gz 524160 BLAKE2B d2c99cadf718e7049c911388b105fb4f5248307c733d94a73fd02ac69c49be230dad58be0a182af9c8d7e0d1f34e8dba6b8fc46a7c01eb15d845f2b3a54499ed SHA512 31d932c481c8a53bd0f8865fb3cfeeb1466b9b05fa89382aa056aa9343a09843b51fe5398fd0388e6bba99e9c3d8093f6033799fd83afd43012bfe8fdc5a33e3 +DIST nrpe-4.1.0.tar.gz 528228 BLAKE2B a8890eef9f32e43417270eb80dcb9eedf1272d70d2dad73fecd855565358fbe9cb1d716fe0b79270310c2c5097eba3ffc7f786c89eecae9f6b84d2fbb43d3e0f SHA512 a47935eecc65d646737166f98f5f160e3d1d5bbd245e006e8cd0758af75db083f870db6c02c1edd0d44cf9a91909ba26df8eee1620a7ac4d9f98032f2cce8981 diff --git a/net-analyzer/nrpe/files/nrpe-4.0.2-disable-tcpd.patch b/net-analyzer/nrpe/files/nrpe-4.0.2-disable-tcpd.patch new file mode 100644 index 000000000000..7140c43d7e8c --- /dev/null +++ b/net-analyzer/nrpe/files/nrpe-4.0.2-disable-tcpd.patch @@ -0,0 +1,62 @@ +Stripped ./configure portion for Gentoo, instead relying on eautoreconf. + +From 8bce40cff68c0a7d88b465eb345267ad5176461a Mon Sep 17 00:00:00 2001 +From: Jaco Kroon <jaco@iewc.co.za> +Date: Mon, 8 Feb 2021 17:07:30 +0200 +Subject: [PATCH] Patch to allow passing --enable-tcpd or --disable-tcpd. + +If passing --enable-tcpd and libwrap is not available, ./configure will +fail. + +If passing --disable-tcpd, libwrap will be completely ignore. + +If not passed, current behaviour still applies. + +Signed-off-by: Jaco Kroon <jaco@iewc.co.za> +--- + configure.ac | 28 +++++++++++++++++++++++----- + 2 files changed, 52 insertions(+), 6 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 3981bb0..e3c1a15 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -237,12 +237,30 @@ AC_CHECK_FUNCS([getopt_long],,AC_CHECK_LIB([iberty],[getopt_long],OTHERLIBS="$OT + dnl Checks for library functions. + AC_CHECK_LIB(nsl,main,SOCKETLIBS="$SOCKETLIBS -lnsl") + AC_CHECK_LIB(socket,socket,SOCKETLIBS="$SOCKETLIBS -lsocket") +-AC_CHECK_LIB(wrap,main,[ +- LIBWRAPLIBS="$LIBWRAPLIBS -lwrap" +- AC_DEFINE(HAVE_LIBWRAP,[1],[Have the TCP wrappers library]) +- AC_TRY_LINK([#include <tcpd.h> +- ],[int a = rfc931_timeout;],AC_DEFINE(HAVE_RFC931_TIMEOUT)) ++ ++AC_ARG_ENABLE([tcpd], ++ AS_HELP_STRING([--disable-tcpd],[disables support for tcpd even if present]),[ ++ if test x$enableval = xyes; then ++ check_for_tcpd=yes ++ else ++ check_for_tcpd=no ++ fi ++ ],check_for_tcpd=optional) ++ ++AC_MSG_CHECKING(check_for_tcpd=$check_for_tcpd) ++if test x$check_for_tcpd != xno; then ++ AC_CHECK_LIB(wrap,main,[ ++ LIBWRAPLIBS="$LIBWRAPLIBS -lwrap" ++ AC_DEFINE(HAVE_LIBWRAP,[1],[Have the TCP wrappers library]) ++ AC_TRY_LINK([#include <tcpd.h> ++ ],[int a = rfc931_timeout;],AC_DEFINE(HAVE_RFC931_TIMEOUT)) ++ ],[ ++ if test x$check_for_tcpd = xyes; then ++ AC_MSG_ERROR(--enable-tcpd specified but unable to locate libwrap.) ++ fi + ]) ++fi ++ + AC_CHECK_FUNCS(strdup strstr strtoul strtok_r initgroups closesocket sigaction scandir) + + dnl socklen_t check - from curl +-- +2.26.2 + diff --git a/net-analyzer/nrpe/metadata.xml b/net-analyzer/nrpe/metadata.xml index 6d48b12e1abf..1876e4216dde 100644 --- a/net-analyzer/nrpe/metadata.xml +++ b/net-analyzer/nrpe/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>sysadmin@gentoo.org</email> @@ -17,6 +17,7 @@ </flag> </use> <upstream> + <remote-id type="github">NagiosEnterprises/nrpe</remote-id> <remote-id type="sourceforge">nagios</remote-id> </upstream> </pkgmetadata> diff --git a/net-analyzer/nrpe/nrpe-4.0.0.ebuild b/net-analyzer/nrpe/nrpe-4.0.0.ebuild index d1e218e2cd8a..1012fda39070 100644 --- a/net-analyzer/nrpe/nrpe-4.0.0.ebuild +++ b/net-analyzer/nrpe/nrpe-4.0.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -10,16 +10,13 @@ SRC_URI="https://github.com/NagiosEnterprises/nrpe/releases/download/${P}/${P}.t LICENSE="GPL-2+" SLOT="0" -KEYWORDS="~alpha amd64 ~hppa ppc ppc64 sparc x86" -IUSE="command-args libressl selinux ssl" +KEYWORDS="~alpha amd64 ~hppa ~ppc ppc64 sparc x86" +IUSE="command-args selinux ssl" DEPEND="acct-group/nagios acct-user/nagios sys-apps/tcp-wrappers - ssl? ( - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) - )" + ssl? ( dev-libs/openssl:0= )" RDEPEND="${DEPEND} || ( net-analyzer/nagios-plugins net-analyzer/monitoring-plugins ) selinux? ( sec-policy/selinux-nagios )" diff --git a/net-analyzer/nrpe/nrpe-4.0.2.ebuild b/net-analyzer/nrpe/nrpe-4.0.2.ebuild index 73205353081b..750ad02c972e 100644 --- a/net-analyzer/nrpe/nrpe-4.0.2.ebuild +++ b/net-analyzer/nrpe/nrpe-4.0.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -11,15 +11,12 @@ SRC_URI="https://github.com/NagiosEnterprises/nrpe/releases/download/${P}/${P}.t LICENSE="GPL-2+" SLOT="0" KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86" -IUSE="command-args libressl selinux ssl" +IUSE="command-args selinux ssl" DEPEND="acct-group/nagios acct-user/nagios sys-apps/tcp-wrappers - ssl? ( - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) - )" + ssl? ( dev-libs/openssl:0= )" RDEPEND="${DEPEND} || ( net-analyzer/nagios-plugins net-analyzer/monitoring-plugins ) selinux? ( sec-policy/selinux-nagios )" diff --git a/net-analyzer/nrpe/nrpe-4.0.3.ebuild b/net-analyzer/nrpe/nrpe-4.0.3.ebuild new file mode 100644 index 000000000000..27d333e85049 --- /dev/null +++ b/net-analyzer/nrpe/nrpe-4.0.3.ebuild @@ -0,0 +1,101 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit autotools systemd + +DESCRIPTION="Nagios Remote Plugin Executor" +HOMEPAGE="https://github.com/NagiosEnterprises/nrpe" +SRC_URI="https://github.com/NagiosEnterprises/nrpe/releases/download/${P}/${P}.tar.gz" + +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="~alpha amd64 ~hppa ~ppc ppc64 sparc x86" +IUSE="command-args selinux ssl tcpd" + +DEPEND="acct-group/nagios + acct-user/nagios + tcpd? ( + sys-apps/tcp-wrappers + ) + ssl? ( + dev-libs/openssl:= + )" +RDEPEND="${DEPEND} + || ( net-analyzer/nagios-plugins net-analyzer/monitoring-plugins ) + selinux? ( sec-policy/selinux-nagios )" + +PATCHES=( + "${FILESDIR}/nrpe-3.2.1-eliminate-systemd-pid.patch" + "${FILESDIR}/nrpe-4.0.2-disable-tcpd.patch" +) + +src_prepare() { + default + eautoreconf +} + +src_configure() { + # The configure script tries to detect what OS, distribution, and + # init system you're running and changes the build/install process + # depending on what it comes up with. We specify fixed values + # because we don't want it guessing, for example, whether or not + # to install the tmpfiles.d entry based on whether or not systemd + # is currently running (OpenRC uses them too). + # + # Note: upstream defaults to using "nagios" as the default NRPE + # user and group. I have a feeling that this isn't quite correct + # on a system where "nagios" is also the user running the nagios + # server daemon. In the future, it would be nice if someone who + # actually uses NRPE could test with an unprivileged "nrpe" as + # the user and group. + econf \ + --libexecdir=/usr/$(get_libdir)/nagios/plugins \ + --localstatedir=/var/lib/nagios \ + --sysconfdir=/etc/nagios \ + --with-nrpe-user=nagios \ + --with-nrpe-group=nagios \ + --with-piddir=/run \ + --with-opsys=unknown \ + --with-dist-type=unknown \ + --with-init-type=unknown \ + --with-inetd-type=unknown \ + $(use_enable command-args) \ + $(use_enable ssl) \ + $(use_enable tcpd) +} + +src_compile() { + emake all +} + +src_install() { + default + + dodoc CHANGELOG.md SECURITY.md + insinto /etc/nagios + newins sample-config/nrpe.cfg nrpe.cfg + fowners root:nagios /etc/nagios/nrpe.cfg + fperms 0640 /etc/nagios/nrpe.cfg + + newinitd "startup/openrc-init" nrpe + newconfd "startup/openrc-conf" nrpe + systemd_newunit "startup/default-service" "${PN}.service" + + insinto /etc/xinetd.d/ + newins "${FILESDIR}/nrpe.xinetd.2" nrpe + + rm "${ED}/usr/bin/nrpe-uninstall" || die 'failed to remove uninstall tool' + rm -r "${ED}/run" || die 'failed to remove /run' +} + +pkg_postinst() { + if use command-args ; then + ewarn '' + ewarn 'You have enabled command-args for NRPE. That lets clients' + ewarn 'supply arguments to the commands that are run, and IS A' + ewarn 'SECURITY RISK!' + ewarn '' + fi +} diff --git a/net-analyzer/nrpe/nrpe-4.1.0.ebuild b/net-analyzer/nrpe/nrpe-4.1.0.ebuild new file mode 100644 index 000000000000..8d9091865841 --- /dev/null +++ b/net-analyzer/nrpe/nrpe-4.1.0.ebuild @@ -0,0 +1,100 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools systemd + +DESCRIPTION="Nagios Remote Plugin Executor" +HOMEPAGE="https://github.com/NagiosEnterprises/nrpe" +SRC_URI="https://github.com/NagiosEnterprises/nrpe/releases/download/${P}/${P}.tar.gz" + +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="~alpha amd64 ~hppa ~ppc ppc64 sparc x86" +IUSE="command-args selinux ssl tcpd" + +DEPEND="acct-group/nagios + acct-user/nagios + tcpd? ( + sys-apps/tcp-wrappers + ) + ssl? ( + dev-libs/openssl:= + )" +RDEPEND="${DEPEND} + || ( net-analyzer/nagios-plugins net-analyzer/monitoring-plugins ) + selinux? ( sec-policy/selinux-nagios )" + +PATCHES=( + "${FILESDIR}/nrpe-3.2.1-eliminate-systemd-pid.patch" +) + +src_prepare() { + default + eautoreconf +} + +src_configure() { + # The configure script tries to detect what OS, distribution, and + # init system you're running and changes the build/install process + # depending on what it comes up with. We specify fixed values + # because we don't want it guessing, for example, whether or not + # to install the tmpfiles.d entry based on whether or not systemd + # is currently running (OpenRC uses them too). + # + # Note: upstream defaults to using "nagios" as the default NRPE + # user and group. I have a feeling that this isn't quite correct + # on a system where "nagios" is also the user running the nagios + # server daemon. In the future, it would be nice if someone who + # actually uses NRPE could test with an unprivileged "nrpe" as + # the user and group. + econf \ + --libexecdir=/usr/$(get_libdir)/nagios/plugins \ + --localstatedir=/var/lib/nagios \ + --sysconfdir=/etc/nagios \ + --with-nrpe-user=nagios \ + --with-nrpe-group=nagios \ + --with-piddir=/run \ + --with-opsys=unknown \ + --with-dist-type=unknown \ + --with-init-type=unknown \ + --with-inetd-type=unknown \ + $(use_enable command-args) \ + $(use_enable ssl) \ + $(use_enable tcpd) +} + +src_compile() { + emake all +} + +src_install() { + default + + dodoc CHANGELOG.md SECURITY.md + insinto /etc/nagios + newins sample-config/nrpe.cfg nrpe.cfg + fowners root:nagios /etc/nagios/nrpe.cfg + fperms 0640 /etc/nagios/nrpe.cfg + + newinitd "startup/openrc-init" nrpe + newconfd "startup/openrc-conf" nrpe + systemd_newunit "startup/default-service" "${PN}.service" + + insinto /etc/xinetd.d/ + newins "${FILESDIR}/nrpe.xinetd.2" nrpe + + rm "${ED}/usr/bin/nrpe-uninstall" || die 'failed to remove uninstall tool' + rm -r "${ED}/run" || die 'failed to remove /run' +} + +pkg_postinst() { + if use command-args ; then + ewarn '' + ewarn 'You have enabled command-args for NRPE. That lets clients' + ewarn 'supply arguments to the commands that are run, and IS A' + ewarn 'SECURITY RISK!' + ewarn '' + fi +} diff --git a/net-analyzer/nsat/files/nsat-1.5-configure-dash.patch b/net-analyzer/nsat/files/nsat-1.5-configure-dash.patch new file mode 100644 index 000000000000..af19ba293ddb --- /dev/null +++ b/net-analyzer/nsat/files/nsat-1.5-configure-dash.patch @@ -0,0 +1,79 @@ +From eda78d802b11dd7c920cd8e0396ca064f34e2a8b Mon Sep 17 00:00:00 2001 +From: Sam James <sam@gentoo.org> +Date: Thu, 5 Aug 2021 00:27:23 +0100 +Subject: [PATCH] Fix configure with non-bash (dash) + +--- + configure.in | 14 +++++++------- + 1 file changed, 7 insertions(+), 7 deletions(-) + +diff --git a/configure.in b/configure.in +index 95c59da..b549092 100644 +--- a/configure.in ++++ b/configure.in +@@ -10,7 +10,7 @@ AC_CONFIG_HEADER(src/libmix++/mix/lmconfig.h) + + AC_PROG_CC + AC_MSG_CHECKING(accepted compiler flags) +-if test $ac_cv_prog_gcc = yes; then ++if test x$ac_cv_prog_gcc = xyes; then + AC_MSG_RESULT(GNU CC/ANSI (good)) + else + AC_MSG_RESULT(crappy :P) +@@ -41,7 +41,7 @@ case "`${UNAME}`" in + AC_MSG_RESULT(found Linux. Ph33r.) + AC_DEFINE(HAVE_LINUX) + AC_DEFINE(MY_HDRINCL,3) +-if test $LEETCC = yes; then ++if test x$LEETCC = xyes; then + CCOPTS='-Wall -O6 -funroll-loops -ansi -fPIC -DLINUX' + else + CCOPTS="${CFLAGS} -DLINUX" +@@ -54,7 +54,7 @@ fi + AC_MSG_RESULT(found MAC OS X) + AC_DEFINE(HAVE_BSD) + AC_DEFINE(MY_HDRINCL,2) +-if test $LEETCC = yes; then ++if test x$LEETCC = xyes; then + CCOPTS='-Wall -O -funroll-loops -ansi -fPIC -DBSD44 -DDARWIN' + else + CCOPTS='-DBSD44 -DOBSD' +@@ -67,7 +67,7 @@ fi + AC_MSG_RESULT(found OpenBSD. Yay.) + AC_DEFINE(HAVE_BSD) + AC_DEFINE(MY_HDRINCL,2) +-if test $LEETCC = yes; then ++if test x$LEETCC = xyes; then + CCOPTS='-Wall -O6 -funroll-loops -ansi -fPIC -DBSD44 -DOBSD' + else + CCOPTS='-DBSD44 -DOBSD' +@@ -80,7 +80,7 @@ fi + AC_MSG_RESULT(found BSD. Yay.) + AC_DEFINE(HAVE_BSD) + AC_DEFINE(MY_HDRINCL,2) +-if test $LEETCC = yes; then ++if test x$LEETCC = xyes; then + CCOPTS='-Wall -O6 -funroll-loops -ansi -fPIC -DBSD44' + else + CCOPTS='-DBSD44' +@@ -95,7 +95,7 @@ fi + AC_DEFINE(MY_HDRINCL,2) + AC_CHECK_LIB(socket, socket, [ CLIB="$CLIB -lsocket " ], AC_MSG_ERROR(libsocket not found.)) + AC_CHECK_LIB(nsl, gethostbyname, [ CLIB="$CLIB -lnsl " ], AC_MSG_ERROR(libnsl not found.)) +-if test $LEETCC = yes; then ++if test x$LEETCC = xyes; then + CCOPTS='-Wall -O6 -funroll-loops -ansi -fPIC -DSOLARIS' + else + CCOPTS='-DSOLARIS' +@@ -169,7 +169,7 @@ AC_HEADER_STDC + AC_CHECK_HEADERS(fcntl.h unistd.h sys/select.h sys/time.h sys/types.h sys/socket.h stdarg.h std_args.h strings.h netdb.h netinet/in.h arpa/inet.h signal.h stdlib.h errno.h ctype.h sys/file.h sys/ioctl.h sys/signal.h sys/stream.h sys/dlpi.h sys/bufmod.h sys/stropts.h sys/param.h sys/termios.h sys/filio.h net/if.h netinet/in_systm.h netinet/ip.h netinet/ip_var.h netinet/ip_icmp.h sys/resource.h X11/Xlib.h) + + AC_C_BIGENDIAN +- if test $ac_cv_c_bigendian = yes; then ++ if test x$ac_cv_c_bigendian = xyes; then + ENDIANESS1="#ifndef WORDS_BIGENDIAN" + ENDIANESS2="#define WORDS_BIGENDIAN /* this is a big endian machine */" + else +-- +2.32.0 + diff --git a/net-analyzer/nsat/metadata.xml b/net-analyzer/nsat/metadata.xml index a812c2597e63..96061d9d2f13 100644 --- a/net-analyzer/nsat/metadata.xml +++ b/net-analyzer/nsat/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>netmon@gentoo.org</email> diff --git a/net-analyzer/nsat/nsat-1.5-r5.ebuild b/net-analyzer/nsat/nsat-1.5-r5.ebuild deleted file mode 100644 index 0b60e57866fa..000000000000 --- a/net-analyzer/nsat/nsat-1.5-r5.ebuild +++ /dev/null @@ -1,75 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit autotools toolchain-funcs - -DESCRIPTION="Network Security Analysis Tool, an application-level network security scanner" -HOMEPAGE="http://nsat.sourceforge.net/" -SRC_URI="mirror://sourceforge/nsat/${P}.tgz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~ppc x86" -IUSE="X" - -RDEPEND=" - dev-libs/libmix - net-libs/libnsl:0= - net-libs/libpcap - net-libs/libtirpc - net-libs/rpcsvc-proto - X? ( - dev-lang/tk:* - x11-libs/libX11 - ) -" -DEPEND="$RDEPEND" -S="${WORKDIR}/${PN}" -PATCHES=( - "${FILESDIR}"/${P}-configure.patch - "${FILESDIR}"/${P}-lvalue-gcc4.patch - "${FILESDIR}"/${P}-strip.patch - "${FILESDIR}"/${P}-misc.patch - "${FILESDIR}"/${P}-va_list.patch - "${FILESDIR}"/${P}-libtirpc.patch - "${FILESDIR}"/${P}-amd64-compat.patch -) - -src_prepare() { - default - - sed -i \ - -e "s:^#CGIFile /usr/local/share/nsat/nsat.cgi$:#CGIFile /usr/share/nsat/nsat.cgi:g" \ - nsat.conf || die - sed -i -e "s:/usr/local:/usr:g" tools/xnsat || die - sed -i \ - -e "s:/usr/local/share/nsat/nsat.conf:/etc/nsat/nsat.conf:g" \ - -e "s:/usr/local/share/nsat/nsat.cgi:/usr/share/nsat/nsat.cgi:g" \ - src/lang.h || die - - eautoreconf -} - -src_configure() { - tc-export CC - econf $(use_with X x) -} - -src_compile() { - emake MIXOBJ=-lmix++ -} - -src_install() { - dobin nsat smb-ns - use X && dobin tools/xnsat - - insinto /usr/share/nsat - doins nsat.cgi - - insinto /etc/nsat - doins nsat.conf - - dodoc README doc/CHANGES - doman doc/nsat.8 -} diff --git a/net-analyzer/nsat/nsat-1.5-r6.ebuild b/net-analyzer/nsat/nsat-1.5-r6.ebuild new file mode 100644 index 000000000000..af4492f250c8 --- /dev/null +++ b/net-analyzer/nsat/nsat-1.5-r6.ebuild @@ -0,0 +1,80 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=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" +S="${WORKDIR}/${PN}" + +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="~amd64 ~ppc x86" +IUSE="X" + +RDEPEND=" + dev-libs/libmix + net-libs/libnsl:0= + net-libs/libpcap + net-libs/libtirpc:= + net-libs/rpcsvc-proto + X? ( + dev-lang/tk:* + x11-libs/libX11 + ) +" +DEPEND="${RDEPEND}" + +PATCHES=( + "${FILESDIR}"/${P}-configure.patch + "${FILESDIR}"/${P}-lvalue-gcc4.patch + "${FILESDIR}"/${P}-strip.patch + "${FILESDIR}"/${P}-misc.patch + "${FILESDIR}"/${P}-va_list.patch + "${FILESDIR}"/${P}-libtirpc.patch + "${FILESDIR}"/${P}-amd64-compat.patch + "${FILESDIR}"/${P}-configure-dash.patch +) + +src_prepare() { + default + + sed -i \ + -e "s:^#CGIFile /usr/local/share/nsat/nsat.cgi$:#CGIFile /usr/share/nsat/nsat.cgi:g" \ + nsat.conf || die + sed -i -e "s:/usr/local:/usr:g" tools/xnsat || die + sed -i \ + -e "s:/usr/local/share/nsat/nsat.conf:/etc/nsat/nsat.conf:g" \ + -e "s:/usr/local/share/nsat/nsat.cgi:/usr/share/nsat/nsat.cgi:g" \ + src/lang.h || die + + mv configure.{in,ac} || die + + eautoreconf +} + +src_configure() { + tc-export CC + econf $(use_with X x) +} + +src_compile() { + emake MIXOBJ=-lmix++ +} + +src_install() { + dobin nsat smb-ns + use X && dobin tools/xnsat + + insinto /usr/share/nsat + doins nsat.cgi + + insinto /etc/nsat + doins nsat.conf + + dodoc README doc/CHANGES + doman doc/nsat.8 +} diff --git a/net-analyzer/nsca/metadata.xml b/net-analyzer/nsca/metadata.xml index 6d5b1ccd3d20..11c0f82cef42 100644 --- a/net-analyzer/nsca/metadata.xml +++ b/net-analyzer/nsca/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>sysadmin@gentoo.org</email> diff --git a/net-analyzer/nsca/nsca-2.7.2-r103.ebuild b/net-analyzer/nsca/nsca-2.7.2-r103.ebuild index c7120d06b665..bb6a49ecfbfa 100644 --- a/net-analyzer/nsca/nsca-2.7.2-r103.ebuild +++ b/net-analyzer/nsca/nsca-2.7.2-r103.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/nagios/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 ~arm ppc ppc64 sparc x86" +KEYWORDS="~alpha amd64 ~arm ~ppc ppc64 sparc x86" IUSE="tcpd +crypt minimal" DEPEND="crypt? ( >=dev-libs/libmcrypt-2.5.1-r4 ) diff --git a/net-analyzer/nstats/metadata.xml b/net-analyzer/nstats/metadata.xml index 74c2baebb4ec..dce3f3be66c0 100644 --- a/net-analyzer/nstats/metadata.xml +++ b/net-analyzer/nstats/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>netmon@gentoo.org</email> diff --git a/net-analyzer/nstats/nstats-0.4-r3.ebuild b/net-analyzer/nstats/nstats-0.4-r3.ebuild deleted file mode 100644 index 65b96057aa7b..000000000000 --- a/net-analyzer/nstats/nstats-0.4-r3.ebuild +++ /dev/null @@ -1,38 +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 - -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" - -SLOT="0" -KEYWORDS="amd64 ~ppc x86" - -RDEPEND=" - net-libs/libpcap - sys-libs/ncurses -" -DEPEND=" - ${RDEPEND} - virtual/pkgconfig -" -PATCHES=( - "${FILESDIR}"/${P}-glibc24.patch - "${FILESDIR}"/${P}-makefile.patch - "${FILESDIR}"/${P}-tinfo.patch -) -DOCS=( BUGS doc/TODO doc/ChangeLog ) - -src_prepare() { - default - eautoreconf -} - -src_configure() { - append-cflags -fcommon - default -} diff --git a/net-analyzer/nstats/nstats-0.4-r4.ebuild b/net-analyzer/nstats/nstats-0.4-r4.ebuild new file mode 100644 index 000000000000..29ee8957fee9 --- /dev/null +++ b/net-analyzer/nstats/nstats-0.4-r4.ebuild @@ -0,0 +1,41 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools flag-o-matic + +DESCRIPTION="Displays statistics about ethernet traffic including protocol breakdown" +HOMEPAGE="http://trash.net/~reeler/nstats/" +SRC_URI="http://trash.net/~reeler/nstats/files/${P}.tar.gz" + +LICENSE="Artistic" +SLOT="0" +KEYWORDS="amd64 ~ppc x86" + +RDEPEND=" + net-libs/libpcap + sys-libs/ncurses +" +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() { + default + eautoreconf +} + +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 b42fe71c99fa..88d1b021acfd 100644 --- a/net-analyzer/ntopng/Manifest +++ b/net-analyzer/ntopng/Manifest @@ -1,2 +1,3 @@ -DIST ntopng-3.8.1.tar.gz 33914341 BLAKE2B 3b0df382e938af78d10e71282e863ccb7ba1da3dc7e2bf90b45f1e6e4670052a8c61a16cb8547f119f0dc753a2e31273b41f40aa26919480cbaecf43b6d59742 SHA512 4cb613881e36b435f97dcc25dfaa505d9c552f63ad8334d5c9d47ec06376d47124c65e6d782546d36f6d27b34b037cc73df7129f459f290ac51e270bb7453970 -DIST ntopng-4.0.tar.gz 43239175 BLAKE2B 689883685d46d339d61c338607e2164e36903313cdc0e0e2b649acd7468505f72fce75118a2c3ef55e54d942fc5cc3c312efbd46f8e2603bbcfaf206908bce82 SHA512 a278cc5f304e3040b31c691286650a54d61b5587033724c4513dd7372168477d5b0b471a1d2a5c5682034464b022b88e971567a38d836216431ea77bf1ed90c9 +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 diff --git a/net-analyzer/ntopng/files/ntopng-3.8-mysqltool.patch b/net-analyzer/ntopng/files/ntopng-3.8-mysqltool.patch deleted file mode 100644 index 62c328a3505e..000000000000 --- a/net-analyzer/ntopng/files/ntopng-3.8-mysqltool.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- a/configure.seed -+++ b/configure.seed -@@ -355,13 +355,7 @@ - if test "x$ac_cv_prog_ac_ct_MARIADB" = "xmariadb_config"; then - MYSQLTOOL="mariadb_config" - else -- PATH=$PATH:/usr/local/mysql/bin -- AC_CHECK_TOOL(MYSQL, mysql_config) -- if test "x$ac_cv_prog_ac_ct_MYSQL" = "xmysql_config"; then -- MYSQLTOOL="mysql_config" -- else -- MYSQLTOOL="" -- fi -+ MYSQLTOOL="mysql_config" - fi - - if test -n "$MYSQLTOOL"; then diff --git a/net-analyzer/ntopng/files/ntopng-3.8-ndpi-includes.patch b/net-analyzer/ntopng/files/ntopng-3.8-ndpi-includes.patch deleted file mode 100644 index cdd5e827147c..000000000000 --- a/net-analyzer/ntopng/files/ntopng-3.8-ndpi-includes.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- a/configure.seed -+++ b/configure.seed -@@ -129,9 +129,9 @@ - fi - - PKG_CHECK_MODULES([NDPI], [libndpi >= 2.0], [ -- NDPI_INC=`echo $NDPI_CFLAGS | sed -e "s/[ ]*$//"`/libndpi -+ NDPI_INC=`echo $NDPI_CFLAGS | sed -e "s/[ ]*$//"` - # Use static libndpi library as building against the dynamic library fails -- NDPI_LIB="-Wl,-Bstatic $NDPI_LIBS -Wl,-Bdynamic" -+ NDPI_LIB="$NDPI_LIBS" - NDPI_LIB_DEP= - ], [ - AC_MSG_CHECKING(for nDPI source) diff --git a/net-analyzer/ntopng/files/ntopng-3.8.1-PKG_CONFIG.patch b/net-analyzer/ntopng/files/ntopng-3.8.1-PKG_CONFIG.patch deleted file mode 100644 index 12117d791bcd..000000000000 --- a/net-analyzer/ntopng/files/ntopng-3.8.1-PKG_CONFIG.patch +++ /dev/null @@ -1,95 +0,0 @@ ---- a/configure.seed -+++ b/configure.seed -@@ -6,6 +6,8 @@ - - AC_PROG_CXX - -+PKG_PROG_PKG_CONFIG -+ - dnl> Add /usr/local/ /opt/local - CFLAGS="-I${PWD} -I${PWD}/include" - CPPFLAGS="${CPPFLAGS} -I${PWD} -I${PWD}/include" -@@ -179,10 +179,10 @@ - fi - dnl finish: nDPI handling - --if test -z `pkg-config --exists libssl`; then -+if ${PKG_CONFIG} --exists libssl; then - AC_DEFINE_UNQUOTED(NO_SSL_DL, 1, [has openssl]) -- SSL_INC="`pkg-config --cflags libssl` -I/usr/include/openssl" -- SSL_LIB="`pkg-config --libs libssl` -lssl -lcrypto" -+ SSL_INC="`${PKG_CONFIG} --cflags libssl` -I/usr/include/openssl" -+ SSL_LIB="`${PKG_CONFIG} --libs libssl` -lssl -lcrypto" - fi - - AC_MSG_CHECKING(for ntopng professional edition) ---- a/Makefile.in -+++ b/Makefile.in -@@ -44,10 +44,10 @@ - - ###### - LIBRRDTOOL_HOME=${PWD}/third-party/rrdtool-1.4.8 --HAS_LIBRRDTOOL=$(shell pkg-config --atleast-version=1.4.8 librrd; echo $$?) -+HAS_LIBRRDTOOL=$(shell $(PKG_CONFIG) --atleast-version=1.4.8 librrd; echo $$?) - ifeq ($(HAS_LIBRRDTOOL), 0) -- LIBRRDTOOL_INC = $(shell pkg-config --cflags librrd) -- LIBRRDTOOL_LIB = $(shell pkg-config --libs librrd) # -lrrd_th -+ LIBRRDTOOL_INC = $(shell $(PKG_CONFIG) --cflags librrd) -+ LIBRRDTOOL_LIB = $(shell $(PKG_CONFIG) --libs librrd) # -lrrd_th - else - LIBRRDTOOL_INC=-I$(LIBRRDTOOL_HOME)/src/ - ifeq ($(OS), $(filter $(OS), OpenBSD FreeBSD)) -@@ -70,10 +70,10 @@ - - ###### - --HAS_JSON=$(shell pkg-config --exists json-c; echo $$?) -+HAS_JSON=$(shell $(PKG_CONFIG) --exists json-c; echo $$?) - ifeq ($(HAS_JSON), 0) -- JSON_INC = $(shell pkg-config --cflags json-c) -- JSON_LIB = $(shell pkg-config --libs json-c) -+ JSON_INC = $(shell $(PKG_CONFIG) --cflags json-c) -+ JSON_LIB = $(shell $(PKG_CONFIG) --libs json-c) - else - JSON_HOME=${PWD}/third-party/json-c - JSON_INC=-I$(JSON_HOME) -@@ -83,21 +83,21 @@ - ###### - - ifeq (@NEDGE@, 0) -- HAS_SODIUM=$(shell pkg-config --exists libsodium; echo $$?) -+ HAS_SODIUM=$(shell $(PKG_CONFIG) --exists libsodium; echo $$?) - ifeq ($(HAS_SODIUM), 0) -- SODIUM_INC = $(shell pkg-config --cflags libsodium) -- SODIUM_LIB = $(shell pkg-config --libs libsodium) -+ SODIUM_INC = $(shell $(PKG_CONFIG) --cflags libsodium) -+ SODIUM_LIB = $(shell $(PKG_CONFIG) --libs libsodium) - else - SODIUM_INC= - SODIUM_LIB= - endif - -- HAS_ZEROMQ=$(shell pkg-config --exists libzmq; echo $$?) -+ HAS_ZEROMQ=$(shell $(PKG_CONFIG) --exists libzmq; echo $$?) - ifeq ($(HAS_ZEROMQ), 0) -- ZEROMQ_INC = $(shell pkg-config --cflags libzmq) -+ ZEROMQ_INC = $(shell $(PKG_CONFIG) --cflags libzmq) - ZMQ_STATIC=/usr/local/lib/libzmq.a - ifeq ($(wildcard $(ZMQ_STATIC)),) -- ZEROMQ_LIB = $(shell pkg-config --libs libzmq) -+ ZEROMQ_LIB = $(shell $(PKG_CONFIG) --libs libzmq) - else - ZEROMQ_LIB = $(ZMQ_STATIC) - endif -@@ -106,11 +106,6 @@ - ZEROMQ_INC=-I$(ZEROMQ_HOME)/include - ZEROMQ_LIB=$(ZEROMQ_HOME)/.libs/libzmq.a - endif -- -- HAS_ZSTD=$(shell pkg-config --exists libzstd; echo $$?) -- ifeq ($(HAS_ZSTD), 0) -- ZSTD_LIB = $(shell pkg-config --libs libzstd) -- endif - endif - - ###### diff --git a/net-analyzer/ntopng/files/ntopng-3.8.1-parallel-make.patch b/net-analyzer/ntopng/files/ntopng-3.8.1-parallel-make.patch deleted file mode 100644 index 9089c0a9b04d..000000000000 --- a/net-analyzer/ntopng/files/ntopng-3.8.1-parallel-make.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- a/configure.seed -+++ b/configure.seed -@@ -526,11 +520,7 @@ - - AC_DEFINE_UNQUOTED(_CRT_SECURE_NO_WARNINGS, 1, [Disable warning on windows]) - --GMAKE=`which gmake` --if test x$GMAKE = x --then -- GMAKE="make" --fi -+GMAKE='$(MAKE)' - - GIT=`which git` - if test x$GIT = x diff --git a/net-analyzer/ntopng/files/ntopng-4.0-PKG_CONFIG.patch b/net-analyzer/ntopng/files/ntopng-4.0-PKG_CONFIG.patch deleted file mode 100644 index cc97d3875676..000000000000 --- a/net-analyzer/ntopng/files/ntopng-4.0-PKG_CONFIG.patch +++ /dev/null @@ -1,124 +0,0 @@ ---- a/configure.seed -+++ b/configure.seed -@@ -182,21 +182,21 @@ - fi - dnl finish: nDPI handling - --pkg-config --exists json-c -+${PKG_CONFIG} --exists json-c - if test "$?" -ne 1; then -- JSON_INC=`pkg-config --cflags json-c` -- JSON_LIB=`pkg-config --libs json-c` -+ JSON_INC=`${PKG_CONFIG} --cflags json-c` -+ JSON_LIB=`${PKG_CONFIG} --libs json-c` - else - echo "Please install libjson-c-dev package prerequisite" - exit -1 - fi - - --pkg-config --exists libssl -+${PKG_CONFIG} --exists libssl - if test "$?" -ne 1; then - AC_DEFINE_UNQUOTED(NO_SSL_DL, 1, [has openssl]) -- SSL_INC="`pkg-config --cflags libssl` -I/usr/include/openssl" -- SSL_LIB="`pkg-config --libs libssl` -lssl -lcrypto" -+ SSL_INC="`${PKG_CONFIG} --cflags libssl` -I/usr/include/openssl" -+ SSL_LIB="`${PKG_CONFIG} --libs libssl` -lssl -lcrypto" - else - dnl Workaround for MacOS Brew - if test -d "/usr/local/opt/openssl/lib"; then -@@ -303,8 +303,8 @@ - AC_DEFINE_UNQUOTED(NTOPNG_GIT_RELEASE, "${GIT_BRANCH}:${GIT_RELEASE}", [GIT Release]) - AC_DEFINE_UNQUOTED(NTOPNG_GIT_DATE, "${GIT_DATE}", [Last GIT change]) - --if test -z `which pkg-config`; then -- echo "#!/bin/sh\n" > pkg-config -+if test -z `which ${PKG_CONFIG}`; then -+ echo "#!/bin/sh\n" > ${PKG_CONFIG} - fi - - if test -f ".git/index"; then -@@ -336,8 +336,8 @@ - - if test -d "/usr/include/hiredis"; then - AC_DEFINE_UNQUOTED(HAVE_HIREDIS, 1, [Local hiredis package present]) -- HIREDIS_INC="`pkg-config --cflags hiredis` -I/usr/include/hiredis" -- HIREDIS_LIB="`pkg-config --libs hiredis` -lhiredis" -+ HIREDIS_INC="`${PKG_CONFIG} --cflags hiredis` -I/usr/include/hiredis" -+ HIREDIS_LIB="`${PKG_CONFIG} --libs hiredis` -lhiredis" - else - HIREDIS_INC="-I ${PWD}/third-party/hiredis" - fi -@@ -433,7 +433,7 @@ - UGLIFYJS_MAJOR_VERSION="${UGLIFYJS_VERSION%%.*}" - fi - --AC_CHECK_LIB([rrd_th], [rrd_update_r], [LIBRRD_LD_FLAGS=-lrrd_th], [LIBRRD_LD_FLAGS=`pkg-config --libs librrd`]) -+AC_CHECK_LIB([rrd_th], [rrd_update_r], [LIBRRD_LD_FLAGS=-lrrd_th], [LIBRRD_LD_FLAGS=`${PKG_CONFIG} --libs librrd`]) - - AC_CHECK_LIB([nl], [nl_handle_alloc], [LDFLAGS="${LDFLAGS} -lnl"]) - AC_CHECK_LIB([rt], [clock_gettime], [LDFLAGS="${LDFLAGS} -lrt"]) -@@ -452,7 +452,7 @@ - dnl> https://github.com/curl/curl/blob/curl-7_20_0/TODO-RELEASE - - AC_MSG_CHECKING(for curl SMTP support) -- if `pkg-config --atleast-version="7.20.0" libcurl` ; then -+ if `${PKG_CONFIG} --atleast-version="7.20.0" libcurl` ; then - AC_DEFINE_UNQUOTED(HAVE_CURL_SMTP, 1, [curl supports SMTP]) - AC_MSG_RESULT(yes) - else ---- a/Makefile.in -+++ b/Makefile.in -@@ -45,9 +45,9 @@ - - ###### - LIBRRDTOOL_HOME=${PWD}/third-party/rrdtool-1.4.8 --HAS_LIBRRDTOOL=$(shell pkg-config --atleast-version=1.4.8 librrd && echo 0) -+HAS_LIBRRDTOOL=$(shell ${PKG_CONFIG} --atleast-version=1.4.8 librrd && echo 0) - ifeq ($(HAS_LIBRRDTOOL), 0) -- LIBRRDTOOL_INC = $(shell pkg-config --cflags librrd) -+ LIBRRDTOOL_INC = $(shell ${PKG_CONFIG} --cflags librrd) - LIBRRDTOOL_LIB = @LIBRRD_LD_FLAGS@ - else - LIBRRDTOOL_INC=-I$(LIBRRDTOOL_HOME)/src/ -@@ -77,21 +77,21 @@ - ###### - - ifeq (@NEDGE@, 0) -- HAS_SODIUM=$(shell pkg-config --exists libsodium && echo 0) -+ HAS_SODIUM=$(shell ${PKG_CONFIG} --exists libsodium && echo 0) - ifeq ($(HAS_SODIUM), 0) -- SODIUM_INC = $(shell pkg-config --cflags libsodium) -- SODIUM_LIB = $(shell pkg-config --libs libsodium) -+ SODIUM_INC = $(shell ${PKG_CONFIG} --cflags libsodium) -+ SODIUM_LIB = $(shell ${PKG_CONFIG} --libs libsodium) - else - SODIUM_INC= - SODIUM_LIB= - endif - -- HAS_ZEROMQ=$(shell pkg-config --exists libzmq && echo 0) -+ HAS_ZEROMQ=$(shell ${PKG_CONFIG} --exists libzmq && echo 0) - ifeq ($(HAS_ZEROMQ), 0) -- ZEROMQ_INC = $(shell pkg-config --cflags libzmq) -+ ZEROMQ_INC = $(shell ${PKG_CONFIG} --cflags libzmq) - ZMQ_STATIC=/usr/local/lib/libzmq.a - ifeq ($(wildcard $(ZMQ_STATIC)),) -- ZEROMQ_LIB = $(shell pkg-config --libs libzmq) -+ ZEROMQ_LIB = $(shell ${PKG_CONFIG} --libs libzmq) - else - ZEROMQ_LIB = $(ZMQ_STATIC) - endif -@@ -101,9 +101,9 @@ - ZEROMQ_LIB=$(ZEROMQ_HOME)/.libs/libzmq.a - endif - -- HAS_ZSTD=$(shell pkg-config --exists libzstd && echo 0) -+ HAS_ZSTD=$(shell ${PKG_CONFIG} --exists libzstd && echo 0) - ifeq ($(HAS_ZSTD), 0) -- ZSTD_LIB = $(shell pkg-config --libs libzstd) -+ ZSTD_LIB = $(shell ${PKG_CONFIG} --libs libzstd) - endif - endif - diff --git a/net-analyzer/ntopng/files/ntopng-4.0-ndpi-includes.patch b/net-analyzer/ntopng/files/ntopng-4.0-ndpi-includes.patch deleted file mode 100644 index d1f61ce52abe..000000000000 --- a/net-analyzer/ntopng/files/ntopng-4.0-ndpi-includes.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/configure.seed -+++ b/configure.seed -@@ -134,7 +134,7 @@ - PKG_CHECK_MODULES([NDPI], [libndpi >= 2.0], [ - NDPI_INC=`echo $NDPI_CFLAGS | sed -e "s/[ ]*$//"` - # Use static libndpi library as building against the dynamic library fails -- NDPI_LIB="-Wl,-Bstatic $NDPI_LIBS -Wl,-Bdynamic" -+ NDPI_LIB="$NDPI_LIBS" - NDPI_LIB_DEP= - ], [ - AC_MSG_CHECKING(for nDPI source) diff --git a/net-analyzer/ntopng/files/ntopng-5.2.1-build-system.patch b/net-analyzer/ntopng/files/ntopng-5.2.1-build-system.patch new file mode 100644 index 000000000000..ff05d103f22a --- /dev/null +++ b/net-analyzer/ntopng/files/ntopng-5.2.1-build-system.patch @@ -0,0 +1,89 @@ +https://github.com/ntop/ntopng/pull/6288 + +From 93b62eb0b48f9914fed5511dc2a4289a83a1ed34 Mon Sep 17 00:00:00 2001 +From: Sam James <sam@gentoo.org> +Date: Tue, 8 Feb 2022 06:07:21 +0000 +Subject: [PATCH 1/3] build: fail configure if ZMQ can't be found + +We already "fail" (makefile won't be generated) when ZMQ can't be found but +the exit code doesn't represent this until now. + +Signed-off-by: Sam James <sam@gentoo.org> +--- + configure.ac.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac.in b/configure.ac.in +index b032d7faa34..0b30e9480c7 100644 +--- a/configure.ac.in ++++ b/configure.ac.in +@@ -132,7 +132,7 @@ if test "x$ac_cv_lib_zmq_zmq_socket_monitor" = xyes; then : + AC_DEFINE_UNQUOTED(HAVE_ZMQ, 1, [ZMQ is present]) + else + echo "ZMQ not present or too old (< v. 3.x)" +- exit ++ exit 1 + fi + + AC_CHECK_LIB([sodium], [sodium_init], LIBS="${LIBS} -lsodium") + +From 75206e5a3fdc289a2229770595fbf588de79402b Mon Sep 17 00:00:00 2001 +From: Sam James <sam@gentoo.org> +Date: Tue, 8 Feb 2022 06:08:02 +0000 +Subject: [PATCH 2/3] build: avoid bashism in configure + +[[ ]] and == are both Bashisms and /bin/sh may be a POSIX compliant +shell (Debian notably uses dash for /bin/sh which wouldn't be +happy with this). + +This will continue to work on Bash. + +Signed-off-by: Sam James <sam@gentoo.org> +--- + configure.ac.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac.in b/configure.ac.in +index 0b30e9480c7..3dc6ef4a539 100644 +--- a/configure.ac.in ++++ b/configure.ac.in +@@ -187,7 +187,7 @@ fi + + if [ test -f /usr/bin/lsb_release ]; then + CODENAME=`/usr/bin/lsb_release -c|cut -f 2` +- if [[ $CODENAME == "wheezy" ]]; then : ++ if test $CODENAME = "wheezy" ; then + CPPFLAGS="${CPPFLAGS} -DOLD_NETFILTER_INTERFACE=1" + fi + fi + +From 6e355cb98078dbfc379ba178ec99b7e351afdfe9 Mon Sep 17 00:00:00 2001 +From: Sam James <sam@gentoo.org> +Date: Tue, 8 Feb 2022 06:09:44 +0000 +Subject: [PATCH 3/3] build: use $(MAKE) + +This allows parallel builds to work properly as we'll be calling 'make ...' +with any additional arguments it internally passes down rather than literally +just make. + +Signed-off-by: Sam James <sam@gentoo.org> +--- + configure.ac.in | 5 +---- + 1 file changed, 1 insertion(+), 4 deletions(-) + +diff --git a/configure.ac.in b/configure.ac.in +index 3dc6ef4a539..3ff06c4efd4 100644 +--- a/configure.ac.in ++++ b/configure.ac.in +@@ -720,10 +720,7 @@ fi + + AC_DEFINE_UNQUOTED(_CRT_SECURE_NO_WARNINGS, 1, [Disable warning on windows]) + +-GMAKE=`which gmake` +-if test x$GMAKE = x; then +- GMAKE="make" +-fi ++GMAKE='$(MAKE)' + + GIT=`which git` + if test x$GIT = x; then diff --git a/net-analyzer/ntopng/files/ntopng-5.2.1-mysqltool.patch b/net-analyzer/ntopng/files/ntopng-5.2.1-mysqltool.patch new file mode 100644 index 000000000000..48551589f022 --- /dev/null +++ b/net-analyzer/ntopng/files/ntopng-5.2.1-mysqltool.patch @@ -0,0 +1,17 @@ +--- a/configure.ac.in ++++ b/configure.ac.in +@@ -596,13 +596,7 @@ if test "${with_nedge+set}" != set; then + if test "x$ac_cv_prog_ac_ct_MARIADB" = "xmariadb_config"; then + MYSQLTOOL="mariadb_config" + else +- PATH=$PATH:/usr/local/mysql/bin +- AC_CHECK_TOOL(MYSQL, mysql_config) +- if test "x$ac_cv_prog_ac_ct_MYSQL" = "xmysql_config"; then +- MYSQLTOOL="mysql_config" +- else +- MYSQLTOOL="" +- fi ++ MYSQLTOOL="mysql_config" + fi + + if test -n "$MYSQLTOOL"; then diff --git a/net-analyzer/ntopng/files/ntopng-5.2.1-ndpi-linking.patch b/net-analyzer/ntopng/files/ntopng-5.2.1-ndpi-linking.patch new file mode 100644 index 000000000000..4940cb44b733 --- /dev/null +++ b/net-analyzer/ntopng/files/ntopng-5.2.1-ndpi-linking.patch @@ -0,0 +1,13 @@ +--- a/configure.ac.in ++++ b/configure.ac.in +@@ -236,8 +236,8 @@ fi + PKG_CHECK_MODULES([NDPI], [libndpi >= 2.0], [ + NDPI_INC=`echo $NDPI_CFLAGS | sed -e "s/[ ]*$//"` + # Use static libndpi library as building against the dynamic library fails +- NDPI_LIB="-Wl,-Bstatic $NDPI_LIBS -Wl,-Bdynamic" +- #NDPI_LIB="$NDPI_LIBS" ++ #NDPI_LIB="-Wl,-Bstatic $NDPI_LIBS -Wl,-Bdynamic" ++ NDPI_LIB="$NDPI_LIBS" + NDPI_LIB_DEP= + ], [ + AC_MSG_CHECKING(for nDPI source) diff --git a/net-analyzer/ntopng/files/ntopng-5.4-ndpi-linking.patch b/net-analyzer/ntopng/files/ntopng-5.4-ndpi-linking.patch new file mode 100644 index 000000000000..8a50b7cb1a10 --- /dev/null +++ b/net-analyzer/ntopng/files/ntopng-5.4-ndpi-linking.patch @@ -0,0 +1,49 @@ +--- a/configure.ac.in ++++ b/configure.ac.in +@@ -231,31 +231,8 @@ NDPI_LIB= + NDPI_LIB_DEP= + + AC_MSG_CHECKING(for nDPI source) +- if test -d "./nDPI" ; then : +- NDPI_HOME=./nDPI +- elif test -d "../nDPI" ; then : +- NDPI_HOME=../nDPI +- elif test -d "$HOME/nDPI" ; then : +- NDPI_HOME=$HOME/nDPI +- fi +- +- if test ! -z "$NDPI_HOME" ; then : +- AC_MSG_RESULT(found in $NDPI_HOME) +- NDPI_LIB=$NDPI_HOME/src/lib/libndpi.a +- AC_MSG_CHECKING(for $NDPI_LIB) +- if test -r $NDPI_LIB ; then : +- AC_MSG_RESULT(found $NDPI_LIB) +- else +- AC_MSG_RESULT(not found $NDPI_LIB: compiling) +- cd $NDPI_HOME; ./autogen.sh; ${MAKE}; cd - +- fi +- NDPI_INC="-I$NDPI_HOME/src/include -I$NDPI_HOME/src/lib/third_party/include" +- NDPI_LIB=$NDPI_HOME/src/lib/libndpi.a +- NDPI_LIB_DEP=$NDPI_LIB +- else +- AC_MSG_RESULT(not found) +- fi +- ++ NDPI_LIB="-lndpi" ++ NDPI_LIB_DEP=$NDPI_LIB + + if test ! -z "$NDPI_CUST_INC" ; then : + NDPI_INC=$NDPI_CUST_INC +diff --git a/configure.ac.in b/configure.ac.in +index ed906b1..3e70bec 100644 +--- a/configure.ac.in ++++ b/configure.ac.in +@@ -242,7 +242,7 @@ if test ! -z "$NDPI_CUST_LIB" ; then : + NDPI_LIB=$NDPI_CUST_LIB + fi + +-if test -z "$NDPI_INC" || test -z "$NDPI_LIB" ; then : ++if test -z "$NDPI_LIB" ; then : + echo "Could not find nDPI" + echo "Please do cd ..; git clone https://github.com/ntop/nDPI.git; cd nDPI; ./autogen.sh; ${MAKE}; cd ../ntopng" + echo "and try again" diff --git a/net-analyzer/ntopng/metadata.xml b/net-analyzer/ntopng/metadata.xml index f31113c67cca..907723bdb488 100644 --- a/net-analyzer/ntopng/metadata.xml +++ b/net-analyzer/ntopng/metadata.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type='project'> -<email>netmon@gentoo.org</email> -</maintainer> - <upstream> - <remote-id type="github">ntop/ntopng</remote-id> - </upstream> + <maintainer type="project"> + <email>netmon@gentoo.org</email> + </maintainer> + <upstream> + <remote-id type="github">ntop/ntopng</remote-id> + <remote-id type="github">ntop/ntopng-dist</remote-id> + </upstream> </pkgmetadata> diff --git a/net-analyzer/ntopng/ntopng-3.8.1-r4.ebuild b/net-analyzer/ntopng/ntopng-3.8.1-r4.ebuild deleted file mode 100644 index b4562c2a6b21..000000000000 --- a/net-analyzer/ntopng/ntopng-3.8.1-r4.ebuild +++ /dev/null @@ -1,99 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit autotools user toolchain-funcs - -DESCRIPTION="Network traffic analyzer with web interface" -HOMEPAGE="https://www.ntop.org/" -SRC_URI="https://github.com/ntop/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -DEPEND=" - >=net-libs/nDPI-3.0:= - 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/zeromq-3:= - net-misc/curl - sys-libs/libcap - sys-libs/zlib -" -RDEPEND=" - ${DEPEND} - dev-db/redis -" -BDEPEND=" - virtual/pkgconfig -" -PATCHES=( - "${FILESDIR}"/${PN}-3.8-mysqltool.patch - "${FILESDIR}"/${PN}-3.8-ndpi-includes.patch - "${FILESDIR}"/${PN}-3.8.1-PKG_CONFIG.patch - "${FILESDIR}"/${PN}-3.8.1-parallel-make.patch -) -RESTRICT="test" - -pkg_setup() { - enewuser ntopng -} - -src_prepare() { - default - - sed \ - -e "s/@VERSION@/${PV}.$(date +%y%m%d)/g" \ - -e "s/@SHORT_VERSION@/${PV}/g" \ - < "${S}/configure.seed" \ - > "${S}/configure.ac" || die - - eautoreconf -} - -src_configure() { - tc-export PKG_CONFIG - default -} - -src_compile() { - emake \ - CC="$(tc-getCC)" \ - MYCFLAGS="${CFLAGS}" \ - MYLDFLAGS="${LDFLAGS}" -} - -src_install() { - SHARE_NTOPNG_DIR="${EPREFIX}/usr/share/${PN}" - dodir ${SHARE_NTOPNG_DIR} - insinto ${SHARE_NTOPNG_DIR} - doins -r httpdocs - doins -r scripts - - dodir ${SHARE_NTOPNG_DIR}/third-party - 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/ntopng/ntopng-4.0.ebuild b/net-analyzer/ntopng/ntopng-4.0.ebuild deleted file mode 100644 index 45fcb2be47c3..000000000000 --- a/net-analyzer/ntopng/ntopng-4.0.ebuild +++ /dev/null @@ -1,99 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit autotools user toolchain-funcs - -DESCRIPTION="Network traffic analyzer with web interface" -HOMEPAGE="https://www.ntop.org/" -SRC_URI="https://github.com/ntop/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -DEPEND=" - >=net-libs/nDPI-3.0:= - 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/zeromq-3:= - net-misc/curl - sys-libs/libcap - sys-libs/zlib -" -RDEPEND=" - ${DEPEND} - dev-db/redis -" -BDEPEND=" - virtual/pkgconfig -" -PATCHES=( - "${FILESDIR}"/${PN}-3.8-mysqltool.patch - "${FILESDIR}"/${PN}-3.8.1-parallel-make.patch - "${FILESDIR}"/${PN}-4.0-ndpi-includes.patch - "${FILESDIR}"/${PN}-4.0-PKG_CONFIG.patch -) -RESTRICT="test" - -pkg_setup() { - enewuser ntopng -} - -src_prepare() { - default - - sed \ - -e "s/@VERSION@/${PV}.$(date +%y%m%d)/g" \ - -e "s/@SHORT_VERSION@/${PV}/g" \ - < "${S}/configure.seed" \ - > "${S}/configure.ac" || die - - eautoreconf -} - -src_configure() { - tc-export PKG_CONFIG - default -} - -src_compile() { - emake \ - CC="$(tc-getCC)" \ - MYCFLAGS="${CFLAGS}" \ - MYLDFLAGS="${LDFLAGS}" -} - -src_install() { - SHARE_NTOPNG_DIR="${EPREFIX}/usr/share/${PN}" - dodir ${SHARE_NTOPNG_DIR} - insinto ${SHARE_NTOPNG_DIR} - doins -r httpdocs - doins -r scripts - - dodir ${SHARE_NTOPNG_DIR}/third-party - 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/ntopng/ntopng-5.2.1-r1.ebuild b/net-analyzer/ntopng/ntopng-5.2.1-r1.ebuild new file mode 100644 index 000000000000..84dd505dc13f --- /dev/null +++ b/net-analyzer/ntopng/ntopng-5.2.1-r1.ebuild @@ -0,0 +1,98 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools toolchain-funcs + +DESCRIPTION="Network traffic analyzer with web interface" +HOMEPAGE="https://www.ntop.org/" +SRC_URI="https://github.com/ntop/${PN}/archive/${PV}.tar.gz -> ${P}.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.2:= + <net-libs/nDPI-4.4:= + >=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.2.1-ndpi-linking.patch + "${FILESDIR}"/${PN}-5.2.1-build-system.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 +} + +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}/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/ntopng/ntopng-5.6-r2.ebuild b/net-analyzer/ntopng/ntopng-5.6-r2.ebuild new file mode 100644 index 000000000000..f0d95a98fcd5 --- /dev/null +++ b/net-analyzer/ntopng/ntopng-5.6-r2.ebuild @@ -0,0 +1,104 @@ +# Copyright 1999-2023 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. 5.6-stable) +# See bug #894152 and https://github.com/ntop/ntopng/issues/7203 +NTOPNG_DIST_COMMIT="90d81ad0281eb6eb582a683ac321a3959abb1269" +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.6:= + <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 +) + +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/nttcp/metadata.xml b/net-analyzer/nttcp/metadata.xml index 74c2baebb4ec..dce3f3be66c0 100644 --- a/net-analyzer/nttcp/metadata.xml +++ b/net-analyzer/nttcp/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>netmon@gentoo.org</email> diff --git a/net-analyzer/nttcp/nttcp-1.47-r3.ebuild b/net-analyzer/nttcp/nttcp-1.47-r3.ebuild index f502164771a3..4203113e8853 100644 --- a/net-analyzer/nttcp/nttcp-1.47-r3.ebuild +++ b/net-analyzer/nttcp/nttcp-1.47-r3.ebuild @@ -1,20 +1,21 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 -inherit eutils toolchain-funcs +EAPI=7 -DESCRIPTION="tool to test TCP and UDP throughput" +inherit toolchain-funcs + +DESCRIPTION="Tool to test TCP and UDP throughput" HOMEPAGE="http://www.leo.org/~elmar/nttcp/" SRC_URI="http://www.leo.org/~elmar/nttcp/${P}.tar.gz" -LICENSE="public-domain" +LICENSE="public-domain" SLOT="0" KEYWORDS="amd64 ~mips ~ppc x86" -src_prepare() { - epatch "${FILESDIR}"/${P}-format-security.patch -} +PATCHES=( + "${FILESDIR}"/${P}-format-security.patch +) src_compile() { emake \ diff --git a/net-analyzer/nuttcp/metadata.xml b/net-analyzer/nuttcp/metadata.xml index 66e11db82cfd..e20092a8449c 100644 --- a/net-analyzer/nuttcp/metadata.xml +++ b/net-analyzer/nuttcp/metadata.xml @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> + <maintainer type="person" proxied="yes"> <email>spiderx@spiderx.dp.ua</email> <name>Vladimir Pavljuchenkov</name> </maintainer> - <maintainer type="project"> + <maintainer type="project" proxied="proxy"> <email>proxy-maint@gentoo.org</email> <name>Proxy Maintainers</name> </maintainer> diff --git a/net-analyzer/nuttcp/nuttcp-8.1.4-r1.ebuild b/net-analyzer/nuttcp/nuttcp-8.1.4-r1.ebuild new file mode 100644 index 000000000000..e45ea3aabc0a --- /dev/null +++ b/net-analyzer/nuttcp/nuttcp-8.1.4-r1.ebuild @@ -0,0 +1,62 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit readme.gentoo-r1 systemd toolchain-funcs + +DESCRIPTION="Network performance measurement tool" +HOMEPAGE="https://www.nuttcp.net/" +SRC_URI="https://nuttcp.net/${PN}/${P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="xinetd" + +RDEPEND="xinetd? ( sys-apps/xinetd )" + +DOCS=( examples.txt README ) +# Honor CC, LDFLAGS, CFLAGS, CPPFLAGS +PATCHES=( "${FILESDIR}"/"${P}"-makefile.patch ) + +DOC_CONTENTS="Usage of nuttpc by its service name in xinetd service, +iptables rules, etc. will require adding these lines to /etc/services:\\n +nuttcp\\t\\t5000/tcp\\n +nuttcp-data\\t\\t5001/tcp\\n +nuttcp6\\t\\t5000/tcp\\n +nuttcp6-data\\t\\t5001/tcp\\n\\n +To run ${PN} in server mode, run:\\n/etc/init.d/${PN} start" + +src_prepare() { + default + + # Fix path to binary + sed -i '/server/s|/local||' xinetd.d/nuttcp || die "sed failed" +} + +src_compile() { + emake APPEXT='' CC="$(tc-getCC)" +} + +src_install() { + einstalldocs + doman "${PN}".8 + newbin "${P}" "${PN}" + + newinitd "${FILESDIR}"/"${PN}".initd "${PN}" + newconfd "${FILESDIR}"/"${PN}".confd "${PN}" + systemd_dounit systemd/"${PN}"@.service + systemd_dounit systemd/"${PN}".socket + + if use xinetd ; then + insinto /etc/xinetd.d + doins xinetd.d/"${PN}" + fi + + readme.gentoo_create_doc +} + +pkg_postinst() { + readme.gentoo_print_elog +} diff --git a/net-analyzer/nuttcp/nuttcp-8.1.4.ebuild b/net-analyzer/nuttcp/nuttcp-8.1.4.ebuild deleted file mode 100644 index 97c01c07adc1..000000000000 --- a/net-analyzer/nuttcp/nuttcp-8.1.4.ebuild +++ /dev/null @@ -1,62 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -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" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="ipv6 xinetd" - -RDEPEND="xinetd? ( sys-apps/xinetd )" - -DOCS=( examples.txt README ) -# Honor CC, LDFLAGS, CFLAGS, CPPFLAGS -PATCHES=( "${FILESDIR}"/"${P}"-makefile.patch ) - -DOC_CONTENTS="Usage of nuttpc by its service name in xinetd service, -iptables rules, etc. will require adding these lines to /etc/services:\\n -nuttcp\\t\\t5000/tcp\\n -nuttcp-data\\t\\t5001/tcp\\n -nuttcp6\\t\\t5000/tcp\\n -nuttcp6-data\\t\\t5001/tcp\\n\\n -To run ${PN} in server mode, run:\\n/etc/init.d/${PN} start" - -src_prepare() { - default - - # Fix path to binary - sed -i '/server/s|/local||' xinetd.d/nuttcp || die "sed failed" -} - -src_compile() { - emake "$(usex ipv6 APPEXT='' NOIPV6=-DNO_IPV6)" CC="$(tc-getCC)" -} - -src_install() { - einstalldocs - doman "${PN}".8 - newbin "${P}$(usex ipv6 '' -noipv6)" "${PN}" - - newinitd "${FILESDIR}"/"${PN}".initd "${PN}" - newconfd "${FILESDIR}"/"${PN}".confd "${PN}" - systemd_dounit systemd/"${PN}"@.service - systemd_dounit systemd/"${PN}".socket - - if use xinetd ; then - insinto /etc/xinetd.d - doins xinetd.d/"${PN}" - fi - - readme.gentoo_create_doc -} - -pkg_postinst() { - readme.gentoo_print_elog -} diff --git a/net-analyzer/odhcploc/metadata.xml b/net-analyzer/odhcploc/metadata.xml index 9c86a3d2d05c..3e4cae9bf2a6 100644 --- a/net-analyzer/odhcploc/metadata.xml +++ b/net-analyzer/odhcploc/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>netmon@gentoo.org</email> diff --git a/net-analyzer/odhcploc/odhcploc-20111021-r1.ebuild b/net-analyzer/odhcploc/odhcploc-20111021-r1.ebuild deleted file mode 100644 index 57f948763029..000000000000 --- a/net-analyzer/odhcploc/odhcploc-20111021-r1.ebuild +++ /dev/null @@ -1,23 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit toolchain-funcs - -DESCRIPTION="Open DHCP Locator" -HOMEPAGE="http://odhcploc.sourceforge.net/" -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 new file mode 100644 index 000000000000..2b6ac9ea2117 --- /dev/null +++ b/net-analyzer/odhcploc/odhcploc-20111021-r2.ebuild @@ -0,0 +1,31 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +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" + +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 + + tc-export CC +} + +src_install() { + dobin ${PN} + doman ${PN}.8 + dodoc AUTHORS +} diff --git a/net-analyzer/oinkmaster/metadata.xml b/net-analyzer/oinkmaster/metadata.xml index ec5e8f6c9ef7..846f4fab4191 100644 --- a/net-analyzer/oinkmaster/metadata.xml +++ b/net-analyzer/oinkmaster/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>netmon@gentoo.org</email> diff --git a/net-analyzer/oinkmaster/oinkmaster-2.0.ebuild b/net-analyzer/oinkmaster/oinkmaster-2.0.ebuild index 35f0ef818c0b..121c74ab8df2 100644 --- a/net-analyzer/oinkmaster/oinkmaster-2.0.ebuild +++ b/net-analyzer/oinkmaster/oinkmaster-2.0.ebuild @@ -1,12 +1,11 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 -inherit eutils +EAPI=7 DESCRIPTION="Rule management for SNORT" +HOMEPAGE="https://oinkmaster.sourceforge.net/" SRC_URI="mirror://sourceforge/oinkmaster/${P}.tar.gz" -HOMEPAGE="http://oinkmaster.sf.net/" LICENSE="BSD" SLOT="0" @@ -14,11 +13,11 @@ KEYWORDS="amd64 ~arm ppc sparc x86" IUSE="X" RDEPEND=" + app-arch/gzip + app-arch/tar >=dev-lang/perl-5.6.1 - X? ( dev-perl/Tk ) net-misc/wget - app-arch/tar - app-arch/gzip + X? ( dev-perl/Tk ) " src_install() { diff --git a/net-analyzer/ookla-speedtest/Manifest b/net-analyzer/ookla-speedtest/Manifest new file mode 100644 index 000000000000..def0e9c7711a --- /dev/null +++ b/net-analyzer/ookla-speedtest/Manifest @@ -0,0 +1,4 @@ +DIST ookla-speedtest-1.2.0-linux-aarch64.tgz 1082287 BLAKE2B dc30e0c2bbe3206e326e22c1724f5bd63a9bf3d2237347222d2b36b2ccc98af06b55f5d5635c4487ae85d32323ea66a927b578ee29f89369ca395787bded34a3 SHA512 d7b78428220b84eac345594a500a76211dcbd19ffc9e399642a2e1506494433f9b6e596828bb5387275b0e1d38eada78af8183cefafa2ed1d93bfecdc366e569 +DIST ookla-speedtest-1.2.0-linux-armhf.tgz 1039260 BLAKE2B 8c4dc63bfdd797fd1e8482fa56f514486a564f3fd0e7f1fc008ba1dd6c20c5b3b8d92eb9b25458324b9ee65987edd1ce18f446b16a8e07f1c1f8df864424f75e SHA512 97a41d4ff38aa550faccfc29b9fe8b5d3e25deb2de4690598f2fb8c9469b379604fbd452ab978268e231b70154807ccc9d268a1cf40fa6aa10d2ec176e9b8be7 +DIST ookla-speedtest-1.2.0-linux-i386.tgz 1191626 BLAKE2B e416169ea7d7f86587b166458d5bff6b2d7e7757fb122deafb4fc824430059c15767b54113705e28b3bdb84bfe8420008f5e9bf5e221427ef7e0838faa04ede8 SHA512 a02cb0aabf9ce261944be9097ad9923bcbdc6b61989e764ac67ff5a46dedaff4f39a27ede733c081e3cc8e0b31f494e6be9aebcae9f4f8c63c4e0184ac9e320b +DIST ookla-speedtest-1.2.0-linux-x86_64.tgz 1106829 BLAKE2B 0eef2c45e3b8d2a9b22f52dce3661d2d0ca472f7127404c0d2ba696068a17e09bdc37427162c41ddb7a3f928c3c402047630f7cd733a3651ee4f65ede2f5d6c2 SHA512 f7ea618abcb17204fea3ede6ec84ed968cd2625540a2922247019830fc6f80a3d2e744a78fc37c7c265e7f51222334b49aef222f80acc1698a57c3c9066708e1 diff --git a/net-analyzer/ookla-speedtest/metadata.xml b/net-analyzer/ookla-speedtest/metadata.xml new file mode 100644 index 000000000000..b74538a2763f --- /dev/null +++ b/net-analyzer/ookla-speedtest/metadata.xml @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="person"> + <email>conikost@gentoo.org</email> + <name>Conrad Kostecki</name> + </maintainer> + <longdescription> + Speedtest CLI brings the trusted technology and global server network + behind Speedtest to the command line. Built for software developers, + system administrators and computer enthusiasts alike, + Speedtest CLI is the first official Linux-native Speedtest application + backed by Ookla. + </longdescription> +</pkgmetadata> diff --git a/net-analyzer/ookla-speedtest/ookla-speedtest-1.2.0.ebuild b/net-analyzer/ookla-speedtest/ookla-speedtest-1.2.0.ebuild new file mode 100644 index 000000000000..04352bc97a59 --- /dev/null +++ b/net-analyzer/ookla-speedtest/ookla-speedtest-1.2.0.ebuild @@ -0,0 +1,27 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DESCRIPTION="Internet connection measurement by Ookla" +HOMEPAGE="https://www.speedtest.net/apps/cli" +SRC_URI=" + amd64? ( https://install.speedtest.net/app/cli/${P}-linux-x86_64.tgz ) + arm? ( https://install.speedtest.net/app/cli/${P}-linux-armhf.tgz ) + arm64? ( https://install.speedtest.net/app/cli/${P}-linux-aarch64.tgz ) + x86? ( https://install.speedtest.net/app/cli/${P}-linux-i386.tgz ) +" +S="${WORKDIR}" + +LICENSE="Ookla" +SLOT="0" +KEYWORDS="-* ~amd64 ~arm ~arm64 ~x86" +RESTRICT="bindist mirror" + +QA_PREBUILT="usr/bin/ookla-speedtest" + +src_install() { + newbin speedtest ookla-speedtest + newman speedtest.5 ookla-speedtest.5 + newdoc speedtest.md ookla-speedtest.md +} diff --git a/net-analyzer/openbsd-netcat/Manifest b/net-analyzer/openbsd-netcat/Manifest index 0ccf2ff4923b..9d649ed1d187 100644 --- a/net-analyzer/openbsd-netcat/Manifest +++ b/net-analyzer/openbsd-netcat/Manifest @@ -1,6 +1,4 @@ -DIST netcat-openbsd_1.105-7.debian.tar.gz 31843 BLAKE2B 115eb2d0c0f35055eb26608746806ba97d15b9320954b5d531a73f3f76ed22238395797e90bc3e60dd9cf5b31e696eec59843f37001093013ed0ef82ae590126 SHA512 ec507c858a9f0e75f5a8d6ee8e60eef5200428e55091e831a7acba6c61d70f97af01103c9b65354b0ce773214b0758d957852af793debb70be8aab5b5900b3f6 -DIST netcat-openbsd_1.105.orig.tar.gz 14891 BLAKE2B 65119a4e2cb3d9cd7b2d7d346b827ff1c175cc3255f40d70bbd45213b438635d6b063b3cf210d27595e38b0d67339788221ae5c3737e6096782245fb573bca3a SHA512 1e515b5af83a12c6f270d6e8bede6406cc7c9f83ca0e316816508dfe2e2c49cda3fffb6b24a3922bf9908dc8b70d540eb8cc49e9cbfe867e49133c004d3f4703 -DIST netcat-openbsd_1.190-2.debian.tar.xz 34836 BLAKE2B 3ff4390c07d05e8d1a19c8696da12bdc6bba07c6e88281b04cd7915509f44a14dda66462128da768b255d92f3a02d008750a860db9290f9f8e0e0bb9dd66e01b SHA512 c33510ad6761627e0b7e564747f6ae82c7569157bdc91f6a282a97b038b2b0917c27fdfba137462c7c34d84fcfdfe8b6393204884d153e3d200a86f5c6657a9a -DIST netcat-openbsd_1.190.orig.tar.gz 22384 BLAKE2B c3e83106f53a0214f71c805b1dfe6b66718dfca217f713a0d7016cb0a3c75c78580fbdd277bd7b5324371145c4b986ebb867e6f779cd61ffecb8e732ebabcb84 SHA512 32310813391f63b8283dc4a63e52821e464ecbfcd0ea995e8e15047c6252a86b31eb4725dc69b778594c43d6ce0cc081aa0f00d7cda0587c91941f20b93a33fe -DIST netcat-openbsd_1.195-2.debian.tar.xz 35984 BLAKE2B eedac24eedc243ad1d58576be76f4f98392e1f455863fa3cdc06bde2714612819b7dfa98dd45c1739a65680469460410f5e4b2f4144f4c24fea04b59dda4d0da SHA512 2a5cc6d04112fdde007be4b9adb3aee44060570c0cb2ae0e33e54af3d37c0b2ff4d6c96edf1f16047365106c7c3720195b38417af3c332226c9be81d49caa552 -DIST netcat-openbsd_1.195.orig.tar.gz 22480 BLAKE2B 53c750c168d7ea5dc2ca653598e42700e2b3ee888d946a09503a22fa3bcbc2c73658f38787314bef628d609ad370223f6889b7019760bf51817f73fc570e1dcc SHA512 ea95cda028f2759835ea8832db0174c178b002d5a917f4c51594445a5377a30d6114ac261071eea98d3d0b60ae1ec72102609db1625dbc5a6e57c67e28d2ff51 +DIST netcat-openbsd_1.218-5.debian.tar.xz 52052 BLAKE2B 38ccde34bfa6f1873a8e38fa7355f94bc74cdeb125fd4081fd68819a685d49a4c8a6cc7ed243d49df2d38c7536f4ac680d598bd4c28a938bc4750c89376d2961 SHA512 a230eb143e32fe80ee108325bb81c4e163d48982b484bf4a93ef266e9eed12890e7e294c2fe3dd2ce91fe5aec7de2f1407bf25dc938c2565bfb3e0759555dddc +DIST netcat-openbsd_1.218.orig.tar.gz 22964 BLAKE2B 2dba29cc93ef5295ec24db7632454564fa640fba139116d2732aff465c9a4b37238f65d51ad727f9b29d304b73ce05282b82ec468444c63f5611a90a1384ac62 SHA512 a830f0e3efdff01ba1bb0b344f49d545b9c184001cd641e523a6d24670b97d52dc723318660a5ec8f3215cb57ebe62ca4c06387000b6c8b6495a5c653a4206c6 +DIST netcat-openbsd_1.219-1.debian.tar.xz 52048 BLAKE2B 62c2e4a6446fbdb01ea34a70c10dc72a980e62b4d8e06e4564f05932b9fb291be73558a1b8c11f448c509b0fc3c5fe42381a1a9f0a14bba0c2e087dd1e6da9f1 SHA512 badc1afbe8a467c068fa1d3bf12817d568eae5bb9774f9f11d3b30c065eb3a8b39724bb456329d7153ea3160cd10fab159a6756f7eeafd9bfc8c5d78114f7da6 +DIST netcat-openbsd_1.219.orig.tar.gz 22940 BLAKE2B 4e871124a22fec2ba572f2a614b7eb5134565acd5d952973f7e7f76ead6b22d0811efcc916726da1e7719c5d3014f94ea53ad09804a77b55c4b15fc571bf0e95 SHA512 9f6d531d33410457b8f1e6a3eb0d105dbd819d5e4fe9753d32d7fd4583680ceba102a60307a8b5ef26b47047492b207388742b725da3708d30d360d4a196f115 diff --git a/net-analyzer/openbsd-netcat/files/openbsd-netcat-1.105-darwin.patch b/net-analyzer/openbsd-netcat/files/openbsd-netcat-1.105-darwin.patch deleted file mode 100644 index 8c68a66ad548..000000000000 --- a/net-analyzer/openbsd-netcat/files/openbsd-netcat-1.105-darwin.patch +++ /dev/null @@ -1,86 +0,0 @@ -Allow compilation on Darwin - ---- netcat.c -+++ netcat.c -@@ -43,11 +43,13 @@ - #include <arpa/telnet.h> - #include <arpa/inet.h> - -+#ifndef IPTOS_LOWCOST -+# define IPTOS_LOWCOST 0x02 -+#endif - #ifndef IPTOS_LOWDELAY - # define IPTOS_LOWDELAY 0x10 - # define IPTOS_THROUGHPUT 0x08 - # define IPTOS_RELIABILITY 0x04 --# define IPTOS_LOWCOST 0x02 - # define IPTOS_MINCOST IPTOS_LOWCOST - #endif /* IPTOS_LOWDELAY */ - -@@ -96,8 +98,9 @@ - #include <unistd.h> - #include <fcntl.h> - #include <limits.h> --#include <bsd/stdlib.h> --#include <bsd/string.h> -+#include <stdlib.h> -+#include <string.h> -+#include <ctype.h> - #include "atomicio.h" - - #ifndef SUN_LEN -@@ -169,6 +172,43 @@ - socklen_t salen, int ctimeout); - static void quit(); - -+static char* strtonumerrs[] = { -+ "too large", -+ "too small", -+ "invalid" -+}; -+ -+static long long -+strtonum( -+ const char *nptr, -+ long long minval, -+ long long maxval, -+ const char **errstr) -+{ -+ long long val; -+ -+ while (*nptr != '\0' && isspace(*nptr)) -+ nptr++; -+ if (*nptr == '\0') { -+ if (errstr != NULL) -+ *errstr = strtonumerrs[2]; -+ return 0; -+ } -+ val = atoll(nptr); -+ if (val < minval) { -+ if (errstr != NULL) -+ *errstr = strtonumerrs[1]; -+ return 0; -+ } -+ if (val > maxval) { -+ if (errstr != NULL) -+ *errstr = strtonumerrs[0]; -+ return 0; -+ } -+ *errstr = NULL; -+ return val; -+} -+ - int - main(int argc, char *argv[]) - { ---- socks.c -+++ socks.c -@@ -38,7 +38,7 @@ - #include <string.h> - #include <unistd.h> - #include <resolv.h> --#include <bsd/readpassphrase.h> -+#include <readpassphrase.h> - #include "atomicio.h" - - #define SOCKS_PORT "1080" diff --git a/net-analyzer/openbsd-netcat/files/openbsd-netcat-1.105-musl-b64_ntop.patch b/net-analyzer/openbsd-netcat/files/openbsd-netcat-1.105-musl-b64_ntop.patch new file mode 100644 index 000000000000..a9603b38bc03 --- /dev/null +++ b/net-analyzer/openbsd-netcat/files/openbsd-netcat-1.105-musl-b64_ntop.patch @@ -0,0 +1,349 @@ +diff -Naur netcat-openbsd-1.105.orig/Makefile netcat-openbsd-1.105/Makefile +--- netcat-openbsd-1.105.orig/Makefile 2017-06-18 09:01:44.293852659 -0700 ++++ netcat-openbsd-1.105/Makefile 2017-06-18 09:04:35.566687655 -0700 +@@ -1,7 +1,7 @@ + # $OpenBSD: Makefile,v 1.6 2001/09/02 18:45:41 jakob Exp $ + + PROG= nc +-SRCS= netcat.c atomicio.c socks.c ++SRCS= netcat.c atomicio.c socks.c compat/base64.c + + LIBS= `pkg-config --libs libbsd` -lresolv + OBJS= $(SRCS:.c=.o) +diff -Naur netcat-openbsd-1.105.orig/compat/base64.c netcat-openbsd-1.105/compat/base64.c +--- netcat-openbsd-1.105.orig/compat/base64.c 1969-12-31 16:00:00.000000000 -0800 ++++ netcat-openbsd-1.105/compat/base64.c 2017-06-18 09:01:31.288700637 -0700 +@@ -0,0 +1,315 @@ ++/* $OpenBSD: base64.c,v 1.8 2015/01/16 16:48:51 deraadt Exp $ */ ++ ++/* ++ * Copyright (c) 1996 by Internet Software Consortium. ++ * ++ * Permission to use, copy, modify, and distribute this software for any ++ * purpose with or without fee is hereby granted, provided that the above ++ * copyright notice and this permission notice appear in all copies. ++ * ++ * THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM DISCLAIMS ++ * ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES ++ * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE ++ * CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL ++ * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR ++ * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ++ * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS ++ * SOFTWARE. ++ */ ++ ++/* ++ * Portions Copyright (c) 1995 by International Business Machines, Inc. ++ * ++ * International Business Machines, Inc. (hereinafter called IBM) grants ++ * permission under its copyrights to use, copy, modify, and distribute this ++ * Software with or without fee, provided that the above copyright notice and ++ * all paragraphs of this notice appear in all copies, and that the name of IBM ++ * not be used in connection with the marketing of any product incorporating ++ * the Software or modifications thereof, without specific, written prior ++ * permission. ++ * ++ * To the extent it has a right to do so, IBM grants an immunity from suit ++ * under its patents, if any, for the use, sale or manufacture of products to ++ * the extent that such products are used for performing Domain Name System ++ * dynamic updates in TCP/IP networks by means of the Software. No immunity is ++ * granted for any product per se or for any other function of any product. ++ * ++ * THE SOFTWARE IS PROVIDED "AS IS", AND IBM DISCLAIMS ALL WARRANTIES, ++ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A ++ * PARTICULAR PURPOSE. IN NO EVENT SHALL IBM BE LIABLE FOR ANY SPECIAL, ++ * DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER ARISING ++ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE, EVEN ++ * IF IBM IS APPRISED OF THE POSSIBILITY OF SUCH DAMAGES. ++ */ ++ ++#include <sys/types.h> ++#include <sys/socket.h> ++#include <netinet/in.h> ++#include <arpa/inet.h> ++#include <arpa/nameser.h> ++ ++#include <ctype.h> ++#include <resolv.h> ++#include <stdio.h> ++ ++#include <stdlib.h> ++#include <string.h> ++ ++static const char Base64[] = ++ "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"; ++static const char Pad64 = '='; ++ ++/* (From RFC1521 and draft-ietf-dnssec-secext-03.txt) ++ The following encoding technique is taken from RFC 1521 by Borenstein ++ and Freed. It is reproduced here in a slightly edited form for ++ convenience. ++ ++ A 65-character subset of US-ASCII is used, enabling 6 bits to be ++ represented per printable character. (The extra 65th character, "=", ++ is used to signify a special processing function.) ++ ++ The encoding process represents 24-bit groups of input bits as output ++ strings of 4 encoded characters. Proceeding from left to right, a ++ 24-bit input group is formed by concatenating 3 8-bit input groups. ++ These 24 bits are then treated as 4 concatenated 6-bit groups, each ++ of which is translated into a single digit in the base64 alphabet. ++ ++ Each 6-bit group is used as an index into an array of 64 printable ++ characters. The character referenced by the index is placed in the ++ output string. ++ ++ Table 1: The Base64 Alphabet ++ ++ Value Encoding Value Encoding Value Encoding Value Encoding ++ 0 A 17 R 34 i 51 z ++ 1 B 18 S 35 j 52 0 ++ 2 C 19 T 36 k 53 1 ++ 3 D 20 U 37 l 54 2 ++ 4 E 21 V 38 m 55 3 ++ 5 F 22 W 39 n 56 4 ++ 6 G 23 X 40 o 57 5 ++ 7 H 24 Y 41 p 58 6 ++ 8 I 25 Z 42 q 59 7 ++ 9 J 26 a 43 r 60 8 ++ 10 K 27 b 44 s 61 9 ++ 11 L 28 c 45 t 62 + ++ 12 M 29 d 46 u 63 / ++ 13 N 30 e 47 v ++ 14 O 31 f 48 w (pad) = ++ 15 P 32 g 49 x ++ 16 Q 33 h 50 y ++ ++ Special processing is performed if fewer than 24 bits are available ++ at the end of the data being encoded. A full encoding quantum is ++ always completed at the end of a quantity. When fewer than 24 input ++ bits are available in an input group, zero bits are added (on the ++ right) to form an integral number of 6-bit groups. Padding at the ++ end of the data is performed using the '=' character. ++ ++ Since all base64 input is an integral number of octets, only the ++ ------------------------------------------------- ++ following cases can arise: ++ ++ (1) the final quantum of encoding input is an integral ++ multiple of 24 bits; here, the final unit of encoded ++ output will be an integral multiple of 4 characters ++ with no "=" padding, ++ (2) the final quantum of encoding input is exactly 8 bits; ++ here, the final unit of encoded output will be two ++ characters followed by two "=" padding characters, or ++ (3) the final quantum of encoding input is exactly 16 bits; ++ here, the final unit of encoded output will be three ++ characters followed by one "=" padding character. ++ */ ++ ++int ++b64_ntop(src, srclength, target, targsize) ++ u_char const *src; ++ size_t srclength; ++ char *target; ++ size_t targsize; ++{ ++ size_t datalength = 0; ++ u_char input[3]; ++ u_char output[4]; ++ int i; ++ ++ while (2 < srclength) { ++ input[0] = *src++; ++ input[1] = *src++; ++ input[2] = *src++; ++ srclength -= 3; ++ ++ output[0] = input[0] >> 2; ++ output[1] = ((input[0] & 0x03) << 4) + (input[1] >> 4); ++ output[2] = ((input[1] & 0x0f) << 2) + (input[2] >> 6); ++ output[3] = input[2] & 0x3f; ++ ++ if (datalength + 4 > targsize) ++ return (-1); ++ target[datalength++] = Base64[output[0]]; ++ target[datalength++] = Base64[output[1]]; ++ target[datalength++] = Base64[output[2]]; ++ target[datalength++] = Base64[output[3]]; ++ } ++ ++ /* Now we worry about padding. */ ++ if (0 != srclength) { ++ /* Get what's left. */ ++ input[0] = input[1] = input[2] = '\0'; ++ for (i = 0; i < srclength; i++) ++ input[i] = *src++; ++ ++ output[0] = input[0] >> 2; ++ output[1] = ((input[0] & 0x03) << 4) + (input[1] >> 4); ++ output[2] = ((input[1] & 0x0f) << 2) + (input[2] >> 6); ++ ++ if (datalength + 4 > targsize) ++ return (-1); ++ target[datalength++] = Base64[output[0]]; ++ target[datalength++] = Base64[output[1]]; ++ if (srclength == 1) ++ target[datalength++] = Pad64; ++ else ++ target[datalength++] = Base64[output[2]]; ++ target[datalength++] = Pad64; ++ } ++ if (datalength >= targsize) ++ return (-1); ++ target[datalength] = '\0'; /* Returned value doesn't count \0. */ ++ return (datalength); ++} ++ ++/* skips all whitespace anywhere. ++ converts characters, four at a time, starting at (or after) ++ src from base - 64 numbers into three 8 bit bytes in the target area. ++ it returns the number of data bytes stored at the target, or -1 on error. ++ */ ++ ++int ++b64_pton(src, target, targsize) ++ char const *src; ++ u_char *target; ++ size_t targsize; ++{ ++ int tarindex, state, ch; ++ u_char nextbyte; ++ char *pos; ++ ++ state = 0; ++ tarindex = 0; ++ ++ while ((ch = (unsigned char)*src++) != '\0') { ++ if (isspace(ch)) /* Skip whitespace anywhere. */ ++ continue; ++ ++ if (ch == Pad64) ++ break; ++ ++ pos = strchr(Base64, ch); ++ if (pos == 0) /* A non-base64 character. */ ++ return (-1); ++ ++ switch (state) { ++ case 0: ++ if (target) { ++ if (tarindex >= targsize) ++ return (-1); ++ target[tarindex] = (pos - Base64) << 2; ++ } ++ state = 1; ++ break; ++ case 1: ++ if (target) { ++ if (tarindex >= targsize) ++ return (-1); ++ target[tarindex] |= (pos - Base64) >> 4; ++ nextbyte = ((pos - Base64) & 0x0f) << 4; ++ if (tarindex + 1 < targsize) ++ target[tarindex+1] = nextbyte; ++ else if (nextbyte) ++ return (-1); ++ } ++ tarindex++; ++ state = 2; ++ break; ++ case 2: ++ if (target) { ++ if (tarindex >= targsize) ++ return (-1); ++ target[tarindex] |= (pos - Base64) >> 2; ++ nextbyte = ((pos - Base64) & 0x03) << 6; ++ if (tarindex + 1 < targsize) ++ target[tarindex+1] = nextbyte; ++ else if (nextbyte) ++ return (-1); ++ } ++ tarindex++; ++ state = 3; ++ break; ++ case 3: ++ if (target) { ++ if (tarindex >= targsize) ++ return (-1); ++ target[tarindex] |= (pos - Base64); ++ } ++ tarindex++; ++ state = 0; ++ break; ++ } ++ } ++ ++ /* ++ * We are done decoding Base-64 chars. Let's see if we ended ++ * on a byte boundary, and/or with erroneous trailing characters. ++ */ ++ ++ if (ch == Pad64) { /* We got a pad char. */ ++ ch = (unsigned char)*src++; /* Skip it, get next. */ ++ switch (state) { ++ case 0: /* Invalid = in first position */ ++ case 1: /* Invalid = in second position */ ++ return (-1); ++ ++ case 2: /* Valid, means one byte of info */ ++ /* Skip any number of spaces. */ ++ for (; ch != '\0'; ch = (unsigned char)*src++) ++ if (!isspace(ch)) ++ break; ++ /* Make sure there is another trailing = sign. */ ++ if (ch != Pad64) ++ return (-1); ++ ch = (unsigned char)*src++; /* Skip the = */ ++ /* Fall through to "single trailing =" case. */ ++ /* FALLTHROUGH */ ++ ++ case 3: /* Valid, means two bytes of info */ ++ /* ++ * We know this char is an =. Is there anything but ++ * whitespace after it? ++ */ ++ for (; ch != '\0'; ch = (unsigned char)*src++) ++ if (!isspace(ch)) ++ return (-1); ++ ++ /* ++ * Now make sure for cases 2 and 3 that the "extra" ++ * bits that slopped past the last full byte were ++ * zeros. If we don't check them, they become a ++ * subliminal channel. ++ */ ++ if (target && tarindex < targsize && ++ target[tarindex] != 0) ++ return (-1); ++ } ++ } else { ++ /* ++ * We ended by seeing the end of the string. Make sure we ++ * have no partial bytes lying around. ++ */ ++ if (state != 0) ++ return (-1); ++ } ++ ++ return (tarindex); ++} +diff -Naur netcat-openbsd-1.105.orig/compat/base64.h netcat-openbsd-1.105/compat/base64.h +--- netcat-openbsd-1.105.orig/compat/base64.h 1969-12-31 16:00:00.000000000 -0800 ++++ netcat-openbsd-1.105/compat/base64.h 2017-06-18 09:09:02.057554167 -0700 +@@ -0,0 +1,3 @@ ++#include <sys/types.h> ++int b64_ntop(u_char const* src, size_t srclength, char *target, size_t targsize); ++int b64_pton(char const* src, u_char *target, size_t targsize); +diff -Naur netcat-openbsd-1.105.orig/socks.c netcat-openbsd-1.105/socks.c +--- netcat-openbsd-1.105.orig/socks.c 2017-06-18 09:01:44.293852659 -0700 ++++ netcat-openbsd-1.105/socks.c 2017-06-18 09:09:21.105757665 -0700 +@@ -40,6 +40,7 @@ + #include <resolv.h> + #include <bsd/readpassphrase.h> + #include "atomicio.h" ++#include "compat/base64.h" + + #define SOCKS_PORT "1080" + #define HTTP_PROXY_PORT "3128" diff --git a/net-analyzer/openbsd-netcat/files/openbsd-netcat-1.190-darwin.patch b/net-analyzer/openbsd-netcat/files/openbsd-netcat-1.190-darwin.patch deleted file mode 100644 index e1a462e746b7..000000000000 --- a/net-analyzer/openbsd-netcat/files/openbsd-netcat-1.190-darwin.patch +++ /dev/null @@ -1,137 +0,0 @@ -Allow compilation on Darwin - -diff --git a/netcat.c b/netcat.c -index a0fb51b..bbb5dd1 100644 ---- a/netcat.c -+++ b/netcat.c -@@ -51,11 +51,13 @@ - # include <bsd/readpassphrase.h> - #endif - -+#ifndef IPTOS_LOWCOST -+# define IPTOS_LOWCOST 0x02 -+#endif - #ifndef IPTOS_LOWDELAY - # define IPTOS_LOWDELAY 0x10 - # define IPTOS_THROUGHPUT 0x08 - # define IPTOS_RELIABILITY 0x04 --# define IPTOS_LOWCOST 0x02 - # define IPTOS_MINCOST IPTOS_LOWCOST - #endif /* IPTOS_LOWDELAY */ - -@@ -108,8 +110,9 @@ - # include <tls.h> - #endif - #include <unistd.h> --#include <bsd/stdlib.h> --#include <bsd/string.h> -+#include <stdlib.h> -+#include <string.h> -+#include <ctype.h> - - #include "atomicio.h" - -@@ -240,6 +243,43 @@ static int connect_with_timeout(int fd, const struct sockaddr *sa, - - static void quit(); - -+static char* strtonumerrs[] = { -+ "too large", -+ "too small", -+ "invalid" -+}; -+ -+static long long -+strtonum( -+ const char *nptr, -+ long long minval, -+ long long maxval, -+ const char **errstr) -+{ -+ long long val; -+ -+ while (*nptr != '\0' && isspace(*nptr)) -+ nptr++; -+ if (*nptr == '\0') { -+ if (errstr != NULL) -+ *errstr = strtonumerrs[2]; -+ return 0; -+ } -+ val = atoll(nptr); -+ if (val < minval) { -+ if (errstr != NULL) -+ *errstr = strtonumerrs[1]; -+ return 0; -+ } -+ if (val > maxval) { -+ if (errstr != NULL) -+ *errstr = strtonumerrs[0]; -+ return 0; -+ } -+ *errstr = NULL; -+ return val; -+} -+ - int - main(int argc, char *argv[]) - { -@@ -814,9 +814,8 @@ - # endif - } else { - len = sizeof(cliaddr); -- connfd = accept4(s, (struct sockaddr *)&cliaddr, -- &len, SOCK_NONBLOCK); -- if (connfd == -1) { -+ connfd = accept(s, (struct sockaddr *)&cliaddr, &len); -+ if (connfd == -1 || fcntl(connfd, F_SETFL, O_NONBLOCK) == -1) { - /* For now, all errnos are fatal */ - err(1, "accept"); - } -@@ -1092,14 +1091,16 @@ - int s, save_errno; - - if (uflag) { -- if ((s = unix_bind(unix_dg_tmp_socket, SOCK_CLOEXEC)) < 0) -+ if ((s = unix_bind(unix_dg_tmp_socket, 0)) < 0) - return -1; - } else { -- if ((s = socket(AF_UNIX, SOCK_STREAM | SOCK_CLOEXEC, 0)) < 0) { -+ if ((s = socket(AF_UNIX, SOCK_STREAM, 0)) < 0) { - errx(1,"create unix socket failed"); - return -1; - } - } -+ if (fcntl(s, F_SETFD, FD_CLOEXEC) == -1) -+ return -1; - - memset(&s_un, 0, sizeof(struct sockaddr_un)); - s_un.sun_family = AF_UNIX; -@@ -1174,9 +1175,13 @@ - port, gai_strerror(error)); - - for (res = res0; res; res = res->ai_next) { -- if ((s = socket(res->ai_family, res->ai_socktype | -- SOCK_NONBLOCK, res->ai_protocol)) < 0) -+ if ((s = socket(res->ai_family, res->ai_socktype, -+ res->ai_protocol)) < 0) -+ continue; -+ if (fcntl(s, F_SETFL, O_NONBLOCK) == -1) { -+ close(s); - continue; -+ } - - /* Bind to a local port or source address if specified. */ - if (sflag || pflag) { -diff --git a/socks.c b/socks.c -index 9068f39..68b68e3 100644 ---- a/socks.c -+++ b/socks.c -@@ -38,7 +38,7 @@ - #include <string.h> - #include <unistd.h> - #include <resolv.h> --#include <bsd/readpassphrase.h> -+#include <readpassphrase.h> - #include "atomicio.h" - - #define SOCKS_PORT "1080" diff --git a/net-analyzer/openbsd-netcat/files/openbsd-netcat-1.190-darwin13.patch b/net-analyzer/openbsd-netcat/files/openbsd-netcat-1.190-darwin13.patch new file mode 100644 index 000000000000..216b8c207922 --- /dev/null +++ b/net-analyzer/openbsd-netcat/files/openbsd-netcat-1.190-darwin13.patch @@ -0,0 +1,54 @@ +strtonum isn't available on <Darwin-11 + +however, it is in the header files on systems like 10.15 with an +availability clause, so don't define strtonum static such that it +matches the prototype from stdlib.h + +diff --git a/netcat.c b/netcat.c +index a0fb51b..bbb5dd1 100644 +--- a/netcat.c ++++ b/netcat.c +@@ -240,6 +243,43 @@ static int connect_with_timeout(int fd, const struct sockaddr *sa, + + static void quit(); + ++static char* strtonumerrs[] = { ++ "too large", ++ "too small", ++ "invalid" ++}; ++ ++long long ++strtonum( ++ const char *nptr, ++ long long minval, ++ long long maxval, ++ const char **errstr) ++{ ++ long long val; ++ ++ while (*nptr != '\0' && isspace(*nptr)) ++ nptr++; ++ if (*nptr == '\0') { ++ if (errstr != NULL) ++ *errstr = strtonumerrs[2]; ++ return 0; ++ } ++ val = atoll(nptr); ++ if (val < minval) { ++ if (errstr != NULL) ++ *errstr = strtonumerrs[1]; ++ return 0; ++ } ++ if (val > maxval) { ++ if (errstr != NULL) ++ *errstr = strtonumerrs[0]; ++ return 0; ++ } ++ *errstr = NULL; ++ return val; ++} ++ + int + main(int argc, char *argv[]) + { diff --git a/net-analyzer/openbsd-netcat/files/openbsd-netcat-1.219-darwin.patch b/net-analyzer/openbsd-netcat/files/openbsd-netcat-1.219-darwin.patch new file mode 100644 index 000000000000..564c414fc750 --- /dev/null +++ b/net-analyzer/openbsd-netcat/files/openbsd-netcat-1.219-darwin.patch @@ -0,0 +1,95 @@ +Allow compilation on Darwin, reverting parts of Linux/Debian patch + +Signed-off-by: Fabian Groffen <grobian@gentoo.org> + +--- a/netcat.c 2023-09-26 15:04:51.169658537 +0200 ++++ b/netcat.c 2023-09-26 15:07:00.270929256 +0200 +@@ -50,13 +50,18 @@ + # include <bsd/readpassphrase.h> + #endif + ++#ifndef IPTOS_LOWCOST ++# define IPTOS_LOWCOST 0x02 ++#endif + #ifndef IPTOS_LOWDELAY + # define IPTOS_LOWDELAY 0x10 + # define IPTOS_THROUGHPUT 0x08 + # define IPTOS_RELIABILITY 0x04 +-# define IPTOS_LOWCOST 0x02 + # define IPTOS_MINCOST IPTOS_LOWCOST + #endif /* IPTOS_LOWDELAY */ ++#ifndef SOCK_CLOEXEC ++# define SOCK_CLOEXEC 0 ++#endif + + # ifndef IPTOS_DSCP_AF11 + # define IPTOS_DSCP_AF11 0x28 +@@ -108,8 +113,9 @@ + # include <tls.h> + #endif + #include <unistd.h> +-#include <bsd/stdlib.h> +-#include <bsd/string.h> ++#include <stdlib.h> ++#include <string.h> ++#include <ctype.h> + + #include "atomicio.h" + +@@ -814,9 +820,8 @@ + int connfd; + + len = sizeof(cliaddr); +- connfd = accept4(s, (struct sockaddr *)&cliaddr, +- &len, SOCK_NONBLOCK); +- if (connfd == -1) { ++ connfd = accept(s, (struct sockaddr *)&cliaddr, &len); ++ if (connfd == -1 || fcntl(connfd, F_SETFL, O_NONBLOCK) == -1) { + /* For now, all errnos are fatal */ + err(1, "accept"); + } +@@ -1069,6 +1074,8 @@ + } else + err(1, "poll failed"); + } ++ if (fcntl(s, F_SETFD, FD_CLOEXEC) == -1) ++ return -1; + + return ret; + } +@@ -1218,9 +1225,13 @@ + port, gai_strerror(error)); + + for (res = res0; res; res = res->ai_next) { +- if ((s = socket(res->ai_family, res->ai_socktype | +- SOCK_NONBLOCK, res->ai_protocol)) == -1) ++ if ((s = socket(res->ai_family, res->ai_socktype, ++ res->ai_protocol)) == -1) + continue; ++ if (fcntl(s, F_SETFL, O_NONBLOCK) == -1) { ++ close(s); ++ continue; ++ } + + /* Bind to a local port or source address if specified. */ + if (sflag || pflag) { +--- a/socks.c 2023-09-26 15:04:51.085185645 +0200 ++++ b/socks.c 2023-09-26 15:07:30.947097100 +0200 +@@ -38,7 +38,7 @@ + #include <string.h> + #include <unistd.h> + #include <resolv.h> +-#include <bsd/readpassphrase.h> ++#include <readpassphrase.h> + #include "atomicio.h" + + #define SOCKS_PORT "1080" +@@ -53,6 +53,8 @@ + #define SOCKS_DOMAIN 3 + #define SOCKS_IPV6 4 + ++#define explicit_bzero(S,L) bzero(S,L) ++ + int remote_connect(const char *, const char *, struct addrinfo, char *); + int socks_connect(const char *, const char *, struct addrinfo, + const char *, const char *, struct addrinfo, int, diff --git a/net-analyzer/openbsd-netcat/metadata.xml b/net-analyzer/openbsd-netcat/metadata.xml index d90cdfaa31e5..65ccccff4b10 100644 --- a/net-analyzer/openbsd-netcat/metadata.xml +++ b/net-analyzer/openbsd-netcat/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> <email>heroxbd@gentoo.org</email> diff --git a/net-analyzer/openbsd-netcat/openbsd-netcat-1.105-r1.ebuild b/net-analyzer/openbsd-netcat/openbsd-netcat-1.105-r1.ebuild deleted file mode 100644 index 298a47420fd0..000000000000 --- a/net-analyzer/openbsd-netcat/openbsd-netcat-1.105-r1.ebuild +++ /dev/null @@ -1,54 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit toolchain-funcs eutils - -DESCRIPTION="The OpenBSD network swiss army knife" -HOMEPAGE="http://www.openbsd.org/cgi-bin/cvsweb/src/usr.bin/nc/" -SRC_URI="http://http.debian.net/debian/pool/main/n/netcat-openbsd/netcat-openbsd_${PV}.orig.tar.gz - http://http.debian.net/debian/pool/main/n/netcat-openbsd/netcat-openbsd_${PV}-7.debian.tar.gz" -LICENSE="BSD" -SLOT="0" -IUSE="elibc_Darwin" - -KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x64-macos" - -DEPEND="virtual/pkgconfig" -RDEPEND="!elibc_Darwin? ( dev-libs/libbsd ) - !net-analyzer/netcat - !net-analyzer/netcat6 -" - -S=${WORKDIR}/netcat-openbsd-${PV} - -PATCHES=( "${WORKDIR}/debian/patches" ) - -src_prepare() { - default - if [[ ${CHOST} == *-darwin* ]] ; then - # this undoes some of the Debian/Linux changes - epatch "${FILESDIR}"/${P}-darwin.patch - fi -} - -src_compile() { - emake CC=$(tc-getCC) CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" -} - -src_install() { - dobin nc - doman nc.1 - cd "${WORKDIR}/debian" - newdoc netcat-openbsd.README.Debian README - dodoc -r examples -} - -pkg_postinst() { - if [[ ${KERNEL} = "linux" ]]; then - ewarn "FO_REUSEPORT is introduced in linux 3.9. If your running kernel is older" - ewarn "and kernel header is newer, nc will not listen correctly. Matching the header" - ewarn "to the running kernel will do. See bug #490246 for details." - fi -} diff --git a/net-analyzer/openbsd-netcat/openbsd-netcat-1.105.ebuild b/net-analyzer/openbsd-netcat/openbsd-netcat-1.105.ebuild deleted file mode 100644 index 34432cdfd0dd..000000000000 --- a/net-analyzer/openbsd-netcat/openbsd-netcat-1.105.ebuild +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -DESCRIPTION="the OpenBSD network swiss army knife" -HOMEPAGE="http://www.openbsd.org/cgi-bin/cvsweb/src/usr.bin/nc/" -SRC_URI="http://http.debian.net/debian/pool/main/n/netcat-openbsd/netcat-openbsd_${PV}.orig.tar.gz - http://http.debian.net/debian/pool/main/n/netcat-openbsd/netcat-openbsd_${PV}-7.debian.tar.gz" -LICENSE="BSD" -SLOT="0" - -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x64-macos" - -DEPEND="virtual/pkgconfig" -RDEPEND="dev-libs/libbsd" - -S=${WORKDIR}/netcat-openbsd-${PV} - -PATCHES=( "${WORKDIR}/debian/patches" ) - -src_install() { - # avoid name conflict against net-analyzer/netcat - newbin nc nc.openbsd - newman nc.1 nc.openbsd.1 - cd "${WORKDIR}/debian" - newdoc netcat-openbsd.README.Debian README - dodoc -r examples -} - -pkg_postinst() { - if [[ ${KERNEL} = "linux" ]]; then - ewarn "FO_REUSEPORT is introduced in linux 3.9. If your running kernel is older" - ewarn "and kernel header is newer, nc will not listen correctly. Matching the header" - ewarn "to the running kernel will do. See bug #490246 for details." - fi -} diff --git a/net-analyzer/openbsd-netcat/openbsd-netcat-1.190.ebuild b/net-analyzer/openbsd-netcat/openbsd-netcat-1.190.ebuild deleted file mode 100644 index 7994e7f7ba34..000000000000 --- a/net-analyzer/openbsd-netcat/openbsd-netcat-1.190.ebuild +++ /dev/null @@ -1,56 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit toolchain-funcs - -DESCRIPTION="The OpenBSD network swiss army knife" -HOMEPAGE="https://cvsweb.openbsd.org/src/usr.bin/nc/ - https://salsa.debian.org/debian/netcat-openbsd" -SRC_URI="http://http.debian.net/debian/pool/main/n/netcat-openbsd/netcat-openbsd_${PV}.orig.tar.gz - http://http.debian.net/debian/pool/main/n/netcat-openbsd/netcat-openbsd_${PV}-2.debian.tar.xz" -LICENSE="BSD" -SLOT="0" -IUSE="elibc_Darwin" - -KEYWORDS="amd64 arm64 ~ppc64 x86 ~amd64-linux ~x64-macos" - -DEPEND="virtual/pkgconfig" -RDEPEND="!elibc_Darwin? ( dev-libs/libbsd ) - !net-analyzer/netcat - !net-analyzer/netcat6 -" - -S=${WORKDIR}/netcat-openbsd-${PV} - -src_prepare() { - for i_patch in $(<"${WORKDIR}"/debian/patches/series); do - eapply "${WORKDIR}"/debian/patches/"${i_patch}" - done - if [[ ${CHOST} == *-darwin* ]] ; then - # this undoes some of the Debian/Linux changes - eapply "${FILESDIR}"/${P}-darwin.patch - fi - default -} - -src_compile() { - emake CC=$(tc-getCC) CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" -} - -src_install() { - dobin nc - doman nc.1 - cd "${WORKDIR}"/debian || die - newdoc netcat-openbsd.README.Debian README - dodoc -r examples -} - -pkg_postinst() { - if [[ ${KERNEL} = "linux" ]]; then - ewarn "SO_REUSEPORT is introduced in linux 3.9. If your running kernel is older" - ewarn "and kernel header is newer, nc will not listen correctly. Matching the header" - ewarn "to the running kernel will do. See bug #490246 for details." - fi -} diff --git a/net-analyzer/openbsd-netcat/openbsd-netcat-1.195.ebuild b/net-analyzer/openbsd-netcat/openbsd-netcat-1.195.ebuild deleted file mode 100644 index 7994e7f7ba34..000000000000 --- a/net-analyzer/openbsd-netcat/openbsd-netcat-1.195.ebuild +++ /dev/null @@ -1,56 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit toolchain-funcs - -DESCRIPTION="The OpenBSD network swiss army knife" -HOMEPAGE="https://cvsweb.openbsd.org/src/usr.bin/nc/ - https://salsa.debian.org/debian/netcat-openbsd" -SRC_URI="http://http.debian.net/debian/pool/main/n/netcat-openbsd/netcat-openbsd_${PV}.orig.tar.gz - http://http.debian.net/debian/pool/main/n/netcat-openbsd/netcat-openbsd_${PV}-2.debian.tar.xz" -LICENSE="BSD" -SLOT="0" -IUSE="elibc_Darwin" - -KEYWORDS="amd64 arm64 ~ppc64 x86 ~amd64-linux ~x64-macos" - -DEPEND="virtual/pkgconfig" -RDEPEND="!elibc_Darwin? ( dev-libs/libbsd ) - !net-analyzer/netcat - !net-analyzer/netcat6 -" - -S=${WORKDIR}/netcat-openbsd-${PV} - -src_prepare() { - for i_patch in $(<"${WORKDIR}"/debian/patches/series); do - eapply "${WORKDIR}"/debian/patches/"${i_patch}" - done - if [[ ${CHOST} == *-darwin* ]] ; then - # this undoes some of the Debian/Linux changes - eapply "${FILESDIR}"/${P}-darwin.patch - fi - default -} - -src_compile() { - emake CC=$(tc-getCC) CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" -} - -src_install() { - dobin nc - doman nc.1 - cd "${WORKDIR}"/debian || die - newdoc netcat-openbsd.README.Debian README - dodoc -r examples -} - -pkg_postinst() { - if [[ ${KERNEL} = "linux" ]]; then - ewarn "SO_REUSEPORT is introduced in linux 3.9. If your running kernel is older" - ewarn "and kernel header is newer, nc will not listen correctly. Matching the header" - ewarn "to the running kernel will do. See bug #490246 for details." - fi -} diff --git a/net-analyzer/openbsd-netcat/openbsd-netcat-1.218_p5.ebuild b/net-analyzer/openbsd-netcat/openbsd-netcat-1.218_p5.ebuild new file mode 100644 index 000000000000..c2ded9744780 --- /dev/null +++ b/net-analyzer/openbsd-netcat/openbsd-netcat-1.218_p5.ebuild @@ -0,0 +1,68 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit toolchain-funcs + +MY_PV=$(ver_cut 1-2) +DESCRIPTION="The OpenBSD network swiss army knife" +HOMEPAGE="https://cvsweb.openbsd.org/src/usr.bin/nc/ https://salsa.debian.org/debian/netcat-openbsd" +SRC_URI=" + mirror://debian/pool/main/n/netcat-openbsd/netcat-openbsd_${MY_PV}.orig.tar.gz + mirror://debian/pool/main/n/netcat-openbsd/netcat-openbsd_${MY_PV}-$(ver_cut 4).debian.tar.xz +" +S="${WORKDIR}"/netcat-openbsd-${MY_PV} + +LICENSE="BSD" +SLOT="0" +KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 ~riscv x86 ~amd64-linux ~x64-macos" + +RDEPEND=" + !net-analyzer/netcat + !elibc_Darwin? ( dev-libs/libbsd ) +" +BDEPEND="virtual/pkgconfig" + +src_prepare() { + local i + for i in $(<"${WORKDIR}"/debian/patches/series) ; do + PATCHES+=( "${WORKDIR}"/debian/patches/${i} ) + done + + if [[ ${CHOST} == *-darwin* ]] ; then + # This undoes some of the Debian/Linux changes + PATCHES+=( "${FILESDIR}"/${PN}-1.219-darwin.patch ) + + if [[ ${CHOST##*-darwin} -lt 20 ]] ; then + PATCHES+=( "${FILESDIR}"/${PN}-1.190-darwin13.patch ) + fi + fi + + if use elibc_musl ; then + PATCHES+=( "${FILESDIR}"/${PN}-1.105-musl-b64_ntop.patch ) + fi + + default +} + +src_compile() { + emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" +} + +src_install() { + dobin nc + doman nc.1 + + cd "${WORKDIR}"/debian || die + newdoc netcat-openbsd.README.Debian README + dodoc -r examples +} + +pkg_postinst() { + if use kernel_linux ; then + ewarn "SO_REUSEPORT is introduced in linux 3.9. If your running kernel is older" + ewarn "and kernel header is newer, nc will not listen correctly. Matching the header" + ewarn "to the running kernel will do. See bug #490246 for details." + fi +} diff --git a/net-analyzer/openbsd-netcat/openbsd-netcat-1.219_p1.ebuild b/net-analyzer/openbsd-netcat/openbsd-netcat-1.219_p1.ebuild new file mode 100644 index 000000000000..afe9a5ea3fbf --- /dev/null +++ b/net-analyzer/openbsd-netcat/openbsd-netcat-1.219_p1.ebuild @@ -0,0 +1,68 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit toolchain-funcs + +MY_PV=$(ver_cut 1-2) +DESCRIPTION="The OpenBSD network swiss army knife" +HOMEPAGE="https://cvsweb.openbsd.org/src/usr.bin/nc/ https://salsa.debian.org/debian/netcat-openbsd" +SRC_URI=" + mirror://debian/pool/main/n/netcat-openbsd/netcat-openbsd_${MY_PV}.orig.tar.gz + mirror://debian/pool/main/n/netcat-openbsd/netcat-openbsd_${MY_PV}-$(ver_cut 4).debian.tar.xz +" +S="${WORKDIR}"/netcat-openbsd-${MY_PV} + +LICENSE="BSD" +SLOT="0" +KEYWORDS="amd64 ~arm arm64 ~loong ~ppc ppc64 ~riscv x86 ~amd64-linux ~arm64-macos ~x64-macos" + +RDEPEND=" + !net-analyzer/netcat + !elibc_Darwin? ( dev-libs/libbsd ) +" +BDEPEND="virtual/pkgconfig" + +src_prepare() { + local i + for i in $(<"${WORKDIR}"/debian/patches/series) ; do + PATCHES+=( "${WORKDIR}"/debian/patches/${i} ) + done + + if [[ ${CHOST} == *-darwin* ]] ; then + # This undoes some of the Debian/Linux changes + PATCHES+=( "${FILESDIR}"/${PN}-1.219-darwin.patch ) + + if [[ ${CHOST##*-darwin} -lt 20 ]] ; then + PATCHES+=( "${FILESDIR}"/${PN}-1.190-darwin13.patch ) + fi + fi + + if use elibc_musl ; then + PATCHES+=( "${FILESDIR}"/${PN}-1.105-musl-b64_ntop.patch ) + fi + + default +} + +src_compile() { + emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" +} + +src_install() { + dobin nc + doman nc.1 + + cd "${WORKDIR}"/debian || die + newdoc netcat-openbsd.README.Debian README + dodoc -r examples +} + +pkg_postinst() { + if use kernel_linux ; then + ewarn "SO_REUSEPORT is introduced in linux 3.9. If your running kernel is older" + ewarn "and kernel header is newer, nc will not listen correctly. Matching the header" + ewarn "to the running kernel will do. See bug #490246 for details." + fi +} diff --git a/net-analyzer/openvas-scanner/Manifest b/net-analyzer/openvas-scanner/Manifest index 45b50efee465..678d032cb5a3 100644 --- a/net-analyzer/openvas-scanner/Manifest +++ b/net-analyzer/openvas-scanner/Manifest @@ -1,2 +1,2 @@ -DIST openvas-scanner-6.0.1.tar.gz 522100 BLAKE2B af82b41736329bd90ba1ea73a0ace36d4115375f81a7aaff5d3bd50f21cfa3195cdf4012aa952da52c4103a31475de5c5790ef3e2e36180aa06737371fa0e5a0 SHA512 db4087fffe1d50e232fa1e51325cf7f142237e2bd3cc5dcaa1e7058a4871300f352f2c0e700eae72ea9412c347b072e9d1f2eca508b27cb30f36c6895ec95147 -DIST openvas-scanner-7.0.1.tar.gz 429012 BLAKE2B 13fd0fef2ce88f6789da9f00e8f35329e915ebc74a29b3bd52af93c6b70292d055fa1159aec4041d79a785971a583eb514e8700d1d38a76775446e40af9b2fac SHA512 201ea02b25bf247320437ae5c82bdc95db981cc6bd99fdece9403573434db122cdc8db7b82a08cba34b6d67d5794b2364f798847c79b421495666adc95a02571 +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 diff --git a/net-analyzer/openvas-scanner/files/README.gentoo b/net-analyzer/openvas-scanner/files/README.gentoo new file mode 100644 index 000000000000..16547c23c7b4 --- /dev/null +++ b/net-analyzer/openvas-scanner/files/README.gentoo @@ -0,0 +1,3 @@ +The redis configuration file is located in: +/etc/gvm/redis-openvas.conf +Please apply your changes to the new configuration files. diff --git a/net-analyzer/openvas-scanner/files/gvm-feed-sync.cron b/net-analyzer/openvas-scanner/files/gvm-feed-sync.cron deleted file mode 100644 index 5563b92929b1..000000000000 --- a/net-analyzer/openvas-scanner/files/gvm-feed-sync.cron +++ /dev/null @@ -1 +0,0 @@ -0 2 * * * gvm [ -x /etc/gvm/gvm-feed-sync.sh ] && /bin/bash /etc/gvm/gvm-feed-sync.sh > /dev/null diff --git a/net-analyzer/openvas-scanner/files/gvm-feed-sync.sh b/net-analyzer/openvas-scanner/files/gvm-feed-sync.sh deleted file mode 100644 index ba21632a4d6c..000000000000 --- a/net-analyzer/openvas-scanner/files/gvm-feed-sync.sh +++ /dev/null @@ -1,45 +0,0 @@ -#!/bin/sh -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 -# GVM cron script that updates feed. - -# Start to update FEED & First NVT. -try=0 -until [ $try -ge 5 ]; do - greenbone-nvt-sync --curl &>/dev/null && break - try=$[$try+1] - sleep 30 -done - -# Check status -if [ $? -eq 0 ]; then - # Avoid your IP temporary banned because of multiple connection - sleep 5 - # Try to update scapdata. - try=0 - until [ $try -ge 5 ]; do - greenbone-scapdata-sync &>/dev/null && break - try=$[$try+1] - sleep 30 - done - - # Check status - if [ $? -eq 0 ]; then - # Avoid your IP temporary banned because of multiple connection - sleep 5 - # Try to update certdata - try=0 - until [ $try -ge 5 ]; do - greenbone-certdata-sync &>/dev/null && break - try=$[$try+1] - sleep 30 - done - - # Check status - if [ $? -eq 0 ]; then - exit 0 - else - exit 1 - fi - fi -fi 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-6.0.1-sbin.patch b/net-analyzer/openvas-scanner/files/openvas-scanner-6.0.1-sbin.patch deleted file mode 100644 index d5b8a2a6b62f..000000000000 --- a/net-analyzer/openvas-scanner/files/openvas-scanner-6.0.1-sbin.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- a/src/CMakeLists.txt 2019-07-21 23:16:18.608251465 +0300 -+++ b/src/CMakeLists.txt 2019-07-21 23:17:08.434210058 +0300 -@@ -175,7 +175,7 @@ - ## Install - - install (TARGETS openvassd -- RUNTIME DESTINATION ${SBINDIR} -+ RUNTIME DESTINATION ${BINDIR} - PERMISSIONS OWNER_EXECUTE OWNER_READ OWNER_WRITE - GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE) - -@@ -183,7 +183,7 @@ - DESTINATION ${OPENVAS_SYSCONF_DIR}) - - install (FILES ${CMAKE_BINARY_DIR}/tools/greenbone-nvt-sync -- DESTINATION ${SBINDIR} -+ DESTINATION ${BINDIR} - PERMISSIONS OWNER_EXECUTE OWNER_READ OWNER_WRITE - GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE) - - diff --git a/net-analyzer/openvas-scanner/files/openvas.conf b/net-analyzer/openvas-scanner/files/openvas.conf deleted file mode 100644 index 487e643834b8..000000000000 --- a/net-analyzer/openvas-scanner/files/openvas.conf +++ /dev/null @@ -1 +0,0 @@ -db_address = /tmp/redis.sock diff --git a/net-analyzer/openvas-scanner/files/openvas.conf-22 b/net-analyzer/openvas-scanner/files/openvas.conf-22 new file mode 100644 index 000000000000..b2d964ff4b53 --- /dev/null +++ b/net-analyzer/openvas-scanner/files/openvas.conf-22 @@ -0,0 +1 @@ +db_address = /run/redis-openvas/redis.sock diff --git a/net-analyzer/openvas-scanner/files/openvas.logrotate b/net-analyzer/openvas-scanner/files/openvas.logrotate new file mode 100644 index 000000000000..7d116f6fbbc0 --- /dev/null +++ b/net-analyzer/openvas-scanner/files/openvas.logrotate @@ -0,0 +1,13 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 +# Daemon ignore HUP so we use 'copytruncate' instead of 'create' +# with safe file size to prevent losing log entries. + +/var/log/gvm/openvas.log { + compress + missingok + notifempty + sharedscripts + copytruncate + maxsize 10M +} diff --git a/net-analyzer/openvas-scanner/files/openvassd-daemon.conf b/net-analyzer/openvas-scanner/files/openvassd-daemon.conf deleted file mode 100644 index 6bb70d165355..000000000000 --- a/net-analyzer/openvas-scanner/files/openvassd-daemon.conf +++ /dev/null @@ -1,17 +0,0 @@ -# OpenVAS Scanner command args - -# e.g --foreground -OPENVAS_SCANNER_OPTIONS="" - -# Scanner listen socket -OPENVAS_SCANNER_LISTEN_SOCKET="--unix-socket=/var/run/openvassd.sock" - -# Scanner listen owner -OPENVAS_SCANNER_LISTEN_OWNER="--listen-owner=gvm" - -# Scanner listen group -OPENVAS_SCANNER_LISTEN_GROUP="--listen-group=gvm" - -# Scanner listen mode -OPENVAS_SCANNER_LISTEN_MODE="--listen-mode=755" - diff --git a/net-analyzer/openvas-scanner/files/openvassd.gvm.conf b/net-analyzer/openvas-scanner/files/openvassd.gvm.conf deleted file mode 100644 index 5dfb8b527454..000000000000 --- a/net-analyzer/openvas-scanner/files/openvassd.gvm.conf +++ /dev/null @@ -1,124 +0,0 @@ -# You can get detailed informations from https://linux.die.net/man/8/openvassd -# Configuration file of the OpenVAS Security Scanner -# Every line starting with a '#' is a comment - -[Misc] - -# Path to the security checks folder: -plugins_folder = /var/lib/openvas/plugins - -# Path to OpenVAS caching folder: -cache_folder = /var/cache/openvas - -# Path to OpenVAS include directories: -# (multiple entries are separated with colon ':') -include_folders = /var/lib/openvas/plugins - -# Config File -config_file = /etc/openvas/openvassd.conf - -# Maximum number of simultaneous hosts tested : -max_hosts = 30 - -# Maximum number of simultaneous checks against each host tested : -max_checks = 10 - -# Niceness. If set to 'yes', openvassd will renice itself to 10. -be_nice = no - -# Log file (or 'syslog') : -logfile = /var/log/gvm/openvassd.log - -# Shall we log every details of the attack ? (disk intensive) -log_whole_attack = no - -# Log the name of the plugins that are loaded by the server ? -log_plugins_name_at_load = no - -# Dump file for debugging output, use `-' for stdout -dumpfile = /var/log/gvm/openvassd.dump - -# Rules file : -rules = /etc/openvas/openvassd.rules - -# CGI paths to check for (cgi-bin:/cgi-aws:/ can do) -cgi_path = /cgi-bin:/scripts - -# Range of the ports the port scanners will scan : -# 'default' means that OpenVAS will scan ports found in its -# services file. -port_range = default - -# Optimize the test (recommended) : -# Turn off for push hard but increase false positive and slow down scans -optimize_test = yes - -# Optimization : -# Read timeout for the sockets of the tests : -checks_read_timeout = 5 - -# Ports against which two plugins should not be run simultaneously : -# non_simult_ports = Services/www, 139, Services/finger -non_simult_ports = 139, 445 - -# Maximum lifetime of a plugin (in seconds) : -plugins_timeout = 320 - -# Safe checks rely on banner grabbing & If enabled push harder to target: -safe_checks = yes - -# Automatically activate the plugins that are depended on -auto_enable_dependencies = yes - -# Do not echo data from plugins which have been automatically enabled -silent_dependencies = no - -# Designate hosts by MAC address, not IP address (useful for DHCP networks) -use_mac_addr = no - - -#--- Knowledge base saving (can be configured by the client) : -# Save the knowledge base on disk : -save_knowledge_base = no - -# Restore the KB for each test : -kb_restore = no - -# Only test hosts whose KB we do not have : -only_test_hosts_whose_kb_we_dont_have = no - -# Only test hosts whose KB we already have : -only_test_hosts_whose_kb_we_have = no - -# KB test replay : -kb_dont_replay_scanners = no -kb_dont_replay_info_gathering = no -kb_dont_replay_attacks = no -kb_dont_replay_denials = no -kb_max_age = 864000 -#--- end of the KB section - -# Redis socket default setting -db_address = /tmp/redis.sock - -# If this option is set, OpenVAS will not scan a network incrementally -# (10.0.0.1, then 10.0.0.2, 10.0.0.3 and so on..) but will attempt to -# slice the workload throughout the whole network (ie: it will scan -# 10.0.0.1, then 10.0.0.127, then 10.0.0.2, then 10.0.0.128 and so on... -slice_network_addresses = no - -# Should consider all the NASL scripts as being signed ? (unsafe if set to 'yes') -nasl_no_signature_check = yes - -#Certificates -cert_file=/var/lib/gvm/CA/servercert.pem -key_file=/var/lib/gvm/private/CA/serverkey.pem -ca_file=/var/lib/gvm/CA/cacert.pem - -# If you decide to protect your private key with a password, -# uncomment and change next line -# pem_password=password -# If you want to force the use of a client certificate, uncomment next line -# force_pubkey_auth = yes - -#end. diff --git a/net-analyzer/openvas-scanner/files/openvassd.init b/net-analyzer/openvas-scanner/files/openvassd.init deleted file mode 100644 index 9bd7332134fc..000000000000 --- a/net-analyzer/openvas-scanner/files/openvassd.init +++ /dev/null @@ -1,14 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -name="Open Vulnerability Assessment Scanner" -command="/usr/bin/openvassd" -command_args="${OPENVAS_SCANNER_OPTIONS} ${OPENVAS_SCANNER_LISTEN_SOCKET} ${OPENVAS_SCANNER_LISTEN_OWNER} ${OPENVAS_SCANNER_LISTEN_GROUP} ${OPENVAS_SCANNER_LISTEN_MODE}" -pidfile="/run/openvassd.pid" -command_background="true" - -depend() { - after bootmisc - need localmount net redis -} diff --git a/net-analyzer/openvas-scanner/files/openvassd.logrotate b/net-analyzer/openvas-scanner/files/openvassd.logrotate deleted file mode 100644 index 9cf47d54763d..000000000000 --- a/net-analyzer/openvas-scanner/files/openvassd.logrotate +++ /dev/null @@ -1,13 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 -# Daemon ignore HUP so we use 'copytruncate' instead of 'create' -# with safe file size to prevent losing log entries. - -/var/log/gvm/openvassd.log { - compress - missingok - notifempty - sharedscripts - copytruncate - maxsize 10M -} diff --git a/net-analyzer/openvas-scanner/files/openvassd.service b/net-analyzer/openvas-scanner/files/openvassd.service deleted file mode 100644 index b7d7df8bbab0..000000000000 --- a/net-analyzer/openvas-scanner/files/openvassd.service +++ /dev/null @@ -1,16 +0,0 @@ -[Unit] -Description=Open Vulnerability Assessment Scanner -After=network.target -After=redis.service -Before=gvmd.service -Requires=redis.service - -[Service] -Type=forking -EnvironmentFile=-/etc/openvas/sysconfig/openvassd-daemon.conf -ExecStart=/usr/bin/openvassd $OPENVAS_SCANNER_OPTIONS $OPENVAS_SCANNER_LISTEN_SOCKET $OPENVAS_SCANNER_LISTEN_OWNER $OPENVAS_SCANNER_LISTEN_GROUP $OPENVAS_SCANNER_LISTEN_MODE -Restart=on-failure -RestartSec=10 - -[Install] -WantedBy=multi-user.target diff --git a/net-analyzer/openvas-scanner/files/redis-openvas.confd b/net-analyzer/openvas-scanner/files/redis-openvas.confd new file mode 100644 index 000000000000..6a75dfdc7d28 --- /dev/null +++ b/net-analyzer/openvas-scanner/files/redis-openvas.confd @@ -0,0 +1,20 @@ +# Redis user. +REDIS_USER="gvm" + +# Redis group. +REDIS_GROUP="gvm" + +# Redis configuration file. +REDIS_CONF="/etc/gvm/redis-openvas.conf" + +# Redis dump directory. +REDIS_DIR="/var/lib/openvas/redis" + +# Redis options. +# (Redis expects the first argument to be the configuration file.) +REDIS_OPTS="${REDIS_CONF}" + +# Specify the network service that corresponds to the "bind" setting +# in your redis.conf. For example, if you bind to 127.0.0.1, this should +# be set to "net.lo" which provides the loopback interface. +rc_need="net.lo" diff --git a/net-analyzer/openvas-scanner/files/redis-openvas.initd b/net-analyzer/openvas-scanner/files/redis-openvas.initd new file mode 100644 index 000000000000..0841942eac6d --- /dev/null +++ b/net-analyzer/openvas-scanner/files/redis-openvas.initd @@ -0,0 +1,29 @@ +#!/sbin/openrc-run +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +: ${REDIS_DIR:=/var/lib/openvas/redis} +: ${REDIS_CONF:=/etc/gvm/redis-openvas.conf} +: ${REDIS_OPTS:="${REDIS_CONF}"} +: ${REDIS_USER:=gvm} +: ${REDIS_GROUP:=gvm} +: ${REDIS_TIMEOUT:=30} + +# https://bugs.gentoo.org/631002#c10 +# Force '--daemonize no' to override the config file +command="/usr/sbin/redis-server" +command_args="${REDIS_OPTS} --daemonize no" +command_background="true" +command_user="${REDIS_USER}:${REDIS_GROUP}" +pidfile="/run/${RC_SVCNAME}/redis-server.pid" +retry="${REDIS_TIMEOUT}" +directory="${REDIS_DIR}" + +start_post() { + checkpath -f --mode 0644 --owner ${REDIS_USER}:${REDIS_GROUP} /var/log/gvm/openvas.log +} + +depend() { + use localmount logger + after keepalived +} diff --git a/net-analyzer/openvas-scanner/files/redis-openvas.service b/net-analyzer/openvas-scanner/files/redis-openvas.service new file mode 100644 index 000000000000..5eb8dd29e287 --- /dev/null +++ b/net-analyzer/openvas-scanner/files/redis-openvas.service @@ -0,0 +1,13 @@ +[Unit] +Description=A persistent key-value database +After=syslog.target network.target +PartOf=gvm.target + +[Service] +Type=forking +PIDFile=/run/redis-openvas/redis-server.pid +ExecStart=/usr/sbin/redis-server /etc/gvm/redis-openvas.conf +User=gvm + +[Install] +WantedBy=multi-user.target diff --git a/net-analyzer/openvas-scanner/files/redis-openvas.tmpfiles b/net-analyzer/openvas-scanner/files/redis-openvas.tmpfiles new file mode 100644 index 000000000000..6dea2932cc0b --- /dev/null +++ b/net-analyzer/openvas-scanner/files/redis-openvas.tmpfiles @@ -0,0 +1,2 @@ +# redis runtime directory +d /run/redis-openvas 0755 gvm root - diff --git a/net-analyzer/openvas-scanner/files/redis.conf.example b/net-analyzer/openvas-scanner/files/redis.conf.example deleted file mode 100644 index 6a41211aaae8..000000000000 --- a/net-analyzer/openvas-scanner/files/redis.conf.example +++ /dev/null @@ -1,57 +0,0 @@ -bind 127.0.0.1 -protected-mode yes -port 0 -tcp-backlog 511 -unixsocket /tmp/redis.sock -unixsocketperm 700 -timeout 0 -tcp-keepalive 300 -daemonize no -supervised no -pidfile /run/redis/redis.pid -loglevel notice -logfile /var/log/redis/redis.log -databases 16 -always-show-logo yes -stop-writes-on-bgsave-error yes -rdbcompression yes -rdbchecksum yes -dbfilename dump.rdb -dir /var/lib/redis/ -slave-serve-stale-data yes -slave-read-only yes -repl-diskless-sync no -repl-diskless-sync-delay 5 -repl-disable-tcp-nodelay no -slave-priority 100 -lazyfree-lazy-eviction no -lazyfree-lazy-expire no -lazyfree-lazy-server-del no -slave-lazy-flush no -appendonly no -appendfilename "appendonly.aof" -appendfsync everysec -no-appendfsync-on-rewrite no -auto-aof-rewrite-percentage 100 -auto-aof-rewrite-min-size 64mb -aof-load-truncated yes -aof-use-rdb-preamble no -lua-time-limit 5000 -slowlog-log-slower-than 10000 -slowlog-max-len 128 -latency-monitor-threshold 0 -notify-keyspace-events "" -hash-max-ziplist-entries 512 -hash-max-ziplist-value 64 -list-max-ziplist-size -2 -list-compress-depth 0 -set-max-intset-entries 512 -zset-max-ziplist-entries 128 -zset-max-ziplist-value 64 -hll-sparse-max-bytes 3000 -activerehashing yes -client-output-buffer-limit normal 0 0 0 -client-output-buffer-limit slave 256mb 64mb 60 -client-output-buffer-limit pubsub 32mb 8mb 60 -hz 10 -aof-rewrite-incremental-fsync yes diff --git a/net-analyzer/openvas-scanner/metadata.xml b/net-analyzer/openvas-scanner/metadata.xml index 932077da95e5..8b98cc0ee111 100644 --- a/net-analyzer/openvas-scanner/metadata.xml +++ b/net-analyzer/openvas-scanner/metadata.xml @@ -1,17 +1,20 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> + <maintainer type="person" proxied="yes"> + <email>foti.giuseppe@gmail.com</email> + <name>Giuseppe Foti</name> + </maintainer> + <maintainer type="person" proxied="yes"> <email>jonas.licht@gmail.com</email> <name>Jonas Licht</name> </maintainer> - <maintainer type="project"> + <maintainer type="project" proxied="proxy"> <email>proxy-maint@gentoo.org</email> <name>Proxy Maintainers</name> </maintainer> <use> - <flag name="cron">Install a cron job to update GVM's feed daily.</flag> - <flag name="extras">Html docs support</flag> + <flag name="snmp">Build againts <pkg>net-analyzer/net-snmp</pkg> for "improved SNMP support"</flag> </use> <longdescription lang="en"> Open Vulnerability Assessment System (OpenVAS) Scanner is the Greenbone Vulnerability Management (GVM) Solution. diff --git a/net-analyzer/openvas-scanner/openvas-scanner-22.7.9.ebuild b/net-analyzer/openvas-scanner/openvas-scanner-22.7.9.ebuild new file mode 100644 index 000000000000..5c8c16dce1d2 --- /dev/null +++ b/net-analyzer/openvas-scanner/openvas-scanner-22.7.9.ebuild @@ -0,0 +1,158 @@ +# 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 + >=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 + 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 ) +" + +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" + "-DINSTALL_OLD_SYNC_SCRIPT=OFF" + "-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.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-6.0.1.ebuild b/net-analyzer/openvas-scanner/openvas-scanner-6.0.1.ebuild deleted file mode 100644 index a1e0d34ebf61..000000000000 --- a/net-analyzer/openvas-scanner/openvas-scanner-6.0.1.ebuild +++ /dev/null @@ -1,135 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -CMAKE_MAKEFILE_GENERATOR="emake" -inherit cmake flag-o-matic systemd toolchain-funcs - -MY_PN="openvas" -MY_DN="openvassd" - -DESCRIPTION="Open Vulnerability Assessment Scanner" -HOMEPAGE="https://www.greenbone.net/en/" -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="cron extras" - -DEPEND=" - app-crypt/gpgme:= - dev-db/redis - dev-libs/libgcrypt:= - dev-libs/libksba - >=net-analyzer/gvm-libs-10.0.1 - net-analyzer/net-snmp - net-libs/gnutls:= - net-libs/libpcap - net-libs/libssh:= -" - -RDEPEND=" - ${DEPEND}" - -BDEPEND=" - sys-devel/bison - sys-devel/flex - virtual/pkgconfig - extras? ( app-doc/doxygen[dot] - app-doc/xmltoman - app-text/htmldoc - dev-perl/CGI - dev-perl/SQL-Translator - )" - -BUILD_DIR="${WORKDIR}/${MY_PN}-${PV}_build" -S="${WORKDIR}/${MY_PN}-${PV}" - -PATCHES=( - # Install exec. to /usr/bin instead of /usr/sbin - "${FILESDIR}/${P}-sbin.patch" -) - -src_prepare() { - cmake_src_prepare - # QA-Fix | Correct FHS/Gentoo policy paths for 6.0.1 - sed -i -e "s*/doc/openvas-scanner/*/doc/openvas-scanner-${PV}/*g" "$S"/src/CMakeLists.txt || die - # QA-Fix | Remove !CLANG doxygen warnings for 6.0.1 - if use extras; 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" - ) - # Add release hardening flags for 6.0.1 - append-cflags -Wno-format-truncation -Wformat -Wformat-security -D_FORTIFY_SOURCE=2 -fstack-protector - append-ldflags -Wl,-z,relro -Wl,-z,now - cmake_src_configure -} - -src_compile() { - cmake_src_compile - if use extras; then - cmake_build -C "${BUILD_DIR}" doc - cmake_build doc-full -C "${BUILD_DIR}" doc - HTML_DOCS=( "${BUILD_DIR}"/doc/generated/html/. ) - fi - cmake_build rebuild_cache -} - -src_install() { - cmake_src_install - - dodir /etc/openvas - insinto /etc/openvas - newins "${FILESDIR}/${MY_DN}.gvm.conf" openvassd.conf - - insinto /etc/openvas - doins "${FILESDIR}"/redis.conf.example - - dodir /etc/openvas/sysconfig - insinto /etc/openvas/sysconfig - doins "${FILESDIR}/${MY_DN}-daemon.conf" - - if use cron; then - # Install the cron job if they want it. - exeinto /etc/gvm - doexe "${FILESDIR}/gvm-feed-sync.sh" - fowners gvm:gvm /etc/gvm/gvm-feed-sync.sh - - insinto /etc/cron.d - newins "${FILESDIR}"/gvm-feed-sync.cron gvm - fi - - fowners -R gvm:gvm /etc/openvas - - newinitd "${FILESDIR}/${MY_DN}.init" "${MY_DN}" - newconfd "${FILESDIR}/${MY_DN}-daemon.conf" "${MY_DN}" - - dodir /etc/logrotate.d - insinto /etc/logrotate.d - newins "${FILESDIR}/${MY_DN}.logrotate" "${MY_DN}" - - systemd_dounit "${FILESDIR}/${MY_DN}.service" - - # Set proper permissions on required files/directories - keepdir /var/log/gvm - fowners gvm:gvm /var/log/gvm - keepdir /var/lib/openvas/{gnupg,plugins} - fowners -R gvm:gvm /var/lib/openvas -} diff --git a/net-analyzer/openvas-scanner/openvas-scanner-7.0.1.ebuild b/net-analyzer/openvas-scanner/openvas-scanner-7.0.1.ebuild deleted file mode 100644 index 812b342a1ca3..000000000000 --- a/net-analyzer/openvas-scanner/openvas-scanner-7.0.1.ebuild +++ /dev/null @@ -1,121 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -CMAKE_MAKEFILE_GENERATOR="emake" -inherit cmake flag-o-matic toolchain-funcs - -MY_PN="openvas" -MY_DN="openvassd" - -DESCRIPTION="Open Vulnerability Assessment Scanner" -HOMEPAGE="https://www.greenbone.net/en/" -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="cron extras test" -RESTRICT="!test? ( test )" - -DEPEND=" - acct-user/gvm - app-crypt/gpgme:= - dev-db/redis - dev-libs/glib - dev-libs/libgcrypt:= - dev-libs/libksba - >=net-analyzer/gvm-libs-11.0.1 - net-analyzer/net-snmp - net-libs/gnutls:= - net-libs/libpcap - net-libs/libssh:=" - -RDEPEND=" - ${DEPEND}" - -BDEPEND=" - sys-devel/bison - sys-devel/flex - virtual/pkgconfig - extras? ( - app-doc/doxygen[dot] - app-doc/xmltoman - app-text/htmldoc - dev-perl/CGI - dev-perl/SQL-Translator - ) - test? ( dev-libs/cgreen )" - -BUILD_DIR="${WORKDIR}/${MY_PN}-${PV}_build" -S="${WORKDIR}/${MY_PN}-${PV}" - -src_prepare() { - cmake_src_prepare - # QA-Fix | Correct FHS/Gentoo policy paths for 7.0.0 - sed -i -e "s*/doc/openvas-scanner/*/doc/openvas-scanner-${PV}/*g" "$S"/src/CMakeLists.txt || die - # QA-Fix | Remove !CLANG doxygen warnings for 7.0.0 - if use extras; 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" - "-DSBINDIR=${EPREFIX}/usr/bin" - ) - cmake_src_configure -} - -src_compile() { - cmake_src_compile - if use extras; 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 extras; then - local HTML_DOCS=( "${BUILD_DIR}"/doc/generated/html/. ) - fi - cmake_src_install - - if use cron; then - # Install the cron job if they want it. - exeinto /etc/gvm - doexe "${FILESDIR}/gvm-feed-sync.sh" - fowners gvm:gvm /etc/gvm/gvm-feed-sync.sh - - insinto /etc/cron.d - newins "${FILESDIR}"/gvm-feed-sync.cron gvm - fi - - insinto /etc/logrotate.d - newins "${FILESDIR}/${MY_DN}.logrotate" "${MY_DN}" - - # Set proper permissions on required files/directories - keepdir /var/log/gvm - fowners gvm:gvm /var/log/gvm - keepdir /var/lib/openvas/{gnupg,plugins} - fowners -R gvm:gvm /var/lib/openvas - - insinto /etc/openvas - doins "${FILESDIR}/openvas.conf" -} diff --git a/net-analyzer/opsgenie-lamp/metadata.xml b/net-analyzer/opsgenie-lamp/metadata.xml index c36c37139fad..db463f3eeb66 100644 --- a/net-analyzer/opsgenie-lamp/metadata.xml +++ b/net-analyzer/opsgenie-lamp/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> <email>williamh@gentoo.org</email> diff --git a/net-analyzer/ospd-openvas/Manifest b/net-analyzer/ospd-openvas/Manifest index 36b0ffc73446..0bcfc7d786d4 100644 --- a/net-analyzer/ospd-openvas/Manifest +++ b/net-analyzer/ospd-openvas/Manifest @@ -1 +1,2 @@ -DIST ospd-openvas-1.0.1.tar.gz 50455 BLAKE2B 06a4cdcc2f51351215fffa5517cb2cae620b9b7ffded738d3c63bda11fa8572fe93e0b5fc1c8c9a1bd27cbea65641b0586c329d1d05a022e1fba79c8782d091c SHA512 bdcdb1a8bc08fc27f1a85846ad944b3764a67c153cd75ffa607f69e0c07f223aa0e0965ee081e2398d4d47fc6faf1fd6fad90e6bc724952a0679de783dd2cc87 +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 diff --git a/net-analyzer/ospd-openvas/files/ospd-openvas-22.confd b/net-analyzer/ospd-openvas/files/ospd-openvas-22.confd new file mode 100644 index 000000000000..dbe9d762dae0 --- /dev/null +++ b/net-analyzer/ospd-openvas/files/ospd-openvas-22.confd @@ -0,0 +1,4 @@ +# OpenVAS Scanner command args + +# e.g --foreground +OSPD_OPENVAS_OPTIONS="" diff --git a/net-analyzer/ospd-openvas/files/ospd-openvas-22.initd b/net-analyzer/ospd-openvas/files/ospd-openvas-22.initd new file mode 100644 index 000000000000..d8ef2f27c214 --- /dev/null +++ b/net-analyzer/ospd-openvas/files/ospd-openvas-22.initd @@ -0,0 +1,24 @@ +#!/sbin/openrc-run +# Copyright 2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +: ${GVM_USER:=gvm} +: ${GVM_GROUP:=$(id -ng ${GVM_USER})} +: ${OSPD_TIMEOUT:=30} + +name="remotely control an OpenVAS Scanner" +command=/usr/bin/ospd-openvas +command_user="${GVM_USER}:${GVM_GROUP}" +command_args="${OSPD_OPENVAS_OPTIONS} \ + --config /etc/gvm/ospd-openvas.conf" +pidfile=/run/ospd/ospd-openvas.pid +retry="${OSPD_TIMEOUT}" + +depend() { + after bootmisc redis-openvas + need localmount redis-openvas +} + +start_pre() { + checkpath -d --owner ${GVM_USER} /var/run/ospd +} diff --git a/net-analyzer/ospd-openvas/files/ospd-openvas.confd b/net-analyzer/ospd-openvas/files/ospd-openvas.confd deleted file mode 100644 index fc776ac49e32..000000000000 --- a/net-analyzer/ospd-openvas/files/ospd-openvas.confd +++ /dev/null @@ -1,10 +0,0 @@ -# OpenVAS Scanner command args - -# e.g --foreground -OSPD_OPENVAS_OPTIONS="" - -# Scanner listen socket -OSPD_OPENVAS_UNIX_SOCKET="--unix-socket=/tmp/ospd.sock" - -# Scanner listen mode -OSPD_OPENVAS_SOCKET_MODE="--socket-mode=0o777" diff --git a/net-analyzer/ospd-openvas/files/ospd-openvas.initd b/net-analyzer/ospd-openvas/files/ospd-openvas.initd deleted file mode 100644 index f8887d8b3431..000000000000 --- a/net-analyzer/ospd-openvas/files/ospd-openvas.initd +++ /dev/null @@ -1,21 +0,0 @@ -#!/sbin/openrc-run -# Copyright 2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -name="remotely control an OpenVAS Scanner" -command=/usr/bin/ospd-openvas -pidfile="/run/${RC_SVCNAME}.pid" -command_args="${OSPD_OPENVAS_OPTIONS} \ - ${OSPD_OPENVAS_UNIX_SOCKET} \ - ${OSPD_OPENVAS_SOCKET_MODE} \ - --pid-file ${pidfile} \ - --config /etc/openvas/ospd.conf" - -depend() { - after bootmisc - need localmount redis -} - -start_pre() { - checkpath -d /var/run/ospd -} diff --git a/net-analyzer/ospd-openvas/files/ospd-openvas.logrotate b/net-analyzer/ospd-openvas/files/ospd-openvas.logrotate new file mode 100644 index 000000000000..7fed1aa23437 --- /dev/null +++ b/net-analyzer/ospd-openvas/files/ospd-openvas.logrotate @@ -0,0 +1,13 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 +# Daemon ignore HUP so we use 'copytruncate' instead of 'create' +# with safe file size to prevent losing log entries. + +/var/log/gvm/ospd-openvas.log { + compress + missingok + notifempty + sharedscripts + copytruncate + maxsize 10M +} diff --git a/net-analyzer/ospd-openvas/files/ospd-openvas.service b/net-analyzer/ospd-openvas/files/ospd-openvas.service deleted file mode 100644 index f496797d54ff..000000000000 --- a/net-analyzer/ospd-openvas/files/ospd-openvas.service +++ /dev/null @@ -1,18 +0,0 @@ -[Unit] -Description=OSPD OpenVAS -After=network.target networking.service dnsmasq.service redis-server@openvas.service systemd-tmpfiles.service -ConditionKernelCommandLine=!recovery - -[Service] -Type=forking -User=gvm -Group=gvm -ExecStart=/usr/bin/ospd-openvas --config /etc/openvas/ospd.conf --foreground -SuccessExitStatus=SIGKILL -# This works asynchronously, but does not take the daemon down during the reload so it's ok. -Restart=always -RestartSec=60 - -[Install] -WantedBy=multi-user.target -Alias=ospd-openvas.service diff --git a/net-analyzer/ospd-openvas/files/ospd-openvas.service.conf b/net-analyzer/ospd-openvas/files/ospd-openvas.service.conf new file mode 100644 index 000000000000..976d81bc72bc --- /dev/null +++ b/net-analyzer/ospd-openvas/files/ospd-openvas.service.conf @@ -0,0 +1,7 @@ +[Unit] +After=network.target networking.service redis-openvas.service mosquitto.service +Wants=redis-openvas.service +PartOf=gvm.target + +[Service] +ExecStartPre=+setfacl -m u:gvm:rw /run/redis-openvas/redis.sock diff --git a/net-analyzer/ospd-openvas/files/ospd-openvas.service_notus.conf b/net-analyzer/ospd-openvas/files/ospd-openvas.service_notus.conf new file mode 100644 index 000000000000..cd8b7d8d0e70 --- /dev/null +++ b/net-analyzer/ospd-openvas/files/ospd-openvas.service_notus.conf @@ -0,0 +1,9 @@ +[Unit] +After=network.target networking.service redis-openvas.service mosquitto.service +Wants=redis-openvas.service +PartOf=gvm.target + +[Service] +ExecStartPre=+setfacl -m u:gvm:rw /run/redis-openvas/redis.sock +ExecStart= +ExecStart=/usr/bin/ospd-openvas --config /etc/gvm/ospd-openvas.conf --log-config /etc/gvm/ospd-logging.conf --lock-file-dir /var/lib/openvas --socket-mode 0o770 --mqtt-broker-address localhost --mqtt-broker-port 1883 --notus-feed-dir /var/lib/notus/advisories diff --git a/net-analyzer/ospd-openvas/files/ospd.conf b/net-analyzer/ospd-openvas/files/ospd.conf deleted file mode 100644 index bac46565001c..000000000000 --- a/net-analyzer/ospd-openvas/files/ospd.conf +++ /dev/null @@ -1,10 +0,0 @@ -[OSPD - openvas] - -#required by gvmd -unix_socket = /tmp/ospd.sock - -#socket_mode = 0o770 -#unix_socket = /run/ospd/ospd-openvas.pid - -log_level = DEBUG -log_file = /var/log/gvm/ospd-openvas.log diff --git a/net-analyzer/ospd-openvas/files/redis.conf.example b/net-analyzer/ospd-openvas/files/redis.conf.example deleted file mode 100644 index 6a41211aaae8..000000000000 --- a/net-analyzer/ospd-openvas/files/redis.conf.example +++ /dev/null @@ -1,57 +0,0 @@ -bind 127.0.0.1 -protected-mode yes -port 0 -tcp-backlog 511 -unixsocket /tmp/redis.sock -unixsocketperm 700 -timeout 0 -tcp-keepalive 300 -daemonize no -supervised no -pidfile /run/redis/redis.pid -loglevel notice -logfile /var/log/redis/redis.log -databases 16 -always-show-logo yes -stop-writes-on-bgsave-error yes -rdbcompression yes -rdbchecksum yes -dbfilename dump.rdb -dir /var/lib/redis/ -slave-serve-stale-data yes -slave-read-only yes -repl-diskless-sync no -repl-diskless-sync-delay 5 -repl-disable-tcp-nodelay no -slave-priority 100 -lazyfree-lazy-eviction no -lazyfree-lazy-expire no -lazyfree-lazy-server-del no -slave-lazy-flush no -appendonly no -appendfilename "appendonly.aof" -appendfsync everysec -no-appendfsync-on-rewrite no -auto-aof-rewrite-percentage 100 -auto-aof-rewrite-min-size 64mb -aof-load-truncated yes -aof-use-rdb-preamble no -lua-time-limit 5000 -slowlog-log-slower-than 10000 -slowlog-max-len 128 -latency-monitor-threshold 0 -notify-keyspace-events "" -hash-max-ziplist-entries 512 -hash-max-ziplist-value 64 -list-max-ziplist-size -2 -list-compress-depth 0 -set-max-intset-entries 512 -zset-max-ziplist-entries 128 -zset-max-ziplist-value 64 -hll-sparse-max-bytes 3000 -activerehashing yes -client-output-buffer-limit normal 0 0 0 -client-output-buffer-limit slave 256mb 64mb 60 -client-output-buffer-limit pubsub 32mb 8mb 60 -hz 10 -aof-rewrite-incremental-fsync yes diff --git a/net-analyzer/ospd-openvas/metadata.xml b/net-analyzer/ospd-openvas/metadata.xml index d46922d749f9..18eb90f3e699 100644 --- a/net-analyzer/ospd-openvas/metadata.xml +++ b/net-analyzer/ospd-openvas/metadata.xml @@ -1,11 +1,15 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> + <maintainer type="person" proxied="yes"> + <email>foti.giuseppe@gmail.com</email> + <name>Giuseppe Foti</name> + </maintainer> + <maintainer type="person" proxied="yes"> <email>jonas.licht@gmail.com</email> <name>Jonas Licht</name> </maintainer> - <maintainer type="project"> + <maintainer type="project" proxied="proxy"> <email>proxy-maint@gentoo.org</email> <name>Proxy Maintainers</name> </maintainer> @@ -13,4 +17,10 @@ This is an OSP server implementation to allow GVM to remotely control OpenVAS. Once running, you need to configure OpenVAS for the Greenbone Vulnerability Manager, for example via the web interface Greenbone Security Assistant. Then you can create scan tasks to use OpenVAS. </longdescription> + <use> + <flag name="notus">Set systemd service file to use notus-scanner</flag> + </use> + <upstream> + <remote-id type="github">greenbone/ospd-openvas</remote-id> + </upstream> </pkgmetadata> diff --git a/net-analyzer/ospd-openvas/ospd-openvas-1.0.1.ebuild b/net-analyzer/ospd-openvas/ospd-openvas-1.0.1.ebuild deleted file mode 100644 index 3e6e76f0659a..000000000000 --- a/net-analyzer/ospd-openvas/ospd-openvas-1.0.1.ebuild +++ /dev/null @@ -1,46 +0,0 @@ -# Copyright 2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{7,8,9} ) -DISTUTILS_USE_SETUPTOOLS=rdepend -inherit distutils-r1 systemd - -DESCRIPTION="This is an OSP server implementation to allow GVM to remotely control OpenVAS" -HOMEPAGE="https://github.com/greenbone/ospd-openvas" -SRC_URI="https://github.com/greenbone/ospd-openvas/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -DEPEND=" - acct-user/gvm - dev-python/packaging[${PYTHON_USEDEP}] - dev-python/psutil[${PYTHON_USEDEP}] - >=dev-python/redis-py-3.0.1[${PYTHON_USEDEP}] - >=net-analyzer/ospd-2.0.0[${PYTHON_USEDEP}] -" -RDEPEND=" - ${DEPEND} - >=net-analyzer/openvas-scanner-7.0.0" -BDEPEND="" - -distutils_enable_tests unittest - -python_install() { - distutils-r1_python_install - - insinto /etc/openvas - doins "${FILESDIR}"/redis.conf.example - doins "${FILESDIR}"/ospd.conf - - fowners -R gvm:gvm /etc/openvas - - newinitd "${FILESDIR}/${PN}.initd" "${PN}" - newconfd "${FILESDIR}/${PN}.confd" "${PN}" - - systemd_dounit "${FILESDIR}/${PN}.service" -} diff --git a/net-analyzer/ospd-openvas/ospd-openvas-22.6.2.ebuild b/net-analyzer/ospd-openvas/ospd-openvas-22.6.2.ebuild new file mode 100644 index 000000000000..d202b6f35bd0 --- /dev/null +++ b/net-analyzer/ospd-openvas/ospd-openvas-22.6.2.ebuild @@ -0,0 +1,86 @@ +# 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/packaging-20.4[${PYTHON_USEDEP}] + <dev-python/packaging-24.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.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/Manifest b/net-analyzer/ospd/Manifest deleted file mode 100644 index ff299eea6a3e..000000000000 --- a/net-analyzer/ospd/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST ospd-2.0.1.tar.gz 87313 BLAKE2B cf527742246ceb5acaf69900d48f1800ef98153026fa6aae2661e4a3aafad6f69221fa7c7f34a222a0972cf5550a9543696b1e7a4368ef050574ca08f72f0978 SHA512 4aed0e1a22ea6c0db26977e7b0bde9c9c37890422f3480ad83ef23ad193b7ae3dd7352872c4fe377808d2a398317a4c1d38d7ab2ef5a0266c544e0ef55a0365a diff --git a/net-analyzer/ospd/metadata.xml b/net-analyzer/ospd/metadata.xml deleted file mode 100644 index 2a4516f1d3b0..000000000000 --- a/net-analyzer/ospd/metadata.xml +++ /dev/null @@ -1,25 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="person"> - <email>jonas.licht@gmail.com</email> - <name>Jonas Licht</name> - </maintainer> - <maintainer type="project"> - <email>proxy-maint@gentoo.org</email> - <name>Proxy Maintainers</name> - </maintainer> - <use> - <flag name="extras">Html docs support</flag> - </use> - <longdescription lang="en"> - OSPD is a base class for scanner wrappers which share the same communication protocol: - OSP (Open Scanner Protocol). OSP creates a unified interface for different security scanners - and makes their control flow and scan results consistently available under the central - Greenbone Vulnerability Manager service. - </longdescription> - <upstream> - <remote-id type="github">greenbone/ospd</remote-id> - </upstream> -</pkgmetadata> - diff --git a/net-analyzer/ospd/ospd-2.0.1.ebuild b/net-analyzer/ospd/ospd-2.0.1.ebuild deleted file mode 100644 index 67790c9260cd..000000000000 --- a/net-analyzer/ospd/ospd-2.0.1.ebuild +++ /dev/null @@ -1,35 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{7,8,9} ) -DISTUTILS_USE_SETUPTOOLS=pyproject.toml -inherit distutils-r1 - -DESCRIPTION="Base class for scanner wrappers,communication protocol for GVM" -HOMEPAGE="https://www.greenbone.net/en/" -SRC_URI="https://github.com/greenbone/ospd/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -SLOT="0" -LICENSE="GPL-2" -KEYWORDS="~amd64 ~x86" -IUSE="extras" - -RDEPEND=" - dev-python/defusedxml[${PYTHON_USEDEP}] - dev-python/lxml[${PYTHON_USEDEP}] - dev-python/paramiko[${PYTHON_USEDEP}]" - -DEPEND=" - ${RDEPEND}" - -distutils_enable_tests unittest - -python_compile() { - if use extras; then - bash "${S}"/doc/generate || die - HTML_DOCS=( "${S}"/doc/. ) - fi - distutils-r1_python_compile -} diff --git a/net-analyzer/ossec-hids/metadata.xml b/net-analyzer/ossec-hids/metadata.xml index cef6eccb2d71..3d4c2c0e64ac 100644 --- a/net-analyzer/ossec-hids/metadata.xml +++ b/net-analyzer/ossec-hids/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <!-- maintainer-needed --> <longdescription> diff --git a/net-analyzer/ostinato/Manifest b/net-analyzer/ostinato/Manifest index 44c30549ab5a..781d32d58930 100644 --- a/net-analyzer/ostinato/Manifest +++ b/net-analyzer/ostinato/Manifest @@ -1 +1,2 @@ -DIST ostinato-0.9_p20180522.tar.gz 424128 BLAKE2B 69a15e523986cd34f89669fab0ed64987f68ea7d82d481de418c2d86f3b325b5c1ff9081db8c77532b603b01f504c37c24a4f7f5b7244657cac8b2f707bc7bdf SHA512 7d8359b193c98165ea376ad0ad57e01b782e35a7b887465d74c67ae1cd434036e8beb67593c569e15a87d5d0c7f602c9f01acf068e9ffff0c0496ab4f889a83a +DIST ostinato-1.1.tar.gz 612589 BLAKE2B 2244b3be5649e0623139b667c61a169a3e7f5dae6f022d6550cd825f1af8fa2c2d82210af1f381ae53af19fff9a56d58b30a406fc1f3d89c73bc7e3d0ab18fa4 SHA512 a45e157d155d4f2efe9a1594a140647b5cbd7264985b15a9ed47d86198c9df9d763170097dcfd40fae1317206e53c9155f08c48c747cce458e0cae7f3a841449 +DIST ostinato-1.2.0.tar.gz 1169889 BLAKE2B 73d1ba4801ee8f50757fbe3a5e4c6fb67957296326c5ffcc5ecfde723ee975bd6a8f494644198b4b47a296fd087e2ed7a43088facd8c39d3ed70b8056fae5da5 SHA512 c3fb1f63a8f32c199ae2c8630244a3d6110e25e9117fbc96b009fd54d6bc16dbfa120b2d26c474ca06e86dbed59a5051443f82064fb8a0eda2feb212e4e1a1c5 diff --git a/net-analyzer/ostinato/files/ostinato-0.9_p20180522-buildfix.patch b/net-analyzer/ostinato/files/ostinato-0.9_p20180522-buildfix.patch deleted file mode 100644 index ff09d689ae5c..000000000000 --- a/net-analyzer/ostinato/files/ostinato-0.9_p20180522-buildfix.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- a/common/mld.cpp 2018-05-22 18:18:21.000000000 +0200 -+++ b/common/mld.cpp 2018-06-26 13:59:58.562569302 +0200 -@@ -24,6 +24,14 @@ - #include <QHostAddress> - #include <QStringList> - -+template <> inline Q_DECL_CONSTEXPR unsigned long qbswap<unsigned long>(unsigned long source) { -+ if (sizeof(unsigned long) == 8) { -+ return qbswap<quint64>(quint64(source)); -+ } else { -+ return qbswap<quint32>(quint32(source)); -+ } -+} -+ - MldProtocol::MldProtocol(StreamBase *stream, AbstractProtocol *parent) - : GmpProtocol(stream, parent) - { diff --git a/net-analyzer/ostinato/metadata.xml b/net-analyzer/ostinato/metadata.xml index fb90fd94be6f..64eb1aca5936 100644 --- a/net-analyzer/ostinato/metadata.xml +++ b/net-analyzer/ostinato/metadata.xml @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> <email>zerochaos@gentoo.org</email> <name>Rick Farina</name> </maintainer> <upstream> - <remote-id type="google-code">ostinato</remote-id> + <remote-id type="github">pstavirs/ostinato</remote-id> </upstream> </pkgmetadata> diff --git a/net-analyzer/ostinato/ostinato-0.9_p20180522.ebuild b/net-analyzer/ostinato/ostinato-0.9_p20180522.ebuild deleted file mode 100644 index e2e38eaf0514..000000000000 --- a/net-analyzer/ostinato/ostinato-0.9_p20180522.ebuild +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -COMMIT=9a4e7e7550c6b20a8f0f1393a55036492c1b7703 -inherit qmake-utils - -DESCRIPTION="Packet generator and analyzer" -HOMEPAGE="https://ostinato.org/" -SRC_URI="https://github.com/pstavirs/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -#KEYWORDS="~amd64 ~arm ~x86" -IUSE="" - -#https://github.com/pstavirs/ostinato/issues/173 -# libpcap dep is versioned to pull in the fix for #602098 -DEPEND=" - dev-libs/protobuf:= - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtscript:5 - dev-qt/qtwidgets:5 - >=net-libs/libpcap-1.8.1-r2 -" -RDEPEND="${DEPEND}" - -S="${WORKDIR}/${PN}-${COMMIT}" - -PATCHES=( - "${FILESDIR}/${P}-buildfix.patch" - "${FILESDIR}/${P}-no-modeltest.patch" -) - -src_configure() { - eqmake5 PREFIX="${ED}/usr" ost.pro -} diff --git a/net-analyzer/ostinato/ostinato-1.1-r2.ebuild b/net-analyzer/ostinato/ostinato-1.1-r2.ebuild new file mode 100644 index 000000000000..bccd03f406c0 --- /dev/null +++ b/net-analyzer/ostinato/ostinato-1.1-r2.ebuild @@ -0,0 +1,42 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit qmake-utils + +DESCRIPTION="Packet generator and analyzer" +HOMEPAGE="https://ostinato.org/" +SRC_URI="https://github.com/pstavirs/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~arm ~x86" +IUSE="" + +#https://github.com/pstavirs/ostinato/issues/173 +# libpcap dep is versioned to pull in the fix for #602098 +DEPEND=" + dev-libs/protobuf:= + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtnetwork:5 + dev-qt/qtscript:5 + dev-qt/qtwidgets:5 + dev-qt/qtxml:5 + dev-libs/libnl:= + >=net-libs/libpcap-1.8.1-r2 +" +RDEPEND="${DEPEND}" + +PATCHES=( + "${FILESDIR}/${PN}-0.9_p20180522-no-modeltest.patch" +) + +src_configure() { + eqmake5 PREFIX="/usr" ost.pro +} + +src_install() { + emake INSTALL_ROOT="${ED}" install +} diff --git a/net-analyzer/ostinato/ostinato-1.2.0.ebuild b/net-analyzer/ostinato/ostinato-1.2.0.ebuild new file mode 100644 index 000000000000..586f8e2f2597 --- /dev/null +++ b/net-analyzer/ostinato/ostinato-1.2.0.ebuild @@ -0,0 +1,45 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit qmake-utils + +DESCRIPTION="Packet generator and analyzer" +HOMEPAGE="https://ostinato.org/" +SRC_URI="https://github.com/pstavirs/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~arm ~x86" +IUSE="" + +#https://github.com/pstavirs/ostinato/issues/173 +# libpcap dep is versioned to pull in the fix for #602098 +RDEPEND=" + dev-libs/protobuf:= + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtnetwork:5 + dev-qt/qtscript:5 + dev-qt/qtwidgets:5 + dev-libs/libnl:3 + >=net-libs/libpcap-1.8.1-r2 +" +DEPEND="${RDEPEND} + dev-qt/qtsvg:5 + dev-qt/qtxml:5" + +PATCHES=( + "${FILESDIR}/${PN}-0.9_p20180522-no-modeltest.patch" +) + +src_configure() { + sed -i 's#"/drone"#"/ostinato-drone"#' client/mainwindow.cpp || die + eqmake5 PREFIX="/usr" ost.pro +} + +src_install() { + emake INSTALL_ROOT="${ED}" install + mv "${ED}"/usr/bin/{drone,ostinato-drone} +} diff --git a/net-analyzer/p0f/metadata.xml b/net-analyzer/p0f/metadata.xml index 74c2baebb4ec..dce3f3be66c0 100644 --- a/net-analyzer/p0f/metadata.xml +++ b/net-analyzer/p0f/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>netmon@gentoo.org</email> diff --git a/net-analyzer/p0f/p0f-3.09_beta-r1.ebuild b/net-analyzer/p0f/p0f-3.09_beta-r1.ebuild new file mode 100644 index 000000000000..305af081ef7d --- /dev/null +++ b/net-analyzer/p0f/p0f-3.09_beta-r1.ebuild @@ -0,0 +1,53 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit edo toolchain-funcs + +MY_P=${P/_beta/b} + +DESCRIPTION="A tool to perform passive OS detection based on SYN packets" +HOMEPAGE="https://lcamtuf.coredump.cx/p0f3/" +SRC_URI="https://lcamtuf.coredump.cx/p0f3/releases/${MY_P}.tgz" +S="${WORKDIR}"/${MY_P} + +LICENSE="LGPL-2.1" +SLOT="0" +KEYWORDS="amd64 ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" +IUSE="debug ipv6" + +RDEPEND="net-libs/libpcap" +DEPEND="${RDEPEND}" + +src_prepare() { + default + + sed -i \ + -e 's:-g -ggdb::' \ + -e 's:-O3::' \ + -e '/^CC/s:=:?=:' \ + -e '/^CFLAGS/s:=:+=:' \ + -e '/^LDFLAGS/s:=:+=:' \ + build.sh tools/Makefile || die + + sed -i -e "/FP_FILE/s:p0f.fp:${EPREFIX}/etc/&:" config.h || die +} + +src_compile() { + tc-export CC + + edo ./build.sh $(use debug && echo debug) + + emake -C tools p0f-client p0f-sendsyn $(use ipv6 && echo p0f-sendsyn6) +} + +src_install() { + dosbin p0f tools/p0f-{client,sendsyn} + use ipv6 && dosbin tools/p0f-sendsyn6 + + insinto /etc + doins p0f.fp + + dodoc docs/{ChangeLog,README,TODO,*.txt} tools/README-TOOLS +} diff --git a/net-analyzer/p0f/p0f-3.09_beta.ebuild b/net-analyzer/p0f/p0f-3.09_beta.ebuild deleted file mode 100644 index 92f2334f50ea..000000000000 --- a/net-analyzer/p0f/p0f-3.09_beta.ebuild +++ /dev/null @@ -1,51 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit toolchain-funcs - -MY_P=${P/_beta/b} - -DESCRIPTION="A tool to perform passive OS detection based on SYN packets" -HOMEPAGE="https://lcamtuf.coredump.cx/p0f3/" -SRC_URI="https://lcamtuf.coredump.cx/p0f3/releases/${MY_P}.tgz" - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="amd64 ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" -IUSE="debug ipv6" - -RDEPEND="net-libs/libpcap" -DEPEND="${RDEPEND}" - -S=${WORKDIR}/${MY_P} - -src_prepare() { - default - - sed -i \ - -e 's:-g -ggdb::' \ - -e 's:-O3::' \ - -e '/^CC/s:=:?=:' \ - -e '/^CFLAGS/s:=:+=:' \ - -e '/^LDFLAGS/s:=:+=:' \ - build.sh tools/Makefile || die - - sed -i -e "/FP_FILE/s:p0f.fp:${EPREFIX}/etc/&:" config.h || die -} - -src_compile() { - tc-export CC - ./build.sh $(use debug && echo debug) || die - emake -C tools p0f-client p0f-sendsyn $(use ipv6 && echo p0f-sendsyn6) -} - -src_install() { - dosbin p0f tools/p0f-{client,sendsyn} - use ipv6 && dosbin tools/p0f-sendsyn6 - - insinto /etc - doins p0f.fp - - dodoc docs/{ChangeLog,README,TODO,*.txt} tools/README-TOOLS -} diff --git a/net-analyzer/packit/Manifest b/net-analyzer/packit/Manifest index 69e82515e9d3..62512f7495e4 100644 --- a/net-analyzer/packit/Manifest +++ b/net-analyzer/packit/Manifest @@ -1,2 +1 @@ -DIST packit-1.6.1.tar.gz 52643 BLAKE2B 4b67c179140a21ec3dc8b5ae2e116a771fdbd860c3a880588a29346f04c956a80a59fcaf84f42ae6c505554e5b942964ed3f2d3a06d408e5b36850276832994a SHA512 462470bfc755dc33418ae0a65237d0dcbbe04609de710883134bcb1e13cff9212cd9a28e888b2e839a06a566fa080ecd6c6668414f1cac2bde337c81d1ac58a2 -DIST packit-1.7.tar.gz 53192 BLAKE2B f5a7fcd0790e05be593be47c2339c3ecb14b2fd45308a273ecc9d5398087698605c2174a8440e870ccf35fd9d560bea11ca720e44045115c15757f6f98d00ac4 SHA512 4e7d13ef5387dc446e718792562dbf84f9e0b611196a3590ea8e8b4411ae30694b48f28ab632a0b692935adffb44757e65a4eb5ab942b5d625acbdc08d34aefd +DIST packit-1.8.tar.gz 150410 BLAKE2B d0a0926643b6b595159d1fec703295a880c1fcad188e2d9a6719b879bad0b1f081ab75031550257d5c8573f2d8ed9960e7d46fdbe4c4c19c669015b048509a24 SHA512 1873c687c8be489966d5f8868def3cb824264dcfd8c6572b03fd51f15f8920965c8682b13cc6a9d6fec62bf9fe3b4e91f5a9d3d4c6441232d3f6f51a244a8baf diff --git a/net-analyzer/packit/files/packit-1.0-noopt.patch b/net-analyzer/packit/files/packit-1.0-noopt.patch deleted file mode 100644 index d6bfdf6fb74f..000000000000 --- a/net-analyzer/packit/files/packit-1.0-noopt.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/src/main.c -+++ b/src/main.c -@@ -201,6 +201,7 @@ - #ifdef DEBUG - fprintf(stdout, "DEBUG: parse_inject\n"); - #endif -+ if (!opts) print_usage(); - - while((opt = getopt(argc, argv, opts)) != -1) - { diff --git a/net-analyzer/packit/files/packit-1.6.1-fno-common.patch b/net-analyzer/packit/files/packit-1.6.1-fno-common.patch deleted file mode 100644 index f4813d868ab1..000000000000 --- a/net-analyzer/packit/files/packit-1.6.1-fno-common.patch +++ /dev/null @@ -1,251 +0,0 @@ ---- a/src/capture_defs.h -+++ b/src/capture_defs.h -@@ -30,12 +30,12 @@ - #define READ_TIMEOUT 500 - #define SNAPLEN_DEFAULT 68 - --u_int16_t g_display; --u_int16_t g_link_layer; --u_int16_t g_dump_pkt; --u_int16_t g_time_gmt; --u_int16_t g_t_rst; --u_int16_t g_snap_len; --u_int32_t g_pkt_rst; -+extern u_int16_t g_display; -+extern u_int16_t g_link_layer; -+extern u_int16_t g_dump_pkt; -+extern u_int16_t g_time_gmt; -+extern u_int16_t g_t_rst; -+extern u_int16_t g_snap_len; -+extern u_int32_t g_pkt_rst; - - #endif /* __CAPTURE_DEFS_H */ ---- a/src/error.c -+++ b/src/error.c -@@ -26,6 +26,8 @@ - - #include "error.h" - -+char error_buf[ERRBUF_MAXLEN]; -+ - void - fatal_error(char *err,...) - { ---- a/src/error.h -+++ b/src/error.h -@@ -33,7 +33,7 @@ - #define SUCCESS 1 - #define FAILURE -1 - --char error_buf[ERRBUF_MAXLEN]; -+extern char error_buf[ERRBUF_MAXLEN]; - - void fatal_error(char *,...); - ---- a/src/globals.h -+++ b/src/globals.h -@@ -138,20 +138,20 @@ - #define P_INT64 0x7FFFFFFFFFFFFFFF - #define P_UINT64 0xFFFFFFFFFFFFFFFF - --char g_w_file[OPT_MAXLEN]; --char g_r_file[OPT_MAXLEN]; -+extern char g_w_file[OPT_MAXLEN]; -+extern char g_r_file[OPT_MAXLEN]; - --pcap_t *g_pkt; --u_int8_t g_tr_fin; --char *g_filter; --char *g_device; --u_int16_t g_hdr_len; --u_int16_t g_pkt_len; --u_int16_t g_verbose; --u_int16_t g_resolve; --u_int16_t g_p_mode; --u_int64_t g_cnt; --u_int64_t g_inj_cnt; --u_int64_t g_cap_cnt; -+extern pcap_t *g_pkt; -+extern u_int8_t g_tr_fin; -+extern char *g_filter; -+extern char *g_device; -+extern u_int16_t g_hdr_len; -+extern u_int16_t g_pkt_len; -+extern u_int16_t g_verbose; -+extern u_int16_t g_resolve; -+extern u_int16_t g_p_mode; -+extern u_int64_t g_cnt; -+extern u_int64_t g_inj_cnt; -+extern u_int64_t g_cap_cnt; - - #endif /* __GLOBALS_H */ ---- a/src/inject_defs.h -+++ b/src/inject_defs.h -@@ -30,7 +30,7 @@ - #ifndef __INJECTION_STRUCTS_H - #define __INJECTION_STRUCTS_H - --struct ip4hdr_opts -+extern struct ip4hdr_opts - { - u_int16_t p; /* protocol type */ - u_int16_t rand_p; -@@ -59,7 +59,7 @@ - u_int16_t rand_d_addr; - } g_ip4hdr_o; - --struct tcphdr_opts -+extern struct tcphdr_opts - { - u_int16_t s_port; /* tcp source port */ - u_int16_t d_port; /* tcp destination port */ -@@ -82,7 +82,7 @@ - - } g_thdr_o; - --struct udphdr_opts -+extern struct udphdr_opts - { - u_int16_t s_port; /* udp source port */ - u_int16_t d_port; /* udp destination port */ -@@ -90,7 +90,7 @@ - u_int16_t sum; /* udp checksum */ - } g_uhdr_o; - --struct icmp4hdr_opts -+extern struct icmp4hdr_opts - { - u_int16_t type; /* icmp4 type */ - u_int16_t code; /* icmp4 code */ -@@ -132,7 +132,7 @@ - u_int32_t ttime; /* transmit timestamp */ - } g_i4hdr_o; - --struct enethdr_opts -+extern struct enethdr_opts - { - u_int16_t rand_s_addr; - u_int16_t rand_d_addr; -@@ -143,7 +143,7 @@ - u_int8_t dhw_addr[18]; - } g_ehdr_o; - --struct arphdr_opts -+extern struct arphdr_opts - { - u_int16_t op_type; /* arp operation */ - -@@ -163,28 +163,28 @@ - u_int8_t rhw_addr[18]; - } g_ahdr_o; - --libnet_t *g_pkt_d; -+extern libnet_t *g_pkt_d; - --u_int16_t g_init_type; --u_int16_t g_rand_d_port; --u_int16_t g_rand_s_port; --u_int16_t g_s_port; --u_int16_t g_d_port; --u_int16_t g_port_range; --u_int16_t g_interval_sec; --u_int16_t g_interval_usec; --u_int16_t g_injection_type; --u_int16_t g_r_timeout; --u_int16_t g_burst_rate; --u_int16_t g_payload_len; --u_int8_t *g_payload; --u_int8_t g_hex_payload; --u_int8_t *g_s_d_port; --u_int8_t g_hwaddr_p[18]; --u_int8_t g_rawip; -+extern u_int16_t g_init_type; -+extern u_int16_t g_rand_d_port; -+extern u_int16_t g_rand_s_port; -+extern u_int16_t g_s_port; -+extern u_int16_t g_d_port; -+extern u_int16_t g_port_range; -+extern u_int16_t g_interval_sec; -+extern u_int16_t g_interval_usec; -+extern u_int16_t g_injection_type; -+extern u_int16_t g_r_timeout; -+extern u_int16_t g_burst_rate; -+extern u_int16_t g_payload_len; -+extern u_int8_t *g_payload; -+extern u_int8_t g_hex_payload; -+extern u_int8_t *g_s_d_port; -+extern u_int8_t g_hwaddr_p[18]; -+extern u_int8_t g_rawip; - --struct timeval g_bf_pcap; --struct timeval g_af_pcap; -+extern struct timeval g_bf_pcap; -+extern struct timeval g_af_pcap; - - - #endif /* __INJECTION_STRUCTS_H */ ---- a/src/main.c -+++ b/src/main.c -@@ -30,6 +30,62 @@ - - #include "main.h" - -+char g_w_file[OPT_MAXLEN]; -+char g_r_file[OPT_MAXLEN]; -+ -+pcap_t *g_pkt; -+u_int8_t g_tr_fin; -+char *g_filter; -+char *g_device; -+u_int16_t g_hdr_len; -+u_int16_t g_pkt_len; -+u_int16_t g_verbose; -+u_int16_t g_resolve; -+u_int16_t g_p_mode; -+u_int64_t g_cnt; -+u_int64_t g_inj_cnt; -+u_int64_t g_cap_cnt; -+ -+/* capture_defs.h */ -+u_int16_t g_display; -+u_int16_t g_link_layer; -+u_int16_t g_dump_pkt; -+u_int16_t g_time_gmt; -+u_int16_t g_t_rst; -+u_int16_t g_snap_len; -+u_int32_t g_pkt_rst; -+ -+/* inject_defs.h */ -+u_int16_t g_init_type; -+u_int16_t g_rand_d_port; -+u_int16_t g_rand_s_port; -+u_int16_t g_s_port; -+u_int16_t g_d_port; -+u_int16_t g_port_range; -+u_int16_t g_interval_sec; -+u_int16_t g_interval_usec; -+u_int16_t g_injection_type; -+u_int16_t g_r_timeout; -+u_int16_t g_burst_rate; -+u_int16_t g_payload_len; -+u_int8_t *g_payload; -+u_int8_t g_hex_payload; -+u_int8_t *g_s_d_port; -+u_int8_t g_hwaddr_p[18]; -+u_int8_t g_rawip; -+ -+struct timeval g_bf_pcap; -+struct timeval g_af_pcap; -+ -+struct arphdr_opts g_ahdr_o; -+struct enethdr_opts g_ehdr_o; -+struct icmp4hdr_opts g_i4hdr_o; -+struct ip4hdr_opts g_ip4hdr_o; -+struct tcphdr_opts g_thdr_o; -+struct udphdr_opts g_uhdr_o; -+ -+libnet_t *g_pkt_d; -+ - void - parse_capture_options(int argc, char *argv[]) - { diff --git a/net-analyzer/packit/metadata.xml b/net-analyzer/packit/metadata.xml index 74c2baebb4ec..fc9bbe0d2a69 100644 --- a/net-analyzer/packit/metadata.xml +++ b/net-analyzer/packit/metadata.xml @@ -1,8 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!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> + <maintainer type="project"> + <email>netmon@gentoo.org</email> + <name>Gentoo network monitoring and analysis project</name> + </maintainer> + <upstream> + <remote-id type="github">resurrecting-open-source-projects/packit</remote-id> + </upstream> </pkgmetadata> diff --git a/net-analyzer/packit/packit-1.6.1.ebuild b/net-analyzer/packit/packit-1.6.1.ebuild deleted file mode 100644 index 48ba4aeab1c9..000000000000 --- a/net-analyzer/packit/packit-1.6.1.ebuild +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit autotools - -DESCRIPTION="network packet generator and capture tool" -HOMEPAGE="https://github.com/resurrecting-open-source-projects/packit" -SRC_URI="https://github.com/resurrecting-open-source-projects/packit/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos" - -DEPEND=" - net-libs/libnet:1.1 - net-libs/libpcap -" -RDEPEND="${DEPEND}" -PATCHES=( - "${FILESDIR}"/${PN}-1.0-noopt.patch - "${FILESDIR}"/${PN}-1.6.1-fno-common.patch -) - -src_prepare() { - default - eautoreconf -} - -src_install() { - default - dodoc docs/* -} diff --git a/net-analyzer/packit/packit-1.7.ebuild b/net-analyzer/packit/packit-1.7.ebuild deleted file mode 100644 index 5059d8e159a0..000000000000 --- a/net-analyzer/packit/packit-1.7.ebuild +++ /dev/null @@ -1,32 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit autotools - -DESCRIPTION="network packet generator and capture tool" -HOMEPAGE="https://github.com/resurrecting-open-source-projects/packit" -SRC_URI="https://github.com/resurrecting-open-source-projects/packit/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos" - -DEPEND=" - net-libs/libnet:1.1 - net-libs/libpcap -" -RDEPEND="${DEPEND}" -PATCHES=( - "${FILESDIR}"/${PN}-1.0-noopt.patch -) - -src_prepare() { - default - eautoreconf -} - -src_install() { - default - dodoc docs/* -} diff --git a/net-analyzer/packit/packit-1.8.ebuild b/net-analyzer/packit/packit-1.8.ebuild new file mode 100644 index 000000000000..4e1f8358e695 --- /dev/null +++ b/net-analyzer/packit/packit-1.8.ebuild @@ -0,0 +1,30 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools + +DESCRIPTION="Network packet generator and capture tool" +HOMEPAGE="https://github.com/resurrecting-open-source-projects/packit" +SRC_URI="https://github.com/resurrecting-open-source-projects/packit/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos" + +DEPEND="net-libs/libnet:1.1 + net-libs/libpcap" +RDEPEND="${DEPEND}" + +src_prepare() { + default + + eautoreconf +} + +src_install() { + default + + dodoc docs/* +} diff --git a/net-analyzer/packit/packit-9999.ebuild b/net-analyzer/packit/packit-9999.ebuild deleted file mode 100644 index d58eaf300f88..000000000000 --- a/net-analyzer/packit/packit-9999.ebuild +++ /dev/null @@ -1,32 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit autotools git-r3 - -DESCRIPTION="network packet generator and capture tool" -HOMEPAGE="https://github.com/resurrecting-open-source-projects/packit" -EGIT_REPO_URI="https://github.com/resurrecting-open-source-projects/packit" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="" - -DEPEND=" - net-libs/libnet:1.1 - net-libs/libpcap -" -RDEPEND="${DEPEND}" -PATCHES=( - "${FILESDIR}"/${PN}-1.0-noopt.patch -) - -src_prepare() { - default - eautoreconf -} - -src_install() { - default - dodoc docs/* -} diff --git a/net-analyzer/pathload/files/pathload-1.3.2-clang16.patch b/net-analyzer/pathload/files/pathload-1.3.2-clang16.patch new file mode 100644 index 000000000000..479aaeec520e --- /dev/null +++ b/net-analyzer/pathload/files/pathload-1.3.2-clang16.patch @@ -0,0 +1,34 @@ +configure.ac is missing, so need to edit this manually + +https://bugs.gentoo.org/870661 +--- a/configure ++++ b/configure +@@ -630,3 +630,3 @@ + +-main(){return(0);} ++int main(void){return(0);} + EOF +--- a/pathload_rcv.h ++++ b/pathload_rcv.h +@@ -85,3 +85,3 @@ + EXTERN l_int32 get_sndr_time_interval(double snd_time[],double *sum); +-EXTERN void sig_alrm(); ++EXTERN void sig_alrm(int __attribute__((__unused__)) unused); + EXTERN void terminate_gracefully(struct timeval exp_start_time); +@@ -100,3 +100,3 @@ + EXTERN void help(); +-EXTERN void sig_sigusr1() ; ++EXTERN void sig_sigusr1(int __attribute__((__unused__)) unused) ; + +--- a/pathload_rcv_func.c ++++ b/pathload_rcv_func.c +@@ -669,3 +669,3 @@ + +-void sig_sigusr1() ++void sig_sigusr1(int __attribute__((__unused__)) unused) + { +@@ -674,3 +674,3 @@ + +-void sig_alrm() ++void sig_alrm(int __attribute__((__unused__)) unused) + { diff --git a/net-analyzer/pathload/metadata.xml b/net-analyzer/pathload/metadata.xml index 74c2baebb4ec..dce3f3be66c0 100644 --- a/net-analyzer/pathload/metadata.xml +++ b/net-analyzer/pathload/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>netmon@gentoo.org</email> diff --git a/net-analyzer/pathload/pathload-1.3.2-r1.ebuild b/net-analyzer/pathload/pathload-1.3.2-r1.ebuild index 27b8252d8e52..b8e220379490 100644 --- a/net-analyzer/pathload/pathload-1.3.2-r1.ebuild +++ b/net-analyzer/pathload/pathload-1.3.2-r1.ebuild @@ -1,24 +1,27 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 + inherit toolchain-funcs DESCRIPTION="Non-intrusive utility for estimation of available bandwidth of Internet paths" HOMEPAGE="https://www.cc.gatech.edu/fac/constantinos.dovrolis/bw-est/pathload.html" -SRC_URI="https://dev.gentoo.org/~jer/${P}.tar.gz" +SRC_URI="https://dev.gentoo.org/~jsmolic/distfiles/${P}.tar.gz" +S="${WORKDIR}/${P/-/_}" -LICENSE="GPL-2" +LICENSE="GPL-2+" SLOT="0" KEYWORDS="~amd64 ~x86" -S=${WORKDIR}/${PN}_${PV} PATCHES=( - "${FILESDIR}"/${PN}-1.3.2-make.patch + "${FILESDIR}"/${P}-make.patch + "${FILESDIR}"/${P}-clang16.patch ) src_configure() { tc-export CC + default } diff --git a/net-analyzer/pbnj/metadata.xml b/net-analyzer/pbnj/metadata.xml index 4a2800404400..685a0835d3af 100644 --- a/net-analyzer/pbnj/metadata.xml +++ b/net-analyzer/pbnj/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>netmon@gentoo.org</email> diff --git a/net-analyzer/pbnj/pbnj-2.04-r1.ebuild b/net-analyzer/pbnj/pbnj-2.04-r1.ebuild index e62cc418dda4..a2a0e1595cf1 100644 --- a/net-analyzer/pbnj/pbnj-2.04-r1.ebuild +++ b/net-analyzer/pbnj/pbnj-2.04-r1.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 inherit perl-module -DESCRIPTION="A tool for running Nmap scans and diff'ing the results" -HOMEPAGE="http://pbnj.sourceforge.net/" +DESCRIPTION="Tool for running Nmap scans and diff'ing the results" +HOMEPAGE="https://pbnj.sourceforge.net/" SRC_URI="mirror://sourceforge/pbnj/${P}.tar.bz2" LICENSE="GPL-2" diff --git a/net-analyzer/pinger/files/pinger-0.33-clang16.patch b/net-analyzer/pinger/files/pinger-0.33-clang16.patch new file mode 100644 index 000000000000..1a6fe6cf03da --- /dev/null +++ b/net-analyzer/pinger/files/pinger-0.33-clang16.patch @@ -0,0 +1,8 @@ +https://bugs.gentoo.org/870871 +--- a/src/interface_ncurses.c ++++ b/src/interface_ncurses.c +@@ -41,3 +41,3 @@ + * characters */ +-static nr_print_ull(char *c, int max_chars, unsigned long long l) ++static int nr_print_ull(char *c, int max_chars, unsigned long long l) + { diff --git a/net-analyzer/pinger/files/pinger-0.33-musl-int-types.patch b/net-analyzer/pinger/files/pinger-0.33-musl-int-types.patch new file mode 100644 index 000000000000..0777242ba6f8 --- /dev/null +++ b/net-analyzer/pinger/files/pinger-0.33-musl-int-types.patch @@ -0,0 +1,158 @@ +From: Sam James <sam@gentoo.org> +Date: Wed, 29 Dec 2021 23:40:20 +0000 +Subject: [PATCH] Use <stdint.h> types + +Fixes musl compatibility. + +Bug: https://bugs.gentoo.org/712746 +--- a/src/fake_gtk.h ++++ b/src/fake_gtk.h +@@ -7,7 +7,6 @@ + #define GdkEvent int + #define gpointer int * + #define gboolean void +-#define gint int + #define GdkInputCondition int + + #else +--- a/src/globals.h ++++ b/src/globals.h +@@ -62,10 +62,6 @@ + #define EXTERN extern + #endif + +-#ifndef __USE_MISC +-#define unsigned int uint; +-#endif +- + #define MAX_HOSTS 100 + /* Maximum size of domain name */ + #define MAX_DNAME_LEN 60 +@@ -93,8 +89,8 @@ typedef struct host_data_t + struct timeval lastok_tv; /* timestamp of last ok echo */ + int status; /* status of host, online, without reply, ... */ + double delay; /* ping latency in miliseconds */ +- u_int last_seq_sent; /* sequence nr. of last packet sent */ +- u_int last_seq_recv; /* sequence nr. of last packet received */ ++ unsigned int last_seq_sent; /* sequence nr. of last packet sent */ ++ unsigned int last_seq_recv; /* sequence nr. of last packet received */ + unsigned long long nr_sent; /* number of send and received */ + unsigned long long nr_recv; + int ok_delay; /* time in ms, after we send next echo when OK (sucessfuly ping - ECHO REPLY) */ +@@ -164,9 +160,9 @@ typedef struct flstruct + #ifdef LOCAL + /* hosts specified only by domain names are resolved every 10 minutes. Specify + * other interval in seconds here if required. -1=disable. */ +-uint dns_check_s = 600; ++unsigned int dns_check_s = 600; + #else +-extern uint dns_check_s; ++extern unsigned int dns_check_s; + #endif + + EXTERN int mode; +--- a/src/interface_gtk.c ++++ b/src/interface_gtk.c +@@ -3,6 +3,7 @@ + #include "ping.h" + #include <gdk/gdkkeysyms.h> + #include <stdio.h> ++#include <stdint.h> + #include <string.h> + + GtkWidget *window; +@@ -13,7 +14,7 @@ static GtkWidget *scrolled_list; + static GtkWidget *tabs; + /* status bar for clock */ + static GtkWidget *status_bar; +-static guint status_bar_context; ++static unsigned int status_bar_context; + /* Box where store tabs and status bar */ + static GtkWidget *vbox; + +@@ -31,7 +32,7 @@ struct regular_disp_data + { + hosts_data *hosts; + int *stop_loop; +- guint disp_timeout_id; ++ unsigned int disp_timeout_id; + }; + + /* Interface display data */ +@@ -54,7 +55,7 @@ enum + static GtkWidget *create_list(hosts_data * hosts, int set_nr, + GtkListStore ** model); + static gboolean display_pinger_status(gpointer data); +-static gint gtk_delete_event(GtkWidget * widget, GdkEvent * event, ++static int gtk_delete_event(GtkWidget * widget, GdkEvent * event, + gpointer data); + static gchar *my_locale_to_utf8(char *text, char *file, int line); + +@@ -63,7 +64,7 @@ static void tab_refresh_rate(GtkWidget * widget, GdkEvent * event, + { + g_source_remove(int_disp_data->disp_timeout_id); + int_disp_data->disp_timeout_id = +- g_timeout_add((guint32) * (int *) data, display_pinger_status, ++ g_timeout_add((uint32_t) * (int *) data, display_pinger_status, + (gpointer) int_disp_data); + } + +@@ -462,7 +463,7 @@ static GtkWidget *create_list(hosts_data * hosts, int set_nr, + } + + /* delete_event callback function. data is (hosts_data *) */ +-static gint gtk_delete_event(GtkWidget * widget, ++static int gtk_delete_event(GtkWidget * widget, + GdkEvent * event, gpointer data) + { + if (free_sockets((hosts_data *) data)) +@@ -532,7 +533,7 @@ void gtk_gui_loop(hosts_data * hosts, int *stop_loop) + disp_data.stop_loop = stop_loop; + + disp_data.disp_timeout_id = +- g_timeout_add((guint32) hosts->titles->refresh_int, ++ g_timeout_add((uint32_t) hosts->titles->refresh_int, + display_pinger_status, (gpointer) & disp_data); + display_pinger_status((gpointer) & disp_data); + +--- a/src/ping.c ++++ b/src/ping.c +@@ -35,10 +35,10 @@ + #endif + + /* Compute checksum for ICMP output buffer */ +-static u_short cksum(u_short * buf, u_int len) ++static unsigned short cksum(unsigned short * buf, unsigned int len) + { +- u_int sum = 0; +- u_short retval; ++ unsigned int sum = 0; ++ unsigned short retval; + + /* 32 bit sum adds sequential 16 bit buffer parts */ + while (len > 1) { +@@ -51,12 +51,12 @@ static u_short cksum(u_short * buf, u_int len) + + union + { +- u_short word; +- u_char byte; ++ unsigned short word; ++ unsigned char byte; + } odd; + + odd.word = 0; +- odd.byte = *(u_char *) buf; ++ odd.byte = *(unsigned char *) buf; + sum += odd.word; + } + +@@ -189,7 +189,7 @@ int send_icmp_echo(host_data * host, hosts_data * hosts) + ich->checksum = 0; + ich->un.echo.sequence = ++host->last_seq_sent; + ich->un.echo.id = getpid() & 0xFFFF; +- ich->checksum = cksum((u_short *) outpacket, outpacket_len); ++ ich->checksum = cksum((unsigned short *) outpacket, outpacket_len); + + if ((sendto + (host->rawfd, outpacket, outpacket_len, 0, (struct sockaddr *) &to, diff --git a/net-analyzer/pinger/metadata.xml b/net-analyzer/pinger/metadata.xml index a0c377799422..2d912969ffda 100644 --- a/net-analyzer/pinger/metadata.xml +++ b/net-analyzer/pinger/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>netmon@gentoo.org</email> diff --git a/net-analyzer/pinger/pinger-0.33-r1.ebuild b/net-analyzer/pinger/pinger-0.33-r1.ebuild new file mode 100644 index 000000000000..38ed420ff7df --- /dev/null +++ b/net-analyzer/pinger/pinger-0.33-r1.ebuild @@ -0,0 +1,57 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools flag-o-matic + +DESCRIPTION="Cyclic multi ping utility for selected adresses using GTK/ncurses" +HOMEPAGE="http://aa.vslib.cz/silk/projekty/pinger/" +SRC_URI="http://aa.vslib.cz/silk/projekty/pinger/download/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64 ~ppc x86" +IUSE="gtk2 gtk3 ncurses nls" + +REQUIRED_USE="|| ( gtk2 gtk3 ncurses ) + ?? ( gtk2 gtk3 )" + +GTK_DEPEND="dev-libs/glib:2" +RDEPEND="gtk2? ( + ${GTK_DEPEND} + >=x11-libs/gtk+-2.4:2 + ) + gtk3? ( + ${GTK_DEPEND} + >=x11-libs/gtk+-3.12:3 + ) + ncurses? ( sys-libs/ncurses:= )" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" + +DOCS=( AUTHORS BUGS ChangeLog NEWS README ) + +PATCHES=( + "${FILESDIR}"/${P}-gentoo.patch + "${FILESDIR}"/${P}-musl-int-types.patch + "${FILESDIR}"/${P}-clang16.patch +) + +src_prepare() { + default + + sed -i -e '/Root privileges/d' src/Makefile.am || die + + eautoreconf +} + +src_configure() { + append-cppflags -D_GNU_SOURCE + + econf \ + $(usex gtk2 --enable-gtk=gtk2 '') \ + $(usex gtk3 --enable-gtk=gtk3 '') \ + $(use_enable ncurses) \ + $(use_enable nls) +} diff --git a/net-analyzer/pinger/pinger-0.33.ebuild b/net-analyzer/pinger/pinger-0.33.ebuild deleted file mode 100644 index 74c25eb05be6..000000000000 --- a/net-analyzer/pinger/pinger-0.33.ebuild +++ /dev/null @@ -1,58 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit autotools eutils flag-o-matic - -DESCRIPTION="Cyclic multi ping utility for selected adresses using GTK/ncurses" -HOMEPAGE="http://aa.vslib.cz/silk/projekty/pinger/" -SRC_URI="http://aa.vslib.cz/silk/projekty/pinger/download/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ~ppc x86" -IUSE="gtk2 gtk3 ncurses nls" - -REQUIRED_USE=" - || ( gtk2 gtk3 ncurses ) - ?? ( gtk2 gtk3 ) -" -GTK_DEPEND=" - dev-libs/glib:2 -" -RDEPEND=" - gtk2? ( - ${GTK_DEPEND} - >=x11-libs/gtk+-2.4:2 - ) - gtk3? ( - ${GTK_DEPEND} - >=x11-libs/gtk+-3.12:3 - ) - ncurses? ( sys-libs/ncurses ) -" -DEPEND=" - ${RDEPEND} - virtual/pkgconfig -" - -DOCS=( AUTHORS BUGS ChangeLog NEWS README ) - -src_prepare() { - epatch "${FILESDIR}"/${P}-gentoo.patch - - sed -i -e '/Root privileges/d' src/Makefile.am || die - - eautoreconf -} - -src_configure() { - append-cppflags -D_GNU_SOURCE - - econf \ - $(usex gtk2 --enable-gtk=gtk2 '') \ - $(usex gtk3 --enable-gtk=gtk3 '') \ - $(use_enable ncurses) \ - $(use_enable nls) -} diff --git a/net-analyzer/pktstat/metadata.xml b/net-analyzer/pktstat/metadata.xml index 74c2baebb4ec..dce3f3be66c0 100644 --- a/net-analyzer/pktstat/metadata.xml +++ b/net-analyzer/pktstat/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>netmon@gentoo.org</email> diff --git a/net-analyzer/pktstat/pktstat-1.8.5-r1.ebuild b/net-analyzer/pktstat/pktstat-1.8.5-r1.ebuild index 38568044a9f1..c3266ee8f631 100644 --- a/net-analyzer/pktstat/pktstat-1.8.5-r1.ebuild +++ b/net-analyzer/pktstat/pktstat-1.8.5-r1.ebuild @@ -1,8 +1,9 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 -inherit autotools eutils +EAPI=7 + +inherit autotools DESCRIPTION="A network monitoring tool with bandwidth tracking" HOMEPAGE="http://www.adaptive-enterprises.com.au/~d/software/pktstat/" @@ -12,18 +13,21 @@ LICENSE="public-domain" SLOT="0" KEYWORDS="amd64 ~ppc x86" +BDEPEND="virtual/pkgconfig" RDEPEND=" net-libs/libpcap >=sys-libs/ncurses-5.3-r1 " -DEPEND=" - ${RDEPEND} - virtual/pkgconfig -" +DEPEND="${RDEPEND}" + +PATCHES=( + "${FILESDIR}"/${P}-tinfo.patch + "${FILESDIR}"/${P}-smtp_line.patch +) src_prepare() { - epatch "${FILESDIR}"/${P}-tinfo.patch - epatch "${FILESDIR}"/${P}-smtp_line.patch + default + eautoreconf } diff --git a/net-analyzer/pmacct/Manifest b/net-analyzer/pmacct/Manifest index 7bf0be7cbf2a..2d7d7e60d533 100644 --- a/net-analyzer/pmacct/Manifest +++ b/net-analyzer/pmacct/Manifest @@ -1,3 +1 @@ -DIST pmacct-1.7.4.tar.gz 1581213 BLAKE2B 3835abc91947af083932e01b828c2324f90595c973fdde9d9f4034dc7d03e12fad6bbe6e91e1462ec36963ccb41a5a740159f531d7e1929f4cd8d994b89a58a1 SHA512 780b6cc25562fb7b5a1f55b48ce9719b36c1ee0d9ee2b6db8d7f238cd5d9f204938313b13e3ff3f62c7b9b179279f18314eba38ad787ffc346a4b217da239ca1 -DIST pmacct-1.7.4_p1.tar.gz 3200089 BLAKE2B 638983a92df0a46441ddddaefa78dc0f61fee94264870979f46674e851e3bf111ae71550f7e6b677d425fa4c688d4ed7735d82aae85a2e77155c1bfa050d8e76 SHA512 03553128975ced54ce08a1a543c794377c2b7a3c800de600a7b5e8aa483b1c3123dee536a361a47053233d60070cacaf269f1a16ad17b563fa9fc0ec7af6a467 -DIST pmacct-1.7.5.tar.gz 3219384 BLAKE2B 9a9feb8a11222e54a018b37eaa387cfa43efcb6aa3da175ea6c367bc7b42d816cbe106431c8b8f69b17c8d0286514a80250bf28b15fcaad12a2ac5fb7af6ff27 SHA512 d52e3d749cf0e8a412a82051531c63f37aa6cf4e7cc435ebd185195040819d65dc2cf4d4b1aa64bae620a9f8d3d1b1a505992044fe45d57b91ba056cfa67609c +DIST pmacct-1.7.8.tar.gz 2175335 BLAKE2B 1b95d48c479d59f2d4a7654e870e6f61c984c57c31aebbfb9fbf86f2d1027cde6a0f334489f33186bbb19ee7bdf94726f0053faa4829273de2d1975f58dff97f SHA512 df576644688ddb1957aa1583b101b96d86ab404c1416e0709b1bc85d691d13841bdb92a37a4526bc9273101dd11e3134d2fb35c06d2cbcde8e5bf7e84751a1c2 diff --git a/net-analyzer/pmacct/files/nfacctd.service b/net-analyzer/pmacct/files/nfacctd.service new file mode 100644 index 000000000000..d649f47030bf --- /dev/null +++ b/net-analyzer/pmacct/files/nfacctd.service @@ -0,0 +1,18 @@ +[Unit] +Description=netflow accounting daemon +After=network.target + +[Service] +ProtectSystem=full +ProtectHome=true +ProtectHostname=true +ProtectKernelTunables=true +ProtectKernelModules=true +ProtectKernelLogs=true +ProtectControlGroups=true +RestrictRealtime=true +Type=forking +ExecStart=/usr/sbin/nfacctd -f /etc/pmacctd/nfacctd.conf -i %I + +[Install] +WantedBy=multi-user.target diff --git a/net-analyzer/pmacct/files/pmacct-1.7.3-nDPI-3.0.patch b/net-analyzer/pmacct/files/pmacct-1.7.3-nDPI-3.0.patch deleted file mode 100644 index 9e6c618fe443..000000000000 --- a/net-analyzer/pmacct/files/pmacct-1.7.3-nDPI-3.0.patch +++ /dev/null @@ -1,28 +0,0 @@ ---- a/configure.ac -+++ b/configure.ac -@@ -955,6 +955,7 @@ - CFLAGS="$_save_CFLAGS" - ]) - PKG_CHECK_MODULES([NDPI26], [libndpi >= 2.6], [AC_DEFINE(WITH_NDPI26, 1)], [AC_DEFINE(WITH_NDPI, 1)]) -+ PKG_CHECK_MODULES([NDPI30], [libndpi >= 3.0], [AC_DEFINE(WITH_NDPI30, 1)], [AC_DEFINE(WITH_NDPI, 1)]) - ;; - no) - AC_MSG_RESULT(no) ---- a/src/ndpi/ndpi.c -+++ b/src/ndpi/ndpi.c -@@ -374,10 +374,14 @@ - if (flow->detection_completed || flow->tcp_finished) { - if (flow->detected_protocol.app_protocol == NDPI_PROTOCOL_UNKNOWN) - #ifdef WITH_NDPI26 -+#ifdef WITH_NDPI30 -+ flow->detected_protocol = ndpi_detection_giveup(workflow->ndpi_struct, flow->ndpi_flow, 1, workflow->prefs.protocol_guess); -+#else - flow->detected_protocol = ndpi_detection_giveup(workflow->ndpi_struct, flow->ndpi_flow, workflow->prefs.protocol_guess); -+#endif /* WITH_NDPI30 */ - #else - flow->detected_protocol = ndpi_detection_giveup(workflow->ndpi_struct, flow->ndpi_flow); --#endif -+#endif /* WITH_NDPI26 */ - - if (workflow->prefs.protocol_guess) { - if (flow->detected_protocol.app_protocol == NDPI_PROTOCOL_UNKNOWN && !flow->guess_completed) { diff --git a/net-analyzer/pmacct/files/pmacct-1.7.4-nDPI-3.2.patch b/net-analyzer/pmacct/files/pmacct-1.7.4-nDPI-3.2.patch deleted file mode 100644 index bcbdbc834cad..000000000000 --- a/net-analyzer/pmacct/files/pmacct-1.7.4-nDPI-3.2.patch +++ /dev/null @@ -1,47 +0,0 @@ ---- a/configure.ac -+++ b/configure.ac -@@ -900,7 +900,7 @@ - [ case "$enableval" in - yes) - AC_MSG_RESULT(yes) -- PKG_CHECK_MODULES([NDPI], [libndpi >= 2.4], [ -+ PKG_CHECK_MODULES([NDPI], [libndpi >= 3.2], [ - SUPPORTS="${SUPPORTS} ndpi" - USING_NDPI="yes" - ---- a/src/ndpi/ndpi_util.c -+++ b/src/ndpi/ndpi_util.c -@@ -29,7 +29,8 @@ - - NDPI_PROTOCOL_BITMASK all; - -- struct ndpi_detection_module_struct *module = ndpi_init_detection_module(); -+ ndpi_init_prefs pm_ndpi_init_prefs = ndpi_no_prefs; -+ struct ndpi_detection_module_struct *module = ndpi_init_detection_module(pm_ndpi_init_prefs); - struct pm_ndpi_workflow *workflow = ndpi_calloc(1, sizeof(struct pm_ndpi_workflow)); - - log_notification_init(&log_notifications.ndpi_cache_full); -@@ -77,6 +78,8 @@ - NDPI_BITMASK_SET_ALL(all); - ndpi_set_protocol_detection_bitmask2(workflow->ndpi_struct, &all); - -+ ndpi_finalize_initalization(workflow->ndpi_struct); -+ - return workflow; - } - ---- a/src/ndpi/ndpi.c -+++ b/src/ndpi/ndpi.c -@@ -373,11 +373,7 @@ - - if (flow->detection_completed || flow->tcp_finished) { - if (flow->detected_protocol.app_protocol == NDPI_PROTOCOL_UNKNOWN) --#ifdef WITH_NDPI26 -- flow->detected_protocol = ndpi_detection_giveup(workflow->ndpi_struct, flow->ndpi_flow, workflow->prefs.protocol_guess); --#else -- flow->detected_protocol = ndpi_detection_giveup(workflow->ndpi_struct, flow->ndpi_flow); --#endif -+ flow->detected_protocol = ndpi_detection_giveup(workflow->ndpi_struct, flow->ndpi_flow, 1, workflow->prefs.protocol_guess); - - if (workflow->prefs.protocol_guess) { - if (flow->detected_protocol.app_protocol == NDPI_PROTOCOL_UNKNOWN && !flow->guess_completed) { diff --git a/net-analyzer/pmacct/files/pmacct-1.7.6-nogit.patch b/net-analyzer/pmacct/files/pmacct-1.7.6-nogit.patch new file mode 100644 index 000000000000..7381408d4489 --- /dev/null +++ b/net-analyzer/pmacct/files/pmacct-1.7.6-nogit.patch @@ -0,0 +1,16 @@ +diff --git a/configure.ac b/configure.ac +index 34269bd9..c6dbe8ba 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -1140,10 +1140,7 @@ dnl Git submodule Dependencies buid system + dnl -------------------------------------- + + dnl First check whether to build git submodule deps +-WITH_EXTERNAL_DEPS_DEFAULT=yes +-if [ test ! -f "$srcdir/src/external_libs/libcdada/include/cdada.h" ] && [ test -z `git rev-parse HEAD 2> /dev/null` ]; then +- WITH_EXTERNAL_DEPS_DEFAULT=no +-fi ++WITH_EXTERNAL_DEPS_DEFAULT=no + + AC_MSG_CHECKING([whether external dependencies (git submodules) should be compiled]) + AC_ARG_WITH(external-deps, diff --git a/net-analyzer/pmacct/files/pmacctd.service b/net-analyzer/pmacct/files/pmacctd.service new file mode 100644 index 000000000000..a2dbb8c45846 --- /dev/null +++ b/net-analyzer/pmacct/files/pmacctd.service @@ -0,0 +1,19 @@ +[Unit] +Description=promiscuous mode accounting daemon +After=network.target + +[Service] +ProtectSystem=full +ProtectHome=true +ProtectHostname=true +ProtectKernelTunables=true +ProtectKernelModules=true +ProtectKernelLogs=true +ProtectControlGroups=true +RestrictRealtime=true +Type=forking +ExecStart=/usr/sbin/pmacctd -f /etc/pmacctd/pmacctd.conf -i %I + +[Install] +WantedBy=multi-user.target + diff --git a/net-analyzer/pmacct/files/sfacctd.service b/net-analyzer/pmacct/files/sfacctd.service new file mode 100644 index 000000000000..7a334e0ffadd --- /dev/null +++ b/net-analyzer/pmacct/files/sfacctd.service @@ -0,0 +1,18 @@ +[Unit] +Description=sflow accounting daemon +After=network.target + +[Service] +ProtectSystem=full +ProtectHome=true +ProtectHostname=true +ProtectKernelTunables=true +ProtectKernelModules=true +ProtectKernelLogs=true +ProtectControlGroups=true +RestrictRealtime=true +Type=forking +ExecStart=/usr/sbin/sfacctd -f /etc/pmacctd/sfacctd.conf -i %I + +[Install] +WantedBy=multi-user.target diff --git a/net-analyzer/pmacct/metadata.xml b/net-analyzer/pmacct/metadata.xml index a306c0fa5034..1c025fea769e 100644 --- a/net-analyzer/pmacct/metadata.xml +++ b/net-analyzer/pmacct/metadata.xml @@ -1,25 +1,25 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!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> -<use> -<flag name="64bit">Use 64bit counters instead of 32bit ones</flag> -<flag name="bgp-bins">Link BGP daemon binaries</flag> -<flag name="bmp-bins">Link BMP daemon binaries</flag> -<flag name="geoipv2">Enable support for GeoIP2 through <pkg>dev-libs/libmaxminddb</pkg></flag> -<flag name="jansson">Enable support for JSON through <pkg>dev-libs/jansson</pkg></flag> -<flag name="kafka">Enable support for Apache Kafka through <pkg>dev-libs/librdkafka</pkg></flag> -<flag name="l2">Enable Layer-2 features and support</flag> -<flag name="mongodb">Enable support for MongoDB through <pkg>dev-libs/mongo-c-driver</pkg></flag> -<flag name="ndpi">Enable support for nDPI through <pkg>net-libs/nDPI</pkg></flag> -<flag name="nflog">Enable support for NFLOG through uacctd</flag> -<flag name="plabel">Enable IP prefix labels</flag> -<flag name="rabbitmq">Enable support for RabbitMQ through <pkg>net-libs/rabbitmq-c</pkg></flag> -<flag name="st-bins">Link Streaming Telemetry daemon binaries</flag> -<flag name="traffic-bins">Link IPv4/IPv6 traffic accounting binaries</flag> -<flag name="zmq">Enable support for ZeroMQ through <pkg>net-libs/zeromq</pkg></flag> -</use> + <maintainer type="project"> + <email>netmon@gentoo.org</email> + <name>Gentoo network monitoring and analysis project</name> + </maintainer> + <use> + <flag name="bgp-bins">Link BGP daemon binaries</flag> + <flag name="bmp-bins">Link BMP daemon binaries</flag> + <flag name="geoipv2">Enable support for GeoIP2 through <pkg>dev-libs/libmaxminddb</pkg></flag> + <flag name="jansson">Enable support for JSON through <pkg>dev-libs/jansson</pkg></flag> + <flag name="kafka">Enable support for Apache Kafka through <pkg>dev-libs/librdkafka</pkg></flag> + <flag name="l2">Enable Layer-2 features and support</flag> + <flag name="ndpi">Enable support for nDPI through <pkg>net-libs/nDPI</pkg></flag> + <flag name="nflog">Enable support for NFLOG through uacctd</flag> + <flag name="rabbitmq">Enable support for RabbitMQ through <pkg>net-libs/rabbitmq-c</pkg></flag> + <flag name="st-bins">Link Streaming Telemetry daemon binaries</flag> + <flag name="traffic-bins">Link IPv4/IPv6 traffic accounting binaries</flag> + <flag name="zmq">Enable support for ZeroMQ through <pkg>net-libs/zeromq</pkg></flag> + </use> + <upstream> + <remote-id type="github">pmacct/pmacct</remote-id> + </upstream> </pkgmetadata> diff --git a/net-analyzer/pmacct/pmacct-1.7.4.ebuild b/net-analyzer/pmacct/pmacct-1.7.4.ebuild deleted file mode 100644 index 99560fad9a73..000000000000 --- a/net-analyzer/pmacct/pmacct-1.7.4.ebuild +++ /dev/null @@ -1,101 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit autotools flag-o-matic toolchain-funcs - -DESCRIPTION="A network tool to gather IP traffic information" -HOMEPAGE="http://www.pmacct.net/" -SRC_URI="http://www.pmacct.net/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE=" - 64bit +bgp-bins +bmp-bins geoip geoipv2 jansson kafka +l2 mongodb mysql - ndpi nflog plabel postgres rabbitmq sqlite +st-bins +traffic-bins zmq -" -REQUIRED_USE=" - ?? ( geoip geoipv2 ) - kafka? ( jansson ) - rabbitmq? ( jansson ) -" - -RDEPEND=" - net-libs/libpcap - geoip? ( dev-libs/geoip ) - geoipv2? ( dev-libs/libmaxminddb ) - jansson? ( dev-libs/jansson ) - kafka? ( dev-libs/librdkafka ) - mongodb? ( - >=dev-libs/mongo-c-driver-0.8.1-r1 - <dev-libs/mongo-c-driver-0.98 - ) - mysql? ( dev-db/mysql-connector-c:0= ) - ndpi? ( >=net-libs/nDPI-2.4:= ) - nflog? ( net-libs/libnetfilter_log ) - postgres? ( dev-db/postgresql:* ) - rabbitmq? ( net-libs/rabbitmq-c ) - sqlite? ( =dev-db/sqlite-3* ) - zmq? ( >=net-libs/zeromq-4.2.0:= ) -" -DEPEND=" - ${RDEPEND} - virtual/pkgconfig -" -PATCHES=( - "${FILESDIR}"/${PN}-1.7.3-nDPI-3.0.patch - "${FILESDIR}"/${PN}-1.7.4--Werror.patch -) - -DOCS=( - CONFIG-KEYS ChangeLog FAQS QUICKSTART UPGRADE - docs/INTERNALS docs/PLUGINS docs/SIGNALS -) - -src_prepare() { - default - eautoreconf -} - -src_configure() { - tc-export CC AR RANLIB - append-cflags -fcommon - - econf \ - $(use_enable 64bit) \ - $(use_enable bgp-bins) \ - $(use_enable bmp-bins) \ - $(use_enable geoip) \ - $(use_enable geoipv2) \ - $(use_enable jansson) \ - $(use_enable kafka) \ - $(use_enable l2) \ - $(use_enable plabel) \ - $(use_enable mongodb) \ - $(use_enable mysql) \ - $(use_enable ndpi) \ - $(use_enable nflog) \ - $(use_enable postgres pgsql) \ - $(use_enable rabbitmq) \ - $(use_enable sqlite sqlite3) \ - $(use_enable st-bins) \ - $(use_enable traffic-bins) \ - $(use_enable zmq) \ - --disable-debug -} - -src_install() { - default - - for dirname in examples sql telemetry; do - docinto ${dirname} - dodoc -r ${dirname}/* - done - - newinitd "${FILESDIR}"/pmacctd-init.d pmacctd - newconfd "${FILESDIR}"/pmacctd-conf.d pmacctd - - insinto /etc/pmacctd - newins examples/pmacctd-imt.conf.example pmacctd.conf -} diff --git a/net-analyzer/pmacct/pmacct-1.7.4_p1.ebuild b/net-analyzer/pmacct/pmacct-1.7.4_p1.ebuild deleted file mode 100644 index 29e47d7219dd..000000000000 --- a/net-analyzer/pmacct/pmacct-1.7.4_p1.ebuild +++ /dev/null @@ -1,103 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit autotools flag-o-matic toolchain-funcs - -DESCRIPTION="A network tool to gather IP traffic information" -HOMEPAGE="http://www.pmacct.net/" -SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV/_}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE=" - 64bit +bgp-bins +bmp-bins geoip geoipv2 jansson kafka +l2 mongodb mysql - ndpi nflog plabel postgres rabbitmq sqlite +st-bins +traffic-bins zmq -" -REQUIRED_USE=" - ?? ( geoip geoipv2 ) - kafka? ( jansson ) - rabbitmq? ( jansson ) -" - -RDEPEND=" - net-libs/libpcap - geoip? ( dev-libs/geoip ) - geoipv2? ( dev-libs/libmaxminddb ) - jansson? ( dev-libs/jansson ) - kafka? ( dev-libs/librdkafka ) - mongodb? ( - >=dev-libs/mongo-c-driver-0.8.1-r1 - <dev-libs/mongo-c-driver-0.98 - ) - mysql? ( dev-db/mysql-connector-c:0= ) - ndpi? ( >=net-libs/nDPI-3.2:= ) - nflog? ( net-libs/libnetfilter_log ) - postgres? ( dev-db/postgresql:* ) - rabbitmq? ( net-libs/rabbitmq-c ) - sqlite? ( =dev-db/sqlite-3* ) - zmq? ( >=net-libs/zeromq-4.2.0:= ) -" -DEPEND=" - ${RDEPEND} - virtual/pkgconfig -" -PATCHES=( -# "${FILESDIR}"/${PN}-1.7.3-nDPI-3.0.patch - "${FILESDIR}"/${PN}-1.7.4--Werror.patch - "${FILESDIR}"/${PN}-1.7.4-nDPI-3.2.patch -) - -DOCS=( - CONFIG-KEYS ChangeLog FAQS QUICKSTART UPGRADE - docs/INTERNALS docs/PLUGINS docs/SIGNALS -) -S=${WORKDIR}/${P/_} - -src_prepare() { - default - eautoreconf -} - -src_configure() { - tc-export CC AR RANLIB - append-cflags -fcommon - - econf \ - $(use_enable 64bit) \ - $(use_enable bgp-bins) \ - $(use_enable bmp-bins) \ - $(use_enable geoip) \ - $(use_enable geoipv2) \ - $(use_enable jansson) \ - $(use_enable kafka) \ - $(use_enable l2) \ - $(use_enable plabel) \ - $(use_enable mongodb) \ - $(use_enable mysql) \ - $(use_enable ndpi) \ - $(use_enable nflog) \ - $(use_enable postgres pgsql) \ - $(use_enable rabbitmq) \ - $(use_enable sqlite sqlite3) \ - $(use_enable st-bins) \ - $(use_enable traffic-bins) \ - $(use_enable zmq) \ - --disable-debug -} - -src_install() { - default - - for dirname in examples sql telemetry; do - docinto ${dirname} - dodoc -r ${dirname}/* - done - - newinitd "${FILESDIR}"/pmacctd-init.d pmacctd - newconfd "${FILESDIR}"/pmacctd-conf.d pmacctd - - insinto /etc/pmacctd - newins examples/pmacctd-imt.conf.example pmacctd.conf -} diff --git a/net-analyzer/pmacct/pmacct-1.7.5.ebuild b/net-analyzer/pmacct/pmacct-1.7.5.ebuild deleted file mode 100644 index b40dc62cab70..000000000000 --- a/net-analyzer/pmacct/pmacct-1.7.5.ebuild +++ /dev/null @@ -1,95 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit autotools flag-o-matic toolchain-funcs - -DESCRIPTION="A network tool to gather IP traffic information" -HOMEPAGE="http://www.pmacct.net/" -SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE=" - +bgp-bins +bmp-bins geoip geoipv2 jansson kafka +l2 mysql ndpi nflog plabel - postgres rabbitmq sqlite +st-bins +traffic-bins zmq -" -REQUIRED_USE=" - ?? ( geoip geoipv2 ) - kafka? ( jansson ) - rabbitmq? ( jansson ) -" - -RDEPEND=" - net-libs/libpcap - geoip? ( dev-libs/geoip ) - geoipv2? ( dev-libs/libmaxminddb ) - jansson? ( dev-libs/jansson ) - kafka? ( dev-libs/librdkafka ) - mysql? ( dev-db/mysql-connector-c:0= ) - ndpi? ( >=net-libs/nDPI-3.2:= ) - nflog? ( net-libs/libnetfilter_log ) - postgres? ( dev-db/postgresql:* ) - rabbitmq? ( net-libs/rabbitmq-c ) - sqlite? ( =dev-db/sqlite-3* ) - zmq? ( >=net-libs/zeromq-4.2.0:= ) -" -DEPEND=" - ${RDEPEND} - virtual/pkgconfig -" -PATCHES=( - "${FILESDIR}"/${PN}-1.7.4--Werror.patch -) - -DOCS=( - CONFIG-KEYS ChangeLog FAQS QUICKSTART UPGRADE - docs/INTERNALS docs/PLUGINS docs/SIGNALS -) - -src_prepare() { - default - eautoreconf -} - -src_configure() { - tc-export CC AR RANLIB - append-cflags -fcommon - - econf \ - $(use_enable bgp-bins) \ - $(use_enable bmp-bins) \ - $(use_enable geoip) \ - $(use_enable geoipv2) \ - $(use_enable jansson) \ - $(use_enable kafka) \ - $(use_enable l2) \ - $(use_enable mysql) \ - $(use_enable ndpi) \ - $(use_enable nflog) \ - $(use_enable plabel) \ - $(use_enable postgres pgsql) \ - $(use_enable rabbitmq) \ - $(use_enable sqlite sqlite3) \ - $(use_enable st-bins) \ - $(use_enable traffic-bins) \ - $(use_enable zmq) \ - --disable-debug \ - --disable-mongodb -} - -src_install() { - default - - for dirname in examples sql telemetry; do - docinto ${dirname} - dodoc -r ${dirname}/* - done - - newinitd "${FILESDIR}"/pmacctd-init.d pmacctd - newconfd "${FILESDIR}"/pmacctd-conf.d pmacctd - - insinto /etc/pmacctd - newins examples/pmacctd-imt.conf.example pmacctd.conf -} diff --git a/net-analyzer/pmacct/pmacct-1.7.8.ebuild b/net-analyzer/pmacct/pmacct-1.7.8.ebuild new file mode 100644 index 000000000000..716720824619 --- /dev/null +++ b/net-analyzer/pmacct/pmacct-1.7.8.ebuild @@ -0,0 +1,112 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools toolchain-funcs systemd + +DESCRIPTION="A network tool to gather IP traffic information" +HOMEPAGE="http://www.pmacct.net/" + +if [[ ${PV} == 9999 ]] ; then + EGIT_REPO_URI="https://github.com/pmacct/pmacct" + inherit git-r3 +else + SRC_URI="https://github.com/pmacct/pmacct/releases/download/v${PV}/${P}.tar.gz + http://www.pmacct.net/${P}.tar.gz" + + KEYWORDS="~amd64 ~x86" +fi + +LICENSE="GPL-2" +SLOT="0" + +IUSE="+bgp-bins +bmp-bins geoip geoipv2 jansson kafka +l2 mysql ndpi nflog postgres rabbitmq sqlite +st-bins +traffic-bins zmq" + +REQUIRED_USE=" + ?? ( geoip geoipv2 ) + kafka? ( jansson ) + rabbitmq? ( jansson ) +" + +RDEPEND="dev-libs/libcdada + net-libs/libpcap + geoip? ( dev-libs/geoip ) + geoipv2? ( dev-libs/libmaxminddb ) + jansson? ( dev-libs/jansson:= ) + kafka? ( dev-libs/librdkafka ) + mysql? ( + dev-db/mysql-connector-c:0= + sys-process/numactl + ) + ndpi? ( >=net-libs/nDPI-3.2:= ) + nflog? ( net-libs/libnetfilter_log ) + postgres? ( dev-db/postgresql:* ) + rabbitmq? ( net-libs/rabbitmq-c ) + sqlite? ( =dev-db/sqlite-3* ) + zmq? ( >=net-libs/zeromq-4.2.0:= )" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" + +PATCHES=( + "${FILESDIR}/${PN}-1.7.4--Werror.patch" + "${FILESDIR}/${PN}-1.7.6-nogit.patch" +) + +DOCS=( + CONFIG-KEYS ChangeLog FAQS QUICKSTART UPGRADE + docs/INTERNALS docs/PLUGINS docs/SIGNALS +) + +src_prepare() { + default + eautoreconf +} + +src_configure() { + tc-export CC AR RANLIB + + local myeconfargs=( + $(use_enable bgp-bins) + $(use_enable bmp-bins) + $(use_enable geoip) + $(use_enable geoipv2) + $(use_enable jansson) + $(use_enable kafka) + $(use_enable l2) + $(use_enable mysql) + $(use_enable ndpi) + $(use_enable nflog) + $(use_enable postgres pgsql) + $(use_enable rabbitmq) + $(use_enable sqlite sqlite3) + $(use_enable st-bins) + $(use_enable traffic-bins) + $(use_enable zmq) + + --without-external-deps + --disable-ebpf + --disable-debug + --disable-mongodb + ) + + econf "${myeconfargs[@]}" +} + +src_install() { + default + + local dirname + for dirname in examples sql telemetry; do + docinto ${dirname} + dodoc -r ${dirname}/* + done + + newinitd "${FILESDIR}"/pmacctd-init.d pmacctd + newconfd "${FILESDIR}"/pmacctd-conf.d pmacctd + + systemd_dounit "${FILESDIR}"/{nfacctd,pmacctd,sfacctd}.service + + insinto /etc/pmacctd + newins examples/pmacctd-imt.conf.example pmacctd.conf +} diff --git a/net-analyzer/pmacct/pmacct-9999.ebuild b/net-analyzer/pmacct/pmacct-9999.ebuild new file mode 100644 index 000000000000..716720824619 --- /dev/null +++ b/net-analyzer/pmacct/pmacct-9999.ebuild @@ -0,0 +1,112 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools toolchain-funcs systemd + +DESCRIPTION="A network tool to gather IP traffic information" +HOMEPAGE="http://www.pmacct.net/" + +if [[ ${PV} == 9999 ]] ; then + EGIT_REPO_URI="https://github.com/pmacct/pmacct" + inherit git-r3 +else + SRC_URI="https://github.com/pmacct/pmacct/releases/download/v${PV}/${P}.tar.gz + http://www.pmacct.net/${P}.tar.gz" + + KEYWORDS="~amd64 ~x86" +fi + +LICENSE="GPL-2" +SLOT="0" + +IUSE="+bgp-bins +bmp-bins geoip geoipv2 jansson kafka +l2 mysql ndpi nflog postgres rabbitmq sqlite +st-bins +traffic-bins zmq" + +REQUIRED_USE=" + ?? ( geoip geoipv2 ) + kafka? ( jansson ) + rabbitmq? ( jansson ) +" + +RDEPEND="dev-libs/libcdada + net-libs/libpcap + geoip? ( dev-libs/geoip ) + geoipv2? ( dev-libs/libmaxminddb ) + jansson? ( dev-libs/jansson:= ) + kafka? ( dev-libs/librdkafka ) + mysql? ( + dev-db/mysql-connector-c:0= + sys-process/numactl + ) + ndpi? ( >=net-libs/nDPI-3.2:= ) + nflog? ( net-libs/libnetfilter_log ) + postgres? ( dev-db/postgresql:* ) + rabbitmq? ( net-libs/rabbitmq-c ) + sqlite? ( =dev-db/sqlite-3* ) + zmq? ( >=net-libs/zeromq-4.2.0:= )" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" + +PATCHES=( + "${FILESDIR}/${PN}-1.7.4--Werror.patch" + "${FILESDIR}/${PN}-1.7.6-nogit.patch" +) + +DOCS=( + CONFIG-KEYS ChangeLog FAQS QUICKSTART UPGRADE + docs/INTERNALS docs/PLUGINS docs/SIGNALS +) + +src_prepare() { + default + eautoreconf +} + +src_configure() { + tc-export CC AR RANLIB + + local myeconfargs=( + $(use_enable bgp-bins) + $(use_enable bmp-bins) + $(use_enable geoip) + $(use_enable geoipv2) + $(use_enable jansson) + $(use_enable kafka) + $(use_enable l2) + $(use_enable mysql) + $(use_enable ndpi) + $(use_enable nflog) + $(use_enable postgres pgsql) + $(use_enable rabbitmq) + $(use_enable sqlite sqlite3) + $(use_enable st-bins) + $(use_enable traffic-bins) + $(use_enable zmq) + + --without-external-deps + --disable-ebpf + --disable-debug + --disable-mongodb + ) + + econf "${myeconfargs[@]}" +} + +src_install() { + default + + local dirname + for dirname in examples sql telemetry; do + docinto ${dirname} + dodoc -r ${dirname}/* + done + + newinitd "${FILESDIR}"/pmacctd-init.d pmacctd + newconfd "${FILESDIR}"/pmacctd-conf.d pmacctd + + systemd_dounit "${FILESDIR}"/{nfacctd,pmacctd,sfacctd}.service + + insinto /etc/pmacctd + newins examples/pmacctd-imt.conf.example pmacctd.conf +} diff --git a/net-analyzer/pmacct/pmacct-999999.ebuild b/net-analyzer/pmacct/pmacct-999999.ebuild deleted file mode 100644 index 63073745a3d7..000000000000 --- a/net-analyzer/pmacct/pmacct-999999.ebuild +++ /dev/null @@ -1,97 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit autotools flag-o-matic git-r3 toolchain-funcs - -DESCRIPTION="A network tool to gather IP traffic information" -HOMEPAGE="http://www.pmacct.net/" -EGIT_REPO_URI="https://github.com/pmacct/pmacct/" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="" -IUSE=" - +bgp-bins +bmp-bins geoip geoipv2 jansson kafka +l2 mongodb mysql - ndpi nflog plabel postgres rabbitmq sqlite +st-bins +traffic-bins zmq -" -REQUIRED_USE=" - ?? ( geoip geoipv2 ) - kafka? ( jansson ) - rabbitmq? ( jansson ) -" - -RDEPEND=" - net-libs/libpcap - geoip? ( dev-libs/geoip ) - geoipv2? ( dev-libs/libmaxminddb ) - jansson? ( dev-libs/jansson ) - kafka? ( dev-libs/librdkafka ) - mongodb? ( - >=dev-libs/mongo-c-driver-0.8.1-r1 - <dev-libs/mongo-c-driver-0.98 - ) - mysql? ( dev-db/mysql-connector-c:0= ) - ndpi? ( >=net-libs/nDPI-3.2:= ) - nflog? ( net-libs/libnetfilter_log ) - postgres? ( dev-db/postgresql:* ) - rabbitmq? ( net-libs/rabbitmq-c ) - sqlite? ( =dev-db/sqlite-3* ) - zmq? ( >=net-libs/zeromq-4.2.0:= ) -" -DEPEND=" - ${RDEPEND} - virtual/pkgconfig -" - -DOCS=( - CONFIG-KEYS ChangeLog FAQS QUICKSTART UPGRADE - docs/INTERNALS docs/PLUGINS docs/SIGNALS -) - -src_prepare() { - default - sed -i -e 's|-Werror||g' configure.ac || die - eautoreconf -} - -src_configure() { - tc-export CC AR RANLIB - append-cflags -fcommon - - econf \ - $(use_enable bgp-bins) \ - $(use_enable bmp-bins) \ - $(use_enable geoip) \ - $(use_enable geoipv2) \ - $(use_enable jansson) \ - $(use_enable kafka) \ - $(use_enable l2) \ - $(use_enable plabel) \ - $(use_enable mongodb) \ - $(use_enable mysql) \ - $(use_enable ndpi) \ - $(use_enable nflog) \ - $(use_enable postgres pgsql) \ - $(use_enable rabbitmq) \ - $(use_enable sqlite sqlite3) \ - $(use_enable st-bins) \ - $(use_enable traffic-bins) \ - $(use_enable zmq) \ - --disable-debug -} - -src_install() { - default - - for dirname in examples sql telemetry; do - docinto ${dirname} - dodoc -r ${dirname}/* - done - - newinitd "${FILESDIR}"/pmacctd-init.d pmacctd - newconfd "${FILESDIR}"/pmacctd-conf.d pmacctd - - insinto /etc/pmacctd - newins examples/pmacctd-imt.conf.example pmacctd.conf -} diff --git a/net-analyzer/pnp4nagios/Manifest b/net-analyzer/pnp4nagios/Manifest index e33adf3e6b1d..f97b423eb62d 100644 --- a/net-analyzer/pnp4nagios/Manifest +++ b/net-analyzer/pnp4nagios/Manifest @@ -1 +1,2 @@ -DIST pnp4nagios-0.6.26.tar.gz 3039265 BLAKE2B 1adb3c41222e6bc93671af955a1564387d77901ce118f5d309d101d88c691140e0feef1c2594bc5db44706ff01505a4fcf99b79b6a0c5b5cb923838dd00f1ff0 SHA512 caf6dcced74967174d9e6f09dd1a5bee17397c10a68d0f577c37dcc836f928d78c20d75a0189539e9ffa93715ab7b6e732e9f36b9698cf4dd9c09cfb65184427 +DIST pnp4nagios-0.6.26_p20221106.tar.gz 3029704 BLAKE2B 5866f4dbfef9b1028255eb3e47ac57fa260c1e2caca50fcb1c5ff93a3dc9bee9f14152e3a269ecf12daab59e50e1f4dfcd6513f9ce3dc5da35de50b944c38260 SHA512 cd0c3ad3d4983c43f7e1a100e8a2e6a530b573ca6bed60125c87b22ab33c2486c5ce99c6f52d641cdc7468984925a22a6ee7e1ac330ea2278ec2439acb910d04 +DIST pnp4nagios-0.6.26_p20230918.tar.gz 3036216 BLAKE2B 101b84623bec93cb3c3c2c5f5785a308afeeff6c7a89504ec5e39812be5e0807eaf7dabf720a69e58a3dd7bfd654f124dd26030deab60f5c6e0a31bd665e83e6 SHA512 4b03c5bf3d00339627e22cf14669b21433f926d6e698933833911a40d8b324d5a70dc5187ee5291f48bfcc12e9b51aaba24c8d263d5f25081544f97dce372890 diff --git a/net-analyzer/pnp4nagios/files/pnp4nagios-0.6.26_p20221106_compat.patch b/net-analyzer/pnp4nagios/files/pnp4nagios-0.6.26_p20221106_compat.patch new file mode 100644 index 000000000000..21f9c89ed94f --- /dev/null +++ b/net-analyzer/pnp4nagios/files/pnp4nagios-0.6.26_p20221106_compat.patch @@ -0,0 +1,53 @@ +# https://github.com/Tontonitch/pnp4nagios/commits/master + +diff --git a/share/pnp/application/views/graph_content.php b/share/pnp/application/views/graph_content.php +index 3ea99dc0..00469ce0 100644 +--- a/share/pnp/application/views/graph_content.php ++++ b/share/pnp/application/views/graph_content.php +@@ -88,7 +88,8 @@ + # treated like a url fragment when zooming + $gid = array(); + parse_str(ltrim($this->url, '?'), $gid); +- $gid = htmlentities("?host=".urlencode($gid["host"])."&srv=".urlencode($gid["srv"])); ++ $srv = isset($gid['srv']) ? $gid['srv'] : ''; ++ $gid = htmlentities("?host=".urlencode($gid["host"])."&srv=".urlencode($srv)); + + echo "<div start=".$value['TIMERANGE']['start']." end=".$value['TIMERANGE']['end']." style=\"width:".$value['GRAPH_WIDTH']."px; height:".$value['GRAPH_HEIGHT']."px; position:absolute; top:33px\" class=\"graph\" id=\"".$gid."\" ></div>"; + +diff --git a/share/pnp/application/vendor/fpdf/fpdf.php b/share/pnp/application/vendor/fpdf/fpdf.php +index cfc09593..efb53b4e 100755 +--- a/share/pnp/application/vendor/fpdf/fpdf.php ++++ b/share/pnp/application/vendor/fpdf/fpdf.php +@@ -1040,8 +1040,11 @@ protected function _dochecks() + if(ini_get('mbstring.func_overload') & 2)
+ $this->Error('mbstring overloading must be disabled');
+ // Ensure runtime magic quotes are disabled
+- if(get_magic_quotes_runtime())
+- @set_magic_quotes_runtime(0);
++# if(get_magic_quotes_runtime())
++# @set_magic_quotes_runtime(0);
++ if (PHP_VERSION_ID < 70400 && get_magic_quotes_runtime()) {
++ set_magic_quotes_runtime(0);
++ }
+ }
+
+ protected function _checkoutput()
+diff --git a/share/pnp/application/vendor/fpdf/fpdi_pdf_parser.php b/share/pnp/application/vendor/fpdf/fpdi_pdf_parser.php +index 9e6d521a..c044f200 100755 +--- a/share/pnp/application/vendor/fpdf/fpdi_pdf_parser.php ++++ b/share/pnp/application/vendor/fpdf/fpdi_pdf_parser.php +@@ -305,6 +305,7 @@ protected function _getPageRotation($obj) + }
+
+ $res = $this->_getPageRotation($obj[1][1]['/Parent']);
++ if(false == $res) return false;
+ if ($res[0] == pdf_parser::TYPE_OBJECT)
+ return $res[1];
+
+@@ -344,4 +345,4 @@ protected function _readPages(&$pages, &$result) + }
+ }
+ }
+-} +\ No newline at end of file ++}
diff --git a/net-analyzer/pnp4nagios/files/pnp4nagios-0.6.26_p20221106_php80.patch b/net-analyzer/pnp4nagios/files/pnp4nagios-0.6.26_p20221106_php80.patch new file mode 100644 index 000000000000..2407bb6c51e9 --- /dev/null +++ b/net-analyzer/pnp4nagios/files/pnp4nagios-0.6.26_p20221106_php80.patch @@ -0,0 +1,42 @@ +diff --git a/lib/kohana/system/core/utf8.php b/lib/kohana/system/core/utf8.php +index 9f20f42..b349c68 100644 +--- a/lib/kohana/system/core/utf8.php ++++ b/lib/kohana/system/core/utf8.php +@@ -49,17 +49,6 @@ if ( ! extension_loaded('iconv')) + ); + } + +-if (extension_loaded('mbstring') AND (ini_get('mbstring.func_overload') & MB_OVERLOAD_STRING)) +-{ +- trigger_error +- ( +- 'The <a href="http://php.net/mbstring">mbstring</a> extension is overloading PHP\'s native string functions. '. +- 'Disable this by setting mbstring.func_overload to 0, 1, 4 or 5 in php.ini or a .htaccess file.'. +- 'This application cannot be run without UTF-8 support.', +- E_USER_ERROR +- ); +-} +- + // Check PCRE support for Unicode properties such as \p and \X. + $ER = error_reporting(0); + define('PCRE_UNICODE_PROPERTIES', (bool) preg_match('/^\pL$/u', 'ñ')); +@@ -740,4 +729,4 @@ final class utf8 { + return _from_unicode($arr); + } + +-} // End utf8 +\ No newline at end of file ++} // End utf8 +diff --git a/share/pnp/application/models/data.php b/share/pnp/application/models/data.php +index 576c8ec..20cdade 100644 +--- a/share/pnp/application/models/data.php ++++ b/share/pnp/application/models/data.php +@@ -266,7 +266,7 @@ class Data_Model extends System_Model + $xml = array(); + if (file_exists($xmlfile)) { + libxml_use_internal_errors(TRUE); +- libxml_clear_errors(TRUE); ++ libxml_clear_errors(); + if(! $xml = simplexml_load_file($xmlfile) ){; + if( $throw_exception == TRUE ){ + $errors = '<br>'; diff --git a/net-analyzer/pnp4nagios/metadata.xml b/net-analyzer/pnp4nagios/metadata.xml index 4854813f7de3..9e00dcae8fec 100644 --- a/net-analyzer/pnp4nagios/metadata.xml +++ b/net-analyzer/pnp4nagios/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>sysadmin@gentoo.org</email> @@ -18,6 +18,6 @@ <upstream> <remote-id type="sourceforge">pnp4nagios</remote-id> - <remote-id type="github">lingej/pnp4nagios</remote-id> + <remote-id type="github">ConSol-Monitoring/pnp4nagios</remote-id> </upstream> </pkgmetadata> diff --git a/net-analyzer/pnp4nagios/pnp4nagios-0.6.26-r9.ebuild b/net-analyzer/pnp4nagios/pnp4nagios-0.6.26-r9.ebuild deleted file mode 100644 index 6a09ab87188b..000000000000 --- a/net-analyzer/pnp4nagios/pnp4nagios-0.6.26-r9.ebuild +++ /dev/null @@ -1,100 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -DESCRIPTION="A performance data analyzer for nagios" -HOMEPAGE="http://www.pnp4nagios.org/" -SRC_URI="mirror://sourceforge/${PN}/PNP-0.6/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -IUSE="apache2 icinga +nagios" -KEYWORDS="amd64 ppc ppc64 ~sparc x86" - -REQUIRED_USE="^^ ( icinga nagios )" - -# Some things (sync mode, for one) are broken with nagios-4.x, but since -# nagios-3.x has been end-of-life'd, we don't have much choice here but -# to accept it. -DEPEND=" - dev-lang/php:*[filter,gd,json,simplexml,xml,zlib] - net-analyzer/rrdtool[graph,perl] - icinga? ( net-analyzer/icinga2 ) - nagios? ( net-analyzer/nagios-core )" - -# A list of modules used in our Apache config file. -APACHE_MODS="apache2_modules_alias," # "Alias" directive -APACHE_MODS+="apache2_modules_authz_core," # "Require" directive -APACHE_MODS+="apache2_modules_rewrite" # "RewriteEngine" and friends - -RDEPEND="${DEPEND} - virtual/perl-Getopt-Long - virtual/perl-Time-HiRes - media-fonts/dejavu - apache2? ( >=www-servers/apache-2.4[${APACHE_MODS}] )" - -PATCHES=( "${FILESDIR}/${PN}-0.6.14-makefile.patch" ) - -src_configure() { - local user_group=nagios - use icinga && user_group=icinga - - econf \ - --sysconfdir="${EPREFIX}"/etc/pnp \ - --datarootdir="${EPREFIX}"/usr/share/pnp \ - --localstatedir="${EPREFIX}"/var/lib/pnp \ - --with-nagios-user="${user_group}" \ - --with-nagios-group="${user_group}" \ - --with-perfdata-logfile="${EPREFIX}"/var/log/pnp/process_perfdata.log -} - -src_compile() { - # The default target just shows a help - emake all -} - -src_install() { - # Don't use INSTALL_OPTS because they set insecure permissions on - # all of /etc/pnp (https://github.com/lingej/pnp4nagios/issues/140). - emake INSTALL_OPTS="" DESTDIR="${D}" install install-config - einstalldocs - newinitd "${FILESDIR}"/npcd.initd npcd - rm "${ED%/}/usr/share/pnp/install.php" || \ - die "unable to remove ${ED%/}/usr/share/pnp/install.php" - - # Fix CVE-2012-3457 (Gentoo bug 430358) - fperms o-rwx /etc/pnp/process_perfdata.cfg - - if use apache2 ; then - insinto /etc/apache2/modules.d - newins "${FILESDIR}"/98_pnp4nagios-2.4.conf 98_pnp4nagios.conf - fi - - # The nagios or icinga user needs to write performance data to the - # perfdata-dir... - local user_group=nagios - use icinga && user_group=icinga - fowners ":${user_group}" /var/lib/pnp/{,perfdata,spool} - fperms g+rwx /var/lib/pnp/{,perfdata,spool} - - # and likewise for its logs... - dodir /var/log/pnp - fowners ":${user_group}" /var/log/pnp - fperms g+rwx /var/log/pnp - - # and its statistics. This one is arguably the responsibility of the - # build system, since process_perfdata.cfg refers to this location. - dodir /var/lib/pnp/stats - fowners ":${user_group}" /var/lib/pnp/stats - fperms g+rwx /var/lib/pnp/stats -} - -pkg_postinst() { - elog "To enable the pnp4nagios web front-end, please visit" - elog "${EROOT%/}/etc/conf.d/apache2 and add \"-D PNP -D PHP\"" - elog "to APACHE2_OPTS. Then pnp4nagios will be available at," - elog - elog " http://localhost/pnp4nagios" - elog -} diff --git a/net-analyzer/pnp4nagios/pnp4nagios-0.6.26_p20221106.ebuild b/net-analyzer/pnp4nagios/pnp4nagios-0.6.26_p20221106.ebuild new file mode 100644 index 000000000000..3df8d7c6aedd --- /dev/null +++ b/net-analyzer/pnp4nagios/pnp4nagios-0.6.26_p20221106.ebuild @@ -0,0 +1,114 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DESCRIPTION="A performance data analyzer for nagios" +HOMEPAGE="http://www.pnp4nagios.org/" +GH_COMMIT="5e09f538373ac4310a13355746bb3d3a10eb7bef" +SRC_URI="https://github.com/lingej/pnp4nagios/archive/${GH_COMMIT}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/${PN}-${GH_COMMIT}" + +LICENSE="GPL-2" +SLOT="0" +IUSE="apache2 icinga +nagios" +KEYWORDS="amd64 ~ppc ppc64 ~sparc x86" + +REQUIRED_USE="^^ ( icinga nagios )" + +# Some things (sync mode, for one) are broken with nagios-4.x, but since +# nagios-3.x has been end-of-life'd, we don't have much choice here but +# to accept it. +DEPEND="net-analyzer/rrdtool[graph,perl] + icinga? ( + acct-group/icinga + acct-user/icinga + ) + nagios? ( + acct-group/nagios + acct-user/nagios + )" + +# A list of modules used in our Apache config file. +APACHE_MODS="apache2_modules_alias," # "Alias" directive +APACHE_MODS+="apache2_modules_authz_core," # "Require" directive +APACHE_MODS+="apache2_modules_rewrite" # "RewriteEngine" and friends + +RDEPEND="${DEPEND} + dev-lang/php:*[filter,gd,json(+),simplexml,xml,zlib] + media-fonts/dejavu + virtual/perl-Getopt-Long + virtual/perl-Time-HiRes + apache2? ( >=www-servers/apache-2.4[${APACHE_MODS}] )" + +PATCHES=( + "${FILESDIR}/${PN}-0.6.14-makefile.patch" + "${FILESDIR}/${PN}-0.6.26_p20221106_compat.patch" + "${FILESDIR}/${PN}-0.6.26_p20221106_php80.patch" +) + +src_configure() { + local user_group=nagios + use icinga && user_group=icinga + + local myeconfargs=( + --sysconfdir="${EPREFIX}"/etc/pnp + --datarootdir="${EPREFIX}"/usr/share/pnp + --localstatedir="${EPREFIX}"/var/lib/pnp + --with-nagios-user="${user_group}" + --with-nagios-group="${user_group}" + --with-perfdata-logfile="${EPREFIX}"/var/log/pnp/process_perfdata.log + ) + + econf "${myeconfargs[@]}" +} + +src_compile() { + # The default target just shows a help + emake all +} + +src_install() { + # Don't use INSTALL_OPTS because they set insecure permissions on + # all of /etc/pnp (https://github.com/lingej/pnp4nagios/issues/140). + emake INSTALL_OPTS="" DESTDIR="${D}" install install-config + einstalldocs + newinitd "${FILESDIR}"/npcd.initd npcd + rm "${ED}/usr/share/pnp/install.php" || \ + die "unable to remove ${ED}/usr/share/pnp/install.php" + + # Fix CVE-2012-3457 (Gentoo bug 430358) + fperms o-rwx /etc/pnp/process_perfdata.cfg + + if use apache2 ; then + insinto /etc/apache2/modules.d + newins "${FILESDIR}"/98_pnp4nagios-2.4.conf 98_pnp4nagios.conf + fi + + # The nagios or icinga user needs to write performance data to the + # perfdata-dir... + local user_group=nagios + use icinga && user_group=icinga + fowners ":${user_group}" /var/lib/pnp/{,perfdata,spool} + fperms g+rwx /var/lib/pnp/{,perfdata,spool} + + # and likewise for its logs... + dodir /var/log/pnp + fowners ":${user_group}" /var/log/pnp + fperms g+rwx /var/log/pnp + + # and its statistics. This one is arguably the responsibility of the + # build system, since process_perfdata.cfg refers to this location. + dodir /var/lib/pnp/stats + fowners ":${user_group}" /var/lib/pnp/stats + fperms g+rwx /var/lib/pnp/stats +} + +pkg_postinst() { + elog "To enable the pnp4nagios web front-end, please visit" + elog "${EROOT}/etc/conf.d/apache2 and add \"-D PNP -D PHP\"" + elog "to APACHE2_OPTS. Then pnp4nagios will be available at," + elog + elog " http://localhost/pnp4nagios" + elog +} diff --git a/net-analyzer/pnp4nagios/pnp4nagios-0.6.26_p20230918.ebuild b/net-analyzer/pnp4nagios/pnp4nagios-0.6.26_p20230918.ebuild new file mode 100644 index 000000000000..5ef07a6cac34 --- /dev/null +++ b/net-analyzer/pnp4nagios/pnp4nagios-0.6.26_p20230918.ebuild @@ -0,0 +1,112 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DESCRIPTION="A performance data analyzer for nagios" +HOMEPAGE="https://github.com/ConSol-Monitoring/pnp" +GH_COMMIT="e52677d3994d35197db68120d7089906a174a3f9" +SRC_URI="https://github.com/ConSol-Monitoring/pnp/archive/${GH_COMMIT}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/pnp-${GH_COMMIT}" + +LICENSE="GPL-2" +SLOT="0" +IUSE="apache2 icinga +nagios" +KEYWORDS="amd64 ~ppc ppc64 ~sparc x86" + +REQUIRED_USE="^^ ( icinga nagios )" + +# Some things (sync mode, for one) are broken with nagios-4.x, but since +# nagios-3.x has been end-of-life'd, we don't have much choice here but +# to accept it. +DEPEND="net-analyzer/rrdtool[graph,perl] + icinga? ( + acct-group/icinga + acct-user/icinga + ) + nagios? ( + acct-group/nagios + acct-user/nagios + )" + +# A list of modules used in our Apache config file. +APACHE_MODS="apache2_modules_alias," # "Alias" directive +APACHE_MODS+="apache2_modules_authz_core," # "Require" directive +APACHE_MODS+="apache2_modules_rewrite" # "RewriteEngine" and friends + +RDEPEND="${DEPEND} + dev-lang/php:*[filter,gd,json(+),simplexml,xml,zlib] + media-fonts/dejavu + virtual/perl-Getopt-Long + virtual/perl-Time-HiRes + apache2? ( >=www-servers/apache-2.4[${APACHE_MODS}] )" + +PATCHES=( + "${FILESDIR}/${PN}-0.6.14-makefile.patch" +) + +src_configure() { + local user_group=nagios + use icinga && user_group=icinga + + local myeconfargs=( + --sysconfdir="${EPREFIX}"/etc/pnp + --datarootdir="${EPREFIX}"/usr/share/pnp + --localstatedir="${EPREFIX}"/var/lib/pnp + --with-nagios-user="${user_group}" + --with-nagios-group="${user_group}" + --with-perfdata-logfile="${EPREFIX}"/var/log/pnp/process_perfdata.log + ) + + econf "${myeconfargs[@]}" +} + +src_compile() { + # The default target just shows a help + emake all +} + +src_install() { + # Don't use INSTALL_OPTS because they set insecure permissions on + # all of /etc/pnp (https://github.com/lingej/pnp4nagios/issues/140). + emake INSTALL_OPTS="" DESTDIR="${D}" install install-config + einstalldocs + newinitd "${FILESDIR}"/npcd.initd npcd + rm "${ED}/usr/share/pnp/install.php" || \ + die "unable to remove ${ED}/usr/share/pnp/install.php" + + # Fix CVE-2012-3457 (Gentoo bug 430358) + fperms o-rwx /etc/pnp/process_perfdata.cfg + + if use apache2 ; then + insinto /etc/apache2/modules.d + newins "${FILESDIR}"/98_pnp4nagios-2.4.conf 98_pnp4nagios.conf + fi + + # The nagios or icinga user needs to write performance data to the + # perfdata-dir... + local user_group=nagios + use icinga && user_group=icinga + fowners ":${user_group}" /var/lib/pnp/{,perfdata,spool} + fperms g+rwx /var/lib/pnp/{,perfdata,spool} + + # and likewise for its logs... + dodir /var/log/pnp + fowners ":${user_group}" /var/log/pnp + fperms g+rwx /var/log/pnp + + # and its statistics. This one is arguably the responsibility of the + # build system, since process_perfdata.cfg refers to this location. + dodir /var/lib/pnp/stats + fowners ":${user_group}" /var/lib/pnp/stats + fperms g+rwx /var/lib/pnp/stats +} + +pkg_postinst() { + elog "To enable the pnp4nagios web front-end, please visit" + elog "${EROOT}/etc/conf.d/apache2 and add \"-D PNP -D PHP\"" + elog "to APACHE2_OPTS. Then pnp4nagios will be available at," + elog + elog " http://localhost/pnp4nagios" + elog +} diff --git a/net-analyzer/poink/metadata.xml b/net-analyzer/poink/metadata.xml index b9c50c7f068b..a5a3b6242849 100644 --- a/net-analyzer/poink/metadata.xml +++ b/net-analyzer/poink/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> <email>robbat2@gentoo.org</email> diff --git a/net-analyzer/pontos/Manifest b/net-analyzer/pontos/Manifest new file mode 100644 index 000000000000..4222dcb9e6c8 --- /dev/null +++ b/net-analyzer/pontos/Manifest @@ -0,0 +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/metadata.xml b/net-analyzer/pontos/metadata.xml new file mode 100644 index 000000000000..57f5489f18e3 --- /dev/null +++ b/net-analyzer/pontos/metadata.xml @@ -0,0 +1,20 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="person" proxied="yes"> + <email>foti.giuseppe@gmail.com</email> + <name>Giuseppe Foti</name> + </maintainer> + <maintainer type="project" proxied="proxy"> + <email>proxy-maint@gentoo.org</email> + <name>Proxy Maintainers</name> + </maintainer> + <longdescription lang="en"> + The pontos Python package is a collection of utilities, tools, classes + and functions maintained by Greenbone Networks. + It is needed to run tests on some Greenbone Vulnerability Management packages. + </longdescription> + <upstream> + <remote-id type="github">greenbone/pontos</remote-id> + </upstream> +</pkgmetadata> diff --git a/net-analyzer/pontos/pontos-24.1.2.ebuild b/net-analyzer/pontos/pontos-24.1.2.ebuild new file mode 100644 index 000000000000..251e78ef2d3a --- /dev/null +++ b/net-analyzer/pontos/pontos-24.1.2.ebuild @@ -0,0 +1,43 @@ +# 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=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}] +" + +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/pontos/pontos-24.3.2.ebuild b/net-analyzer/pontos/pontos-24.3.2.ebuild new file mode 100644 index 000000000000..bf8315f7c568 --- /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/portmon/metadata.xml b/net-analyzer/portmon/metadata.xml index 74c2baebb4ec..dce3f3be66c0 100644 --- a/net-analyzer/portmon/metadata.xml +++ b/net-analyzer/portmon/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>netmon@gentoo.org</email> diff --git a/net-analyzer/portsentry/metadata.xml b/net-analyzer/portsentry/metadata.xml index 99bfe72a50cf..ff8e6562e4e4 100644 --- a/net-analyzer/portsentry/metadata.xml +++ b/net-analyzer/portsentry/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>netmon@gentoo.org</email> diff --git a/net-analyzer/portsentry/portsentry-1.2-r1.ebuild b/net-analyzer/portsentry/portsentry-1.2-r1.ebuild index 29e14b375300..731cf9e95739 100644 --- a/net-analyzer/portsentry/portsentry-1.2-r1.ebuild +++ b/net-analyzer/portsentry/portsentry-1.2-r1.ebuild @@ -1,29 +1,48 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 -inherit eutils toolchain-funcs +EAPI=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" +S="${WORKDIR}"/${PN}_beta SLOT="0" LICENSE="GPL-2" -KEYWORDS="amd64 ppc x86" +KEYWORDS="amd64 ppc x86 ~x64-macos" -S="${WORKDIR}"/${PN}_beta +RDEPEND="kernel_Darwin? ( app-shells/tcsh )" -src_prepare() { - epatch "${FILESDIR}"/${P}-conf.patch - epatch "${FILESDIR}"/${P}-config.h.patch - epatch "${FILESDIR}"/${P}-gcc.patch - epatch "${FILESDIR}"/${P}-ignore.csh.patch -} +PATCHES=( + "${FILESDIR}"/${P}-conf.patch + "${FILESDIR}"/${P}-config.h.patch + "${FILESDIR}"/${P}-gcc.patch + "${FILESDIR}"/${P}-ignore.csh.patch +) src_compile() { - emake CC=$(tc-getCC) CFLAGS="${CFLAGS} ${LDFLAGS}" linux + local target + + if use kernel_Darwin ; then + target="osx" + elif use kernel_linux ; then + target="linux" + elif use kernel_SunOS ; then + target="solaris" + fi + + if [[ -z "${target}" ]] ; then + elog "Using 'generic' target for your platform" + target="generic" + else + elog "Using '${target}' (detected) target for your platform" + fi + + emake CC="$(tc-getCC)" CFLAGS="${CFLAGS} ${CPPFLAGS} ${LDFLAGS}" "${target}" } src_install() { diff --git a/net-analyzer/prelude-correlator/Manifest b/net-analyzer/prelude-correlator/Manifest deleted file mode 100644 index 064bcdfec7ca..000000000000 --- a/net-analyzer/prelude-correlator/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST prelude-correlator-5.1.0.tar.gz 242620 BLAKE2B 70d4c4cc620fe4aa605812a83979b097e78ea97c5684d0d7ac8f0de2975f68d54f712f0d6dcd341f2928c846663fdf5182f8481fe6142de7648ba8fd2443d369 SHA512 db3a4cb1c4a8254270f63552ee2a959bc28cec8fdb48340f1c301fa65df73115292060067bed4b5945da4717a216313aa6eb2525bc02de4a6a45716b9827f5fd -DIST prelude-correlator-5.2.0.tar.gz 216556 BLAKE2B 9ccdbaf01224d34a507191521aeda8a8fe91004dc0b7a6113cbfc4b0d7ebab345a160b0e498b3c3477e3cc52cda1501d11a558842bb286444a925463a66ff7b5 SHA512 96e0c7637f3d17dc7cd76603e95f29eba0a1ec86ae603dcb6900b26a12e410e62884f9e339a228e3dd4a0db0fd0e8849bbd098caeb7e3c15db917ed33ebb5b43 diff --git a/net-analyzer/prelude-correlator/files/prelude-correlator-5.2.0-fix_siteconfig.patch b/net-analyzer/prelude-correlator/files/prelude-correlator-5.2.0-fix_siteconfig.patch deleted file mode 100644 index cdb55dfbac95..000000000000 --- a/net-analyzer/prelude-correlator/files/prelude-correlator-5.2.0-fix_siteconfig.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/setup.py 2020-09-29 00:30:57.407653336 +0200 -+++ b/setup.py 2020-09-29 00:41:37.813997273 +0200 -@@ -67,6 +67,7 @@ - - class my_install(install): - def run(self): -+ self.skip_build = 0 - for dirname, flist in self.distribution.data_files: - prefix = self.prefix - if self.prefix == "/usr": diff --git a/net-analyzer/prelude-correlator/files/prelude-correlator.initd b/net-analyzer/prelude-correlator/files/prelude-correlator.initd deleted file mode 100644 index 6e75689ca03c..000000000000 --- a/net-analyzer/prelude-correlator/files/prelude-correlator.initd +++ /dev/null @@ -1,26 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -BIN_CORRELATOR=/usr/bin/prelude-correlator -PID_CORRELATOR=/run/prelude-correlator/prelude-correlator.pid - -depend() { - need net - after prelude-manager -} - -start() { - ebegin "Starting prelude-correlator" - checkpath -d -m 0755 -o root:root /run/prelude-correlator - start-stop-daemon --start --exec $BIN_CORRELATOR \ - --pidfile $PID_CORRELATOR -- -d -P $PID_CORRELATOR - eend $? -} - -stop() { - ebegin "Stopping prelude-correlator" - start-stop-daemon --stop --exec $BIN_CORRELATOR \ - --pidfile $PID_CORRELATOR - eend $? -} diff --git a/net-analyzer/prelude-correlator/files/prelude-correlator.run b/net-analyzer/prelude-correlator/files/prelude-correlator.run deleted file mode 100644 index 8bec03f78704..000000000000 --- a/net-analyzer/prelude-correlator/files/prelude-correlator.run +++ /dev/null @@ -1,4 +0,0 @@ -# Configuration to create /run/prelude-correlator directory -# Used as part of systemd's tmpfiles - -d /run/prelude-correlator 0755 root root diff --git a/net-analyzer/prelude-correlator/files/prelude-correlator.service b/net-analyzer/prelude-correlator/files/prelude-correlator.service deleted file mode 100644 index 7b763c30c13a..000000000000 --- a/net-analyzer/prelude-correlator/files/prelude-correlator.service +++ /dev/null @@ -1,13 +0,0 @@ -[Unit] -Description=Prelude-Correlator service -DefaultDependencies=no -After=remote_fs.target prelude-manager.service - -[Service] -ExecStart=/usr/bin/prelude-correlator -d -P /run/prelude-correlator/prelude-correlator.pid -Type=forking -PIDFile=/run/prelude-correlator/prelude-correlator.pid -Restart=always - -[Install] -WantedBy=multi-user.target diff --git a/net-analyzer/prelude-correlator/metadata.xml b/net-analyzer/prelude-correlator/metadata.xml deleted file mode 100644 index fa977ec21f47..000000000000 --- a/net-analyzer/prelude-correlator/metadata.xml +++ /dev/null @@ -1,21 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="person"> - <email>thomas.andrejak@gmail.com</email> - <name>Thomas Andrejak</name> - </maintainer> - <maintainer type="project"> - <email>proxy-maint@gentoo.org</email> - <name>Proxy Maintainers</name> - </maintainer> - <longdescription lang="en"> - Prelude-Correlator allows conducting multi-stream correlations - thanks to a powerful programming language for writing correlation - rules. With any type of alert able to be correlated, event - analysis becomes simpler, quicker and more incisive. This - correlation alert then appears within the Prewikka interface - and indicates the potential target information via the set of - correlation rules. - </longdescription> -</pkgmetadata> diff --git a/net-analyzer/prelude-correlator/prelude-correlator-5.1.0.ebuild b/net-analyzer/prelude-correlator/prelude-correlator-5.1.0.ebuild deleted file mode 100644 index 43aef1343542..000000000000 --- a/net-analyzer/prelude-correlator/prelude-correlator-5.1.0.ebuild +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{6,7} ) - -inherit distutils-r1 systemd - -DESCRIPTION="Real time correlator of events received by Prelude Manager" -HOMEPAGE="https://www.prelude-siem.org" -SRC_URI="https://www.prelude-siem.org/pkg/src/5.1.0/${P}.tar.gz" - -LICENSE="GPL-2+" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -RDEPEND=">=dev-libs/libprelude-5.1.0[python,${PYTHON_USEDEP}] - <dev-libs/libprelude-6[python,${PYTHON_USEDEP}] - dev-python/netaddr[${PYTHON_USEDEP}]" - -src_install() { - distutils-r1_src_install - - systemd_dounit "${FILESDIR}/${PN}.service" - systemd_newtmpfilesd "${FILESDIR}/${PN}.run" "${PN}.conf" - - newinitd "${FILESDIR}/${PN}.initd" "${PN}" -} diff --git a/net-analyzer/prelude-correlator/prelude-correlator-5.2.0.ebuild b/net-analyzer/prelude-correlator/prelude-correlator-5.2.0.ebuild deleted file mode 100644 index 8d5c2ca8a594..000000000000 --- a/net-analyzer/prelude-correlator/prelude-correlator-5.2.0.ebuild +++ /dev/null @@ -1,36 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{6,7,8} ) - -inherit distutils-r1 systemd - -DESCRIPTION="Real time correlator of events received by Prelude Manager" -HOMEPAGE="https://www.prelude-siem.org" -SRC_URI="https://www.prelude-siem.org/pkg/src/5.2.0/${P}.tar.gz" - -LICENSE="GPL-2+" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -RDEPEND=">=dev-libs/libprelude-5.2.0[python,${PYTHON_USEDEP}] - <dev-libs/libprelude-6[python,${PYTHON_USEDEP}] - dev-python/netaddr[${PYTHON_USEDEP}]" - -PATCHES=( - "${FILESDIR}/${PN}-5.2.0-fix_siteconfig.patch" -) - -src_install() { - distutils-r1_src_install - - keepdir /var/${PN} - keepdir /var/spool/prelude/prelude-correlator - - systemd_dounit "${FILESDIR}/${PN}.service" - systemd_newtmpfilesd "${FILESDIR}/${PN}.run" "${PN}.conf" - - newinitd "${FILESDIR}/${PN}.initd" "${PN}" -} diff --git a/net-analyzer/prelude-lml-rules/Manifest b/net-analyzer/prelude-lml-rules/Manifest deleted file mode 100644 index 2e6f47ca1154..000000000000 --- a/net-analyzer/prelude-lml-rules/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST prelude-lml-rules-5.1.0.tar.gz 117585 BLAKE2B 0df09a472cd5bd3306927e788b0fc5451d95bf200ec83f77cede2653c1e28da1c777b4bc6ed1232bbf82c06557bc77ece18c02843349c14a8e0bf453db5191d9 SHA512 ef31b7933a441efa43a994170d3cec377b211b55ee80abbbff7986474d58a1f7b780c717a6c364c9ae162d3a8830004a7dd5c43b5cd8df0e2d92a38ad312eadc -DIST prelude-lml-rules-5.2.0.tar.gz 117046 BLAKE2B e0c8e6477497304dfc36c8abf93bd0bea7b86920652786ebfe84df391129b9a4ba76fc8c9fcf3ac817a805924a6626afa6f115c602f73519fc3271ed405ef4bf SHA512 d15a9e90e15cf484d4f2bf53005fe8b37bbf582d6b65f30a010e77290a56c0439b24322be948f7d096b92d1a5cf72a6dc3a0ee1495486840fa0bab603bbeeeeb diff --git a/net-analyzer/prelude-lml-rules/metadata.xml b/net-analyzer/prelude-lml-rules/metadata.xml deleted file mode 100644 index f9f94e2cbf43..000000000000 --- a/net-analyzer/prelude-lml-rules/metadata.xml +++ /dev/null @@ -1,12 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="person"> - <email>thomas.andrejak@gmail.com</email> - <name>Thomas Andrejak</name> - </maintainer> - <maintainer type="project"> - <email>proxy-maint@gentoo.org</email> - <name>Proxy Maintainers</name> - </maintainer> -</pkgmetadata> diff --git a/net-analyzer/prelude-lml-rules/prelude-lml-rules-5.1.0.ebuild b/net-analyzer/prelude-lml-rules/prelude-lml-rules-5.1.0.ebuild deleted file mode 100644 index 31c1829ee02f..000000000000 --- a/net-analyzer/prelude-lml-rules/prelude-lml-rules-5.1.0.ebuild +++ /dev/null @@ -1,21 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DESCRIPTION="Prelude LML community ruleset" -HOMEPAGE="https://www.prelude-siem.org" -SRC_URI="https://www.prelude-siem.org/pkg/src/${PV}/${P}.tar.gz" - -LICENSE="GPL-2+" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -RDEPEND="~net-analyzer/prelude-lml-${PV}" - -DEPEND="${RDEPEND}" - -src_install() { - insinto "/etc/prelude-lml/ruleset" - doins ruleset/*.rules -} diff --git a/net-analyzer/prelude-lml-rules/prelude-lml-rules-5.2.0.ebuild b/net-analyzer/prelude-lml-rules/prelude-lml-rules-5.2.0.ebuild deleted file mode 100644 index e93bb67f9786..000000000000 --- a/net-analyzer/prelude-lml-rules/prelude-lml-rules-5.2.0.ebuild +++ /dev/null @@ -1,21 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DESCRIPTION="Prelude LML community ruleset" -HOMEPAGE="https://www.prelude-siem.org" -SRC_URI="https://www.prelude-siem.org/pkg/src/${PV}/${P}.tar.gz" - -LICENSE="GPL-2+" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -RDEPEND="~net-analyzer/prelude-lml-${PV}" - -DEPEND="${RDEPEND}" - -src_install() { - insinto "/etc/prelude-lml/ruleset" - doins ruleset/*.rules -} diff --git a/net-analyzer/prelude-lml/Manifest b/net-analyzer/prelude-lml/Manifest deleted file mode 100644 index fb6cb0034a12..000000000000 --- a/net-analyzer/prelude-lml/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST prelude-lml-5.1.0.tar.gz 1585080 BLAKE2B 572a3bf2b013dc3f427f7e3a4cc650219945a0e481e10f9f8f8e6afac75c86db5319fd16f1bf9157ede55ae511ce5151a0fe63694d0b8cc2becbd6430521fba3 SHA512 248434352c340d9979051897190fc7fbe835c7b1f2411ec98a04cbf0bebb6f115e80ca854d35ab2b2f50722c052eea10e088e4557ca4218f0dfed21ae21109ae -DIST prelude-lml-5.2.0.tar.gz 1584414 BLAKE2B c97a730e366cdf0663ad6393acc0125d01995bd1339f4538a1dd62c2aa85e46dd78e3e279067a2bac328db675b5de59cebb8474bdafbe00d745320d360124535 SHA512 45de2dea196941086a690b3081b98253a3d9685552a25f39cf3b92d3b223c5a9d98057f855da1f23fff7aa425fd832e6021050d2d7fe58322c4f3f48c34394b5 diff --git a/net-analyzer/prelude-lml/files/prelude-lml-3.0.0-conf.patch b/net-analyzer/prelude-lml/files/prelude-lml-3.0.0-conf.patch deleted file mode 100644 index dab4ea8a6bb1..000000000000 --- a/net-analyzer/prelude-lml/files/prelude-lml-3.0.0-conf.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- a/prelude-lml.conf -+++ b/prelude-lml.conf -@@ -92,7 +92,7 @@ - time-format = "%b %d %H:%M:%S" - prefix-regex = "^(?P<timestamp>.{15}) (?P<hostname>\S+) (?:(?P<process>\S+?)(?:\[(?P<pid>[0-9]+)\])?: )?" - file = /var/log/messages --file = /var/log/secure -+file = /var/log/auth.log - # udp-server = 0.0.0.0 - # tcp-server = 0.0.0.0 - # tcp-tls-server = 0.0.0.0 ---- a/prelude-lml.conf.in -+++ b/prelude-lml.conf.in -@@ -92,7 +92,7 @@ - time-format = "%b %d %H:%M:%S" - prefix-regex = "^(?P<timestamp>.{15}) (?P<hostname>\S+) (?:(?P<process>\S+?)(?:\[(?P<pid>[0-9]+)\])?: )?" - file = /var/log/messages --file = /var/log/secure -+file = /var/log/auth.log - # udp-server = 0.0.0.0 - # tcp-server = 0.0.0.0 - # tcp-tls-server = 0.0.0.0 diff --git a/net-analyzer/prelude-lml/files/prelude-lml-3.1.0-run.patch b/net-analyzer/prelude-lml/files/prelude-lml-3.1.0-run.patch deleted file mode 100644 index a9eba7760d36..000000000000 --- a/net-analyzer/prelude-lml/files/prelude-lml-3.1.0-run.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- a/configure.ac -+++ b/configure.ac -@@ -209,9 +209,9 @@ - configdir=$SYSCONFDIR/prelude-lml - prelude_lml_conf=$configdir/prelude-lml.conf - regex_conf=$configdir/plugins.rules --metadata_dir=$LOCALSTATEDIR/lib/prelude-lml -+metadata_dir=$LOCALSTATEDIR/prelude-lml - plugindir=$LIBDIR/prelude-lml --lml_run_dir=$LOCALSTATEDIR/run/prelude-lml -+lml_run_dir=/run/prelude-lml - - AC_DEFINE_UNQUOTED(PRELUDE_LML_CONF, "$prelude_lml_conf", Path to the LML configuration file) - AC_DEFINE_UNQUOTED(LOG_PLUGIN_DIR, "$plugindir", Prelude-LML report plugin directory) diff --git a/net-analyzer/prelude-lml/files/prelude-lml.initd b/net-analyzer/prelude-lml/files/prelude-lml.initd deleted file mode 100644 index 0e1dd2e0f4fc..000000000000 --- a/net-analyzer/prelude-lml/files/prelude-lml.initd +++ /dev/null @@ -1,26 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -BIN_LML=/usr/bin/prelude-lml -PID_LML=/run/prelude-lml/prelude-lml.pid - -depend() { - need net - after prelude-manager -} - -start() { - ebegin "Starting prelude-lml" - checkpath -d -m 0755 -o root:root /run/prelude-lml - start-stop-daemon --start --exec $BIN_LML \ - --pidfile $PID_LML -- -d -P $PID_LML - eend $? -} - -stop() { - ebegin "Stopping prelude-lml" - start-stop-daemon --stop --exec $BIN_LML \ - --pidfile $PID_LML - eend $? -} diff --git a/net-analyzer/prelude-lml/files/prelude-lml.run b/net-analyzer/prelude-lml/files/prelude-lml.run deleted file mode 100644 index 75f2ef89adda..000000000000 --- a/net-analyzer/prelude-lml/files/prelude-lml.run +++ /dev/null @@ -1,4 +0,0 @@ -# Configuration to create /run/prelude-lml directory -# Used as part of systemd's tmpfiles - -d /run/prelude-lml 0755 root root diff --git a/net-analyzer/prelude-lml/files/prelude-lml.service b/net-analyzer/prelude-lml/files/prelude-lml.service deleted file mode 100644 index 9d9230c6ff4c..000000000000 --- a/net-analyzer/prelude-lml/files/prelude-lml.service +++ /dev/null @@ -1,13 +0,0 @@ -[Unit] -Description=Prelude-LML service -DefaultDependencies=no -After=remote_fs.target prelude-manager.service - -[Service] -ExecStart=/usr/bin/prelude-lml -d -P /run/prelude-lml/prelude-lml.pid -Type=forking -PIDFile=/run/prelude-lml/prelude-lml.pid -Restart=always - -[Install] -WantedBy=multi-user.target diff --git a/net-analyzer/prelude-lml/metadata.xml b/net-analyzer/prelude-lml/metadata.xml deleted file mode 100644 index 515391274149..000000000000 --- a/net-analyzer/prelude-lml/metadata.xml +++ /dev/null @@ -1,19 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="person"> - <email>thomas.andrejak@gmail.com</email> - <name>Thomas Andrejak</name> - </maintainer> - <maintainer type="project"> - <email>proxy-maint@gentoo.org</email> - <name>Proxy Maintainers</name> - </maintainer> - <longdescription lang="en"> - Prelude-LML is a log analyser that allows Prelude to collect and - analyze information from all kind of applications emitting logs or - syslog messages in order to detect suspicious activities and transform - them into Prelude-IDMEF alerts. Prelude-LML handles events generated - by a large set of applications - </longdescription> -</pkgmetadata> diff --git a/net-analyzer/prelude-lml/prelude-lml-5.1.0.ebuild b/net-analyzer/prelude-lml/prelude-lml-5.1.0.ebuild deleted file mode 100644 index 2d2d40b4db58..000000000000 --- a/net-analyzer/prelude-lml/prelude-lml-5.1.0.ebuild +++ /dev/null @@ -1,59 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools systemd - -DESCRIPTION="The prelude log analyzer" -HOMEPAGE="https://www.prelude-siem.org" -SRC_URI="https://www.prelude-siem.org/pkg/src/${PV}/${P}.tar.gz" - -LICENSE="GPL-2+" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="icu ssl" - -RDEPEND="dev-libs/libpcre - >=dev-libs/libprelude-5.1.0 - <dev-libs/libprelude-6 - icu? ( dev-libs/icu:= ) - ssl? ( net-libs/gnutls:= )" - -DEPEND="${RDEPEND}" - -BDEPEND="virtual/pkgconfig" - -PATCHES=( - "${FILESDIR}/${PN}-3.1.0-run.patch" - "${FILESDIR}/${PN}-3.0.0-conf.patch" -) - -src_prepare() { - default - - eautoreconf -} - -src_configure() { - local myconf=( - --localstatedir="${EPREFIX}/var" - $(use_with ssl libgnutls-prefix) - ) - - econf "${myconf[@]}" -} - -src_install() { - default - - rm -rv "${ED}/run" || die "rm failed" - keepdir /var/${PN} - - find "${D}" -name '*.la' -delete || die - - systemd_dounit "${FILESDIR}/${PN}.service" - systemd_newtmpfilesd "${FILESDIR}/${PN}.run" "${PN}.conf" - - newinitd "${FILESDIR}/${PN}.initd" "${PN}" -} diff --git a/net-analyzer/prelude-lml/prelude-lml-5.2.0.ebuild b/net-analyzer/prelude-lml/prelude-lml-5.2.0.ebuild deleted file mode 100644 index 554623ae6606..000000000000 --- a/net-analyzer/prelude-lml/prelude-lml-5.2.0.ebuild +++ /dev/null @@ -1,64 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools systemd tmpfiles - -DESCRIPTION="The prelude log analyzer" -HOMEPAGE="https://www.prelude-siem.org" -SRC_URI="https://www.prelude-siem.org/pkg/src/${PV}/${P}.tar.gz" - -LICENSE="GPL-2+" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="icu ssl" - -RDEPEND="dev-libs/libpcre - >=dev-libs/libprelude-5.2.0 - <dev-libs/libprelude-6 - icu? ( dev-libs/icu:= ) - ssl? ( net-libs/gnutls:= )" - -DEPEND="${RDEPEND}" - -BDEPEND="virtual/pkgconfig" - -PATCHES=( - "${FILESDIR}/${PN}-3.1.0-run.patch" - "${FILESDIR}/${PN}-3.0.0-conf.patch" -) - -src_prepare() { - default - - eautoreconf -} - -src_configure() { - local myconf=( - --localstatedir="${EPREFIX}/var" - $(use_with ssl libgnutls-prefix) - ) - - econf "${myconf[@]}" -} - -src_install() { - default - - rm -rv "${ED}/run" || die "rm failed" - keepdir /var/${PN} - keepdir /var/spool/prelude/prelude-lml - - find "${D}" -name '*.la' -delete || die - - systemd_dounit "${FILESDIR}/${PN}.service" - newtmpfiles "${FILESDIR}/${PN}.run" "${PN}.conf" - - newinitd "${FILESDIR}/${PN}.initd" "${PN}" -} - -pkg_postinst() { - tmpfiles_process "${PN}.conf" -} diff --git a/net-analyzer/prettyping/metadata.xml b/net-analyzer/prettyping/metadata.xml index 3799608c0a37..07495e084893 100644 --- a/net-analyzer/prettyping/metadata.xml +++ b/net-analyzer/prettyping/metadata.xml @@ -1,14 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>telans@posteo.de</email> - <name>Theo Anderson</name> - </maintainer> - <maintainer type="project"> - <email>proxy-maint@gentoo.org</email> - <name>Proxy Maintainers</name> - </maintainer> + <!-- maintainer-needed --> <longdescription> 'prettyping' is a wrapper around the standard 'ping' tool, making the output prettier, more colorful, more compact, diff --git a/net-analyzer/prettyping/prettyping-1.0.1.ebuild b/net-analyzer/prettyping/prettyping-1.0.1.ebuild index 6bca8544ecbd..284ed8a7c3b4 100644 --- a/net-analyzer/prettyping/prettyping-1.0.1.ebuild +++ b/net-analyzer/prettyping/prettyping-1.0.1.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="Ping wrapper that produces coloured, easily readable output." -HOMEPAGE="http://denilson.sa.nom.br/prettyping/" +DESCRIPTION="Ping wrapper that produces coloured, easily readable output" +HOMEPAGE="https://denilson.sa.nom.br/prettyping/" SRC_URI="https://github.com/denilsonsa/prettyping/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="MIT" @@ -13,7 +13,7 @@ KEYWORDS="amd64 ~arm ~arm64 ~x86" RDEPEND="app-shells/bash net-misc/iputils - virtual/awk" + app-alternatives/awk" src_install() { dobin prettyping diff --git a/net-analyzer/pypacker/Manifest b/net-analyzer/pypacker/Manifest index a01168605d21..f746ae904f44 100644 --- a/net-analyzer/pypacker/Manifest +++ b/net-analyzer/pypacker/Manifest @@ -1,2 +1 @@ -DIST pypacker-4.8.tar.gz 600508 BLAKE2B e9cdf07ed7d92aecad24e2bea9d18f67eca4477bccc273d77b82701f3110b7b71db5f35bc29ee45d33ac8ba02e8c8d1d36b31e326f21a443f6fc2b2375678330 SHA512 729a55e745f645b874bc6a868afcff543a26aae74b5241204c8e7103f754c296204c43b9db5b64b4a3423f735e2c658e9f0d97f7c84f0f8b134b29c5a2e55227 -DIST pypacker-4.9.tar.gz 602068 BLAKE2B 1ddc16e361ba0aa57b4dab62c38c37aabeffe2cab5cb819e627aeaac5452201117c2f806f2f443cad96d673f93bf0f0a159fa6a7d59564879d038524a2de1eb1 SHA512 804bb32eda76a00121c88d38722a6fb51a9fcff0a5625bd46bda68329e39139624c4fb8e2736208733a6b97ec0df02f173d304fcf3bb39549f3fa119fcf0ae2f +DIST pypacker-v5.2.tar.bz2 544026 BLAKE2B 3401b47a496e8c76d2b925e63c43838d2a05af01655a3e470ddfd0c2c57ab6b37ba1b9acd49386232b5c0fb4bc8d061f8992eac07f5729306502fa76413c51f5 SHA512 3ccb82ff2a352553819991c0e24fb6da8a26091f5cdced3d3358192ecf6598153fb3b36d48b1f51cdc1dd7f54e136c073e8e5a2f3fb050af24f83c77e1bda3b4 diff --git a/net-analyzer/pypacker/metadata.xml b/net-analyzer/pypacker/metadata.xml index c3888efc00a8..61659fe10b68 100644 --- a/net-analyzer/pypacker/metadata.xml +++ b/net-analyzer/pypacker/metadata.xml @@ -1,12 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!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> <upstream> - <remote-id type="github">mike01/pypacker</remote-id> + <remote-id type="gitlab">mike01/pypacker</remote-id> <maintainer> <email>michael.stahn.42@googlemail.com</email> <name>Michael Stahn</name> diff --git a/net-analyzer/pypacker/pypacker-4.8.ebuild b/net-analyzer/pypacker/pypacker-4.8.ebuild deleted file mode 100644 index f10389269bce..000000000000 --- a/net-analyzer/pypacker/pypacker-4.8.ebuild +++ /dev/null @@ -1,27 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -PYTHON_COMPAT=( python3_{6,7} ) -inherit distutils-r1 vcs-snapshot - -DESCRIPTION="Fast and simple packet creation and parsing library for Python" -HOMEPAGE="https://gitlab.com/mike01/pypacker" -SRC_URI="https://gitlab.com/mike01/pypacker/-/archive/v${PV}/pypacker-v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="examples" - -DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]" -DOCS=( AUTHORS CHANGES HACKING README.md ) - -python_test() { - "${EPYTHON}" tests/test_pypacker.py || die -} - -python_install_all() { - distutils-r1_python_install_all - use examples && dodoc -r examples -} diff --git a/net-analyzer/pypacker/pypacker-4.9.ebuild b/net-analyzer/pypacker/pypacker-4.9.ebuild deleted file mode 100644 index 6de7cf5ad3c1..000000000000 --- a/net-analyzer/pypacker/pypacker-4.9.ebuild +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{6..9} ) - -inherit distutils-r1 vcs-snapshot - -DESCRIPTION="Fast and simple packet creation and parsing library for Python" -HOMEPAGE="https://gitlab.com/mike01/pypacker" -SRC_URI="https://gitlab.com/mike01/pypacker/-/archive/v${PV}/pypacker-v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="examples" - -DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]" -DOCS=( AUTHORS CHANGES HACKING README.md ) - -python_test() { - "${EPYTHON}" tests/test_pypacker.py || die -} - -python_install_all() { - distutils-r1_python_install_all - use examples && dodoc -r examples -} diff --git a/net-analyzer/pypacker/pypacker-5.2.ebuild b/net-analyzer/pypacker/pypacker-5.2.ebuild new file mode 100644 index 000000000000..3de0dad76a97 --- /dev/null +++ b/net-analyzer/pypacker/pypacker-5.2.ebuild @@ -0,0 +1,30 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISTUTILS_USE_PEP517=setuptools +PYTHON_COMPAT=( python3_{9..11} ) + +inherit distutils-r1 + +DESCRIPTION="Fast and simple packet creation and parsing library for Python" +HOMEPAGE="https://gitlab.com/mike01/pypacker" +SRC_URI="https://gitlab.com/mike01/pypacker/-/archive/v${PV}/pypacker-v${PV}.tar.bz2" +S="${WORKDIR}"/${PN}-v${PV} + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="examples" + +DOCS=( AUTHORS CHANGES HACKING README.md ) + +python_test() { + "${EPYTHON}" tests/test_pypacker.py || die +} + +python_install_all() { + distutils-r1_python_install_all + use examples && dodoc -r examples +} diff --git a/net-analyzer/python-gvm/Manifest b/net-analyzer/python-gvm/Manifest index e9e4ba9eb0a2..72ac45aa37e9 100644 --- a/net-analyzer/python-gvm/Manifest +++ b/net-analyzer/python-gvm/Manifest @@ -1,4 +1 @@ -DIST python-gvm-1.1.0.tar.gz 160289 BLAKE2B 64dbf79f6749c50cddc2b908c45c6aea6c3793f0ddb10a98a96870636ee351f1a2e66227fbcc1383c63e0e015b4c05bf4c116ac80ef35f73f7e9057f9c8dd9b5 SHA512 dae04d42a14adde274c2148f7bd4b47b0ea02d6e249d6c23dfeb15f217f04ad9ff722f2e98d13e1a7add7b61d9dabfec623ab5b45087aaf5f480447fd31a8071 -DIST python-gvm-1.2.0.tar.gz 160700 BLAKE2B 40ef2d6e01dee7a93796c5d2f29db06e2a533860f7c612000ad5250d9b291ce90164e3a7c65c77f7131fc12c4622094b22da4eeb989293ad1b33e2754063ec76 SHA512 3eacec521bbd4cbfaec08d1ccabfe1c97898288b8b56779f9e3ceb734f52d78b93faf92674c1eefc555501e0bfdb16ed26316e87c697bbdc5a673d1be2170c00 -DIST python-gvm-1.5.0.tar.gz 171471 BLAKE2B 57fa3cc8dfa74a16c56fb4fee0f2c47ede441892a19865271e8c034cb853751f38b3f90cbca6d538d8e59866cd45d0fd8e783a62719c523c6fc9723f4c183a79 SHA512 7c1717dd8f724566232cca50997494012d0364975151afcca8aa483f9fd85d47343f1a2af0124cb762e16d42a057b06d8f8a5e637280e14541a270b14be188e1 -DIST python-gvm-1.6.0.tar.gz 175162 BLAKE2B 2c2f9d96911533734807b1aa3e6a56c758122755284a4808ac4e7f974847a12ac8d148e1c8604307965422f311231d721cbbaf09207e85d4425afc5d9534b2e5 SHA512 135ae95d6b5d5226a5ed3e4a7c14e03831005e745039bca86d532cb852a41a973ea1559b1c17b6564787f9448e20c932445dfec0ec8ecf1b39366edc205ea934 +DIST python-gvm-24.1.0.tar.gz 287497 BLAKE2B 049154d5a516c56885c06e2a83884736c9e4009e1e69a817e541f1317d4fe0cb886f98ed1572bcb55bcfdd40ed7da6639ba52cc89b113731f24d941de3f6195b SHA512 d70d3c654aefb6e5949e35f68fd1585c243988a41165c9fefb54c8fe6dd24694391553201a95558d3fd4a6e8c88783a1fc4d2205ce9ae1a7d2fc2dafdf19825b diff --git a/net-analyzer/python-gvm/metadata.xml b/net-analyzer/python-gvm/metadata.xml index fd0b9228bd46..fc9cf3041b5d 100644 --- a/net-analyzer/python-gvm/metadata.xml +++ b/net-analyzer/python-gvm/metadata.xml @@ -1,11 +1,15 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> + <maintainer type="person" proxied="yes"> + <email>foti.giuseppe@gmail.com</email> + <name>Giuseppe Foti</name> + </maintainer> + <maintainer type="person" proxied="yes"> <email>jonas.licht@gmail.com</email> <name>Jonas Licht</name> </maintainer> - <maintainer type="project"> + <maintainer type="project" proxied="proxy"> <email>proxy-maint@gentoo.org</email> <name>Proxy Maintainers</name> </maintainer> diff --git a/net-analyzer/python-gvm/python-gvm-1.1.0.ebuild b/net-analyzer/python-gvm/python-gvm-1.1.0.ebuild deleted file mode 100644 index 9a52388287f5..000000000000 --- a/net-analyzer/python-gvm/python-gvm-1.1.0.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 - -PYTHON_COMPAT=( python3_{6,7} ) -inherit distutils-r1 - -DESCRIPTION="Greenbone Vulnerability Management Python Library" -HOMEPAGE="https://www.greenbone.net/en/" -SRC_URI="https://github.com/greenbone/python-gvm/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -SLOT="0" -LICENSE="GPL-3" -KEYWORDS="~amd64 ~x86" -IUSE="" - -RDEPEND=" - dev-python/defusedxml[${PYTHON_USEDEP}] - dev-python/lxml[${PYTHON_USEDEP}] - dev-python/paramiko[${PYTHON_USEDEP}]" - -DEPEND=" - ${RDEPEND}" - -distutils_enable_tests unittest - -src_prepare() { - distutils-r1_python_prepare_all - # Exlude tests & docs to fix build issue - sed \ - -e "s/packages=find_packages(exclude=.*/packages=find_packages(exclude=['tests*', 'docs']),/g" \ - -i "$S"/setup.py || die -} diff --git a/net-analyzer/python-gvm/python-gvm-1.2.0.ebuild b/net-analyzer/python-gvm/python-gvm-1.2.0.ebuild deleted file mode 100644 index 8643fbe95e03..000000000000 --- a/net-analyzer/python-gvm/python-gvm-1.2.0.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 - -PYTHON_COMPAT=( python3_{6,7,8} ) -inherit distutils-r1 - -DESCRIPTION="Greenbone Vulnerability Management Python Library" -HOMEPAGE="https://www.greenbone.net/en/" -SRC_URI="https://github.com/greenbone/python-gvm/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -SLOT="0" -LICENSE="GPL-3" -KEYWORDS="~amd64 ~x86" -IUSE="" - -RDEPEND=" - dev-python/defusedxml[${PYTHON_USEDEP}] - dev-python/lxml[${PYTHON_USEDEP}] - dev-python/paramiko[${PYTHON_USEDEP}]" - -DEPEND=" - ${RDEPEND}" - -distutils_enable_tests unittest - -src_prepare() { - distutils-r1_python_prepare_all - # Exlude tests & docs to fix build issue - sed \ - -e "s/packages=find_packages(exclude=.*/packages=find_packages(exclude=['tests*', 'docs']),/g" \ - -i "$S"/setup.py || die -} diff --git a/net-analyzer/python-gvm/python-gvm-1.5.0.ebuild b/net-analyzer/python-gvm/python-gvm-1.5.0.ebuild deleted file mode 100644 index 8f7d966921fb..000000000000 --- a/net-analyzer/python-gvm/python-gvm-1.5.0.ebuild +++ /dev/null @@ -1,36 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{6,7,8} ) -DISTUTILS_USE_SETUPTOOLS=pyproject.toml - -inherit distutils-r1 - -DESCRIPTION="Greenbone Vulnerability Management Python Library" -HOMEPAGE="https://www.greenbone.net/en/" -SRC_URI="https://github.com/greenbone/python-gvm/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -SLOT="0" -LICENSE="GPL-3" -KEYWORDS="~amd64 ~x86" -IUSE="" - -RDEPEND=" - dev-python/defusedxml[${PYTHON_USEDEP}] - dev-python/lxml[${PYTHON_USEDEP}] - dev-python/paramiko[${PYTHON_USEDEP}]" - -DEPEND=" - ${RDEPEND}" - -distutils_enable_tests unittest - -src_prepare() { - distutils-r1_python_prepare_all - # Exlude tests & docs to fix build issue - sed \ - -e "s/packages=find_packages(exclude=.*/packages=find_packages(exclude=['tests*', 'docs']),/g" \ - -i "$S"/setup.py || die -} diff --git a/net-analyzer/python-gvm/python-gvm-1.6.0.ebuild b/net-analyzer/python-gvm/python-gvm-1.6.0.ebuild deleted file mode 100644 index c3d5c167201e..000000000000 --- a/net-analyzer/python-gvm/python-gvm-1.6.0.ebuild +++ /dev/null @@ -1,28 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{7,8,9} ) -DISTUTILS_USE_SETUPTOOLS=pyproject.toml - -inherit distutils-r1 - -DESCRIPTION="Greenbone Vulnerability Management Python Library" -HOMEPAGE="https://www.greenbone.net/en/" -SRC_URI="https://github.com/greenbone/python-gvm/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -SLOT="0" -LICENSE="GPL-3" -KEYWORDS="~amd64 ~x86" -IUSE="" - -RDEPEND=" - dev-python/defusedxml[${PYTHON_USEDEP}] - dev-python/lxml[${PYTHON_USEDEP}] - dev-python/paramiko[${PYTHON_USEDEP}]" - -DEPEND=" - ${RDEPEND}" - -distutils_enable_tests unittest diff --git a/net-analyzer/python-gvm/python-gvm-24.1.0.ebuild b/net-analyzer/python-gvm/python-gvm-24.1.0.ebuild new file mode 100644 index 000000000000..8ec792cbd495 --- /dev/null +++ b/net-analyzer/python-gvm/python-gvm-24.1.0.ebuild @@ -0,0 +1,36 @@ +# 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=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" + +SLOT="0" +LICENSE="GPL-3+" +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}] + 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/quidscor/Manifest b/net-analyzer/quidscor/Manifest deleted file mode 100644 index 10c96375f852..000000000000 --- a/net-analyzer/quidscor/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST quidscor-1.2.48-src.tar.gz 77843 BLAKE2B 4f9feffb67acc8f32c4f922ce882a0799549ecce8e439dffeee5d0e4ec967739646a0ee4912a189e99c9f39743a74ae1f5528050daa82689f35ba498b2bad87f SHA512 8272a1a4ed406d3429f0438dabddd15092be0a33a8fce3c5b0af0ae13422c8918f1a5971b2c2ea639fb87ffdeb1bc89085f07f89856e732f0b270b57eabb7010 diff --git a/net-analyzer/quidscor/files/quidscor-1.2.48-curl-types.h.patch b/net-analyzer/quidscor/files/quidscor-1.2.48-curl-types.h.patch deleted file mode 100644 index 5f1e035c81d6..000000000000 --- a/net-analyzer/quidscor/files/quidscor-1.2.48-curl-types.h.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/libqg/libqg.h -+++ b/libqg/libqg.h -@@ -38,7 +38,6 @@ - #include <arpa/inet.h> - #include <dirent.h> - #include <curl/curl.h> --#include <curl/types.h> - #include <string.h> - #include <strings.h> - #include <libxml/xmlmemory.h> diff --git a/net-analyzer/quidscor/files/quidscor-1.2.48-paths.patch b/net-analyzer/quidscor/files/quidscor-1.2.48-paths.patch deleted file mode 100644 index 6168720cbdf4..000000000000 --- a/net-analyzer/quidscor/files/quidscor-1.2.48-paths.patch +++ /dev/null @@ -1,37 +0,0 @@ ---- a/quidscor.conf -+++ b/quidscor.conf -@@ -15,9 +15,9 @@ - # Logdir: directory - LOGDIR /var/log/quidscor/ - # Cachedir: directory --CACHEDIR /var/run/quidscor/cache/ -+CACHEDIR /var/lib/quidscor - # Rulesdir: directory where .rules (for snort) live (.lib for dragon) --RULESDIR /usr/local/etc/snort-rules -+RULESDIR /etc/snort/rules - # Expiretime: time_in_seconds - EXPIRETIME 86400 - # File for custom mapping (must be absolute path) ---- a/quidscor.h -+++ b/quidscor.h -@@ -85,7 +85,7 @@ - #define AL_UNVER "alerts_unknown.log" - - // Directories --#define CACHE_DIR "run/quidscor/cache/" -+#define CACHE_DIR "/lib/quidscor" - #define LOG_DIR "log/quidscor/" - #define CREATE_MOD 0700 - #define MOD_PID 0640 ---- a/Makefile -+++ b/Makefile -@@ -84,8 +84,7 @@ - - install: - install -d -m 0700 $(IVARPREFIX)/log/$(PNAME)/ -- install -d -m 0700 $(IVARPREFIX)/run/$(PNAME)/ -- install -d -m 0700 $(IVARPREFIX)/run/$(PNAME)/cache/ -+ install -d -m 0700 $(IVARPREFIX)/lib/$(PNAME)/ - install -d -m 0755 $(IPREFIX)/sbin/ - install -m 0755 $(PNAME) $(IPREFIX)/sbin/$(PNAME) - install -d -m 0755 $(IPREFIX)/etc/ diff --git a/net-analyzer/quidscor/files/quidscor-1.2.48-strip.patch b/net-analyzer/quidscor/files/quidscor-1.2.48-strip.patch deleted file mode 100644 index 9d169e619c0b..000000000000 --- a/net-analyzer/quidscor/files/quidscor-1.2.48-strip.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/Makefile -+++ b/Makefile -@@ -69,7 +69,6 @@ - - $(PNAME): $(PNAME).debug - $(CP) $(PNAME).debug $@ -- $(STRIP) $@ - - $(PNAME).debug: libqg/libqg.a $(OFILES) Makefile - $(CC) $(LDFLAGS) $(CFLAGS) -o $@ $(OFILES) $(LIBS) diff --git a/net-analyzer/quidscor/metadata.xml b/net-analyzer/quidscor/metadata.xml deleted file mode 100644 index 2a7b2d66bb99..000000000000 --- a/net-analyzer/quidscor/metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>netmon@gentoo.org</email> - <name>Gentoo network monitoring and analysis project</name> - </maintainer> - <upstream> - <remote-id type="sourceforge">quidscor</remote-id> - </upstream> -</pkgmetadata> diff --git a/net-analyzer/quidscor/quidscor-1.2.48-r1.ebuild b/net-analyzer/quidscor/quidscor-1.2.48-r1.ebuild deleted file mode 100644 index 9c118b6762a3..000000000000 --- a/net-analyzer/quidscor/quidscor-1.2.48-r1.ebuild +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit eutils toolchain-funcs - -DESCRIPTION="Qualys IDS Correlation Daemon" -HOMEPAGE="http://quidscor.sourceforge.net/" -SRC_URI="mirror://sourceforge/quidscor/${P}-src.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~ppc ~x86" - -DEPEND=" - >=dev-libs/libxml2-2.4 - >=net-misc/curl-7.10 - >=net-analyzer/snort-2.0 -" -RDEPEND="${DEPEND}" - -src_prepare() { - epatch \ - "${FILESDIR}"/${P}-curl-types.h.patch \ - "${FILESDIR}"/${P}-paths.patch \ - "${FILESDIR}"/${P}-strip.patch - - #yes, the fix below is as pathetic as it seems - echo "#define FALSE 0" >> libqg/libqg.h || die - echo "#define TRUE 1" >> libqg/libqg.h || die -} - -src_compile() { - emake EXTRA_CFLAGS="${CFLAGS}" CC="$(tc-getCC)" -} - -src_install() { - emake PREFIX=/usr STAGING_PREFIX="${D}" install - dodoc ChangeLog FAQ MANIFEST README TODO - # fix ugly install - cd "${D}"/usr || die - mv etc .. || die - rm -r doc || die -} diff --git a/net-analyzer/raddump/metadata.xml b/net-analyzer/raddump/metadata.xml index 031c18c54a9f..54b98d783bd3 100644 --- a/net-analyzer/raddump/metadata.xml +++ b/net-analyzer/raddump/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> <email>robbat2@gentoo.org</email> diff --git a/net-analyzer/rain/metadata.xml b/net-analyzer/rain/metadata.xml index 74c2baebb4ec..dce3f3be66c0 100644 --- a/net-analyzer/rain/metadata.xml +++ b/net-analyzer/rain/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>netmon@gentoo.org</email> diff --git a/net-analyzer/rrdcollect/metadata.xml b/net-analyzer/rrdcollect/metadata.xml index 100eb9f44e4a..1eea9b19605b 100644 --- a/net-analyzer/rrdcollect/metadata.xml +++ b/net-analyzer/rrdcollect/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>netmon@gentoo.org</email> diff --git a/net-analyzer/rrdtool/Manifest b/net-analyzer/rrdtool/Manifest index d0902d1b33b9..457a1b51cd3a 100644 --- a/net-analyzer/rrdtool/Manifest +++ b/net-analyzer/rrdtool/Manifest @@ -1 +1,2 @@ -DIST rrdtool-1.7.2.tar.gz 2883737 BLAKE2B f3ff6cc4e325cdec42a6f9e67a1644f501c11edc47bc281df58c2e1d7be4c01767c35166f4301f68cf9c22dcd5c159bb51ee704a5e36776acdf166100122cebb SHA512 453230efc68aeb4a12842d20a9d246ba478a79c2f6bfd9693a91837c1c1136abe8af177be64fe29aa40bf84ccfce7f2f15296aefe095e89b8b62aef5a7623e29 +DIST rrdtool-1.8.0-gcc14.patch.gz 10775 BLAKE2B 9b8eeb829acec097bf06e3cad2fb4ca37a5d351fb3eca5767066d8cfb70c176c9d3b9265a721958b97e02f1c267b8b3a4b61ad35b0ca06199cc45c8c92f7dc09 SHA512 576be3d94a56edbc8738a32b934d30d8e45eb3e801854f73a3a77f5bd22bdd4618f68ea079f37992f38a9b756cac96e6cb48eeb5cceb4ff30139a2d77c9b0afe +DIST rrdtool-1.8.0.tar.gz 2955398 BLAKE2B d821d662af432c53760bc0e9636b84d9209933a810fa71091fc4c2b44518c89c7ad509bde7955d952279ee41464c3bfa4f631662dde61b6fff46699bb382653f SHA512 8ae6f94d119e8d0e1ba7f2d0738f1ba008a4880d1022f1c0c5436f662d961fceec5c42e01c241493ece3d6f55c60fd7d1d264f93e678f3cf1251201dcde027c1 diff --git a/net-analyzer/rrdtool/files/rrdcached.confd b/net-analyzer/rrdtool/files/rrdcached.confd deleted file mode 100644 index 0463a7923461..000000000000 --- a/net-analyzer/rrdtool/files/rrdcached.confd +++ /dev/null @@ -1,8 +0,0 @@ -RRCACHE_ARGS="-l unix:/var/run/rrdcached.sock -j /var/lib/rrdcached/journal/ -F -b /var/lib/rrdcached/db/ -B" - -USER="" -GROUP="" - -MODE="" - -MAXWAIT=30 diff --git a/net-analyzer/rrdtool/files/rrdcached.confd-r1 b/net-analyzer/rrdtool/files/rrdcached.confd-r1 new file mode 100644 index 000000000000..99213acd1e1b --- /dev/null +++ b/net-analyzer/rrdtool/files/rrdcached.confd-r1 @@ -0,0 +1,13 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +# Default user and group for the rrdcached daemon +GROUP="rrdcached" +USER="root" + +# Default options for the rrdcached daemon +RRCACHE_ARGS="-B -F -m 770 -s rrdcached -l unix:/run/rrdcached.sock" + +# Default path for database and journal +RRCACHE_DATABASE="/var/lib/rrdcached/db" +RRCACHE_JOURNAL="/var/lib/rrdcached/journal" diff --git a/net-analyzer/rrdtool/files/rrdcached.init b/net-analyzer/rrdtool/files/rrdcached.init deleted file mode 100644 index 51c2cbb6e818..000000000000 --- a/net-analyzer/rrdtool/files/rrdcached.init +++ /dev/null @@ -1,13 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -command="/usr/bin/rrdcached" -command_args="${RRCACHE_ARGS} -p /run/rrdcached.pid" -start_stop_daemon_args="--quiet" -description="RRDtool data caching daemon" - -depend() { - need localmount net - use logger -} diff --git a/net-analyzer/rrdtool/files/rrdcached.init-r1 b/net-analyzer/rrdtool/files/rrdcached.init-r1 new file mode 100644 index 000000000000..f7bdb0c68504 --- /dev/null +++ b/net-analyzer/rrdtool/files/rrdcached.init-r1 @@ -0,0 +1,23 @@ +#!/sbin/openrc-run +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +description="Data caching daemon for RRDTool" +rrdcached_database="${RRCACHE_DATABASE:-/var/lib/rrdcached/db}" +rrdcached_group="${GROUP:-rrdcached}" +rrdcached_journal="${RRCACHE_JOURNAL:-/var/lib/rrdcached/journal}" +rrdcached_user="${USER:-rrdcached}" +pidfile="/run/rrdcached.pid" + +command="/usr/bin/rrdcached" +command_args="${RRCACHE_ARGS} -b ${rrdcached_database} -G ${rrdcached_group} -j ${rrdcached_journal} -p ${pidfile} -U ${rrdcached_user}" + +depend() { + need localmount + use logger +} + +start_pre() { + checkpath -d -o "${rrdcached_user}:${rrdcached_group}" -q "${rrdcached_database}" + checkpath -d -o "${rrdcached_user}:${rrdcached_group}" -q "${rrdcached_journal}" +} diff --git a/net-analyzer/rrdtool/files/rrdtool-1.4.9-disable-rrd_graph-perl.patch b/net-analyzer/rrdtool/files/rrdtool-1.4.9-disable-rrd_graph-perl.patch deleted file mode 100644 index c68ca24a3e2f..000000000000 --- a/net-analyzer/rrdtool/files/rrdtool-1.4.9-disable-rrd_graph-perl.patch +++ /dev/null @@ -1,53 +0,0 @@ ---- a/bindings/perl-shared/RRDs.xs -+++ b/bindings/perl-shared/RRDs.xs -@@ -189,6 +189,7 @@ - OUTPUT: - RETVAL - -+#ifdef HAVE_RRD_GRAPH - SV * - rrd_graph(...) - PROTOTYPE: @ -@@ -235,6 +236,8 @@ - PUSHs(sv_2mortal(newSViv(xsize))); - PUSHs(sv_2mortal(newSViv(ysize))); - -+#endif /* HAVE_RRD_GRAPH */ -+ - SV * - rrd_fetch(...) - PROTOTYPE: @ -@@ -313,6 +316,7 @@ - PUSHs(sv_2mortal(newSVuv(start_tmp))); - PUSHs(sv_2mortal(newSVuv(end_tmp))); - -+#ifdef HAVE_RRD_GRAPH - int - rrd_xport(...) - PROTOTYPE: @ -@@ -371,6 +375,8 @@ - PUSHs(sv_2mortal(newRV_noinc((SV*)names))); - PUSHs(sv_2mortal(newRV_noinc((SV*)retar))); - -+#endif /* HAVE_RRD_GRAPH */ -+ - SV* - rrd_info(...) - PROTOTYPE: @ -@@ -397,6 +403,7 @@ - OUTPUT: - RETVAL - -+#ifdef HAVE_RRD_GRAPH - SV* - rrd_graphv(...) - PROTOTYPE: @ -@@ -410,6 +417,8 @@ - OUTPUT: - RETVAL - -+#endif /* HAVE_RRD_GRAPH */ -+ - int - rrd_dump(...) - PROTOTYPE: @ diff --git a/net-analyzer/rrdtool/files/rrdtool-1.5.5-rrdrados.pod b/net-analyzer/rrdtool/files/rrdtool-1.5.5-rrdrados.pod deleted file mode 100644 index 0c645548a202..000000000000 --- a/net-analyzer/rrdtool/files/rrdtool-1.5.5-rrdrados.pod +++ /dev/null @@ -1,68 +0,0 @@ -=head1 NAME - -rrdrados - Creating, updating and retrieving RRD files from Ceph - -=head1 SYNOPSIS - -E<lt>rrdfileE<gt> = B<ceph//E<lt>nameE<gt>> - - -=head1 DESCRIPTION - -This module adds support for creating, updating and retrieving RRD files -directly from a Ceph cluster using librados. - -It adds a ceph// prefix to RRD file name which is used to instruct rrdtool to -operate on a file that is stored in Ceph. - -Currently the module expects to find the Ceph configuration file in the default -location at /etc/ceph/ceph.conf. By default it uses Ceph client ID "admin" and a -Ceph pool named "rrd". - - -=head1 ENVIRONMENT VARIABLES - -=over 4 - -=item B<CEPH_ID> - -Sets the Ceph Client ID to use when connecting. By default the client ID "admin" -is used. - -=item B<CEPH_POOL> - -Sets the name of the Ceph Pool to connect to. By default, the pool "rrd" is -used. - -=back - - -=head1 EXAMPLES - -B<Creating an RRD file on Ceph> - - rrdtool create ceph//temperature.rrd --step 300 \ - DS:temp:GAUGE:600:-273:5000 \ - RRA:AVERAGE:0.5:1:1200 \ - RRA:MIN:0.5:12:2400 \ - RRA:MAX:0.5:12:2400 \ - RRA:AVERAGE:0.5:12:2400 - - -B<Importing an existing RRD into Ceph> - - rrdtool dump existing.rrd | rrdtool restore - ceph//new.rrd - -Or you could also copy the RRD file directly into Ceph using the rados command -line utility. - - -B<Retrieving RRD data from Ceph> - - rrdtool fetch ceph//file.rrd AVERAGE - - -=head1 AUTHOR - -Simon Boulet E<lt>simon@nostalgeek.comE<gt> - diff --git a/net-analyzer/rrdtool/files/rrdtool-1.8.0-configure-clang16.patch b/net-analyzer/rrdtool/files/rrdtool-1.8.0-configure-clang16.patch new file mode 100644 index 000000000000..355436cb82f2 --- /dev/null +++ b/net-analyzer/rrdtool/files/rrdtool-1.8.0-configure-clang16.patch @@ -0,0 +1,34 @@ +https://github.com/oetiker/rrdtool-1.x/commit/f3334fcbde0a77aa48938ba38602bff91c09cf85 + +From f3334fcbde0a77aa48938ba38602bff91c09cf85 Mon Sep 17 00:00:00 2001 +From: Ryan Schmidt <git@ryandesign.com> +Date: Sun, 20 Mar 2022 16:29:10 -0500 +Subject: [PATCH] acinclude.m4: Include <stdlib.h> when using exit + +Fixes: + +conftest.c:124:33: error: implicitly declaring library function 'exit' +with type 'void (int) __attribute__((noreturn))' +--- a/m4/acinclude.m4 ++++ b/m4/acinclude.m4 +@@ -582,7 +582,8 @@ AC_DEFUN([GC_TIMEZONE], [ + AC_REQUIRE([AC_STRUCT_TM]) + AC_CACHE_CHECK([tm_gmtoff in struct tm], gq_cv_have_tm_gmtoff, + gq_cv_have_tm_gmtoff=no +- AC_TRY_COMPILE([#include <time.h> ++ AC_TRY_COMPILE([#include <stdlib.h> ++ #include <time.h> + #include <$ac_cv_struct_tm> + ], + [struct tm t; +@@ -595,7 +596,8 @@ AC_DEFUN([GC_TIMEZONE], [ + + AC_CACHE_CHECK([__tm_gmtoff in struct tm], gq_cv_have___tm_gmtoff, + gq_cv_have___tm_gmtoff=no +- AC_TRY_COMPILE([#include <time.h> ++ AC_TRY_COMPILE([#include <stdlib.h> ++ #include <time.h> + #include <$ac_cv_struct_tm> + ], + [struct tm t; + diff --git a/net-analyzer/rrdtool/metadata.xml b/net-analyzer/rrdtool/metadata.xml index a6a291c9723d..7c83d2658e6f 100644 --- a/net-analyzer/rrdtool/metadata.xml +++ b/net-analyzer/rrdtool/metadata.xml @@ -1,13 +1,21 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!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> -<use> -<flag name="graph">Enable support for graphing functions</flag> -<flag name="rados">Enable support for librados from <pkg>sys-cluster/ceph</pkg></flag> -<flag name="rrdcgi">Build rrdcgi support</flag> -</use> + <maintainer type="person"> + <email>conikost@gentoo.org</email> + <name>Conrad Kostecki</name> + </maintainer> + <maintainer type="project"> + <email>netmon@gentoo.org</email> + <name>Gentoo network monitoring and analysis project</name> + </maintainer> + <use> + <flag name="graph">Enable support for graphing functions</flag> + <flag name="rados">Enable support for librados from <pkg>sys-cluster/ceph</pkg></flag> + <flag name="rrdcached">Build support for write-caching daemon</flag> + <flag name="rrdcgi">Build rrdcgi support</flag> + </use> + <upstream> + <remote-id type="github">oetiker/rrdtool-1.x</remote-id> + </upstream> </pkgmetadata> diff --git a/net-analyzer/rrdtool/rrdtool-1.7.2-r1.ebuild b/net-analyzer/rrdtool/rrdtool-1.7.2-r1.ebuild deleted file mode 100644 index ddf3e474c0fc..000000000000 --- a/net-analyzer/rrdtool/rrdtool-1.7.2-r1.ebuild +++ /dev/null @@ -1,189 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -DISTUTILS_OPTIONAL=true -DISTUTILS_SINGLE_IMPL=true -GENTOO_DEPEND_ON_PERL=no -PYTHON_COMPAT=( python3_{6,7,8} ) -inherit autotools perl-module distutils-r1 flag-o-matic multilib - -MY_P=${P/_/-} - -DESCRIPTION="A system to store and display time-series data" -HOMEPAGE="https://oss.oetiker.ch/rrdtool/" -SRC_URI="https://oss.oetiker.ch/rrdtool/pub/${MY_P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0/8.0.0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris" -IUSE="dbi doc graph lua perl python rados rrdcgi ruby static-libs tcl tcpd test" -RESTRICT="!test? ( test )" -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -CDEPEND=" - >=dev-libs/glib-2.28.7:2[static-libs(+)?] - >=dev-libs/libxml2-2.7.8:2[static-libs(+)?] - dbi? ( dev-db/libdbi[static-libs(+)?] ) - graph? ( - >=media-libs/libpng-1.5.10:0=[static-libs(+)?] - >=x11-libs/cairo-1.10.2[svg,static-libs(+)?] - >=x11-libs/pango-1.28 - ) - lua? ( dev-lang/lua:0= ) - perl? ( dev-lang/perl:= ) - python? ( ${PYTHON_DEPS} ) - rados? ( sys-cluster/ceph ) - tcl? ( dev-lang/tcl:0= ) - tcpd? ( sys-apps/tcp-wrappers ) -" - -DEPEND=" - ${CDEPEND} - sys-apps/groff - virtual/pkgconfig - virtual/awk - test? ( sys-devel/bc ) -" -RDEPEND=" - ${CDEPEND} -" -PDEPEND=" - ruby? ( ~dev-ruby/rrdtool-bindings-${PV} ) -" -PATCHES=( - "${FILESDIR}"/${PN}-1.4.9-disable-rrd_graph-perl.patch - "${FILESDIR}"/${PN}-1.7.0-disable-rrd_graph-cgi.patch - "${FILESDIR}"/${PN}-1.7.1-configure.ac.patch -) -S=${WORKDIR}/${MY_P} - -python_compile() { - cd bindings/python || die - distutils-r1_python_compile -} - -python_install() { - cd bindings/python || die - distutils-r1_python_install -} - -pkg_setup() { - use python && python-single-r1_pkg_setup -} - -src_prepare() { - default - # At the next version bump, please see if you actually still need this - # before adding versions - if ! [ -f doc/rrdrados.pod ]; then - cp "${FILESDIR}"/${PN}-1.5.5-rrdrados.pod doc/rrdrados.pod - else - die "File already exists: doc/rrdrados.pod. Remove this code!" - fi - - # bug 456810 - # no time to sleep - sed -i \ - -e 's|$LUA_CFLAGS|IGNORE_THIS_BAD_TEST|g' \ - -e 's|^sleep 1$||g' \ - -e '/^dnl.*png/s|^dnl||g' \ - configure.ac || die - - # Python bindings are built/installed manually - sed -i \ - -e '/^all-local:/s| @COMP_PYTHON@||' \ - bindings/Makefile.am || die - - if ! use graph; then - sed -i \ - -e '2s:rpn1::; 2s:rpn2::; 6s:create-with-source-4::;' \ - -e '7s:xport1::; 7s:dcounter1::; 7s:vformatter1::' \ - -e 's|graph1||g' \ - tests/Makefile.am || die - fi - - eautoreconf -} - -src_configure() { - export rd_cv_gcc_flag__Werror=no - export rd_cv_ms_async=ok - - filter-flags -ffast-math - - export RRDDOCDIR=${EPREFIX}/usr/share/doc/${PF} - - # to solve bug #260380 - [[ ${CHOST} == *-solaris* ]] && append-flags -D__EXTENSIONS__ - - # Stub configure.ac - local myconf=() - if ! use tcpd; then - myconf+=( "--disable-libwrap" ) - fi - if ! use dbi; then - myconf+=( "--disable-libdbi" ) - fi - if ! use rados; then - myconf+=( "--disable-librados" ) - fi - - econf \ - $(use_enable graph rrd_graph) \ - $(use_enable lua lua-site-install) \ - $(use_enable lua) \ - $(use_enable perl perl-site-install) \ - $(use_enable perl) \ - $(use_enable python) \ - $(use_enable rrdcgi) \ - $(use_enable static-libs static) \ - $(use_enable tcl) \ - $(use_with tcl tcllib "${EPREFIX}"/usr/$(get_libdir)) \ - --with-perl-options=INSTALLDIRS=vendor \ - --disable-ruby-site-install \ - --disable-ruby \ - ${myconf[@]} -} - -src_compile() { - default - - use python && distutils-r1_src_compile -} - -src_test() { - export LC_ALL=C - default -} - -src_install() { - default - - if ! use doc ; then - rm -rf "${ED}"usr/share/doc/${PF}/{html,txt} - fi - - if use !rrdcgi ; then - # uses rrdcgi, causes invalid shebang error in Prefix, useless - # without rrdcgi installed - rm -f "${ED}"usr/share/${PN}/examples/cgi-demo.cgi - fi - - if use perl ; then - perl_delete_localpod - perl_delete_packlist - fi - - dodoc CHANGES CONTRIBUTORS NEWS THREADS TODO - - find "${ED}"usr -name '*.la' -exec rm -f {} + - - keepdir /var/lib/rrdcached/journal/ - keepdir /var/lib/rrdcached/db/ - - newconfd "${FILESDIR}"/rrdcached.confd rrdcached - newinitd "${FILESDIR}"/rrdcached.init rrdcached - - use python && distutils-r1_src_install -} diff --git a/net-analyzer/rrdtool/rrdtool-1.7.2-r100.ebuild b/net-analyzer/rrdtool/rrdtool-1.7.2-r100.ebuild deleted file mode 100644 index 9c2b0c2e0962..000000000000 --- a/net-analyzer/rrdtool/rrdtool-1.7.2-r100.ebuild +++ /dev/null @@ -1,248 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DISTUTILS_OPTIONAL=true -DISTUTILS_SINGLE_IMPL=true -GENTOO_DEPEND_ON_PERL=no -LUA_COMPAT=( lua5-{1..4} luajit ) -PYTHON_COMPAT=( python3_{6,7,8} ) - -inherit autotools lua perl-module distutils-r1 flag-o-matic multilib - -MY_P=${P/_/-} - -DESCRIPTION="A system to store and display time-series data" -HOMEPAGE="https://oss.oetiker.ch/rrdtool/" -SRC_URI="https://oss.oetiker.ch/rrdtool/pub/${MY_P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0/8.0.0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris" -IUSE="dbi doc graph lua perl python rados rrdcgi ruby static-libs tcl tcpd test" -RESTRICT="!test? ( test )" -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} ) - lua? ( - ${LUA_REQUIRED_USE} - test? ( graph ) - )" - -CDEPEND=" - >=dev-libs/glib-2.28.7:2[static-libs(+)?] - >=dev-libs/libxml2-2.7.8:2[static-libs(+)?] - dbi? ( dev-db/libdbi[static-libs(+)?] ) - graph? ( - >=media-libs/libpng-1.5.10:0=[static-libs(+)?] - >=x11-libs/cairo-1.10.2[svg,static-libs(+)?] - >=x11-libs/pango-1.28 - ) - lua? ( ${LUA_DEPS} ) - perl? ( dev-lang/perl:= ) - python? ( ${PYTHON_DEPS} ) - rados? ( sys-cluster/ceph ) - tcl? ( dev-lang/tcl:0= ) - tcpd? ( sys-apps/tcp-wrappers ) -" - -DEPEND=" - ${CDEPEND} - sys-apps/groff - virtual/pkgconfig - virtual/awk - test? ( sys-devel/bc ) -" -RDEPEND=" - ${CDEPEND} -" -BDEPEND="test? ( - lua? ( ${LUA_DEPS} ) -)" -PDEPEND=" - ruby? ( ~dev-ruby/rrdtool-bindings-${PV} ) -" -PATCHES=( - "${FILESDIR}"/${PN}-1.4.9-disable-rrd_graph-perl.patch - "${FILESDIR}"/${PN}-1.7.0-disable-rrd_graph-cgi.patch - "${FILESDIR}"/${PN}-1.7.1-configure.ac.patch -) -S=${WORKDIR}/${MY_P} - -python_compile() { - cd bindings/python || die - distutils-r1_python_compile -} - -python_install() { - cd bindings/python || die - distutils-r1_python_install -} - -pkg_setup() { - use python && python-single-r1_pkg_setup -} - -src_prepare() { - default - # At the next version bump, please see if you actually still need this - # before adding versions - if ! [ -f doc/rrdrados.pod ]; then - cp "${FILESDIR}"/${PN}-1.5.5-rrdrados.pod doc/rrdrados.pod - else - die "File already exists: doc/rrdrados.pod. Remove this code!" - fi - - # bug 456810 - # no time to sleep - sed -i \ - -e 's|$LUA_CFLAGS|IGNORE_THIS_BAD_TEST|g' \ - -e 's|^sleep 1$||g' \ - -e '/^dnl.*png/s|^dnl||g' \ - configure.ac || die - - # Python bindings are built/installed manually - sed -i \ - -e '/^all-local:/s| @COMP_PYTHON@||' \ - bindings/Makefile.am || die - - if ! use graph; then - sed -i \ - -e '2s:rpn1::; 2s:rpn2::; 6s:create-with-source-4::;' \ - -e '7s:xport1::; 7s:dcounter1::; 7s:vformatter1::' \ - -e 's|graph1||g' \ - tests/Makefile.am || die - fi - - eautoreconf -} - -src_configure() { - export rd_cv_gcc_flag__Werror=no - export rd_cv_ms_async=ok - - filter-flags -ffast-math - - export RRDDOCDIR=${EPREFIX}/usr/share/doc/${PF} - - # to solve bug #260380 - [[ ${CHOST} == *-solaris* ]] && append-flags -D__EXTENSIONS__ - - # Stub configure.ac - local myconf=() - if ! use tcpd; then - myconf+=( "--disable-libwrap" ) - fi - if ! use dbi; then - myconf+=( "--disable-libdbi" ) - fi - if ! use rados; then - myconf+=( "--disable-librados" ) - fi - - # We will handle Lua bindings ourselves, upstream is not multi-impl-ready - # and their Lua-detection logic depends on having the right version of the Lua - # interpreter available at build time. - econf \ - $(use_enable graph rrd_graph) \ - $(use_enable perl perl-site-install) \ - $(use_enable perl) \ - $(use_enable python) \ - $(use_enable rrdcgi) \ - $(use_enable static-libs static) \ - $(use_enable tcl) \ - $(use_with tcl tcllib "${EPREFIX}"/usr/$(get_libdir)) \ - --with-perl-options=INSTALLDIRS=vendor \ - --disable-lua \ - --disable-ruby-site-install \ - --disable-ruby \ - ${myconf[@]} -} - -lua_src_compile() { - pushd "${BUILD_DIR}"/bindings/lua || die "Failed to change to Lua-binding directory for ${ELUA}" - - # We do need the cmod-dir path here, otherwise libtool complains. - # Use the real one (i.e. not within ${ED}) just in case. - emake \ - LUA_CFLAGS=$(lua_get_CFLAGS) \ - LUA_INSTALL_CMOD="$(lua_get_cmod_dir)" - - popd -} - -src_compile() { - default - - if use lua; then - # Only copy sources now so that we do not trigger librrd compilation - # multiple times. - lua_copy_sources - - lua_foreach_impl lua_src_compile - fi - - use python && distutils-r1_src_compile -} - -lua_src_test() { - pushd "${BUILD_DIR}"/bindings/lua || die "Failed to change to Lua-binding directory for ${ELUA}" - - LUA_CPATH="${PWD}/.libs/?.so" emake LUA="${LUA}" test - - popd -} - -src_test() { - export LC_ALL=C - default - if use lua; then - lua_foreach_impl lua_src_test - fi -} - -lua_src_install() { - pushd "${BUILD_DIR}"/bindings/lua || die "Failed to change to Lua-binding directory for ${ELUA}" - - # This time we must prefix the cmod-dir path with ${ED} so that make - # does not try to violate the sandbox. - emake \ - LUA_INSTALL_CMOD="${ED}/$(lua_get_cmod_dir)" \ - install - - popd -} - -src_install() { - default - - if ! use doc ; then - rm -rf "${ED}"/usr/share/doc/${PF}/{html,txt} - fi - - if use lua; then - lua_foreach_impl lua_src_install - fi - - if use !rrdcgi ; then - # uses rrdcgi, causes invalid shebang error in Prefix, useless - # without rrdcgi installed - rm -f "${ED}"/usr/share/${PN}/examples/cgi-demo.cgi - fi - - if use perl ; then - perl_delete_localpod - perl_delete_packlist - fi - - dodoc CHANGES CONTRIBUTORS NEWS THREADS TODO - - find "${ED}"/usr -name '*.la' -exec rm -f {} + - - keepdir /var/lib/rrdcached/journal/ - keepdir /var/lib/rrdcached/db/ - - newconfd "${FILESDIR}"/rrdcached.confd rrdcached - newinitd "${FILESDIR}"/rrdcached.init rrdcached - - use python && distutils-r1_src_install -} diff --git a/net-analyzer/rrdtool/rrdtool-1.7.2.ebuild b/net-analyzer/rrdtool/rrdtool-1.7.2.ebuild deleted file mode 100644 index 1335788aeb0e..000000000000 --- a/net-analyzer/rrdtool/rrdtool-1.7.2.ebuild +++ /dev/null @@ -1,189 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -DISTUTILS_OPTIONAL=true -DISTUTILS_SINGLE_IMPL=true -GENTOO_DEPEND_ON_PERL=no -PYTHON_COMPAT=( python3_{6,7,8} ) -inherit autotools perl-module distutils-r1 flag-o-matic multilib - -MY_P=${P/_/-} - -DESCRIPTION="A system to store and display time-series data" -HOMEPAGE="https://oss.oetiker.ch/rrdtool/" -SRC_URI="https://oss.oetiker.ch/rrdtool/pub/${MY_P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0/8.0.0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris" -IUSE="dbi doc graph lua perl python rados rrdcgi ruby static-libs tcl tcpd test" -RESTRICT="!test? ( test )" -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -CDEPEND=" - >=dev-libs/glib-2.28.7:2[static-libs(+)?] - >=dev-libs/libxml2-2.7.8:2[static-libs(+)?] - dbi? ( dev-db/libdbi[static-libs(+)?] ) - graph? ( - >=media-libs/libpng-1.5.10:0=[static-libs(+)?] - >=x11-libs/cairo-1.10.2[svg,static-libs(+)?] - >=x11-libs/pango-1.28 - ) - lua? ( dev-lang/lua:0=[deprecated] ) - perl? ( dev-lang/perl:= ) - python? ( ${PYTHON_DEPS} ) - rados? ( sys-cluster/ceph ) - tcl? ( dev-lang/tcl:0= ) - tcpd? ( sys-apps/tcp-wrappers ) -" - -DEPEND=" - ${CDEPEND} - sys-apps/groff - virtual/pkgconfig - virtual/awk - test? ( sys-devel/bc ) -" -RDEPEND=" - ${CDEPEND} -" -PDEPEND=" - ruby? ( ~dev-ruby/rrdtool-bindings-${PV} ) -" -PATCHES=( - "${FILESDIR}"/${PN}-1.4.9-disable-rrd_graph-perl.patch - "${FILESDIR}"/${PN}-1.7.0-disable-rrd_graph-cgi.patch - "${FILESDIR}"/${PN}-1.7.1-configure.ac.patch -) -S=${WORKDIR}/${MY_P} - -python_compile() { - cd bindings/python || die - distutils-r1_python_compile -} - -python_install() { - cd bindings/python || die - distutils-r1_python_install -} - -pkg_setup() { - use python && python-single-r1_pkg_setup -} - -src_prepare() { - default - # At the next version bump, please see if you actually still need this - # before adding versions - if ! [ -f doc/rrdrados.pod ]; then - cp "${FILESDIR}"/${PN}-1.5.5-rrdrados.pod doc/rrdrados.pod - else - die "File already exists: doc/rrdrados.pod. Remove this code!" - fi - - # bug 456810 - # no time to sleep - sed -i \ - -e 's|$LUA_CFLAGS|IGNORE_THIS_BAD_TEST|g' \ - -e 's|^sleep 1$||g' \ - -e '/^dnl.*png/s|^dnl||g' \ - configure.ac || die - - # Python bindings are built/installed manually - sed -i \ - -e '/^all-local:/s| @COMP_PYTHON@||' \ - bindings/Makefile.am || die - - if ! use graph; then - sed -i \ - -e '2s:rpn1::; 2s:rpn2::; 6s:create-with-source-4::;' \ - -e '7s:xport1::; 7s:dcounter1::; 7s:vformatter1::' \ - -e 's|graph1||g' \ - tests/Makefile.am || die - fi - - eautoreconf -} - -src_configure() { - export rd_cv_gcc_flag__Werror=no - export rd_cv_ms_async=ok - - filter-flags -ffast-math - - export RRDDOCDIR=${EPREFIX}/usr/share/doc/${PF} - - # to solve bug #260380 - [[ ${CHOST} == *-solaris* ]] && append-flags -D__EXTENSIONS__ - - # Stub configure.ac - local myconf=() - if ! use tcpd; then - myconf+=( "--disable-libwrap" ) - fi - if ! use dbi; then - myconf+=( "--disable-libdbi" ) - fi - if ! use rados; then - myconf+=( "--disable-librados" ) - fi - - econf \ - $(use_enable graph rrd_graph) \ - $(use_enable lua lua-site-install) \ - $(use_enable lua) \ - $(use_enable perl perl-site-install) \ - $(use_enable perl) \ - $(use_enable python) \ - $(use_enable rrdcgi) \ - $(use_enable static-libs static) \ - $(use_enable tcl) \ - $(use_with tcl tcllib "${EPREFIX}"/usr/$(get_libdir)) \ - --with-perl-options=INSTALLDIRS=vendor \ - --disable-ruby-site-install \ - --disable-ruby \ - ${myconf[@]} -} - -src_compile() { - default - - use python && distutils-r1_src_compile -} - -src_test() { - export LC_ALL=C - default -} - -src_install() { - default - - if ! use doc ; then - rm -rf "${ED}"usr/share/doc/${PF}/{html,txt} - fi - - if use !rrdcgi ; then - # uses rrdcgi, causes invalid shebang error in Prefix, useless - # without rrdcgi installed - rm -f "${ED}"usr/share/${PN}/examples/cgi-demo.cgi - fi - - if use perl ; then - perl_delete_localpod - perl_delete_packlist - fi - - dodoc CHANGES CONTRIBUTORS NEWS THREADS TODO - - find "${ED}"usr -name '*.la' -exec rm -f {} + - - keepdir /var/lib/rrdcached/journal/ - keepdir /var/lib/rrdcached/db/ - - newconfd "${FILESDIR}"/rrdcached.confd rrdcached - newinitd "${FILESDIR}"/rrdcached.init rrdcached - - use python && distutils-r1_src_install -} diff --git a/net-analyzer/rrdtool/rrdtool-1.8.0-r4.ebuild b/net-analyzer/rrdtool/rrdtool-1.8.0-r4.ebuild new file mode 100644 index 000000000000..73d95f65962c --- /dev/null +++ b/net-analyzer/rrdtool/rrdtool-1.8.0-r4.ebuild @@ -0,0 +1,256 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +LUA_COMPAT=( lua5-{1..4} luajit ) +PYTHON_COMPAT=( python3_{9..12} ) +DISTUTILS_EXT=1 +DISTUTILS_OPTIONAL="true" +DISTUTILS_SINGLE_IMPL="true" +DISTUTILS_USE_PEP517="setuptools" +GENTOO_DEPEND_ON_PERL="no" +MY_P="${P/_/-}" + +inherit autotools lua perl-module distutils-r1 flag-o-matic + +DESCRIPTION="A data logging and graphing system for time series data" +HOMEPAGE="https://oss.oetiker.ch/rrdtool/" +SRC_URI=" + https://github.com/oetiker/${PN}-1.x/releases/download/v${PV}/${P}.tar.gz + https://dev.gentoo.org/~conikost/distfiles/patches/${PN}-1.8.0-gcc14.patch.gz +" +S="${WORKDIR}/${MY_P}" + +LICENSE="GPL-2" +SLOT="0/8.0.0" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" +IUSE="dbi doc examples graph lua perl python rados rrdcached rrdcgi ruby static-libs tcl tcpd test" + +RESTRICT="!test? ( test )" +REQUIRED_USE=" + python? ( ${PYTHON_REQUIRED_USE} ) + lua? ( + ${LUA_REQUIRED_USE} + test? ( graph ) + ) + test? ( graph rrdcached ) +" + +PDEPEND="ruby? ( ~dev-ruby/rrdtool-bindings-${PV} )" + +RDEPEND=" + dev-libs/glib:2[static-libs(+)?] + dev-libs/libxml2:2[static-libs(+)?] + dbi? ( dev-db/libdbi[static-libs(+)?] ) + graph? ( + media-libs/libpng:0=[static-libs(+)?] + x11-libs/cairo[svg(+),static-libs(+)?] + x11-libs/pango + ) + lua? ( ${LUA_DEPS} ) + perl? ( dev-lang/perl:= ) + python? ( ${PYTHON_DEPS} ) + rados? ( sys-cluster/ceph ) + rrdcached? ( + acct-group/rrdcached + acct-user/rrdcached + ) + tcl? ( dev-lang/tcl:0= ) + tcpd? ( sys-apps/tcp-wrappers ) +" + +DEPEND="${RDEPEND}" + +BDEPEND=" + ${DISTUTILS_DEPS} + sys-apps/groff + virtual/pkgconfig + app-alternatives/awk + python? ( $(python_gen_cond_dep 'dev-python/setuptools[${PYTHON_USEDEP}]') ) + test? ( + app-alternatives/bc + lua? ( ${LUA_DEPS} ) + ) +" + +PATCHES=( + "${FILESDIR}"/${PN}-1.7.0-disable-rrd_graph-cgi.patch + "${FILESDIR}"/${PN}-1.7.1-configure.ac.patch + "${FILESDIR}"/${PN}-1.8.0-configure-clang16.patch + "${WORKDIR}"/${PN}-1.8.0-gcc14.patch +) + +pkg_setup() { + use python && python-single-r1_pkg_setup +} + +src_prepare() { + default + + # Bug #456810 + local mysedargs=( + -e 's|$LUA_CFLAGS|IGNORE_THIS_BAD_TEST|g' + -e 's|^sleep 1$||g' + -e '/^dnl.*png/s|^dnl||g' + -i configure.ac + ) + + sed "${mysedargs[@]}" || die + + # Python bindings are built and installed manually + local mysedargs=( + -e '/^all-local:/s| @COMP_PYTHON@||' + -i bindings/Makefile.am + ) + + sed "${mysedargs[@]}" || die + + # Makefile needs to be adjusted for disabling 'graph' feature + if ! use graph ; then + local mysedargs=( + -e '2s:rpn1::; 2s:rpn2::; 6s:create-with-source-4::;' + -e '7s:xport1::; 7s:dcounter1::; 7s:vformatter1::' + -e 's|graph1||g' + -i tests/Makefile.am + ) + + sed "${mysedargs[@]}" || die + fi + + # Temporarily disable rpn test, will be enabled with > 1.8.0 release. + sed -e 's/rpn2//' -i tests/Makefile.am || die + + eautoreconf +} + +src_configure() { + export rd_cv_gcc_flag__Werror=no + export rd_cv_ms_async=ok + export RRDDOCDIR="${EPREFIX}/usr/share/doc/${PF}" + + # Bug #260380 + [[ ${CHOST} == *-solaris* ]] && append-flags -D__EXTENSIONS__ + + # Enabling '-ffast-math' is known to cause problems. + filter-flags -ffast-math + + # We will handle Lua bindings ourselves, upstream is not multi-impl-ready + # and their Lua-detection logic depends on having the right version of the Lua + # interpreter available at build time. + local myeconfargs=( + --disable-lua + --disable-ruby + --disable-ruby-site-install + $(usex !dbi '--disable-libdbi' '') + $(usex !examples '--disable-examples' '') + $(use_enable graph rrd_graph) + $(use_enable perl perl-site-install) + $(use_enable perl) + $(use_enable python) + $(usex !rados '--disable-librados' '') + $(usex !rrdcached '--disable-rrdcached' '') + $(use_enable rrdcgi) + $(use_enable static-libs static) + $(usex !tcpd '--disable-libwrap' '') + $(use_enable tcl) + $(use_enable tcl tcl-site) + $(use_with tcl tcllib "${EPREFIX}"/usr/$(get_libdir)) + --with-perl-options="INSTALLDIRS=vendor" + ) + + econf "${myeconfargs[@]}" +} + +lua_src_compile() { + pushd "${BUILD_DIR}"/bindings/lua || die + + # We do need the CMOD-dir path here, otherwise libtool complains. + # Use the real one (i.e. not within ${ED}) just in case. + local myemakeargs=( + LUA_CFLAGS="$(lua_get_CFLAGS)" + LUA_INSTALL_CMOD="$(lua_get_cmod_dir)" + ) + + emake "${myemakeargs[@]}" + + popd || die +} + +python_compile() { + cd bindings/python || die + distutils-r1_python_compile +} + +src_compile() { + default + + # Only copy sources now so that we do not + # trigger librrd compilation multiple times. + if use lua; then + lua_copy_sources + lua_foreach_impl lua_src_compile + fi + + use python && distutils-r1_src_compile +} + +lua_src_test() { + pushd "${BUILD_DIR}"/bindings/lua || die + LUA_CPATH="${PWD}/.libs/?.so" emake LUA="${LUA}" test + popd || die +} + +src_test() { + export LC_ALL=C + default + + if use lua; then + lua_foreach_impl lua_src_test + fi +} + +lua_src_install() { + pushd "${BUILD_DIR}"/bindings/lua || die + + # This time we must prefix the CMOD-dir path with ${ED}, + # so that make does not try to violate the sandbox. + local myemakeargs=( + LUA_INSTALL_CMOD="${ED}/$(lua_get_cmod_dir)" + ) + + emake "${myemakeargs[@]}" install + + popd || die +} + +python_install() { + cd bindings/python || die + distutils-r1_python_install +} + +src_install() { + default + + if ! use doc; then + rm -rf "${ED}"/usr/share/doc/"${PF}"/{html,txt} || die + fi + + if use lua; then + lua_foreach_impl lua_src_install + fi + + if use perl; then + perl_delete_localpod + perl_delete_packlist + fi + + use python && distutils-r1_src_install + + if use rrdcached; then + newconfd "${FILESDIR}"/rrdcached.confd-r1 rrdcached + newinitd "${FILESDIR}"/rrdcached.init-r1 rrdcached + fi + + find "${ED}" -name '*.la' -delete || die +} diff --git a/net-analyzer/rtpbreak/metadata.xml b/net-analyzer/rtpbreak/metadata.xml index 6f49eba8f496..85e4ed814fa2 100644 --- a/net-analyzer/rtpbreak/metadata.xml +++ b/net-analyzer/rtpbreak/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <!-- maintainer-needed --> </pkgmetadata> diff --git a/net-analyzer/rtpbreak/rtpbreak-1.3a-r1.ebuild b/net-analyzer/rtpbreak/rtpbreak-1.3a-r1.ebuild deleted file mode 100644 index c10b7bd76cc0..000000000000 --- a/net-analyzer/rtpbreak/rtpbreak-1.3a-r1.ebuild +++ /dev/null @@ -1,36 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit eutils toolchain-funcs - -DESCRIPTION="Analyze any RTP session through heuristics over UDP network traffic" -HOMEPAGE="http://xenion.reactive-search.com/?page_id=7" -SRC_URI="http://xenion.antifork.org/rtpbreak/${P}.tgz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -DEPEND="net-libs/libnet:1.1 - >=net-libs/libpcap-0.7" - -RDEPEND="${DEPEND}" - -src_prepare() { - # Use limits.h PATH_MAX - epatch "${FILESDIR}"/${P}-limits.patch \ - "${FILESDIR}"/${P}-missing-headers.patch -} - -src_compile() { - emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" -} - -src_install() { - dobin src/rtpbreak - dodoc CHANGELOG THANKS - dohtml -r doc -} diff --git a/net-analyzer/rtpbreak/rtpbreak-1.3a-r2.ebuild b/net-analyzer/rtpbreak/rtpbreak-1.3a-r2.ebuild new file mode 100644 index 000000000000..bdd5d139be1b --- /dev/null +++ b/net-analyzer/rtpbreak/rtpbreak-1.3a-r2.ebuild @@ -0,0 +1,33 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit toolchain-funcs + +DESCRIPTION="Analyze any RTP session through heuristics over UDP network traffic" +HOMEPAGE="http://xenion.reactive-search.com/?page_id=7" +SRC_URI="http://xenion.antifork.org/rtpbreak/${P}.tgz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +DEPEND="net-libs/libnet:1.1 + >=net-libs/libpcap-0.7" +RDEPEND="${DEPEND}" + +PATCHES=( + "${FILESDIR}"/${P}-limits.patch + "${FILESDIR}"/${P}-missing-headers.patch +) + +src_compile() { + emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" +} + +src_install() { + dobin src/rtpbreak + einstalldocs + dodoc -r doc +} diff --git a/net-analyzer/sancp/Manifest b/net-analyzer/sancp/Manifest index 5334b6da520f..82188b274820 100644 --- a/net-analyzer/sancp/Manifest +++ b/net-analyzer/sancp/Manifest @@ -1,3 +1,4 @@ +DIST sancp-1.6.1-musl.patch.bz2 7013 BLAKE2B a54c3a3c45b1029a95451a21de2b42497434dff6715cb173db5f04293740f3e03869900e23c571dae97a563a9b7fdce76c4295f3267857a77a074a65e79f3b53 SHA512 3310577acef1d16b87b51924ed6fbb82b491afc5646555667fcd2430aef1b0dd5f0ee510c6356eebd32402b79eb8e9f5032955b5194517acc0c055da8dd74fc2 DIST sancp-1.6.1.fix200511.a.patch 662 BLAKE2B d3d5114662f3904db4052d581b3a95f07f5a492b439958bd64149ca6f9aaf48f2d2d9cf2094500b9ab829b3a06358180893637ed6d3f502ef46f87dfe8527ccc SHA512 87662d9ea863a3a2468b7b64c81a191d34c81348eab9374245a73d3ed63cf2f25df54561f092f3713d516d9cc4eb553d4d7286fd920676a301e61669a023142e DIST sancp-1.6.1.fix200511.b.patch 870 BLAKE2B 18ad38c37f11aa1c4804400db5475323db25e0c135d3478e9c81af3a0a3885f397521fdf9b58825216fdd16ec2e2616584f3dc9e175e76d64c7125a767b2c029 SHA512 a54bbec1ce3799f83c006f7375297bafee85b12a90361f1f5dbbf46c936193c7e0f1196483a2bdf560019e93ceffe9129b3c01322eedc397e5dfa3a1a6b76b81 DIST sancp-1.6.1.fix200601.c.patch 3578 BLAKE2B 7c7e5ef0e1967d41f731d3c79f4273a4ebfc922159ada1940ba4635f6f82e63ed55faeffe53636d2c8fd96d57e1516211fff8852c73876d019fc13d59f4ace9d SHA512 3d15028d33e7dbddc74d8c6eefac6d66e357f024dca15afdfb8156b0cf969ab093c26baa43ebf7c1ac88f4275ef4bdc91c1cc69c5aa7b439a042ed966edea30f diff --git a/net-analyzer/sancp/metadata.xml b/net-analyzer/sancp/metadata.xml index 3f2ab8cd615e..a0b410674454 100644 --- a/net-analyzer/sancp/metadata.xml +++ b/net-analyzer/sancp/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>netmon@gentoo.org</email> diff --git a/net-analyzer/sancp/sancp-1.6.1-r6.ebuild b/net-analyzer/sancp/sancp-1.6.1-r6.ebuild deleted file mode 100644 index be00f2204c5c..000000000000 --- a/net-analyzer/sancp/sancp-1.6.1-r6.ebuild +++ /dev/null @@ -1,73 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit toolchain-funcs - -DESCRIPTION="collect network traffic statistics and store them in pcap format" -HOMEPAGE="https://sourceforge.net/projects/sancp/" -SRC_URI=" - http://www.metre.net/files/${P}.tar.gz - http://sancp.sourceforge.net/${PN}-1.6.1.fix200511.a.patch - http://sancp.sourceforge.net/${PN}-1.6.1.fix200511.b.patch - http://sancp.sourceforge.net/${PN}-1.6.1.fix200601.c.patch - http://sancp.sourceforge.net/${PN}-1.6.1.fix200606.d.patch -" - -LICENSE="QPL GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="sguil" - -RDEPEND=" - acct-group/sancp - acct-user/sancp - net-libs/libpcap" -DEPEND="${RDEPEND}" - -PATCHES=( - "${FILESDIR}"/${PN}-1.6.1-compiler.patch - "${FILESDIR}"/${PN}-1.6.1-gcc6.patch - "${FILESDIR}"/${PN}-1.6.1-extern.patch -) - -src_prepare() { - eapply "${DISTDIR}"/${PN}-1.6.1.fix200511.a.patch - eapply "${DISTDIR}"/${PN}-1.6.1.fix200511.b.patch - # bug 138337 - eapply "${DISTDIR}"/${PN}-1.6.1.fix200601.c.patch - eapply "${DISTDIR}"/${PN}-1.6.1.fix200606.d.patch - default -} - -src_compile() { - tc-export CC CXX - emake CFLAGS="${CXXFLAGS}" -} - -src_install() { - keepdir /var/log/sancp/ - dodoc docs/CHANGES docs/fields.LIST docs/README docs/SETUP \ - "${FILESDIR}"/sguil_sancp.conf etc/sancp/sancp.conf - - insinto /etc/sancp - if use sguil ; then - newins "${FILESDIR}"/sguil_sancp.conf sancp.conf - else - doins etc/sancp/sancp.conf - fi - - dobin sancp - - newinitd "${FILESDIR}"/sancp.rc1 sancp - newconfd "${FILESDIR}"/sancp.confd sancp - if use sguil ; then - sed -i -e /^SANCP_OPTS/s:'sancp':"sguil":g \ - -e s:'-d $LOGDIR/today':"-d /var/lib/sguil/$(hostname)/sancp": \ - "${D}/etc/conf.d/sancp" - fi - - fowners sancp:sancp /var/log/sancp - fperms 0770 /var/log/sancp -} diff --git a/net-analyzer/sancp/sancp-1.6.1-r7.ebuild b/net-analyzer/sancp/sancp-1.6.1-r7.ebuild new file mode 100644 index 000000000000..f3ea7b0a3461 --- /dev/null +++ b/net-analyzer/sancp/sancp-1.6.1-r7.ebuild @@ -0,0 +1,69 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit toolchain-funcs + +DESCRIPTION="collect network traffic statistics and store them in pcap format" +HOMEPAGE="https://sourceforge.net/projects/sancp/" +SRC_URI="http://www.metre.net/files/${P}.tar.gz + http://sancp.sourceforge.net/${PN}-1.6.1.fix200511.a.patch + http://sancp.sourceforge.net/${PN}-1.6.1.fix200511.b.patch + http://sancp.sourceforge.net/${PN}-1.6.1.fix200601.c.patch + http://sancp.sourceforge.net/${PN}-1.6.1.fix200606.d.patch + https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-1.6.1-musl.patch.bz2" + +LICENSE="QPL-1.0 GPL-2" # GPL-2 for init script +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="sguil" + +RDEPEND=" + acct-group/sancp + acct-user/sancp + net-libs/libpcap" +DEPEND="${RDEPEND}" + +PATCHES=( + "${DISTDIR}"/${PN}-1.6.1.fix200511.a.patch + "${DISTDIR}"/${PN}-1.6.1.fix200511.b.patch + # bug 138337 + "${DISTDIR}"/${PN}-1.6.1.fix200601.c.patch + "${DISTDIR}"/${PN}-1.6.1.fix200606.d.patch + "${FILESDIR}"/${PN}-1.6.1-compiler.patch + "${FILESDIR}"/${PN}-1.6.1-gcc6.patch + "${FILESDIR}"/${PN}-1.6.1-extern.patch + "${WORKDIR}"/${PN}-1.6.1-musl.patch +) + +src_compile() { + tc-export CC CXX + emake CFLAGS="${CXXFLAGS}" +} + +src_install() { + keepdir /var/log/sancp/ + dodoc docs/CHANGES docs/fields.LIST docs/README docs/SETUP \ + "${FILESDIR}"/sguil_sancp.conf etc/sancp/sancp.conf + + insinto /etc/sancp + if use sguil ; then + newins "${FILESDIR}"/sguil_sancp.conf sancp.conf + else + doins etc/sancp/sancp.conf + fi + + dobin sancp + + newinitd "${FILESDIR}"/sancp.rc1 sancp + newconfd "${FILESDIR}"/sancp.confd sancp + if use sguil ; then + sed -i -e /^SANCP_OPTS/s:'sancp':"sguil":g \ + -e s:'-d $LOGDIR/today':"-d /var/lib/sguil/$(hostname)/sancp": \ + "${D}/etc/conf.d/sancp" + fi + + fowners sancp:sancp /var/log/sancp + fperms 0770 /var/log/sancp +} diff --git a/net-analyzer/sarg/metadata.xml b/net-analyzer/sarg/metadata.xml index 774ea9db6563..3f683ef50e06 100644 --- a/net-analyzer/sarg/metadata.xml +++ b/net-analyzer/sarg/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>netmon@gentoo.org</email> diff --git a/net-analyzer/sarg/sarg-2.4.0-r1.ebuild b/net-analyzer/sarg/sarg-2.4.0-r1.ebuild new file mode 100644 index 000000000000..083cbcb27245 --- /dev/null +++ b/net-analyzer/sarg/sarg-2.4.0-r1.ebuild @@ -0,0 +1,60 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=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" + +LICENSE="GPL-2" +KEYWORDS="amd64 ppc x86" +SLOT="0" +IUSE="bzip2 doublecheck +gd +glob ldap lzma pcre zlib" + +RDEPEND=" + bzip2? ( app-arch/bzip2 ) + gd? ( media-libs/gd[png,truetype] ) + ldap? ( net-nds/openldap:= ) + lzma? ( app-arch/xz-utils ) + pcre? ( dev-libs/libpcre ) + zlib? ( sys-libs/zlib ) +" +DEPEND=" + ${RDEPEND} +" +DOCS=( BETA-TESTERS CONTRIBUTORS DONATIONS README ChangeLog htaccess ) +PATCHES=( + "${FILESDIR}"/${PN}-2.4.0-config.patch + "${FILESDIR}"/${PN}-2.4.0-configure.patch + "${FILESDIR}"/${PN}-2.4.0-fabs.patch + "${FILESDIR}"/${PN}-2.4.0-format.patch +) +S=${WORKDIR}/${P/_/-} + +src_prepare() { + default + + eautoreconf +} + +src_configure() { + append-cflags -fcommon + econf \ + $(use_enable doublecheck) \ + $(use_with bzip2 bzlib) \ + $(use_with gd) \ + $(use_with glob) \ + $(use_with ldap) \ + $(use_with lzma liblzma) \ + $(use_with pcre) \ + $(use_with zlib) \ + --sysconfdir="${EPREFIX}/etc/sarg/" +} + +src_install() { + default + + dodoc documentation/* +} diff --git a/net-analyzer/sarg/sarg-2.4.0.ebuild b/net-analyzer/sarg/sarg-2.4.0.ebuild deleted file mode 100644 index c2da09b5fa35..000000000000 --- a/net-analyzer/sarg/sarg-2.4.0.ebuild +++ /dev/null @@ -1,60 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=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" - -LICENSE="GPL-2" -KEYWORDS="amd64 ppc x86" -SLOT="0" -IUSE="bzip2 doublecheck +gd +glob ldap lzma pcre zlib" - -RDEPEND=" - bzip2? ( app-arch/bzip2 ) - gd? ( media-libs/gd[png,truetype] ) - ldap? ( net-nds/openldap ) - lzma? ( app-arch/xz-utils ) - pcre? ( dev-libs/libpcre ) - zlib? ( sys-libs/zlib ) -" -DEPEND=" - ${RDEPEND} -" -DOCS=( BETA-TESTERS CONTRIBUTORS DONATIONS README ChangeLog htaccess ) -PATCHES=( - "${FILESDIR}"/${PN}-2.4.0-config.patch - "${FILESDIR}"/${PN}-2.4.0-configure.patch - "${FILESDIR}"/${PN}-2.4.0-fabs.patch - "${FILESDIR}"/${PN}-2.4.0-format.patch -) -S=${WORKDIR}/${P/_/-} - -src_prepare() { - default - - eautoreconf -} - -src_configure() { - append-cflags -fcommon - econf \ - $(use_enable doublecheck) \ - $(use_with bzip2 bzlib) \ - $(use_with gd) \ - $(use_with glob) \ - $(use_with ldap) \ - $(use_with lzma liblzma) \ - $(use_with pcre) \ - $(use_with zlib) \ - --sysconfdir="${EPREFIX}/etc/sarg/" -} - -src_install() { - default - - dodoc documentation/* -} diff --git a/net-analyzer/sbd/metadata.xml b/net-analyzer/sbd/metadata.xml index 38408b55071e..35230ab450dd 100644 --- a/net-analyzer/sbd/metadata.xml +++ b/net-analyzer/sbd/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>netmon@gentoo.org</email> diff --git a/net-analyzer/sbd/sbd-1.37-r1.ebuild b/net-analyzer/sbd/sbd-1.37-r1.ebuild index 514310c7e942..6b87335cd5a6 100644 --- a/net-analyzer/sbd/sbd-1.37-r1.ebuild +++ b/net-analyzer/sbd/sbd-1.37-r1.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 inherit toolchain-funcs @@ -9,11 +9,12 @@ DESCRIPTION="Netcat-clone, designed to be portable and offer strong encryption" HOMEPAGE="http://tigerteam.se/dl/sbd/" SRC_URI="http://tigerteam.se/dl/sbd/${P}.tar.gz" -LICENSE="GPL-2" +LICENSE="GPL-2+" SLOT="0" -KEYWORDS="amd64 ~hppa ~ppc x86" +KEYWORDS="~amd64 ~hppa ~ppc ~x86" src_prepare() { + default sed -i \ -e '/ -o /{ s| $(UNIX_LDFLAGS) $(LDFLAGS)||g;s|$(CFLAGS)|& $(LDFLAGS)|g }' \ Makefile || die diff --git a/net-analyzer/scanlogd/Manifest b/net-analyzer/scanlogd/Manifest index a9a4cbfaab64..132bd95b882c 100644 --- a/net-analyzer/scanlogd/Manifest +++ b/net-analyzer/scanlogd/Manifest @@ -1 +1 @@ -DIST scanlogd-2.2.7.tar.gz 11352 BLAKE2B 480e1ef78ac35ff04fb44961aa501f997786e20a3501f54f74b9e5761edba4736341d364a9a10772d795cb6025b88399bf3b56b0a980a0d2d0787f7a66eeeb22 SHA512 56238cb91a33524a9512914568984ed0d066eb84bea1c08551fbc4e02c9643a3f9535d59b364db00d538e4d9bcd9650ac24f2042584d3a9c639f99eb77ba1a7b +DIST scanlogd-2.2.8.tar.gz 12190 BLAKE2B 26396c3174de3d3cceed9833354cae7d7bbcf3078a81472ae1fa28856f011e6984fa8182a994d5a10632c19f15f86e31f1ee73309273cad04e05fec942afa0a4 SHA512 92f7a28dd40593dad6afae4fd0572efeceea3f43f334ff82c349538d4a28e9ab624912f82fc5c102a4a9937009bbf7b76a81029588e2815ff9b305144143572a diff --git a/net-analyzer/scanlogd/metadata.xml b/net-analyzer/scanlogd/metadata.xml index 23b1ab5a12ae..9898ab6d729c 100644 --- a/net-analyzer/scanlogd/metadata.xml +++ b/net-analyzer/scanlogd/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>netmon@gentoo.org</email> diff --git a/net-analyzer/scanlogd/scanlogd-2.2.7.ebuild b/net-analyzer/scanlogd/scanlogd-2.2.7.ebuild deleted file mode 100644 index b7c18a9d4cd0..000000000000 --- a/net-analyzer/scanlogd/scanlogd-2.2.7.ebuild +++ /dev/null @@ -1,46 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit eutils savedconfig toolchain-funcs user - -DESCRIPTION="a port scan detection tool" -SRC_URI="http://www.openwall.com/scanlogd/${P}.tar.gz" -HOMEPAGE="http://www.openwall.com/scanlogd/" - -LICENSE="scanlogd GPL-2" # GPL-2 for initscript -SLOT="0" -KEYWORDS="~amd64 ppc x86" -IUSE="+nids pcap" -REQUIRED_USE="?? ( nids pcap )" - -DEPEND=" - nids? ( net-libs/libnids ) - pcap? ( net-libs/libpcap ) -" -RDEPEND="${DEPEND}" - -src_prepare() { - epatch "${FILESDIR}"/${P}-gentoo.patch - restore_config params.h - tc-export CC -} - -src_compile() { - local target=linux - use nids && target=libnids - use pcap && target=libpcap - emake ${target} -} - -src_install() { - dosbin scanlogd - doman scanlogd.8 - newinitd "${FILESDIR}"/scanlogd.rc scanlogd - save_config params.h -} - -pkg_preinst() { - enewgroup scanlogd - enewuser scanlogd -1 -1 /dev/null scanlogd -} diff --git a/net-analyzer/scanlogd/scanlogd-2.2.8-r1.ebuild b/net-analyzer/scanlogd/scanlogd-2.2.8-r1.ebuild new file mode 100644 index 000000000000..c4c0611a002a --- /dev/null +++ b/net-analyzer/scanlogd/scanlogd-2.2.8-r1.ebuild @@ -0,0 +1,55 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit savedconfig toolchain-funcs + +DESCRIPTION="A port scan detection tool" +SRC_URI="https://www.openwall.com/scanlogd/${P}.tar.gz" +HOMEPAGE="https://www.openwall.com/scanlogd/" + +LICENSE="scanlogd GPL-2" # GPL-2 for initscript +SLOT="0" +KEYWORDS="~amd64 ~ppc x86" +IUSE="+nids pcap" +REQUIRED_USE="?? ( nids pcap )" + +DEPEND=" + nids? ( net-libs/libnids ) + pcap? ( net-libs/libpcap ) +" +RDEPEND=" + ${DEPEND} + acct-group/scanlogd + acct-user/scanlogd +" + +PATCHES=( + "${FILESDIR}"/${PN}-2.2.7-gentoo.patch +) + +src_prepare() { + default + + restore_config params.h + + tc-export CC +} + +src_compile() { + local target=linux + + use nids && target=libnids + use pcap && target=libpcap + emake ${target} +} + +src_install() { + dosbin scanlogd + + doman scanlogd.8 + newinitd "${FILESDIR}"/scanlogd.rc scanlogd + + save_config params.h +} diff --git a/net-analyzer/scanssh/metadata.xml b/net-analyzer/scanssh/metadata.xml index afd56fd6df8d..0bfdf7f5bb7f 100644 --- a/net-analyzer/scanssh/metadata.xml +++ b/net-analyzer/scanssh/metadata.xml @@ -1,9 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!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> +<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.2.ebuild b/net-analyzer/scanssh/scanssh-2.1.2.ebuild index 54e673333041..02520623012d 100644 --- a/net-analyzer/scanssh/scanssh-2.1.2.ebuild +++ b/net-analyzer/scanssh/scanssh-2.1.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -10,7 +10,7 @@ SRC_URI="https://github.com/ofalk/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" LICENSE="BSD" SLOT="0" -KEYWORDS="amd64 ~hppa ppc ~ppc64 sparc x86" +KEYWORDS="amd64 ~hppa ppc ~ppc64 ~riscv sparc x86" DEPEND=" dev-libs/libdnet diff --git a/net-analyzer/scapy/Manifest b/net-analyzer/scapy/Manifest index 60e58090c7cc..db24ef0d9d37 100644 --- a/net-analyzer/scapy/Manifest +++ b/net-analyzer/scapy/Manifest @@ -1 +1 @@ -DIST scapy-2.4.4.tar.gz 3240890 BLAKE2B 38b4fc0c34f229bb33f4d488ae9ba20905db572e3dd3caa15a92e8a33ba7305ba86a2b32a2664779c5085e53d44b4c55336d7afa8d65b90ffa3babcdc94bff25 SHA512 b8ad138ae2563967af07d123339ac73468fadb8f7687123aed364ad6d45198e9039314e17a155c37d01ef084e25571c587330dfd21777527110342c01821a389 +DIST scapy-2.5.0.tar.gz 6082895 BLAKE2B 2673de913d46532760dce93914916b909a4706d846e1e699c16f35b738cac8a073e23b194f9ed4647ade41170a04849ebd33ab3d0ba5b7f09fea8fa527e14c5d SHA512 4e5cacff0bbf6fd991ea24f4680049d042082fae4b349c8082078e6f01b38c09bb5c8276bfba15d4a88a1eb5af92c505848ec98556b10eecbd803f134a5b244a diff --git a/net-analyzer/scapy/files/scapy-2.5.0-no-install-tests.patch b/net-analyzer/scapy/files/scapy-2.5.0-no-install-tests.patch new file mode 100644 index 000000000000..be6d8fbd638a --- /dev/null +++ b/net-analyzer/scapy/files/scapy-2.5.0-no-install-tests.patch @@ -0,0 +1,11 @@ +--- a/setup.py ++++ b/setup.py +@@ -33,7 +33,7 @@ def get_long_description(): + setup( + name='scapy', + version=__import__('scapy').VERSION, +- packages=find_packages(), ++ packages=find_packages(exclude=["test", "test.*"]), + data_files=[('share/man/man1', ["doc/scapy.1"])], + package_data={ + 'scapy': ['VERSION'], diff --git a/net-analyzer/scapy/metadata.xml b/net-analyzer/scapy/metadata.xml index b3243d196ed5..13a3ea6fdea1 100644 --- a/net-analyzer/scapy/metadata.xml +++ b/net-analyzer/scapy/metadata.xml @@ -1,11 +1,7 @@ -<?xml version='1.0' encoding='UTF-8'?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> - <email>ikelos@gentoo.org</email> - <name>Mike Auty</name> - </maintainer> - <maintainer type="person"> <email>sam@gentoo.org</email> <name>Sam James</name> </maintainer> @@ -13,7 +9,7 @@ <email>netmon@gentoo.org</email> <name>Gentoo network monitoring and analysis project</name> </maintainer> - <stabilize-allarches/> + <!-- no ALLARCHES: uses ctypes --> <upstream> <remote-id type="github">secdev/scapy</remote-id> </upstream> diff --git a/net-analyzer/scapy/scapy-2.4.4.ebuild b/net-analyzer/scapy/scapy-2.4.4.ebuild deleted file mode 100644 index 8e4a5ba64ef0..000000000000 --- a/net-analyzer/scapy/scapy-2.4.4.ebuild +++ /dev/null @@ -1,46 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -PYTHON_COMPAT=( python3_{6,7,8,9} ) -DISTUTILS_USE_SETUPTOOLS=rdepend -inherit distutils-r1 readme.gentoo-r1 - -DESCRIPTION="A Python interactive packet manipulation program for mastering the network" -HOMEPAGE="https://scapy.net/ https://github.com/secdev/scapy" -SRC_URI="https://github.com/secdev/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ~arm ~arm64 x86" -DOC_CONTENTS=" -Scapy has optional support for the following packages: - - dev-python/cryptography - dev-python/ipython - dev-python/matplotlib - dev-python/pyx - media-gfx/graphviz - net-analyzer/tcpdump - net-analyzer/tcpreplay - net-libs/libpcap - virtual/imagemagick-tools - - See also ""${EPREFIX}/usr/share/doc/${PF}/installation.rst"" -" - -src_prepare() { - if ! [[ -f ${PN}/VERSION ]]; then - echo ${PV} > ${PN}/VERSION || die - else - die - fi - - distutils-r1_src_prepare -} - -src_install() { - distutils-r1_src_install - dodoc -r doc/${PN}/* - DISABLE_AUTOFORMATTING=plz readme.gentoo_create_doc -} diff --git a/net-analyzer/scapy/scapy-2.5.0.ebuild b/net-analyzer/scapy/scapy-2.5.0.ebuild new file mode 100644 index 000000000000..34e252955a74 --- /dev/null +++ b/net-analyzer/scapy/scapy-2.5.0.ebuild @@ -0,0 +1,83 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +# See https://github.com/secdev/scapy/pull/3958#discussion_r1161302244 on next +# bump (>2.5.0)! + +PYTHON_COMPAT=( python3_{10..12} ) +inherit distutils-r1 readme.gentoo-r1 + +DESCRIPTION="A Python interactive packet manipulation program for mastering the network" +HOMEPAGE="https://scapy.net/ https://github.com/secdev/scapy" +SRC_URI="https://github.com/secdev/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64 ~arm ~arm64 x86" +IUSE="test" +RESTRICT="!test? ( test )" + +BDEPEND=" + test? ( + dev-python/mock[${PYTHON_USEDEP}] + dev-python/zstandard[${PYTHON_USEDEP}] + ) +" + +DOC_CONTENTS=" +Scapy has optional support for the following packages: + + dev-python/cryptography + dev-python/ipython + dev-python/matplotlib + dev-python/pyx + media-gfx/graphviz + net-analyzer/tcpdump + net-analyzer/tcpreplay + net-libs/libpcap + virtual/imagemagick-tools + + See also ""${EPREFIX}/usr/share/doc/${PF}/installation.rst"" +" + +PATCHES=( + "${FILESDIR}"/${PN}-2.5.0-no-install-tests.patch +) + +src_prepare() { + if ! [[ -f ${PN}/VERSION ]]; then + echo ${PV} > ${PN}/VERSION || die + else + die + fi + + # Drop tests which need network + rm \ + test/nmap.uts \ + test/p0f.uts \ + test/p0fv2.uts \ + test/regression.uts \ + test/scapy/layers/inet6.uts || die + # Timed out + rm test/tftp.uts || die + # Needs ipython + rm test/scapy/layers/dhcp.uts || die + # Import failure? + rm test/contrib/isotp_native_socket.uts test/contrib/isotpscan.uts || die + + distutils-r1_src_prepare +} + +python_test() { + # https://github.com/secdev/scapy/blob/master/tox.ini + "${EPYTHON}" -m scapy.tools.UTscapy -c ./test/configs/linux.utsc -N || die +} + +src_install() { + distutils-r1_src_install + + dodoc -r doc/${PN}/* + DISABLE_AUTOFORMATTING=1 readme.gentoo_create_doc +} diff --git a/net-analyzer/scapy/scapy-9999.ebuild b/net-analyzer/scapy/scapy-9999.ebuild deleted file mode 100644 index 3b658780d774..000000000000 --- a/net-analyzer/scapy/scapy-9999.ebuild +++ /dev/null @@ -1,43 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -PYTHON_COMPAT=( python3_{6,7,8,9} ) -DISTUTILS_USE_SETUPTOOLS=rdepend -inherit distutils-r1 git-r3 readme.gentoo-r1 - -DESCRIPTION="A Python interactive packet manipulation program for mastering the network" -HOMEPAGE="https://scapy.net/ https://github.com/secdev/scapy" -EGIT_REPO_URI="https://github.com/secdev/${PN}" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="" -S=${WORKDIR}/${P/_/} -DOC_CONTENTS=" -Scapy has optional support for the following packages: - - dev-python/cryptography - dev-python/ipython - dev-python/matplotlib - dev-python/pyx - media-gfx/graphviz - net-analyzer/tcpdump - net-analyzer/tcpreplay - net-libs/libpcap - virtual/imagemagick-tools - - See also ""${EPREFIX}/usr/share/doc/${PF}/installation.rst"" -" - -src_prepare() { - echo ${PV/_/} > ${PN}/VERSION || die - - distutils-r1_src_prepare -} - -src_install() { - distutils-r1_src_install - dodoc -r doc/${PN}/* - DISABLE_AUTOFORMATTING=plz readme.gentoo_create_doc -} diff --git a/net-analyzer/scli/Manifest b/net-analyzer/scli/Manifest deleted file mode 100644 index e4f019d7f606..000000000000 --- a/net-analyzer/scli/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST scli-0.4.0.tar.gz 953401 BLAKE2B b6f3ccd1dbc69df882e3dbd73f8a686af76e370a5785cb475b9122a200cc9a01ae364d50fd391499cd88856ebb1e1a1869c8545b36eaecf73b45d46d47282b9b SHA512 ceb81e51049def64cb6f2428263709802380f7f712575e327a71d8cc120d284a7d9c57679d76e22cfcaf5b160d0d46af0cefa1133c56972b43002cb94f120dcc diff --git a/net-analyzer/scli/files/scli-0.4.0-configure.patch b/net-analyzer/scli/files/scli-0.4.0-configure.patch deleted file mode 100644 index d942da0adcc5..000000000000 --- a/net-analyzer/scli/files/scli-0.4.0-configure.patch +++ /dev/null @@ -1,44 +0,0 @@ ---- a/configure.in -+++ b/configure.in -@@ -20,6 +20,8 @@ - AC_CHECK_PROG(SMIDUMP, smidump, smidump) - AC_SUBST(SMIDUMP) - -+PKG_PROG_PKG_CONFIG -+ - AC_DEFINE_UNQUOTED(SCLI_PLUGIN_PATH, "${pkglibdir}") - - AC_MSG_CHECKING([whether to enable -Wall]) -@@ -33,19 +35,24 @@ - - dnl Checks for libraries. - --AM_PATH_GLIB_2_0(2.0.0, [], AC_MSG_ERROR(scli needs GLIB), gmodule) --AM_PATH_GNET_2_0(2.0.0, [], AC_MSG_ERROR(scli needs GNET)) -+PKG_CHECK_MODULES(GLIB, glib-2.0 gmodule-2.0 gthread-2.0,[ -+ LIBS="$LIBS $GLIB_LIBS" -+ CPPFLAGS="$CPPFLAGS $GLIB_CFLAGS" -+ ], AC_MSG_ERROR(scli needs GLIB)) -+PKG_CHECK_MODULES(GNET, gnet-2.0 >= 2.0.0,[ -+ LIBS="$LIBS $GNET_LIBS" -+ CPPFLAGS="$CPPFLAGS $GNET_CFLAGS" -+ ], AC_MSG_ERROR(scli needs GNET)) - dnl AM_PATH_GLIB(1.2.0, [], AC_MSG_ERROR(scli needs GLIB), gmodule) - dnl AM_PATH_GTK(1.2.0, [], AC_MSG_ERROR(scli needs GTK)) --AM_PATH_XML2(2.0.0, [], AC_MSG_ERROR(scli needs libxml2)) -+PKG_CHECK_MODULES(XML2, libxml-2.0 >= 2.0.0,[ -+ LIBS="$LIBS $XML2_LIBS" -+ CPPFLAGS="$CPPFLAGS $XML2_CFLAGS" -+ ], AC_MSG_ERROR(scli needs libxml2)) - PKG_CHECK_MODULES(GSNMP, gsnmp, have_gsnmp=true, have_gsnmp=false) - AC_SUBST(GSNMP_CFLAGS) - AC_SUBST(GSNMP_LIBS) --AC_CHECK_LIB(ncurses, initscr, [], -- AC_CHECK_LIB(curses, initscr, [], -- AC_MSG_ERROR([scli requires curses functions; install curses first]) -- ) --) -+PKG_CHECK_MODULES(ncurses,ncurses,LIBS="$LIBS $ncurses_LIBS",AC_MSG_ERROR([ncurses is required])) - AC_CHECK_LIB(readline, readline, [], - AC_MSG_ERROR([scli requires readline functions; install libreadline first]) - ) diff --git a/net-analyzer/scli/metadata.xml b/net-analyzer/scli/metadata.xml deleted file mode 100644 index 2c2a7923cfc8..000000000000 --- a/net-analyzer/scli/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://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/scli/scli-0.4.0-r1.ebuild b/net-analyzer/scli/scli-0.4.0-r1.ebuild deleted file mode 100644 index 200f73836851..000000000000 --- a/net-analyzer/scli/scli-0.4.0-r1.ebuild +++ /dev/null @@ -1,35 +0,0 @@ -# Copyright 1999-2018 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit autotools eutils - -DESCRIPTION="SNMP Command Line Interface" -HOMEPAGE="https://github.com/schoenw/scli" -SRC_URI="ftp://ftp.ibr.cs.tu-bs.de/pub/local/${PN}/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 x86 ~amd64-linux" - -RDEPEND=" - dev-libs/glib:2 - dev-libs/libxml2 - net-libs/gnet - net-libs/gsnmp - sys-libs/ncurses - sys-libs/readline - sys-libs/zlib -" -DEPEND=" - ${RDEPEND} - virtual/pkgconfig -" - -DOCS=( AUTHORS ChangeLog NEWS PORTING README TODO ) - -src_prepare() { - epatch "${FILESDIR}"/${P}-configure.patch - - eautoreconf -} diff --git a/net-analyzer/sec/Manifest b/net-analyzer/sec/Manifest index 445d76d447c0..8f748aa1a964 100644 --- a/net-analyzer/sec/Manifest +++ b/net-analyzer/sec/Manifest @@ -1 +1,2 @@ -DIST sec-2.8.3.tar.gz 144950 BLAKE2B 03e6f3077628a1e4221149875878642574ab00d87a0e601144b4c2f35f1d54cb937053a22d30ee7c5f13c4079e845dcccdf743a71a5afd75d2c46a34e4dadcf6 SHA512 9eba7db0dfa3661a3ef4e8aad3eeef1db710784f7a71131991a06918cc4f5634577b8bff3f00fcc1c5d998bf0c1e80efe88e1c1df3f5530b6ab4905ff00f2269 +DIST sec-2.9.1.tar.gz 153305 BLAKE2B 0bbc70f786badb24153f4f124aaedbf6f34970556630ee3e8763e7854dc1765d0eb8f7d10efce119ca936eade2af8064188f3372e63f7977240a0b10327269a3 SHA512 c6764cf660ad969d260e4993c38809580e448a9d941d1a763c1b70630c5d55a7f215feb6b0fa50cbf23d68fb442e34f0d270d03e1172850d63d64042a689ac90 +DIST sec-2.9.2.tar.gz 153482 BLAKE2B d2f099b034b2ab59b4abdea0d824fc63e2d340d56b4f43324e2e477e0f33b433b5f54e4172c873e1579b544504a2a5f1ba20a3c8468eab43e4587c9efc54446b SHA512 441c543f9abcfff46c5cd86c9be8fd5c57fef988519f2c9f431b715717e0500ce1b89365e16c0d3b6e76369cf5ee5f6d5318b32e4374c614ec0083833021f17c diff --git a/net-analyzer/sec/metadata.xml b/net-analyzer/sec/metadata.xml index 2d02138ee2cb..99534773d99e 100644 --- a/net-analyzer/sec/metadata.xml +++ b/net-analyzer/sec/metadata.xml @@ -1,5 +1,5 @@ -<?xml version='1.0' encoding='UTF-8'?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<?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> diff --git a/net-analyzer/sec/sec-2.8.3.ebuild b/net-analyzer/sec/sec-2.8.3.ebuild deleted file mode 100644 index bceadcf96795..000000000000 --- a/net-analyzer/sec/sec-2.8.3.ebuild +++ /dev/null @@ -1,27 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DESCRIPTION="Simple Event Correlator" -HOMEPAGE="https://github.com/simple-evcorr/sec" -SRC_URI="https://github.com/simple-evcorr/sec/releases/download/${PV}/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ~ppc x86 ~amd64-linux" - -RDEPEND=">=dev-lang/perl-5.8.0" - -src_install() { - dobin sec - - dodoc ChangeLog README - docinto contrib - dodoc contrib/{itostream.c,convert.pl,swatch2sec.pl} - - newman sec.man sec.1 - - newinitd "${FILESDIR}"/sec.init.d sec - newconfd "${FILESDIR}"/sec.conf.d sec -} diff --git a/net-analyzer/sec/sec-2.9.1.ebuild b/net-analyzer/sec/sec-2.9.1.ebuild new file mode 100644 index 000000000000..3236d9d01b2f --- /dev/null +++ b/net-analyzer/sec/sec-2.9.1.ebuild @@ -0,0 +1,28 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DESCRIPTION="Simple Event Correlator" +HOMEPAGE="https://simple-evcorr.github.io/ https://github.com/simple-evcorr/sec" +SRC_URI="https://github.com/simple-evcorr/sec/releases/download/${PV}/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64 ~ppc x86 ~amd64-linux" + +RDEPEND=">=dev-lang/perl-5.8.0 + virtual/perl-JSON-PP" + +src_install() { + dobin sec + + dodoc ChangeLog README + docinto contrib + dodoc contrib/{itostream.c,convert.pl,swatch2sec.pl} + + newman sec.man sec.1 + + newinitd "${FILESDIR}"/sec.init.d sec + newconfd "${FILESDIR}"/sec.conf.d sec +} diff --git a/net-analyzer/sec/sec-2.9.2.ebuild b/net-analyzer/sec/sec-2.9.2.ebuild new file mode 100644 index 000000000000..58956cadc373 --- /dev/null +++ b/net-analyzer/sec/sec-2.9.2.ebuild @@ -0,0 +1,30 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DESCRIPTION="Simple Event Correlator" +HOMEPAGE="https://simple-evcorr.github.io/ https://github.com/simple-evcorr/sec" +SRC_URI="https://github.com/simple-evcorr/sec/releases/download/${PV}/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64 ~ppc x86 ~amd64-linux" + +RDEPEND=" + >=dev-lang/perl-5.8.0 + virtual/perl-JSON-PP +" + +src_install() { + dobin sec + + dodoc ChangeLog README + docinto contrib + dodoc contrib/{itostream.c,convert.pl,swatch2sec.pl} + + newman sec.man sec.1 + + newinitd "${FILESDIR}"/sec.init.d sec + newconfd "${FILESDIR}"/sec.conf.d sec +} diff --git a/net-analyzer/sflowtool/metadata.xml b/net-analyzer/sflowtool/metadata.xml index 66b83a2d79ef..84b04c0dc7f1 100644 --- a/net-analyzer/sflowtool/metadata.xml +++ b/net-analyzer/sflowtool/metadata.xml @@ -1,5 +1,5 @@ -<?xml version='1.0' encoding='UTF-8'?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<?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> diff --git a/net-analyzer/sguil-client/metadata.xml b/net-analyzer/sguil-client/metadata.xml index ca324d618d91..e0c75486e6c0 100644 --- a/net-analyzer/sguil-client/metadata.xml +++ b/net-analyzer/sguil-client/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>netmon@gentoo.org</email> diff --git a/net-analyzer/sguil-client/sguil-client-1.0.0.ebuild b/net-analyzer/sguil-client/sguil-client-1.0.0.ebuild index 992c2a582baa..a0b8868ce81c 100644 --- a/net-analyzer/sguil-client/sguil-client-1.0.0.ebuild +++ b/net-analyzer/sguil-client/sguil-client-1.0.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -8,7 +8,7 @@ DESCRIPTION="GUI Console for sguil Network Security Monitoring" HOMEPAGE="https://github.com/bammv/sguil" SRC_URI="https://github.com/bammv/sguil/archive/v${PV}.tar.gz -> ${P/-client}.tar.gz" -LICENSE="QPL" +LICENSE="GPL-3 GPL-2+ QPL-1.0" SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="ssl" diff --git a/net-analyzer/sguil-sensor/Manifest b/net-analyzer/sguil-sensor/Manifest deleted file mode 100644 index 6a6586972b73..000000000000 --- a/net-analyzer/sguil-sensor/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST sguil-1.0.0.tar.gz 892934 BLAKE2B 69459eed682d91a1b57ba08c141dd655dbbfaa0d9d2956e6a26065f1b6820307b0e0e4dcbcad89537eba7499aea38f81739c351246e3dd6c46cab46bdf0d054f SHA512 fc3007383f90c99a0ace3eeebac75864f9aa549676e784c7bf1d81222282e3a5a3d5290b121097ae3c027dee3dd35bbe8ac9dfede04dbd561edfd3948a0465ab diff --git a/net-analyzer/sguil-sensor/files/log_packets.confd b/net-analyzer/sguil-sensor/files/log_packets.confd deleted file mode 100644 index 93bdc772bff7..000000000000 --- a/net-analyzer/sguil-sensor/files/log_packets.confd +++ /dev/null @@ -1,18 +0,0 @@ -# Config file for /etc/init.d/log_packets -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -# This tell snort which interface to listen on (any for every interface) -IFACE=eth1 - -# Make sure this matches your IFACE -PIDFILE=/run/sguil-log_packets_$IFACE.pid - -# You probably don't want to change this, but in case you do -LOGDIR="/var/lib/sguil" - -# Percentage of disk to try and maintain -MAX_DISK_USE=95 - -# This pulls in the options above -OPTIONS="-m 122 -u sguil -g sguil" diff --git a/net-analyzer/sguil-sensor/files/log_packets.initd b/net-analyzer/sguil-sensor/files/log_packets.initd deleted file mode 100644 index f372c82c905b..000000000000 --- a/net-analyzer/sguil-sensor/files/log_packets.initd +++ /dev/null @@ -1,91 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -extra_commands="cleandisk" - -LOG_DIR="${LOGDIR}/${HOSTNAME}/dailylogs" - -start() { - ebegin "Starting Log_packest" - if [ ! -x /usr/bin/snort ] - then - eerror "No snort - cannot start" - eend 1 - return 1 - fi - - if [ ! -d ${LOG_DIR} ] - then - mkdir -p ${LOG_DIR} - chmod 770 ${LOG_DIR} - fi - - today=$(date '+%Y-%m-%d') - - if [ ! -d "${LOG_DIR}/${today}" ] - then - mkdir "${LOG_DIR}/${today}" - chmod 770 "${LOG_DIR}/${today}" - chown root:sguil "${LOG_DIR}/${today}" - fi - start-stop-daemon --start --quiet -b -m --pidfile "${PIDFILE}" \ - --exec /usr/bin/snort \ - -- ${OPTIONS} -l "${LOG_DIR}/${today}" -b -i "${IFACE}" "${FILTER}" - real_cleandisk - eend $? -} - -stop() { - ebegin "Stopping Sensor Agent" - start-stop-daemon --stop --quiet --pidfile "${PIDFILE}" - eend $? -} - -cleandisk() { - ebegin "Cleaning Disk" - real_cleandisk - eend $? -} - -# This func checks the current space being used by LOG_DIR -# and rm's data as necessary. -real_cleandisk() { - einfo "Checking disk space (limited to ${MAX_DISK_USE}%)..." - # grep, awk, tr...woohoo! - CUR_USE=$(df -P ${LOG_DIR} | grep -v -i filesystem | awk '{print $5}' | tr -d %) - einfo " Current Disk Use: ${CUR_USE}%" - - if [ ${CUR_USE} -gt ${MAX_DISK_USE} ] - then - # If we are here then we passed our disk limit - # First find the oldest DIR - cd "${LOG_DIR}" - # Can't use -t on the ls since the mod time changes each time we - # delete a file. Good thing we use YYYY-MM-DD so we can sort. - OLDEST_DIR=$(ls | sort | head -n 1) - cd "${OLDEST_DIR}" - - OLDEST_FILE=$(ls -t | tail -n 1) - - if [ -f "${OLDEST_FILE}" ] - then - einfo " Removing file: ${OLDEST_DIR}/${OLDEST_FILE}" - rm -f "${OLDEST_FILE}" - else - einfo " Removing empty dir: ${OLDEST_DIR}" - cd .. - rm -rf "${OLDEST_DIR}" - fi - - # Run cleandisk again as rm'ing one file might been enough - # but we wait 5 secs in hopes any open writes are done. - sync - einfo " Waiting 5 secs for disk to sync..." - sleep 5 - real_cleandisk - else - einfo "Done." - fi -} - diff --git a/net-analyzer/sguil-sensor/files/sensor_agent.initd b/net-analyzer/sguil-sensor/files/sensor_agent.initd deleted file mode 100644 index 08b45e511f8c..000000000000 --- a/net-analyzer/sguil-sensor/files/sensor_agent.initd +++ /dev/null @@ -1,29 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -depend() { - need net -} - -checkconfig() { - if [ ! -e /etc/sguil/sensor_agent.conf ] ; then - eerror "You need an /etc/snort/sensor_agent.conf to run the Sensor Agent" - return 1 - fi -} - -start() { - checkconfig || return 1 - ebegin "Starting Sensor Agent" - start-stop-daemon --start -c sguil --quiet --exec /usr/bin/sensor_agent.tcl \ - -- -D -c "/etc/sguil/sensor_agent.conf">/dev/null 2>&1 - eend $? -} - -stop() { - ebegin "Stopping Sensor Agent" - start-stop-daemon --stop --quiet --pidfile /run/sguil-sensor.pid - eend $? -} - diff --git a/net-analyzer/sguil-sensor/metadata.xml b/net-analyzer/sguil-sensor/metadata.xml deleted file mode 100644 index ca324d618d91..000000000000 --- a/net-analyzer/sguil-sensor/metadata.xml +++ /dev/null @@ -1,12 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>netmon@gentoo.org</email> - <name>Gentoo network monitoring and analysis project</name> - </maintainer> - <upstream> - <remote-id type="github">bammv/sguil</remote-id> - <remote-id type="sourceforge">sguil</remote-id> - </upstream> -</pkgmetadata> diff --git a/net-analyzer/sguil-sensor/sguil-sensor-1.0.0.ebuild b/net-analyzer/sguil-sensor/sguil-sensor-1.0.0.ebuild deleted file mode 100644 index f8dd087562e0..000000000000 --- a/net-analyzer/sguil-sensor/sguil-sensor-1.0.0.ebuild +++ /dev/null @@ -1,80 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit user - -MY_PV="${PV/_p/p}" -DESCRIPTION="Sensor part of sguil Network Security Monitoring" -HOMEPAGE="https://github.com/bammv/sguil" -SRC_URI="https://github.com/bammv/sguil/archive/v${PV}.tar.gz -> ${P/-sensor}.tar.gz" - -LICENSE="GPL-2 QPL" -SLOT="0" -KEYWORDS="~x86" -IUSE="" - -RDEPEND=" - >=dev-lang/tcl-8.3:0=[-threads] - >=dev-tcltk/tclx-8.3 - >=net-analyzer/barnyard-0.2.0-r1 - >=net-analyzer/snort-2.4.1-r1 - dev-ml/pcre-ocaml - net-analyzer/sancp -" - -S="${WORKDIR}/sguil-${MY_PV}" - -pkg_setup() { - enewgroup sguil - enewuser sguil -1 -1 /var/lib/sguil sguil -} - -src_prepare() { - default - sed -i \ - -e "s:gateway:${HOSTNAME}:" \ - -e 's:/snort_data:/var/lib/sguil:' \ - -e 's:DAEMON 0:DAEMON 1:' \ - -e 's:DEBUG 1:DEBUG 0:g' \ - sensor/sensor_agent.conf || die - sed -i \ - -e 's:/var/run/sensor_agent.pid:/run/sguil-sensor.pid:' \ - sensor/sensor_agent.tcl || die -} - -src_install() { - dodoc doc/* - - dobin sensor/sensor_agent.tcl - - newinitd "${FILESDIR}/log_packets.initd" log_packets - newinitd "${FILESDIR}/sensor_agent.initd" sensor_agent - newconfd "${FILESDIR}/log_packets.confd" log_packets - insinto /etc/sguil - doins sensor/sensor_agent.conf - - # Create the directory structure - diropts -g sguil -o sguil - keepdir /var/lib/sguil /var/lib/sguil/archive \ - "/var/lib/sguil/${HOSTNAME}" \ - "/var/lib/sguil/${HOSTNAME}/portscans" \ - "/var/lib/sguil/${HOSTNAME}/ssn_logs" \ - "/var/lib/sguil/${HOSTNAME}/dailylogs" \ - "/var/lib/sguil/${HOSTNAME}/sancp" - -} - -pkg_postinst() { - elog - elog "You should check /etc/sguil/sensor_agent.conf and" - elog "/etc/init.d/logpackets and ensure that they are accurate" - elog "for your environment. They should work providing that you" - elog "are running the sensor on the same machine as the server." - elog "This ebuild assumes that you are running a single sensor" - elog "environment, if this is not the case then you must make sure" - elog "to modify /etc/sguil/sensor_agent.conf and change the HOSTNAME variable." - elog "You should crontab the /etc/init.d/log_packets script to restart" - elog "each hour." - elog -} diff --git a/net-analyzer/shodan/Manifest b/net-analyzer/shodan/Manifest new file mode 100644 index 000000000000..bf9c67712bf3 --- /dev/null +++ b/net-analyzer/shodan/Manifest @@ -0,0 +1,3 @@ +DIST shodan-1.30.0.tar.gz 57790 BLAKE2B 1c3c030e84d31dc79ad737b71e63ce6c9218441be04ec94b4144013545e0d7dd79f1e25e51af1811cdd624f2f32b128e5aeb7dbc8d71b21741712733ca4b6d39 SHA512 996555945f4d874cb0fa3c596e6fad9298f7af396c0e94d75b8e9e103d4a2d7dd33ed8af24a218c753117231a0713caa971106f2152bc429d7c8b5c07b00dbc6 +DIST shodan-1.30.1.tar.gz 57908 BLAKE2B 21ef6f4ae2fd6a487e478627f8623dde4e2092fe9dec893e443fc27e94dc3e65a3483317c6819c947f053542414babcfa57ddb82c40f8a83d43bd9e2d9e84d44 SHA512 498d9057271e112940f00dda76a0ecb80a30ea66df84cfecb6e4b77197225714dc1a22d848e6b14a71a48bb4ded5e77a0924bc3915b552acb4ee35f3444cf558 +DIST shodan-1.31.0.tar.gz 57939 BLAKE2B 7d22e8ec9e32669494838ddef76115ce80ba4600ca71e5c7e9e6c91d82bbf2a55e5e754d7fd4018545c9dbba01fd21bd9fd444d4f2090938f09c7b1610b98100 SHA512 fe66fdd4ae1088d165a2acd67f85a54a9fcbed8130ee5e2a5764d318fa0c50fb472fd5a76ce72f84fcfdb4c74c29ae2e14881f86468fb177ddc3191cb95d3b67 diff --git a/net-analyzer/shodan/metadata.xml b/net-analyzer/shodan/metadata.xml new file mode 100644 index 000000000000..506479336f85 --- /dev/null +++ b/net-analyzer/shodan/metadata.xml @@ -0,0 +1,22 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="person" proxied="yes"> + <email>mario.haustein@hrz.tu-chemnitz.de</email> + <name>Mario Haustein</name> + </maintainer> + <maintainer type="project" proxied="proxy"> + <email>proxy-maint@gentoo.org</email> + <name>Proxy Maintainers</name> + </maintainer> + <longdescription> + Shodan is a search engine for Internet-connected devices. Google lets + you search for websites, Shodan lets you search for devices. This + library provides developers easy access to all of the data stored in + Shodan in order to automate tasks and integrate into existing tools. + </longdescription> + <upstream> + <remote-id type="github">achillean/shodan-python</remote-id> + <remote-id type="pypi">shodan</remote-id> + </upstream> +</pkgmetadata> diff --git a/net-analyzer/shodan/shodan-1.30.0.ebuild b/net-analyzer/shodan/shodan-1.30.0.ebuild new file mode 100644 index 000000000000..e934d6ec63e7 --- /dev/null +++ b/net-analyzer/shodan/shodan-1.30.0.ebuild @@ -0,0 +1,36 @@ +# Copyright 2022-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISTUTILS_USE_PEP517=setuptools +PYTHON_COMPAT=( python3_{10..12} ) +inherit distutils-r1 + +DESCRIPTION="The official Python library for Shodan" +HOMEPAGE="https://github.com/achillean/shodan-python" + +MY_PN="${PN}-python" + +if [[ ${PV} = "9999" ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/achillean/shodan-python.git" +else + inherit pypi + KEYWORDS="amd64 ~loong x86" +fi + +LICENSE="MIT" +SLOT="0" + +RDEPEND=" + dev-python/click[${PYTHON_USEDEP}] + dev-python/click-plugins[${PYTHON_USEDEP}] + dev-python/colorama[${PYTHON_USEDEP}] + >=dev-python/requests-2.2.1[${PYTHON_USEDEP}] + dev-python/tldextract[${PYTHON_USEDEP}] + dev-python/xlsxwriter[${PYTHON_USEDEP}] +" + +# Test requires API key +RESTRICT="test" diff --git a/net-analyzer/shodan/shodan-1.30.1.ebuild b/net-analyzer/shodan/shodan-1.30.1.ebuild new file mode 100644 index 000000000000..bc9092e7acc5 --- /dev/null +++ b/net-analyzer/shodan/shodan-1.30.1.ebuild @@ -0,0 +1,36 @@ +# Copyright 2022-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISTUTILS_USE_PEP517=setuptools +PYTHON_COMPAT=( python3_{10..12} ) +inherit distutils-r1 + +DESCRIPTION="The official Python library for Shodan" +HOMEPAGE="https://github.com/achillean/shodan-python" + +MY_PN="${PN}-python" + +if [[ ${PV} = "9999" ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/achillean/shodan-python.git" +else + inherit pypi + KEYWORDS="~amd64 ~loong ~x86" +fi + +LICENSE="MIT" +SLOT="0" + +RDEPEND=" + dev-python/click[${PYTHON_USEDEP}] + dev-python/click-plugins[${PYTHON_USEDEP}] + dev-python/colorama[${PYTHON_USEDEP}] + >=dev-python/requests-2.2.1[${PYTHON_USEDEP}] + dev-python/tldextract[${PYTHON_USEDEP}] + dev-python/xlsxwriter[${PYTHON_USEDEP}] +" + +# Test requires API key +RESTRICT="test" diff --git a/net-analyzer/shodan/shodan-1.31.0.ebuild b/net-analyzer/shodan/shodan-1.31.0.ebuild new file mode 100644 index 000000000000..be21ef2b1735 --- /dev/null +++ b/net-analyzer/shodan/shodan-1.31.0.ebuild @@ -0,0 +1,36 @@ +# Copyright 2022-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISTUTILS_USE_PEP517=setuptools +PYTHON_COMPAT=( python3_{10..12} ) +inherit distutils-r1 + +DESCRIPTION="The official Python library for Shodan" +HOMEPAGE="https://github.com/achillean/shodan-python" + +MY_PN="${PN}-python" + +if [[ ${PV} = "9999" ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/achillean/shodan-python.git" +else + inherit pypi + KEYWORDS="amd64 ~loong x86" +fi + +LICENSE="MIT" +SLOT="0" + +RDEPEND=" + dev-python/click[${PYTHON_USEDEP}] + dev-python/click-plugins[${PYTHON_USEDEP}] + dev-python/colorama[${PYTHON_USEDEP}] + >=dev-python/requests-2.2.1[${PYTHON_USEDEP}] + dev-python/tldextract[${PYTHON_USEDEP}] + dev-python/xlsxwriter[${PYTHON_USEDEP}] +" + +# Test requires API key +RESTRICT="test" diff --git a/net-analyzer/shodan/shodan-9999.ebuild b/net-analyzer/shodan/shodan-9999.ebuild new file mode 100644 index 000000000000..bc9092e7acc5 --- /dev/null +++ b/net-analyzer/shodan/shodan-9999.ebuild @@ -0,0 +1,36 @@ +# Copyright 2022-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISTUTILS_USE_PEP517=setuptools +PYTHON_COMPAT=( python3_{10..12} ) +inherit distutils-r1 + +DESCRIPTION="The official Python library for Shodan" +HOMEPAGE="https://github.com/achillean/shodan-python" + +MY_PN="${PN}-python" + +if [[ ${PV} = "9999" ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/achillean/shodan-python.git" +else + inherit pypi + KEYWORDS="~amd64 ~loong ~x86" +fi + +LICENSE="MIT" +SLOT="0" + +RDEPEND=" + dev-python/click[${PYTHON_USEDEP}] + dev-python/click-plugins[${PYTHON_USEDEP}] + dev-python/colorama[${PYTHON_USEDEP}] + >=dev-python/requests-2.2.1[${PYTHON_USEDEP}] + dev-python/tldextract[${PYTHON_USEDEP}] + dev-python/xlsxwriter[${PYTHON_USEDEP}] +" + +# Test requires API key +RESTRICT="test" diff --git a/net-analyzer/sinfo/metadata.xml b/net-analyzer/sinfo/metadata.xml index 74c2baebb4ec..dce3f3be66c0 100644 --- a/net-analyzer/sinfo/metadata.xml +++ b/net-analyzer/sinfo/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>netmon@gentoo.org</email> diff --git a/net-analyzer/sinfo/sinfo-0.0.48-r1.ebuild b/net-analyzer/sinfo/sinfo-0.0.48-r1.ebuild new file mode 100644 index 000000000000..ebc65efd14bf --- /dev/null +++ b/net-analyzer/sinfo/sinfo-0.0.48-r1.ebuild @@ -0,0 +1,48 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit autotools + +DESCRIPTION="A monitoring tool for networked computers" +HOMEPAGE="http://www.ant.uni-bremen.de/whomes/rinas/sinfo/" +SRC_URI="http://www.ant.uni-bremen.de/whomes/rinas/sinfo/download/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~arm ~x86" +IUSE="ipv6 static-libs" + +RDEPEND=" + !sys-cluster/slurm + dev-libs/boost + sys-libs/ncurses:= +" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" + +PATCHES=( + "${FILESDIR}"/${PN}-0.0.47-tinfo.patch + "${FILESDIR}"/${P}-gcc6.patch +) + +src_prepare() { + default + + cp "${FILESDIR}"/${P}-acinclude.m4 acinclude.m4 || die + eautoreconf +} + +DOCS=( AUTHORS ChangeLog README ) + +src_configure() { + econf $(use_enable ipv6 IPv6) +} + +src_install() { + default + + newconfd "${FILESDIR}"/sinfod.confd sinfod + newinitd "${FILESDIR}"/sinfod.initd sinfod +} diff --git a/net-analyzer/sinfo/sinfo-0.0.48.ebuild b/net-analyzer/sinfo/sinfo-0.0.48.ebuild deleted file mode 100644 index 441f23d854dd..000000000000 --- a/net-analyzer/sinfo/sinfo-0.0.48.ebuild +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit autotools eutils - -DESCRIPTION="A monitoring tool for networked computers" -HOMEPAGE="http://www.ant.uni-bremen.de/whomes/rinas/sinfo/" -SRC_URI="http://www.ant.uni-bremen.de/whomes/rinas/sinfo/download/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~arm ~x86" -IUSE="ipv6 static-libs" - -RDEPEND=" - !sys-cluster/slurm - dev-libs/boost - sys-libs/ncurses:= -" -DEPEND=" - ${RDEPEND} - virtual/pkgconfig -" - -src_prepare() { - cp "${FILESDIR}"/${P}-acinclude.m4 acinclude.m4 || die - epatch "${FILESDIR}"/${PN}-0.0.47-tinfo.patch - epatch "${FILESDIR}"/${P}-gcc6.patch - eautoreconf -} - -DOCS=( AUTHORS ChangeLog README ) - -src_configure() { - econf $(use_enable ipv6 IPv6) -} - -src_install() { - default - - newconfd "${FILESDIR}"/sinfod.confd sinfod - newinitd "${FILESDIR}"/sinfod.initd sinfod -} diff --git a/net-analyzer/siphon/metadata.xml b/net-analyzer/siphon/metadata.xml index 74c2baebb4ec..dce3f3be66c0 100644 --- a/net-analyzer/siphon/metadata.xml +++ b/net-analyzer/siphon/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>netmon@gentoo.org</email> diff --git a/net-analyzer/slurm/Manifest b/net-analyzer/slurm/Manifest index 33fb3260e5f1..8e2229e19e23 100644 --- a/net-analyzer/slurm/Manifest +++ b/net-analyzer/slurm/Manifest @@ -1,2 +1 @@ -DIST slurm-0.3.3.tar.gz 122839 BLAKE2B 2633ab72c6fa32c66a6573937241a3053644ea33ad43d6646a1f0b54e34367254f3185fea5ea7cd31fbd09d640bc56033e6b74ac74817ee4262511ee90a262f0 SHA512 67ffef9d0fc6239e2a742b2020a2a1fa913a6f0d681ffb7fd00611265e60b39f83b18cbd782ce841b6b39ed0db2c40cd6410d7f5d9408bf0eb0361b95949a8a3 DIST slurm-0.4.3.tar.gz 36076 BLAKE2B 468dadfb7e338a7b11a2db8501763fa75e9f82af1c7411d132c6aec2e8426cbd1170fb9657a661dde35c77d6ad23497599affc9b36e583772950a2bf30715c20 SHA512 f55005e2e2acebf1b7be0f7106511f83123f4df30305d00495940220f99394ddd48193ee4985c91604f294487c181f6efebe9452137f7df5b9675d2c3388892f diff --git a/net-analyzer/slurm/files/slurm-0.3.3-gentoo.patch b/net-analyzer/slurm/files/slurm-0.3.3-gentoo.patch deleted file mode 100644 index bd97a10c1e81..000000000000 --- a/net-analyzer/slurm/files/slurm-0.3.3-gentoo.patch +++ /dev/null @@ -1,48 +0,0 @@ ---- a/configure.in -+++ b/configure.in -@@ -40,31 +40,6 @@ - fi - AC_DEFINE(OSTYPE, ["${OSTYPE}"], [The operating system to build for]) - --for cursespath in /usr/include/ncurses.h /usr/local/include/ncurses.h /usr/local/include/ncurses/ncurses.h /opt/include/ncurses.h /opt/include/curses.h /usr/include/curses.h /usr/local/include/curses.h /dev/null --do -- test -f "${cursespath}" && break --done --case ${cursespath} in -- /usr/include/*) -- CFLAGS="$CFLAGS -I/usr/include" -- LDFLAGS="" -- ;; -- /usr/local/include/ncurses/*) -- CFLAGS="${CFLAGS} -I/usr/local/include/ncurses" -- LDFLAGS="-L/usr/local/lib" -- SOLLDFLAGS="-R/usr/local/lib" -- ;; -- /usr/local/include/*) -- CFLAGS="${CFLAGS} -I/usr/local/include" -- LDFLAGS="-L/usr/local/lib" -- SOLLDFLAGS="-R/usr/local/lib" -- ;; -- /opt/include/*) -- CFLAGS="${CFLAGS} -I/opt/include" -- LDFLAGS="-L/opt/lib" -- SOLLDFLAGS="-R/opt/lib" -- ;; --esac - # add Slowlaris -R and libraries to LDFLAGS - if test ${OSTYPE} = "solaris" ; then - LDFLAGS="${LDFLAGS} ${SOLLDFLAGS} -lnsl -lsocket -lkstat" -@@ -74,7 +49,12 @@ - ncurses_support="no" - curses_support="no" - color_support="no" --AC_CHECK_LIB(ncurses, use_default_colors, LDFLAGS="$LDFLAGS -lncurses"; CFLAGS="$CFLAGS -D_HAVE_NCURSES -D_HAVE_NCURSES_COLOR"; color_support="yes"; ncurses_support="yes", AC_CHECK_LIB(ncurses, use_default_colors, LDFLAGS="$LDFLAGS -lncurses"; CFLAGS="$CFLAGS -D_HAVE_NCURSES"; ncurses_support="yes"; echo "NO TRANSPARENCY SUPPORT in this ncurses lib", AC_CHECK_LIB(curses, initscr, LDFLAGS="$LDFLAGS -lcurses"; CFLAGS="$CFLAGS -D_HAVE_CURSES"; curses_support="yes"; echo "NO TRANSPARENCY SUPPORT in curses lib"))) -+PKG_CHECK_MODULES(ncurses,ncurses, -+ LIBS="$LIBS $ncurses_LIBS" -+ AC_DEFINE(HAVE_NCURSES, 1, [Define if we have ncurses]) -+ AC_DEFINE(HAVE_NCURSES_COLOR, 1, [We want color]) -+ color_support="yes"; ncurses_support="yes" -+ ,AC_MSG_ERROR([ncurses not found])) - - # disable color support on Solaris for now - if test ${OSTYPE} = "solaris" ; then diff --git a/net-analyzer/slurm/files/slurm-0.3.3-theme.patch b/net-analyzer/slurm/files/slurm-0.3.3-theme.patch deleted file mode 100644 index 131554ee57f7..000000000000 --- a/net-analyzer/slurm/files/slurm-0.3.3-theme.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- a/theme.c -+++ b/theme.c -@@ -70,13 +70,7 @@ - if ((f = fopen(filename, "r")) == NULL) - { - bzero(&filename, BUFSIZ); --#ifdef __NetBSD__ -- snprintf(filename, BUFSIZ, "/usr/pkg/share/slurm/%s.theme", name); --#elif __Debian__ - snprintf(filename, BUFSIZ, "/usr/share/slurm/%s.theme", name); --#else -- snprintf(filename, BUFSIZ, "/usr/local/share/slurm/%s.theme", name); --#endif - if ((f = fopen(filename, "r")) == NULL) - error(ERR_FATAL, "cannot find theme '%s'", name); - } diff --git a/net-analyzer/slurm/files/slurm-0.4.3-fix-includes.patch b/net-analyzer/slurm/files/slurm-0.4.3-fix-includes.patch new file mode 100644 index 000000000000..a421c0aa1fa0 --- /dev/null +++ b/net-analyzer/slurm/files/slurm-0.4.3-fix-includes.patch @@ -0,0 +1,23 @@ +https://github.com/mattthias/slurm/pull/39 +--- a/os.h ++++ b/os.h +@@ -177,7 +177,7 @@ + #elif defined (__linux__) /* L I N U X */ + #include <stdio.h> + #include <sys/param.h> +-#include <sys/sysctl.h> ++#include <linux/sysctl.h> + #include <stdlib.h> + #include <stdarg.h> + #include <unistd.h> +@@ -195,8 +195,8 @@ + #include <netinet/in.h> + #include <net/if.h> + #include <arpa/inet.h> +-#include <net/ppp_defs.h> +-#include <net/if_ppp.h> ++#include <linux/ppp_defs.h> ++#include <linux/if_ppp.h> + #elif defined (__Solaris__) /* S O L A R I S */ + #include <stdio.h> + #define NO_CURSES_E 1 diff --git a/net-analyzer/slurm/files/slurm-0.4.3-tinfo.patch b/net-analyzer/slurm/files/slurm-0.4.3-tinfo.patch index c1a1233f177b..ccb00fbeb094 100644 --- a/net-analyzer/slurm/files/slurm-0.4.3-tinfo.patch +++ b/net-analyzer/slurm/files/slurm-0.4.3-tinfo.patch @@ -1,3 +1,4 @@ +https://github.com/mattthias/slurm/pull/38 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -25,7 +25,7 @@ diff --git a/net-analyzer/slurm/metadata.xml b/net-analyzer/slurm/metadata.xml index 7312d8a52540..84a3b8b8bd3d 100644 --- a/net-analyzer/slurm/metadata.xml +++ b/net-analyzer/slurm/metadata.xml @@ -1,5 +1,5 @@ -<?xml version='1.0' encoding='UTF-8'?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<?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> diff --git a/net-analyzer/slurm/slurm-0.3.3-r2.ebuild b/net-analyzer/slurm/slurm-0.3.3-r2.ebuild deleted file mode 100644 index b8f2e06dde3e..000000000000 --- a/net-analyzer/slurm/slurm-0.3.3-r2.ebuild +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit autotools eutils - -DESCRIPTION="Realtime network interface monitor based on FreeBSD's pppstatus" -HOMEPAGE="http://www.wormulon.net/projects/slurm" -SRC_URI="http://www.wormulon.net/files/code/slurm/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ~ppc ~sparc x86" - -RDEPEND="sys-libs/ncurses" -DEPEND=" - ${RDEPEND} - virtual/pkgconfig -" - -src_prepare() { - epatch \ - "${FILESDIR}"/${P}-gentoo.patch \ - "${FILESDIR}"/${P}-overflow.patch \ - "${FILESDIR}"/${P}-theme.patch - eautoreconf -} - -src_install() { - dobin slurm - - insinto /usr/share/${PN} - doins themes/*.theme - - doman slurm.1 - dodoc AUTHORS ChangeLog FAQ KEYS README THANKS THEMES.txt TODO -} diff --git a/net-analyzer/slurm/slurm-0.4.3.ebuild b/net-analyzer/slurm/slurm-0.4.3.ebuild index 95641beb1b22..5dd5798c2f8b 100644 --- a/net-analyzer/slurm/slurm-0.4.3.ebuild +++ b/net-analyzer/slurm/slurm-0.4.3.ebuild @@ -1,8 +1,9 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 -inherit cmake-utils +EAPI=7 + +inherit cmake DESCRIPTION="Realtime network interface monitor based on FreeBSD's pppstatus" HOMEPAGE="https://github.com/mattthias/slurm" @@ -10,28 +11,21 @@ SRC_URI="https://github.com/mattthias/slurm/archive/upstream/${PN}.tar.gz -> ${P LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~ppc ~sparc ~x86" - -RDEPEND=" - sys-libs/ncurses:* -" -DEPEND=" - ${RDEPEND} -" +KEYWORDS="amd64 ~ppc ~sparc x86" + +RDEPEND="sys-libs/ncurses:=" +DEPEND="${RDEPEND}" + +S="${WORKDIR}/${PN}-upstream" + PATCHES=( "${FILESDIR}"/${PN}-0.3.3-overflow.patch "${FILESDIR}"/${P}-tinfo.patch "${FILESDIR}"/${P}-version.patch -) -DOCS=( - AUTHORS - ChangeLog - FAQ - KEYS - README - THANKS - THEMES.txt - TODO + "${FILESDIR}"/${P}-fix-includes.patch ) -S=${WORKDIR}/${PN}-upstream +src_install() { + cmake_src_install + dodoc KEYS THEMES.txt +} diff --git a/net-analyzer/smokeping/Manifest b/net-analyzer/smokeping/Manifest deleted file mode 100644 index e02fdf06e63b..000000000000 --- a/net-analyzer/smokeping/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST smokeping-2.7.3.tar.gz 6614710 BLAKE2B 7fa10c19487427a3092a1e5591422cb37f66a6eab86b8b43eebbc8af441d5426b99f3c7b54040660f6f150ade99b1ea2555b4fcd6f80d8306d6f86ac9f95974e SHA512 d46d61539ffdd9cac41391aa813364260f90f84443c328b1c9233ab6ba3a0c157861694614e6c33e18b153f6a6afc0769c5fc7752b3ab52f114d984e53232830 diff --git a/net-analyzer/smokeping/files/79_smokeping.conf b/net-analyzer/smokeping/files/79_smokeping.conf deleted file mode 100644 index 1e9361ba501a..000000000000 --- a/net-analyzer/smokeping/files/79_smokeping.conf +++ /dev/null @@ -1,15 +0,0 @@ -### -### Setup the smokeping image cache and perl cgi script -### -<IfModule mod_alias.c> - Alias "/.simg/" "/var/lib/smokeping/.simg/" - <IfModule mod_perl.c> - <Directory "/var/lib/smokeping/.simg/"> - Options -Indexes MultiViews - AllowOverride None - Order deny,allow - Deny from all - Allow from 127.0.0.1 - </Directory> - </IfModule> -</IfModule> diff --git a/net-analyzer/smokeping/files/smokeping.conf b/net-analyzer/smokeping/files/smokeping.conf deleted file mode 100644 index 729726316fbd..000000000000 --- a/net-analyzer/smokeping/files/smokeping.conf +++ /dev/null @@ -1 +0,0 @@ -d /run/smokeping 0755 root root diff --git a/net-analyzer/smokeping/files/smokeping.init.5 b/net-analyzer/smokeping/files/smokeping.init.5 deleted file mode 100644 index 3c08c3fdc65e..000000000000 --- a/net-analyzer/smokeping/files/smokeping.init.5 +++ /dev/null @@ -1,56 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -command="/usr/bin/smokeping" -command_args="--nodaemon" -command_background="true" -command_user="smokeping:smokeping" -pidfile="/run/${RC_SVCNAME}.pid" -extra_started_commands="dump reload restore" -required_files="/etc/smokeping/config" - -depend() { - need net - use dns -} - -start_pre() { - export LC_ALL=C -} - -reload() { - ebegin "Reloading smokeping" - "${command}" --reload 2>&1 >/dev/null - eend $? -} - -dump() { - ebegin "Dumping smokeping rrd files to XML for backup or upgrade use" - if service_started "${myservice}" ; then - eerror "You need to stop smokeping before dumping files!" - return 1 - fi - for f in $(find /var/lib/smokeping -name '*.rrd' -print) ; do - f_xml=$(dirname $f)/$(basename $f .rrd).xml - rrdtool dump "$f" > "${f_xml}" - chown root:0 "${f_xml}" - done - eend $? -} - -restore() { - ebegin "Restoring smokeping rrd files from XML dump files" - if service_started "${myservice}" ; then - eerror "You need to stop smokeping before restoring files!" - return 1 - fi - for f in $(find /var/lib/smokeping -name '*.xml' -print) ; do - f_rrd=$(dirname $f)/$(basename $f .xml).rrd - mv -f "${f_rrd}" "${f_rrd}.bak" - chown root:0 "${f_rrd}.bak" - rrdtool restore "$f" "${f_rrd}" - chown smokeping:smokeping "${f_rrd}" - done - eend $? -} diff --git a/net-analyzer/smokeping/files/smokeping.service b/net-analyzer/smokeping/files/smokeping.service deleted file mode 100644 index 2130aca23627..000000000000 --- a/net-analyzer/smokeping/files/smokeping.service +++ /dev/null @@ -1,10 +0,0 @@ -[Unit] -Description=Latency Logging and Graphing System -After=network.target - -[Service] -ExecStart=/usr/bin/smokeping --nodaemon -ExecReload=/bin/kill -HUP $MAINPID - -[Install] -WantedBy=multi-user.target diff --git a/net-analyzer/smokeping/metadata.xml b/net-analyzer/smokeping/metadata.xml deleted file mode 100644 index 7b436470d4c4..000000000000 --- a/net-analyzer/smokeping/metadata.xml +++ /dev/null @@ -1,12 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> -<maintainer type="project"> -<email>netmon@gentoo.org</email> -<name>Gentoo network monitoring and analysis project</name> -</maintainer> -<use> -<flag name="dig">Install <pkg>net-dns/bind-tools</pkg> for dig functionality</flag> -<flag name="echoping">Install <pkg>net-analyzer/echoping</pkg> for echoping functionality</flag> -</use> -</pkgmetadata> diff --git a/net-analyzer/smokeping/smokeping-2.7.3.ebuild b/net-analyzer/smokeping/smokeping-2.7.3.ebuild deleted file mode 100644 index 57f3773d61bb..000000000000 --- a/net-analyzer/smokeping/smokeping-2.7.3.ebuild +++ /dev/null @@ -1,147 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit autotools eutils multilib user systemd - -DESCRIPTION="A powerful latency measurement tool" -HOMEPAGE="https://oss.oetiker.ch/smokeping/" -SRC_URI="https://oss.oetiker.ch/smokeping/pub/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 x86" - -IUSE="apache2 curl dig echoping ipv6 radius" - -DEPEND=" - >=dev-lang/perl-5.8.8-r8 - >=dev-perl/SNMP_Session-1.13 - >=net-analyzer/fping-2.4_beta2-r2[suid] - >=net-analyzer/rrdtool-1.2[graph,perl] - dev-perl/CGI - dev-perl/CGI-Session - dev-perl/Config-Grammar - dev-perl/Digest-HMAC - dev-perl/FCGI - dev-perl/IO-Socket-SSL - dev-perl/IO-Tty - dev-perl/Net-DNS - dev-perl/Net-OpenSSH - dev-perl/Net-SNMP - dev-perl/Net-Telnet - dev-perl/libwww-perl - dev-perl/perl-ldap - virtual/perl-libnet - dev-perl/CGI-Fast - !apache2? ( virtual/httpd-cgi ) - apache2? ( - >=www-apache/mod_perl-2.0.1 - www-apache/mod_fcgid - ) - curl? ( >=net-misc/curl-7.21.4 ) - dig? ( net-dns/bind-tools ) - echoping? ( >=net-analyzer/echoping-6.0.2 ) - ipv6? ( >=dev-perl/Socket6-0.20 ) - radius? ( dev-perl/Authen-Radius ) -" - -RDEPEND="${DEPEND}" - -pkg_setup() { - enewgroup smokeping - enewuser smokeping -1 -1 /var/lib/smokeping smokeping -} - -src_prepare() { - default - - sed -i -e '/^SUBDIRS = / s|thirdparty||g' Makefile.am || die - sed -i -e '/^perllibdir = / s|= .*|= $(libdir)|g' lib/Makefile.am || die - rm -r lib/{BER.pm,SNMP_Session.pm,SNMP_util.pm} || die # dev-perl/SNMP_Session - echo ${PV} > VERSION - - eautoreconf -} - -src_configure() { - econf \ - --sysconfdir=/etc/smokeping \ - --with-htdocs-dir=/var/www/localhost/smokeping -} - -src_compile() { - LC_ALL=C emake -} - -src_install() { - dodir /usr/$(get_libdir) - default - - newinitd "${FILESDIR}"/${PN}.init.5 ${PN} - systemd_dotmpfilesd "${FILESDIR}"/"${PN}".conf - systemd_dounit "${FILESDIR}"/"${PN}".service - - mv "${D}/etc/smokeping/basepage.html.dist" "${D}/etc/smokeping/basepage.html" - mv "${D}/etc/smokeping/config.dist" "${D}/etc/smokeping/config" - mv "${D}/etc/smokeping/smokemail.dist" "${D}/etc/smokeping/smokemail" - mv "${D}/etc/smokeping/smokeping_secrets.dist" "${D}/etc/smokeping/smokeping_secrets" - mv "${D}/etc/smokeping/tmail.dist" "${D}/etc/smokeping/tmail" - - sed -i \ - -e '/^imgcache/{s:\(^imgcache[ \t]*=\).*:\1 /var/lib/smokeping/.simg:}' \ - -e '/^imgurl/{s:\(^imgurl[ \t]*=\).*:\1 ../.simg:}' \ - -e '/^datadir/{s:\(^datadir[ \t]*=\).*:\1 /var/lib/smokeping:}' \ - -e '/^piddir/{s:\(^piddir[ \t]*=\).*:\1 /run/smokeping:}' \ - -e '/^cgiurl/{s#\(^cgiurl[ \t]*=\).*#\1 http://some.place.xyz/perl/smokeping.pl#}' \ - -e '/^smokemail/{s:\(^smokemail[ \t]*=\).*:\1 /etc/smokeping/smokemail:}' \ - -e '/^tmail/{s:\(^tmail[ \t]*=\).*:\1 /etc/smokeping/tmail:}' \ - -e '/^secrets/{s:\(^secrets[ \t]*=\).*:\1 /etc/smokeping/smokeping_secrets:}' \ - -e '/^template/{s:\(^template[ \t]*=\).*:\1 /etc/smokeping/basepage.html:}' \ - "${D}/etc/${PN}/config" || die - - sed -i \ - -e '/^<script/{s:cropper/:/cropper/:}' \ - "${D}/etc/${PN}/basepage.html" || die - - sed -i \ - -e 's/$FindBin::RealBin\/..\/etc\/config/\/etc\/smokeping\/config/g' \ - "${D}/usr/bin/smokeping" "${D}/usr/bin/smokeping_cgi" || die - - sed -i \ - -e 's:etc/config.dist:/etc/smokeping/config:' \ - "${D}/usr/bin/tSmoke" || die - - sed -i \ - -e 's:/usr/etc/config:/etc/smokeping/config:' \ - "${D}/var/www/localhost/smokeping/smokeping.fcgi.dist" || die - - dodir /var/www/localhost/cgi-bin - mv "${D}/var/www/localhost/smokeping/smokeping.fcgi.dist" \ - "${D}/var/www/localhost/cgi-bin/smokeping.fcgi" - - fperms 700 /etc/${PN}/smokeping_secrets - - if use apache2 ; then - insinto /etc/apache2/modules.d - doins "${FILESDIR}/79_${PN}.conf" - fi - - # Create the files in /var for rrd file storage - keepdir /var/lib/${PN}/.simg - fowners smokeping:smokeping /var/lib/${PN} - - if use apache2 ; then - fowners apache:apache /var/lib/${PN}/.simg - fowners -R apache:apache /var/www - else - fowners smokeping:smokeping /var/lib/${PN}/.simg - fi - - fperms 775 /var/lib/${PN} /var/lib/${PN}/.simg -} - -pkg_postinst() { - chown smokeping:smokeping "${ROOT}/var/lib/${PN}" - chmod 755 "${ROOT}/var/lib/${PN}" -} diff --git a/net-analyzer/snallygaster/Manifest b/net-analyzer/snallygaster/Manifest index 976721d1609b..b772d52adb82 100644 --- a/net-analyzer/snallygaster/Manifest +++ b/net-analyzer/snallygaster/Manifest @@ -1,3 +1 @@ -DIST snallygaster-0.0.6.tar.gz 22260 BLAKE2B 5f5f45678ee83922d477eb7356bf830a4ececbff6fc02bc21d2b714abf350c1b2643fb8134f330d8f54a4c58809b9de2671f46b728e631ac0a5f4996f87fd8e1 SHA512 abca663005e43948ef7c6516a3e85d1b1010811365f39a280b9c091490a8b4687fdaa1b0acbd29f5a84285fe16cd74398098eb9600b5ec41ec880d355cd0ddbd -DIST snallygaster-0.0.8.tar.gz 23341 BLAKE2B 0b4e92b50c9f766440a19bab6e39f7be323c5574c8f350ed3fbd07499ca04b358ec0e66deeddd30b5e798d093a73fbce65434be4058285eb773918314f373dac SHA512 a4937d5e486109deb54d4a3494fcdb2b06a0938cb9ca686550616d31d2f5bde01b4162f610db15c34c86e41673f6f05f749fb921d5f858cbc4a2fc7f65a6dda6 -DIST snallygaster-0.0.9.tar.gz 24055 BLAKE2B 049a88250877ed87103d23a30443ed638320e61c788716d432d877407c837f439bd16dc78a6eb00f7fea844280975f155898d9b084f7e285a0ed81a6becf9d68 SHA512 e7de6d97576f1651e0a6882c4d2766efe82b8656f53a6c30a5e36eeadbaa4fdc2b79dc370a1106a0bbd916d45d1c92169dcfb5d7c75e89946b371bc80098366c +DIST snallygaster-0.0.12.tar.gz 25234 BLAKE2B 69082fe94fc65d78b99519511b6850d569401d326788448dffac2baca3e359e166b161e69b5169dc0772c4eba5e3cf70968ed75fe09efad7924869971a0869c8 SHA512 507b5bbaa8a013bbbb18b53778781e1e212e295f113ea91b1b73d5162f93d35be74780fa0cba7499d62f40c8cd27b4cdfd79526bd0ab07018090460ca937eb48 diff --git a/net-analyzer/snallygaster/metadata.xml b/net-analyzer/snallygaster/metadata.xml index 28ef3c7b080f..f8aae7b5d9a4 100644 --- a/net-analyzer/snallygaster/metadata.xml +++ b/net-analyzer/snallygaster/metadata.xml @@ -1,5 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"><email>hanno@gentoo.org</email></maintainer> +<upstream> +<remote-id type="github">hannob/snallygaster</remote-id> +<remote-id type="pypi">snallygaster</remote-id> +</upstream> </pkgmetadata> diff --git a/net-analyzer/snallygaster/snallygaster-0.0.12-r1.ebuild b/net-analyzer/snallygaster/snallygaster-0.0.12-r1.ebuild new file mode 100644 index 000000000000..2e4e6ae2913c --- /dev/null +++ b/net-analyzer/snallygaster/snallygaster-0.0.12-r1.ebuild @@ -0,0 +1,25 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +PYTHON_COMPAT=( python3_{9,10,11} ) +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/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/snallygaster/snallygaster-0.0.6.ebuild b/net-analyzer/snallygaster/snallygaster-0.0.6.ebuild deleted file mode 100644 index 721aa4381322..000000000000 --- a/net-analyzer/snallygaster/snallygaster-0.0.6.ebuild +++ /dev/null @@ -1,21 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -PYTHON_COMPAT=( python3_{6,7,8} ) -DISTUTILS_SINGLE_IMPL=1 -inherit distutils-r1 - -DESCRIPTION="Finds file leaks and other security problems on HTTP servers" -HOMEPAGE="https://github.com/hannob/snallygaster" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="CC0-1.0" -SLOT="0" -KEYWORDS="~amd64" - -DEPEND="dev-python/dnspython - dev-python/urllib3 - dev-python/beautifulsoup" -RDEPEND="${DEPEND}" -DOCS=( README.md TESTS.md ) diff --git a/net-analyzer/snallygaster/snallygaster-0.0.8.ebuild b/net-analyzer/snallygaster/snallygaster-0.0.8.ebuild deleted file mode 100644 index 721aa4381322..000000000000 --- a/net-analyzer/snallygaster/snallygaster-0.0.8.ebuild +++ /dev/null @@ -1,21 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -PYTHON_COMPAT=( python3_{6,7,8} ) -DISTUTILS_SINGLE_IMPL=1 -inherit distutils-r1 - -DESCRIPTION="Finds file leaks and other security problems on HTTP servers" -HOMEPAGE="https://github.com/hannob/snallygaster" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="CC0-1.0" -SLOT="0" -KEYWORDS="~amd64" - -DEPEND="dev-python/dnspython - dev-python/urllib3 - dev-python/beautifulsoup" -RDEPEND="${DEPEND}" -DOCS=( README.md TESTS.md ) diff --git a/net-analyzer/snallygaster/snallygaster-0.0.9.ebuild b/net-analyzer/snallygaster/snallygaster-0.0.9.ebuild deleted file mode 100644 index 721aa4381322..000000000000 --- a/net-analyzer/snallygaster/snallygaster-0.0.9.ebuild +++ /dev/null @@ -1,21 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -PYTHON_COMPAT=( python3_{6,7,8} ) -DISTUTILS_SINGLE_IMPL=1 -inherit distutils-r1 - -DESCRIPTION="Finds file leaks and other security problems on HTTP servers" -HOMEPAGE="https://github.com/hannob/snallygaster" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="CC0-1.0" -SLOT="0" -KEYWORDS="~amd64" - -DEPEND="dev-python/dnspython - dev-python/urllib3 - dev-python/beautifulsoup" -RDEPEND="${DEPEND}" -DOCS=( README.md TESTS.md ) diff --git a/net-analyzer/sngrep/Manifest b/net-analyzer/sngrep/Manifest index 9f3afb299a48..f8a03b85593f 100644 --- a/net-analyzer/sngrep/Manifest +++ b/net-analyzer/sngrep/Manifest @@ -1,2 +1,2 @@ -DIST sngrep-1.4.6.tar.gz 235721 BLAKE2B e01f2a1d83b9147b99196f7ff2e5562552b16badc2ca634e63b2e2f5955a5d0328c9fcdb841f42a950899511a81fffd8eb64169758dc319875e3052d4359de93 SHA512 25c67e26158b140bded775b217f313ad5a6268684f03d0b9875ddd423d7548b50fa9c358346330d3873984f456aefa9401c2b0fdd136dd95061e34da6530bcc3 -DIST sngrep-1.4.7.tar.gz 237978 BLAKE2B 30172748aeab2910e7fa13f35b447d7bd1688bb206576af6233c8c47405eb3fe93316cc72255169f19f3752e7fe3ada63c5c0bba0d9ab75706c1b0d3ac296474 SHA512 f414f9cc49b0c34cbbf5a77d285f12eb4091af3395953ed93dbe2f57d4ba3731d16c4b56c37e90744cf3784572975f485aed48cdd100898ffaee18e9a18943b1 +DIST sngrep-1.6.0.tar.gz 248091 BLAKE2B a08c50d87d43f49f24494a85b8f4d72f24a649050ab696cabd087a39bd64532a9e7ed137ccaacecddce8ef22c960fc43f5372c9b13817eae26dd06b711363e3b SHA512 bca3192e1aacf4152f566925fd075dfd957cbe87017c8258303c8689f1221ea082f337866db45cb5ada0629f7cc4b66ce73b74a911d230c63d10fefa19aaebe3 +DIST sngrep-1.7.0.tar.gz 248947 BLAKE2B 39a5d9bc71df9fb5bd4abadadf3f8fc8a680dd06eb4a7f06bb597a70215854d0ee4b93b39cfff67e2b15b6fed4ffac2865741af31b21a7ba8a91f9c01c4c750a SHA512 ecf31d61643ecc9ba1a9fe7759ae8c2c65fcbf6886ed263def2993dd6900eb9aeaddce8ebbde71e1ec57fbdc11a388de05f7c13f4587714e3b3e33689cf591b0 diff --git a/net-analyzer/sngrep/files/sngrep-1.4.6-stdin.patch b/net-analyzer/sngrep/files/sngrep-1.4.6-stdin.patch deleted file mode 100644 index b61025d25b6e..000000000000 --- a/net-analyzer/sngrep/files/sngrep-1.4.6-stdin.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/src/capture.c -+++ b/src/capture.c -@@ -191,7 +191,7 @@ - - // Reopen tty for ncurses after pcap have used stdin - if (!strncmp(infile, "/dev/stdin", 10)) { -- if (!(stdin = freopen("/dev/tty", "r", stdin))) { -+ if (!(fstdin = freopen("/dev/tty", "r", stdin))) { - fprintf(stderr, "Failed to reopen tty while using stdin for capture."); - return 1; - } diff --git a/net-analyzer/sngrep/files/sngrep-1.4.7-LDFLAGS.patch b/net-analyzer/sngrep/files/sngrep-1.4.7-LDFLAGS.patch deleted file mode 100644 index 3e63dc245dab..000000000000 --- a/net-analyzer/sngrep/files/sngrep-1.4.7-LDFLAGS.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/m4/sngrep.m4 -+++ b/m4/sngrep.m4 -@@ -44,7 +44,7 @@ - LIBS="$sngrep_config_script $LIBS " - sngrep_script_success=yes - ], []) -- LDFLAGS="$save_LDFLAGS" -+ LDFLAGS="$sngrep_save_LDFLAGS" - fi - if test "x$sngrep_script_success" = xno; then - [$5] diff --git a/net-analyzer/sngrep/files/sngrep-1.4.7-tinfo.patch b/net-analyzer/sngrep/files/sngrep-1.4.7-tinfo.patch deleted file mode 100644 index 8a01eeb2560b..000000000000 --- a/net-analyzer/sngrep/files/sngrep-1.4.7-tinfo.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- a/configure.ac -+++ b/configure.ac -@@ -74,6 +74,10 @@ - AC_CHECK_LIB([menuw], [new_item], [], [ - AC_MSG_ERROR([ You need to have ncurses menuw library installed to compile sngrep.]) - ]) -+ -+ AC_SEARCH_LIBS([keyname], [tinfow], [], [ -+ AC_MSG_ERROR([ You need to have ncurses tinfow library installed to compile sngrep.]) -+ ]) - ], [ - - # Ncurses without wide-character support -@@ -96,6 +100,10 @@ - AC_CHECK_LIB([menu], [new_item], [], [ - AC_MSG_ERROR([ You need to have ncurses menu library installed to compile sngrep.]) - ]) -+ -+ AC_SEARCH_LIBS([keyname], [tinfo], [], [ -+ AC_MSG_ERROR([ You need to have ncurses tinfo library installed to compile sngrep.]) -+ ]) - ]) - - #### diff --git a/net-analyzer/sngrep/metadata.xml b/net-analyzer/sngrep/metadata.xml index eeb043ad62b3..6891786f5ba3 100644 --- a/net-analyzer/sngrep/metadata.xml +++ b/net-analyzer/sngrep/metadata.xml @@ -1,12 +1,14 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type="project"> -<email>netmon@gentoo.org</email> -</maintainer> -<use> -<flag name='eep'>Enable EEP packet send/receive support</flag> -<flag name='gnutls'>Use <pkg>net-libs/gnutls</pkg> to parse captured TLS packets</flag> -<flag name='openssl'>Use <pkg>dev-libs/openssl</pkg> to parse captured TLS packets</flag> -</use> + <maintainer type="project"> + <email>netmon@gentoo.org</email> + </maintainer> + <use> + <flag name="eep">Enable EEP packet send/receive support</flag> + <flag name="gnutls">Use <pkg>net-libs/gnutls</pkg> to parse captured TLS packets</flag> + </use> + <upstream> + <remote-id type="github">irontec/sngrep</remote-id> + </upstream> </pkgmetadata> diff --git a/net-analyzer/sngrep/sngrep-1.4.6-r3.ebuild b/net-analyzer/sngrep/sngrep-1.4.6-r3.ebuild deleted file mode 100644 index b9f731a5e648..000000000000 --- a/net-analyzer/sngrep/sngrep-1.4.6-r3.ebuild +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit autotools - -DESCRIPTION="Ncurses SIP Messages flow viewer" -HOMEPAGE="https://github.com/irontec/sngrep" -SRC_URI="https://github.com/irontec/sngrep/releases/download/v${PV}/${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="eep gnutls ipv6 openssl pcre unicode" -REQUIRED_USE=" - gnutls? ( !openssl ) -" - -DEPEND=" - net-libs/libpcap - sys-libs/ncurses:0=[unicode?] - openssl? ( dev-libs/openssl:0= ) - gnutls? ( net-libs/gnutls ) -" -RDEPEND="${DEPEND}" -PATCHES=( - "${FILESDIR}"/${PN}-1.4.6-stdin.patch - "${FILESDIR}"/${PN}-1.4.7-tinfo.patch -) - -src_prepare() { - default - eautoreconf -} - -src_configure() { - econf \ - $(use_enable eep) \ - $(use_enable ipv6) \ - $(use_enable unicode) \ - $(use_with gnutls) \ - $(use_with openssl) \ - $(use_with pcre) -} diff --git a/net-analyzer/sngrep/sngrep-1.4.7.ebuild b/net-analyzer/sngrep/sngrep-1.4.7.ebuild deleted file mode 100644 index f021e73049e6..000000000000 --- a/net-analyzer/sngrep/sngrep-1.4.7.ebuild +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit autotools - -DESCRIPTION="Ncurses SIP Messages flow viewer" -HOMEPAGE="https://github.com/irontec/sngrep" -SRC_URI="https://github.com/irontec/sngrep/releases/download/v${PV}/${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="eep gnutls ipv6 openssl pcre unicode" -REQUIRED_USE=" - gnutls? ( !openssl ) -" - -DEPEND=" - net-libs/libpcap - sys-libs/ncurses:0=[unicode?] - openssl? ( dev-libs/openssl:0= ) - gnutls? ( net-libs/gnutls ) -" -RDEPEND="${DEPEND}" -PATCHES=( - "${FILESDIR}"/${PN}-1.4.7-tinfo.patch - "${FILESDIR}"/${PN}-1.4.7-LDFLAGS.patch -) - -src_prepare() { - default - eautoreconf -} - -src_configure() { - econf \ - $(use_enable eep) \ - $(use_enable ipv6) \ - $(use_enable unicode) \ - $(use_with gnutls) \ - $(use_with openssl) \ - $(use_with pcre) -} diff --git a/net-analyzer/sngrep/sngrep-1.6.0-r1.ebuild b/net-analyzer/sngrep/sngrep-1.6.0-r1.ebuild new file mode 100644 index 000000000000..89771013483f --- /dev/null +++ b/net-analyzer/sngrep/sngrep-1.6.0-r1.ebuild @@ -0,0 +1,47 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools + +DESCRIPTION="Ncurses SIP Messages flow viewer" +HOMEPAGE="https://github.com/irontec/sngrep" +SRC_URI="https://github.com/irontec/sngrep/releases/download/v${PV}/${P}.tar.gz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="eep gnutls pcre ssl zlib" + +DEPEND=" + net-libs/libpcap + sys-libs/ncurses:=[unicode(+)] + ssl? ( + !gnutls? ( dev-libs/openssl:= ) + gnutls? ( net-libs/gnutls:= ) + ) + pcre? ( dev-libs/libpcre2 ) + zlib? ( sys-libs/zlib ) +" +RDEPEND="${DEPEND}" + +src_prepare() { + default + + eautoreconf +} + +src_configure() { + local myeconfargs=( + --enable-ipv6 + --enable-unicode + --without-pcre + $(use_enable eep) + $(use_with pcre pcre2) + $(use_with ssl $(usex gnutls gnutls openssl)) + $(use_with zlib) + ) + + econf "${myeconfargs[@]}" +} diff --git a/net-analyzer/sngrep/sngrep-1.7.0.ebuild b/net-analyzer/sngrep/sngrep-1.7.0.ebuild new file mode 100644 index 000000000000..4ec90e3677e8 --- /dev/null +++ b/net-analyzer/sngrep/sngrep-1.7.0.ebuild @@ -0,0 +1,47 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools + +DESCRIPTION="Ncurses SIP Messages flow viewer" +HOMEPAGE="https://github.com/irontec/sngrep" +SRC_URI="https://github.com/irontec/sngrep/releases/download/v${PV}/${P}.tar.gz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="eep gnutls pcre ssl zlib" + +DEPEND=" + net-libs/libpcap + sys-libs/ncurses:=[unicode(+)] + ssl? ( + !gnutls? ( dev-libs/openssl:= ) + gnutls? ( net-libs/gnutls:= ) + ) + pcre? ( dev-libs/libpcre2 ) + zlib? ( sys-libs/zlib ) +" +RDEPEND="${DEPEND}" + +src_prepare() { + default + + eautoreconf +} + +src_configure() { + local myeconfargs=( + --enable-ipv6 + --enable-unicode + --without-pcre + $(use_enable eep) + $(use_with pcre pcre2) + $(use_with ssl $(usex gnutls gnutls openssl)) + $(use_with zlib) + ) + + econf "${myeconfargs[@]}" +} diff --git a/net-analyzer/sniffit/files/sniffit-0.5.0-implicit-func-decl.patch b/net-analyzer/sniffit/files/sniffit-0.5.0-implicit-func-decl.patch new file mode 100644 index 000000000000..e6ee580d6e33 --- /dev/null +++ b/net-analyzer/sniffit/files/sniffit-0.5.0-implicit-func-decl.patch @@ -0,0 +1,50 @@ +https://github.com/resurrecting-open-source-projects/sniffit/pull/3 + +From a05340968343d9f61f57506ed00bff0a62d3f38e Mon Sep 17 00:00:00 2001 +From: Sam James <sam@gentoo.org> +Date: Thu, 28 Jul 2022 12:14:44 +0100 +Subject: [PATCH] Fix -Wimplicit-function-declaration + +--- a/src/sn_cfgfile.c ++++ b/src/sn_cfgfile.c +@@ -2,6 +2,7 @@ + /* - by : Brecht Claerhout */ + /* - improvements: Shudoh Kazuyuki */ + ++#include <ctype.h> + #include <stdlib.h> + #include <stdio.h> + #include <string.h> +--- a/src/sn_generation.c ++++ b/src/sn_generation.c +@@ -13,7 +13,9 @@ + #include "sn_curses.h" + #include "sn_defines.h" + #include "sn_structs.h" ++#include "sn_packets.h" + #include "sn_generation.h" ++#include "sn_interface.h" + + extern volatile int screen_busy; + +--- a/src/sn_interface.c ++++ b/src/sn_interface.c +@@ -4,6 +4,7 @@ + #include "sn_config.h" + + #ifdef INCLUDE_INTERFACE ++#include <ctype.h> + #include <signal.h> + #include <termios.h> + #include <stdlib.h> +--- a/src/sniffit.c ++++ b/src/sniffit.c +@@ -3,6 +3,7 @@ + + #include "sn_config.h" /* Config header file */ + ++#include <ctype.h> + #include <unistd.h> + #include <signal.h> + #include <stdlib.h> + diff --git a/net-analyzer/sniffit/metadata.xml b/net-analyzer/sniffit/metadata.xml index 74c2baebb4ec..b1b6918e47b0 100644 --- a/net-analyzer/sniffit/metadata.xml +++ b/net-analyzer/sniffit/metadata.xml @@ -1,8 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!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> +<upstream> + <remote-id type="github">resurrecting-open-source-projects/sniffit</remote-id> +</upstream> </pkgmetadata> diff --git a/net-analyzer/sniffit/sniffit-0.5-r1.ebuild b/net-analyzer/sniffit/sniffit-0.5-r1.ebuild new file mode 100644 index 000000000000..1247440f794f --- /dev/null +++ b/net-analyzer/sniffit/sniffit-0.5-r1.ebuild @@ -0,0 +1,31 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools + +DESCRIPTION="Interactive Packet Sniffer" +HOMEPAGE="https://github.com/resurrecting-open-source-projects/sniffit" +SRC_URI="https://github.com/resurrecting-open-source-projects/sniffit/archive/${P}.tar.gz" +S="${WORKDIR}"/${PN}-${P} + +LICENSE="BSD" +SLOT="0" +KEYWORDS="amd64 ppc sparc x86" + +RDEPEND=" + net-libs/libpcap + >=sys-libs/ncurses-5.2 +" +DEPEND="${RDEPEND}" + +PATCHES=( + "${FILESDIR}"/${PN}-0.4.0-tinfo.patch + "${FILESDIR}"/${PN}-0.5.0-implicit-func-decl.patch +) + +src_prepare() { + default + eautoreconf +} diff --git a/net-analyzer/sniffit/sniffit-0.5.ebuild b/net-analyzer/sniffit/sniffit-0.5.ebuild deleted file mode 100644 index 3be66ceda23e..000000000000 --- a/net-analyzer/sniffit/sniffit-0.5.ebuild +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit autotools - -DESCRIPTION="Interactive Packet Sniffer" -HOMEPAGE="https://github.com/resurrecting-open-source-projects/sniffit" -SRC_URI="https://github.com/resurrecting-open-source-projects/sniffit/archive/${P}.tar.gz" -SLOT="0" -LICENSE="BSD" -KEYWORDS="amd64 ppc sparc x86" - -RDEPEND=" - net-libs/libpcap - >=sys-libs/ncurses-5.2 -" -DEPEND=" - ${RDEPEND} -" -PATCHES=( - "${FILESDIR}"/${PN}-0.4.0-tinfo.patch -) -S=${WORKDIR}/${PN}-${P} - -src_prepare() { - default - eautoreconf -} diff --git a/net-analyzer/snmpclitools/metadata.xml b/net-analyzer/snmpclitools/metadata.xml index 57e2cb1d8be5..1584f1bcd08d 100644 --- a/net-analyzer/snmpclitools/metadata.xml +++ b/net-analyzer/snmpclitools/metadata.xml @@ -1,10 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type="project"> -<email>python@gentoo.org</email> -</maintainer> -<maintainer type="project"> -<email>netmon@gentoo.org</email> -</maintainer> + <maintainer type="project"> + <email>netmon@gentoo.org</email> + <name>Gentoo network monitoring and analysis project</name> + </maintainer> + <stabilize-allarches/> + <upstream> + <remote-id type="github">etingof/snmpclitools</remote-id> + </upstream> </pkgmetadata> diff --git a/net-analyzer/snmpclitools/snmpclitools-0.6.4-r1.ebuild b/net-analyzer/snmpclitools/snmpclitools-0.6.4-r1.ebuild new file mode 100644 index 000000000000..190b3e6f2f15 --- /dev/null +++ b/net-analyzer/snmpclitools/snmpclitools-0.6.4-r1.ebuild @@ -0,0 +1,20 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISTUTILS_USE_PEP517=setuptools +PYTHON_COMPAT=( python3_{10..11} ) +inherit distutils-r1 + +DESCRIPTION="Pure-Python SNMP management tools, formerly pysnmp-apps" +HOMEPAGE="https://github.com/etingof/snmpclitools" +SRC_URI="https://github.com/etingof/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +RDEPEND="!dev-python/pysnmp-apps + >=dev-python/pysnmp-4.2.2[${PYTHON_USEDEP}] + dev-python/pysnmp-mibs[${PYTHON_USEDEP}]" diff --git a/net-analyzer/snmpclitools/snmpclitools-0.6.4.ebuild b/net-analyzer/snmpclitools/snmpclitools-0.6.4.ebuild deleted file mode 100644 index 4e5827951210..000000000000 --- a/net-analyzer/snmpclitools/snmpclitools-0.6.4.ebuild +++ /dev/null @@ -1,23 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -PYTHON_COMPAT=( python3_{6,7} ) -inherit distutils-r1 - -DESCRIPTION="Pure-Python SNMP management tools, formerly pysnmp-apps" -HOMEPAGE="https://github.com/etingof/snmpclitools" -SRC_URI="https://github.com/etingof/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -RDEPEND=" - !dev-python/pysnmp-apps - >=dev-python/pysnmp-4.2.2[${PYTHON_USEDEP}] - dev-python/pysnmp-mibs[${PYTHON_USEDEP}] -" -DEPEND=" - dev-python/setuptools[${PYTHON_USEDEP}] -" diff --git a/net-analyzer/snmptt/metadata.xml b/net-analyzer/snmptt/metadata.xml index a12fece1902a..fce724ab2251 100644 --- a/net-analyzer/snmptt/metadata.xml +++ b/net-analyzer/snmptt/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>netmon@gentoo.org</email> diff --git a/net-analyzer/snort/Manifest b/net-analyzer/snort/Manifest index b4ad5b9977bc..d74b593f0aeb 100644 --- a/net-analyzer/snort/Manifest +++ b/net-analyzer/snort/Manifest @@ -1,2 +1 @@ -DIST snort-2.9.15.1.tar.gz 6618999 BLAKE2B d9f661b036afa2130d406f8bcfa8d33fca482983e0e4785218e08899104c9069809b089631940109ee31e8d197783d994c58417d94f4b5282702e51466f828fa SHA512 9940f5bcdcf04823f9cb5c3f8efda72f98f6a47bce9f40399dec9ec41d23a386c7f7e44861d82368de31546123b920f9fc617197bbf9c5e750724bf8b9e19590 -DIST snort-2.9.16.tar.gz 6948498 BLAKE2B b089f1caef44cd5243c38eba44e7449b1111b397e42eb1722f64530206532edb413003e6af06d18bc6051ef1ce8cbcf42955d823a56abe061081e99c6492dea7 SHA512 7e4e772d351890cb6ad6db4210e1f302fbb600b3b25182800ffd7e73061a044c2cf6fa927e542a1d20cea4fa3eed522f022b394a9286ada7694309d0c8c3bb75 +DIST snort-2.9.20.tar.gz 7009894 BLAKE2B 0fa1426dce94e2800550691bb433c01371c1688616a528c27803f75837cb5eb430246ee113b2a5a1e374b14b6fd5a57140ce54fe13fb13df94276fbd19aa0a15 SHA512 a9ca37e814baeb978a6db06c3c62256b9e98fdd9fa18ce881a2ce854c0c9a5d92476c3384bec9017b8a67e5d78c6f31ca19956a914f54b817343a159a2a7fced diff --git a/net-analyzer/snort/files/snort-2.9.15.1-fno-common.patch b/net-analyzer/snort/files/snort-2.9.15.1-fno-common.patch deleted file mode 100644 index f5e3b3bbe34a..000000000000 --- a/net-analyzer/snort/files/snort-2.9.15.1-fno-common.patch +++ /dev/null @@ -1,110 +0,0 @@ ---- a/src/preprocessors/Stream6/stream_paf.h -+++ b/src/preprocessors/Stream6/stream_paf.h -@@ -68,12 +68,14 @@ - uint16_t s5_paf_port_registration_all (void* pv, uint16_t port, bool c2s, bool flush); - uint16_t s5_paf_service_registration (void* pv, uint16_t service, bool c2s, bool flush); - --enum FlushMode -+typedef enum - { - FLUSH_MODE_NORMAL = 0, - FLUSH_MODE_PRE_DISCARD, - FLUSH_MODE_DISCARD --}FlushMode; -+} FlushMode_t; -+ -+extern FlushMode_t FlushMode; - - typedef struct { - void* user[MAX_PAF_USER]; // arbitrary user data ---- a/src/sfutil/util_jsnorm.h -+++ b/src/sfutil/util_jsnorm.h -@@ -42,5 +42,7 @@ - uint16_t alerts; - }JSState; - -+extern int hex_lookup[256]; -+ - int JSNormalizeDecode(char *, uint16_t , char *, uint16_t destlen, char **, int *, JSState *, uint8_t *); - void InitJSNormLookupTable(void); ---- a/src/preprocessors/spp_session.h -+++ b/src/preprocessors/spp_session.h -@@ -28,6 +28,10 @@ - #include "decode.h" - #include "session_common.h" - -+#ifdef PERF_PROFILING -+extern PreprocStats sessionPerfStats; -+#endif -+ - /* list of function prototypes for this preprocessor */ - void SetupSessionManager(void); - void SessionReload(struct _SessionCache* lws_cache, uint32_t max_sessions, ---- a/src/preprocessors/spp_httpinspect.c -+++ b/src/preprocessors/spp_httpinspect.c -@@ -161,7 +161,6 @@ - MemPool *http_mempool = NULL; - MemPool *mime_decode_mempool = NULL; - MemPool *mime_log_mempool = NULL; --int hex_lookup[256]; - int valid_lookup[256]; - - char** xffFields = NULL; ---- a/src/detection-plugins/sp_session.c -+++ b/src/detection-plugins/sp_session.c -@@ -80,7 +80,7 @@ - #include "snort.h" - #include "profiler.h" - #ifdef PERF_PROFILING --PreprocStats sessionPerfStats; -+PreprocStats sp_sessionPerfStats; - extern PreprocStats ruleOTNEvalPerfStats; - #endif - -@@ -149,7 +149,7 @@ - /* map the keyword to an initialization/processing function */ - RegisterRuleOption("session", SessionInit, NULL, OPT_TYPE_LOGGING, NULL); - #ifdef PERF_PROFILING -- RegisterPreprocessorProfile("session", &sessionPerfStats, 3, &ruleOTNEvalPerfStats, NULL); -+ RegisterPreprocessorProfile("session", &sp_sessionPerfStats, 3, &ruleOTNEvalPerfStats, NULL); - #endif - DEBUG_WRAP(DebugMessage(DEBUG_PLUGIN, "Plugin: Session Setup\n");); - } -@@ -287,7 +287,7 @@ - FILE *session; /* session file ptr */ - PROFILE_VARS; - -- PREPROC_PROFILE_START(sessionPerfStats); -+ PREPROC_PROFILE_START(sp_sessionPerfStats); - - /* if there's data in this packet */ - if(p != NULL) -@@ -298,7 +298,7 @@ - - if(session == NULL) - { -- PREPROC_PROFILE_END(sessionPerfStats); -+ PREPROC_PROFILE_END(sp_sessionPerfStats); - return DETECTION_OPTION_MATCH; - } - -@@ -308,7 +308,7 @@ - } - } - -- PREPROC_PROFILE_END(sessionPerfStats); -+ PREPROC_PROFILE_END(sp_sessionPerfStats); - return DETECTION_OPTION_MATCH; - } - ---- a/src/detection-plugins/sp_session.h -+++ b/src/detection-plugins/sp_session.h -@@ -29,5 +29,8 @@ - void SetupSession(void); - uint32_t SessionHash(void *d); - int SessionCompare(void *l, void *r); -+#ifdef PERF_PROFILING -+extern PreprocStats sp_sessionPerfStats; -+#endif - - #endif /* __SP_SESSION_H__ */ diff --git a/net-analyzer/snort/files/snort_at.service b/net-analyzer/snort/files/snort_at.service index f764015c2192..40fb0cb1a1d5 100644 --- a/net-analyzer/snort/files/snort_at.service +++ b/net-analyzer/snort/files/snort_at.service @@ -3,7 +3,7 @@ Description=Snort IDS system listening on '%I' [Service] Type=simple -ExecStartPre=/usr/sbin/ip link set up dev %I +ExecStartPre=/bin/ip link set up dev %I ExecStart=/usr/bin/snort --daq-dir /usr/lib/daq/ -A fast -b -p -u snort -g snort -c /etc/snort/snort.conf -i %I ExecReload=/bin/kill -HUP $MAINPID diff --git a/net-analyzer/snort/metadata.xml b/net-analyzer/snort/metadata.xml index b8c76a643bfc..39900f601479 100644 --- a/net-analyzer/snort/metadata.xml +++ b/net-analyzer/snort/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> <email>patrick@gentoo.org</email> @@ -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.15.1.ebuild b/net-analyzer/snort/snort-2.9.15.1.ebuild deleted file mode 100644 index 21bdbd512480..000000000000 --- a/net-analyzer/snort/snort-2.9.15.1.ebuild +++ /dev/null @@ -1,245 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit autotools user systemd tmpfiles multilib - -DESCRIPTION="The de facto standard for intrusion detection/prevention" -HOMEPAGE="https://www.snort.org" -SRC_URI="https://www.snort.org/downloads/archive/${PN}/${P}.tar.gz" -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86" -IUSE="static +gre +ppm +perfprofiling -+non-ether-decoders control-socket file-inspect high-availability -shared-rep side-channel sourcefire linux-smp-stats inline-init-failopen -+threads debug +active-response reload-error-restart open-appid -+react +flexresp3 large-pcap-64bit selinux +libtirpc" - -DEPEND=">=net-libs/libpcap-1.3.0 - >=net-libs/daq-2.0.2 - >=dev-libs/libpcre-8.33 - dev-libs/libdnet - net-libs/libnsl:0= - sys-libs/zlib - !libtirpc? ( sys-libs/glibc[rpc(-)] ) - libtirpc? ( net-libs/libtirpc ) - open-appid? ( dev-lang/luajit:= ) -" - -RDEPEND="${DEPEND} - selinux? ( sec-policy/selinux-snort )" - -REQUIRED_USE="!kernel_linux? ( !shared-rep )" - -PATCHES=( - "${FILESDIR}"/${PN}-2.9.8.3-no-implicit.patch - "${FILESDIR}"/${PN}-2.9.8.3-rpc.patch - "${FILESDIR}"/${PN}-2.9.12-snort.pc.patch - "${FILESDIR}"/${PN}-2.9.15.1-fno-common.patch -) - -pkg_setup() { - # pre_inst() is a better place to put this - # but we need it here for the 'fowners' statements in src_install() - enewgroup snort - enewuser snort -1 -1 /dev/null snort - -} - -src_prepare() { - default - - mv configure.{in,ac} || die - - AT_M4DIR=m4 eautoreconf -} - -src_configure() { - econf \ - $(use_enable !static shared) \ - $(use_enable static) \ - $(use_enable static so-with-static-lib) \ - $(use_enable gre) \ - $(use_enable control-socket) \ - $(use_enable file-inspect) \ - $(use_enable high-availability ha) \ - $(use_enable non-ether-decoders) \ - $(use_enable shared-rep) \ - $(use_enable side-channel) \ - $(use_enable sourcefire) \ - $(use_enable ppm) \ - $(use_enable perfprofiling) \ - $(use_enable linux-smp-stats) \ - $(use_enable inline-init-failopen) \ - $(use_enable open-appid) \ - $(use_enable threads pthread) \ - $(use_enable debug) \ - $(use_enable debug debug-msgs) \ - $(use_enable debug corefiles) \ - $(use_enable !debug dlclose) \ - $(use_enable active-response) \ - $(use_enable reload-error-restart) \ - $(use_enable react) \ - $(use_enable flexresp3) \ - $(use_enable large-pcap-64bit large-pcap) \ - $(use_with libtirpc) \ - --enable-mpls \ - --enable-normalizer \ - --enable-reload \ - --enable-targetbased \ - --disable-build-dynamic-examples \ - --disable-profile \ - --disable-ppm-test \ - --disable-intel-soft-cpm \ - --disable-static-daq -} - -src_install() { - default - - keepdir /var/log/snort \ - /etc/snort/rules \ - /etc/snort/so_rules \ - /usr/$(get_libdir)/snort_dynamicrules - - # config.log and build.log are needed by Sourcefire - # to trouble shoot build problems and bug reports so we are - # perserving them incase the user needs upstream support. - dodoc RELEASE.NOTES ChangeLog \ - doc/* \ - tools/u2boat/README.u2boat - - insinto /etc/snort - doins etc/attribute_table.dtd \ - etc/classification.config \ - etc/gen-msg.map \ - etc/reference.config \ - etc/threshold.conf \ - etc/unicode.map - - # We use snort.conf.distrib because the config file is complicated - # and the one shipped with snort can change drastically between versions. - # Users should migrate setting by hand and not with etc-update. - newins etc/snort.conf snort.conf.distrib - - # config.log and build.log are needed by Sourcefire - # to troubleshoot build problems and bug reports so we are - # preserving them incase the user needs upstream support. - if [ -f "${WORKDIR}/${PF}/config.log" ]; then - dodoc "${WORKDIR}/${PF}/config.log" - fi - if [ -f "${T}/build.log" ]; then - dodoc "${T}/build.log" - fi - - insinto /etc/snort/preproc_rules - doins preproc_rules/decoder.rules \ - preproc_rules/preprocessor.rules \ - preproc_rules/sensitive-data.rules - - fowners -R snort:snort \ - /var/log/snort \ - /etc/snort - - newinitd "${FILESDIR}/snort.rc12" snort - newconfd "${FILESDIR}/snort.confd.2" snort - systemd_newunit "${FILESDIR}/snort_at.service" "snort@.service" - - newtmpfiles "${FILESDIR}"/snort.tmpfiles snort.conf - - # Sourcefire uses Makefiles to install docs causing Bug #297190. - # This removes the unwanted doc directory and rogue Makefiles. - rm -rf "${ED}"/usr/share/doc/snort || die "Failed to remove SF doc directories" - rm "${ED}"/usr/share/doc/"${PF}"/Makefile* || die "Failed to remove doc make files" - - # Remove unneeded .la files (Bug #382863) - rm "${ED}"/usr/$(get_libdir)/snort_dynamicengine/libsf_engine.la || die - rm "${ED}"/usr/$(get_libdir)/snort_dynamicpreprocessor/libsf_*_preproc.la || die "Failed to remove libsf_?_preproc.la" - - # Set the correct lib path for dynamicengine, dynamicpreprocessor, and dynamicdetection - sed -i -e 's|/usr/local/lib|/usr/'$(get_libdir)'|g' \ - "${ED}/etc/snort/snort.conf.distrib" || die - - # Set the correct rule location in the config - sed -i -e 's|RULE_PATH ../rules|RULE_PATH /etc/snort/rules|g' \ - "${ED}/etc/snort/snort.conf.distrib" || die - - # Set the correct preprocessor/decoder rule location in the config - sed -i -e 's|PREPROC_RULE_PATH ../preproc_rules|PREPROC_RULE_PATH /etc/snort/preproc_rules|g' \ - "${ED}/etc/snort/snort.conf.distrib" || die - - # Enable the preprocessor/decoder rules - sed -i -e 's|^# include $PREPROC_RULE_PATH|include $PREPROC_RULE_PATH|g' \ - "${ED}/etc/snort/snort.conf.distrib" || die - - sed -i -e 's|^# dynamicdetection directory|dynamicdetection directory|g' \ - "${ED}/etc/snort/snort.conf.distrib" || die - - # Just some clean up of trailing /'s in the config - sed -i -e 's|snort_dynamicpreprocessor/$|snort_dynamicpreprocessor|g' \ - "${ED}/etc/snort/snort.conf.distrib" || die - - # Make it clear in the config where these are... - sed -i -e 's|^include classification.config|include /etc/snort/classification.config|g' \ - "${ED}/etc/snort/snort.conf.distrib" || die - - sed -i -e 's|^include reference.config|include /etc/snort/reference.config|g' \ - "${ED}/etc/snort/snort.conf.distrib" || die - - # Disable all rule files by default. - sed -i -e 's|^include $RULE_PATH|# include $RULE_PATH|g' \ - "${ED%}/etc/snort/snort.conf.distrib" || die - - # Set the configured DAQ to afpacket - sed -i -e 's|^# config daq: <type>|config daq: afpacket|g' \ - "${ED%}/etc/snort/snort.conf.distrib" || die - - # Set the location of the DAQ modules - sed -i -e 's|^# config daq_dir: <dir>|config daq_dir: /usr/'$(get_libdir)'/daq|g' \ - "${ED%}/etc/snort/snort.conf.distrib" || die - - # Set the DAQ mode to passive - sed -i -e 's|^# config daq_mode: <mode>|config daq_mode: passive|g' \ - "${ED%}/etc/snort/snort.conf.distrib" || die - - # Set snort to run as snort:snort - sed -i -e 's|^# config set_gid:|config set_gid: snort|g' \ - "${ED}/etc/snort/snort.conf.distrib" || die - sed -i -e 's|^# config set_uid:|config set_uid: snort|g' \ - "${ED}/etc/snort/snort.conf.distrib" || die - - # Set the default log dir - sed -i -e 's|^# config logdir:|config logdir: /var/log/snort/|g' \ - "${ED}/etc/snort/snort.conf.distrib" || die - - # Set the correct so_rule location in the config - sed -i -e 's|SO_RULE_PATH ../so_rules|SO_RULE_PATH /etc/snort/so_rules|g' \ - "${ED}/etc/snort/snort.conf.distrib" || die -} - -pkg_postinst() { - tmpfiles_process snort.conf - - einfo "There have been a number of improvements and new features" - einfo "added to ${P}. Please review the RELEASE.NOTES and" - einfo "ChangLog located in /usr/share/doc/${PF}." - einfo - elog "The Sourcefire Vulnerability Research Team (VRT) recommends that" - elog "users migrate their snort.conf customizations to the latest config" - elog "file released by the VRT. You can find the latest version of the" - elog "Snort config file in /etc/snort/snort.conf.distrib." - elog - elog "!! It is important that you migrate to this new snort.conf file !!" - elog - elog "This version of the ebuild includes an updated init.d file and" - elog "conf.d file that rely on options found in the latest Snort" - elog "config file provided by the VRT." - - if use debug; then - elog "You have the 'debug' USE flag enabled. If this has been done to" - elog "troubleshoot an issue by producing a core dump or a back trace," - elog "then you need to also ensure the FEATURES variable in make.conf" - elog "contains the 'nostrip' option." - fi -} diff --git a/net-analyzer/snort/snort-2.9.16-r100.ebuild b/net-analyzer/snort/snort-2.9.16-r100.ebuild deleted file mode 100644 index c3363729e9af..000000000000 --- a/net-analyzer/snort/snort-2.9.16-r100.ebuild +++ /dev/null @@ -1,250 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -LUA_COMPAT=( luajit ) - -inherit autotools lua-single user systemd tmpfiles multilib - -DESCRIPTION="The de facto standard for intrusion detection/prevention" -HOMEPAGE="https://www.snort.org" -SRC_URI="https://www.snort.org/downloads/archive/${PN}/${P}.tar.gz" -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~sparc ~x86" -IUSE="+active-response control-socket debug file-inspect +flexresp3 +gre -high-availability inline-init-failopen large-pcap-64bit +libtirpc -linux-smp-stats +non-ether-decoders open-appid +perfprofiling +ppm +react -reload-error-restart selinux shared-rep side-channel sourcefire static -+threads" - -DEPEND=">=net-libs/libpcap-1.3.0 - >=net-libs/daq-2.0.2 - >=dev-libs/libpcre-8.33 - dev-libs/libdnet - net-libs/libnsl:0= - sys-libs/zlib - !libtirpc? ( sys-libs/glibc[rpc(-)] ) - libtirpc? ( net-libs/libtirpc ) - open-appid? ( ${LUA_DEPS} ) -" - -RDEPEND="${DEPEND} - selinux? ( sec-policy/selinux-snort )" - -REQUIRED_USE="!kernel_linux? ( !shared-rep ) - open-appid? ( ${LUA_REQUIRED_USE} )" - -PATCHES=( - "${FILESDIR}"/${PN}-2.9.8.3-no-implicit.patch - "${FILESDIR}"/${PN}-2.9.8.3-rpc.patch - "${FILESDIR}"/${PN}-2.9.12-snort.pc.patch - "${FILESDIR}"/${PN}-2.9.15.1-fno-common.patch -) - -pkg_setup() { - # pre_inst() is a better place to put this - # but we need it here for the 'fowners' statements in src_install() - enewgroup snort - enewuser snort -1 -1 /dev/null snort - - use open-appid && lua-single_pkg_setup -} - -src_prepare() { - default - - mv configure.{in,ac} || die - - AT_M4DIR=m4 eautoreconf -} - -src_configure() { - econf \ - $(use_enable !static shared) \ - $(use_enable static) \ - $(use_enable static so-with-static-lib) \ - $(use_enable gre) \ - $(use_enable control-socket) \ - $(use_enable file-inspect) \ - $(use_enable high-availability ha) \ - $(use_enable non-ether-decoders) \ - $(use_enable shared-rep) \ - $(use_enable side-channel) \ - $(use_enable sourcefire) \ - $(use_enable ppm) \ - $(use_enable perfprofiling) \ - $(use_enable linux-smp-stats) \ - $(use_enable inline-init-failopen) \ - $(use_enable open-appid) \ - $(use_enable threads pthread) \ - $(use_enable debug) \ - $(use_enable debug debug-msgs) \ - $(use_enable debug corefiles) \ - $(use_enable !debug dlclose) \ - $(use_enable active-response) \ - $(use_enable reload-error-restart) \ - $(use_enable react) \ - $(use_enable flexresp3) \ - $(use_enable large-pcap-64bit large-pcap) \ - $(use_with libtirpc) \ - --enable-mpls \ - --enable-normalizer \ - --enable-reload \ - --enable-targetbased \ - --disable-build-dynamic-examples \ - --disable-profile \ - --disable-ppm-test \ - --disable-intel-soft-cpm \ - --disable-static-daq -} - -src_install() { - default - - keepdir /var/log/snort \ - /etc/snort/rules \ - /etc/snort/so_rules \ - /usr/$(get_libdir)/snort_dynamicrules - - # config.log and build.log are needed by Sourcefire - # to trouble shoot build problems and bug reports so we are - # perserving them incase the user needs upstream support. - dodoc RELEASE.NOTES ChangeLog \ - doc/* \ - tools/u2boat/README.u2boat - - insinto /etc/snort - doins etc/attribute_table.dtd \ - etc/classification.config \ - etc/gen-msg.map \ - etc/reference.config \ - etc/threshold.conf \ - etc/unicode.map - - # We use snort.conf.distrib because the config file is complicated - # and the one shipped with snort can change drastically between versions. - # Users should migrate setting by hand and not with etc-update. - newins etc/snort.conf snort.conf.distrib - - # config.log and build.log are needed by Sourcefire - # to troubleshoot build problems and bug reports so we are - # preserving them incase the user needs upstream support. - if [ -f "${WORKDIR}/${PF}/config.log" ]; then - dodoc "${WORKDIR}/${PF}/config.log" - fi - if [ -f "${T}/build.log" ]; then - dodoc "${T}/build.log" - fi - - insinto /etc/snort/preproc_rules - doins preproc_rules/decoder.rules \ - preproc_rules/preprocessor.rules \ - preproc_rules/sensitive-data.rules - - fowners -R snort:snort \ - /var/log/snort \ - /etc/snort - - newinitd "${FILESDIR}/snort.rc12" snort - newconfd "${FILESDIR}/snort.confd.2" snort - systemd_newunit "${FILESDIR}/snort_at.service" "snort@.service" - - newtmpfiles "${FILESDIR}"/snort.tmpfiles snort.conf - - # Sourcefire uses Makefiles to install docs causing Bug #297190. - # This removes the unwanted doc directory and rogue Makefiles. - rm -rf "${ED}"/usr/share/doc/snort || die "Failed to remove SF doc directories" - rm "${ED}"/usr/share/doc/"${PF}"/Makefile* || die "Failed to remove doc make files" - - # Remove unneeded .la files (Bug #382863) - rm "${ED}"/usr/$(get_libdir)/snort_dynamicengine/libsf_engine.la || die - rm "${ED}"/usr/$(get_libdir)/snort_dynamicpreprocessor/libsf_*_preproc.la || die "Failed to remove libsf_?_preproc.la" - - # Set the correct lib path for dynamicengine, dynamicpreprocessor, and dynamicdetection - sed -i -e 's|/usr/local/lib|/usr/'$(get_libdir)'|g' \ - "${ED}/etc/snort/snort.conf.distrib" || die - - # Set the correct rule location in the config - sed -i -e 's|RULE_PATH ../rules|RULE_PATH /etc/snort/rules|g' \ - "${ED}/etc/snort/snort.conf.distrib" || die - - # Set the correct preprocessor/decoder rule location in the config - sed -i -e 's|PREPROC_RULE_PATH ../preproc_rules|PREPROC_RULE_PATH /etc/snort/preproc_rules|g' \ - "${ED}/etc/snort/snort.conf.distrib" || die - - # Enable the preprocessor/decoder rules - sed -i -e 's|^# include $PREPROC_RULE_PATH|include $PREPROC_RULE_PATH|g' \ - "${ED}/etc/snort/snort.conf.distrib" || die - - sed -i -e 's|^# dynamicdetection directory|dynamicdetection directory|g' \ - "${ED}/etc/snort/snort.conf.distrib" || die - - # Just some clean up of trailing /'s in the config - sed -i -e 's|snort_dynamicpreprocessor/$|snort_dynamicpreprocessor|g' \ - "${ED}/etc/snort/snort.conf.distrib" || die - - # Make it clear in the config where these are... - sed -i -e 's|^include classification.config|include /etc/snort/classification.config|g' \ - "${ED}/etc/snort/snort.conf.distrib" || die - - sed -i -e 's|^include reference.config|include /etc/snort/reference.config|g' \ - "${ED}/etc/snort/snort.conf.distrib" || die - - # Disable all rule files by default. - sed -i -e 's|^include $RULE_PATH|# include $RULE_PATH|g' \ - "${ED%}/etc/snort/snort.conf.distrib" || die - - # Set the configured DAQ to afpacket - sed -i -e 's|^# config daq: <type>|config daq: afpacket|g' \ - "${ED%}/etc/snort/snort.conf.distrib" || die - - # Set the location of the DAQ modules - sed -i -e 's|^# config daq_dir: <dir>|config daq_dir: /usr/'$(get_libdir)'/daq|g' \ - "${ED%}/etc/snort/snort.conf.distrib" || die - - # Set the DAQ mode to passive - sed -i -e 's|^# config daq_mode: <mode>|config daq_mode: passive|g' \ - "${ED%}/etc/snort/snort.conf.distrib" || die - - # Set snort to run as snort:snort - sed -i -e 's|^# config set_gid:|config set_gid: snort|g' \ - "${ED}/etc/snort/snort.conf.distrib" || die - sed -i -e 's|^# config set_uid:|config set_uid: snort|g' \ - "${ED}/etc/snort/snort.conf.distrib" || die - - # Set the default log dir - sed -i -e 's|^# config logdir:|config logdir: /var/log/snort/|g' \ - "${ED}/etc/snort/snort.conf.distrib" || die - - # Set the correct so_rule location in the config - sed -i -e 's|SO_RULE_PATH ../so_rules|SO_RULE_PATH /etc/snort/so_rules|g' \ - "${ED}/etc/snort/snort.conf.distrib" || die -} - -pkg_postinst() { - tmpfiles_process snort.conf - - einfo "There have been a number of improvements and new features" - einfo "added to ${P}. Please review the RELEASE.NOTES and" - einfo "ChangLog located in /usr/share/doc/${PF}." - einfo - elog "The Sourcefire Vulnerability Research Team (VRT) recommends that" - elog "users migrate their snort.conf customizations to the latest config" - elog "file released by the VRT. You can find the latest version of the" - elog "Snort config file in /etc/snort/snort.conf.distrib." - elog - elog "!! It is important that you migrate to this new snort.conf file !!" - elog - elog "This version of the ebuild includes an updated init.d file and" - elog "conf.d file that rely on options found in the latest Snort" - elog "config file provided by the VRT." - - if use debug; then - elog "You have the 'debug' USE flag enabled. If this has been done to" - elog "troubleshoot an issue by producing a core dump or a back trace," - elog "then you need to also ensure the FEATURES variable in make.conf" - elog "contains the 'nostrip' option." - fi -} diff --git a/net-analyzer/snort/snort-2.9.16.ebuild b/net-analyzer/snort/snort-2.9.16.ebuild deleted file mode 100644 index 6e7835a53107..000000000000 --- a/net-analyzer/snort/snort-2.9.16.ebuild +++ /dev/null @@ -1,245 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit autotools user systemd tmpfiles multilib - -DESCRIPTION="The de facto standard for intrusion detection/prevention" -HOMEPAGE="https://www.snort.org" -SRC_URI="https://www.snort.org/downloads/archive/${PN}/${P}.tar.gz" -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86" -IUSE="+active-response control-socket debug file-inspect +flexresp3 +gre -high-availability inline-init-failopen large-pcap-64bit +libtirpc -linux-smp-stats +non-ether-decoders open-appid +perfprofiling +ppm +react -reload-error-restart selinux shared-rep side-channel sourcefire static -+threads" - -DEPEND=">=net-libs/libpcap-1.3.0 - >=net-libs/daq-2.0.2 - >=dev-libs/libpcre-8.33 - dev-libs/libdnet - net-libs/libnsl:0= - sys-libs/zlib - !libtirpc? ( sys-libs/glibc[rpc(-)] ) - libtirpc? ( net-libs/libtirpc ) - open-appid? ( dev-lang/luajit:= ) -" - -RDEPEND="${DEPEND} - selinux? ( sec-policy/selinux-snort )" - -REQUIRED_USE="!kernel_linux? ( !shared-rep )" - -PATCHES=( - "${FILESDIR}"/${PN}-2.9.8.3-no-implicit.patch - "${FILESDIR}"/${PN}-2.9.8.3-rpc.patch - "${FILESDIR}"/${PN}-2.9.12-snort.pc.patch - "${FILESDIR}"/${PN}-2.9.15.1-fno-common.patch -) - -pkg_setup() { - # pre_inst() is a better place to put this - # but we need it here for the 'fowners' statements in src_install() - enewgroup snort - enewuser snort -1 -1 /dev/null snort - -} - -src_prepare() { - default - - mv configure.{in,ac} || die - - AT_M4DIR=m4 eautoreconf -} - -src_configure() { - econf \ - $(use_enable !static shared) \ - $(use_enable static) \ - $(use_enable static so-with-static-lib) \ - $(use_enable gre) \ - $(use_enable control-socket) \ - $(use_enable file-inspect) \ - $(use_enable high-availability ha) \ - $(use_enable non-ether-decoders) \ - $(use_enable shared-rep) \ - $(use_enable side-channel) \ - $(use_enable sourcefire) \ - $(use_enable ppm) \ - $(use_enable perfprofiling) \ - $(use_enable linux-smp-stats) \ - $(use_enable inline-init-failopen) \ - $(use_enable open-appid) \ - $(use_enable threads pthread) \ - $(use_enable debug) \ - $(use_enable debug debug-msgs) \ - $(use_enable debug corefiles) \ - $(use_enable !debug dlclose) \ - $(use_enable active-response) \ - $(use_enable reload-error-restart) \ - $(use_enable react) \ - $(use_enable flexresp3) \ - $(use_enable large-pcap-64bit large-pcap) \ - $(use_with libtirpc) \ - --enable-mpls \ - --enable-normalizer \ - --enable-reload \ - --enable-targetbased \ - --disable-build-dynamic-examples \ - --disable-profile \ - --disable-ppm-test \ - --disable-intel-soft-cpm \ - --disable-static-daq -} - -src_install() { - default - - keepdir /var/log/snort \ - /etc/snort/rules \ - /etc/snort/so_rules \ - /usr/$(get_libdir)/snort_dynamicrules - - # config.log and build.log are needed by Sourcefire - # to trouble shoot build problems and bug reports so we are - # perserving them incase the user needs upstream support. - dodoc RELEASE.NOTES ChangeLog \ - doc/* \ - tools/u2boat/README.u2boat - - insinto /etc/snort - doins etc/attribute_table.dtd \ - etc/classification.config \ - etc/gen-msg.map \ - etc/reference.config \ - etc/threshold.conf \ - etc/unicode.map - - # We use snort.conf.distrib because the config file is complicated - # and the one shipped with snort can change drastically between versions. - # Users should migrate setting by hand and not with etc-update. - newins etc/snort.conf snort.conf.distrib - - # config.log and build.log are needed by Sourcefire - # to troubleshoot build problems and bug reports so we are - # preserving them incase the user needs upstream support. - if [ -f "${WORKDIR}/${PF}/config.log" ]; then - dodoc "${WORKDIR}/${PF}/config.log" - fi - if [ -f "${T}/build.log" ]; then - dodoc "${T}/build.log" - fi - - insinto /etc/snort/preproc_rules - doins preproc_rules/decoder.rules \ - preproc_rules/preprocessor.rules \ - preproc_rules/sensitive-data.rules - - fowners -R snort:snort \ - /var/log/snort \ - /etc/snort - - newinitd "${FILESDIR}/snort.rc12" snort - newconfd "${FILESDIR}/snort.confd.2" snort - systemd_newunit "${FILESDIR}/snort_at.service" "snort@.service" - - newtmpfiles "${FILESDIR}"/snort.tmpfiles snort.conf - - # Sourcefire uses Makefiles to install docs causing Bug #297190. - # This removes the unwanted doc directory and rogue Makefiles. - rm -rf "${ED}"/usr/share/doc/snort || die "Failed to remove SF doc directories" - rm "${ED}"/usr/share/doc/"${PF}"/Makefile* || die "Failed to remove doc make files" - - # Remove unneeded .la files (Bug #382863) - rm "${ED}"/usr/$(get_libdir)/snort_dynamicengine/libsf_engine.la || die - rm "${ED}"/usr/$(get_libdir)/snort_dynamicpreprocessor/libsf_*_preproc.la || die "Failed to remove libsf_?_preproc.la" - - # Set the correct lib path for dynamicengine, dynamicpreprocessor, and dynamicdetection - sed -i -e 's|/usr/local/lib|/usr/'$(get_libdir)'|g' \ - "${ED}/etc/snort/snort.conf.distrib" || die - - # Set the correct rule location in the config - sed -i -e 's|RULE_PATH ../rules|RULE_PATH /etc/snort/rules|g' \ - "${ED}/etc/snort/snort.conf.distrib" || die - - # Set the correct preprocessor/decoder rule location in the config - sed -i -e 's|PREPROC_RULE_PATH ../preproc_rules|PREPROC_RULE_PATH /etc/snort/preproc_rules|g' \ - "${ED}/etc/snort/snort.conf.distrib" || die - - # Enable the preprocessor/decoder rules - sed -i -e 's|^# include $PREPROC_RULE_PATH|include $PREPROC_RULE_PATH|g' \ - "${ED}/etc/snort/snort.conf.distrib" || die - - sed -i -e 's|^# dynamicdetection directory|dynamicdetection directory|g' \ - "${ED}/etc/snort/snort.conf.distrib" || die - - # Just some clean up of trailing /'s in the config - sed -i -e 's|snort_dynamicpreprocessor/$|snort_dynamicpreprocessor|g' \ - "${ED}/etc/snort/snort.conf.distrib" || die - - # Make it clear in the config where these are... - sed -i -e 's|^include classification.config|include /etc/snort/classification.config|g' \ - "${ED}/etc/snort/snort.conf.distrib" || die - - sed -i -e 's|^include reference.config|include /etc/snort/reference.config|g' \ - "${ED}/etc/snort/snort.conf.distrib" || die - - # Disable all rule files by default. - sed -i -e 's|^include $RULE_PATH|# include $RULE_PATH|g' \ - "${ED%}/etc/snort/snort.conf.distrib" || die - - # Set the configured DAQ to afpacket - sed -i -e 's|^# config daq: <type>|config daq: afpacket|g' \ - "${ED%}/etc/snort/snort.conf.distrib" || die - - # Set the location of the DAQ modules - sed -i -e 's|^# config daq_dir: <dir>|config daq_dir: /usr/'$(get_libdir)'/daq|g' \ - "${ED%}/etc/snort/snort.conf.distrib" || die - - # Set the DAQ mode to passive - sed -i -e 's|^# config daq_mode: <mode>|config daq_mode: passive|g' \ - "${ED%}/etc/snort/snort.conf.distrib" || die - - # Set snort to run as snort:snort - sed -i -e 's|^# config set_gid:|config set_gid: snort|g' \ - "${ED}/etc/snort/snort.conf.distrib" || die - sed -i -e 's|^# config set_uid:|config set_uid: snort|g' \ - "${ED}/etc/snort/snort.conf.distrib" || die - - # Set the default log dir - sed -i -e 's|^# config logdir:|config logdir: /var/log/snort/|g' \ - "${ED}/etc/snort/snort.conf.distrib" || die - - # Set the correct so_rule location in the config - sed -i -e 's|SO_RULE_PATH ../so_rules|SO_RULE_PATH /etc/snort/so_rules|g' \ - "${ED}/etc/snort/snort.conf.distrib" || die -} - -pkg_postinst() { - tmpfiles_process snort.conf - - einfo "There have been a number of improvements and new features" - einfo "added to ${P}. Please review the RELEASE.NOTES and" - einfo "ChangLog located in /usr/share/doc/${PF}." - einfo - elog "The Sourcefire Vulnerability Research Team (VRT) recommends that" - elog "users migrate their snort.conf customizations to the latest config" - elog "file released by the VRT. You can find the latest version of the" - elog "Snort config file in /etc/snort/snort.conf.distrib." - elog - elog "!! It is important that you migrate to this new snort.conf file !!" - elog - elog "This version of the ebuild includes an updated init.d file and" - elog "conf.d file that rely on options found in the latest Snort" - elog "config file provided by the VRT." - - if use debug; then - elog "You have the 'debug' USE flag enabled. If this has been done to" - elog "troubleshoot an issue by producing a core dump or a back trace," - elog "then you need to also ensure the FEATURES variable in make.conf" - elog "contains the 'nostrip' option." - fi -} diff --git a/net-analyzer/snort/snort-2.9.20.ebuild b/net-analyzer/snort/snort-2.9.20.ebuild new file mode 100644 index 000000000000..1bfd9d0de604 --- /dev/null +++ b/net-analyzer/snort/snort-2.9.20.ebuild @@ -0,0 +1,252 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +LUA_COMPAT=( luajit ) + +inherit autotools flag-o-matic lua-single systemd tmpfiles + +DESCRIPTION="The de facto standard for intrusion detection/prevention" +HOMEPAGE="https://www.snort.org" +SRC_URI="https://www.snort.org/downloads/archive/${PN}/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" + +KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~sparc ~x86" +IUSE="+active-response control-socket debug file-inspect +flexresp3 +gre +high-availability inline-init-failopen large-pcap-64bit +libtirpc +linux-smp-stats +non-ether-decoders open-appid +perfprofiling +ppm +react +reload-error-restart selinux shared-rep side-channel sourcefire +threads" + +DEPEND="acct-user/snort + acct-group/snort + dev-libs/libdnet + >=dev-libs/libpcre-8.33 + net-libs/libnsl:0= + >=net-libs/libpcap-1.3.0 + sys-libs/zlib + !libtirpc? ( sys-libs/glibc[rpc(-)] ) + libtirpc? ( net-libs/libtirpc ) + open-appid? ( ${LUA_DEPS} )" +BDEPEND=">=net-libs/daq-2.0.2" +RDEPEND="${DEPEND} + selinux? ( sec-policy/selinux-snort )" + +REQUIRED_USE="!kernel_linux? ( !shared-rep ) + open-appid? ( ${LUA_REQUIRED_USE} )" + +PATCHES=( + "${FILESDIR}/${PN}-2.9.8.3-no-implicit.patch" + "${FILESDIR}/${PN}-2.9.8.3-rpc.patch" + "${FILESDIR}/${PN}-2.9.12-snort.pc.patch" +) + +pkg_setup() { + use open-appid && lua-single_pkg_setup +} + +src_prepare() { + default + + mv configure.{in,ac} || 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) \ + $(use_enable file-inspect) \ + $(use_enable high-availability ha) \ + $(use_enable non-ether-decoders) \ + $(use_enable shared-rep) \ + $(use_enable side-channel) \ + $(use_enable sourcefire) \ + $(use_enable ppm) \ + $(use_enable perfprofiling) \ + $(use_enable linux-smp-stats) \ + $(use_enable inline-init-failopen) \ + $(use_enable open-appid) \ + $(use_enable threads pthread) \ + $(use_enable debug) \ + $(use_enable debug debug-msgs) \ + $(use_enable debug corefiles) \ + $(use_enable !debug dlclose) \ + $(use_enable active-response) \ + $(use_enable reload-error-restart) \ + $(use_enable react) \ + $(use_enable flexresp3) \ + $(use_enable large-pcap-64bit large-pcap) \ + $(use_with libtirpc) \ + --enable-mpls \ + --enable-normalizer \ + --enable-reload \ + --enable-targetbased \ + --disable-build-dynamic-examples \ + --disable-profile \ + --disable-ppm-test \ + --disable-intel-soft-cpm \ + --disable-static-daq \ + --disable-static \ + --disable-so-with-static-lib +} + +src_install() { + default + + keepdir /var/log/snort \ + /etc/snort/rules \ + /etc/snort/so_rules \ + /usr/$(get_libdir)/snort_dynamicrules + + # config.log and build.log are needed by Sourcefire + # to trouble shoot build problems and bug reports so we are + # perserving them incase the user needs upstream support. + dodoc RELEASE.NOTES ChangeLog \ + doc/* \ + tools/u2boat/README.u2boat + + insinto /etc/snort + doins etc/attribute_table.dtd \ + etc/classification.config \ + etc/gen-msg.map \ + etc/reference.config \ + etc/threshold.conf \ + etc/unicode.map + + # We use snort.conf.distrib because the config file is complicated + # and the one shipped with snort can change drastically between versions. + # Users should migrate setting by hand and not with etc-update. + newins etc/snort.conf snort.conf.distrib + + # config.log and build.log are needed by Sourcefire + # to troubleshoot build problems and bug reports so we are + # preserving them incase the user needs upstream support. + if [ -f "${WORKDIR}/${PF}/config.log" ]; then + dodoc "${WORKDIR}/${PF}/config.log" + fi + if [ -f "${T}/build.log" ]; then + dodoc "${T}/build.log" + fi + + insinto /etc/snort/preproc_rules + doins preproc_rules/decoder.rules \ + preproc_rules/preprocessor.rules \ + preproc_rules/sensitive-data.rules + + fowners -R snort:snort \ + /var/log/snort \ + /etc/snort + + newinitd "${FILESDIR}/snort.rc12" snort + newconfd "${FILESDIR}/snort.confd.2" snort + systemd_newunit "${FILESDIR}/snort_at.service" "snort@.service" + + newtmpfiles "${FILESDIR}"/snort.tmpfiles snort.conf + + # Sourcefire uses Makefiles to install docs causing Bug #297190. + # This removes the unwanted doc directory and rogue Makefiles. + rm -rf "${ED}"/usr/share/doc/snort || die "Failed to remove SF doc directories" + rm "${ED}"/usr/share/doc/"${PF}"/Makefile* || die "Failed to remove doc make files" + + # Remove unneeded .la files (Bug #382863) + find "${ED}" -name '*.la' -type f -delete || die + + # Set the correct lib path for dynamicengine, dynamicpreprocessor, and dynamicdetection + sed -i -e 's|/usr/local/lib|/usr/'$(get_libdir)'|g' \ + "${ED}/etc/snort/snort.conf.distrib" || die + + # Set the correct rule location in the config + sed -i -e 's|RULE_PATH ../rules|RULE_PATH /etc/snort/rules|g' \ + "${ED}/etc/snort/snort.conf.distrib" || die + + # Set the correct preprocessor/decoder rule location in the config + sed -i -e 's|PREPROC_RULE_PATH ../preproc_rules|PREPROC_RULE_PATH /etc/snort/preproc_rules|g' \ + "${ED}/etc/snort/snort.conf.distrib" || die + + # Enable the preprocessor/decoder rules + sed -i -e 's|^# include $PREPROC_RULE_PATH|include $PREPROC_RULE_PATH|g' \ + "${ED}/etc/snort/snort.conf.distrib" || die + + sed -i -e 's|^# dynamicdetection directory|dynamicdetection directory|g' \ + "${ED}/etc/snort/snort.conf.distrib" || die + + # Just some clean up of trailing /'s in the config + sed -i -e 's|snort_dynamicpreprocessor/$|snort_dynamicpreprocessor|g' \ + "${ED}/etc/snort/snort.conf.distrib" || die + + # Make it clear in the config where these are... + sed -i -e 's|^include classification.config|include /etc/snort/classification.config|g' \ + "${ED}/etc/snort/snort.conf.distrib" || die + + sed -i -e 's|^include reference.config|include /etc/snort/reference.config|g' \ + "${ED}/etc/snort/snort.conf.distrib" || die + + # Disable all rule files by default. + sed -i -e 's|^include $RULE_PATH|# include $RULE_PATH|g' \ + "${ED%}/etc/snort/snort.conf.distrib" || die + + # Set the configured DAQ to afpacket + sed -i -e 's|^# config daq: <type>|config daq: afpacket|g' \ + "${ED%}/etc/snort/snort.conf.distrib" || die + + # Set the location of the DAQ modules + sed -i -e 's|^# config daq_dir: <dir>|config daq_dir: /usr/'$(get_libdir)'/daq|g' \ + "${ED%}/etc/snort/snort.conf.distrib" || die + + # Set the DAQ mode to passive + sed -i -e 's|^# config daq_mode: <mode>|config daq_mode: passive|g' \ + "${ED%}/etc/snort/snort.conf.distrib" || die + + # Set snort to run as snort:snort + sed -i -e 's|^# config set_gid:|config set_gid: snort|g' \ + "${ED}/etc/snort/snort.conf.distrib" || die + sed -i -e 's|^# config set_uid:|config set_uid: snort|g' \ + "${ED}/etc/snort/snort.conf.distrib" || die + + # Set the default log dir + sed -i -e 's|^# config logdir:|config logdir: /var/log/snort/|g' \ + "${ED}/etc/snort/snort.conf.distrib" || die + + # Set the correct so_rule location in the config + sed -i -e 's|SO_RULE_PATH ../so_rules|SO_RULE_PATH /etc/snort/so_rules|g' \ + "${ED}/etc/snort/snort.conf.distrib" || die +} + +pkg_postinst() { + tmpfiles_process snort.conf + + einfo "There have been a number of improvements and new features" + einfo "added to ${P}. Please review the RELEASE.NOTES and" + einfo "ChangLog located in /usr/share/doc/${PF}." + einfo + elog "The Sourcefire Vulnerability Research Team (VRT) recommends that" + elog "users migrate their snort.conf customizations to the latest config" + elog "file released by the VRT. You can find the latest version of the" + elog "Snort config file in /etc/snort/snort.conf.distrib." + elog + elog "!! It is important that you migrate to this new snort.conf file !!" + elog + elog "This version of the ebuild includes an updated init.d file and" + elog "conf.d file that rely on options found in the latest Snort" + elog "config file provided by the VRT." + + if use debug; then + elog "You have the 'debug' USE flag enabled. If this has been done to" + elog "troubleshoot an issue by producing a core dump or a back trace," + elog "then you need to also ensure the FEATURES variable in make.conf" + elog "contains the 'nostrip' option." + fi +} diff --git a/net-analyzer/snortalog/metadata.xml b/net-analyzer/snortalog/metadata.xml index 74c2baebb4ec..dce3f3be66c0 100644 --- a/net-analyzer/snortalog/metadata.xml +++ b/net-analyzer/snortalog/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>netmon@gentoo.org</email> diff --git a/net-analyzer/snortalog/snortalog-2.4.3-r1.ebuild b/net-analyzer/snortalog/snortalog-2.4.3-r1.ebuild index 18e2cd14b905..960612b2f88f 100644 --- a/net-analyzer/snortalog/snortalog-2.4.3-r1.ebuild +++ b/net-analyzer/snortalog/snortalog-2.4.3-r1.ebuild @@ -1,17 +1,19 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 -inherit eutils +EAPI=7 MY_P="${PN}_v${PV}" -DESCRIPTION="a powerful perl script that summarizes snort logs" +inherit edos2unix + +DESCRIPTION="A powerful perl script that summarizes snort logs" HOMEPAGE="http://jeremy.chartier.free.fr/snortalog/" SRC_URI="http://jeremy.chartier.free.fr/snortalog/downloads/${PN}/${MY_P}.tar" +S="${WORKDIR}" + LICENSE="GPL-2" SLOT="0" - KEYWORDS="~amd64 ~arm ~ppc ~sparc ~x86" IUSE="tk" @@ -24,10 +26,16 @@ RDEPEND=" tk? ( dev-perl/Tk ) " -S=${WORKDIR} - src_prepare() { - edos2unix $(find conf/ modules/ -type f) ${PN}.* CHANGES + default + + local convert=$(find conf/ modules/ -type f || die) + convert+=( ${PN}.* CHANGES ) + + local item + for item in ${convert[@]} ; do + edos2unix "${item}" + done # fix paths, erroneous can access message sed -i \ diff --git a/net-analyzer/snortsam/Manifest b/net-analyzer/snortsam/Manifest deleted file mode 100644 index e341252bae98..000000000000 --- a/net-analyzer/snortsam/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST snortsam-src-2.70.tar.gz 1971624 BLAKE2B 10f26afb8addffb52db099e0c376a9adb884b625503233b72203070cadc79a688c7a6950014759d6fb58c8844899482057d9701e9eaa5e9d12066f10e88d6421 SHA512 e0b6d53dfc0963e5a0012e25c1cd15f76263cc0d0158f6a50eab3876f1ae40c47eeafb7309113d27f1ca92d5491a19e32748c3bf51754be9320346ebbf26e5b1 diff --git a/net-analyzer/snortsam/files/snortsam-2.70-gentoo.patch b/net-analyzer/snortsam/files/snortsam-2.70-gentoo.patch deleted file mode 100644 index f2d8fd330d33..000000000000 --- a/net-analyzer/snortsam/files/snortsam-2.70-gentoo.patch +++ /dev/null @@ -1,140 +0,0 @@ - makesnortsam.sh | 66 +++++++++++++++++++++------------------------------------ - 1 file changed, 24 insertions(+), 42 deletions(-) - -diff --git a/makesnortsam.sh b/makesnortsam.sh -index 64c6eb6..37f66c9 100644 ---- a/makesnortsam.sh -+++ b/makesnortsam.sh -@@ -36,8 +36,7 @@ SSP_OBSD_SRC="ssp_pf.c ssp_pf2.c" - SSP_BSD_SRC="ssp_ipf.c ssp_ipfw2.c ssp_pf2.c" - SSP_SUNOS_SRC="ssp_ipf.c" - --CFLAGS="-O2 -D${systype}" --LDFLAGS= -+CFLAGS=" ${CFLAGS} -D${systype}" - - # OS specific flags - LINUX_CFLAGS= -@@ -72,23 +71,23 @@ case "$1" in - - case "${systype}" in - Linux*) -- gcc ${CFLAGS} ${LINUX_CFLAGS} ${OPSEC_CFLAGS} ${LDFLAGS} ${LINUX_LDFLAGS} ${OPSEC_LDFLAGS} ${OPSEC_LIBS} \ -- ${SSP_GENERIC_SRC} ${SSP_LINUX_SRC} -o ${SNORTSAM} -+ ${CC} ${CFLAGS} ${LINUX_CFLAGS} ${OPSEC_CFLAGS} ${LDFLAGS} \ -+ ${SSP_GENERIC_SRC} ${SSP_LINUX_SRC} -o ${SNORTSAM} ${LINUX_LDFLAGS} ${OPSEC_LDFLAGS} ${OPSEC_LIBS} - ;; - - OpenBSD*) -- #gcc ${CFLAGS} ${OBSD_CFLAGS} ${OPSEC_CFLAGS} ${LDFLAGS} ${OBSD_LDFLAGS} ${OPSEC_LIBS} /usr/lib/libnsl.a -o ${SNORTSAM} -- gcc ${CFLAGS} ${OBSD_CFLAGS} ${OPSEC_CFLAGS} ${LDFLAGS} ${OBSD_LDFLAGS} ${OPSEC_LDFLAGS} ${OPSEC_LIBS} \ -+ #${CC} ${CFLAGS} ${OBSD_CFLAGS} ${OPSEC_CFLAGS} ${LDFLAGS} ${OBSD_LDFLAGS} ${OPSEC_LIBS} /usr/lib/libnsl.a -o ${SNORTSAM} -+ ${CC} ${CFLAGS} ${OBSD_CFLAGS} ${OPSEC_CFLAGS} ${LDFLAGS} ${OBSD_LDFLAGS} ${OPSEC_LDFLAGS} ${OPSEC_LIBS} \ - ${SSP_GENERIC_SRC} ${SSP_OBSD_SRC} -o ${SNORTSAM} - ;; - - *BSD*) -- gcc ${CFLAGS} ${BSD_CFLAGS} ${OPSEC_CFLAGS} ${LDFLAGS} ${BSD_LDFLAGS} ${OPSEC_LDFLAGS} ${OPSEC_LIBS} \ -+ ${CC} ${CFLAGS} ${BSD_CFLAGS} ${OPSEC_CFLAGS} ${LDFLAGS} ${BSD_LDFLAGS} ${OPSEC_LDFLAGS} ${OPSEC_LIBS} \ - ${SSP_GENERIC_SRC} ${SSP_BSD_SRC} -o ${SNORTSAM} - ;; - - SunOS*) -- gcc ${CFLAGS} ${SUNOS_CFLAGS} ${OPSEC_SUNOS_CFLAGS} ${LDFLAGS} ${SUNOS_LDFLAGS} ${OPSEC_SUNOS_LDFLAGS} \ -+ ${CC} ${CFLAGS} ${SUNOS_CFLAGS} ${OPSEC_SUNOS_CFLAGS} ${LDFLAGS} ${SUNOS_LDFLAGS} ${OPSEC_SUNOS_LDFLAGS} \ - ${SSP_GENERIC_SRC} ${SSP_SUNOS_SRC} -o ${SNORTSAM} - ;; - esac -@@ -104,23 +103,23 @@ case "$1" in - - case "${systype}" in - Linux*) -- gcc ${CFLAGS} ${LINUX_CFLAGS} ${OPSEC_CFLAGS} ${LDFLAGS} ${LINUX_LDFLAGS} ${OPSEC_LDFLAGS} ${OPSEC_LIBS} \ -+ ${CC} ${CFLAGS} ${LINUX_CFLAGS} ${OPSEC_CFLAGS} ${LDFLAGS} ${LINUX_LDFLAGS} ${OPSEC_LDFLAGS} ${OPSEC_LIBS} \ - ${SSP_GENERIC_SRC} ${SSP_LINUX_SRC} -o ${SNORTSAM} - ;; - - OpenBSD*) -- #gcc ${CFLAGS} ${OBSD_CFLAGS} ${OPSEC_CFLAGS} ${LDFLAGS} ${OBSD_LDFLAGS} ${OPSEC_LIBS} /usr/lib/libnsl.a -o ${SNORTSAM} -- gcc ${CFLAGS} ${OBSD_CFLAGS} ${OPSEC_CFLAGS} ${LDFLAGS} ${OBSD_LDFLAGS} ${OPSEC_LDFLAGS} ${OPSEC_LIBS} \ -+ #${CC} ${CFLAGS} ${OBSD_CFLAGS} ${OPSEC_CFLAGS} ${LDFLAGS} ${OBSD_LDFLAGS} ${OPSEC_LIBS} /usr/lib/libnsl.a -o ${SNORTSAM} -+ ${CC} ${CFLAGS} ${OBSD_CFLAGS} ${OPSEC_CFLAGS} ${LDFLAGS} ${OBSD_LDFLAGS} ${OPSEC_LDFLAGS} ${OPSEC_LIBS} \ - ${SSP_GENERIC_SRC} ${SSP_OBSD_SRC} -o ${SNORTSAM} - ;; - - *BSD*) -- gcc ${CFLAGS} ${BSD_CFLAGS} ${OPSEC_CFLAGS} ${LDFLAGS} ${BSD_LDFLAGS} ${OPSEC_LDFLAGS} ${OPSEC_LIBS} \ -+ ${CC} ${CFLAGS} ${BSD_CFLAGS} ${OPSEC_CFLAGS} ${LDFLAGS} ${BSD_LDFLAGS} ${OPSEC_LDFLAGS} ${OPSEC_LIBS} \ - ${SSP_GENERIC_SRC} ${SSP_BSD_SRC} -o ${SNORTSAM} - ;; - - SunOS*) -- gcc ${CFLAGS} ${SUNOS_CFLAGS} ${OPSEC_SUNOS_CFLAGS} ${LDFLAGS} ${SUNOS_LDFLAGS} ${OPSEC_SUNOS_LDFLAGS} \ -+ ${CC} ${CFLAGS} ${SUNOS_CFLAGS} ${OPSEC_SUNOS_CFLAGS} ${LDFLAGS} ${SUNOS_LDFLAGS} ${OPSEC_SUNOS_LDFLAGS} \ - ${SSP_GENERIC_SRC} ${SSP_SUNOS_SRC} -o ${SNORTSAM} - ;; - esac -@@ -152,10 +151,10 @@ case "$1" in - rm -f ${SAMTOOL}-debug - - case "${systype}" in -- Linux*) gcc ${CFLAGS} ${LINUX_CFLAGS} ${LDFLAGS} ${LINUX_LDFLAGS} ${SAMTOOL_SRC} -o ${SAMTOOL} ;; -- OpenBSD*) gcc ${CFLAGS} ${OBSD_CFLAGS} ${LDFLAGS} ${OBSD_LDFLAGS} ${SAMTOOL_SRC} -o ${SAMTOOL} ;; -- *BSD*) gcc ${CFLAGS} ${BSD_CFLAGS} ${LDFLAGS} ${BSD_LDFLAGS} ${SAMTOOL_SRC} -o ${SAMTOOL} ;; -- SunOS) gcc ${CFLAGS} ${SUNOS_CFLAGS} ${LDFLAGS} ${SUNOS_LDFLAGS} ${SAMTOOL_SRC} -o ${SAMTOOL} ;; -+ Linux*) echo ${CC} ${CFLAGS} ${LINUX_CFLAGS} ${LDFLAGS} ${LINUX_LDFLAGS} ${SAMTOOL_SRC} -o ${SAMTOOL} ; ${CC} ${CFLAGS} ${LINUX_CFLAGS} ${LINUX_LDFLAGS} ${SAMTOOL_SRC} -o ${SAMTOOL} ; [ $? = 0 ] || exit 1;; -+ OpenBSD*) echo ${CC} ${CFLAGS} ${OBSD_CFLAGS} ${LDFLAGS} ${OBSD_LDFLAGS} ${SAMTOOL_SRC} -o ${SAMTOOL} ; ${CC} ${CFLAGS} ${OBSD_CFLAGS} ${OBSD_LDFLAGS} ${SAMTOOL_SRC} -o ${SAMTOOL} ; [ $? = 0 ] || exit 1;; -+ *BSD*) echo ${CC} ${CFLAGS} ${BSD_CFLAGS} ${LDFLAGS} ${BSD_LDFLAGS} ${SAMTOOL_SRC} -o ${SAMTOOL} ; ${CC} ${CFLAGS} ${BSD_CFLAGS} ${BSD_LDFLAGS} ${SAMTOOL_SRC} -o ${SAMTOOL} ; [ $? = 0 ] || exit 1;; -+ SunOS) echo ${CC} ${CFLAGS} ${SUNOS_CFLAGS} ${LDFLAGS} ${SUNOS_LDFLAGS} ${SAMTOOL_SRC} -o ${SAMTOOL} ; ${CC} ${CFLAGS} ${SUNOS_CFLAGS} $${SUNOS_LDFLAGS} ${SAMTOOL_SRC} -o ${SAMTOOL} ; [ $? = 0 ] || exit 1;; - esac - - echo "-------------------------------------------------------------------------------" -@@ -167,10 +166,10 @@ case "$1" in - SAMTOOL="${SAMTOOL}-debug" - - case "${systype}" in -- Linux*) gcc ${CFLAGS} ${LINUX_CFLAGS} ${LDFLAGS} ${LINUX_LDFLAGS} ${SAMTOOL_SRC} -o ${SAMTOOL} ;; -- OpenBSD*) gcc ${CFLAGS} ${OBSD_CFLAGS} ${LDFLAGS} ${OBSD_LDFLAGS} ${SAMTOOL_SRC} -o ${SAMTOOL} ;; -- *BSD*) gcc ${CFLAGS} ${BSD_CFLAGS} ${LDFLAGS} ${BSD_LDFLAGS} ${SAMTOOL_SRC} -o ${SAMTOOL} ;; -- SunOS) gcc ${CFLAGS} ${SUNOS_CFLAGS} ${LDFLAGS} ${SUNOS_LDFLAGS} ${SAMTOOL_SRC} -o ${SAMTOOL} ;; -+ Linux*) echo ${CC} ${CFLAGS} ${LINUX_CFLAGS} ${LDFLAGS} ${SAMTOOL_SRC} -o ${SAMTOOL} ${LINUX_LDFLAGS}; ${CC} ${CFLAGS} ${LINUX_CFLAGS} ${LINUX_LDFLAGS} ${SAMTOOL_SRC} -o ${SAMTOOL} ${LINUX_LDFLAGS}; [ $? = 0 ] || exit 1;; -+ OpenBSD*) echo ${CC} ${CFLAGS} ${OBSD_CFLAGS} ${LDFLAGS} ${OBSD_LDFLAGS} ${SAMTOOL_SRC} -o ${SAMTOOL} ; ${CC} ${CFLAGS} ${OBSD_CFLAGS} ${OBSD_LDFLAGS} ${SAMTOOL_SRC} -o ${SAMTOOL} ; [ $? = 0 ] || exit 1;; -+ *BSD*) echo ${CC} ${CFLAGS} ${BSD_CFLAGS} ${LDFLAGS} ${BSD_LDFLAGS} ${SAMTOOL_SRC} -o ${SAMTOOL} ; ${CC} ${CFLAGS} ${BSD_CFLAGS} ${BSD_LDFLAGS} ${SAMTOOL_SRC} -o ${SAMTOOL} ; [ $? = 0 ] || exit 1;; -+ SunOS) echo ${CC} ${CFLAGS} ${SUNOS_CFLAGS} ${LDFLAGS} ${SUNOS_LDFLAGS} ${SAMTOOL_SRC} -o ${SAMTOOL} ; ${CC} ${CFLAGS} ${SUNOS_CFLAGS} ${SUNOS_LDFLAGS} ${SAMTOOL_SRC} -o ${SAMTOOL} ; [ $? = 0 ] || exit 1;; - esac - cd .. - ;; -@@ -186,29 +185,12 @@ case "$1" in - rm -f ${SNORTSAM}-debug - - case "${systype}" in -- Linux*) gcc ${CFLAGS} ${LINUX_CFLAGS} ${LDFLAGS} ${LINUX_LDFLAGS} ${SSP_GENERIC_SRC} ${SSP_LINUX_SRC} -o ${SNORTSAM} ;; -- OpenBSD*) gcc ${CFLAGS} ${OBSD_CFLAGS} ${LDFLAGS} ${OBSD_LDFLAGS} ${SSP_GENERIC_SRC} ${SSP_OBSD_SRC} -o ${SNORTSAM} ;; -- *BSD*) gcc ${CFLAGS} ${BSD_CFLAGS} ${LDFLAGS} ${BSD_LDFLAGS} ${SSP_GENERIC_SRC} ${SSP_BSD_SRC} -o ${SNORTSAM} ;; -- SunOS*) gcc ${CFLAGS} ${SUNOS_CFLAGS} ${LDFLAGS} ${SUNOS_LDFLAGS} ${SSP_GENERIC_SRC} ${SSP_SUNOS_SRC} -o ${SNORTSAM} ;; -+ Linux*) echo ${CC} ${CFLAGS} ${LINUX_CFLAGS} ${LDFLAGS} ${SSP_GENERIC_SRC} ${SSP_LINUX_SRC} ${LDFLAGS} -o ${SNORTSAM} ${LINUX_LDFLAGS}; ${CC} ${CFLAGS} ${LINUX_CFLAGS} ${LDFLAGS} ${SSP_GENERIC_SRC} ${SSP_LINUX_SRC} -o ${SNORTSAM} ${LINUX_LDFLAGS}; [ $? = 0 ] || exit 1;; -+ OpenBSD*) echo ${CC} ${CFLAGS} ${OBSD_CFLAGS} ${LDFLAGS} ${OBSD_LDFLAGS} ${SSP_GENERIC_SRC} ${SSP_OBSD_SRC} ${LDFLAGS} -o ${SNORTSAM} ; ${CC} ${CFLAGS} ${LDFLAGS} ${OBSD_CFLAGS} ${OBSD_LDFLAGS} ${SSP_GENERIC_SRC} ${SSP_OBSD_SRC} -o ${SNORTSAM} ; [ $? = 0 ] || exit 1;; -+ *BSD*) echo ${CC} ${CFLAGS} ${BSD_CFLAGS} ${LDFLAGS} ${BSD_LDFLAGS} ${SSP_GENERIC_SRC} ${SSP_BSD_SRC} -o ${SNORTSAM} ; ${CC} ${CFLAGS} ${LDFLAGS} ${BSD_CFLAGS} ${BSD_LDFLAGS} ${SSP_GENERIC_SRC} ${SSP_BSD_SRC} -o ${SNORTSAM} ; [ $? = 0 ] || exit 1;; -+ SunOS*) echo ${CC} ${CFLAGS} ${SUNOS_CFLAGS} ${LDFLAGS} ${SUNOS_LDFLAGS} ${SSP_GENERIC_SRC} ${SSP_SUNOS_SRC}-o ${SNORTSAM} ; ${CC} ${CFLAGS} ${LDFLAGS} ${SUNOS_CFLAGS} ${SUNOS_LDFLAGS} ${SSP_GENERIC_SRC} ${SSP_SUNOS_SRC} -o ${SNORTSAM} ; [ $? = 0 ] || exit 1;; - esac - -- -- echo "-------------------------------------------------------------------------------" -- echo "Building SnortSam (debug)" -- echo "-------------------------------------------------------------------------------" -- -- rm -f *.o -- CFLAGS="${CFLAGS} -DFWSAMDEBUG" -- SNORTSAM="${SNORTSAM}-debug" -- -- case "${systype}" in -- Linux*) gcc ${CFLAGS} ${LINUX_CFLAGS} ${LDFLAGS} ${LINUX_LDFLAGS} ${SSP_GENERIC_SRC} ${SSP_LINUX_SRC} -o ${SNORTSAM} ;; -- OpenBSD*) gcc ${CFLAGS} ${OBSD_CFLAGS} ${LDFLAGS} ${OBSD_LDFLAGS} ${SSP_GENERIC_SRC} ${SSP_OBSD_SRC} -o ${SNORTSAM} ;; -- *BSD*) gcc ${CFLAGS} ${BSD_CFLAGS} ${LDFLAGS} ${BSD_LDFLAGS} ${SSP_GENERIC_SRC} ${SSP_BSD_SRC} -o ${SNORTSAM} ;; -- SunOS*) gcc ${CFLAGS} ${SUNOS_CFLAGS} ${LDFLAGS} ${SUNOS_LDFLAGS} ${SSP_GENERIC_SRC} ${SSP_SUNOS_SRC} -o ${SNORTSAM} ;; -- -- esac -- cd .. - ;; - esac - diff --git a/net-analyzer/snortsam/metadata.xml b/net-analyzer/snortsam/metadata.xml deleted file mode 100644 index 789a44405524..000000000000 --- a/net-analyzer/snortsam/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://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/snortsam/snortsam-2.70.ebuild b/net-analyzer/snortsam/snortsam-2.70.ebuild deleted file mode 100644 index 800c7f6f08ec..000000000000 --- a/net-analyzer/snortsam/snortsam-2.70.ebuild +++ /dev/null @@ -1,45 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit eutils flag-o-matic toolchain-funcs vcs-clean - -DESCRIPTION="Snort plugin that allows automated blocking of IP addresses on several firewalls" -HOMEPAGE="http://www.snortsam.net/" -SRC_URI="http://www.snortsam.net/files/snortsam/${PN}-src-${PV}.tar.gz" - -LICENSE="BSD-2" -SLOT="0" -KEYWORDS="~alpha amd64 ppc ppc64 sparc x86" -IUSE="debug" - -S=${WORKDIR}/${PN} - -src_prepare() { - epatch "${FILESDIR}"/${P}-gentoo.patch - ecvs_clean -} - -src_configure() { - use debug && append-cflags -DFWSAMDEBUG - tc-export CC -} - -src_compile() { - sh makesnortsam.sh || die -} - -src_install() { - dobin snortsam - find "${S}" -depth -type f -name "*.asc" -exec rm -f {} \; - dodoc docs/* conf/* -} - -pkg_postinst() { - echo - elog "To use snortsam with snort, you'll have to compile snort with USE=snortsam." - elog "Read the INSTALL file to configure snort for snortsam, and configure" - elog "snortsam for your particular firewall." - echo -} diff --git a/net-analyzer/softflowd/files/softflowd-0.9.9-_GNU_SOURCE.patch b/net-analyzer/softflowd/files/softflowd-0.9.9-_GNU_SOURCE.patch deleted file mode 100644 index cb4844803e00..000000000000 --- a/net-analyzer/softflowd/files/softflowd-0.9.9-_GNU_SOURCE.patch +++ /dev/null @@ -1,13 +0,0 @@ -setresuid and setresgid need _GNU_SOURCE which clashes with _BSD_SOURCE - ---- a/configure.ac -+++ b/configure.ac -@@ -87,7 +87,7 @@ - AC_SEARCH_LIBS(socket, socket) - AC_CHECK_LIB(pcap, pcap_open_live) - --AC_CHECK_FUNCS(closefrom daemon setresuid setreuid setresgid setgid strlcpy strlcat) -+AC_CHECK_FUNCS(closefrom daemon setreuid setgid strlcpy strlcat) - - AC_CHECK_TYPES([u_int64_t, int64_t, uint64_t, u_int32_t, int32_t, uint32_t]) - AC_CHECK_TYPES([u_int16_t, int16_t, uint16_t, u_int8_t, int8_t, uint8_t]) diff --git a/net-analyzer/softflowd/files/softflowd-0.9.9-no-strip.patch b/net-analyzer/softflowd/files/softflowd-0.9.9-no-strip.patch deleted file mode 100644 index c48603a7f491..000000000000 --- a/net-analyzer/softflowd/files/softflowd-0.9.9-no-strip.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- a/Makefile.in -+++ b/Makefile.in -@@ -52,7 +52,7 @@ - $(srcdir)/mkinstalldirs $(DESTDIR)$(sbindir) - [ -d $(DESTDIR)$(mandir)/man8 ] || \ - $(srcdir)/mkinstalldirs $(DESTDIR)$(mandir)/man8 -- $(INSTALL) -m 0755 -s softflowd $(DESTDIR)$(sbindir)/softflowd -- $(INSTALL) -m 0755 -s softflowctl $(DESTDIR)$(sbindir)/softflowctl -+ $(INSTALL) -m 0755 softflowd $(DESTDIR)$(sbindir)/softflowd -+ $(INSTALL) -m 0755 softflowctl $(DESTDIR)$(sbindir)/softflowctl - $(INSTALL) -m 0644 softflowd.8 $(DESTDIR)$(mandir)/man8/softflowd.8 - $(INSTALL) -m 0644 softflowctl.8 $(DESTDIR)$(mandir)/man8/softflowctl.8 diff --git a/net-analyzer/softflowd/metadata.xml b/net-analyzer/softflowd/metadata.xml index 35892ab7c2d1..d3aa32c666d5 100644 --- a/net-analyzer/softflowd/metadata.xml +++ b/net-analyzer/softflowd/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>netmon@gentoo.org</email> diff --git a/net-analyzer/speedtest++/Manifest b/net-analyzer/speedtest++/Manifest new file mode 100644 index 000000000000..788248bd96f7 --- /dev/null +++ b/net-analyzer/speedtest++/Manifest @@ -0,0 +1 @@ +DIST speedtest++-0.0.20210829.tar.gz 13444 BLAKE2B ac6967d7ed0174e2278c91a8e76012621cc67e51c1722a0d359fc7889b4bc813abb1709b5e482eeef7ff0951be3c697777dc5f2258b099521a08db77c5d7fa40 SHA512 3085adab0f4c94c8e5c3168136094a571d901866352387e9afe0ef386127da6971329bc8f6d8c02efa5f32c8620ccd2482d65dce34da4ca4331b88edf34df2b3 diff --git a/net-analyzer/speedtest++/metadata.xml b/net-analyzer/speedtest++/metadata.xml new file mode 100644 index 000000000000..2c5e2cf3619d --- /dev/null +++ b/net-analyzer/speedtest++/metadata.xml @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="person"> + <email>zx2c4@gentoo.org</email> + <name>Jason A. Donenfeld</name> + </maintainer> + <upstream> + <remote-id type="github">taganaka/SpeedTest</remote-id> + </upstream> +</pkgmetadata> diff --git a/net-analyzer/speedtest++/speedtest++-0.0.20210829.ebuild b/net-analyzer/speedtest++/speedtest++-0.0.20210829.ebuild new file mode 100644 index 000000000000..4ccc533381c7 --- /dev/null +++ b/net-analyzer/speedtest++/speedtest++-0.0.20210829.ebuild @@ -0,0 +1,24 @@ +# Copyright 2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake + +DESCRIPTION="High performance speedtest.net CLI" +HOMEPAGE="https://github.com/taganaka/SpeedTest" +SNAPSHOT_COMMIT="0f63cfbf7ce8d64ea803bf143b957eae76323405" +SRC_URI="https://github.com/taganaka/SpeedTest/archive/${SNAPSHOT_COMMIT}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64" + +DEPEND=" + net-misc/curl + dev-libs/libxml2:= + dev-libs/openssl:0= +" +RDEPEND="${DEPEND}" + +S="${WORKDIR}/SpeedTest-${SNAPSHOT_COMMIT}" diff --git a/net-analyzer/speedtest-cli/Manifest b/net-analyzer/speedtest-cli/Manifest index e056ba9574cb..8cccddb672e4 100644 --- a/net-analyzer/speedtest-cli/Manifest +++ b/net-analyzer/speedtest-cli/Manifest @@ -1 +1 @@ -DIST speedtest-cli-2.1.2.tar.gz 24741 BLAKE2B 09418e34d92e0f91d7482ba4cc46cf812b43f25118c71a8e5127265f62ef93bb428ebfe5cc65a73ea8284fb7bfe1a99cc670d5d186f9e82284a11390f6e66960 SHA512 f2eb125116f42075d3248e1c0590cce4f822f383ff7c54c158504b16de72bf35b35d55a78014413a95a5f5bafa98c71c3ea011f20f480f1db272d6e8800c40bd +DIST speedtest-cli-2.1.3.tar.gz 24771 BLAKE2B 70c604848ffa29ae0a28a636a40ffdd278000c865b243038f773d20a4f6f1c668704505c8bae302d84a0957b2a6ad9d4b303e2e9371b351348d7147ff9a5a67d SHA512 e2ecd9b4eea95e3641045c3da217ec5a39846b26c1f773fdd31c6ffe3cb5e35341320fc1992f865af48afd1a704c4d4224f9ec4048abb69131ee2f32385ae94c diff --git a/net-analyzer/speedtest-cli/files/speedtest-cli-2.1.3-json-serverlist.patch b/net-analyzer/speedtest-cli/files/speedtest-cli-2.1.3-json-serverlist.patch new file mode 100644 index 000000000000..455fd4bfd2eb --- /dev/null +++ b/net-analyzer/speedtest-cli/files/speedtest-cli-2.1.3-json-serverlist.patch @@ -0,0 +1,88 @@ +diff --git a/speedtest.py b/speedtest.py +index a33296d..e7490b1 100755 +--- a/speedtest.py ++++ b/speedtest.py +@@ -20,6 +20,7 @@ import re + import csv + import sys + import math ++import json + import errno + import signal + import socket +@@ -1250,10 +1251,7 @@ class Speedtest(object): + ) + + urls = [ +- '://www.speedtest.net/speedtest-servers-static.php', +- 'http://c.speedtest.net/speedtest-servers-static.php', +- '://www.speedtest.net/speedtest-servers.php', +- 'http://c.speedtest.net/speedtest-servers.php', ++ "://www.speedtest.net/api/js/servers", + ] + + headers = {} +@@ -1296,53 +1294,31 @@ class Speedtest(object): + printer('Servers XML:\n%s' % serversxml, debug=True) + + try: +- try: +- try: +- root = ET.fromstring(serversxml) +- except ET.ParseError: +- e = get_exception() +- raise SpeedtestServersError( +- 'Malformed speedtest.net server list: %s' % e +- ) +- elements = etree_iter(root, 'server') +- except AttributeError: +- try: +- root = DOM.parseString(serversxml) +- except ExpatError: +- e = get_exception() +- raise SpeedtestServersError( +- 'Malformed speedtest.net server list: %s' % e +- ) +- elements = root.getElementsByTagName('server') +- except (SyntaxError, xml.parsers.expat.ExpatError): ++ elements = json.loads(serversxml) ++ except SyntaxError: + raise ServersRetrievalError() + + for server in elements: +- try: +- attrib = server.attrib +- except AttributeError: +- attrib = dict(list(server.attributes.items())) +- +- if servers and int(attrib.get('id')) not in servers: ++ if servers and int(server.get('id')) not in servers: + continue + +- if (int(attrib.get('id')) in self.config['ignore_servers'] +- or int(attrib.get('id')) in exclude): ++ if (int(server.get('id')) in self.config['ignore_servers'] ++ or int(server.get('id')) in exclude): + continue + + try: + d = distance(self.lat_lon, +- (float(attrib.get('lat')), +- float(attrib.get('lon')))) ++ (float(server.get('lat')), ++ float(server.get('lon')))) + except Exception: + continue + +- attrib['d'] = d ++ server['d'] = d + + try: +- self.servers[d].append(attrib) ++ self.servers[d].append(server) + except KeyError: +- self.servers[d] = [attrib] ++ self.servers[d] = [server] + + break + diff --git a/net-analyzer/speedtest-cli/metadata.xml b/net-analyzer/speedtest-cli/metadata.xml index ecdebc6dea58..1608948afeb0 100644 --- a/net-analyzer/speedtest-cli/metadata.xml +++ b/net-analyzer/speedtest-cli/metadata.xml @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> - <email>zx2c4@gentoo.org</email> - <name>Jason A. Donenfeld</name> + <email>conikost@gentoo.org</email> + <name>Conrad Kostecki</name> </maintainer> <upstream> <remote-id type="github">sivel/speedtest-cli</remote-id> diff --git a/net-analyzer/speedtest-cli/speedtest-cli-2.1.2.ebuild b/net-analyzer/speedtest-cli/speedtest-cli-2.1.2.ebuild deleted file mode 100644 index 8e0aa6890832..000000000000 --- a/net-analyzer/speedtest-cli/speedtest-cli-2.1.2.ebuild +++ /dev/null @@ -1,27 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python{3_6,3_7,3_8} ) - -inherit distutils-r1 - -DESCRIPTION="Command line interface for testing internet bandwidth using speedtest.net" -HOMEPAGE="https://github.com/sivel/speedtest-cli" -SRC_URI="https://github.com/sivel/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 x86" -IUSE="" - -DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]" -RDEPEND="${DEPEND}" - -DOCS=( CONTRIBUTING.md README.rst ) - -python_install_all() { - doman ${PN}.1 - distutils-r1_python_install_all -} 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 new file mode 100644 index 000000000000..50fd8d8ef75d --- /dev/null +++ b/net-analyzer/speedtest-cli/speedtest-cli-2.1.3-r2.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..12} ) + +inherit distutils-r1 + +DESCRIPTION="Command line interface for testing internet bandwidth using speedtest.net" +HOMEPAGE="https://github.com/sivel/speedtest-cli" +SRC_URI="https://github.com/sivel/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="amd64 ~arm arm64 ppc ppc64 x86" + +DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]" +RDEPEND="${DEPEND}" + +PATCHES=( "${FILESDIR}/${PN}-2.1.3-json-serverlist.patch" ) + +python_install_all() { + doman ${PN}.1 + distutils-r1_python_install_all +} diff --git a/net-analyzer/sqlninja/metadata.xml b/net-analyzer/sqlninja/metadata.xml index 33aad216574c..44b52e2a3957 100644 --- a/net-analyzer/sqlninja/metadata.xml +++ b/net-analyzer/sqlninja/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>netmon@gentoo.org</email> 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 a4283bd9f1ac..c6a7a32beb57 100644 --- a/net-analyzer/sqlninja/sqlninja-0.2.6_p1-r1.ebuild +++ b/net-analyzer/sqlninja/sqlninja-0.2.6_p1-r1.ebuild @@ -1,21 +1,21 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 -inherit versionator +EAPI=8 -MY_PV="$(replace_version_separator 3 '-')" +MY_PV="${PV//_/-}" MY_PV="${MY_PV/p/r}" 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" +S="${WORKDIR}/${MY_P}" + LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="doc" - RESTRICT="mirror" RDEPEND=" @@ -28,28 +28,25 @@ RDEPEND=" dev-perl/NetPacket " -S="${WORKDIR}/${MY_P}" - src_install() { dodoc sqlninja-howto.html ChangeLog README if use doc; then dodoc -r sources - docompress -x /usr/share/doc/"${P}"/sources + docompress -x /usr/share/doc/${P}/sources fi - insinto /etc/"${PN}" + insinto /etc/${PN} doins sqlninja.conf.example rm -r sources sqlninja-howto.html ChangeLog README LICENSE || die rm -r apps || die rm sqlninja.conf.example || die - dodir /usr/lib/"${PN}" - insinto /usr/lib/"${PN}" - exeinto /usr/lib/"${PN}" + insinto /usr/lib/${PN} + exeinto /usr/lib/${PN} doins -r * doexe sqlninja - dosbin "${FILESDIR}"/"${PN}" + dosbin "${FILESDIR}"/${PN} } diff --git a/net-analyzer/squid-graph/metadata.xml b/net-analyzer/squid-graph/metadata.xml index 3415c5776e0d..42bbf7b764a6 100644 --- a/net-analyzer/squid-graph/metadata.xml +++ b/net-analyzer/squid-graph/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>netmon@gentoo.org</email> diff --git a/net-analyzer/squid-graph/squid-graph-3.2-r1.ebuild b/net-analyzer/squid-graph/squid-graph-3.2-r1.ebuild deleted file mode 100644 index 4c5d34c145d1..000000000000 --- a/net-analyzer/squid-graph/squid-graph-3.2-r1.ebuild +++ /dev/null @@ -1,22 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit eutils - -DESCRIPTION="Squid logfile analyzer and traffic grapher" -HOMEPAGE="http://squid-graph.sourceforge.net/" -LICENSE="GPL-2" -SRC_URI="mirror://sourceforge/squid-graph/${P}.tar.gz" - -SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" - -RDEPEND="dev-perl/GD[png]" - -S=${WORKDIR}/${PN} - -src_install() { - dobin apacheconv generate.cgi squid-graph timeconv - dodoc README -} diff --git a/net-analyzer/squid-graph/squid-graph-3.2-r2.ebuild b/net-analyzer/squid-graph/squid-graph-3.2-r2.ebuild new file mode 100644 index 000000000000..32887b2c15a0 --- /dev/null +++ b/net-analyzer/squid-graph/squid-graph-3.2-r2.ebuild @@ -0,0 +1,20 @@ +# Copyright 1999-2021 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" +S="${WORKDIR}"/${PN} + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~x86" + +RDEPEND="dev-perl/GD[png(+)]" + +src_install() { + dobin apacheconv generate.cgi squid-graph timeconv + dodoc README +} diff --git a/net-analyzer/squidsites/files/squidsites-1.01-format-security.patch b/net-analyzer/squidsites/files/squidsites-1.01-format-security.patch index 3dd72203c309..0efa4d0817ec 100644 --- a/net-analyzer/squidsites/files/squidsites-1.01-format-security.patch +++ b/net-analyzer/squidsites/files/squidsites-1.01-format-security.patch @@ -1,5 +1,5 @@ ---- a/src/squidsites.c -+++ b/src/squidsites.c +--- a/squidsites.c ++++ b/squidsites.c @@ -286,7 +286,7 @@ static
void print_help()
diff --git a/net-analyzer/squidsites/metadata.xml b/net-analyzer/squidsites/metadata.xml index 74c2baebb4ec..dce3f3be66c0 100644 --- a/net-analyzer/squidsites/metadata.xml +++ b/net-analyzer/squidsites/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>netmon@gentoo.org</email> diff --git a/net-analyzer/squidsites/squidsites-1.01-r2.ebuild b/net-analyzer/squidsites/squidsites-1.01-r2.ebuild index 01f56bf30cc3..3c359aefe472 100644 --- a/net-analyzer/squidsites/squidsites-1.01-r2.ebuild +++ b/net-analyzer/squidsites/squidsites-1.01-r2.ebuild @@ -1,25 +1,30 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 -inherit eutils toolchain-funcs +inherit toolchain-funcs -DESCRIPTION="A tool that parses Squid access log file and generates a report of the most visited sites" -LICENSE="GPL-2" +DESCRIPTION="A tool to parse Squid access log file and to generate reports" HOMEPAGE="http://www.stefanopassiglia.com/misc.htm" SRC_URI="http://www.stefanopassiglia.com/downloads/${P}.tar.gz" +S="${WORKDIR}/src" + +LICENSE="GPL-2" SLOT="1" KEYWORDS="amd64 ppc x86" -S="${WORKDIR}/src" +PATCHES=( + "${FILESDIR}"/${P}-format-security.patch +) src_prepare() { + default + # Respect CFLAGS sed -i Makefile \ -e '/^CCFLAGS=/s|-g| $(CFLAGS) $(LDFLAGS)|' \ || die - epatch "${FILESDIR}"/${P}-format-security.patch } src_compile() { diff --git a/net-analyzer/squidview/metadata.xml b/net-analyzer/squidview/metadata.xml index 6f49eba8f496..85e4ed814fa2 100644 --- a/net-analyzer/squidview/metadata.xml +++ b/net-analyzer/squidview/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <!-- maintainer-needed --> </pkgmetadata> diff --git a/net-analyzer/ssh-audit/Manifest b/net-analyzer/ssh-audit/Manifest new file mode 100644 index 000000000000..6d0a4850a473 --- /dev/null +++ b/net-analyzer/ssh-audit/Manifest @@ -0,0 +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/metadata.xml b/net-analyzer/ssh-audit/metadata.xml new file mode 100644 index 000000000000..915e0081a17e --- /dev/null +++ b/net-analyzer/ssh-audit/metadata.xml @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="person"> + <email>graaff@gentoo.org</email> + </maintainer> + <upstream> + <remote-id type="github">jtesta/ssh-audit</remote-id> + </upstream> +</pkgmetadata> diff --git a/net-analyzer/ssh-audit/ssh-audit-3.0.0.ebuild b/net-analyzer/ssh-audit/ssh-audit-3.0.0.ebuild new file mode 100644 index 000000000000..1a964a4b8a85 --- /dev/null +++ b/net-analyzer/ssh-audit/ssh-audit-3.0.0.ebuild @@ -0,0 +1,27 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISTUTILS_USE_PEP517=setuptools +PYTHON_COMPAT=(python3_{10,11}) + +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="" + +# Tests require prospector which is not packaged +RESTRICT="test" + +src_install() { + distutils-r1_src_install + + doman ssh-audit.1 +} diff --git a/net-analyzer/ssh-audit/ssh-audit-3.1.0.ebuild b/net-analyzer/ssh-audit/ssh-audit-3.1.0.ebuild new file mode 100644 index 000000000000..f61f9ddb69ed --- /dev/null +++ b/net-analyzer/ssh-audit/ssh-audit-3.1.0.ebuild @@ -0,0 +1,27 @@ +# Copyright 1999-2023 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="" + +# Tests require prospector which is not packaged +RESTRICT="test" + +src_install() { + distutils-r1_src_install + + doman ssh-audit.1 +} 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/sshping/Manifest b/net-analyzer/sshping/Manifest new file mode 100644 index 000000000000..5ff59abc1d9a --- /dev/null +++ b/net-analyzer/sshping/Manifest @@ -0,0 +1 @@ +DIST sshping-0.1.4.tar.gz 3536227 BLAKE2B 30ee41324046d5ba5fb38a28acbf11dabadcbe41c506f7e4f51f2a5e95c015251d77ad16c534160eb1b83a871a5d25083b2481a5df91f5beb104279268838ae7 SHA512 16d72099b468c58d44835822a372f97863ba0b73282e8e64c20b0a0e6465e6f9efa634a85b0c7c13d03c470c547b08332820bf177f5bad59984270801ab74782 diff --git a/net-analyzer/sshping/files/sshping-0.1.4-fix-man-dir.patch b/net-analyzer/sshping/files/sshping-0.1.4-fix-man-dir.patch new file mode 100644 index 000000000000..2758e84b70e4 --- /dev/null +++ b/net-analyzer/sshping/files/sshping-0.1.4-fix-man-dir.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 2e59dd5..d20c9a9 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -34,7 +34,7 @@ if (UNIX) + endif (UNIX) + + add_custom_target(man ALL DEPENDS ${MAN_TGT}) +-install(FILES ${MAN_TGT} DESTINATION ${CMAKE_INSTALL_PREFIX}/man/man8) ++install(FILES ${MAN_TGT} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/man/man8) + + # Packaging for RPM or DEB + find_program(rpmbuild_path "rpmbuild" FALSE) diff --git a/net-analyzer/sshping/files/sshping-0.1.4-respect-cxxflags.patch b/net-analyzer/sshping/files/sshping-0.1.4-respect-cxxflags.patch new file mode 100644 index 000000000000..9f2f905aded6 --- /dev/null +++ b/net-analyzer/sshping/files/sshping-0.1.4-respect-cxxflags.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index e8a7d0b..00ade1c 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -5,7 +5,7 @@ cmake_minimum_required(VERSION 2.8) + #find_package(libssh) + + # Build the sshping binary +-set(CMAKE_CXX_FLAGS "-I ${CMAKE_CURRENT_SOURCE_DIR}/ext/ -Wall") ++set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -I ${CMAKE_CURRENT_SOURCE_DIR}/ext/") + add_executable(${PROJECT_NAME} src/sshping.cxx) + target_link_libraries(${PROJECT_NAME} ssh) + install(TARGETS ${PROJECT_NAME} DESTINATION bin) diff --git a/net-analyzer/sshping/metadata.xml b/net-analyzer/sshping/metadata.xml new file mode 100644 index 000000000000..338f017da09e --- /dev/null +++ b/net-analyzer/sshping/metadata.xml @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="person"> + <email>ajak@gentoo.org</email> + <name>John Helmert III</name> + </maintainer> + <upstream> + <remote-id type="github">spook/sshping</remote-id> + </upstream> +</pkgmetadata> diff --git a/net-analyzer/sshping/sshping-0.1.4.ebuild b/net-analyzer/sshping/sshping-0.1.4.ebuild new file mode 100644 index 000000000000..b6898c56a36b --- /dev/null +++ b/net-analyzer/sshping/sshping-0.1.4.ebuild @@ -0,0 +1,32 @@ +# Copyright 2020-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake + +DESCRIPTION="ssh-based ping: measure character echo latency and bandwidth" +HOMEPAGE="https://github.com/spook/sshping" +SRC_URI="https://github.com/spook/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64" + +BDEPEND="dev-lang/perl" +DEPEND="net-libs/libssh:=" +RDEPEND="${DEPEND}" + +PATCHES=( + "${FILESDIR}/${P}-fix-man-dir.patch" + "${FILESDIR}/${P}-respect-cxxflags.patch" +) + +src_configure() { + local mycmakeargs=( + -DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr" + -DCMAKE_CXX_FLAGS="${CXXFLAGS}" + ) + + cmake_src_configure +} diff --git a/net-analyzer/ssldump/Manifest b/net-analyzer/ssldump/Manifest index 213e835b43be..eb1f4cb13252 100644 --- a/net-analyzer/ssldump/Manifest +++ b/net-analyzer/ssldump/Manifest @@ -1,2 +1 @@ -DIST ssldump-0.9b3.tar.gz 137435 BLAKE2B e42eeac4daa99a62537ac7ee5152428664fed40256ec10f7c61621f9bbd06476d280af1a6c517eaff253058e3720a282e88604b2f1de0c7ad1b5328597879449 SHA512 ea81558a243950ab43354c9f33c0a4feae0ae859bc2bd6e6b58838a01f4a1e7a6447f2a9ab1fa40bbe8dbd6c3630c489c17fc9c066cacfddfb64269b0cd5090a -DIST ssldump-1.1.tar.gz 187436 BLAKE2B 3cafd7263762a7a326fb30722a918bcfaae5b43eedca37a0b5c341efc510e935671dc7ebf71eb807fcacbfce5f77896f310b634028713deb5516390fcfc21f65 SHA512 00ff449d3818a27fbcb46316733428f6a623488e758a67fcb7ee4390835e3279e7242aa0134ddc158740cb8323f5fd9869bd50efb35189dce977d4768d9636c2 +DIST ssldump-1.5.tar.gz 129388 BLAKE2B 9877bf604690911a3680cf4edfe0115a8a8e2ddf14abc260a99fdcc181bd727c5f3bfb0aa8864f502ff560ccab76e27a22266a3ed78eb516f019ed7cb44bef69 SHA512 4eb84744591539fdaf9b2454d23c917f5e97cb2e5f03e0c38393327caecc72dfc77ee7b734519b1f224a5e3a132185b8fccfeb9186fc9f1b586444fc748a3814 diff --git a/net-analyzer/ssldump/files/ssldump-0.9-DLT_LINUX_SLL.patch b/net-analyzer/ssldump/files/ssldump-0.9-DLT_LINUX_SLL.patch deleted file mode 100644 index 9a58c6369929..000000000000 --- a/net-analyzer/ssldump/files/ssldump-0.9-DLT_LINUX_SLL.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/base/pcap-snoop.c -+++ b/base/pcap-snoop.c -@@ -157,6 +157,10 @@ - return; - - break; -+ case DLT_LINUX_SLL: -+ data+=16; -+ len-=16; -+ break; - } - network_process_packet(n,&hdr->ts,data,len); - } diff --git a/net-analyzer/ssldump/files/ssldump-0.9-configure-dylib.patch b/net-analyzer/ssldump/files/ssldump-0.9-configure-dylib.patch deleted file mode 100644 index 941350e8c789..000000000000 --- a/net-analyzer/ssldump/files/ssldump-0.9-configure-dylib.patch +++ /dev/null @@ -1,28 +0,0 @@ ---- a/configure.in -+++ b/configure.in -@@ -102,14 +102,13 @@ - AC_MSG_CHECKING(for PCAP library) - ac_found_pcap_lib_dir="no" - for dir in $ac_pcap_lib_dir; do -- if test -f $dir/libpcap.a; then -+ if test -f $dir/libpcap.so -o -f $dir/libpcap.dylib; then - dnl Ok, we think we've found them, but check that they -- dnl actually ontain the right functions -+ dnl actually contain the right functions - save_LIBS=$LIBS -- save_LDFLAGS=$LDFLAGS - LIBS="-lpcap $LIBS" - if test "$dir" != "/usr/lib"; then -- LDFLAGS="-L$dir $LDFLAGS" -+ LIBS="-L$dir $LIBS" - fi - AC_TRY_LINK_FUNC(pcap_open_live,ac_linked_libpcap="true", - ac_linked_libpcap="false"); -@@ -118,7 +117,6 @@ - break - fi - LIBS=$save_LIBS -- LDFLAGS=$save_LDFLAGS - fi - done - diff --git a/net-analyzer/ssldump/files/ssldump-0.9-declaration.patch b/net-analyzer/ssldump/files/ssldump-0.9-declaration.patch deleted file mode 100644 index 836b52c84ab2..000000000000 --- a/net-analyzer/ssldump/files/ssldump-0.9-declaration.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/ssl/ssl_rec.h -+++ b/ssl/ssl_rec.h -@@ -54,6 +54,8 @@ - SSL_CipherSuite *cs,UCHAR *mk,UCHAR *sk,UCHAR *iv)); - int ssl_decode_rec_data PROTO_LIST((ssl_obj *ssl,ssl_rec_decoder *d, - int ct,int version,UCHAR *in,int inl,UCHAR *out,int *outl)); -+int ssl3_check_mac(ssl_rec_decoder *d, int ct, int ver, UCHAR *data, -+ UINT4 datalen, UCHAR *mac); - - #endif - diff --git a/net-analyzer/ssldump/files/ssldump-0.9-includes.patch b/net-analyzer/ssldump/files/ssldump-0.9-includes.patch deleted file mode 100644 index 8ca06dcef449..000000000000 --- a/net-analyzer/ssldump/files/ssldump-0.9-includes.patch +++ /dev/null @@ -1,30 +0,0 @@ ---- a/common/lib/r_assoc.c -+++ b/common/lib/r_assoc.c -@@ -57,6 +57,7 @@ - static char *RCSSTRING="$Id$"; - - #include <r_common.h> -+#include <string.h> /* memcpy() memcmp() */ - #include "r_assoc.h" - - typedef struct r_assoc_el_ { ---- a/common/lib/r_bitfield.c -+++ b/common/lib/r_bitfield.c -@@ -11,6 +11,7 @@ - static char *RCSSTRING="$Id$"; - - #include <r_common.h> -+#include <string.h> /* memcpy() memset() */ - #include "r_bitfield.h" - - int r_bitfield_create(setp,size) ---- a/common/lib/r_data.c -+++ b/common/lib/r_data.c -@@ -47,6 +47,7 @@ - static char *RCSSTRING="$Id$"; - - #include <r_common.h> -+#include <string.h> /* memcmp() memcpy() memset() */ - #include <r_data.h> - - int r_data_create(dp,d,l) diff --git a/net-analyzer/ssldump/files/ssldump-0.9-libpcap-header.patch b/net-analyzer/ssldump/files/ssldump-0.9-libpcap-header.patch deleted file mode 100644 index a9a724658ccf..000000000000 --- a/net-analyzer/ssldump/files/ssldump-0.9-libpcap-header.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/base/pcap-snoop.c -+++ b/base/pcap-snoop.c -@@ -49,7 +49,6 @@ - - #include <pcap.h> - #include <unistd.h> --#include <net/bpf.h> - #ifndef _WIN32 - #include <sys/param.h> - #endif diff --git a/net-analyzer/ssldump/files/ssldump-0.9-openssl-0.9.8.compile-fix.patch b/net-analyzer/ssldump/files/ssldump-0.9-openssl-0.9.8.compile-fix.patch deleted file mode 100644 index 2ce16d54f168..000000000000 --- a/net-analyzer/ssldump/files/ssldump-0.9-openssl-0.9.8.compile-fix.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- a/ssl/ssldecode.c -+++ b/ssl/ssldecode.c -@@ -51,6 +51,7 @@ - #include <openssl/ssl.h> - #include <openssl/hmac.h> - #include <openssl/evp.h> -+#include <openssl/md5.h> - #include <openssl/x509v3.h> - #endif - #include "ssldecode.h" -@@ -131,6 +132,7 @@ - ssl_decode_ctx *d=0; - int r,_status; - -+ SSL_library_init(); - SSLeay_add_all_algorithms(); - if(!(d=(ssl_decode_ctx *)malloc(sizeof(ssl_decode_ctx)))) - ABORT(R_NO_MEMORY); diff --git a/net-analyzer/ssldump/files/ssldump-0.9-prefix-fix.patch b/net-analyzer/ssldump/files/ssldump-0.9-prefix-fix.patch deleted file mode 100644 index 74d7ddcd6f68..000000000000 --- a/net-analyzer/ssldump/files/ssldump-0.9-prefix-fix.patch +++ /dev/null @@ -1,22 +0,0 @@ -eliminates unused variable ROOT, which disturbs ld from Prefix. Bug #414335 - ---- a/Makefile.in -+++ b/Makefile.in -@@ -46,13 +46,12 @@ BINDIR=@sbindir@ - MANDIR=@mandir@ - RM=rm -f - --ROOT=./ --ANALYZE_SRCDIR=$(ROOT)base/ -+ANALYZE_SRCDIR=base/ - COMMONDIR=common/ - COMMON_LIB_SRCDIR=$(COMMONDIR)lib/ --ANALYZE_NULL_SRCDIR=$(ROOT)null/ --ANALYZE_SSL_SRCDIR=$(ROOT)ssl/ --ANALYZE_RECORD_SRCDIR=$(ROOT)@RECORD_MOD@/ -+ANALYZE_NULL_SRCDIR=null/ -+ANALYZE_SSL_SRCDIR=ssl/ -+ANALYZE_RECORD_SRCDIR=@RECORD_MOD@/ - include rules.mk - - include $(COMMON_LIB_SRCDIR)/targets.mk diff --git a/net-analyzer/ssldump/metadata.xml b/net-analyzer/ssldump/metadata.xml index 12203e1a761b..27215b8a217b 100644 --- a/net-analyzer/ssldump/metadata.xml +++ b/net-analyzer/ssldump/metadata.xml @@ -1,11 +1,11 @@ -<?xml version='1.0' encoding='UTF-8'?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<?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> <upstream> - <remote-id type="sourceforge">downloads</remote-id> + <remote-id type="github">adulau/ssldump</remote-id> </upstream> </pkgmetadata> diff --git a/net-analyzer/ssldump/ssldump-0.9_beta3.ebuild b/net-analyzer/ssldump/ssldump-0.9_beta3.ebuild deleted file mode 100644 index 0f7107da7d0b..000000000000 --- a/net-analyzer/ssldump/ssldump-0.9_beta3.ebuild +++ /dev/null @@ -1,66 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -AUTOTOOLS_IN_SOURCE_BUILD=1 -AUTOTOOLS_AUTORECONF=1 -inherit autotools eutils toolchain-funcs - -MY_PV=${PV/_beta/b} -MY_P=${PN}-${MY_PV} - -DESCRIPTION="An SSLv3/TLS network protocol analyzer" -HOMEPAGE="http://ssldump.sourceforge.net/" -SRC_URI=" - http://downloads.sourceforge.net/project/${PN}/${PN}/${MY_PV}/${MY_P}.tar.gz -" - -LICENSE="openssl" -SLOT="0" -KEYWORDS="amd64 ~arm ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" -IUSE="ssl" - -RDEPEND=" - net-libs/libpcap - ssl? ( >=dev-libs/openssl-1:0= ) -" -DEPEND=" - ${RDEPEND} -" - -S=${WORKDIR}/${MY_P} - -PATCHES=( - "${FILESDIR}"/${PN}-0.9-libpcap-header.patch - "${FILESDIR}"/${PN}-0.9-configure-dylib.patch - "${FILESDIR}"/${PN}-0.9-openssl-0.9.8.compile-fix.patch - "${FILESDIR}"/${PN}-0.9-DLT_LINUX_SLL.patch - "${FILESDIR}"/${PN}-0.9-prefix-fix.patch - "${FILESDIR}"/${PN}-0.9-declaration.patch - "${FILESDIR}"/${PN}-0.9-includes.patch -) - -src_prepare() { - default - - eapply_user - - eautoreconf -} - -src_configure() { - tc-export CC - - econf \ - --with-pcap-inc="${EPREFIX}/usr/include" \ - --with-pcap-lib="${EPREFIX}/usr/$(get_libdir)" \ - $(usex ssl --with-openssl-inc="${EPREFIX}/usr/include" '--without-openssl') \ - $(usex ssl --with-openssl-lib="${EPREFIX}/usr/$(get_libdir)" '--without-openssl') -} - -src_install() { - dosbin ssldump - doman ssldump.1 - dodoc ChangeLog CREDITS README -} diff --git a/net-analyzer/ssldump/ssldump-1.1.ebuild b/net-analyzer/ssldump/ssldump-1.1.ebuild deleted file mode 100644 index 6263f65aa674..000000000000 --- a/net-analyzer/ssldump/ssldump-1.1.ebuild +++ /dev/null @@ -1,41 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit multilib toolchain-funcs - -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" -IUSE="ssl" - -RDEPEND=" - net-libs/libpcap - ssl? ( >=dev-libs/openssl-1:0= ) -" -DEPEND=" - ${RDEPEND} -" - -src_configure() { - tc-export CC - - econf \ - $(usex ssl --with-openssl-inc="${EPREFIX}/usr/include" '') \ - $(usex ssl --with-openssl-lib="${EPREFIX}/usr/$(get_libdir)" '') \ - $(usex ssl --with-openssl="${EPREFIX}/usr") \ - --with-pcap-inc="${EPREFIX}/usr/include" \ - --with-pcap-lib="${EPREFIX}/usr/$(get_libdir)" -} - -src_install() { - dosbin ssldump - doman ssldump.1 - dodoc ChangeLog CREDITS README -} diff --git a/net-analyzer/ssldump/ssldump-1.5.ebuild b/net-analyzer/ssldump/ssldump-1.5.ebuild new file mode 100644 index 000000000000..bfac1f000611 --- /dev/null +++ b/net-analyzer/ssldump/ssldump-1.5.ebuild @@ -0,0 +1,32 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools + +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_prepare() { + default + + eautoreconf +} + +src_install() { + dosbin ssldump + doman ssldump.1 + dodoc ChangeLog CREDITS README README.md +} diff --git a/net-analyzer/sslscan/Manifest b/net-analyzer/sslscan/Manifest index f1be247f7500..ed9de4f1eecb 100644 --- a/net-analyzer/sslscan/Manifest +++ b/net-analyzer/sslscan/Manifest @@ -1,10 +1,6 @@ -DIST sslscan-1.11.13-rbsec-openssl.tar.gz 5523256 BLAKE2B d8f5aa8bf748310fe1186ec9ab74ecc33425d6fa3db709d94516780d4efadbdd9cf6358798796704dfeb4032ec615298f3b67c8150e314f1e79a4d826c2589b7 SHA512 9bfdac0b6dcbb9e932ef41db9753f7298cf38ddc18731386968289114fd5ed10d81e95523d557b42b431377638d2f62fb710189e7d944ba89979fe5e3437fd3f -DIST sslscan-1.11.13-rbsec.tar.gz 57006 BLAKE2B ea5e2754f5a8218ee1f3aba26e7efe2394fa87b79137955705edc4600d67139f2641ac7b4e7a92f7273878f5b150e3e1b159114c833dc180049688563cf5095b SHA512 51477e5b29a2fc87e2d6c8d76430eeb2a6feb388d47392938b9e2c572acc5926534a19dc249080a066256a1a6cbfe08b162e9f3839386c86116352e5eb57c544 -DIST sslscan-2.0.1.tar.gz 109709 BLAKE2B d0aabebe208529122d9d4d63d39b13c3cc9128dce552cc773b32e02ade87fcb91d5ad7e13a5dfd4883f73153d3ec19b91b16166a756c38df92c96a2f9e8606bb SHA512 d8e9b66b110d7a76ffa7cc3b52f6f5614998ab08e91d12aa92d604ff3320dff6bec0e9a9017ab9c2dea204d9f51b5c729215836fd8f0dce0c5817e28b2eef63f -DIST sslscan-2.0.2.tar.gz 109798 BLAKE2B 4ed599578a3ee1bd0296c237f8f751aa9f95b96ab7592d0d8f7d117879e7058a92f28d5361658e144eb461fd1bb11739e79e2ae030ac9fb0430924ecca53dfd6 SHA512 ffe12315942c9b9a5f28766768c2202ef09d82977a42c5d114ba2bb7354e694df6262377288ca788e185e0b9423a78c9ebe2fcc02923bd8522c0b9b98df43453 -DIST sslscan-2.0.3.tar.gz 109870 BLAKE2B e42b31eea50adb3f24627a0359d9896a1ed3e24f6f4316ff55ed1ea5e52a9d8d7db8c231e18e0e323b688e3b2cb15342b052529392bfa9b6be17e7c3401bf193 SHA512 3cc1e7b93f76c03afff054b74938fbc22a190f6231fc9623b70084d5488313e253d170532c58ec5d320cac2a0b451b2bf43199367f4f38ccecbfa904bb8424ec -DIST sslscan-2.0.4.tar.gz 109501 BLAKE2B 45eccf9c2b7b235b30259dd77a7bdfcb77ee43517ec5619aef96a06aba9f145e105fc29410f4abf6d4c645c1aebd02156344d9ca88c629068ba00d6ee93d12e2 SHA512 1313020edc75abad12f1ea735d4c871d4bc605b7cb3be039904cb24dfbeae94580c812067b3ff304e9c4f612e22697dee02c6cfdc81066a7af46c95523399837 -DIST sslscan-2.0.5.tar.gz 109503 BLAKE2B bd1fd0c3a0eb9e00cd36dc30c3bc2cc052c0e842ef61e49830af57a7f6ebc4a683440c973193bd7ccd3a20b67c42a47c92480789bf3de0886d51827876626f64 SHA512 2d6db38d6df6bd3bd691381ad6f649283889bfcab06121d509db40ec080adff421962980cb7943eae83c23bcef91e57c5d2be1ad32560e8bdab2b200a080fb37 -DIST sslscan-2.0.6.tar.gz 109597 BLAKE2B 30c0dc329d252fbb91800e470cad84214fbe30694c33fa388040838da24ca73b0857f19603ca7e71dc84fe4ca10977b2d4c0145a752718225f5225540184dee5 SHA512 2f7236f101e1ab75a6fb2efc8fed2949a410b4c67156e88865724e0f399a6e749218253d49c122f1e046022634ef62dcc2b4f97833fd33f90a3ba5a2b7e06c6c -DIST sslscan-OpenSSL_1_1_1g.tar.gz 9975550 BLAKE2B 22efa4ffe5d56a861bc4e2e1bc9a558e79265a3789acd9ca65d0a1162a1808a089a92a234e88c951f2a3cdabd3b1908ac7fe6d5f2b5fe554f229a22c11ab185b SHA512 bc8d24d7fc93542a8d77e13a57768de242ef679ef4db93c1b6b981a15a60646a5c5d869d066248448f3eb1ab2012e3ddc80bf301f486c0574d469a3f7db7b8d4 -DIST sslscan-OpenSSL_1_1_1h.tar.gz 9985614 BLAKE2B 78f8bcf04a5a03636efe4ea2f82cfbbf6528ed1b02f64b7b7cf773809f5bed11974fd6d2f9f9bddb7fc31e986997f0987a0a773da2bd10b842f3ace977c5c56a SHA512 619dc7b28151571e4410844263a6727c9883701c11a064a2df55368659a63d548179165c9b96910b0e739cec1142f109eae9503b688cbade7abd6b4f3a7563aa +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-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 diff --git a/net-analyzer/sslscan/files/gentoo.config-1.0.2 b/net-analyzer/sslscan/files/gentoo.config-1.0.2 new file mode 100644 index 000000000000..68d7d0ac1fc1 --- /dev/null +++ b/net-analyzer/sslscan/files/gentoo.config-1.0.2 @@ -0,0 +1,171 @@ +#!/usr/bin/env bash +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 +# +# Openssl doesn't play along nicely with cross-compiling +# like autotools based projects, so let's teach it new tricks. +# +# Review the bundled 'config' script to see why kind of targets +# we can pass to the 'Configure' script. + + +# Testing routines +if [[ $1 == "test" ]] ; then + for c in \ + "arm-gentoo-linux-uclibc |linux-generic32 -DL_ENDIAN" \ + "armv5b-linux-gnu |linux-armv4 -DB_ENDIAN" \ + "x86_64-pc-linux-gnu |linux-x86_64" \ + "alpha-linux-gnu |linux-alpha-gcc" \ + "alphaev56-unknown-linux-gnu |linux-alpha+bwx-gcc" \ + "i686-pc-linux-gnu |linux-elf" \ + "whatever-gentoo-freebsdX.Y |BSD-generic32" \ + "i686-gentoo-freebsdX.Y |BSD-x86-elf" \ + "sparc64-alpha-freebsdX.Y |BSD-sparc64" \ + "ia64-gentoo-freebsd5.99234 |BSD-ia64" \ + "x86_64-gentoo-freebsdX.Y |BSD-x86_64" \ + "hppa64-aldsF-linux-gnu5.3 |linux-generic32 -DB_ENDIAN" \ + "powerpc-gentOO-linux-uclibc |linux-ppc" \ + "powerpc64-unk-linux-gnu |linux-ppc64" \ + "powerpc64le-linux-gnu |linux-ppc64le" \ + "x86_64-apple-darwinX |darwin64-x86_64-cc" \ + "powerpc64-apple-darwinX |darwin64-ppc-cc" \ + "i686-apple-darwinX |darwin-i386-cc" \ + "i386-apple-darwinX |darwin-i386-cc" \ + "powerpc-apple-darwinX |darwin-ppc-cc" \ + "i586-pc-winnt |winnt-parity" \ + "s390-ibm-linux-gnu |linux-generic32 -DB_ENDIAN" \ + "s390x-linux-gnu |linux64-s390x" \ + ;do + CHOST=${c/|*} + ret_want=${c/*|} + ret_got=$(CHOST=${CHOST} "$0") + + if [[ ${ret_want} == "${ret_got}" ]] ; then + echo "PASS: ${CHOST}" + else + echo "FAIL: ${CHOST}" + echo -e "\twanted: ${ret_want}" + echo -e "\twe got: ${ret_got}" + fi + done + exit 0 +fi +[[ -z ${CHOST} && -n $1 ]] && CHOST=$1 + + +# Detect the operating system +case ${CHOST} in + *-aix*) system="aix";; + *-darwin*) system="darwin";; + *-freebsd*) system="BSD";; + *-hpux*) system="hpux";; + *-linux*) system="linux";; + *-solaris*) system="solaris";; + *-winnt*) system="winnt";; + x86_64-*-mingw*) system="mingw64";; + *mingw*) system="mingw";; + *) exit 0;; +esac + + +# Compiler munging +compiler="gcc" +if [[ ${CC} == "ccc" ]] ; then + compiler=${CC} +fi + + +# Detect target arch +machine="" +chost_machine=${CHOST%%-*} +case ${system} in +linux) + case ${chost_machine}:${ABI} in + aarch64*be*) machine="aarch64 -DB_ENDIAN";; + aarch64*) machine="aarch64 -DL_ENDIAN";; + alphaev56*|\ + alphaev[678]*)machine=alpha+bwx-${compiler};; + alpha*) machine=alpha-${compiler};; + armv[4-9]*b*) machine="armv4 -DB_ENDIAN";; + armv[4-9]*) machine="armv4 -DL_ENDIAN";; + arm*b*) machine="generic32 -DB_ENDIAN";; + arm*) machine="generic32 -DL_ENDIAN";; + avr*) machine="generic32 -DL_ENDIAN";; + bfin*) machine="generic32 -DL_ENDIAN";; + # hppa64*) machine=parisc64;; + hppa*) machine="generic32 -DB_ENDIAN";; + i[0-9]86*|\ + x86_64*:x86) machine=elf;; + ia64*) machine=ia64;; + m68*) machine="generic32 -DB_ENDIAN";; + mips*el*) machine="generic32 -DL_ENDIAN";; + mips*) machine="generic32 -DB_ENDIAN";; + powerpc64*le*)machine=ppc64le;; + powerpc64*) machine=ppc64;; + powerpc*le*) machine="generic32 -DL_ENDIAN";; + powerpc*) machine=ppc;; + riscv32*) machine="generic32 -DL_ENDIAN";; + riscv64*) machine="generic64 -DL_ENDIAN";; + # sh64*) machine=elf;; + sh*b*) machine="generic32 -DB_ENDIAN";; + sh*) machine="generic32 -DL_ENDIAN";; + # TODO: Might want to do -mcpu probing like glibc to determine a + # better default for sparc-linux-gnu targets. This logic will + # break v7 and older systems when they use it. + sparc*v7*) machine="generic32 -DB_ENDIAN";; + sparc64*) machine=sparcv9 system=linux64;; + sparc*v9*) machine=sparcv9;; + sparc*v8*) machine=sparcv8;; + sparc*) machine=sparcv8;; + s390x*) machine=s390x system=linux64;; + s390*) machine="generic32 -DB_ENDIAN";; + x86_64*:x32) machine=x32;; + x86_64*) machine=x86_64;; + esac + ;; +BSD) + case ${chost_machine} in + alpha*) machine=generic64;; + i[6-9]86*) machine=x86-elf;; + ia64*) machine=ia64;; + sparc64*) machine=sparc64;; + x86_64*) machine=x86_64;; + *) machine=generic32;; + esac + ;; +aix) + machine=${compiler} + ;; +darwin) + case ${chost_machine} in + powerpc64) machine=ppc-cc; system=${system}64;; + powerpc) machine=ppc-cc;; + i?86*) machine=i386-cc;; + x86_64) machine=x86_64-cc; system=${system}64;; + esac + ;; +hpux) + case ${chost_machine} in + ia64) machine=ia64-${compiler} ;; + esac + ;; +solaris) + case ${chost_machine} in + i386) machine=x86-${compiler} ;; + x86_64*) machine=x86_64-${compiler}; system=${system}64;; + sparcv9*) machine=sparcv9-${compiler}; system=${system}64;; + sparc*) machine=sparcv8-${compiler};; + esac + ;; +winnt) + machine=parity + ;; +mingw*) + # special case ... no xxx-yyy style name + echo ${system} + ;; +esac + + +# If we have something, show it +[[ -n ${machine} ]] && echo ${system}-${machine} diff --git a/net-analyzer/sslscan/metadata.xml b/net-analyzer/sslscan/metadata.xml index a67d5ce56426..7684d0be8b63 100644 --- a/net-analyzer/sslscan/metadata.xml +++ b/net-analyzer/sslscan/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> <email>graaff@gentoo.org</email> diff --git a/net-analyzer/sslscan/sslscan-1.11.13-r1.ebuild b/net-analyzer/sslscan/sslscan-1.11.13-r1.ebuild deleted file mode 100644 index 1cf3cf65c006..000000000000 --- a/net-analyzer/sslscan/sslscan-1.11.13-r1.ebuild +++ /dev/null @@ -1,45 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -# Upstream now builds against the openssl 1.0.x fork by PeterMosmans -MOSMANS_OPENSSL_COMMIT=c9ba19c8b7fd131137373dbd1fccd6a8bb0628be - -inherit eutils toolchain-funcs - -DESCRIPTION="Fast SSL configuration scanner" -HOMEPAGE="https://github.com/rbsec/sslscan" -MY_FORK="rbsec" -SRC_URI="https://github.com/${MY_FORK}/${PN}/archive/${PV}-${MY_FORK}.tar.gz -> ${P}-${MY_FORK}.tar.gz - https://github.com/PeterMosmans/openssl/archive/${MOSMANS_OPENSSL_COMMIT}.tar.gz -> ${P}-${MY_FORK}-openssl.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="" - -DEPEND="" -RDEPEND="${DEPEND}" - -S="${WORKDIR}/${P}-${MY_FORK}" - -src_prepare() { - ln -s ../openssl-${MOSMANS_OPENSSL_COMMIT} openssl || die - touch .openssl_is_fresh || die - - sed -i -e '/openssl\/.git/,/fi/d' \ - -e '/openssl test/d' Makefile || die - - default -} - -src_compile() { - emake static -} - -src_install() { - DESTDIR="${D}" emake install - - dodoc Changelog README.md -} diff --git a/net-analyzer/sslscan/sslscan-2.0.1.ebuild b/net-analyzer/sslscan/sslscan-2.0.1.ebuild deleted file mode 100644 index 874d6c6593bd..000000000000 --- a/net-analyzer/sslscan/sslscan-2.0.1.ebuild +++ /dev/null @@ -1,50 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -# sslscan builds against a static openssl library to allow weak ciphers -# to be enabled so that they can be tested. -OPENSSL_RELEASE_TAG="OpenSSL_1_1_1g" - -inherit toolchain-funcs - -DESCRIPTION="Fast SSL configuration scanner" -HOMEPAGE="https://github.com/rbsec/sslscan" -#MY_FORK="rbsec" -#SRC_URI="https://github.com/${MY_FORK}/${PN}/archive/${PV}-${MY_FORK}.tar.gz -> ${P}-${MY_FORK}.tar.gz -# https://github.com/PeterMosmans/openssl/archive/${MOSMANS_OPENSSL_COMMIT}.tar.gz -> ${P}-${MY_FORK}-openssl.tar.gz" -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 ~x86" -IUSE="" - -DEPEND="dev-libs/openssl:*" -RDEPEND="${DEPEND}" - -# 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 - - default -} - -src_compile() { - emake static -} - -src_install() { - DESTDIR="${D}" emake install - - dodoc Changelog README.md -} diff --git a/net-analyzer/sslscan/sslscan-2.0.2-r1.ebuild b/net-analyzer/sslscan/sslscan-2.0.2-r1.ebuild deleted file mode 100644 index b90f6d3563b4..000000000000 --- a/net-analyzer/sslscan/sslscan-2.0.2-r1.ebuild +++ /dev/null @@ -1,47 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -# sslscan builds against a static openssl library to allow weak ciphers -# to be enabled so that they can be tested. -OPENSSL_RELEASE_TAG="OpenSSL_1_1_1h" - -inherit toolchain-funcs - -DESCRIPTION="Fast SSL configuration scanner" -HOMEPAGE="https://github.com/rbsec/sslscan" -#MY_FORK="rbsec" -#SRC_URI="https://github.com/${MY_FORK}/${PN}/archive/${PV}-${MY_FORK}.tar.gz -> ${P}-${MY_FORK}.tar.gz -# https://github.com/PeterMosmans/openssl/archive/${MOSMANS_OPENSSL_COMMIT}.tar.gz -> ${P}-${MY_FORK}-openssl.tar.gz" -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 ~x86" -IUSE="" - -# 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 - - default -} - -src_compile() { - emake static -} - -src_install() { - DESTDIR="${D}" emake install - - dodoc Changelog README.md -} diff --git a/net-analyzer/sslscan/sslscan-2.0.2.ebuild b/net-analyzer/sslscan/sslscan-2.0.2.ebuild deleted file mode 100644 index 874d6c6593bd..000000000000 --- a/net-analyzer/sslscan/sslscan-2.0.2.ebuild +++ /dev/null @@ -1,50 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -# sslscan builds against a static openssl library to allow weak ciphers -# to be enabled so that they can be tested. -OPENSSL_RELEASE_TAG="OpenSSL_1_1_1g" - -inherit toolchain-funcs - -DESCRIPTION="Fast SSL configuration scanner" -HOMEPAGE="https://github.com/rbsec/sslscan" -#MY_FORK="rbsec" -#SRC_URI="https://github.com/${MY_FORK}/${PN}/archive/${PV}-${MY_FORK}.tar.gz -> ${P}-${MY_FORK}.tar.gz -# https://github.com/PeterMosmans/openssl/archive/${MOSMANS_OPENSSL_COMMIT}.tar.gz -> ${P}-${MY_FORK}-openssl.tar.gz" -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 ~x86" -IUSE="" - -DEPEND="dev-libs/openssl:*" -RDEPEND="${DEPEND}" - -# 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 - - default -} - -src_compile() { - emake static -} - -src_install() { - DESTDIR="${D}" emake install - - dodoc Changelog README.md -} diff --git a/net-analyzer/sslscan/sslscan-2.0.3.ebuild b/net-analyzer/sslscan/sslscan-2.0.3.ebuild deleted file mode 100644 index b90f6d3563b4..000000000000 --- a/net-analyzer/sslscan/sslscan-2.0.3.ebuild +++ /dev/null @@ -1,47 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -# sslscan builds against a static openssl library to allow weak ciphers -# to be enabled so that they can be tested. -OPENSSL_RELEASE_TAG="OpenSSL_1_1_1h" - -inherit toolchain-funcs - -DESCRIPTION="Fast SSL configuration scanner" -HOMEPAGE="https://github.com/rbsec/sslscan" -#MY_FORK="rbsec" -#SRC_URI="https://github.com/${MY_FORK}/${PN}/archive/${PV}-${MY_FORK}.tar.gz -> ${P}-${MY_FORK}.tar.gz -# https://github.com/PeterMosmans/openssl/archive/${MOSMANS_OPENSSL_COMMIT}.tar.gz -> ${P}-${MY_FORK}-openssl.tar.gz" -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 ~x86" -IUSE="" - -# 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 - - default -} - -src_compile() { - emake static -} - -src_install() { - DESTDIR="${D}" emake install - - dodoc Changelog README.md -} diff --git a/net-analyzer/sslscan/sslscan-2.0.4.ebuild b/net-analyzer/sslscan/sslscan-2.0.4.ebuild deleted file mode 100644 index b90f6d3563b4..000000000000 --- a/net-analyzer/sslscan/sslscan-2.0.4.ebuild +++ /dev/null @@ -1,47 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -# sslscan builds against a static openssl library to allow weak ciphers -# to be enabled so that they can be tested. -OPENSSL_RELEASE_TAG="OpenSSL_1_1_1h" - -inherit toolchain-funcs - -DESCRIPTION="Fast SSL configuration scanner" -HOMEPAGE="https://github.com/rbsec/sslscan" -#MY_FORK="rbsec" -#SRC_URI="https://github.com/${MY_FORK}/${PN}/archive/${PV}-${MY_FORK}.tar.gz -> ${P}-${MY_FORK}.tar.gz -# https://github.com/PeterMosmans/openssl/archive/${MOSMANS_OPENSSL_COMMIT}.tar.gz -> ${P}-${MY_FORK}-openssl.tar.gz" -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 ~x86" -IUSE="" - -# 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 - - default -} - -src_compile() { - emake static -} - -src_install() { - DESTDIR="${D}" emake install - - dodoc Changelog README.md -} diff --git a/net-analyzer/sslscan/sslscan-2.0.5.ebuild b/net-analyzer/sslscan/sslscan-2.0.5.ebuild deleted file mode 100644 index 8deaf7cd4f79..000000000000 --- a/net-analyzer/sslscan/sslscan-2.0.5.ebuild +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -# sslscan builds against a static openssl library to allow weak ciphers -# to be enabled so that they can be tested. -OPENSSL_RELEASE_TAG="OpenSSL_1_1_1h" - -inherit toolchain-funcs - -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 ~x86" -IUSE="" - -# 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 - - default -} - -src_compile() { - emake static -} - -src_install() { - DESTDIR="${D}" emake install - - dodoc Changelog README.md -} diff --git a/net-analyzer/sslscan/sslscan-2.0.6.ebuild b/net-analyzer/sslscan/sslscan-2.0.6.ebuild deleted file mode 100644 index 8deaf7cd4f79..000000000000 --- a/net-analyzer/sslscan/sslscan-2.0.6.ebuild +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -# sslscan builds against a static openssl library to allow weak ciphers -# to be enabled so that they can be tested. -OPENSSL_RELEASE_TAG="OpenSSL_1_1_1h" - -inherit toolchain-funcs - -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 ~x86" -IUSE="" - -# 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 - - default -} - -src_compile() { - emake static -} - -src_install() { - DESTDIR="${D}" emake install - - dodoc Changelog README.md -} diff --git a/net-analyzer/sslscan/sslscan-2.1.1.ebuild b/net-analyzer/sslscan/sslscan-2.1.1.ebuild new file mode 100644 index 000000000000..4a30e17b6ac3 --- /dev/null +++ b/net-analyzer/sslscan/sslscan-2.1.1.ebuild @@ -0,0 +1,82 @@ +# Copyright 1999-2023 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.11" + +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 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/sslscan/sslscan-2.1.2.ebuild b/net-analyzer/sslscan/sslscan-2.1.2.ebuild new file mode 100644 index 000000000000..b77ee2587f92 --- /dev/null +++ b/net-analyzer/sslscan/sslscan-2.1.2.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.12" + +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 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/sslscan/sslscan-2.1.3-r1.ebuild b/net-analyzer/sslscan/sslscan-2.1.3-r1.ebuild new file mode 100644 index 000000000000..85086045d0da --- /dev/null +++ b/net-analyzer/sslscan/sslscan-2.1.3-r1.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.13" + +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/sslscan/sslscan-2.1.3.ebuild b/net-analyzer/sslscan/sslscan-2.1.3.ebuild new file mode 100644 index 000000000000..aa63120b6c89 --- /dev/null +++ b/net-analyzer/sslscan/sslscan-2.1.3.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.12" + +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 ~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/sslsplit/Manifest b/net-analyzer/sslsplit/Manifest index c06f6601455f..99d65e3f8129 100644 --- a/net-analyzer/sslsplit/Manifest +++ b/net-analyzer/sslsplit/Manifest @@ -1,2 +1 @@ -DIST sslsplit-0.5.4.tar.gz 1750390 BLAKE2B 4ab9014c91938397c469bdc49dd307c47375047f018a5caaf8b32eb84596d2fbe623702349dc85776071363b2167c6ee8918604c6bf2843d357ffe64df36bb1b SHA512 5220cbf26a2d5201c4b36207ec52b290f95002c6d5a4d828868d163cff528095add8b333ecb844b86b4e83f62934aa840f80d3838d00997acd50b6e30cee7aed DIST sslsplit-0.5.5.tar.gz 1846850 BLAKE2B b223491c480070dd9718804f0ceb8fec9fe519cf0d189fd9bf9cc4dce5ae00d93227dca42349b42d2b82c62d0d92c451442670f6eae2f8d2beedef437907299b SHA512 f236f1ccce8bdb4a09659551defd73b73fbf660ceedace6ffbbb687c1de4488f74a23274b53a67e7001dfcdbd0ede7270ba8261feab633a25ae9f57cce468f39 diff --git a/net-analyzer/sslsplit/files/sslsplit-0.5.4-install.patch b/net-analyzer/sslsplit/files/sslsplit-0.5.4-install.patch deleted file mode 100644 index 65959f3e1090..000000000000 --- a/net-analyzer/sslsplit/files/sslsplit-0.5.4-install.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/GNUmakefile b/GNUmakefile -index ebdcf0a..02cb4b7 100644 ---- a/GNUmakefile -+++ b/GNUmakefile -@@ -519,21 +519,12 @@ $(TARGET).conf.5: $(TARGET).conf.5.in $(MKFS) FORCE - - install: $(TARGET) $(TARGET).conf $(TARGET).1 $(TARGET).conf.5 - test -d $(DESTDIR)$(PREFIX)/bin || $(MKDIR) -p $(DESTDIR)$(PREFIX)/bin -- test -d $(DESTDIR)$(PREFIX)/$(TARGET) || \ -- $(MKDIR) -p $(DESTDIR)$(PREFIX)/sslsplit - test -d $(DESTDIR)$(PREFIX)/$(MANDIR)/man1 || \ - $(MKDIR) -p $(DESTDIR)$(PREFIX)/$(MANDIR)/man1 - test -d $(DESTDIR)$(PREFIX)/$(MANDIR)/man5 || \ - $(MKDIR) -p $(DESTDIR)$(PREFIX)/$(MANDIR)/man5 -- test -d $(DESTDIR)/var/log/$(TARGET) || \ -- $(MKDIR) -p $(DESTDIR)/var/log/$(TARGET) -- test -d $(DESTDIR)/var/run/$(TARGET) || \ -- $(MKDIR) -p $(DESTDIR)/var/run/$(TARGET) - $(INSTALL) $(BINOWNERFLAGS) -m $(BINMODE) \ - $(TARGET) $(DESTDIR)$(PREFIX)/bin/ -- $(INSTALL) $(CNFOWNERFLAGS) -m $(CNFMODE) \ -- $(TARGET).conf \ -- $(DESTDIR)$(PREFIX)/$(TARGET)/$(TARGET).conf.sample - $(INSTALL) $(MANOWNERFLAGS) -m $(MANMODE) \ - $(TARGET).1 $(DESTDIR)$(PREFIX)/$(MANDIR)/man1/ - $(INSTALL) $(MANOWNERFLAGS) -m $(MANMODE) \ diff --git a/net-analyzer/sslsplit/files/sslsplit-0.5.5-libcrypto-pkgconfig.patch b/net-analyzer/sslsplit/files/sslsplit-0.5.5-libcrypto-pkgconfig.patch new file mode 100644 index 000000000000..dd6ae812efb6 --- /dev/null +++ b/net-analyzer/sslsplit/files/sslsplit-0.5.5-libcrypto-pkgconfig.patch @@ -0,0 +1,23 @@ +Use pkgconfig for localization of libcrypto. This is needed for tests in +multilib systems. + +diff --git a/extra/engine/GNUmakefile b/extra/engine/GNUmakefile +index b50717b..3712ad6 100644 +--- a/extra/engine/GNUmakefile ++++ b/extra/engine/GNUmakefile +@@ -16,9 +16,9 @@ else + SUFFIX:= so + endif + +-CFLAGS+= -fPIC -I$(OPENSSL_BASE)/include +-LDFLAGS+= -L$(OPENSSL_BASE)/lib +-LIBS+= -lcrypto ++CFLAGS+= -fPIC $(shell pkg-config --cflags libcrypto) ++LDFLAGS+= $(shell pkg-config --libs-only-L libcrypto) ++LIBS+= $(shell pkg-config --libs-only-l libcrypto) + + TARGET= dummy-engine + +-- +2.35.1 + diff --git a/net-analyzer/sslsplit/files/sslsplit-0.5.5-libnet-pkgconfig.patch b/net-analyzer/sslsplit/files/sslsplit-0.5.5-libnet-pkgconfig.patch new file mode 100644 index 000000000000..5eebf8d4deaf --- /dev/null +++ b/net-analyzer/sslsplit/files/sslsplit-0.5.5-libnet-pkgconfig.patch @@ -0,0 +1,40 @@ +Subject: [PATCH] locate libnet with pkgconfig + +This is partially reverted from upstream commit 46a55de8040a ("Refactor +location of packages, improve libnet detection") + +diff --git a/GNUmakefile b/GNUmakefile +index cc7197e..2343272 100644 +--- a/GNUmakefile ++++ b/GNUmakefile +@@ -277,6 +277,10 @@ PKGS+= $(shell $(PKGCONFIG) $(PCFLAGS) --exists libevent_openssl \ + PKGS+= $(shell $(PKGCONFIG) $(PCFLAGS) --exists libevent_pthreads \ + && echo libevent_pthreads) + endif ++ifndef LIBNET_BASE ++PKGS+= $(shell $(PKGCONFIG) $(PCFLAGS) --exists libnet \ ++ && echo libnet) ++endif + ifneq ($(filter -DWITHOUT_MIRROR,$(FEATURES)),-DWITHOUT_MIRROR) + ifndef LIBPCAP_BASE + PKGS+= $(shell $(PKGCONFIG) $(PCFLAGS) --exists libpcap \ +@@ -333,7 +337,7 @@ CHECK_MISSING:= 1 + endif + endif + +-# Always search filesystem for libnet because libnet-config is unreliable ++ifeq (,$(filter libnet,$(PKGS))) + ifneq ($(filter -DWITHOUT_MIRROR,$(FEATURES)),-DWITHOUT_MIRROR) + LIBNET_FOUND:= $(call locate,libnet,include/libnet-1.1/libnet.h,$(LIBNET_BASE)) + ifdef LIBNET_FOUND +@@ -347,6 +351,7 @@ $(error dependency 'libnet' not found; \ + install it or point LIBNET_BASE to base path) + endif + endif ++endif + + ifdef OPENSSL_FOUND + PKG_CPPFLAGS+= -I$(OPENSSL_FOUND)/include +-- +2.35.1 + diff --git a/net-analyzer/sslsplit/files/sslsplit-0.5.5-openssl3.patch b/net-analyzer/sslsplit/files/sslsplit-0.5.5-openssl3.patch new file mode 100644 index 000000000000..10807bee3899 --- /dev/null +++ b/net-analyzer/sslsplit/files/sslsplit-0.5.5-openssl3.patch @@ -0,0 +1,31 @@ +From: Soner Tari <sonertari@gmail.com> +Date: Fri, 4 Feb 2022 19:46:58 +0300 +Subject: [PATCH] Fix build errors with OpenSSL 3.0.x, but not deprecation + warnings, issue #290 + +This patch fixes errors only, so that build succeeds, but deprecation +warnings remain. It seems we need considerable changes to replace those +deprecated functions in the warnings. +--- + +Upstream-commit: e17de8454a65 ("Fix build errors with OpenSSL 3.0.x, but not deprecation warnings, issue #290") +Upstream-issue: https://github.com/droe/sslsplit/issues/290 + +diff --git a/pxyconn.c b/pxyconn.c +index e69de20..09a8b80 100644 +--- a/pxyconn.c ++++ b/pxyconn.c +@@ -72,6 +72,10 @@ bufferevent_openssl_set_allow_dirty_shutdown(UNUSED struct bufferevent *bev, + } + #endif /* LIBEVENT_VERSION_NUMBER < 0x02010000 */ + ++#if OPENSSL_VERSION_NUMBER >= 0x30000000L ++#define ERR_GET_FUNC(x) 0 ++#define ERR_func_error_string(x) "" ++#endif + + /* + * Maximum size of data to buffer per connection direction before +-- +2.35.1 + diff --git a/net-analyzer/sslsplit/metadata.xml b/net-analyzer/sslsplit/metadata.xml index 614c7c40e2e1..c83f57067941 100644 --- a/net-analyzer/sslsplit/metadata.xml +++ b/net-analyzer/sslsplit/metadata.xml @@ -1,14 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> - <email>arkamar@atlas.cz</email> + <email>arkamar@gentoo.org</email> <name>Petr Vaněk</name> </maintainer> - <maintainer type="project"> - <email>proxy-maint@gentoo.org</email> - <name>Proxy Maintainers</name> - </maintainer> <longdescription lang="en"> SSLsplit is a tool for man-in-the-middle attacks against SSL/TLS encrypted network connections. It is intended to be useful for network diff --git a/net-analyzer/sslsplit/sslsplit-0.5.4.ebuild b/net-analyzer/sslsplit/sslsplit-0.5.4.ebuild deleted file mode 100644 index f75310908600..000000000000 --- a/net-analyzer/sslsplit/sslsplit-0.5.4.ebuild +++ /dev/null @@ -1,52 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit flag-o-matic - -DESCRIPTION="Transparent SSL/TLS interception" -HOMEPAGE="https://www.roe.ch/SSLsplit" - -LICENSE="BSD-2" -SLOT="0" -IUSE="elibc_musl test" -RESTRICT="!test? ( test )" - -if [[ ${PV} == *9999 ]] ; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/droe/${PN}" - EGIT_BRANCH="develop" -else - SRC_URI="https://github.com/droe/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~x86" -fi - -RDEPEND=" - dev-libs/libevent[ssl,threads] - dev-libs/openssl:0= - net-libs/libnet:1.1 - net-libs/libpcap - elibc_musl? ( sys-libs/fts-standalone )" -DEPEND="${RDEPEND} - test? ( dev-libs/check )" -BDEPEND="virtual/pkgconfig" - -PATCHES=( - "${FILESDIR}/${P}-install.patch" -) - -src_prepare() { - default - - use elibc_musl && append-libs "-lfts" - - sed -i -e 's/-D_FORTIFY_SOURCE=2 //g' \ - -e 's/\<FEATURES\>/SSLSPLIT_FEATURES/g' GNUmakefile || die - sed -i '/opts_suite/d' main.t.c || die -} - -src_install() { - emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install - dodoc AUTHORS.md NEWS.md README.md sslsplit.conf -} diff --git a/net-analyzer/sslsplit/sslsplit-0.5.5-r1.ebuild b/net-analyzer/sslsplit/sslsplit-0.5.5-r1.ebuild new file mode 100644 index 000000000000..bd815603e0c1 --- /dev/null +++ b/net-analyzer/sslsplit/sslsplit-0.5.5-r1.ebuild @@ -0,0 +1,57 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit flag-o-matic + +DESCRIPTION="Transparent SSL/TLS interception" +HOMEPAGE=" + https://www.roe.ch/SSLsplit + https://github.com/droe/sslsplit +" + +LICENSE="BSD-2" +SLOT="0" +IUSE="test" +RESTRICT="!test? ( test )" + +if [[ ${PV} == *9999 ]] ; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/droe/${PN}" + EGIT_BRANCH="develop" +else + SRC_URI="https://github.com/droe/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~arm64 ~x86" +fi + +RDEPEND=" + dev-libs/libevent:=[ssl,threads(+)] + dev-libs/openssl:0= + net-libs/libnet:1.1 + net-libs/libpcap + elibc_musl? ( sys-libs/fts-standalone )" +DEPEND="${RDEPEND} + test? ( dev-libs/check )" +BDEPEND="virtual/pkgconfig" + +PATCHES=( + "${FILESDIR}/${P}-openssl3.patch" + "${FILESDIR}/${P}-libnet-pkgconfig.patch" + "${FILESDIR}/${P}-libcrypto-pkgconfig.patch" +) + +src_prepare() { + default + + use elibc_musl && append-libs "-lfts" + + sed -i -e 's/-D_FORTIFY_SOURCE=2 //g' \ + -e 's/\<FEATURES\>/SSLSPLIT_FEATURES/g' GNUmakefile || die + sed -i '/opts_suite/d' main.t.c || die +} + +src_install() { + emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" SYSCONFDIR="${EPREFIX}/etc" install + dodoc AUTHORS.md NEWS.md README.md +} diff --git a/net-analyzer/sslsplit/sslsplit-0.5.5.ebuild b/net-analyzer/sslsplit/sslsplit-0.5.5.ebuild deleted file mode 100644 index 355f76bc4381..000000000000 --- a/net-analyzer/sslsplit/sslsplit-0.5.5.ebuild +++ /dev/null @@ -1,48 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit flag-o-matic - -DESCRIPTION="Transparent SSL/TLS interception" -HOMEPAGE="https://www.roe.ch/SSLsplit" - -LICENSE="BSD-2" -SLOT="0" -IUSE="elibc_musl test" -RESTRICT="!test? ( test )" - -if [[ ${PV} == *9999 ]] ; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/droe/${PN}" - EGIT_BRANCH="develop" -else - SRC_URI="https://github.com/droe/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~x86" -fi - -RDEPEND=" - dev-libs/libevent[ssl,threads] - dev-libs/openssl:0= - net-libs/libnet:1.1 - net-libs/libpcap - elibc_musl? ( sys-libs/fts-standalone )" -DEPEND="${RDEPEND} - test? ( dev-libs/check )" -BDEPEND="virtual/pkgconfig" - -src_prepare() { - default - - use elibc_musl && append-libs "-lfts" - - sed -i -e 's/-D_FORTIFY_SOURCE=2 //g' \ - -e 's/\<FEATURES\>/SSLSPLIT_FEATURES/g' GNUmakefile || die - sed -i '/opts_suite/d' main.t.c || die -} - -src_install() { - emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" SYSCONFDIR="${EPREFIX}/etc" install - dodoc AUTHORS.md NEWS.md README.md -} diff --git a/net-analyzer/sslsplit/sslsplit-9999.ebuild b/net-analyzer/sslsplit/sslsplit-9999.ebuild deleted file mode 100644 index 355f76bc4381..000000000000 --- a/net-analyzer/sslsplit/sslsplit-9999.ebuild +++ /dev/null @@ -1,48 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit flag-o-matic - -DESCRIPTION="Transparent SSL/TLS interception" -HOMEPAGE="https://www.roe.ch/SSLsplit" - -LICENSE="BSD-2" -SLOT="0" -IUSE="elibc_musl test" -RESTRICT="!test? ( test )" - -if [[ ${PV} == *9999 ]] ; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/droe/${PN}" - EGIT_BRANCH="develop" -else - SRC_URI="https://github.com/droe/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~x86" -fi - -RDEPEND=" - dev-libs/libevent[ssl,threads] - dev-libs/openssl:0= - net-libs/libnet:1.1 - net-libs/libpcap - elibc_musl? ( sys-libs/fts-standalone )" -DEPEND="${RDEPEND} - test? ( dev-libs/check )" -BDEPEND="virtual/pkgconfig" - -src_prepare() { - default - - use elibc_musl && append-libs "-lfts" - - sed -i -e 's/-D_FORTIFY_SOURCE=2 //g' \ - -e 's/\<FEATURES\>/SSLSPLIT_FEATURES/g' GNUmakefile || die - sed -i '/opts_suite/d' main.t.c || die -} - -src_install() { - emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" SYSCONFDIR="${EPREFIX}/etc" install - dodoc AUTHORS.md NEWS.md README.md -} diff --git a/net-analyzer/ssmping/metadata.xml b/net-analyzer/ssmping/metadata.xml index 851f9e832157..164fd2d779f4 100644 --- a/net-analyzer/ssmping/metadata.xml +++ b/net-analyzer/ssmping/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>netmon@gentoo.org</email> diff --git a/net-analyzer/ssmping/ssmping-0.9.1.ebuild b/net-analyzer/ssmping/ssmping-0.9.1.ebuild index a9dc609c45f5..13fb78913e09 100644 --- a/net-analyzer/ssmping/ssmping-0.9.1.ebuild +++ b/net-analyzer/ssmping/ssmping-0.9.1.ebuild @@ -1,18 +1,24 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 -inherit eutils toolchain-funcs +EAPI=7 + +inherit toolchain-funcs DESCRIPTION="Tool for testing multicast connectivity" HOMEPAGE="http://www.venaas.no/multicast/ssmping/" -LICENSE="public-domain" SRC_URI="http://www.venaas.no/multicast/ssmping/${P}.tar.gz" + +LICENSE="public-domain" SLOT="0" -KEYWORDS="amd64 x86" +KEYWORDS="amd64 ~riscv x86" + +PATCHES=( + "${FILESDIR}"/${PN}-0.9-build.patch +) src_prepare() { - epatch "${FILESDIR}"/${PN}-0.9-build.patch + default tc-export CC } diff --git a/net-analyzer/suricata/Manifest b/net-analyzer/suricata/Manifest index 4393b479fd57..fdaacd396d1e 100644 --- a/net-analyzer/suricata/Manifest +++ b/net-analyzer/suricata/Manifest @@ -1,4 +1,2 @@ -DIST suricata-5.0.4.tar.gz 29091046 BLAKE2B 38526ca39d2460d630fdd9e804f36c74bfcde54a529748896779b549ed1b55174d6080ddad8933ddfd26004f4e78748a503832f47ee5f52d84a133643aef482b SHA512 e5da14f80b628968e146839b828971e888fd0158b2ecbbcc15c0f42fda2bdcc8ad89632ba05cc45c88d88e537452e77f8e2f3a5e09ecd038d0d38b1a8cf8cea6 -DIST suricata-5.0.5.tar.gz 29094537 BLAKE2B c2a5897836117abe9ca39b3a03de36c4d5667d3e64dc1befd77a7b777e4191439a497e3042e6d00b80ae31c8c4f18347cb2e6833e8db5f64b31c8ab1cf557ac5 SHA512 5f26731e0a0134fdecc8e76a68a69584bacb614ba4fd56b74f27abe62ab7d80135908eeaae38c9a03101f069d83597b3c7c69000bdd2a2e6bfe87f7a98de4e16 -DIST suricata-6.0.0.tar.gz 30832555 BLAKE2B 9cea05b07520924706e961efed6a45b9ba73388a25777f43c1a90497aa00ec200bad15863b7b17b84e622c79309365596853423776da9c3d103c2a8c1126a0d2 SHA512 3c30f6f57c0e8a24992ff2b4ce8ce166d3c0d4b28c8f5e79434d04de9f2016773be01a1689fedfc9e54ff1c8bc9838206bc28f3ff2e47d60102a7016f1062ec3 -DIST suricata-6.0.1.tar.gz 30460439 BLAKE2B 55a24fa2f653a0a80f51e1ab102bb7046bd1f67d60c64c139b485086f4d8e0f5db58906bc33a7b5bdb76ba37b8206ded99b08034c4c292cf16d595bcafc7acc0 SHA512 be57150afc238b6627731e4463297e67469b66241779f5af3d1bd93bfad4fde41a5371298b54a06c7c3ea324e5642753ca57900173989ac738d663a85e9c33f4 +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-5.0.1-init b/net-analyzer/suricata/files/suricata-5.0.1-init deleted file mode 100644 index 89f92803cedf..000000000000 --- a/net-analyzer/suricata/files/suricata-5.0.1-init +++ /dev/null @@ -1,147 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -SURICATA_BIN=/usr/bin/suricata -SURICATA_DIR=${SURICATA_DIR:-/etc/suricata} -SURICATA=${SVCNAME#*.} -SURICATAID=$(shell_var "${SURICATA}") -if [ -n "${SURICATA}" ] && [ ${SVCNAME} != "suricata" ]; then - eval SURICATACONF=\$SURICATA_CONF_${SURICATAID} - [ ${#SURICATACONF} -eq 0 ] && SURICATACONF="${SURICATA_DIR}/suricata-${SURICATA}.yaml" || SURICATACONF="${SURICATA_DIR}/${SURICATACONF}" - SURICATAPID="/run/suricata/suricata.${SURICATA}.pid" - eval SURICATAOPTS=\$SURICATA_OPTS_${SURICATAID} - eval SURICATALOGPATH=\$SURICATA_LOG_FILE_${SURICATAID} - eval SURICATAUSER=\$SURICATA_USER_${SURICATAID} - eval SURICATAGROUP=\$SURICATA_GROUP_${SURICATAID} -else - SURICATACONF=${SURICATA_CONF} - [ ${#SURICATACONF} -eq 0 ] && SURICATACONF="${SURICATA_DIR}/suricata.yaml" || SURICATACONF="${SURICATA_DIR}/${SURICATACONF}" - SURICATAPID="/run/suricata/suricata.pid" - SURICATAOPTS=${SURICATA_OPTS} - SURICATALOGPATH=${SURICATA_LOG_FILE} - SURICATAUSER=${SURICATA_USER} - SURICATAGROUP=${SURICATA_GROUP} -fi -SURICATAUSER=${SURICATAUSER:-${SURICATA_USER}} -SURICATAGROUP=${SURICATAGROUP:-${SURICATA_GROUP}} -[ -e ${SURICATACONF} ] && SURICATAOPTS="-c ${SURICATACONF} ${SURICATAOPTS}" -[[ -z "${SURICATA_MAX_WAIT_ON_STOP// }" ]] || SURICATA_RETRY="--retry ${SURICATA_MAX_WAIT_ON_STOP}" - -description="Suricata IDS/IPS" -extra_commands="checkconfig dump" -description_checkconfig="Check config for ${SVCNAME}" -description_dump="List all config values that can be used with --set" -extra_started_commands="reload relog" -description_reload="Live rule and config reload" -description_relog="Close and re-open all log files" - -depend() { - need net - after mysql - after postgresql -} - -checkconfig() { - if [ ! -d "/run/suricata" ] ; then - checkpath -d /run/suricata - fi - if [ ${#SURICATALOGPATH} -gt 0 ]; then - SURICATALOGFILE=$( basename ${SURICATALOGPATH} ) - SURICATALOGFILE=${SURICATALOGFILE:-suricata.log} - SURICATALOGPATH=$( dirname ${SURICATALOGPATH} ) - if [ ! -d "${SURICATALOGPATH}" ] ; then - checkpath -d "${SURICATALOGPATH}" - fi - if [ ${#SURICATAUSER} -gt 0 ] && [ ${#SURICATAGROUP} -gt 0 ] && [ -e "${SURICATALOGPATH}" ]; then - chown ${SURICATAUSER}:${SURICATAGROUP} "${SURICATALOGPATH}" || return 1 - chown ${SURICATAUSER}:${SURICATAGROUP} "${SURICATALOGPATH}"/* >/dev/null 2>&1 3>&1 - fi - SURICATAOPTS="${SURICATAOPTS} --set logging.outputs.1.file.filename=${SURICATALOGPATH}/${SURICATALOGFILE}" - SURICATALOGPATH="-l ${SURICATALOGPATH}" - fi - if [ ! -e ${SURICATACONF} ] ; then - einfo "The configuration file ${SURICATACONF} was not found." - einfo "If this is OK then make sure you set enough options for ${SVCNAME} in /etc/conf.d/suricata." - einfo "Take a look at the suricata arguments --set and --dump-config." - fi - if [ ${#SURICATAUSER} -gt 0 ] && [ ${#SURICATAGROUP} -gt 0 ]; then - einfo "${SVCNAME} will run as user ${SURICATAUSER}:${SURICATAGROUP}." - SURICATAOPTS="${SURICATAOPTS} --user=${SURICATAUSER} --group=${SURICATAGROUP}" - fi -} - -initpidinfo() { - [ -e ${SURICATAPID} ] && SUR_PID="$(cat ${SURICATAPID})" - if [ ${#SUR_PID} -gt 0 ]; then - SUR_PID_CHECK="$(ps -eo pid | grep -c ${SUR_PID})" - SUR_USER="$(ps -p ${SUR_PID} --no-headers -o user)" - fi -} - -checkpidinfo() { - initpidinfo - if [ ! -e ${SURICATAPID} ]; then - eerror "${SVCNAME} isn't running" - return 1 - elif [ ${#SUR_PID} -eq 0 ] || [ $((SUR_PID_CHECK)) -ne 1 ]; then - eerror "Could not determine PID of ${SVCNAME}! Did the service crash?" - return 1 - elif [ ${#SUR_USER} -eq 0 ]; then - eerror "Unable to determine user running ${SVCNAME}!" - return 1 - elif [ "x${SUR_USER}" != "xroot" ]; then - ewarn "${SVCNAME} may need to be running as root or as a priviledged user for the extra commands reload and relog to work." - fi -} - -start() { - checkconfig || return 1 - ebegin "Starting ${SVCNAME}" - start-stop-daemon --start --quiet --exec ${SURICATA_BIN} \ - -- --pidfile ${SURICATAPID} -D ${SURICATAOPTS} ${SURICATALOGPATH} >/dev/null 2>&1 - local SUR_EXIT=$? - if [ $((SUR_EXIT)) -ne 0 ]; then - einfo "Could not start ${SURICATA_BIN} with:" - einfo "--pidfile ${SURICATAPID} -D ${SURICATAOPTS} ${SURICATALOGPATH}" - einfo "Exit code ${SUR_EXIT}" - fi - eend ${SUR_EXIT} -} - -stop() { - ebegin "Stopping ${SVCNAME}" - start-stop-daemon --stop ${SURICATA_RETRY} --quiet --pidfile ${SURICATAPID} >/dev/null 2>&1 - eend $? -} - -reload() { - checkpidinfo || return 1 - checkconfig || return 1 - ebegin "Sending USR2 signal to ${SVCNAME} to perform a live rule and config reload." - if [ ${#SURICATAUSER} -gt 0 ] && [ ${#SURICATAGROUP} -gt 0 ]; then - start-stop-daemon --user ${SURICATAUSER} --group ${SURICATAGROUP} --signal USR2 --pidfile ${SURICATAPID} - else - start-stop-daemon --signal USR2 --pidfile ${SURICATAPID} - fi - eend $? -} - -relog() { - checkpidinfo || return 1 - checkconfig || return 1 - ebegin "Sending HUP signal to ${SVCNAME} to close and re-open all log files." - if [ ${#SURICATAUSER} -gt 0 ] && [ ${#SURICATAGROUP} -gt 0 ]; then - start-stop-daemon --user ${SURICATAUSER} --group ${SURICATAGROUP} --signal HUP --pidfile ${SURICATAPID} - else - start-stop-daemon --signal HUP --pidfile ${SURICATAPID} - fi - eend $? -} - -dump() { - checkconfig || return 1 - ebegin "Dumping ${SVCNAME} config values and quitting." - ${SURICATA_BIN} --dump-config --pidfile ${SURICATAPID} ${SURICATAOPTS} ${SURICATALOGPATH} - eend $? -} diff --git a/net-analyzer/suricata/files/suricata-5.0.1_default-config.patch b/net-analyzer/suricata/files/suricata-5.0.1_default-config.patch deleted file mode 100644 index ef1b1f63ad4f..000000000000 --- a/net-analyzer/suricata/files/suricata-5.0.1_default-config.patch +++ /dev/null @@ -1,27 +0,0 @@ ---- a/suricata.yaml.in -+++ b/suricata.yaml.in -@@ -203,8 +203,9 @@ - # https://suricata.readthedocs.io/en/latest/output/eve/eve-json-output.html#dns-v1-format - - # As of Suricata 5.0, version 2 of the eve dns output -- # format is the default. -- #version: 2 -+ # format is the default - but the daemon produces a warning to that effect -+ # at start-up if this isn't explicitly set. -+ version: 2 - - # Enable/disable this logger. Default: enabled. - #enabled: yes -@@ -978,9 +979,9 @@ - ## - - # Run suricata as user and group. --#run-as: --# user: suri --# group: suri -+run-as: -+ user: suricata -+ group: suricata - - # Some logging module will use that name in event as identifier. The default - # value is the hostname diff --git a/net-analyzer/suricata/files/suricata-5.0.7_configure-no-hyperscan-automagic.patch b/net-analyzer/suricata/files/suricata-5.0.7_configure-no-hyperscan-automagic.patch new file mode 100644 index 000000000000..69a857408eee --- /dev/null +++ b/net-analyzer/suricata/files/suricata-5.0.7_configure-no-hyperscan-automagic.patch @@ -0,0 +1,24 @@ +--- a/configure.ac ++++ b/configure.ac +@@ -729,8 +729,11 @@ + fi + + # libhs +- enable_hyperscan="no" +- ++ AC_ARG_ENABLE(hyperscan, ++ AS_HELP_STRING([--enable-hyperscan], [Enable high-performance regex matching with hyperscan]), ++ [enable_hyperscan=$enableval], ++ [enable_hyperscan=no]) ++ if test "x$enable_hyperscan" != "xno"; then + # Try pkg-config first: + PKG_CHECK_MODULES([libhs], libhs,, [with_pkgconfig_libhs=no]) + if test "$with_pkgconfig_libhs" != "no"; then +@@ -765,6 +768,7 @@ + enable_hyperscan="no" + fi + fi ++ fi + AS_IF([test "x$enable_hyperscan" = "xyes"], [AC_DEFINE([BUILD_HYPERSCAN], [1], [Intel Hyperscan support enabled])]) + + # libyaml diff --git a/net-analyzer/suricata/files/suricata-7.0.2_configure-no-sphinx-pdflatex-automagic.patch b/net-analyzer/suricata/files/suricata-7.0.2_configure-no-sphinx-pdflatex-automagic.patch new file mode 100644 index 000000000000..07fddac0a6d2 --- /dev/null +++ b/net-analyzer/suricata/files/suricata-7.0.2_configure-no-sphinx-pdflatex-automagic.patch @@ -0,0 +1,20 @@ +--- a/configure.ac ++++ b/configure.ac +@@ -2231,7 +2231,7 @@ + fi + + # sphinx-build for documentation, and also check for a new enough version +- AC_PATH_PROG([SPHINX_BUILD], [sphinx-build], [no]) ++ SPHINX_BUILD="no" + if test "$SPHINX_BUILD" != "no"; then + MIN_SPHINX_BUILD_VERSION="3.4.3" + sphinx_build_version=$($SPHINX_BUILD --version 2>&1 | cut -d' ' -f2-) +@@ -2257,7 +2257,7 @@ + AM_CONDITIONAL([HAVE_SURICATA_MAN], [test "x$have_suricata_man" = "xyes"]) + + # pdflatex for the pdf version of the user manual +- AC_PATH_PROG(HAVE_PDFLATEX, pdflatex, "no") ++ HAVE_PDFLATEX="no" + if test "$HAVE_PDFLATEX" = "no"; then + enable_pdflatex=no + fi 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/files/suricata-5.0.1-conf b/net-analyzer/suricata/files/suricata.confd index 7f22113dbf0d..7f22113dbf0d 100644 --- a/net-analyzer/suricata/files/suricata-5.0.1-conf +++ b/net-analyzer/suricata/files/suricata.confd diff --git a/net-analyzer/suricata/files/suricata.initd b/net-analyzer/suricata/files/suricata.initd new file mode 100644 index 000000000000..154636ef828e --- /dev/null +++ b/net-analyzer/suricata/files/suricata.initd @@ -0,0 +1,147 @@ +#!/sbin/openrc-run +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +SURICATA_BIN=/usr/bin/suricata +SURICATA_DIR=${SURICATA_DIR:-/etc/suricata} +SURICATA=${SVCNAME#*.} +SURICATAID=$(shell_var "${SURICATA}") +if [ -n "${SURICATA}" ] && [ ${SVCNAME} != "suricata" ]; then + eval SURICATACONF=\$SURICATA_CONF_${SURICATAID} + [ ${#SURICATACONF} -eq 0 ] && SURICATACONF="${SURICATA_DIR}/suricata-${SURICATA}.yaml" || SURICATACONF="${SURICATA_DIR}/${SURICATACONF}" + SURICATAPID="/run/suricata/suricata.${SURICATA}.pid" + eval SURICATAOPTS=\$SURICATA_OPTS_${SURICATAID} + eval SURICATALOGPATH=\$SURICATA_LOG_FILE_${SURICATAID} + eval SURICATAUSER=\$SURICATA_USER_${SURICATAID} + eval SURICATAGROUP=\$SURICATA_GROUP_${SURICATAID} +else + SURICATACONF=${SURICATA_CONF} + [ ${#SURICATACONF} -eq 0 ] && SURICATACONF="${SURICATA_DIR}/suricata.yaml" || SURICATACONF="${SURICATA_DIR}/${SURICATACONF}" + SURICATAPID="/run/suricata/suricata.pid" + SURICATAOPTS=${SURICATA_OPTS} + SURICATALOGPATH=${SURICATA_LOG_FILE} + SURICATAUSER=${SURICATA_USER} + SURICATAGROUP=${SURICATA_GROUP} +fi +SURICATAUSER=${SURICATAUSER:-${SURICATA_USER}} +SURICATAGROUP=${SURICATAGROUP:-${SURICATA_GROUP}} +[ -e ${SURICATACONF} ] && SURICATAOPTS="-c ${SURICATACONF} ${SURICATAOPTS}" +[ -z "${SURICATA_MAX_WAIT_ON_STOP}" ] || SURICATA_RETRY="--retry ${SURICATA_MAX_WAIT_ON_STOP}" + +description="Suricata IDS/IPS" +extra_commands="checkconfig dump" +description_checkconfig="Check config for ${SVCNAME}" +description_dump="List all config values that can be used with --set" +extra_started_commands="reload relog" +description_reload="Live rule and config reload" +description_relog="Close and re-open all log files" + +depend() { + need net + after mysql + after postgresql +} + +checkconfig() { + if [ ! -d "/run/suricata" ] ; then + checkpath -d /run/suricata + fi + if [ ${#SURICATALOGPATH} -gt 0 ]; then + SURICATALOGFILE=$( basename ${SURICATALOGPATH} ) + SURICATALOGFILE=${SURICATALOGFILE:-suricata.log} + SURICATALOGPATH=$( dirname ${SURICATALOGPATH} ) + if [ ! -d "${SURICATALOGPATH}" ] ; then + checkpath -d "${SURICATALOGPATH}" + fi + if [ ${#SURICATAUSER} -gt 0 ] && [ ${#SURICATAGROUP} -gt 0 ] && [ -e "${SURICATALOGPATH}" ]; then + chown ${SURICATAUSER}:${SURICATAGROUP} "${SURICATALOGPATH}" || return 1 + chown ${SURICATAUSER}:${SURICATAGROUP} "${SURICATALOGPATH}"/* >/dev/null 2>&1 3>&1 + fi + SURICATAOPTS="${SURICATAOPTS} --set logging.outputs.1.file.filename=${SURICATALOGPATH}/${SURICATALOGFILE}" + SURICATALOGPATH="-l ${SURICATALOGPATH}" + fi + if [ ! -e ${SURICATACONF} ] ; then + einfo "The configuration file ${SURICATACONF} was not found." + einfo "If this is OK then make sure you set enough options for ${SVCNAME} in /etc/conf.d/suricata." + einfo "Take a look at the suricata arguments --set and --dump-config." + fi + if [ ${#SURICATAUSER} -gt 0 ] && [ ${#SURICATAGROUP} -gt 0 ]; then + einfo "${SVCNAME} will run as user ${SURICATAUSER}:${SURICATAGROUP}." + SURICATAOPTS="${SURICATAOPTS} --user=${SURICATAUSER} --group=${SURICATAGROUP}" + fi +} + +initpidinfo() { + [ -e ${SURICATAPID} ] && SUR_PID="$(cat ${SURICATAPID})" + if [ ${#SUR_PID} -gt 0 ]; then + SUR_PID_CHECK="$(ps -eo pid | grep -c ${SUR_PID})" + SUR_USER="$(ps -p ${SUR_PID} --no-headers -o user)" + fi +} + +checkpidinfo() { + initpidinfo + if [ ! -e ${SURICATAPID} ]; then + eerror "${SVCNAME} isn't running" + return 1 + elif [ ${#SUR_PID} -eq 0 ] || [ $((SUR_PID_CHECK)) -ne 1 ]; then + eerror "Could not determine PID of ${SVCNAME}! Did the service crash?" + return 1 + elif [ ${#SUR_USER} -eq 0 ]; then + eerror "Unable to determine user running ${SVCNAME}!" + return 1 + elif [ "x${SUR_USER}" != "xroot" ]; then + ewarn "${SVCNAME} may need to be running as root or as a priviledged user for the extra commands reload and relog to work." + fi +} + +start() { + checkconfig || return 1 + ebegin "Starting ${SVCNAME}" + start-stop-daemon --start --quiet --exec ${SURICATA_BIN} \ + -- --pidfile ${SURICATAPID} -D ${SURICATAOPTS} ${SURICATALOGPATH} >/dev/null 2>&1 + local SUR_EXIT=$? + if [ $((SUR_EXIT)) -ne 0 ]; then + einfo "Could not start ${SURICATA_BIN} with:" + einfo "--pidfile ${SURICATAPID} -D ${SURICATAOPTS} ${SURICATALOGPATH}" + einfo "Exit code ${SUR_EXIT}" + fi + eend ${SUR_EXIT} +} + +stop() { + ebegin "Stopping ${SVCNAME}" + start-stop-daemon --stop ${SURICATA_RETRY} --quiet --pidfile ${SURICATAPID} >/dev/null 2>&1 + eend $? +} + +reload() { + checkpidinfo || return 1 + checkconfig || return 1 + ebegin "Sending USR2 signal to ${SVCNAME} to perform a live rule and config reload." + if [ ${#SURICATAUSER} -gt 0 ] && [ ${#SURICATAGROUP} -gt 0 ]; then + start-stop-daemon --user ${SURICATAUSER} --group ${SURICATAGROUP} --signal USR2 --pidfile ${SURICATAPID} + else + start-stop-daemon --signal USR2 --pidfile ${SURICATAPID} + fi + eend $? +} + +relog() { + checkpidinfo || return 1 + checkconfig || return 1 + ebegin "Sending HUP signal to ${SVCNAME} to close and re-open all log files." + if [ ${#SURICATAUSER} -gt 0 ] && [ ${#SURICATAGROUP} -gt 0 ]; then + start-stop-daemon --user ${SURICATAUSER} --group ${SURICATAGROUP} --signal HUP --pidfile ${SURICATAPID} + else + start-stop-daemon --signal HUP --pidfile ${SURICATAPID} + fi + eend $? +} + +dump() { + checkconfig || return 1 + ebegin "Dumping ${SVCNAME} config values and quitting." + ${SURICATA_BIN} --dump-config --pidfile ${SURICATAPID} ${SURICATAOPTS} ${SURICATALOGPATH} + eend $? +} diff --git a/net-analyzer/suricata/metadata.xml b/net-analyzer/suricata/metadata.xml index 457a2fbd2e8a..a409aa734d3c 100644 --- a/net-analyzer/suricata/metadata.xml +++ b/net-analyzer/suricata/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> <email>marecki@gentoo.org</email> @@ -7,12 +7,12 @@ </maintainer> <use> <flag name="af-packet">Enable AF_PACKET support</flag> + <flag name="af-xdp">Enable AF_XDP support</flag> <flag name="bpf">Enable support for eBPF (as well as XDP if supported by the kernel and the NIC driver) for low-level, high-speed packet processing</flag> <flag name="control-socket">Enable unix socket</flag> - <flag name="cuda">Enable NVIDIA Cuda computations support</flag> <flag name="detection">Enable detection modules</flag> - <flag name="logrotate">Install logrotate rule</flag> + <flag name="hyperscan">Enable high-performance regex matching with Hyperscan</flag> <flag name="lz4">Enable support for compressed pcap logging using the LZ4 algorithm</flag> <flag name="nflog">Enable libnetfilter_log support</flag> <flag name="nfqueue">Enable NFQUEUE support for inline IDP</flag> diff --git a/net-analyzer/suricata/suricata-5.0.4.ebuild b/net-analyzer/suricata/suricata-5.0.4.ebuild deleted file mode 100644 index 077c14ece6d3..000000000000 --- a/net-analyzer/suricata/suricata-5.0.4.ebuild +++ /dev/null @@ -1,197 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{6..9} ) - -inherit autotools flag-o-matic linux-info python-single-r1 systemd - -DESCRIPTION="High performance Network IDS, IPS and Network Security Monitoring engine" -HOMEPAGE="https://suricata-ids.org/" -SRC_URI="https://www.openinfosecfoundation.org/download/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="+af-packet bpf control-socket cuda debug +detection geoip hardened logrotate lua luajit lz4 nflog +nfqueue redis systemd test" - -RESTRICT="!test? ( test )" - -REQUIRED_USE="${PYTHON_REQUIRED_USE} - ?? ( lua luajit ) - bpf? ( af-packet )" - -RDEPEND="${PYTHON_DEPS} - acct-group/suricata - acct-user/suricata - dev-libs/jansson - dev-libs/libpcre - dev-libs/libyaml - net-libs/libnet:* - net-libs/libnfnetlink - dev-libs/nspr - dev-libs/nss - $(python_gen_cond_dep ' - dev-python/pyyaml[${PYTHON_USEDEP}] - ') - >=net-libs/libhtp-0.5.35 - net-libs/libpcap - sys-apps/file - sys-libs/libcap-ng - bpf? ( >=dev-libs/libbpf-0.1.0 ) - cuda? ( dev-util/nvidia-cuda-toolkit ) - geoip? ( dev-libs/libmaxminddb ) - logrotate? ( app-admin/logrotate ) - lua? ( dev-lang/lua:0= ) - luajit? ( dev-lang/luajit:* ) - lz4? ( app-arch/lz4 ) - nflog? ( net-libs/libnetfilter_log ) - nfqueue? ( net-libs/libnetfilter_queue ) - redis? ( dev-libs/hiredis )" -DEPEND="${RDEPEND} - >=sys-devel/autoconf-2.69-r5 - virtual/rust" - -PATCHES=( - "${FILESDIR}/${PN}-5.0.1_configure-no-lz4-automagic.patch" - "${FILESDIR}/${PN}-5.0.1_default-config.patch" -) - -pkg_pretend() { - if use bpf && use kernel_linux; then - if kernel_is -lt 4 15; then - ewarn "Kernel 4.15 or newer is necessary to use all XDP features like the CPU redirect map" - fi - - CONFIG_CHECK="~XDP_SOCKETS" - ERROR_XDP_SOCKETS="CONFIG_XDP_SOCKETS is not set, making it impossible for Suricata to load XDP programs. " - ERROR_XDP_SOCKETS+="Other eBPF features should work normally." - check_extra_config - fi -} - -src_prepare() { - default - sed -ie 's/docdir =.*/docdir = ${datarootdir}\/doc\/'${PF}'\//' "${S}/doc/Makefile.am" || die - eautoreconf -} - -src_configure() { - local myeconfargs=( - "--localstatedir=/var" \ - "--runstatedir=/run" \ - "--enable-non-bundled-htp" \ - "--enable-gccmarch-native=no" \ - "--enable-python" \ - $(use_enable af-packet) \ - $(use_enable bpf ebpf) \ - $(use_enable control-socket unix-socket) \ - $(use_enable cuda) \ - $(use_enable detection) \ - $(use_enable geoip) \ - $(use_enable hardened gccprotect) \ - $(use_enable hardened pie) \ - $(use_enable lua) \ - $(use_enable luajit) \ - $(use_enable lz4) \ - $(use_enable nflog) \ - $(use_enable nfqueue) \ - $(use_enable redis hiredis) \ - $(use_enable test unittests) \ - "--disable-coccinelle" - ) - - if use debug; then - myeconfargs+=( $(use_enable debug) ) - # so we can get a backtrace according to "reporting bugs" on upstream web site - CFLAGS="-ggdb -O0" econf ${myeconfargs[@]} - else - econf ${myeconfargs[@]} - fi -} - -src_install() { - emake DESTDIR="${D}" install - python_optimize - - if use bpf; then - rm -f ebpf/Makefile.{am,in} - dodoc -r ebpf/ - keepdir /usr/libexec/suricata/ebpf - fi - - insinto "/etc/${PN}" - doins etc/{classification,reference}.config threshold.config suricata.yaml - - keepdir "/var/lib/${PN}/rules" "/var/lib/${PN}/update" - keepdir "/var/log/${PN}" - - fowners -R ${PN}: "/var/lib/${PN}" "/var/log/${PN}" "/etc/${PN}" - fperms 750 "/var/lib/${PN}" "/var/log/${PN}" "/etc/${PN}" - fperms 2750 "/var/lib/${PN}/rules" "/var/lib/${PN}/update" - - newinitd "${FILESDIR}/${PN}-5.0.1-init" ${PN} - newconfd "${FILESDIR}/${PN}-5.0.1-conf" ${PN} - systemd_dounit "${FILESDIR}"/${PN}.service - systemd_newtmpfilesd "${FILESDIR}"/${PN}.tmpfiles ${PN}.conf - - if use logrotate; then - insopts -m0644 - insinto /etc/logrotate.d - newins etc/${PN}.logrotate ${PN} - fi -} - -pkg_postinst() { - elog "" - if use systemd; then - elog "Suricata requires either the mode of operation (e.g. --af-packet) or the interface to listen on (e.g. -i eth0)" - elog "to be specified on the command line. The provided systemd unit launches Suricata in af-packet mode and relies" - elog "on file configuration to specify interfaces, should you prefer to run it differently you will have to customise" - elog "said unit. The simplest way of doing it is to override the Environment=OPTIONS='...' line using a .conf file" - elog "placed in the directory ${EPREFIX}/etc/systemd/system/suricata.service.d/ ." - elog "For details, see the section on drop-in directories in systemd.unit(5)." - else - elog "The ${PN} init script expects to find the path to the configuration" - elog "file as well as extra options in /etc/conf.d." - elog "" - elog "To create more than one ${PN} service, simply create a new .yaml file for it" - elog "then create a symlink to the init script from a link called" - elog "${PN}.foo - like so" - elog " cd /etc/${PN}" - elog " ${EDITOR##*/} suricata-foo.yaml" - elog " cd /etc/init.d" - elog " ln -s ${PN} ${PN}.foo" - elog "Then edit /etc/conf.d/${PN} and make sure you specify sensible options for foo." - elog "" - elog "You can create as many ${PN}.foo* services as you wish." - fi - - if use bpf; then - elog "" - elog "eBPF/XDP files must be compiled (using sys-devel/clang[llvm_targets_BPF]) before use" - elog "because their configuration is hard-coded. You can find the default ones in" - elog " ${EPREFIX}/usr/share/doc/${PF}/ebpf" - elog "and the common location for eBPF bytecode is" - elog " ${EPREFIX}/usr/libexec/${PN}" - elog "For more information, see https://${PN}.readthedocs.io/en/${P}/capture-hardware/ebpf-xdp.html" - fi - - if use debug; then - elog "" - elog "You have enabled the debug USE flag. Please read this link to report bugs upstream:" - elog "https://redmine.openinfosecfoundation.org/projects/suricata/wiki/Reporting_Bugs" - elog "You need to also ensure the FEATURES variable in make.conf contains the" - elog "'nostrip' option to produce useful core dumps or back traces." - fi - - elog "" - elog "To download and install an initial set of rules, run:" - elog " emerge --config =${CATEGORY}/${PF}" - elog "" -} - -pkg_config() { - suricata-update -} diff --git a/net-analyzer/suricata/suricata-5.0.5.ebuild b/net-analyzer/suricata/suricata-5.0.5.ebuild deleted file mode 100644 index db9ee04aadb6..000000000000 --- a/net-analyzer/suricata/suricata-5.0.5.ebuild +++ /dev/null @@ -1,197 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{6..9} ) - -inherit autotools flag-o-matic linux-info python-single-r1 systemd - -DESCRIPTION="High performance Network IDS, IPS and Network Security Monitoring engine" -HOMEPAGE="https://suricata-ids.org/" -SRC_URI="https://www.openinfosecfoundation.org/download/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="+af-packet bpf control-socket cuda debug +detection geoip hardened logrotate lua luajit lz4 nflog +nfqueue redis systemd test" - -RESTRICT="!test? ( test )" - -REQUIRED_USE="${PYTHON_REQUIRED_USE} - ?? ( lua luajit ) - bpf? ( af-packet )" - -RDEPEND="${PYTHON_DEPS} - acct-group/suricata - acct-user/suricata - dev-libs/jansson - dev-libs/libpcre - dev-libs/libyaml - net-libs/libnet:* - net-libs/libnfnetlink - dev-libs/nspr - dev-libs/nss - $(python_gen_cond_dep ' - dev-python/pyyaml[${PYTHON_USEDEP}] - ') - >=net-libs/libhtp-0.5.36 - net-libs/libpcap - sys-apps/file - sys-libs/libcap-ng - bpf? ( >=dev-libs/libbpf-0.1.0 ) - cuda? ( dev-util/nvidia-cuda-toolkit ) - geoip? ( dev-libs/libmaxminddb ) - logrotate? ( app-admin/logrotate ) - lua? ( dev-lang/lua:0= ) - luajit? ( dev-lang/luajit:* ) - lz4? ( app-arch/lz4 ) - nflog? ( net-libs/libnetfilter_log ) - nfqueue? ( net-libs/libnetfilter_queue ) - redis? ( dev-libs/hiredis )" -DEPEND="${RDEPEND} - >=sys-devel/autoconf-2.69-r5 - virtual/rust" - -PATCHES=( - "${FILESDIR}/${PN}-5.0.1_configure-no-lz4-automagic.patch" - "${FILESDIR}/${PN}-5.0.1_default-config.patch" -) - -pkg_pretend() { - if use bpf && use kernel_linux; then - if kernel_is -lt 4 15; then - ewarn "Kernel 4.15 or newer is necessary to use all XDP features like the CPU redirect map" - fi - - CONFIG_CHECK="~XDP_SOCKETS" - ERROR_XDP_SOCKETS="CONFIG_XDP_SOCKETS is not set, making it impossible for Suricata to load XDP programs. " - ERROR_XDP_SOCKETS+="Other eBPF features should work normally." - check_extra_config - fi -} - -src_prepare() { - default - sed -ie 's/docdir =.*/docdir = ${datarootdir}\/doc\/'${PF}'\//' "${S}/doc/Makefile.am" || die - eautoreconf -} - -src_configure() { - local myeconfargs=( - "--localstatedir=/var" \ - "--runstatedir=/run" \ - "--enable-non-bundled-htp" \ - "--enable-gccmarch-native=no" \ - "--enable-python" \ - $(use_enable af-packet) \ - $(use_enable bpf ebpf) \ - $(use_enable control-socket unix-socket) \ - $(use_enable cuda) \ - $(use_enable detection) \ - $(use_enable geoip) \ - $(use_enable hardened gccprotect) \ - $(use_enable hardened pie) \ - $(use_enable lua) \ - $(use_enable luajit) \ - $(use_enable lz4) \ - $(use_enable nflog) \ - $(use_enable nfqueue) \ - $(use_enable redis hiredis) \ - $(use_enable test unittests) \ - "--disable-coccinelle" - ) - - if use debug; then - myeconfargs+=( $(use_enable debug) ) - # so we can get a backtrace according to "reporting bugs" on upstream web site - CFLAGS="-ggdb -O0" econf ${myeconfargs[@]} - else - econf ${myeconfargs[@]} - fi -} - -src_install() { - emake DESTDIR="${D}" install - python_optimize - - if use bpf; then - rm -f ebpf/Makefile.{am,in} - dodoc -r ebpf/ - keepdir /usr/libexec/suricata/ebpf - fi - - insinto "/etc/${PN}" - doins etc/{classification,reference}.config threshold.config suricata.yaml - - keepdir "/var/lib/${PN}/rules" "/var/lib/${PN}/update" - keepdir "/var/log/${PN}" - - fowners -R ${PN}: "/var/lib/${PN}" "/var/log/${PN}" "/etc/${PN}" - fperms 750 "/var/lib/${PN}" "/var/log/${PN}" "/etc/${PN}" - fperms 2750 "/var/lib/${PN}/rules" "/var/lib/${PN}/update" - - newinitd "${FILESDIR}/${PN}-5.0.1-init" ${PN} - newconfd "${FILESDIR}/${PN}-5.0.1-conf" ${PN} - systemd_dounit "${FILESDIR}"/${PN}.service - systemd_newtmpfilesd "${FILESDIR}"/${PN}.tmpfiles ${PN}.conf - - if use logrotate; then - insopts -m0644 - insinto /etc/logrotate.d - newins etc/${PN}.logrotate ${PN} - fi -} - -pkg_postinst() { - elog "" - if use systemd; then - elog "Suricata requires either the mode of operation (e.g. --af-packet) or the interface to listen on (e.g. -i eth0)" - elog "to be specified on the command line. The provided systemd unit launches Suricata in af-packet mode and relies" - elog "on file configuration to specify interfaces, should you prefer to run it differently you will have to customise" - elog "said unit. The simplest way of doing it is to override the Environment=OPTIONS='...' line using a .conf file" - elog "placed in the directory ${EPREFIX}/etc/systemd/system/suricata.service.d/ ." - elog "For details, see the section on drop-in directories in systemd.unit(5)." - else - elog "The ${PN} init script expects to find the path to the configuration" - elog "file as well as extra options in /etc/conf.d." - elog "" - elog "To create more than one ${PN} service, simply create a new .yaml file for it" - elog "then create a symlink to the init script from a link called" - elog "${PN}.foo - like so" - elog " cd /etc/${PN}" - elog " ${EDITOR##*/} suricata-foo.yaml" - elog " cd /etc/init.d" - elog " ln -s ${PN} ${PN}.foo" - elog "Then edit /etc/conf.d/${PN} and make sure you specify sensible options for foo." - elog "" - elog "You can create as many ${PN}.foo* services as you wish." - fi - - if use bpf; then - elog "" - elog "eBPF/XDP files must be compiled (using sys-devel/clang[llvm_targets_BPF]) before use" - elog "because their configuration is hard-coded. You can find the default ones in" - elog " ${EPREFIX}/usr/share/doc/${PF}/ebpf" - elog "and the common location for eBPF bytecode is" - elog " ${EPREFIX}/usr/libexec/${PN}" - elog "For more information, see https://${PN}.readthedocs.io/en/${P}/capture-hardware/ebpf-xdp.html" - fi - - if use debug; then - elog "" - elog "You have enabled the debug USE flag. Please read this link to report bugs upstream:" - elog "https://redmine.openinfosecfoundation.org/projects/suricata/wiki/Reporting_Bugs" - elog "You need to also ensure the FEATURES variable in make.conf contains the" - elog "'nostrip' option to produce useful core dumps or back traces." - fi - - elog "" - elog "To download and install an initial set of rules, run:" - elog " emerge --config =${CATEGORY}/${PF}" - elog "" -} - -pkg_config() { - suricata-update -} diff --git a/net-analyzer/suricata/suricata-6.0.0.ebuild b/net-analyzer/suricata/suricata-6.0.0.ebuild deleted file mode 100644 index 6a00d0c18c98..000000000000 --- a/net-analyzer/suricata/suricata-6.0.0.ebuild +++ /dev/null @@ -1,203 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{6..9} ) - -inherit autotools flag-o-matic linux-info python-single-r1 systemd - -DESCRIPTION="High performance Network IDS, IPS and Network Security Monitoring engine" -HOMEPAGE="https://suricata-ids.org/" -SRC_URI="https://www.openinfosecfoundation.org/download/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="+af-packet bpf control-socket cuda debug +detection geoip hardened logrotate lua luajit lz4 nflog +nfqueue redis systemd test" - -RESTRICT="!test? ( test )" - -REQUIRED_USE="${PYTHON_REQUIRED_USE} - ?? ( lua luajit ) - bpf? ( af-packet )" - -RDEPEND="${PYTHON_DEPS} - acct-group/suricata - acct-user/suricata - dev-libs/jansson - dev-libs/libpcre - dev-libs/libyaml - net-libs/libnet:* - net-libs/libnfnetlink - dev-libs/nspr - dev-libs/nss - $(python_gen_cond_dep ' - dev-python/pyyaml[${PYTHON_USEDEP}] - ') - >=net-libs/libhtp-0.5.35 - net-libs/libpcap - sys-apps/file - sys-libs/libcap-ng - bpf? ( >=dev-libs/libbpf-0.1.0 ) - cuda? ( dev-util/nvidia-cuda-toolkit ) - geoip? ( dev-libs/libmaxminddb ) - logrotate? ( app-admin/logrotate ) - lua? ( dev-lang/lua:0= ) - luajit? ( dev-lang/luajit:* ) - lz4? ( app-arch/lz4 ) - nflog? ( net-libs/libnetfilter_log ) - nfqueue? ( net-libs/libnetfilter_queue ) - redis? ( dev-libs/hiredis )" -DEPEND="${RDEPEND} - >=sys-devel/autoconf-2.69-r5 - virtual/rust" - -PATCHES=( - "${FILESDIR}/${PN}-5.0.1_configure-no-lz4-automagic.patch" - "${FILESDIR}/${PN}-6.0.0_default-config.patch" -) - -pkg_pretend() { - if use bpf && use kernel_linux; then - if kernel_is -lt 4 15; then - ewarn "Kernel 4.15 or newer is necessary to use all XDP features like the CPU redirect map" - fi - - CONFIG_CHECK="~XDP_SOCKETS" - ERROR_XDP_SOCKETS="CONFIG_XDP_SOCKETS is not set, making it impossible for Suricata to load XDP programs. " - ERROR_XDP_SOCKETS+="Other eBPF features should work normally." - check_extra_config - fi -} - -src_prepare() { - default - sed -ie 's/docdir =.*/docdir = ${datarootdir}\/doc\/'${PF}'\//' "${S}/doc/Makefile.am" || die - eautoreconf -} - -src_configure() { - local myeconfargs=( - "--localstatedir=/var" \ - "--runstatedir=/run" \ - "--enable-non-bundled-htp" \ - "--enable-gccmarch-native=no" \ - "--enable-python" \ - $(use_enable af-packet) \ - $(use_enable bpf ebpf) \ - $(use_enable control-socket unix-socket) \ - $(use_enable cuda) \ - $(use_enable detection) \ - $(use_enable geoip) \ - $(use_enable hardened gccprotect) \ - $(use_enable hardened pie) \ - $(use_enable lua) \ - $(use_enable luajit) \ - $(use_enable lz4) \ - $(use_enable nflog) \ - $(use_enable nfqueue) \ - $(use_enable redis hiredis) \ - $(use_enable test unittests) \ - "--disable-coccinelle" - ) - - if use debug; then - myeconfargs+=( $(use_enable debug) ) - # so we can get a backtrace according to "reporting bugs" on upstream web site - CFLAGS="-ggdb -O0" econf ${myeconfargs[@]} - else - econf ${myeconfargs[@]} - fi -} - -src_install() { - emake DESTDIR="${D}" install - python_optimize - - if use bpf; then - rm -f ebpf/Makefile.{am,in} - dodoc -r ebpf/ - keepdir /usr/libexec/suricata/ebpf - fi - - insinto "/etc/${PN}" - doins etc/{classification,reference}.config threshold.config suricata.yaml - - keepdir "/var/lib/${PN}/rules" "/var/lib/${PN}/update" - keepdir "/var/log/${PN}" - - fowners -R ${PN}: "/var/lib/${PN}" "/var/log/${PN}" "/etc/${PN}" - fperms 750 "/var/lib/${PN}" "/var/log/${PN}" "/etc/${PN}" - fperms 2750 "/var/lib/${PN}/rules" "/var/lib/${PN}/update" - - newinitd "${FILESDIR}/${PN}-5.0.1-init" ${PN} - newconfd "${FILESDIR}/${PN}-5.0.1-conf" ${PN} - systemd_dounit "${FILESDIR}"/${PN}.service - systemd_newtmpfilesd "${FILESDIR}"/${PN}.tmpfiles ${PN}.conf - - if use logrotate; then - insopts -m0644 - insinto /etc/logrotate.d - newins etc/${PN}.logrotate ${PN} - fi -} - -pkg_postinst() { - elog - if use systemd; then - elog "Suricata requires either the mode of operation (e.g. --af-packet) or the interface to listen on (e.g. -i eth0)" - elog "to be specified on the command line. The provided systemd unit launches Suricata in af-packet mode and relies" - elog "on file configuration to specify interfaces, should you prefer to run it differently you will have to customise" - elog "said unit. The simplest way of doing it is to override the Environment=OPTIONS='...' line using a .conf file" - elog "placed in the directory ${EPREFIX}/etc/systemd/system/suricata.service.d/ ." - elog "For details, see the section on drop-in directories in systemd.unit(5)." - else - elog "The ${PN} init script expects to find the path to the configuration" - elog "file as well as extra options in /etc/conf.d." - elog - elog "To create more than one ${PN} service, simply create a new .yaml file for it" - elog "then create a symlink to the init script from a link called" - elog "${PN}.foo - like so" - elog " cd /etc/${PN}" - elog " ${EDITOR##*/} suricata-foo.yaml" - elog " cd /etc/init.d" - elog " ln -s ${PN} ${PN}.foo" - elog "Then edit /etc/conf.d/${PN} and make sure you specify sensible options for foo." - elog - elog "You can create as many ${PN}.foo* services as you wish." - fi - - if use bpf; then - elog - elog "eBPF/XDP files must be compiled (using sys-devel/clang[llvm_targets_BPF]) before use" - elog "because their configuration is hard-coded. You can find the default ones in" - elog " ${EPREFIX}/usr/share/doc/${PF}/ebpf" - elog "and the common location for eBPF bytecode is" - elog " ${EPREFIX}/usr/libexec/${PN}" - elog "For more information, see https://${PN}.readthedocs.io/en/${P}/capture-hardware/ebpf-xdp.html" - fi - - if use debug; then - elog - elog "You have enabled the debug USE flag. Please read this link to report bugs upstream:" - elog "https://redmine.openinfosecfoundation.org/projects/suricata/wiki/Reporting_Bugs" - elog "You need to also ensure the FEATURES variable in make.conf contains the" - elog "'nostrip' option to produce useful core dumps or back traces." - fi - - elog - if [[ -n "${REPLACING_VERSIONS}" ]]; then - ewarn "Since version 6.0.0 Suricata no longer supports the unified2 output format commonly used" - ewarn "in legacy, Snort-compatible IDS solutions, e.g. ones based on net-analyzer/barnyard2." - ewarn "If you need unified2 support, please continue to use suricata-5." - else - elog "To download and install an initial set of rules, run:" - elog " emerge --config =${CATEGORY}/${PF}" - fi - elog -} - -pkg_config() { - suricata-update -} diff --git a/net-analyzer/suricata/suricata-6.0.1-r100.ebuild b/net-analyzer/suricata/suricata-6.0.1-r100.ebuild deleted file mode 100644 index 3d6679536b45..000000000000 --- a/net-analyzer/suricata/suricata-6.0.1-r100.ebuild +++ /dev/null @@ -1,208 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -LUA_COMPAT=( lua5-1 luajit ) -PYTHON_COMPAT=( python3_{6..9} ) - -inherit autotools flag-o-matic linux-info lua-single python-single-r1 systemd - -DESCRIPTION="High performance Network IDS, IPS and Network Security Monitoring engine" -HOMEPAGE="https://suricata-ids.org/" -SRC_URI="https://www.openinfosecfoundation.org/download/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="+af-packet bpf control-socket cuda debug +detection geoip hardened logrotate lua lz4 nflog +nfqueue redis systemd test" - -RESTRICT="!test? ( test )" - -REQUIRED_USE="${PYTHON_REQUIRED_USE} - bpf? ( af-packet ) - lua? ( ${LUA_REQUIRED_USE} )" - -RDEPEND="${PYTHON_DEPS} - acct-group/suricata - acct-user/suricata - dev-libs/jansson - dev-libs/libpcre - dev-libs/libyaml - net-libs/libnet:* - net-libs/libnfnetlink - dev-libs/nspr - dev-libs/nss - $(python_gen_cond_dep ' - dev-python/pyyaml[${PYTHON_USEDEP}] - ') - >=net-libs/libhtp-0.5.36 - net-libs/libpcap - sys-apps/file - sys-libs/libcap-ng - bpf? ( >=dev-libs/libbpf-0.1.0 ) - cuda? ( dev-util/nvidia-cuda-toolkit ) - geoip? ( dev-libs/libmaxminddb ) - logrotate? ( app-admin/logrotate ) - lua? ( ${LUA_DEPS} ) - lz4? ( app-arch/lz4 ) - nflog? ( net-libs/libnetfilter_log ) - nfqueue? ( net-libs/libnetfilter_queue ) - redis? ( dev-libs/hiredis )" -DEPEND="${RDEPEND} - >=sys-devel/autoconf-2.69-r5 - virtual/rust" - -PATCHES=( - "${FILESDIR}/${PN}-5.0.1_configure-no-lz4-automagic.patch" - "${FILESDIR}/${PN}-6.0.0_default-config.patch" -) - -pkg_pretend() { - if use bpf && use kernel_linux; then - if kernel_is -lt 4 15; then - ewarn "Kernel 4.15 or newer is necessary to use all XDP features like the CPU redirect map" - fi - - CONFIG_CHECK="~XDP_SOCKETS" - ERROR_XDP_SOCKETS="CONFIG_XDP_SOCKETS is not set, making it impossible for Suricata to load XDP programs. " - ERROR_XDP_SOCKETS+="Other eBPF features should work normally." - check_extra_config - fi -} - -src_prepare() { - default - sed -ie 's/docdir =.*/docdir = ${datarootdir}\/doc\/'${PF}'\//' "${S}/doc/Makefile.am" || die - eautoreconf -} - -src_configure() { - local myeconfargs=( - "--localstatedir=/var" \ - "--runstatedir=/run" \ - "--enable-non-bundled-htp" \ - "--enable-gccmarch-native=no" \ - "--enable-python" \ - $(use_enable af-packet) \ - $(use_enable bpf ebpf) \ - $(use_enable control-socket unix-socket) \ - $(use_enable cuda) \ - $(use_enable detection) \ - $(use_enable geoip) \ - $(use_enable hardened gccprotect) \ - $(use_enable hardened pie) \ - $(use_enable lz4) \ - $(use_enable nflog) \ - $(use_enable nfqueue) \ - $(use_enable redis hiredis) \ - $(use_enable test unittests) \ - "--disable-coccinelle" - ) - if use lua; then - if use lua_single_target_luajit; then - myeconfargs+=( --enable-luajit ) - else - myeconfargs+=( --enable-lua ) - fi - fi - - if use debug; then - myeconfargs+=( $(use_enable debug) ) - # so we can get a backtrace according to "reporting bugs" on upstream web site - CFLAGS="-ggdb -O0" econf ${myeconfargs[@]} - else - econf ${myeconfargs[@]} - fi -} - -src_install() { - emake DESTDIR="${D}" install - python_optimize - - if use bpf; then - rm -f ebpf/Makefile.{am,in} - dodoc -r ebpf/ - keepdir /usr/libexec/suricata/ebpf - fi - - insinto "/etc/${PN}" - doins etc/{classification,reference}.config threshold.config suricata.yaml - - keepdir "/var/lib/${PN}/rules" "/var/lib/${PN}/update" - keepdir "/var/log/${PN}" - - fowners -R ${PN}: "/var/lib/${PN}" "/var/log/${PN}" "/etc/${PN}" - fperms 750 "/var/lib/${PN}" "/var/log/${PN}" "/etc/${PN}" - fperms 2750 "/var/lib/${PN}/rules" "/var/lib/${PN}/update" - - newinitd "${FILESDIR}/${PN}-5.0.1-init" ${PN} - newconfd "${FILESDIR}/${PN}-5.0.1-conf" ${PN} - systemd_dounit "${FILESDIR}"/${PN}.service - systemd_newtmpfilesd "${FILESDIR}"/${PN}.tmpfiles ${PN}.conf - - if use logrotate; then - insopts -m0644 - insinto /etc/logrotate.d - newins etc/${PN}.logrotate ${PN} - fi -} - -pkg_postinst() { - elog - if use systemd; then - elog "Suricata requires either the mode of operation (e.g. --af-packet) or the interface to listen on (e.g. -i eth0)" - elog "to be specified on the command line. The provided systemd unit launches Suricata in af-packet mode and relies" - elog "on file configuration to specify interfaces, should you prefer to run it differently you will have to customise" - elog "said unit. The simplest way of doing it is to override the Environment=OPTIONS='...' line using a .conf file" - elog "placed in the directory ${EPREFIX}/etc/systemd/system/suricata.service.d/ ." - elog "For details, see the section on drop-in directories in systemd.unit(5)." - else - elog "The ${PN} init script expects to find the path to the configuration" - elog "file as well as extra options in /etc/conf.d." - elog - elog "To create more than one ${PN} service, simply create a new .yaml file for it" - elog "then create a symlink to the init script from a link called" - elog "${PN}.foo - like so" - elog " cd /etc/${PN}" - elog " ${EDITOR##*/} suricata-foo.yaml" - elog " cd /etc/init.d" - elog " ln -s ${PN} ${PN}.foo" - elog "Then edit /etc/conf.d/${PN} and make sure you specify sensible options for foo." - elog - elog "You can create as many ${PN}.foo* services as you wish." - fi - - if use bpf; then - elog - elog "eBPF/XDP files must be compiled (using sys-devel/clang[llvm_targets_BPF]) before use" - elog "because their configuration is hard-coded. You can find the default ones in" - elog " ${EPREFIX}/usr/share/doc/${PF}/ebpf" - elog "and the common location for eBPF bytecode is" - elog " ${EPREFIX}/usr/libexec/${PN}" - elog "For more information, see https://${PN}.readthedocs.io/en/${P}/capture-hardware/ebpf-xdp.html" - fi - - if use debug; then - elog - elog "You have enabled the debug USE flag. Please read this link to report bugs upstream:" - elog "https://redmine.openinfosecfoundation.org/projects/suricata/wiki/Reporting_Bugs" - elog "You need to also ensure the FEATURES variable in make.conf contains the" - elog "'nostrip' option to produce useful core dumps or back traces." - fi - - elog - if [[ -n "${REPLACING_VERSIONS}" ]]; then - ewarn "Since version 6.0.0 Suricata no longer supports the unified2 output format commonly used" - ewarn "in legacy, Snort-compatible IDS solutions, e.g. ones based on net-analyzer/barnyard2." - ewarn "If you need unified2 support, please continue to use suricata-5." - else - elog "To download and install an initial set of rules, run:" - elog " emerge --config =${CATEGORY}/${PF}" - fi - elog -} - -pkg_config() { - suricata-update -} diff --git a/net-analyzer/suricata/suricata-6.0.1.ebuild b/net-analyzer/suricata/suricata-6.0.1.ebuild deleted file mode 100644 index 6602a4b80adc..000000000000 --- a/net-analyzer/suricata/suricata-6.0.1.ebuild +++ /dev/null @@ -1,203 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{6..9} ) - -inherit autotools flag-o-matic linux-info python-single-r1 systemd - -DESCRIPTION="High performance Network IDS, IPS and Network Security Monitoring engine" -HOMEPAGE="https://suricata-ids.org/" -SRC_URI="https://www.openinfosecfoundation.org/download/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="+af-packet bpf control-socket cuda debug +detection geoip hardened logrotate lua luajit lz4 nflog +nfqueue redis systemd test" - -RESTRICT="!test? ( test )" - -REQUIRED_USE="${PYTHON_REQUIRED_USE} - ?? ( lua luajit ) - bpf? ( af-packet )" - -RDEPEND="${PYTHON_DEPS} - acct-group/suricata - acct-user/suricata - dev-libs/jansson - dev-libs/libpcre - dev-libs/libyaml - net-libs/libnet:* - net-libs/libnfnetlink - dev-libs/nspr - dev-libs/nss - $(python_gen_cond_dep ' - dev-python/pyyaml[${PYTHON_USEDEP}] - ') - >=net-libs/libhtp-0.5.36 - net-libs/libpcap - sys-apps/file - sys-libs/libcap-ng - bpf? ( >=dev-libs/libbpf-0.1.0 ) - cuda? ( dev-util/nvidia-cuda-toolkit ) - geoip? ( dev-libs/libmaxminddb ) - logrotate? ( app-admin/logrotate ) - lua? ( dev-lang/lua:0= ) - luajit? ( dev-lang/luajit:* ) - lz4? ( app-arch/lz4 ) - nflog? ( net-libs/libnetfilter_log ) - nfqueue? ( net-libs/libnetfilter_queue ) - redis? ( dev-libs/hiredis )" -DEPEND="${RDEPEND} - >=sys-devel/autoconf-2.69-r5 - virtual/rust" - -PATCHES=( - "${FILESDIR}/${PN}-5.0.1_configure-no-lz4-automagic.patch" - "${FILESDIR}/${PN}-6.0.0_default-config.patch" -) - -pkg_pretend() { - if use bpf && use kernel_linux; then - if kernel_is -lt 4 15; then - ewarn "Kernel 4.15 or newer is necessary to use all XDP features like the CPU redirect map" - fi - - CONFIG_CHECK="~XDP_SOCKETS" - ERROR_XDP_SOCKETS="CONFIG_XDP_SOCKETS is not set, making it impossible for Suricata to load XDP programs. " - ERROR_XDP_SOCKETS+="Other eBPF features should work normally." - check_extra_config - fi -} - -src_prepare() { - default - sed -ie 's/docdir =.*/docdir = ${datarootdir}\/doc\/'${PF}'\//' "${S}/doc/Makefile.am" || die - eautoreconf -} - -src_configure() { - local myeconfargs=( - "--localstatedir=/var" \ - "--runstatedir=/run" \ - "--enable-non-bundled-htp" \ - "--enable-gccmarch-native=no" \ - "--enable-python" \ - $(use_enable af-packet) \ - $(use_enable bpf ebpf) \ - $(use_enable control-socket unix-socket) \ - $(use_enable cuda) \ - $(use_enable detection) \ - $(use_enable geoip) \ - $(use_enable hardened gccprotect) \ - $(use_enable hardened pie) \ - $(use_enable lua) \ - $(use_enable luajit) \ - $(use_enable lz4) \ - $(use_enable nflog) \ - $(use_enable nfqueue) \ - $(use_enable redis hiredis) \ - $(use_enable test unittests) \ - "--disable-coccinelle" - ) - - if use debug; then - myeconfargs+=( $(use_enable debug) ) - # so we can get a backtrace according to "reporting bugs" on upstream web site - CFLAGS="-ggdb -O0" econf ${myeconfargs[@]} - else - econf ${myeconfargs[@]} - fi -} - -src_install() { - emake DESTDIR="${D}" install - python_optimize - - if use bpf; then - rm -f ebpf/Makefile.{am,in} - dodoc -r ebpf/ - keepdir /usr/libexec/suricata/ebpf - fi - - insinto "/etc/${PN}" - doins etc/{classification,reference}.config threshold.config suricata.yaml - - keepdir "/var/lib/${PN}/rules" "/var/lib/${PN}/update" - keepdir "/var/log/${PN}" - - fowners -R ${PN}: "/var/lib/${PN}" "/var/log/${PN}" "/etc/${PN}" - fperms 750 "/var/lib/${PN}" "/var/log/${PN}" "/etc/${PN}" - fperms 2750 "/var/lib/${PN}/rules" "/var/lib/${PN}/update" - - newinitd "${FILESDIR}/${PN}-5.0.1-init" ${PN} - newconfd "${FILESDIR}/${PN}-5.0.1-conf" ${PN} - systemd_dounit "${FILESDIR}"/${PN}.service - systemd_newtmpfilesd "${FILESDIR}"/${PN}.tmpfiles ${PN}.conf - - if use logrotate; then - insopts -m0644 - insinto /etc/logrotate.d - newins etc/${PN}.logrotate ${PN} - fi -} - -pkg_postinst() { - elog - if use systemd; then - elog "Suricata requires either the mode of operation (e.g. --af-packet) or the interface to listen on (e.g. -i eth0)" - elog "to be specified on the command line. The provided systemd unit launches Suricata in af-packet mode and relies" - elog "on file configuration to specify interfaces, should you prefer to run it differently you will have to customise" - elog "said unit. The simplest way of doing it is to override the Environment=OPTIONS='...' line using a .conf file" - elog "placed in the directory ${EPREFIX}/etc/systemd/system/suricata.service.d/ ." - elog "For details, see the section on drop-in directories in systemd.unit(5)." - else - elog "The ${PN} init script expects to find the path to the configuration" - elog "file as well as extra options in /etc/conf.d." - elog - elog "To create more than one ${PN} service, simply create a new .yaml file for it" - elog "then create a symlink to the init script from a link called" - elog "${PN}.foo - like so" - elog " cd /etc/${PN}" - elog " ${EDITOR##*/} suricata-foo.yaml" - elog " cd /etc/init.d" - elog " ln -s ${PN} ${PN}.foo" - elog "Then edit /etc/conf.d/${PN} and make sure you specify sensible options for foo." - elog - elog "You can create as many ${PN}.foo* services as you wish." - fi - - if use bpf; then - elog - elog "eBPF/XDP files must be compiled (using sys-devel/clang[llvm_targets_BPF]) before use" - elog "because their configuration is hard-coded. You can find the default ones in" - elog " ${EPREFIX}/usr/share/doc/${PF}/ebpf" - elog "and the common location for eBPF bytecode is" - elog " ${EPREFIX}/usr/libexec/${PN}" - elog "For more information, see https://${PN}.readthedocs.io/en/${P}/capture-hardware/ebpf-xdp.html" - fi - - if use debug; then - elog - elog "You have enabled the debug USE flag. Please read this link to report bugs upstream:" - elog "https://redmine.openinfosecfoundation.org/projects/suricata/wiki/Reporting_Bugs" - elog "You need to also ensure the FEATURES variable in make.conf contains the" - elog "'nostrip' option to produce useful core dumps or back traces." - fi - - elog - if [[ -n "${REPLACING_VERSIONS}" ]]; then - ewarn "Since version 6.0.0 Suricata no longer supports the unified2 output format commonly used" - ewarn "in legacy, Snort-compatible IDS solutions, e.g. ones based on net-analyzer/barnyard2." - ewarn "If you need unified2 support, please continue to use suricata-5." - else - elog "To download and install an initial set of rules, run:" - elog " emerge --config =${CATEGORY}/${PF}" - fi - elog -} - -pkg_config() { - suricata-update -} diff --git a/net-analyzer/suricata/suricata-7.0.5.ebuild b/net-analyzer/suricata/suricata-7.0.5.ebuild new file mode 100644 index 000000000000..d6d60eada0b0 --- /dev/null +++ b/net-analyzer/suricata/suricata-7.0.5.ebuild @@ -0,0 +1,222 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +LUA_COMPAT=( lua5-1 luajit ) +PYTHON_COMPAT=( python3_{10..12} ) + +inherit autotools flag-o-matic linux-info lua-single python-single-r1 systemd tmpfiles verify-sig + +DESCRIPTION="High performance Network IDS, IPS and Network Security Monitoring engine" +HOMEPAGE="https://suricata.io/" +SRC_URI="https://www.openinfosecfoundation.org/download/${P}.tar.gz + verify-sig? ( https://www.openinfosecfoundation.org/download/${P}.tar.gz.sig )" + +LICENSE="GPL-2" +SLOT="0/7" +KEYWORDS="~amd64 ~riscv ~x86" +IUSE="+af-packet af-xdp bpf control-socket cuda debug +detection geoip hardened hyperscan lua lz4 nflog +nfqueue redis systemd test" +VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/openinfosecfoundation.org.asc" + +RESTRICT="!test? ( test )" + +REQUIRED_USE="${PYTHON_REQUIRED_USE} + af-xdp? ( bpf ) + bpf? ( af-packet ) + lua? ( ${LUA_REQUIRED_USE} )" + +RDEPEND="${PYTHON_DEPS} + acct-group/suricata + acct-user/suricata + dev-libs/jansson:= + dev-libs/libpcre2 + dev-libs/libyaml + net-libs/libnet:* + net-libs/libnfnetlink + dev-libs/nspr + dev-libs/nss + $(python_gen_cond_dep ' + dev-python/pyyaml[${PYTHON_USEDEP}] + ') + >=net-libs/libhtp-0.5.48 + net-libs/libpcap + sys-apps/file + sys-libs/libcap-ng + af-xdp? ( net-libs/xdp-tools ) + bpf? ( dev-libs/libbpf ) + cuda? ( dev-util/nvidia-cuda-toolkit ) + geoip? ( dev-libs/libmaxminddb:= ) + hyperscan? ( dev-libs/vectorscan:= ) + lua? ( ${LUA_DEPS} ) + lz4? ( app-arch/lz4 ) + nflog? ( net-libs/libnetfilter_log ) + nfqueue? ( net-libs/libnetfilter_queue ) + redis? ( dev-libs/hiredis:= )" +DEPEND="${RDEPEND} + >=dev-build/autoconf-2.69-r5 + virtual/rust" +BDEPEND="verify-sig? ( >=sec-keys/openpgp-keys-oisf-20200807 )" + +PATCHES=( + "${FILESDIR}/${PN}-5.0.1_configure-no-lz4-automagic.patch" + "${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.5_configure-fortify_source.patch" +) + +pkg_pretend() { + if use af-xdp && use kernel_linux; then + if kernel_is -lt 4 18; then + ewarn "Kernel 4.18 or newer is required for AF_XDP" + fi + fi + + if use bpf && use kernel_linux; then + if kernel_is -lt 4 15; then + ewarn "Kernel 4.15 or newer is necessary to use all XDP features like the CPU redirect map" + fi + + CONFIG_CHECK="~XDP_SOCKETS" + ERROR_XDP_SOCKETS="CONFIG_XDP_SOCKETS is not set, making it impossible for Suricata to load XDP programs. " + ERROR_XDP_SOCKETS+="Other eBPF features should work normally." + check_extra_config + fi +} + +src_prepare() { + default + sed -ie 's/docdir =.*/docdir = ${datarootdir}\/doc\/'${PF}'\//' "${S}/doc/Makefile.am" || die + eautoreconf +} + +src_configure() { + # Bug #861242 + filter-lto + + local myeconfargs=( + "--localstatedir=/var" \ + "--runstatedir=/run" \ + "--enable-non-bundled-htp" \ + "--enable-gccmarch-native=no" \ + "--enable-python" \ + $(use_enable af-packet) \ + $(use_enable af-xdp) \ + $(use_enable bpf ebpf) \ + $(use_enable control-socket unix-socket) \ + $(use_enable cuda) \ + $(use_enable detection) \ + $(use_enable geoip) \ + $(use_enable hardened gccprotect) \ + $(use_enable hardened pie) \ + $(use_enable hyperscan) \ + $(use_enable lz4) \ + $(use_enable nflog) \ + $(use_enable nfqueue) \ + $(use_enable redis hiredis) \ + $(use_enable test unittests) \ + "--disable-coccinelle" + ) + if use lua; then + if use lua_single_target_luajit; then + myeconfargs+=( --enable-luajit ) + else + myeconfargs+=( --enable-lua ) + fi + fi + + if use debug; then + myeconfargs+=( $(use_enable debug) ) + # so we can get a backtrace according to "reporting bugs" on upstream web site + QA_FLAGS_IGNORED="usr/bin/${PN}" + CFLAGS="-ggdb -O0" econf ${myeconfargs[@]} + else + econf ${myeconfargs[@]} + fi +} + +src_install() { + emake DESTDIR="${D}" install + python_optimize + # Bug #878855 + python_fix_shebang "${ED}"/usr/bin/ + + if use bpf; then + rm -f ebpf/Makefile.{am,in} || die + dodoc -r ebpf/ + keepdir /usr/libexec/suricata/ebpf + fi + + insinto "/etc/${PN}" + doins etc/{classification,reference}.config threshold.config suricata.yaml + + keepdir "/var/lib/${PN}/rules" "/var/lib/${PN}/update" + keepdir "/var/log/${PN}" + + fowners -R ${PN}: "/var/lib/${PN}" "/var/log/${PN}" "/etc/${PN}" + fperms 750 "/var/lib/${PN}" "/var/log/${PN}" "/etc/${PN}" + fperms 6750 "/var/lib/${PN}/rules" "/var/lib/${PN}/update" + + newinitd "${FILESDIR}/${PN}.initd" ${PN} + newconfd "${FILESDIR}/${PN}.confd" ${PN} + systemd_dounit "${FILESDIR}"/${PN}.service + newtmpfiles "${FILESDIR}"/${PN}.tmpfiles ${PN}.conf + + insopts -m0644 + insinto /etc/logrotate.d + newins etc/${PN}.logrotate ${PN} +} + +pkg_postinst() { + tmpfiles_process ${PN}.conf + + elog + if use systemd; then + elog "Suricata requires either the mode of operation (e.g. --af-packet) or the interface to listen on (e.g. -i eth0)" + elog "to be specified on the command line. The provided systemd unit launches Suricata in af-packet mode and relies" + elog "on file configuration to specify interfaces, should you prefer to run it differently you will have to customise" + elog "said unit. The simplest way of doing it is to override the Environment=OPTIONS='...' line using a .conf file" + elog "placed in the directory ${EPREFIX}/etc/systemd/system/suricata.service.d/ ." + elog "For details, see the section on drop-in directories in systemd.unit(5)." + else + elog "The ${PN} init script expects to find the path to the configuration" + elog "file as well as extra options in /etc/conf.d." + elog + elog "To create more than one ${PN} service, simply create a new .yaml file for it" + elog "then create a symlink to the init script from a link called" + elog "${PN}.foo - like so" + elog " cd /etc/${PN}" + elog " ${EDITOR##*/} suricata-foo.yaml" + elog " cd /etc/init.d" + elog " ln -s ${PN} ${PN}.foo" + elog "Then edit /etc/conf.d/${PN} and make sure you specify sensible options for foo." + elog + elog "You can create as many ${PN}.foo* services as you wish." + fi + + if use bpf; then + elog + elog "eBPF/XDP files must be compiled (using sys-devel/clang[llvm_targets_BPF]) before use" + elog "because their configuration is hard-coded. You can find the default ones in" + elog " ${EPREFIX}/usr/share/doc/${PF}/ebpf" + elog "and the common location for eBPF bytecode is" + elog " ${EPREFIX}/usr/libexec/${PN}" + elog "For more information, see https://${PN}.readthedocs.io/en/${P}/capture-hardware/ebpf-xdp.html" + fi + + if use debug; then + elog + elog "You have enabled the debug USE flag. Please read this link to report bugs upstream:" + elog "https://redmine.openinfosecfoundation.org/projects/suricata/wiki/Reporting_Bugs" + elog "You need to also ensure the FEATURES variable in make.conf contains the" + elog "'nostrip' option to produce useful core dumps or back traces." + fi + + elog + if [[ -z "${REPLACING_VERSIONS}" ]]; then + elog "To download and install an initial set of rules, run:" + elog " suricata-update" + fi + elog +} diff --git a/net-analyzer/symon/metadata.xml b/net-analyzer/symon/metadata.xml index ed375df28cbc..324d9ed6fee9 100644 --- a/net-analyzer/symon/metadata.xml +++ b/net-analyzer/symon/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>netmon@gentoo.org</email> diff --git a/net-analyzer/symon/symon-2.88.ebuild b/net-analyzer/symon/symon-2.88.ebuild index 0250b6eec39b..db593d82b2e3 100644 --- a/net-analyzer/symon/symon-2.88.ebuild +++ b/net-analyzer/symon/symon-2.88.ebuild @@ -1,31 +1,27 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 -inherit eutils perl-module toolchain-funcs +EAPI=7 + +inherit perl-module toolchain-funcs DESCRIPTION="Performance and information monitoring tool" HOMEPAGE="https://wpd.home.xs4all.nl/symon/" SRC_URI="https://wpd.home.xs4all.nl/symon/philes/${P}.tar.gz" +S="${WORKDIR}"/${PN} LICENSE="BSD-2" SLOT="0" KEYWORDS="~amd64 ~sparc ~x86" IUSE="perl +symon symux" -REQUIRED_USE=" - || ( perl symon symux ) -" +REQUIRED_USE="|| ( perl symon symux )" +BDEPEND="dev-build/pmake" RDEPEND=" perl? ( dev-lang/perl ) symux? ( net-analyzer/rrdtool ) " -DEPEND=" - ${RDEPEND} - sys-devel/pmake -" - -S=${WORKDIR}/${PN} +DEPEND="${RDEPEND}" # Deletes the directory passed as an argument from the internal pmake # variable SUBDIR. @@ -84,7 +80,6 @@ src_install() { doman symux/symux.8 dosbin symux/symux - dodir /usr/share/symon insinto /usr/share/symon doins symux/c_smrrds.sh fperms a+x /usr/share/symon/c_smrrds.sh diff --git a/net-analyzer/synscan/files/synscan-5.02-lld.patch b/net-analyzer/synscan/files/synscan-5.02-lld.patch new file mode 100644 index 000000000000..612e91599984 --- /dev/null +++ b/net-analyzer/synscan/files/synscan-5.02-lld.patch @@ -0,0 +1,9 @@ +lld does not ignore erroneous libdirs (ideally should use pkg-config) +https://bugs.gentoo.org/875017 +--- a/configure.in ++++ b/configure.in +@@ -60,3 +60,3 @@ + CFLAGS="$CFLAGS -I${prefix}/include" +- LIBS="$LIBS -L${prefix}/lib -lpcap" ++ LIBS="$LIBS -lpcap" + elif test -f /usr/include/pcap/pcap.h; then diff --git a/net-analyzer/synscan/metadata.xml b/net-analyzer/synscan/metadata.xml index 7a38bb900964..115e9d64a669 100644 --- a/net-analyzer/synscan/metadata.xml +++ b/net-analyzer/synscan/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <!-- maintainer-needed --> </pkgmetadata> diff --git a/net-analyzer/synscan/synscan-5.02.ebuild b/net-analyzer/synscan/synscan-5.02.ebuild index d91e0b3141dd..5d38f8710526 100644 --- a/net-analyzer/synscan/synscan-5.02.ebuild +++ b/net-analyzer/synscan/synscan-5.02.ebuild @@ -1,39 +1,38 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 -inherit autotools eutils +EAPI=8 -DESCRIPTION="A fast asynchronous half-open TCP portscanner" +inherit autotools + +DESCRIPTION="Fast asynchronous half-open TCP portscanner" HOMEPAGE="http://www.digit-labs.org/files/tools/synscan/" -SRC_URI="http://www.digit-labs.org/files/tools/${PN}/releases/${P}.tar.gz" +SRC_URI="http://www.digit-labs.org/files/tools/synscan/releases/${P}.tar.gz" -LICENSE="GPL-2" +LICENSE="GPL-2+" SLOT="0" -KEYWORDS="amd64 x86" -IUSE="kernel_FreeBSD kernel_linux" +KEYWORDS="amd64 x86 ~x64-macos" RDEPEND="net-libs/libpcap" DEPEND="${RDEPEND}" PATCHES=( - "${FILESDIR}/${P}-destdir.patch" + "${FILESDIR}"/${P}-destdir.patch + "${FILESDIR}"/${P}-lld.patch ) src_prepare() { default - mv "$S"/configure.in "$S"/configure.ac || die - eautoconf -} -src_configure() { - econf --prefix="${EPREFIX}"/usr + eautoreconf } src_compile() { local _target - use kernel_FreeBSD && _target=freebsd + use kernel_linux && _target=linux + use kernel_SunOS && _target=solaris-sparc-gcc + use kernel_Darwin && _target=macos emake ${_target} } diff --git a/net-analyzer/syweb/metadata.xml b/net-analyzer/syweb/metadata.xml index 2c2a7923cfc8..d5af4bcfaf13 100644 --- a/net-analyzer/syweb/metadata.xml +++ b/net-analyzer/syweb/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>netmon@gentoo.org</email> diff --git a/net-analyzer/syweb/syweb-0.65-r1.ebuild b/net-analyzer/syweb/syweb-0.65-r1.ebuild new file mode 100644 index 000000000000..1f6494bd2c77 --- /dev/null +++ b/net-analyzer/syweb/syweb-0.65-r1.ebuild @@ -0,0 +1,43 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +WEBAPP_MANUAL_SLOT="yes" +inherit webapp + +DESCRIPTION="Web frontend to symon" +HOMEPAGE="http://www.xs4all.nl/~wpd/symon/" +SRC_URI="http://www.xs4all.nl/~wpd/symon/philes/${P}.tar.gz" +S="${WORKDIR}/${PN}" + +LICENSE="BSD-2" +SLOT="0" +KEYWORDS="~amd64 ~sparc ~x86" + +RDEPEND=" + net-analyzer/rrdtool + virtual/httpd-php +" + +need_httpd_cgi + +src_install() { + webapp_src_preinst + + dodoc CHANGELOG README + docinto layouts + dodoc symon/*.layout + + dodir "${MY_HOSTROOTDIR}"/syweb/cache + insinto "${MY_HOSTROOTDIR}"/syweb + doins symon/hifn_test.layout + webapp_serverowned "${MY_HOSTROOTDIR}"/syweb/cache + insinto "${MY_HTDOCSDIR}" + doins -r htdocs/syweb/* + webapp_configfile "${MY_HTDOCSDIR}"/setup.inc + webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt + webapp_hook_script "${FILESDIR}"/reconfig + + webapp_src_install +} diff --git a/net-analyzer/syweb/syweb-0.65.ebuild b/net-analyzer/syweb/syweb-0.65.ebuild deleted file mode 100644 index da3bdcae2f6d..000000000000 --- a/net-analyzer/syweb/syweb-0.65.ebuild +++ /dev/null @@ -1,42 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -WEBAPP_MANUAL_SLOT="yes" -inherit webapp - -DESCRIPTION="Web frontend to symon" -HOMEPAGE="http://www.xs4all.nl/~wpd/symon/" -SRC_URI="http://www.xs4all.nl/~wpd/symon/philes/${P}.tar.gz" - -LICENSE="BSD-2" -SLOT="0" -KEYWORDS="~amd64 ~sparc ~x86" - -RDEPEND="virtual/httpd-php - net-analyzer/rrdtool" - -need_httpd_cgi - -S=${WORKDIR}/${PN} - -src_install() { - webapp_src_preinst - - dodoc CHANGELOG README - docinto layouts - dodoc symon/*.layout - - dodir "${MY_HOSTROOTDIR}"/syweb/cache - insinto "${MY_HOSTROOTDIR}"/syweb - doins symon/hifn_test.layout - webapp_serverowned "${MY_HOSTROOTDIR}"/syweb/cache - insinto "${MY_HTDOCSDIR}" - doins -r htdocs/syweb/* - webapp_configfile "${MY_HTDOCSDIR}"/setup.inc - webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt - webapp_hook_script "${FILESDIR}"/reconfig - - webapp_src_install -} diff --git a/net-analyzer/tcpdump/Manifest b/net-analyzer/tcpdump/Manifest index cd74edc21c66..a9f92479362d 100644 --- a/net-analyzer/tcpdump/Manifest +++ b/net-analyzer/tcpdump/Manifest @@ -1,2 +1,2 @@ -DIST tcpdump-4.9.3.tar.gz 2333119 BLAKE2B 21e13fc40d98cfac0bbd5513580cf98313df1f8fea24c48f045f70d494aea3e75230b8481049660c109f9179015c3164f3e3b31acc76c0bfb1f2da5039f1834e SHA512 3aec673f78b996a4df884b1240e5d0a26a2ca81ee7aca8a2e6d50255bb53476e008a5ced4409e278a956710d8a4d31d85bbb800c9f1aab92b0b1046b59292a22 -DIST tcpdump-4.99.0.tar.gz 1876161 BLAKE2B 5ad7e7f888f56fac92ef3c01229ba03b45cfd706d7a904a10118b65c73aa6c5c1d39f54b7139c72116b67ed2971566596ae51d65de8528116b3a81bbcc7f52ab SHA512 921c27bdd803de9ecebe735a3efc82ac87c4efbd47949119241b8290ed1a015c25d252e428d5bf3b8e275e5b084d19bafb31020b1b3e241202cbc42f1f1d4801 +DIST tcpdump-4.99.4.tar.gz 1903612 BLAKE2B f100e10774574ef04a770bc30d4e2d06fd0f1f16a7b2c88848be6e8290cc4838666ff378d9f78fdc418f4ffab9716a11214edc3588c292cb5ff39636cd7cfd2d SHA512 cb51e19574707d07c0de90dd4c301955897f2c9f2a69beb7162c08f59189f55625346d1602c8d66ab2b4c626ea4b0df1f08ed8734d2d7f536d0a7840c2d6d8df +DIST tcpdump-4.99.4.tar.gz.sig 442 BLAKE2B 2ee35036d86f643b378591c0eb93d8a0f08cb2f0e3638bde25515d550b40fef1bf0eb6c876d4d6512fa795041b0703954ca884c646c4af8771b4bc4049e7609a SHA512 bec395f0f595a37121bc144bac133f3fb31c6c1007cdadf061e4437d6fe2406c0cb0d5b68b5c63e03b932c783bfb58f0af0b7e8a58bb81beb9de6a0d681620e8 diff --git a/net-analyzer/tcpdump/files/tcpdump-4.9.3-CVE-2020-8037.patch b/net-analyzer/tcpdump/files/tcpdump-4.9.3-CVE-2020-8037.patch deleted file mode 100644 index 2852845eb748..000000000000 --- a/net-analyzer/tcpdump/files/tcpdump-4.9.3-CVE-2020-8037.patch +++ /dev/null @@ -1,63 +0,0 @@ -From 32027e199368dad9508965aae8cd8de5b6ab5231 Mon Sep 17 00:00:00 2001 -From: Guy Harris <guy@alum.mit.edu> -Date: Sat, 18 Apr 2020 14:04:59 -0700 -Subject: [PATCH] PPP: When un-escaping, don't allocate a too-large buffer. - -The buffer should be big enough to hold the captured data, but it -doesn't need to be big enough to hold the entire on-the-network packet, -if we haven't captured all of it. - -(backported from commit e4add0b010ed6f2180dcb05a13026242ed935334) ---- - print-ppp.c | 18 ++++++++++++++---- - 1 file changed, 14 insertions(+), 4 deletions(-) - -diff --git a/print-ppp.c b/print-ppp.c -index 891761728..33fb03412 100644 ---- a/print-ppp.c -+++ b/print-ppp.c -@@ -1367,19 +1367,29 @@ print_bacp_config_options(netdissect_options *ndo, - return 0; - } - -+/* -+ * Un-escape RFC 1662 PPP in HDLC-like framing, with octet escapes. -+ * The length argument is the on-the-wire length, not the captured -+ * length; we can only un-escape the captured part. -+ */ - static void - ppp_hdlc(netdissect_options *ndo, - const u_char *p, int length) - { -+ u_int caplen = ndo->ndo_snapend - p; - u_char *b, *t, c; - const u_char *s; -- int i, proto; -+ u_int i; -+ int proto; - const void *se; - -+ if (caplen == 0) -+ return; -+ - if (length <= 0) - return; - -- b = (u_char *)malloc(length); -+ b = (u_char *)malloc(caplen); - if (b == NULL) - return; - -@@ -1388,10 +1398,10 @@ ppp_hdlc(netdissect_options *ndo, - * Do this so that we dont overwrite the original packet - * contents. - */ -- for (s = p, t = b, i = length; i > 0 && ND_TTEST(*s); i--) { -+ for (s = p, t = b, i = caplen; i != 0; i--) { - c = *s++; - if (c == 0x7d) { -- if (i <= 1 || !ND_TTEST(*s)) -+ if (i <= 1) - break; - i--; - c = *s++ ^ 0x20; diff --git a/net-analyzer/tcpdump/files/tcpdump-4.99.4-lfs.patch b/net-analyzer/tcpdump/files/tcpdump-4.99.4-lfs.patch new file mode 100644 index 000000000000..b38c2c24b108 --- /dev/null +++ b/net-analyzer/tcpdump/files/tcpdump-4.99.4-lfs.patch @@ -0,0 +1,22 @@ +https://github.com/the-tcpdump-group/tcpdump/pull/1068 + +From 54278acb038f0d16ed75cdddb35fd2813a7cdcef Mon Sep 17 00:00:00 2001 +From: Sam James <sam@gentoo.org> +Date: Thu, 27 Jul 2023 08:31:53 +0100 +Subject: [PATCH] configure.ac: use AC_SYS_LARGEFILE + +This enables 64-bit off_t where it's opt-in (e.g. glibc) on 32-bit platforms. + +Bug: https://bugs.gentoo.org/911176 +Signed-off-by: Sam James <sam@gentoo.org> +--- a/configure.ac ++++ b/configure.ac +@@ -30,7 +30,7 @@ if test "$ac_cv_prog_cc_c99" = "no"; then + fi + AC_LBL_C_INIT(V_CCOPT, V_INCLS) + AC_LBL_C_INLINE +- ++AC_SYS_LARGEFILE + AC_CHECK_HEADERS(fcntl.h rpc/rpc.h rpc/rpcent.h net/if.h) + + case "$host_os" in diff --git a/net-analyzer/tcpdump/files/tcpdump-9999-lfs.patch b/net-analyzer/tcpdump/files/tcpdump-9999-lfs.patch new file mode 100644 index 000000000000..396614ef3ad2 --- /dev/null +++ b/net-analyzer/tcpdump/files/tcpdump-9999-lfs.patch @@ -0,0 +1,22 @@ +https://github.com/the-tcpdump-group/tcpdump/pull/1068 + +From 54278acb038f0d16ed75cdddb35fd2813a7cdcef Mon Sep 17 00:00:00 2001 +From: Sam James <sam@gentoo.org> +Date: Thu, 27 Jul 2023 08:31:53 +0100 +Subject: [PATCH] configure.ac: use AC_SYS_LARGEFILE + +This enables 64-bit off_t where it's opt-in (e.g. glibc) on 32-bit platforms. + +Bug: https://bugs.gentoo.org/911176 +Signed-off-by: Sam James <sam@gentoo.org> +--- a/configure.ac ++++ b/configure.ac +@@ -30,7 +30,7 @@ if test "$ac_cv_prog_cc_c99" = "no"; then + fi + AC_LBL_C_INIT(V_CCOPT, V_INCLS) + AC_C_INLINE +- ++AC_SYS_LARGEFILE + AC_CHECK_HEADERS(fcntl.h rpc/rpc.h rpc/rpcent.h net/if.h) + + case "$host_os" in diff --git a/net-analyzer/tcpdump/metadata.xml b/net-analyzer/tcpdump/metadata.xml index 1f6e1c98b574..46a723b7db8b 100644 --- a/net-analyzer/tcpdump/metadata.xml +++ b/net-analyzer/tcpdump/metadata.xml @@ -1,11 +1,7 @@ -<?xml version='1.0' encoding='UTF-8'?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> - <email>zlogene@gentoo.org</email> - <name>Mikle Kolyada</name> - </maintainer> - <maintainer type="person"> <email>sam@gentoo.org</email> <name>Sam James</name> </maintainer> diff --git a/net-analyzer/tcpdump/tcpdump-4.9.3-r4.ebuild b/net-analyzer/tcpdump/tcpdump-4.9.3-r4.ebuild deleted file mode 100644 index 6c0d493d0ed5..000000000000 --- a/net-analyzer/tcpdump/tcpdump-4.9.3-r4.ebuild +++ /dev/null @@ -1,86 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools - -DESCRIPTION="A Tool for network monitoring and data acquisition" -HOMEPAGE="https://www.tcpdump.org/ https://github.com/the-tcpdump-group/tcpdump" -SRC_URI="https://www.tcpdump.org/release/${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux" -IUSE="+drop-root libressl smi ssl samba suid test" -RESTRICT="!test? ( test )" - -RDEPEND=" - net-libs/libpcap - drop-root? ( - acct-group/pcap - acct-user/pcap - sys-libs/libcap-ng - ) - smi? ( net-libs/libsmi ) - ssl? ( - !libressl? ( >=dev-libs/openssl-0.9.6m:0= ) - libressl? ( dev-libs/libressl:= ) - ) - suid? ( - acct-group/pcap - acct-user/pcap - ) -" -DEPEND=" - ${RDEPEND} - test? ( - >=net-libs/libpcap-1.9.1 - dev-lang/perl - ) -" - -PATCHES=( - "${FILESDIR}"/${PN}-9999-libdir.patch - "${FILESDIR}"/${PN}-4.9.3-CVE-2020-8037.patch -) - -src_prepare() { - default - eautoreconf -} - -src_configure() { - econf \ - $(use_enable samba smb) \ - $(use_with drop-root cap-ng) \ - $(use_with drop-root chroot '') \ - $(use_with smi) \ - $(use_with ssl crypto "${ESYSROOT}/usr") \ - $(usex drop-root "--with-user=pcap" "") -} - -src_test() { - if [[ ${EUID} -ne 0 ]] || ! use drop-root; then - emake check - else - ewarn "If you want to run the test suite, make sure you either" - ewarn "set FEATURES=userpriv or set USE=-drop-root" - fi -} - -src_install() { - dosbin tcpdump - doman tcpdump.1 - dodoc *.awk - dodoc CHANGES CREDITS README.md - - if use suid; then - fowners root:pcap /usr/sbin/tcpdump - fperms 4110 /usr/sbin/tcpdump - fi -} - -pkg_postinst() { - use suid && elog "To let normal users run tcpdump, add them to the pcap group." -} diff --git a/net-analyzer/tcpdump/tcpdump-4.99.0.ebuild b/net-analyzer/tcpdump/tcpdump-4.99.0.ebuild deleted file mode 100644 index 5d08f58a44ec..000000000000 --- a/net-analyzer/tcpdump/tcpdump-4.99.0.ebuild +++ /dev/null @@ -1,88 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools - -DESCRIPTION="A Tool for network monitoring and data acquisition" -HOMEPAGE="https://www.tcpdump.org/ https://github.com/the-tcpdump-group/tcpdump" -SRC_URI="https://github.com/the-tcpdump-group/${PN}/archive/${P/_}.tar.gz" -S="${WORKDIR}/${PN}-${P/_}" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" -IUSE="+drop-root libressl +smi +ssl +samba suid test" -RESTRICT="!test? ( test )" -REQUIRED_USE="test? ( samba )" - -BDEPEND="drop-root? ( virtual/pkgconfig )" -RDEPEND=" - net-libs/libpcap - drop-root? ( - acct-group/pcap - acct-user/pcap - sys-libs/libcap-ng - ) - smi? ( net-libs/libsmi ) - ssl? ( - !libressl? ( >=dev-libs/openssl-0.9.6m:0= ) - libressl? ( dev-libs/libressl:= ) - ) - suid? ( - acct-group/pcap - acct-user/pcap - ) -" -DEPEND=" - ${RDEPEND} - test? ( - >=net-libs/libpcap-1.9.1 - dev-lang/perl - ) -" - -PATCHES=( - "${FILESDIR}"/${PN}-9999-libdir.patch -) - -src_prepare() { - default - eautoreconf -} - -src_configure() { - econf \ - $(use_enable samba smb) \ - $(use_with drop-root cap-ng) \ - $(use_with drop-root chroot '') \ - $(use_with smi) \ - $(use_with ssl crypto "${ESYSROOT}/usr") \ - $(usex drop-root "--with-user=pcap" "") -} - -src_test() { - if [[ ${EUID} -ne 0 ]] || ! use drop-root ; then - emake check - else - ewarn "If you want to run the test suite, make sure you either" - ewarn "set FEATURES=userpriv or set USE=-drop-root" - fi -} - -src_install() { - dosbin tcpdump - doman tcpdump.1 - dodoc *.awk - dodoc CHANGES CREDITS README.md - - if use suid ; then - fowners root:pcap /usr/sbin/tcpdump - fperms 4110 /usr/sbin/tcpdump - fi -} - -pkg_postinst() { - use suid && elog "To let normal users run tcpdump, add them to the pcap group." -} diff --git a/net-analyzer/tcpdump/tcpdump-4.99.4-r1.ebuild b/net-analyzer/tcpdump/tcpdump-4.99.4-r1.ebuild new file mode 100644 index 000000000000..84162ab068b5 --- /dev/null +++ b/net-analyzer/tcpdump/tcpdump-4.99.4-r1.ebuild @@ -0,0 +1,102 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools + +DESCRIPTION="A tool for network monitoring and data acquisition" +HOMEPAGE="https://www.tcpdump.org/ https://github.com/the-tcpdump-group/tcpdump" + +if [[ ${PV} == *9999* ]] ; then + inherit git-r3 + + EGIT_REPO_URI="https://github.com/the-tcpdump-group/tcpdump" +else + VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/tcpdump.asc + inherit verify-sig + + SRC_URI="https://www.tcpdump.org/release/${P}.tar.gz" + SRC_URI+=" verify-sig? ( https://www.tcpdump.org/release/${P}.tar.gz.sig )" + + KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" +fi + +LICENSE="BSD" +SLOT="0" +IUSE="+drop-root +smi +ssl +samba suid test" +REQUIRED_USE="test? ( samba )" +RESTRICT="!test? ( test )" + +RDEPEND=" + >=net-libs/libpcap-1.10.1 + drop-root? ( + acct-group/pcap + acct-user/pcap + sys-libs/libcap-ng + ) + smi? ( net-libs/libsmi ) + ssl? ( + >=dev-libs/openssl-0.9.6m:= + ) + suid? ( + acct-group/pcap + acct-user/pcap + ) +" +DEPEND=" + ${RDEPEND} + test? ( + dev-lang/perl + ) +" +BDEPEND="drop-root? ( virtual/pkgconfig )" + +if [[ ${PV} != *9999* ]] ; then + BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-tcpdump )" +fi + +PATCHES=( + "${FILESDIR}"/${PN}-9999-libdir.patch + "${FILESDIR}"/${PN}-4.99.4-lfs.patch +) + +src_prepare() { + default + eautoreconf +} + +src_configure() { + econf \ + $(use_enable samba smb) \ + $(use_with drop-root cap-ng) \ + $(use_with drop-root chroot '') \ + $(use_with smi) \ + $(use_with ssl crypto "${ESYSROOT}/usr") \ + $(usex drop-root "--with-user=pcap" "") +} + +src_test() { + if [[ ${EUID} -ne 0 ]] || ! use drop-root ; then + emake check + else + ewarn "If you want to run the test suite, make sure you either" + ewarn "set FEATURES=userpriv or set USE=-drop-root" + fi +} + +src_install() { + dosbin tcpdump + doman tcpdump.1 + dodoc *.awk + dodoc CHANGES CREDITS README.md + + if use suid ; then + fowners root:pcap /usr/sbin/tcpdump + fperms 4110 /usr/sbin/tcpdump + fi +} + +pkg_postinst() { + use suid && elog "To let normal users run tcpdump, add them to the pcap group." +} diff --git a/net-analyzer/tcpdump/tcpdump-9999.ebuild b/net-analyzer/tcpdump/tcpdump-9999.ebuild index 6f074f38fb23..6d223129b9ed 100644 --- a/net-analyzer/tcpdump/tcpdump-9999.ebuild +++ b/net-analyzer/tcpdump/tcpdump-9999.ebuild @@ -1,25 +1,35 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 -inherit autotools git-r3 +EAPI=8 -DESCRIPTION="A Tool for network monitoring and data acquisition" -HOMEPAGE=" - https://www.tcpdump.org/ - https://github.com/the-tcpdump-group/tcpdump -" -LICENSE="BSD" -EGIT_REPO_URI="https://github.com/the-tcpdump-group/tcpdump" +inherit autotools + +DESCRIPTION="A tool for network monitoring and data acquisition" +HOMEPAGE="https://www.tcpdump.org/ https://github.com/the-tcpdump-group/tcpdump" + +if [[ ${PV} == *9999* ]] ; then + inherit git-r3 + + EGIT_REPO_URI="https://github.com/the-tcpdump-group/tcpdump" +else + VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/tcpdump.asc + inherit verify-sig + + SRC_URI="https://www.tcpdump.org/release/${P}.tar.gz" + SRC_URI+=" verify-sig? ( https://www.tcpdump.org/release/${P}.tar.gz.sig )" + + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" +fi +LICENSE="BSD" SLOT="0" -KEYWORDS="" -IUSE="+drop-root libressl +smi +ssl +samba suid test" -RESTRICT="!test? ( test )" +IUSE="+drop-root +smi +ssl +samba suid test" REQUIRED_USE="test? ( samba )" +RESTRICT="!test? ( test )" RDEPEND=" - net-libs/libpcap + >=net-libs/libpcap-1.10.1 drop-root? ( acct-group/pcap acct-user/pcap @@ -27,31 +37,32 @@ RDEPEND=" ) smi? ( net-libs/libsmi ) ssl? ( - !libressl? ( >=dev-libs/openssl-0.9.6m:0= ) - libressl? ( dev-libs/libressl:= ) + >=dev-libs/openssl-0.9.6m:= ) suid? ( acct-group/pcap acct-user/pcap ) " -BDEPEND=" - drop-root? ( virtual/pkgconfig ) -" DEPEND=" ${RDEPEND} test? ( - >=net-libs/libpcap-1.9.1 dev-lang/perl ) " +BDEPEND="drop-root? ( virtual/pkgconfig )" + +if [[ ${PV} != *9999* ]] ; then + BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-tcpdump )" +fi + PATCHES=( "${FILESDIR}"/${PN}-9999-libdir.patch + "${FILESDIR}"/${PN}-9999-lfs.patch ) src_prepare() { default - eautoreconf } @@ -66,7 +77,7 @@ src_configure() { } src_test() { - if [[ ${EUID} -ne 0 ]] || ! use drop-root; then + if [[ ${EUID} -ne 0 ]] || ! use drop-root ; then emake check else ewarn "If you want to run the test suite, make sure you either" @@ -80,12 +91,12 @@ src_install() { dodoc *.awk dodoc CHANGES CREDITS README.md - if use suid; then + if use suid ; then fowners root:pcap /usr/sbin/tcpdump fperms 4110 /usr/sbin/tcpdump fi } pkg_postinst() { - use suid && elog "To let normal users run tcpdump add them to the pcap group." + use suid && elog "To let normal users run tcpdump, add them to the pcap group." } diff --git a/net-analyzer/tcpflow/Manifest b/net-analyzer/tcpflow/Manifest new file mode 100644 index 000000000000..849f6a69a642 --- /dev/null +++ b/net-analyzer/tcpflow/Manifest @@ -0,0 +1,3 @@ +DIST be13_api-20170924.tar.gz 75724 BLAKE2B a5257346b9c0740d9758543fe7772c960e1941735abefe4d24d347631b35d1511fde8eb5a58dbb2824c54e78ee0d686a2549ceea2c1dc91e05ef92899c8b3c2d SHA512 5bf0d28f23df9436304245ccbdbf4af5b0f65e62b92e3039cfb9a70fe2056aa90dcce906db02f3df83fcf2a415c8a46f0f75468d48e13b15673d11c447a4c9c4 +DIST dfxml-20170921.tar.gz 163616 BLAKE2B 17214d15596a136efb2afc7246ee0f5696620b5aac7c2d78e37764f51487ff816de5a7c0f59e7484d358a8cd8eab34841716970cd859f0ce868ac29c8532754c SHA512 0885947aaf8efe639c13324413ef0cca49750027b48b434f226fb9fbfba494e84e245da879dc0d77b46bddc27798f7f5df12590fce47b096683034bbc61280e1 +DIST tcpflow-1.6.1-tag.tar.gz 915245 BLAKE2B 22a1540415d6321d4ba43035f386aaea177e9d3244ff1dcdedcb0c8a72f487a969372b76b85f6acec4f0f1430b51230ceb665466af388d2bfe123a57dcd4224b SHA512 9c0357ca816bf4316ce7a461e5d18c5043a6938828ce83a613a952d5804cc6b701028a666b352da922d69447ab7f5d4c9f66585872e7b116c0f1aebebc38682b diff --git a/net-analyzer/tcpflow/files/tcpflow-1.5.0_alpha-libcapng.patch b/net-analyzer/tcpflow/files/tcpflow-1.5.0_alpha-libcapng.patch new file mode 100644 index 000000000000..b56144324c09 --- /dev/null +++ b/net-analyzer/tcpflow/files/tcpflow-1.5.0_alpha-libcapng.patch @@ -0,0 +1,13 @@ +--- a/src/tcpflow.cpp ++++ b/src/tcpflow.cpp +@@ -30,6 +30,10 @@ + #include <grp.h> + #endif + ++#ifdef HAVE_CAP_NG_H ++#include <cap-ng.h> ++#endif ++ + /* bring in inet_ntop if it is not present */ + #define ETH_ALEN 6 + #ifndef HAVE_INET_NTOP diff --git a/net-analyzer/tcpflow/files/tcpflow-1.5.2-gentoo.patch b/net-analyzer/tcpflow/files/tcpflow-1.5.2-gentoo.patch new file mode 100644 index 000000000000..e6748c019688 --- /dev/null +++ b/net-analyzer/tcpflow/files/tcpflow-1.5.2-gentoo.patch @@ -0,0 +1,64 @@ +--- a/configure.ac ++++ b/configure.ac +@@ -30,7 +30,6 @@ + AC_PROG_INSTALL + + m4_include([m4/slg_searchdirs.m4]) +-m4_include([m4/slg_gcc_all_warnings.m4]) + + + # use C++11 mode if available; HAVE_CXX11 is defined in config.h if so. Don't +@@ -402,7 +402,12 @@ + AC_CHECK_HEADERS(cap-ng.h) + fi + +- ++################################################################ ++# http-parser ++ ++AC_CHECK_LIB(http_parser,http_parser_init,, ++ AC_MSG_ERROR([http-parser library not installed])) ++AC_CHECK_HEADERS(http_parser.h) + + ################################################################ + # Specify our other headers +--- a/src/scan_http.cpp ++++ b/src/scan_http.cpp +@@ -11,7 +11,11 @@ + #include "tcpip.h" + #include "tcpdemux.h" + ++#ifdef HAVE_HTTP_PARSER_H ++#include "http_parser.h" ++#else + #include "http-parser/http_parser.h" ++#endif + + #include "mime_map.h" + +diff --git a/src/Makefile.am b/src/Makefile.am +index 793ec1a..ecac7a9 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -98,8 +98,6 @@ tcpflow_SOURCES = \ + scan_netviz.cpp \ + pcap_writer.h \ + iptree.h \ +- http-parser/http_parser.c \ +- http-parser/http_parser.h \ + mime_map.cpp \ + mime_map.h + +@@ -110,12 +108,6 @@ tcpflow_SOURCES = \ + EXTRA_DIST =\ + inet_ntop.c \ + inet_ntop.h \ +- http-parser/AUTHORS \ +- http-parser/CONTRIBUTIONS \ +- http-parser/LICENSE-MIT \ +- http-parser/Makefile \ +- http-parser/README.md \ +- http-parser/http_parser.gyp \ + wifipcap/README.txt \ + wifipcap/TimeVal.cpp \ + wifipcap/TimeVal.h \ diff --git a/net-analyzer/tcpflow/files/tcpflow-1.6.1-gcc13.patch b/net-analyzer/tcpflow/files/tcpflow-1.6.1-gcc13.patch new file mode 100644 index 000000000000..d3b6b63920f1 --- /dev/null +++ b/net-analyzer/tcpflow/files/tcpflow-1.6.1-gcc13.patch @@ -0,0 +1,22 @@ +https://github.com/simsong/tcpflow/pull/252 + +From 51973125e3961569b83bd4fdde65272a3843a6a3 Mon Sep 17 00:00:00 2001 +From: Sam James <sam@gentoo.org> +Date: Sat, 15 Apr 2023 09:54:14 +0100 +Subject: [PATCH] Fix build with GCC 13 + +GCC 13 (as usual for new compiler releases) shuffles around some internal includes and so etc is no longer transitively included. + +See https://gnu.org/software/gcc/gcc-13/porting_to.html. +Bug: https://bugs.gentoo.org/895282 +--- a/src/netviz/plot_view.h ++++ b/src/netviz/plot_view.h +@@ -23,6 +23,7 @@ + #include <cairo/cairo-pdf.h> + #endif + ++#include <cstdint> + #include <vector> + #include <string> + #include <math.h> + diff --git a/net-analyzer/tcpflow/files/tcpflow-1.6.1-wformat-security.patch b/net-analyzer/tcpflow/files/tcpflow-1.6.1-wformat-security.patch new file mode 100644 index 000000000000..092a08dd7664 --- /dev/null +++ b/net-analyzer/tcpflow/files/tcpflow-1.6.1-wformat-security.patch @@ -0,0 +1,24 @@ +https://github.com/simsong/tcpflow/issues/238 +https://github.com/simsong/tcpflow/commit/a0697509c4657e2fd94f941e43a2d4c86ddf9fe4 + +From: "Simson L. Garfinkel" <simsong@acm.org> +Date: Thu, 11 Mar 2021 19:30:54 -0500 +Subject: [PATCH] Update datalink.cpp (#239) + +per https://salsa.debian.org/debian/tcpflow/-/blob/master/debian/patches/fix-werror-format-security.patch +Closes https://github.com/simsong/tcpflow/issues/238 +--- a/src/datalink.cpp ++++ b/src/datalink.cpp +@@ -171,10 +171,7 @@ void dl_ethernet(u_char *user, const struct pcap_pkthdr *h, const u_char *p) + break; + } + } catch( std::logic_error e){ +- std::string s(std::string("warning: caught std::logic_error ") +- + e.what() +- + std::string(" in packet")); +- DEBUG(6)(s.c_str()); ++ DEBUG(6)("Warning: caught std::logic_error %s in packet",e.what()); + } + } + + diff --git a/net-analyzer/tcpflow/metadata.xml b/net-analyzer/tcpflow/metadata.xml new file mode 100644 index 000000000000..e3c9b6ed920b --- /dev/null +++ b/net-analyzer/tcpflow/metadata.xml @@ -0,0 +1,11 @@ +<?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> + <upstream> + <remote-id type="github">simsong/tcpflow</remote-id> + </upstream> +</pkgmetadata> diff --git a/net-analyzer/tcpflow/tcpflow-1.6.1-r1.ebuild b/net-analyzer/tcpflow/tcpflow-1.6.1-r1.ebuild new file mode 100644 index 000000000000..ab313f301712 --- /dev/null +++ b/net-analyzer/tcpflow/tcpflow-1.6.1-r1.ebuild @@ -0,0 +1,57 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools flag-o-matic + +DESCRIPTION="A tool for monitoring, capturing and storing TCP connections flows" +HOMEPAGE="https://github.com/simsong/tcpflow" +SRC_URI=" + https://api.github.com/repos/simsong/be13_api/tarball/c81521d768bb78499c069fcd7c47adc8eee0350c -> be13_api-20170924.tar.gz + https://api.github.com/repos/simsong/dfxml/tarball/7d11eaa7da8d31f588ce8aecb4b4f5e7e8169ba6 -> dfxml-20170921.tar.gz + https://github.com/simsong/tcpflow/archive/refs/tags/${P}.tar.gz -> ${P}-tag.tar.gz +" +S="${WORKDIR}"/${PN}-${P} + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux ~x64-macos" +IUSE="cairo test" +RESTRICT="!test? ( test )" + +RDEPEND="dev-db/sqlite + dev-libs/boost:= + dev-libs/openssl:= + net-libs/http-parser:= + net-libs/libpcap + sys-libs/libcap-ng + sys-libs/zlib:= + cairo? ( + x11-libs/cairo + )" +DEPEND="${RDEPEND}" +BDEPEND="test? ( sys-apps/coreutils )" + +PATCHES=( + "${FILESDIR}"/${PN}-1.5.0_alpha-libcapng.patch + "${FILESDIR}"/${PN}-1.5.2-gentoo.patch + "${FILESDIR}"/${PN}-1.6.1-wformat-security.patch + "${FILESDIR}"/${PN}-1.6.1-gcc13.patch +) + +src_prepare() { + default + + eautoreconf +} + +src_configure() { + append-cxxflags -fpermissive + + # Disable Python because it's Python 2.7 only, even as of 1.6.1! + export ac_cv_header_python2_7_Python_h=no + export ac_cv_lib_python2_7_Py_Initialize=no + + CONFIG_SHELL="${BROOT}"/bin/bash econf $(usex cairo --enable-cairo=true --enable-cairo=false) +} diff --git a/net-analyzer/tcping/Manifest b/net-analyzer/tcping/Manifest index 93156ec4abf3..6efff5e7cf56 100644 --- a/net-analyzer/tcping/Manifest +++ b/net-analyzer/tcping/Manifest @@ -1,2 +1 @@ -DIST tcping-1.3.5.tar.gz 5889 BLAKE2B 8636d1fa4ff65eb14c8fe3c8d6e5b31740b84f0ccc1517b8b35ac613ace3be4b7584b6b7ccd5cf7737c7b7fea678d8d85ac54c00186ce79920dd1756c8c66fd3 SHA512 729360cd1f820ec7c68e2c64365caf60daace8c486c64fe96a88d1037b9818dd27603408962842b74d0db1ee2306ef68522f3f3369c1390e4554929297de760d DIST tcping-1.3.6.tar.gz 3329 BLAKE2B cd69e259d930532810bf3b19d22db981d644051e472d6356e442df2074ebd6fe675b62540190f465127bdcd0c248f329b3e5c167a6c4408acfef029297b5e181 SHA512 74c65f292d6521dfbf8784ae9e1988a12ad224c81f6575ada1cae55b079cf9c13707be52cb9147abe02c8787ebbedb0d9fca1f2c27fb57c32eea5817c7042992 diff --git a/net-analyzer/tcping/metadata.xml b/net-analyzer/tcping/metadata.xml index 12edb2ee98a0..821122387993 100644 --- a/net-analyzer/tcping/metadata.xml +++ b/net-analyzer/tcping/metadata.xml @@ -1,7 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type='project'> -<email>netmon@gentoo.org</email> +<maintainer type="project"> + <email>netmon@gentoo.org</email> </maintainer> +<upstream> + <remote-id type="github">mkirchner/tcping</remote-id> +</upstream> </pkgmetadata> diff --git a/net-analyzer/tcping/tcping-1.3.5-r1.ebuild b/net-analyzer/tcping/tcping-1.3.5-r1.ebuild deleted file mode 100644 index 956a3556561e..000000000000 --- a/net-analyzer/tcping/tcping-1.3.5-r1.ebuild +++ /dev/null @@ -1,28 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit toolchain-funcs - -DESCRIPTION="Ping implementation that uses the TCP protocol" -HOMEPAGE="https://github.com/mkirchner/tcping" -SRC_URI="https://web.archive.org/web/20160316191549/http://linuxco.de/tcping/tcping-1.3.5.tar.gz" - -LICENSE="LGPL-3" -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/tcping/tcping-1.3.6.ebuild b/net-analyzer/tcping/tcping-1.3.6.ebuild index ac21b008725e..e581a8a8dbf9 100644 --- a/net-analyzer/tcping/tcping-1.3.6.ebuild +++ b/net-analyzer/tcping/tcping-1.3.6.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 @@ -8,7 +8,7 @@ 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-with-advertising" +LICENSE="MIT" SLOT="0" KEYWORDS="~amd64 ~x86" diff --git a/net-analyzer/tcpreen/metadata.xml b/net-analyzer/tcpreen/metadata.xml index 74c2baebb4ec..dce3f3be66c0 100644 --- a/net-analyzer/tcpreen/metadata.xml +++ b/net-analyzer/tcpreen/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>netmon@gentoo.org</email> diff --git a/net-analyzer/tcpreen/tcpreen-1.4.4-r1.ebuild b/net-analyzer/tcpreen/tcpreen-1.4.4-r1.ebuild new file mode 100644 index 000000000000..3191689b7a26 --- /dev/null +++ b/net-analyzer/tcpreen/tcpreen-1.4.4-r1.ebuild @@ -0,0 +1,27 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit toolchain-funcs + +DESCRIPTION="TCP network re-engineering tool" +HOMEPAGE="https://www.remlab.net/tcpreen/" +SRC_URI="https://www.remlab.net/files/${PN}/stable/${P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64 ~ppc x86" +IUSE="nls" + +BDEPEND="nls? ( sys-devel/gettext )" + +PATCHES=( "${FILESDIR}"/${P}-literal-suffix.patch ) + +src_configure() { + econf $(use_enable nls) +} + +src_compile() { + emake AR="$(tc-getAR)" +} diff --git a/net-analyzer/tcpreen/tcpreen-1.4.4.ebuild b/net-analyzer/tcpreen/tcpreen-1.4.4.ebuild deleted file mode 100644 index 3aa79a2d98df..000000000000 --- a/net-analyzer/tcpreen/tcpreen-1.4.4.ebuild +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit toolchain-funcs - -DESCRIPTION="TCP network re-engineering tool" -HOMEPAGE="https://www.remlab.net/tcpreen/" -SRC_URI="https://www.remlab.net/files/${PN}/stable/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ~ppc x86" -IUSE="nls" -DEPEND=" - nls? ( sys-devel/gettext ) -" -DOCS=( AUTHORS NEWS README THANKS TODO ) -PATCHES=( - "${FILESDIR}"/${P}-literal-suffix.patch -) - -src_configure() { - econf $(use_enable nls) -} - -src_compile() { - emake AR="$(tc-getAR)" -} diff --git a/net-analyzer/tcpreplay/Manifest b/net-analyzer/tcpreplay/Manifest index 311b4ba4d1c0..821f42c144ad 100644 --- a/net-analyzer/tcpreplay/Manifest +++ b/net-analyzer/tcpreplay/Manifest @@ -1 +1,2 @@ -DIST tcpreplay-4.3.3.tar.xz 748220 BLAKE2B 2de09f75e6bb6035fc25f34f41d9ce2ccbb961d7464a9a6dae16ec417d629e4819593fd781d95075293ffa3a3db7c4a50ae8667c4e7d07c0b425361027c8df06 SHA512 110d7768a176d2126766829466a209cdd983afcf0c988f7e128baa5057b3ac1dc918fcaeb168a2e6654429100a146afcbdafcda8c3d67adf6b17892a48689a02 +DIST tcpreplay-4.4.3.tar.xz 750072 BLAKE2B 218fe1c5faab0fdd75a031afce8f468c85886a4cf21a4d9bd34089bd106756ee0e65e0df605efecb3260ccff266553a44d8ee10249b35524a044c6c5db86fcc7 SHA512 d8186a5faf3fbe5505da34cfc466c0375c4f298c997fe85505ea898c8c1241c16f98269596b682983a3e5cbd8493882334c925ff750d95995f3b13c5b83357cf +DIST tcpreplay-4.4.4.tar.xz 748344 BLAKE2B 05f586c9d68e1ee47fc5dfdbf14d866ccbd921a5734a52de4ba6c1f33f37628e510eddbf9059130c9858207690ec2c14dfbf3819f923436aa64fcc3fc2ce074d SHA512 a6907c98779c96b2acf53e2f13e832f2c9a7ee840acc40d23c7290c2ceefb5885d314453dec9463069218011bee86bb7df057966120aacd6cddda942821aea9b diff --git a/net-analyzer/tcpreplay/metadata.xml b/net-analyzer/tcpreplay/metadata.xml index e53da7185c86..f49b7430b798 100644 --- a/net-analyzer/tcpreplay/metadata.xml +++ b/net-analyzer/tcpreplay/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>netmon@gentoo.org</email> diff --git a/net-analyzer/tcpreplay/tcpreplay-4.3.3.ebuild b/net-analyzer/tcpreplay/tcpreplay-4.3.3.ebuild deleted file mode 100644 index a5ce8388372c..000000000000 --- a/net-analyzer/tcpreplay/tcpreplay-4.3.3.ebuild +++ /dev/null @@ -1,74 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit autotools flag-o-matic - -DESCRIPTION="utilities for editing and replaying previously captured network traffic" -HOMEPAGE="http://tcpreplay.appneta.com/ https://github.com/appneta/tcpreplay" -LICENSE="BSD GPL-3" -SRC_URI="https://github.com/appneta/${PN}/releases/download/v${PV}/${P}.tar.xz" - -SLOT="0" -KEYWORDS="amd64 ~arm ~sparc x86" -IUSE="debug pcapnav +tcpdump" - -DEPEND=" - >=sys-devel/autogen-5.18.4[libopts] - dev-libs/libdnet - >=net-libs/libpcap-0.9 - tcpdump? ( net-analyzer/tcpdump ) - pcapnav? ( net-libs/libpcapnav ) -" -RDEPEND="${DEPEND}" - -DOCS=( - docs/{CHANGELOG,CREDIT,HACKING,TODO} -) -PATCHES=( - "${FILESDIR}"/${PN}-4.3.0-enable-pcap_findalldevs.patch -) - -S=${WORKDIR}/${P/_/-} - -src_prepare() { - default - - sed -i \ - -e 's|#include <dnet.h>|#include <dnet/eth.h>|g' \ - src/common/sendpacket.c || die - sed -i \ - -e 's|@\([A-Z_]*\)@|$(\1)|g' \ - -e '/tcpliveplay_CFLAGS/s|$| $(LDNETINC)|g' \ - -e '/tcpliveplay_LDADD/s|$| $(LDNETLIB)|g' \ - src/Makefile.am || die - - eautoreconf -} - -src_configure() { - # By default it uses static linking. Avoid that, bug 252940 - econf \ - $(use_enable debug) \ - $(use_with pcapnav pcapnav-config /usr/bin/pcapnav-config) \ - $(use_with tcpdump tcpdump /usr/sbin/tcpdump) \ - --enable-dynamic-link \ - --enable-local-libopts \ - --enable-shared \ - --with-libdnet \ - --with-testnic2=lo \ - --with-testnic=lo -} - -src_test() { - if [[ ! ${EUID} -eq 0 ]]; then - ewarn "Some tests were disabled due to FEATURES=userpriv" - ewarn "To run all tests issue the following command as root:" - ewarn " # make -C ${S}/test" - emake -j1 -C test tcpprep - else - emake -j1 test || { - ewarn "Note that some tests require eth0 iface to be up." ; - die "self test failed - see ${S}/test/test.log" ; } - fi -} diff --git a/net-analyzer/tcpreplay/tcpreplay-4.4.3.ebuild b/net-analyzer/tcpreplay/tcpreplay-4.4.3.ebuild new file mode 100644 index 000000000000..98be0bac5446 --- /dev/null +++ b/net-analyzer/tcpreplay/tcpreplay-4.4.3.ebuild @@ -0,0 +1,86 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools flag-o-matic + +DESCRIPTION="Utilities for editing and replaying previously captured network traffic" +HOMEPAGE="http://tcpreplay.appneta.com/ https://github.com/appneta/tcpreplay" +if [[ ${PV} == *9999* ]] ; then + EGIT_REPO_URI="https://github.com/appneta/tcpreplay" + inherit git-r3 +else + SRC_URI="https://github.com/appneta/${PN}/releases/download/v${PV}/${P}.tar.xz" + KEYWORDS="amd64 ~arm ~sparc x86" +fi + +S="${WORKDIR}"/${P/_/-} + +LICENSE="BSD GPL-3" +SLOT="0" +IUSE="debug pcapnav +tcpdump" + +# libpcapnav for pcapnav-config +BDEPEND=" + net-libs/libpcapnav + >=sys-devel/autogen-5.18.4[libopts] +" +DEPEND=" + dev-libs/libdnet + >=net-libs/libpcap-0.9 + elibc_musl? ( sys-libs/fts-standalone ) + pcapnav? ( net-libs/libpcapnav ) + tcpdump? ( net-analyzer/tcpdump ) +" +RDEPEND="${DEPEND}" + +DOCS=( docs/{CHANGELOG,CREDIT,HACKING,TODO} ) + +PATCHES=( + "${FILESDIR}"/${PN}-4.3.0-enable-pcap_findalldevs.patch +) + +src_prepare() { + default + + sed -i \ + -e 's|#include <dnet.h>|#include <dnet/eth.h>|g' \ + src/common/sendpacket.c || die + sed -i \ + -e 's|@\([A-Z_]*\)@|$(\1)|g' \ + -e '/tcpliveplay_CFLAGS/s|$| $(LDNETINC)|g' \ + -e '/tcpliveplay_LDADD/s|$| $(LDNETLIB)|g' \ + src/Makefile.am || die + + eautoreconf +} + +src_configure() { + use elibc_musl && append-flags "-lfts" + # By default it uses static linking. Avoid that, bug #252940 + econf \ + $(use_enable debug) \ + $(use_with pcapnav pcapnav-config "${BROOT}"/usr/bin/pcapnav-config) \ + $(use_with tcpdump tcpdump "${ESYSROOT}"/usr/sbin/tcpdump) \ + --enable-dynamic-link \ + --enable-local-libopts \ + --enable-shared \ + --with-libdnet \ + --with-testnic2=lo \ + --with-testnic=lo +} + +src_test() { + if [[ ! ${EUID} -eq 0 ]] ; then + ewarn "Some tests were disabled due to FEATURES=userpriv" + ewarn "To run all tests issue the following command as root:" + ewarn " # make -C ${S}/test" + emake -j1 -C test tcpprep + else + emake -j1 test || { + ewarn "Note that some tests require eth0 iface to be up." + die "self test failed - see ${S}/test/test.log" + } + fi +} diff --git a/net-analyzer/tcpreplay/tcpreplay-4.4.4.ebuild b/net-analyzer/tcpreplay/tcpreplay-4.4.4.ebuild new file mode 100644 index 000000000000..98be0bac5446 --- /dev/null +++ b/net-analyzer/tcpreplay/tcpreplay-4.4.4.ebuild @@ -0,0 +1,86 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools flag-o-matic + +DESCRIPTION="Utilities for editing and replaying previously captured network traffic" +HOMEPAGE="http://tcpreplay.appneta.com/ https://github.com/appneta/tcpreplay" +if [[ ${PV} == *9999* ]] ; then + EGIT_REPO_URI="https://github.com/appneta/tcpreplay" + inherit git-r3 +else + SRC_URI="https://github.com/appneta/${PN}/releases/download/v${PV}/${P}.tar.xz" + KEYWORDS="amd64 ~arm ~sparc x86" +fi + +S="${WORKDIR}"/${P/_/-} + +LICENSE="BSD GPL-3" +SLOT="0" +IUSE="debug pcapnav +tcpdump" + +# libpcapnav for pcapnav-config +BDEPEND=" + net-libs/libpcapnav + >=sys-devel/autogen-5.18.4[libopts] +" +DEPEND=" + dev-libs/libdnet + >=net-libs/libpcap-0.9 + elibc_musl? ( sys-libs/fts-standalone ) + pcapnav? ( net-libs/libpcapnav ) + tcpdump? ( net-analyzer/tcpdump ) +" +RDEPEND="${DEPEND}" + +DOCS=( docs/{CHANGELOG,CREDIT,HACKING,TODO} ) + +PATCHES=( + "${FILESDIR}"/${PN}-4.3.0-enable-pcap_findalldevs.patch +) + +src_prepare() { + default + + sed -i \ + -e 's|#include <dnet.h>|#include <dnet/eth.h>|g' \ + src/common/sendpacket.c || die + sed -i \ + -e 's|@\([A-Z_]*\)@|$(\1)|g' \ + -e '/tcpliveplay_CFLAGS/s|$| $(LDNETINC)|g' \ + -e '/tcpliveplay_LDADD/s|$| $(LDNETLIB)|g' \ + src/Makefile.am || die + + eautoreconf +} + +src_configure() { + use elibc_musl && append-flags "-lfts" + # By default it uses static linking. Avoid that, bug #252940 + econf \ + $(use_enable debug) \ + $(use_with pcapnav pcapnav-config "${BROOT}"/usr/bin/pcapnav-config) \ + $(use_with tcpdump tcpdump "${ESYSROOT}"/usr/sbin/tcpdump) \ + --enable-dynamic-link \ + --enable-local-libopts \ + --enable-shared \ + --with-libdnet \ + --with-testnic2=lo \ + --with-testnic=lo +} + +src_test() { + if [[ ! ${EUID} -eq 0 ]] ; then + ewarn "Some tests were disabled due to FEATURES=userpriv" + ewarn "To run all tests issue the following command as root:" + ewarn " # make -C ${S}/test" + emake -j1 -C test tcpprep + else + emake -j1 test || { + ewarn "Note that some tests require eth0 iface to be up." + die "self test failed - see ${S}/test/test.log" + } + fi +} diff --git a/net-analyzer/tcpreplay/tcpreplay-9999.ebuild b/net-analyzer/tcpreplay/tcpreplay-9999.ebuild new file mode 100644 index 000000000000..28758be51d1b --- /dev/null +++ b/net-analyzer/tcpreplay/tcpreplay-9999.ebuild @@ -0,0 +1,86 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools flag-o-matic + +DESCRIPTION="Utilities for editing and replaying previously captured network traffic" +HOMEPAGE="http://tcpreplay.appneta.com/ https://github.com/appneta/tcpreplay" +if [[ ${PV} == *9999* ]] ; then + EGIT_REPO_URI="https://github.com/appneta/tcpreplay" + inherit git-r3 +else + SRC_URI="https://github.com/appneta/${PN}/releases/download/v${PV}/${P}.tar.xz" + KEYWORDS="~amd64 ~arm ~sparc ~x86" +fi + +S="${WORKDIR}"/${P/_/-} + +LICENSE="BSD GPL-3" +SLOT="0" +IUSE="debug pcapnav +tcpdump" + +# libpcapnav for pcapnav-config +BDEPEND=" + net-libs/libpcapnav + >=sys-devel/autogen-5.18.4[libopts] +" +DEPEND=" + dev-libs/libdnet + >=net-libs/libpcap-0.9 + elibc_musl? ( sys-libs/fts-standalone ) + pcapnav? ( net-libs/libpcapnav ) + tcpdump? ( net-analyzer/tcpdump ) +" +RDEPEND="${DEPEND}" + +DOCS=( docs/{CHANGELOG,CREDIT,HACKING,TODO} ) + +PATCHES=( + "${FILESDIR}"/${PN}-4.3.0-enable-pcap_findalldevs.patch +) + +src_prepare() { + default + + sed -i \ + -e 's|#include <dnet.h>|#include <dnet/eth.h>|g' \ + src/common/sendpacket.c || die + sed -i \ + -e 's|@\([A-Z_]*\)@|$(\1)|g' \ + -e '/tcpliveplay_CFLAGS/s|$| $(LDNETINC)|g' \ + -e '/tcpliveplay_LDADD/s|$| $(LDNETLIB)|g' \ + src/Makefile.am || die + + eautoreconf +} + +src_configure() { + use elibc_musl && append-flags "-lfts" + # By default it uses static linking. Avoid that, bug #252940 + econf \ + $(use_enable debug) \ + $(use_with pcapnav pcapnav-config "${BROOT}"/usr/bin/pcapnav-config) \ + $(use_with tcpdump tcpdump "${ESYSROOT}"/usr/sbin/tcpdump) \ + --enable-dynamic-link \ + --enable-local-libopts \ + --enable-shared \ + --with-libdnet \ + --with-testnic2=lo \ + --with-testnic=lo +} + +src_test() { + if [[ ! ${EUID} -eq 0 ]] ; then + ewarn "Some tests were disabled due to FEATURES=userpriv" + ewarn "To run all tests issue the following command as root:" + ewarn " # make -C ${S}/test" + emake -j1 -C test tcpprep + else + emake -j1 test || { + ewarn "Note that some tests require eth0 iface to be up." + die "self test failed - see ${S}/test/test.log" + } + fi +} diff --git a/net-analyzer/tcpreplay/tcpreplay-999999.ebuild b/net-analyzer/tcpreplay/tcpreplay-999999.ebuild deleted file mode 100644 index 9e2776949df2..000000000000 --- a/net-analyzer/tcpreplay/tcpreplay-999999.ebuild +++ /dev/null @@ -1,73 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit autotools flag-o-matic git-r3 - -DESCRIPTION="utilities for editing and replaying previously captured network traffic" -HOMEPAGE="http://tcpreplay.appneta.com/ https://github.com/appneta/tcpreplay" -LICENSE="BSD GPL-3" -EGIT_REPO_URI="https://github.com/appneta/tcpreplay" - -SLOT="0" -KEYWORDS="" -IUSE="debug pcapnav +tcpdump" - -DEPEND=" - >=sys-devel/autogen-5.18.4[libopts] - dev-libs/libdnet - >=net-libs/libpcap-0.9 - tcpdump? ( net-analyzer/tcpdump ) - pcapnav? ( net-libs/libpcapnav ) -" -RDEPEND="${DEPEND}" -DOCS=( - docs/{CHANGELOG,CREDIT,HACKING,TODO} -) -PATCHES=( - "${FILESDIR}"/${PN}-4.3.0-enable-pcap_findalldevs.patch -) - -S=${WORKDIR}/${P/_/-} - -src_prepare() { - default - - sed -i \ - -e 's|#include <dnet.h>|#include <dnet/eth.h>|g' \ - src/common/sendpacket.c || die - sed -i \ - -e 's|@\([A-Z_]*\)@|$(\1)|g' \ - -e '/tcpliveplay_CFLAGS/s|$| $(LDNETINC)|g' \ - -e '/tcpliveplay_LDADD/s|$| $(LDNETLIB)|g' \ - src/Makefile.am || die - - eautoreconf -} - -src_configure() { - # By default it uses static linking. Avoid that, bug 252940 - econf \ - $(use_enable debug) \ - $(use_with pcapnav pcapnav-config /usr/bin/pcapnav-config) \ - $(use_with tcpdump tcpdump /usr/sbin/tcpdump) \ - --disable-local-libopts \ - --enable-dynamic-link \ - --enable-shared \ - --with-libdnet \ - --with-testnic2=lo \ - --with-testnic=lo -} - -src_test() { - if [[ ! ${EUID} -eq 0 ]]; then - ewarn "Some tests will be disabled due to FEATURES=userpriv" - ewarn "To run all tests issue the following command as root:" - ewarn " # make -C ${S}/test" - emake -j1 -C test tcpprep - else - emake -j1 test || { - ewarn "Note that some tests require eth0 iface to be up." ; - die "self test failed - see ${S}/test/test.log" ; } - fi -} diff --git a/net-analyzer/tcpslice/Manifest b/net-analyzer/tcpslice/Manifest index 41ade7a38751..39cd37ea07e5 100644 --- a/net-analyzer/tcpslice/Manifest +++ b/net-analyzer/tcpslice/Manifest @@ -1,2 +1,4 @@ -DIST tcpslice_1.2a3-4.debian.tar.gz 5784 BLAKE2B c85beab03b494984d721ca64fb75ccb29746dee4184e4daecf2703e80f3b3d3e4330b911831960caa17d631a4760a21d17368cd7017e61c05766fd1f50c66e0e SHA512 43a0ad5811c84639be0c6d162ea92101e73240e9689e4b647ee060697382062ec0e22dcb951ca000e05bac829455b7aa37f8dd73c5b1dd87f55e6d61a8a9b59b -DIST tcpslice_1.2a3.orig.tar.gz 76879 BLAKE2B 38b20ef09c2c0fc2c956c421d131ce27748bea684bb459da13f0d29b008a4561b7f61381cfbdb9c1dbdf53478c55b412efa9af689d5425f7fbfc9f0ee32016d5 SHA512 04e12d592807022c78eb4941580ed103995680c69af885bb8f13828a12ec570f7fe93c34c1b20a01d3d99f445d5da17a1fcfbe25b2e3b41abe28304c034654c5 +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/files/tcpslice-1.2a_p3-exit.patch b/net-analyzer/tcpslice/files/tcpslice-1.2a_p3-exit.patch deleted file mode 100644 index befcfdc9defe..000000000000 --- a/net-analyzer/tcpslice/files/tcpslice-1.2a_p3-exit.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/util.c -+++ b/util.c -@@ -25,6 +25,7 @@ - #endif - - #include <sys/types.h> -+#include <stdlib.h> /* exit() */ - - #include <stdio.h> - #if __STDC__ diff --git a/net-analyzer/tcpslice/metadata.xml b/net-analyzer/tcpslice/metadata.xml index f932bb378f35..d2be3b66d6ab 100644 --- a/net-analyzer/tcpslice/metadata.xml +++ b/net-analyzer/tcpslice/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>netmon@gentoo.org</email> diff --git a/net-analyzer/tcpslice/tcpslice-1.2a_p3_p4.ebuild b/net-analyzer/tcpslice/tcpslice-1.2a_p3_p4.ebuild deleted file mode 100644 index e988b2260bdb..000000000000 --- a/net-analyzer/tcpslice/tcpslice-1.2a_p3_p4.ebuild +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit autotools flag-o-matic - -MY_P="${PN}_$(ver_cut 1).$(ver_cut 2-3)$(ver_cut 5)" - -DESCRIPTION="Extract and concatenate portions of pcap files" -HOMEPAGE="http://www.tcpdump.org/ https://github.com/the-tcpdump-group/tcpslice" -LICENSE="BSD" -SLOT="0" -SRC_URI=" - mirror://debian/pool/main/${PN:0:1}/${PN}/${MY_P}.orig.tar.gz - mirror://debian/pool/main/${PN:0:1}/${PN}/${MY_P}-$(ver_cut 7).debian.tar.gz -" -KEYWORDS="~amd64 ~ppc x86" - -RDEPEND=" - net-libs/libpcap -" -DEPEND=" - ${RDEPEND} -" -S=${WORKDIR}/${MY_P/_/-} - -src_prepare() { - eapply \ - "${WORKDIR}"/debian/patches/[0-]* \ - "${FILESDIR}"/${PN}-1.2a_p3-exit.patch - eapply_user - sed -i -e 's|ifndef lint|if 0|g' *.c || die - eautoconf -} - -src_install() { - dosbin tcpslice - doman tcpslice.1 - dodoc README -} diff --git a/net-analyzer/tcpslice/tcpslice-1.5.ebuild b/net-analyzer/tcpslice/tcpslice-1.5.ebuild new file mode 100644 index 000000000000..d6ef4a8164f7 --- /dev/null +++ b/net-analyzer/tcpslice/tcpslice-1.5.ebuild @@ -0,0 +1,21 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +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.gz + verify-sig? ( https://www.tcpdump.org/release/${P}.tar.gz.sig )" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~ppc x86" + +BDEPEND="verify-sig? ( sec-keys/openpgp-keys-tcpdump )" +RDEPEND="net-libs/libpcap" +DEPEND="${RDEPEND}" + +VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/tcpdump.asc" 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/files/tcpstat-1.5-_DEFAULT_SOURCE.patch b/net-analyzer/tcpstat/files/tcpstat-1.5-_DEFAULT_SOURCE.patch deleted file mode 100644 index e3e0df933d5c..000000000000 --- a/net-analyzer/tcpstat/files/tcpstat-1.5-_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 ] ) ;; - bsd/os*) ;; - freebsd*) ;; - sunos*) ;; diff --git a/net-analyzer/tcpstat/files/tcpstat-1.5-db.patch b/net-analyzer/tcpstat/files/tcpstat-1.5-db.patch deleted file mode 100644 index 88e668e1a4a5..000000000000 --- a/net-analyzer/tcpstat/files/tcpstat-1.5-db.patch +++ /dev/null @@ -1,165 +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 -@@ -147,34 +158,11 @@ - If you already have... then please rerun configure with the option - --with-pcap-lib=DIR - with "DIR" being where libpcap is found.]) - ]) - --dnl look for dbopen for tcpprof --TCPPROF="" --LD_TCPPROF="" --AC_CHECK_LIB(c, dbopen, [ TCPPROF=tcpprof ], [ -- AC_CHECK_LIB(db1, dbopen, [ -- TCPPROF=tcpprof -- LD_TCPPROF="-ldb1" -- AC_DEFINE(USE_DB1_LIBRARY, 1, [ Use the sleepycat DB library. ]) -- ], [ -- AC_MSG_WARN([ -- -- *** WARNING *** -- I couldn't locate the Berkeley DB library. The extra utility -- "tcpprof" will not be built. THIS IS OK!!! "tcpstat" will -- continue to be built as if this never happened. -- -- If you wish to use the extra "tcpprof" program, please install -- the Berkeley DB library from: -- ftp://ftp.cs.berkeley.edu/ucb/4bsd/db.tar.gz -- ]) -- ]) --]) - AC_SUBST(TCPPROF) --AC_SUBST(LD_TCPPROF) - AC_SUBST(MATHLIB) - - AC_CONFIG_FILES([ - Makefile - doc/Makefile ---- 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 -@@ -50,11 +50,11 @@ - if (c == ' ') return c; - if ((u_char)c > 0xa1 && SHOW_HIGH_BIT) return c; - 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; - char c; - - r = (u_char *)p; -@@ -90,11 +90,11 @@ - } - /* - * 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]; - struct bpf_program bpf_prog; - ---- 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 index 74c2baebb4ec..dce3f3be66c0 100644 --- a/net-analyzer/tcpstat/metadata.xml +++ b/net-analyzer/tcpstat/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>netmon@gentoo.org</email> diff --git a/net-analyzer/tcpstat/tcpstat-1.5-r3.ebuild b/net-analyzer/tcpstat/tcpstat-1.5-r3.ebuild deleted file mode 100644 index ce12a85db51b..000000000000 --- a/net-analyzer/tcpstat/tcpstat-1.5-r3.ebuild +++ /dev/null @@ -1,45 +0,0 @@ -# Copyright 1999-2020 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}.tar.gz" - -LICENSE="BSD-2" -SLOT="0" -KEYWORDS="amd64 ~ppc ppc64 sparc x86" -IUSE="ipv6" - -DEPEND=" - net-libs/libpcap -" -RDEPEND=" - ${DEPEND} -" -DOCS=( AUTHORS ChangeLog NEWS README doc/Tips_and_Tricks.txt ) -PATCHES=( - "${FILESDIR}"/${P}-db.patch - "${FILESDIR}"/${P}-_DEFAULT_SOURCE.patch -) - -src_prepare() { - default - 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/tcpstat/tcpstat-1.5_p8.ebuild b/net-analyzer/tcpstat/tcpstat-1.5_p8.ebuild index a7ffbe9723e3..6be8bb24a4b0 100644 --- a/net-analyzer/tcpstat/tcpstat-1.5_p8.ebuild +++ b/net-analyzer/tcpstat/tcpstat-1.5_p8.ebuild @@ -1,7 +1,8 @@ -# Copyright 1999-2020 Gentoo Authors +# 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" @@ -10,20 +11,22 @@ 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" +KEYWORDS="amd64 ~ppc ppc64 sparc x86" IUSE="ipv6" DEPEND=" net-libs/libpcap sys-libs/db:* " -RDEPEND=" - ${DEPEND} -" +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 @@ -31,7 +34,6 @@ PATCHES=( "${FILESDIR}"/${P}-off-by-one.patch "${FILESDIR}"/${P}-unused.patch ) -S=${WORKDIR}/${P/_p*} src_prepare() { eapply $( @@ -39,8 +41,8 @@ src_prepare() { do echo "${WORKDIR}"/debian/patches/${patch} done ) ${PATCHES[@]} - eapply_user + eapply_user eautoreconf } diff --git a/net-analyzer/tcptrace/Manifest b/net-analyzer/tcptrace/Manifest index 9d4cc81f6006..0c533e08f0ef 100644 --- a/net-analyzer/tcptrace/Manifest +++ b/net-analyzer/tcptrace/Manifest @@ -1,4 +1,2 @@ DIST tcptrace-6.6.7.tar.gz 3773308 BLAKE2B cae5816cb25c33f71c316d14de3c18ff26f0e7452375a962b88c4818ca7c43425e7298e788bd8cb43f2e22ac7dc9b89ed1921b7bd70d0e8befab3ee791453fb1 SHA512 3638770c342aea6c71aa556e758ed22e1fd44730f6c652cf82d3861eb1c31b186952c660071bd1df45020b80eaf9dd090a4ff58c979cc907eb8154dcb7b9b432 -DIST tcptrace_6.6.7-4.1.diff.gz 29161 BLAKE2B 83768d0a6f14525f20b484421181078a3cf7ac3adeada3cf02a7441530593632743c6e515dd8738f5a4692422d97f4eb718dda076a234489096a10defb97dd5f SHA512 2f6dfeb8e15faa0151bdbb18194587e51de040f63117eb1b469a826091d5c1e5eb41a306bdc94e89ce993d0d04ec31324e5f7eea0a1a52852e07ee80006b2087 -DIST tcptrace_6.6.7-5.debian.tar.xz 6236 BLAKE2B 21d35b625fdc7b94c29b2be595ac39488578f08c53e5dde98953bbebaa2d8d96de968b746dd107ea78365a77f1fe7aa5abfeb3aeef4473c9020587f93066000c SHA512 6265d0bfb25f256c8f356cda731c48f869fe3e9d9504ed6afd0e98a3c2caf5dbcff73373c338be111712713b9a501fae886bb06723796103bac4dec5d8fcfaf6 DIST tcptrace_6.6.7-6.debian.tar.xz 6056 BLAKE2B a46a8a8a8f804066486566bccd10e33dc372a1fc30f37f401913c2b3038cf917891472e93a509cac8bdd2928d473c3ce21d0c4048c96ae54967fc48780384221 SHA512 82eebc2e297130cbafab0bb1757402d8b210885320ded1cd9b7ff064248d145c93196820564d4d1d7f1b1f7391cc5f734a0e0bf6275ddcae106d0bd540e32b61 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/files/tcptrace-6.6.7-fix-build-clang16.patch b/net-analyzer/tcptrace/files/tcptrace-6.6.7-fix-build-clang16.patch new file mode 100644 index 000000000000..fa1fd322c83e --- /dev/null +++ b/net-analyzer/tcptrace/files/tcptrace-6.6.7-fix-build-clang16.patch @@ -0,0 +1,30 @@ +Bug: https://bugs.gentoo.org/897830 +--- a/compress.c ++++ b/compress.c +@@ -61,6 +61,8 @@ static char const GCC_UNUSED rcsid[] = + + #include "compress.h" + #include <sys/wait.h> ++#include <stdio.h> ++#include <stdio_ext.h> + + /* + * OK, this stuff is a little complicated. Here's why: +@@ -240,7 +242,7 @@ CompReopenFile( + /* erase the file buffer and reposition to the front */ + #ifdef HAVE_FPURGE + /* needed for NetBSD and FreeBSD (at least) */ +- fpurge(stdin); /* discard input buffer */ ++ __fpurge(stdin); /* discard input buffer */ + #else /* HAVE_FPURGE */ + fflush(stdin); /* discard input buffer */ + #endif /* HAVE_FPURGE */ +@@ -599,7 +601,7 @@ PipeHelper(void) + // read end of the pipe, fdpipe[0] + + #ifdef HAVE_FPURGE +- fpurge(stdin); // needed for NetBSD/FreeBSD ++ __fpurge(stdin); // needed for NetBSD/FreeBSD + #else + fflush(stdin); + #endif diff --git a/net-analyzer/tcptrace/metadata.xml b/net-analyzer/tcptrace/metadata.xml index 74c2baebb4ec..dce3f3be66c0 100644 --- a/net-analyzer/tcptrace/metadata.xml +++ b/net-analyzer/tcptrace/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>netmon@gentoo.org</email> diff --git a/net-analyzer/tcptrace/tcptrace-6.6.7_p4_p1.ebuild b/net-analyzer/tcptrace/tcptrace-6.6.7_p4_p1.ebuild deleted file mode 100644 index 9e42190df0b0..000000000000 --- a/net-analyzer/tcptrace/tcptrace-6.6.7_p4_p1.ebuild +++ /dev/null @@ -1,63 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit autotools eutils flag-o-matic versionator - -TT_DEB_MAJOR=$(get_version_component_range 4) -TT_DEB_MAJOR=${TT_DEB_MAJOR/p} -TT_DEB_MINOR=$(get_version_component_range 5) -TT_DEB_MINOR=${TT_DEB_MINOR/p} -TT_VER=$(get_version_component_range 1-3) - -DESCRIPTION="A Tool for analyzing network packet dumps" -HOMEPAGE="http://www.tcptrace.org/" -SRC_URI=" - http://www.tcptrace.org/download/${PN}-${TT_VER}.tar.gz - http://www.tcptrace.org/download/old/6.6/${PN}-${TT_VER}.tar.gz - mirror://debian/pool/main/t/${PN}/${PN}_${TT_VER}-${TT_DEB_MAJOR}.${TT_DEB_MINOR}.diff.gz -" - -SLOT="0" -LICENSE="GPL-2" -KEYWORDS="amd64 ~ppc ppc64 x86" - -DEPEND=" - net-libs/libpcap -" -RDEPEND=" - ${DEPEND} -" - -S=${WORKDIR}/${PN}-${TT_VER} - -src_prepare() { - eapply "${FILESDIR}"/${PN}-${TT_VER}-cross-compile.patch - eapply "${WORKDIR}"/${PN}_${TT_VER}-${TT_DEB_MAJOR}.${TT_DEB_MINOR}.diff - - eapply_user - - append-cppflags -D_DEFAULT_SOURCE - - eautoreconf -} - -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/tcptrace/tcptrace-6.6.7_p5.ebuild b/net-analyzer/tcptrace/tcptrace-6.6.7_p5.ebuild deleted file mode 100644 index acb7c415420a..000000000000 --- a/net-analyzer/tcptrace/tcptrace-6.6.7_p5.ebuild +++ /dev/null @@ -1,58 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit autotools - -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/6.6/${P/_p*}.tar.gz - mirror://debian/pool/main/t/${PN}/${PN}_${PV/_p*}-${PV/*_p}.debian.tar.xz -" - -SLOT="0" -LICENSE="GPL-2" -KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" - -DEPEND=" - net-libs/libpcap -" -RDEPEND=" - ${DEPEND} -" -PATCHES=( - "${FILESDIR}"/${P/_p*}-cross-compile.patch - "${FILESDIR}"/${P/_p*}-_DEFAULT_SOURCE.patch -) -S=${WORKDIR}/${P/_p*} - -src_prepare() { - default - - eapply \ - $(awk '{ print "'"${WORKDIR}"'/debian/patches/" $0; }' < "${WORKDIR}"/debian/patches/series) - - eautoreconf -} - -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/tcptrace/tcptrace-6.6.7_p6-r1.ebuild b/net-analyzer/tcptrace/tcptrace-6.6.7_p6-r1.ebuild new file mode 100644 index 000000000000..5453f2914699 --- /dev/null +++ b/net-analyzer/tcptrace/tcptrace-6.6.7_p6-r1.ebuild @@ -0,0 +1,72 @@ +# 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 +" + +SLOT="0" +LICENSE="GPL-2" +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 +) +S=${WORKDIR}/${P/_p*} + +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/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..c0cc55723524 --- /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/tcptrace/tcptrace-6.6.7_p6.ebuild b/net-analyzer/tcptrace/tcptrace-6.6.7_p6.ebuild index f08f5f8fd7de..fe3dd350d447 100644 --- a/net-analyzer/tcptrace/tcptrace-6.6.7_p6.ebuild +++ b/net-analyzer/tcptrace/tcptrace-6.6.7_p6.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -8,13 +8,13 @@ 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/6.6/${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 " SLOT="0" LICENSE="GPL-2" -KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" +KEYWORDS="amd64 ~ppc ppc64 x86" DEPEND=" net-libs/libpcap diff --git a/net-analyzer/tcptraceroute/metadata.xml b/net-analyzer/tcptraceroute/metadata.xml index 027df8340d8d..3be0eb6a1a60 100644 --- a/net-analyzer/tcptraceroute/metadata.xml +++ b/net-analyzer/tcptraceroute/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>netmon@gentoo.org</email> diff --git a/net-analyzer/tcptraceroute/tcptraceroute-1.5_beta7-r3.ebuild b/net-analyzer/tcptraceroute/tcptraceroute-1.5_beta7-r3.ebuild index bfb827e2b245..bb25e818fc32 100644 --- a/net-analyzer/tcptraceroute/tcptraceroute-1.5_beta7-r3.ebuild +++ b/net-analyzer/tcptraceroute/tcptraceroute-1.5_beta7-r3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -10,7 +10,7 @@ SRC_URI="https://github.com/mct/${PN}/archive/${P/_}.tar.gz -> ${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~loong ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux" DEPEND=" net-libs/libnet:1.1 diff --git a/net-analyzer/tcptrack/metadata.xml b/net-analyzer/tcptrack/metadata.xml index 74c2baebb4ec..dce3f3be66c0 100644 --- a/net-analyzer/tcptrack/metadata.xml +++ b/net-analyzer/tcptrack/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>netmon@gentoo.org</email> diff --git a/net-analyzer/tcptrack/tcptrack-1.4.2.ebuild b/net-analyzer/tcptrack/tcptrack-1.4.2.ebuild index 235ac5dff8d2..30fbb10604a6 100644 --- a/net-analyzer/tcptrack/tcptrack-1.4.2.ebuild +++ b/net-analyzer/tcptrack/tcptrack-1.4.2.ebuild @@ -1,8 +1,9 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 -inherit autotools eutils +EAPI=7 + +inherit autotools DESCRIPTION="Passive per-connection tcp bandwidth monitor" HOMEPAGE="http://www.rhythm.cx/~steve/devel/tcptrack/" @@ -12,17 +13,23 @@ LICENSE="LGPL-2.1" SLOT="0" KEYWORDS="~amd64 ~ppc x86" +BDEPEND="virtual/pkgconfig" DEPEND=" net-libs/libpcap sys-libs/ncurses " -RDEPEND=" - ${DEPEND} - virtual/pkgconfig -" +RDEPEND="${DEPEND}" + +PATCHES=( + "${FILESDIR}"/${P}-tinfo.patch +) src_prepare() { - epatch "${FILESDIR}"/${P}-tinfo.patch + default + sed -i src/Makefile.am -e 's| -Werror||g' || die + + mv configure.{in,ac} || die + eautoreconf } diff --git a/net-analyzer/telegraf/Manifest b/net-analyzer/telegraf/Manifest index 386914df5cbd..a6c34e66b3be 100644 --- a/net-analyzer/telegraf/Manifest +++ b/net-analyzer/telegraf/Manifest @@ -1,918 +1,4 @@ -DIST cloud.google.com%2Fgo%2F@v%2Fv0.26.0.mod 27 BLAKE2B 814b0fa8f12d5ce6171fa629b5a7eb34e0e882cc0c5430986896bb38c243e08dc83098f271227f4ba019e78f16dc97fbb381e833aff1819833d243b08add916b SHA512 5132f3438533427c0ab0fbb7a12112a7830ea9122662ed46019ff89c71d9cf80c02edc32dd5c892da572031b5a2cce100f2602fa6a19bea6be7c02781f701273 -DIST cloud.google.com%2Fgo%2F@v%2Fv0.34.0.mod 27 BLAKE2B 814b0fa8f12d5ce6171fa629b5a7eb34e0e882cc0c5430986896bb38c243e08dc83098f271227f4ba019e78f16dc97fbb381e833aff1819833d243b08add916b SHA512 5132f3438533427c0ab0fbb7a12112a7830ea9122662ed46019ff89c71d9cf80c02edc32dd5c892da572031b5a2cce100f2602fa6a19bea6be7c02781f701273 -DIST cloud.google.com%2Fgo%2F@v%2Fv0.37.4.mod 1006 BLAKE2B ed912b9fe91ee4e16f58b599232ea85bc1f994a290e8f514f6d053bad6312422c18e868b9d419079c63cd547781dcf82994b53af6ef10bb23fea05b66f55747f SHA512 8e12292cb0c83d0ea8d4227c27fdabaed182de6f42bc6a29bd53848c41c87754994dd50df282ff30ab78411d54a6667a371d84b620d1b02f3f953429e3c2e97b -DIST cloud.google.com%2Fgo%2F@v%2Fv0.37.4.zip 2717957 BLAKE2B d5de25820cbee7f89ca2fce9c721b59839c1d1c38023e5d0ae153423b3ffc6b5e344d978d5a5cd18f99f732b56946a779adf82b1074eb78a2feccbdbd9962739 SHA512 7bb51ac0b816eb709386e0116fdd2e7cd9f3e6dc55db7b0d2ea5e221b45647b05452da36839ef840c701d74fa0aabd71b92459944761b686aa91379f935ca5dc -DIST cloud.google.com%2Fgo%2F@v%2Fv0.38.0.mod 1006 BLAKE2B 9d321b9bad7e881795f0215828ca23ff5753b8ca9cbe64ca085bcd2f64d36d0d5bdd5c3e80eb64e19e067748b6b23eb7837827cede0e75a840ed1cfa2b00c1a8 SHA512 8aa90e6ce7d50af3db56c8a7abdd16822f6351cabb96e6b75ac0cdefa15bb4a2d402aa84e6212fec4d599ec6f13cb1891bb37f41200e6a05a27642375a89a959 -DIST cloud.google.com%2Fgo%2F@v%2Fv0.44.1.mod 1150 BLAKE2B dba381727351af838c47c0d81a0d842d3851dc4e4a6cce1fbea14ccef9dc21407dbe2749fcaf130df4211b083ddac015bc532f7285450e767064855cf729ecce SHA512 6a49609209f9d51e4851ed5c55a06b9451c0101de3bd92b7fa5b3662b2e85df4a667ad8068288773b9a85670c65fbba46f88c643aac290d1f65e2a44ef531409 -DIST cloud.google.com%2Fgo%2F@v%2Fv0.44.2.mod 1075 BLAKE2B 370ba9f085033653a0fe9d328aca613b7feb50eb9407e55ed583d7b9302fd844856c9a1a9dca69c67c360c0a7b49ebff6ebd22946fb83c6c7061b9b8c573e99e SHA512 a58f7bd34b5ba8affd021a2d34be64e49dab0d9bb893ad25e00bf5b50ff92c4762b6d9093134b483dff2573ad3c0ebb5f42808dfbe33081cef0e96dc5215074f -DIST cloud.google.com%2Fgo%2F@v%2Fv0.45.1.mod 998 BLAKE2B 8dc0e29275055b37db12138b6e30fb22a6ccd995b3c3566efbb616f799660cd7073bfee935e41a77f311a95d0ec40ef9b5e40673ff8e59c9c06e5cfa32675adb SHA512 ade24f2b10476b5e5eb42d6f471b73ccb7d8107e6a26c5b1fd38191dc7d4ffee31552088fa5854983c47a2c4868a13bfc22d7f92f834662c75f7c4c88e0274ea -DIST cloud.google.com%2Fgo%2F@v%2Fv0.46.3.mod 960 BLAKE2B 879529244d38fbecdaea27588031c2d0d82551d8173f7e41f004dae8356e2264259d80e66953e941aa856a9613ae82211ea8dc0b12f9188f65bdf54487052952 SHA512 cbe178d04fe28f9b7dd07b0317fd4404d805e80ceada4953ad47763bafa2f215f88464c1315261a902ebcc52145af09df4c96a341e42644d38526909fcef313c -DIST cloud.google.com%2Fgo%2F@v%2Fv0.50.0.mod 1129 BLAKE2B 975226b22ad0291e83a5e47d901c79ac5a7c684010972581dc15f9713154141f3d6dd7231407255240620e29cbfeb877f05f5b5d388100a70d381f8f54f7db5f SHA512 70400a50eedc5305fef765d38f0428f636f439195d09cbb283ee7779b8aba1f881f83d894acbc6ee90ff016358aa9b117c79557da15d10fc60264eb36ed3fe3c -DIST cloud.google.com%2Fgo%2F@v%2Fv0.52.0.mod 1226 BLAKE2B d0544ce288b6beec6b76bfd106924e8a9ad50913946ae7e8243dc3e61356363a361384ee6c827bb4040976d783b217ad1619be3a34cba533940ed4ecfce4be41 SHA512 104e7cd0eb1c4a3bccfca3feb31f1530973d4829d853ee30e8e03c2ef80ccef784bc0560342d31d8dcdc6d410fe8f64a302140e452fb77d96ea2b342bfb8b319 -DIST cloud.google.com%2Fgo%2F@v%2Fv0.53.0.mod 1149 BLAKE2B bc4e8c16d0c809b4f5d46d8b29112192ff51066e7df99242923eed643339599ca3d1180afe571c3e826d656d935ccc9ff1ba1b79701de859cc15364415bb35ae SHA512 de15381b36dd6691bf40592be83b4ae5b58fc92111a3ccb8cb4b540e1230dc0798d86c149884e8dfb6f93ec827447acdd7ccca2f2942c81aeafd1b035f5c482a -DIST cloud.google.com%2Fgo%2F@v%2Fv0.53.0.zip 1307858 BLAKE2B 3ab3610812c18a19c4fe0cf1b42f619456287a3daa2b59e098d819b22e84ff43954fc979ac75c9ebd056c0a0e3223c3b894bbac492fbbdc532a9ff66c9e5f326 SHA512 30b6212b23df18c2f3bfd53bafa9cd1d07d1efe37b1ff4c7c60b30d0e6da221866205d8fbb19960f6e04331d0996eee48330207385090a09bf4cb2b4740cdeb0 -DIST cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.0.1.mod 319 BLAKE2B 99d93b5a4dbd4c90f3e8dfb58e64ed41fdbb484f2348297a90c8dabe03b036ef6917c2c9fb7cc4795d0c8d25af10cefebff4c4bc1b2ebcdc876b6db8beae5eb8 SHA512 338a067f7ad15d8549da11ac146b65657923ae4fee3caf2eff888c104c0df0edcdf0d98f5be6a67a764aa39210d5cad811ebd9d604084a67049b753246fbf89a -DIST cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.3.0.mod 555 BLAKE2B 6707e248be1fa35970275388888eb7692f976a8fca6ddc7cf02e355f8d44264c7eef6d093d90c115670b7a3b495658b79e622c47d1c90b95684b8d32547d7342 SHA512 2df2dbf07037f027100f8beba6416c00fc115fcde2dce19ea4c0fe4a036e8f66f7ae278e9765d0fc80149a330e6dd90eee8e9a0c93aecfe16da65d02320aabd1 -DIST cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.4.0.mod 631 BLAKE2B f7d342f7b6a9e0cc3249d9133a5408e9738957c57cedb13a64bd54d638cf85a17902bade3b452660b5e8b6aa6dbd76e0e93f0b0e4f5711856916879049f28e13 SHA512 3de4d1cf52d35112353c8d7e76df9915e92ba8addcbcf4c72e6d24c677bb642ff0b1011fca4e17dd9d364a03443710f452effb51965d95fd1571358b9aed7039 -DIST cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.4.0.zip 389091 BLAKE2B f3210307d8bfacd200772cf72a2648a486bbe3f2c5d0f68665b820a78878f9695cc50cb5807048a0a4adb7ac00d4d0140b88ab1f474060a84dea2d5d300b29f6 SHA512 83fef26d7c72a4368a2876b21d7085b8addbb3984723f44339f9cdbb7155be725b28466c741b29cc0f4b586ed4f3f6dc16702e172274fb5bcfacbd323f573809 -DIST cloud.google.com%2Fgo%2Fdatastore%2F@v%2Fv1.0.0.mod 433 BLAKE2B b3d58e290d719434bd433ffda9572fb233171493c7b81bfe353d9b7730130d5dec365f4e93a136a25467851b5f26cb21be6be06486696f010ccff1fcea140662 SHA512 8082ab039764aa6abd6615b1cf3a1830f2813dd5b791a27b7f0ebf5fa1ee68fe040a5e12988e6c91ba5d032a0a6666d384d6eceff12165d394a75ba56b744382 -DIST cloud.google.com%2Fgo%2Fdatastore%2F@v%2Fv1.1.0.mod 566 BLAKE2B 93ded2035caa89bff7ac5a432c713751fa04791c513b9464c409524157c62d0ad19929a65126785a1d167c499fbca2289da6e6657ab182bf38234a4d2f380d72 SHA512 e7056a89df84a1027e2dcb4e15c6e89e0279d4a8bf5a45dad7778587bbd06f5f359c7addde5a5a62e0cb454032cc3ae0fc443477bf2adc3422cb0c38009f4e52 -DIST cloud.google.com%2Fgo%2Fdatastore%2F@v%2Fv1.1.0.zip 279892 BLAKE2B fd5e1c812d8f1205c9618fad851923013eb1451463e96b472ddb1b355dfab1abd41b469e49da0329687a3d7876578127a47fc91bc95efb2e6547570b8f2cb5c0 SHA512 08a1fad4b3a243f047da01abdeecd206c699f6cf5910c8bea430b478d383c8f0a49e54576a51277d292cac1bdfdf739702e67bb1c869e92a5a8b37e05c52c882 -DIST cloud.google.com%2Fgo%2Fpubsub%2F@v%2Fv1.0.1.mod 508 BLAKE2B 9915d1d1a768852b3f262784771c8fe2e7e176e61f7d77841f8d3adac571dc141e36c6455c19090cf00a98a7a5ef0c2c887424142e2ecad339f8105b1c30f91e SHA512 8a393b8614207c22c73a706ccc3e66a8a16d2f305ab95d8f70774f13d0bcb7396b0ac5095daa57ebb991225a1db08c3110f1e85c26dd72f3bbcaf73fea536d9c -DIST cloud.google.com%2Fgo%2Fpubsub%2F@v%2Fv1.1.0.mod 755 BLAKE2B 2a2aa8bcee45060e8a277379fabf5ce73a2c0a0abea8802c1bf152e31522b565b969ace4a49367048672908e55142c18b3c4ad60c7a468866ddf3316c722699a SHA512 2b2720ffcf11b02b3e12e794132f0d25e5e0afa08e4d617f9d4147d8bafbb6f00c8aa4c5776e039eba4ff5c8add0b4e73c8c928f4b155c5c386f09a4e06b765c -DIST cloud.google.com%2Fgo%2Fpubsub%2F@v%2Fv1.2.0.mod 858 BLAKE2B 7efdc0f9b152a5f49c07fb611f1807548f81f18f3a63b54d7f6d49a2f27c40941dc2c266e2abe0cddc60844ccb237bfbfd8afa3daa3f13c3a7ee34093e1a437d SHA512 de93e34151997c18f5d0211702ffbc19cfa1bbcd77fa6d194747e1094ffdefe7014a197f3a7c28fe99ae7677dce76e049566caeaba8a067bd4507dddeafc4f6a -DIST cloud.google.com%2Fgo%2Fpubsub%2F@v%2Fv1.2.0.zip 152250 BLAKE2B 9e438a05025f03dda5dde90c48e76278c8fe0773207f07c756d54968328d700ee072dd454a8f353f37a4f4d8aec4cdff489a666495cfd57d3eb166fe22ca8dc1 SHA512 7ccfa6a546c0126ef73fc347f065755b42c0c31dba868e0bc04b22b3d0ff42a2ffe8bb745f3452a3e0ffe68fac83808128b7922236cf0fab05c6d1caed6ddad4 -DIST cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.0.0.mod 374 BLAKE2B 4fef9f7da9f23e94efe43be0e279958715949a889c5d51e388f5b66ec9a7cdbf15a717c988883647032998facd71359ad1dcacebcf3334100144abbfa12dac03 SHA512 faf4a02a513ae4c23f931b8917e74a056c528b4267ef3b5b704949283910bfc5d41fdd7264b78d4fc1f6e5b370474a7c9933a2fad36bb5c872006def71f8ed0b -DIST cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.5.0.mod 953 BLAKE2B c520f4cc8fbb60561cfd33b1f70839691a3970669c34c0bc1ede45a31ea53624d9c4d2b16de25533d3121792739006faecc1086afd2539e2a1c7e9b37fc6bead SHA512 33dacd4dc65bf8a7ead2e660e6719beb7024b1603e47e705ee657cf3024e5ec06c44ba88dfd05192142ce880903e94f8dd628d059ddc357e6b42e395953a86ba -DIST cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.5.0.zip 401108 BLAKE2B 1f28d174c6a34504bb5cc6674866396a1b1e56b6fa3274996b90e66a7007cd20d677fdc1cedd2f9f3666eeba12939c37f0c8016b950e0350986d5c23d9662dd5 SHA512 6d31112652f152cf748ae57782a5aaa8764bb60797845b4da6a3012474f10376f3d9fdcb5d713b3be8bc9425937841d091914ac622abeaf8740fc7348842ea4f -DIST code.cloudfoundry.org%2Fclock%2F@v%2Fv1.0.0.mod 35 BLAKE2B a374b6f1818d60a76f412aed7675cb3802fe59123bbd2ece6e4191dec587f97d09f236a5ef5e3fb9b50aeb4ed30bd6a62a9f64b740944c8fdbe9124788e1e1ba SHA512 c011623b73573deb52215bad093cddfdf649a4ccb56c842f28697d22b07e3b88205fb7e4798c66d9e755ed311d1c8d89d698f96353c74eefda3db73588ed78c9 -DIST code.cloudfoundry.org%2Fclock%2F@v%2Fv1.0.0.zip 12902 BLAKE2B 6a8f34c9b4bb573a937690ee5aafab39e501876deebae7dbae4debfb522cc9fe3b28335f8b4109d6157f9341ea33bde6a544856e0751ba7c3728a51261ec6c55 SHA512 113af489ab5608be1ffa9c5ed4b32470be7e066d25d7eb0f97caa12f950c3094d19eb22fc75fe379a81a1b551d3edfd900a91685f0f163524b8fefd5a7fb13c9 -DIST collectd.org%2F@v%2Fv0.3.0.mod 20 BLAKE2B 7b96a22f921fe63455011f7665f2a9d857a574a9ec0f5045366dda86a1d2a9ef9a8afebe9c5640aa46fc8c06cc73769b13263aea16537ac63a938fb8df70833e SHA512 f214d1a62a9cbf57ab751b12c01e522933dc85f766efaa3d01f15730bc36c08bb3fd01bc3305d883d204f55871eb7996978b7bf8d4a43d2c1675c677d4179b06 -DIST collectd.org%2F@v%2Fv0.3.0.zip 56106 BLAKE2B bd6a89a8301e1d43076be3fb190a9ad53516bafc65bedae931b6d55505dec5daaa683b625d108b5a72c7fcc455c87efe1045484bc7895f2809ba085505ef0304 SHA512 658875ff38947b9f858640b9b87baccae062361423dd65169e026e5c02f1d7e76e5f76a571115675f0befc892f7536909f1956eb7f7b969c650c885aaa0ab647 -DIST dmitri.shuralyov.com%2Fgpu%2Fmtl%2F@v%2Fv0.0.0-20190408044501-666a987793e9.mod 36 BLAKE2B b430ef9388b0dfe932b201495a00275a6036338c99160d7362556be1e25924584b0802061d193533f23b1f76719dfd6a9484572babd25f1af0e53fd9bf07ac00 SHA512 196affe091247f94ceda4b56629bd62d4ee2b397f2c0f56c9534c02e43531b46705ad33543b58c1a4fc7a48e25e5923db087fe0485a93966a4086581c0d1d3e1 -DIST github.com%2F!azure%2Fazure-amqp-common-go%2Fv3%2F@v%2Fv3.0.0.mod 372 BLAKE2B 80a7e0aac984acb79239b3309290cd8ef1eeca8d9f53b3c91628cbe6dd112706d2313c47e33ac52ea9e8a6417289dacae8e2e72a03e679836d3ed89cb86c0aee SHA512 6db1a52bbab1332ab7e761532cb110394afa1dd69cc5f7443c3fb733c7d95fa712cf6bf8a78fc3f51d89b2d368a248e532bab06bc93e2e663b8f836c91aef0de -DIST github.com%2F!azure%2Fazure-amqp-common-go%2Fv3%2F@v%2Fv3.0.0.zip 29788 BLAKE2B c1e493471bca24ac64c8119e624ea077a74678a492b036deb907ede12b5e93c3ef699820cb2ec9468a98d00e83d84c6bb45cf274b4812a0f319a0248610a4d2c SHA512 a412fbe597ab0c47223d733303ed2277656fe35866f52e4ed1f25cc03b691f15f5592cb07b3c5fb39d4cb98c6d73dbc8e1e7869cea17241a33dfc29db0a1d121 -DIST github.com%2F!azure%2Fazure-event-hubs-go%2Fv3%2F@v%2Fv3.2.0.mod 916 BLAKE2B 706d8ae3aba8be1db525274437ac3c67bfc63949c548c336eb473d909ca44750cf29da839b724ba57b27982c83d06b2f801a41978c8b137e5c02cf7dd764849f SHA512 bea86b9d3f77af63d77a191582926ad6f4cd5a6913601304e482be7ef9b1c6a527c4f51eaf004f441873c001fa7dbb57b1961ca7d461abd624dc5092ba852869 -DIST github.com%2F!azure%2Fazure-event-hubs-go%2Fv3%2F@v%2Fv3.2.0.zip 151900 BLAKE2B 9d5668903cea81e3e7c63e0f47333a998af1f9cede9349cc920aba19b0f07430b24432e7679f1907cb9c7ea4ee02c9a73fd46827bf10af45c064b2ac404f2e68 SHA512 da213b4ec5aa5c325e169cf2e7c6989ddcb4660c9b913e6631d9b368cc77446ca7169b85bcd3c7fa438bb6c5539beb0f2974083d33238bc73e669ef4f670f4be -DIST github.com%2F!azure%2Fazure-pipeline-go%2F@v%2Fv0.1.8.mod 42 BLAKE2B 918e7b776b2a84db7ceb26eb9a1938899e2fc3c982dec44c8930b016d5d922b0050f4d5fa7301e572785f5d47560575db94662e81a66a1bbfdf0303abdf6baae SHA512 e62709dae4886e56dbc610b8d2fd2e06940f2274d5b17c1802e2ae93ee6d95d153af4cbf7fc651a526bfb675d63c77ceb7246267a916f0511e07e0b13492c9ec -DIST github.com%2F!azure%2Fazure-pipeline-go%2F@v%2Fv0.1.9.mod 42 BLAKE2B 918e7b776b2a84db7ceb26eb9a1938899e2fc3c982dec44c8930b016d5d922b0050f4d5fa7301e572785f5d47560575db94662e81a66a1bbfdf0303abdf6baae SHA512 e62709dae4886e56dbc610b8d2fd2e06940f2274d5b17c1802e2ae93ee6d95d153af4cbf7fc651a526bfb675d63c77ceb7246267a916f0511e07e0b13492c9ec -DIST github.com%2F!azure%2Fazure-pipeline-go%2F@v%2Fv0.1.9.zip 20981 BLAKE2B 5bc94c957582e49eaef29e96b460a02306d3045c1e0ff7899f4b274ef1391deb27c4a1de512161d5e3407c3edd3c5dd19c95aedf44125b9c84ee066c770e31fe SHA512 3c51e4da5ce4939eb7b6ed12e2749060f40b6388045475e2a4133a0e6de9f71688114509e328d8129a95e5022d3f1bbca111fd498107a1e1414b8d50569f74b7 -DIST github.com%2F!azure%2Fazure-sdk-for-go%2F@v%2Fv37.1.0+incompatible.mod 41 BLAKE2B de145bd0fb63d51b475e0f5d293b9957a170a7c7c206f1cf2d8eb9abdb67a80051b25116b68c5f450bcc8163bb942d34d9bd4ed0b41f4e06d0d510d9b1aeff55 SHA512 be976846ed78cec5b19618c7364c47e66c3475519bed166ad1e6b666399ea08028fa621869ab4980981fc70256acc9a7dd1c1e52c8d3d44cb0ac75f9907b6d3e -DIST github.com%2F!azure%2Fazure-sdk-for-go%2F@v%2Fv37.1.0+incompatible.zip 31945637 BLAKE2B 88c8cbb805b85e39cbd230a85cacdd69d9d9e6f2fd472e576b4c89101b29b9fc4bdab6fc2beb02c6b51cbd5cf154e3a2a4381af8678efabfa8ca6075b17a7b00 SHA512 85de16c81247e5a6368a2e9248f380451c052577efceba6737b075e69d0bd8904155166a290eda7c57a6c2d8c6fe9861ca4cdbed042bc836b953db56cce5b183 -DIST github.com%2F!azure%2Fazure-storage-blob-go%2F@v%2Fv0.6.0.mod 156 BLAKE2B 97a6041ffa2c182395876028eb5c4e2e206a2cfd70d98e3a6ced33add0437940714ad3f9b68015485febcf6f0482fadc68fa39b76151daf241f0a0fb974c4958 SHA512 6d34fbef427cefb280448fe1e33caef63991875e5a65d7f260fd517311720bb1922a683f6849bee67cfb06d9fcd3474f9ae58d93591e282761366f65fdcfd19d -DIST github.com%2F!azure%2Fazure-storage-queue-go%2F@v%2Fv0.0.0-20181215014128-6ed74e755687.mod 157 BLAKE2B 7e7bd5b913f4d5938cf4cdc8ba78d6fe48402a26be22e55027bdc3645c9be0e637143b64d1366f92277d12079b473fac82f2a552f39713d0339132e69bf12e4b SHA512 f32527e5450e5bb91b2c5ffc3df9c647f26651c6641e4b11186d04c0daa0a9cc780daac9a8b62279f9fdb3d52c41147392c96f53bb49d3d0b5d69f13a188ea59 -DIST github.com%2F!azure%2Fazure-storage-queue-go%2F@v%2Fv0.0.0-20181215014128-6ed74e755687.zip 90829 BLAKE2B c67c4d750ffa0cb9e48a7cd57f5c13d2d03b1cfbc3a4420548655bf939e180a7184433187eaae83c55f687d0e08fd72115f9a3618dfbea5ce4568f52c397b2ba SHA512 f4cb196b16dfe2b492fe428dc6e5d701d41c587fad592e66fb059ebca1992ada22d350af192ef28ae3a5a1abf0c705df97a5c0923caa154230e24e0ed5a6b317 -DIST github.com%2F!azure%2Fgo-amqp%2F@v%2Fv0.12.6.mod 154 BLAKE2B c0e49a0b41ded8b417acf12a7f23f0f1ac5de4b0e61f47847a7cfc9dc67487c8964e902207bdb07b011077db144abea07ebd3472774515bbee4121a8d1cfff62 SHA512 07acb7ce7c6070a744ff3120705ab69de9d190a2d0174058e9aac2e534f4500a2a2cb79a3973f0e0ceaa712f9369295861bc77c9456662bf002c301ab6471a67 -DIST github.com%2F!azure%2Fgo-amqp%2F@v%2Fv0.12.6.zip 604954 BLAKE2B a0c7fd40df764e8211c219f8bce5385e46ebb34ee4c547b8902961a772fe0d2843e7c67788a6d6053805a8ab57f8373e5340c3a45b4689328b4c3586d5b74d11 SHA512 ebe0dbdddf9996a736d1d9c4b87bd8c201dd6735e256c28c93302e2a243d23762e5433d57682100abd3f5bbd7d7b4e576425847186a795a0d685989af76d542b -DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.9.0.mod 315 BLAKE2B 08bd66cb04b1bd32588ef1eb6059f3a2cd208a20a9ba12816e50fa39f6258d1e50ced24d78da3df80f9ebbf19db7a6c42d04fa1934eb66637ec612da86704c6e SHA512 72bb5cdb3b87c148cf4b613f3976076ffa0f8406d0d85b92b8f0311ca260e643c7855a939292dd82c66a71d4c5a1419a90b13f886bd65c7138062c34eaeae0b8 -DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.9.3.mod 315 BLAKE2B 2f508451778b22bf72bb0e6b4479991dd1dda0b474ed3f09d4bebdfdde1628c780d70c9c0edc38fb91c6b7568eeb0db63e7c8500a908adf967370fe16682e24c SHA512 72629745cdd14c9c66a696700baecb37589b565862873cbdb9711545df08c7af659aeb4dc4725c7ef9c19af9889b9007935487530a87ff97267f98811b701924 -DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.9.3.zip 104877 BLAKE2B d266dc408ad799bb289293df8dfb2ccd6008b01dbbf0436e5b49ffe48da4cca98fff7759010750e63c9cd3c7ce8bbd89b1b1642e1a08c0b81d801ceb1d168ffe SHA512 a9622ef347ea7bb305a20121552e185c3854c901f3495a5eb48da7eb9cbe58fc1f63bed48f659cbfcff87fdae961dd4c214e9191cd89ec0303f502a26ef4fb1d -DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.5.0.mod 325 BLAKE2B 1ff6851c8e73b2a566cfafdc2ebd259478b39258f785040407cd853433312ef10e492da8dc0dc9cbd4a2d2470e2715ef5ba4c05100c35f5b0664c9b23879e721 SHA512 61c06f593c1759bb078042d461319db2f91afcbddf50186d09195021eab865159ca5c017eb078d354d7db590365846e401ec3f91a2cbbf753bc32d7111683bd2 -DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.8.0.mod 371 BLAKE2B cd0bcfc08f429e4c64a921f2df9a243f4198bea6fd7d80f74d9bab21f4d9891ba4a9c40ea3b389c9953c722b46a95d17e39f09e735e3c5850dc4565116fcfd16 SHA512 6c4daa23efdfe8ba8d2a9e31cbffade7636519c56af858f24c7ab154924fb5915c13030e5ce1aff2a7f23e99b0b48dc692744109fce7da66e77ab12fe45980c6 -DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.8.1.mod 371 BLAKE2B 778ec4567ccf1533e9815f0f855933c94c2a4aed6285f10815258c71a39fb706ed130db03c85f8b944b764978ae584f7cc675cdd3688e6a93961f4437bf3aca2 SHA512 02605c296a8277e72074a0b3049ef0ee87597b67ba8d1e008d17746ee2dfc2551e2517e60f972135d368b27b899452e1c768c3b13afb9315da48173733450fe7 -DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.8.1.zip 40585 BLAKE2B 7bdd1ba26f30ebe978e8c39dd6a87e4ff8aab8e4441f7cd799a2bc12213430833ca4730592961ee412d1effb4952c1a009ad8995fc8f2be5297c4e238ccc2585 SHA512 af8aa7d0db5399ce4828c9c8c5269d1a84a85dc6e0c0db060b7cbaa8838a32169fae59bc8fc608d57860b8bd47f537c4f53de53c311ae0c24d3fe1e69c60e9ea -DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fazure%2Fauth%2F@v%2Fv0.4.2.mod 324 BLAKE2B 1098a558b4802839f636e6a0adafd495bd65ca95352ee1839d8a8708ef33fc17c6f0a112104ddee27d423b7af8676b92621b0a1e77b5324de8977b12df1d92de SHA512 bd16fa0408713689dead4e6ef5503a83489512de98535a55dc0662f626840bcae0373f19379ee0489c32531350383dbee7c645071c5d5e83552053be564d283a -DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fazure%2Fauth%2F@v%2Fv0.4.2.zip 16255 BLAKE2B 6d9edc54aacc44e5ffe433241f2e7353ca4f9eb38ca24be7bdca2cf2d0c0db51f011f0a401fa0f8115fe5857136d54a5e959e23eb412f5f8dba3efa875feaf09 SHA512 b659673f500abf7bc23531764165e86e5a17209cc59098b0cbbd8c2b44c8b63e3fc54c10cc4346fe94f2fa451b8c6054b8d9e974b857f7893238b806b066de61 -DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fazure%2Fcli%2F@v%2Fv0.3.1.mod 302 BLAKE2B c913350af2596f077dd70ccd71c3a50c3edcb8027eeb2a3a8e5f92636debdaec2bba056077fbeaa1a99ac1f7a52fa72072b61c0e89a588d324d60df80b19517f SHA512 09e11d4655a40002fff8472827035f1834881b689f84aaebcbe3a9795f94bb9ce8b281a6a5bd02fa0e310912822f2c3dee5da2fc794bc5c34cdc9afe1000e306 -DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fazure%2Fcli%2F@v%2Fv0.3.1.zip 10691 BLAKE2B a9aaff2800f294e58b521be7d6aeeda192caff4ff2310c4feb581117ae8bf133ef9bcfa8c4219b275cf5edd021eb4e412632c2b0d2ae1b0691b58d4fe2baa47b SHA512 76125df9d1ee4e858c0935c32cbc3e4b8992d52a9d1ffa558383e3b884b80ea2f1a50f5399d7ab0a440fc247f8522aa34d8d4c6284656c353eabcbaac412eeac -DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fdate%2F@v%2Fv0.1.0.mod 59 BLAKE2B 7816ef9919ec514b2eafce6a859edeae85735475da10c34c64ecaf9a53a07748b02a424bd0a16b0413c499a2eacea0fcd6ce7807b651acd9f67ecd00b5fe55ce SHA512 d5eb17738399f8b8e1a1be409ba5b24520b848b3be5fced46c726499f9df5bf5a54233c6c0c9b8fe896834bcf5132f39ba0b91bac0ce6347b9aef7c8bf93f912 -DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fdate%2F@v%2Fv0.2.0.mod 113 BLAKE2B 7822bd4ddff863c4fe4e3caf59e722121828f61b08d5504216e1fea40401108199708fb07d7cef2b9dd7ddc7ed7d8feb4e0c823b8a7962217881601107404ca2 SHA512 08860dbcc27a83f322c07cb64b9fb1dad3810f8a7dda4ad5914b3fb8dcdc14fd20640e5aa78ad5dbd220c6dd95b8c9ab6e15c4bd75dc476db743f1c5df1fac95 -DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fdate%2F@v%2Fv0.2.0.zip 18897 BLAKE2B 984f84c50aa5024a3eb78369d669ad73e9b6a7ee6bc7a7ae95667d29706bbb7f6d1f06a8e8e98e037a1226ac9f9637e6072735a3d01b8467f3f21657ccbf7929 SHA512 3eb5646b62d06c1d610de05889dc4533e0bfe1ee5de2fd9feda4f4dea0606ddc7c667a41c73687460ab1f28f4fb17ea9b3f79b5c93ad6c4aaac6b0b9f15cd8ce -DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.1.0.mod 60 BLAKE2B b5b6b8c4b80b9fb33bdabf18d6d34357cb207329df96da5fa36f85c18a62135da9d1550acc17eda531ec3fbf225781c5f9fa8f8c4a50730a8bda95e9fd567fe9 SHA512 98a8b2ccac214ef2a701c0bca2bb3512acdab19294d516ae6c8fe028d87393b055aa2e589cb273704ea4f612a1c949194014394aeb7d8ecd92233401e6ca35a6 -DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.2.0.mod 60 BLAKE2B b5b6b8c4b80b9fb33bdabf18d6d34357cb207329df96da5fa36f85c18a62135da9d1550acc17eda531ec3fbf225781c5f9fa8f8c4a50730a8bda95e9fd567fe9 SHA512 98a8b2ccac214ef2a701c0bca2bb3512acdab19294d516ae6c8fe028d87393b055aa2e589cb273704ea4f612a1c949194014394aeb7d8ecd92233401e6ca35a6 -DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.3.0.mod 114 BLAKE2B fec15aa5a362d73dbe839818a965fbf0a0183e7de3fa5b739739e7dcac4e88ae037848ccd7e6a35a4f6c3d7bc26988e0e1219ef6a3527c2533598777a0e5fdd2 SHA512 a119491d5a5b513a2ec0d0f5960ce04d03c263842f35a86a3efcb3931b5fefd19ef74df546e4b79ec119fb20dfa62d0f251c7812f144bc8258bf3acd902b693e -DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.3.0.zip 9849 BLAKE2B 710903822f31a6678941a4489984af5b5cb7a82a97476a642fbe35061d4df496ce79159a82e4e7871fb9dfdbc3cead15416d29ac8d293165bfeb29b4c973c546 SHA512 1529a7855dce3307332e12e3b717b8c6ed9c274637e357007801df890332304f88f7aa159da3bc3685701f49edd78cbd10895131daea9c6c034d7619d21847a5 -DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fto%2F@v%2Fv0.3.0.mod 111 BLAKE2B c5ae8e34a416406d265d2cacc6ebaf2e3f801eb0338d488eb413da396159a70b217309e4d560f1d50d173e3c717c7248f8969ba6da948bb86cba04ae0e30f32e SHA512 e3af601d732c07f5e995c21ea484fc2087aa693afacd77df8e9c1abf687c1476e41b50cd5178d07585672f0ef52cf454879ed13bd1a1ab6611428a320b73ea9d -DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fto%2F@v%2Fv0.3.0.zip 8761 BLAKE2B bff49ea7cc3b504f9d69bd3d06184ec123cd5d6f9d25368dbf194114925f343bd7f40874933a64e9ad16c6c887cb02df9764a502bc4b2114528a003c993bac7d SHA512 5d9abd4b8468b2ffb9feb70c9a87d2ca57dad721053759c016ba61034a05b72b5d5539a2def3b7f0dfe0f6caec415b0c5a5ff5a8e329554bbae4d85d61c8bef9 -DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fvalidation%2F@v%2Fv0.2.0.mod 160 BLAKE2B 57c363c25bf42b884a85ac5a6f152745ba3138a2869041fb383de44432f6c38f39a8b11405ec9134a3e940d66d864d3686769686d81d7ce1e99c2dd22bec2cd1 SHA512 6fccb53dcdc93b44c1f2c071f09c27b0536f6ef071b6e96296c31b50e81eee3d4224e9d3e863f84c85fec70adb48f57324d363b735d4eb1ce5aa5709fd4889cf -DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fvalidation%2F@v%2Fv0.2.0.zip 16166 BLAKE2B 506805cb5cfc3a2d4aee18916c7a31ab5c58749335a5c8d4ff56a14fec30a1dd0659fa59602ac679b4cb893271b3424a13fe4bb3fecf5d6260a7cbb5099133a6 SHA512 e5270951b7410810a10dd0dfea3424174903bd9189420e0e7b96a4802f2e5a356bd105c2710595dcea0331566e1c207b1de0899d1bf3f56b3c9ac49de75f3698 -DIST github.com%2F!azure%2Fgo-autorest%2Flogger%2F@v%2Fv0.1.0.mod 52 BLAKE2B 83e3b09b165e45af373e2e62dc0b7799ac204794e1922b4134ebbeba4cf6cd9b6d883f6035624f2421e8ae613d071a2e281379ee4935e55b73540ad8104d79cd SHA512 ad433e42696f3b605cdb12c70438d3b1a4d4d52890cb28b8e76cb26bf1ae51f324e6dbe2043bd74bc9086efe743da65b8cbddd10618f4b59d27858e0898279d5 -DIST github.com%2F!azure%2Fgo-autorest%2Flogger%2F@v%2Fv0.1.0.zip 9362 BLAKE2B aef4f369994d869906ca45a1051cc706579525324b8fe2a5c98dd4d80d4181366ff7e3cbb08f3274762a6f2ab2259a2770fa11a9b088b07ff3abf1a241d01814 SHA512 f81a070b61e026440ddd9b29174fd1d59241eb32d1fb4a2202c38fe80022aaff07b389ed6d75eff27da9408a7832f74c51f3c53866774cd9125e83c9f258bb61 -DIST github.com%2F!azure%2Fgo-autorest%2Ftracing%2F@v%2Fv0.5.0.mod 53 BLAKE2B 6fab3fdcfa8f595bbd52845b0b4f7b0e47df93fc624820a661b38bff1d51e0a57c89b678e0cf271ac6575b6a77c48d3ca93d5307d6cad98b35f79f1142a27795 SHA512 b1f9bd825933cac8ecd5416f86748f26e5cde3fe87266e35ee794cd1f59ce0fa81c0e62169e838e70afa71b0680a89fd8f2beafb3c1411eceadf48a154a08f9d -DIST github.com%2F!azure%2Fgo-autorest%2Ftracing%2F@v%2Fv0.5.0.zip 6278 BLAKE2B 1c42d23c77848911af642fd38f79aab655056e731f015a62374a23cdaade84b53f61b80f65f9416bd4f0e4b72a0b42203b56d659d30a44bb244a6ed5ed1869eb SHA512 f1a334ef91dd9410c57efbeece2ebef6ea326485e790e47de67efc9495d3e252cd7e981bd9da3f94f2f7e35c1bad9a8d5153e671a9b81758ad0584883c916155 -DIST github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.mod 34 BLAKE2B ce54a247aef91043830bdf0603c8452ba38eceb1495af6e7a74c9119234a0dc5cd080cb25258c28f5e270acf91189a5ed33e361cbf17de2be5e37dadbda1d90d SHA512 320941bc3b7fb8bc595e6135cbc513a7583d129f0cd92508055291e141191066303cf75148e25198c21f6c6c539a790ea3210f3ecf5de6a2a03b70c753091146 -DIST github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.zip 56132 BLAKE2B 5edcfe991d7fc40094d637bae8d8d6f1f897ab3d3786ade2bb80287738103264520681ced8d30d2037253206c32d3f867f4d024a571cb9aad030ebc451e198eb SHA512 43ed64ae515738487e9b75a2290d0b2bc25e83c021a9f29b21487c37adbf34e74e1e7d3d5ec0dfe678c8396356f95c3993a5f5610d1791ff62056cd182a4272f -DIST github.com%2F!burnt!sushi%2Fxgb%2F@v%2Fv0.0.0-20160522181843-27f122750802.mod 33 BLAKE2B d234bf9be3dd919cb1f8d33750a24dca68c90fea110fd0ff62f0dba86d2ebbfc66d55fea62745b6383c5607bc91cfd78c9d2cf12df251397e85995c04707caa2 SHA512 dbfa64ac31b25fdbff12110c6f9815abfde65f281e40852e7165499a2cefb6656c74fe0b82f0f018304daa02b83b421e9c15654efabad39787c69c1b2996a79d -DIST github.com%2F!data!dog%2Fdatadog-go%2F@v%2Fv3.2.0+incompatible.mod 37 BLAKE2B 74a94066231395cbd85f1dbbb68408161ef74781c0c686746f97365dceb3ca69e3b924a86e6639b5e4cbcf64928fa21245e6828339105a779a86bc4f132a5bf5 SHA512 da3a3499834784b7ace8158659956206fdb113000fdc84d54b6525805727e37029bdcf263afcbabe724d8b10f6601f1f38a985e6ac10fd0466907ae56da3edd7 -DIST github.com%2F!mellanox%2Frdmamap%2F@v%2Fv0.0.0-20191106181932-7c3c4763a6ee.mod 35 BLAKE2B f176b5e1afe36af20540d41478e06cb2fcabc05229e40b5f148014b13979b2aa9d3b3c93e47aee0a9c1639fbc6509915e088d30f3cf9b538ed642dbb9de9574a SHA512 254332e67d18e8bc6b0738be666ea8ba83a90c9cb548376c423e211e4990e2021348c0ffced6175c904925e26d4d5eb558108e1d309249118d76a65c625b6d3b -DIST github.com%2F!mellanox%2Frdmamap%2F@v%2Fv0.0.0-20191106181932-7c3c4763a6ee.zip 9545 BLAKE2B a76b9d9ea0f5159008f8237a574f3997cb999e1d08507db23718cbbb621fdd07f1a3af2be1a66fdf393bd4900fb1bd6d134b982adc391af5559c2f9deb2cf620 SHA512 18137e809bc8a88c62a059f786eeaac9dbff36264af7051d775fc619a9fa121103a04d75fa4daf87f1ecfc5c2fd44c523d648793c91da456b2afe3ba187c1ff0 -DIST github.com%2F!microsoft%2F!application!insights-!go%2F@v%2Fv0.4.2.mod 51 BLAKE2B e4f7bddbea5a2750e440c0fa3394f2ff01a44371ed90e4484206ad1d96aa37703b240b3a58f71a57159407997fca2b7e6f216956496e06a7e06cf34d22b3dd54 SHA512 bf9f21423bacb1b4dcff2c1d970e971645e3b52b916389de1339b80a9637fa2d4670c91f1fe71faea8fd78d995378c0eea8e0991ed3b30f00346c30ce26a4e36 -DIST github.com%2F!microsoft%2F!application!insights-!go%2F@v%2Fv0.4.2.zip 80193 BLAKE2B 44dd1077d02ff1ee47fd954a829e20e84ee50d7961487df7a29842ac4653a2e0acb709bf3034fdf7fac33c4ade2198ed4f49d747eae5c2bdf405912e62b66c1c SHA512 f82a1b2d969086491471d7439d71f239fc36c4052e20ea362299e5b83c0437073210e1125354ab8aef7cced259c1b7f22036a7b38c9d9efa44bb6a3d72802fc0 -DIST github.com%2F!microsoft%2Fgo-winio%2F@v%2Fv0.4.9.mod 37 BLAKE2B 21cbcf43ce9e4dc3485c260f4b20ae34fa1aa41676ccdc1f4bd28fdbd9402db8c1f77d4c644e5044a0f2cc44e06a6109791f6d6cc4620b32e1d2c36426df65a5 SHA512 752909cad98e7eafe9ff00951c27d955242d3d76c99c3e52427987f1c81720af76ad1da5e4d67e31bc192822b7de299edeb2077b248c0f070b6adfde4e9b8ec2 -DIST github.com%2F!microsoft%2Fgo-winio%2F@v%2Fv0.4.9.zip 101004 BLAKE2B a46eefbe7afa5af6af5acdae46f4c0033bd5f6c91cd89d2e263aa71a1b7e3609b71a72a2db21a1681433eee6dc6f3f5c120e6a22b9c2087f837962afa16869f8 SHA512 a7f5a2fb7509a301a81956c9852566732df85d3452d497da889598434625242c8b62360fdc2395cb5bf6c25f00fabb8fd6126b47769874c86eb479d24fd03424 -DIST github.com%2F!n!y!times%2Fgziphandler%2F@v%2Fv0.0.0-20170623195520-56545f4a5d46.mod 38 BLAKE2B 3f0ac051b31c84f5e98663c1e6245a4e2bde2be5c0be61ec80764d753bef5479251bbad3cedf6fb998d1a4a4e66a80beeafa6f3291ed45f46d643f7be109004a SHA512 aa1f503fe0c19002da21ae30df5393c15f2b2243ff415493420204d11032a562d5d40047705b1644d031523881dbbf284d3c56ce8106a2a969d2610504426762 -DIST github.com%2F!puerkito!bio%2Fpurell%2F@v%2Fv1.0.0.mod 37 BLAKE2B 9aad8d876b88c7c8976667747135ea2496c21542d029e879d80490e9d979923ac3060f65ddc443044db8eff2f92e2eed6b18682822f6b5706c5605d8de92ecbb SHA512 8382734877c9dc6a9c8a59b12d9735b6f971ea72ddeeb9985ea0cd0573820991a4b936baa1a643d38b694f1df7395d7b0d119f4f52be8d947f00adba96773989 -DIST github.com%2F!puerkito!bio%2Furlesc%2F@v%2Fv0.0.0-20160726150825-5bd2802263f2.mod 37 BLAKE2B 28c9393f5171487d23b732afcbb1d3d835d13d1a63b7e852fd3205925742fcf5a686c39b0600359e9052770360e9396f6bfe52a0000ecb51e3ed0a23611a2853 SHA512 a2b3211e3520fdef3d5c1991b5ad4b3745f4bb1b49be3afc5b1936c82b2a3058231b6cc17c63c85402cae0b80f037a70051d42738e89a708865e43dabf7b7b8a -DIST github.com%2F!shopify%2Fsarama%2F@v%2Fv1.19.0.mod 33 BLAKE2B 7013f44d03c22c21595c5369c52e1538a526891c9fc4cccac37373504f13c66d7c504552251f46632917739dfa1d6c3a15e15aec4dc03b9c69902b0bcfc8785c SHA512 db3271d8abd514934ce5d06fd20f7490db8368e57822a2379bbfd4ccb94e67354400d487d388a57467a5a16cec339cbae9488cecf82e41d85918639bedaa0a87 -DIST github.com%2F!shopify%2Fsarama%2F@v%2Fv1.24.1.mod 1188 BLAKE2B bd52cd2d49c856181228f7d2500d6457befd145e5f5e69d1ee4e939c07cd436d4e94b1d6d7ec2cf7f371683daa69f89e06afd70f3a7d8205141cc934b61a695d SHA512 7afc6074fc64dd861b1fed922c2a89b7b75fd35a3b6af51c073152aa4097782f47f6b2c986b9e92e55c30e7bbff68ac176d478a6b1743df6e54b68c3715e7c7b -DIST github.com%2F!shopify%2Fsarama%2F@v%2Fv1.24.1.zip 354212 BLAKE2B d04f32b81fa91096a54e672119fa1b88c557198af871ed0a9253b83aebe42665607953788f2fd8990247f31976ac6ecec19e6491b1c059477c00d7014ca6c736 SHA512 721dc8a6eb0475d0947b30b2b0b78362c5dbb86bcc339153de1d64a4d97feec86ddd8475387859c77c197f6a10a5c4f60a4268f66f9026fb42bcd05d13014ef4 -DIST github.com%2F!shopify%2Ftoxiproxy%2F@v%2Fv2.1.4+incompatible.mod 36 BLAKE2B af7b84d9f1cd163555b32bcf960b28b64a5689a1c9694f430af310f5041cd967fcf0d6c1a6c4020478544d347e4ba5b2fd16a6ef54258d33314ee0ad9239752c SHA512 917ada7ac198a013d2b090dfc59a45bd2619dcb7227df1521ca38a0d822fab12ea8c158c526257fef4ef506af29d9fa678e8dc2a73fc13c8dfeb57b398801744 -DIST github.com%2F!shopify%2Ftoxiproxy%2F@v%2Fv2.1.4+incompatible.zip 64188 BLAKE2B 8a83e77b1720a9c4d2004f8f8c14fbb8208687f54a5f4f09dda758c2516c0d907a5734c2a8d566b0461810899cc8e0877819612cd2d715220ac9da21d9cb4970 SHA512 89d7b18a1eda0e215851b894ed019d27cb302650ad12eb07edeb49e663ac0910be41a0e4281e1e9b7c1ff2948a74e174d47ae5dbd7956e946c7d3c72633d0a24 -DIST github.com%2F!stack!exchange%2Fwmi%2F@v%2Fv0.0.0-20180116203802-5d049714c4a6.mod 36 BLAKE2B e15c1ef74374320cc49b3509a1fa8d7f63c8566920ba56f8b6f293e3d331f5587d45b35284af52b40f329e116f570543a7df50ab1888c4238b28c2ea583d2fda SHA512 83f296ee872570bab84dc3e3f7984f155f5a9a4f95ca7b23a5f39dd47b54eb87ceb2eaa4db00a3966def5b41fb0250de18bcde32610c350206b6d0e744353fd7 -DIST github.com%2F!stack!exchange%2Fwmi%2F@v%2Fv0.0.0-20180116203802-5d049714c4a6.zip 14852 BLAKE2B 33a7c997772bc0ab89312c06940938a0e447b81d5613c95585ec3cf395189edaa92a8e9801649f91ebf9e65dad30af94725436d5849ca1277ec4126989d3b023 SHA512 55765137bbfcb45b4c9962044502458f1e7944487946604fbc7604d48b9b576c522b9316a99cb14dacc3c613c99ddb9c51f1a9cd92f4a729bdf76b834d7d2fba -DIST github.com%2Faerospike%2Faerospike-client-go%2F@v%2Fv1.27.0.mod 48 BLAKE2B 5828a106b0c2aac15695edb54a3f66353f1858e5ce038f95759bf1af87902a4d9be1de48f7b96893b25bb2651b79a8831010b777683e887ad2f7e93480ab135a SHA512 cf61a77ab7768d54a756f54dcb982ca5ef32d51de0e8ea3f632ff3b3c185bf3cd96ca4e1bb7b39b7334c3eb6f2a02a9017e6e92fa12a933e9516ab36f000653a -DIST github.com%2Faerospike%2Faerospike-client-go%2F@v%2Fv1.27.0.zip 392019 BLAKE2B a0cbe33b31d03338a585d5de09bd74db0dceb6424cf92a26c717b3cd8de1119ede7383168e9ef57760611c6d9e9bf35ced1289a13e07ea11822484b5bfe1127d SHA512 06839cb215200c90dfe29112d3b18b9d79fa50ba07bea4ea7c304f8784c966e22cf364bae9f511a14c42f1ed26a18664a3ceb55de99963b385dafea623d0ff4d -DIST github.com%2Fajstarks%2Fsvgo%2F@v%2Fv0.0.0-20180226025133-644b8db467af.mod 32 BLAKE2B b8647c299d1f9a1c4f8ade152cfcb58f73d4bba4b6803f7fed7e0584607c6da369f9f622e70c1a415af2f5f53cdd1c8de7f29a7843b3ce505821ff1ffacaaec7 SHA512 031c2c2f683d57f81b504c68d24aa328a8f03af7d3ab9021b0acffd541d9a295a80cc7b1c9051d19ba30caad619d3e454ec5b804f14e24e9e39b008ec27dfaf5 -DIST github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20160405071501-a0175ee3bccc.mod 38 BLAKE2B 2e1a897393e3527f0f82e6ab9baf62558d9cf54b56ada5d79aa1b206128de30395d9082bc600c4aa2a17e81095e429cc5874de95047854531cccc9ea0b867de7 SHA512 072ca7ba3d5ca815f58848db201002cc572d95334aeacfe44cb226505ad20d82ce06eb2ee059650912ae499db6291822c583296cb65a66e54adce62d6d850929 -DIST github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20190718012654-fb15b899a751.mod 38 BLAKE2B 2e1a897393e3527f0f82e6ab9baf62558d9cf54b56ada5d79aa1b206128de30395d9082bc600c4aa2a17e81095e429cc5874de95047854531cccc9ea0b867de7 SHA512 072ca7ba3d5ca815f58848db201002cc572d95334aeacfe44cb226505ad20d82ce06eb2ee059650912ae499db6291822c583296cb65a66e54adce62d6d850929 -DIST github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20151022065526-2efee857e7cf.mod 35 BLAKE2B 873b4b9c8491117a0b99bcc183ae96fc7e392c68d7271b73b5d7876574a5c7d67580425b35445ff2fff326c5cc7f328326d5d11946699c213cb2b84e8a9a0aad SHA512 7f23b8c5622c02b295646c7baf6f2ea3dd01e11e18ac9c263b853c7f771f5d098d8bcb75971f0cdc33d1c4765b563f3382ec5dc4bf20010065c3f1bc94e93175 -DIST github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20151022065526-2efee857e7cf.zip 5176 BLAKE2B 58fdc8010b4ee8363336ef720c8ef2d126c2b7dd79357ca4f99a1094957965544430420f6ae4155490f75242cd7a7cd20993a9ae15087ccdf33327c551caff59 SHA512 0dd4cbe03b224bfe68d00d121f758796f6e63b96eeee17261bc7d8f6ad1ef9878976b8eae5eadc2f6abee28670a83e6925596f4d35bea529fcd735772fc9a049 -DIST github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20190717042225-c3de453c63f4.mod 35 BLAKE2B 873b4b9c8491117a0b99bcc183ae96fc7e392c68d7271b73b5d7876574a5c7d67580425b35445ff2fff326c5cc7f328326d5d11946699c213cb2b84e8a9a0aad SHA512 7f23b8c5622c02b295646c7baf6f2ea3dd01e11e18ac9c263b853c7f771f5d098d8bcb75971f0cdc33d1c4765b563f3382ec5dc4bf20010065c3f1bc94e93175 -DIST github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20190717042225-c3de453c63f4.zip 5447 BLAKE2B 9b79de84354305adc2019db61eaa5f84daaf0ba088b1582776b4973d85fda9055264b14218a00ddaa3c23696f5c57574eecbd48c2c7dc4df84348bf5c507d559 SHA512 eb9b80bd07a9586681ccb20b48644c404ad326e65251571531776ffb51eed20dfc79cb34dba332dea2fb4aa1a766da2cbad597b59db3c7f770b56febe1956ed4 -DIST github.com%2Famir%2Fraidman%2F@v%2Fv0.0.0-20170415203553-1ccc43bfb9c9.mod 31 BLAKE2B f34b1de6c50a2bb56926abc95c5bfd54989e2822defa1535da9696d76acad9edbd0687f305c6cf75f317366ccac2f289fa06f14374b2d8856e56a7f08182f858 SHA512 55f45af957a2de583066331f2e4b6eb31e43bd430c4f603f55cbad6d40cdb1e4ac8cae4742602a39db11b918280dd5741cb83f1626e85a19981a0766d591e13b -DIST github.com%2Famir%2Fraidman%2F@v%2Fv0.0.0-20170415203553-1ccc43bfb9c9.zip 8446 BLAKE2B 410b8aa1eec03822941c6aa454cb41c6838434b8e31c783ec7a44815dbf7046289e486908a20ba20eea0712e4ccd46517a69aedd988e904c0fcedfc5d2141c91 SHA512 d0a6fe49a905aadeed8d4dd53ae87844ea28a93e82e60dce79a696a85064c58166846486458b8a530ce7ae84c214d51ed39ddc36d9b130fa1a2eda0e3c401395 -DIST github.com%2Fapache%2Fthrift%2F@v%2Fv0.12.0.mod 32 BLAKE2B f5b7273a6c32fd9eb6e4a8956477bac6cdc2a5415eb1dd5dfa5dbafb28f5f8d1cc477196a4c3347025d9c184bb68ab269f4622ae03a01516f5e9c67124a10776 SHA512 190c3c9b3fe9e247246976b3c916c2ff41da6cfc04091de1d050eb78badedb067d9e960c2295a17b167ceeaf27fa62d149b33a8794ff2bddacf93e9731660564 -DIST github.com%2Fapache%2Fthrift%2F@v%2Fv0.12.0.zip 4933055 BLAKE2B c132ece646d1e9bdd457de88deb477c83edc933f08888868c4abee379d8a9800f337f1dbe6a0f34ce8b68909246440396318869e676f028f0e67dd16b8e1f218 SHA512 372afb46e76060a7d5f84b553089eedc421ae6f1e498b3f8a817989ea9e0243ffc7dc871eff8a327d1b48a717ebcb52d2e649aad2ec5988267d0a653e5959747 -DIST github.com%2Faristanetworks%2Fglog%2F@v%2Fv0.0.0-20191112221043-67e8567f59f3.mod 38 BLAKE2B 340ce2bd43b73f4a9c535d862ac8e63db416cf5aa576a0369fdb77dea472df201a957a80f1e053cdb2b47d764fdbb3f18d490e1196201bdeb637d73bcbab680d SHA512 c340592915dfbc90e0381df14ff8e950957dad10311bbe92d21ecc694df05a1ac82d22af2dd60c803f077735eb3715f33070db9903d5b01c14e16a87706ae7d9 -DIST github.com%2Faristanetworks%2Fglog%2F@v%2Fv0.0.0-20191112221043-67e8567f59f3.zip 25053 BLAKE2B c01f42e623c5381bc2ef77f80af9ff4d8e1db2b02bf46858b4ef59dbe733a20ac31f4c58968c8df7dd3df6357f69cb0b147a83da1ba08d2d9327c0169de4c99b SHA512 239fcfdd02a7c2bac03326cd36e7ab6e882dd4a801bf93d6faa5c205f8d8e7f26ea1adecc7a93a113bfe20d2edc3632003ab2481cb7c37e70d0f5999af0e5be8 -DIST github.com%2Faristanetworks%2Fgoarista%2F@v%2Fv0.0.0-20190325233358-a123909ec740.mod 42 BLAKE2B 573840dc40bae4a50b2891e9c6876a0f09ccaf6e676f8c7b0d820708b01b59eb6940ba2516db2e507f535246f35d98bf0e902b3f440d0a00ce701171f7c60a66 SHA512 301530d5fdd867d20f6696927dbeb04e567ae9086a1f94c09b11685d60abf167e3b907925f1cd8a8bd7141dec6f81aafe0446634b5ffb06258ba466befc35cb9 -DIST github.com%2Faristanetworks%2Fgoarista%2F@v%2Fv0.0.0-20190325233358-a123909ec740.zip 602320 BLAKE2B ccd81cd4ec9a4a4d98f5c76af760988acb67804c91ab632a26be4e624496de49fd5754a0a3ee5158f6248bf90b4dc5cd9eebc8c84b1c237d2f57333c1d38c68d SHA512 9a4b20d21bd03a1deee31d98689531d64a9f15c115c6ff6787a9a47d0b42df37007a949f69c3d30ac42ce05d9e0681093156bb131b5fbf76144ed2d89fe90702 -DIST github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.0.0-20180917152333-f0300d1749da.mod 35 BLAKE2B 97d3ccde6ba4ad06a5344183f954cd6dfea580673607a6d54f1c0f3a643aee512bbe5fe7bdbc22629e6ffeb58f70422b9b80577d70fb58db9b03ababc0552ba5 SHA512 fe8dfbec1d09d7da5829af43760a4ddb5495b6a63eeb76fb3758aeb2fcf83d83ea443a15789d7042a0f5e637664babc9c388dbebc63ff7d35fb9545c7c7da991 -DIST github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.3.0.mod 753 BLAKE2B 5d81e99f1c39cafd4dd39f7202f71ea5fa3eba3f1c970e9c51e674e9aba8ce527034679105ed92843c7c69caec3770ef6fad38cc172df670f1643270300fb821 SHA512 8a04b0f60d9393afdc4b106413a1022e213509cadc222d592b8a98cc06188eda9ab8b7fdc346e8e70e15f40294ed41fe5510205d64ff40c427a6fbbcbd16f530 -DIST github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.3.0.zip 41294 BLAKE2B 740f787e7be4692fb250166dc036906694870d994466fba331c76ccd968b1f77cf7a0ad36bd7a1f60a38541b1f86a29075b547cad46f14747b486bcb7d5d1ede SHA512 3f287b66a1f9b4d87e51ffb8e7e59e8462b97af8b52263a9d02f5cf4ea9d2b9db6d74c0fea78d5d0ac4d45ee39097501539e3dd84f13c4342e0be8bba2692e6a -DIST github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.19.41.mod 109 BLAKE2B 70ae989bab9ef295dcf17e421481a371312fed6b07d1dd5e8892419c3dedea91dccd0aa0fc63fb728c24863b15ac24677261624ff16e75605678ceb39576b3d9 SHA512 89b17b1155f12c8a75fe85d815ef7724b96a009485b73e4df937990dbd6958b58cdaf8346610d5a614a3122450dcbea2687a510fba556b980d079cd3b1bee801 -DIST github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.19.41.zip 12367154 BLAKE2B 6a4ca20f774ac21aad2c50a994f8e02a79c7894d361049147e144b97803e95ec9a3de0f7fba06ad9d32d6b7f05fd57783322fd7250497cfe1dd28aeb8910bd45 SHA512 caf436572618f9c4192b31807859ed72f092d382951ff8e34a8c96c7b854afe6d1c868ae90db3a904d746946503e0474a9cde6888e1bbfea85126d21f7a598b3 -DIST github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.30.9.mod 217 BLAKE2B 37aad2fa34cfaa65bef0b9aeaf421a69fecaea85895b1c30b24c31335ec7ce59e989478c08b1241fb5344d4c5708e1fab48e3b14c090eafc051b20df429e2969 SHA512 ec22b59d6d5febbe206b6697008cbea27b5ae35ee89799b92d7f137e205b6b4a65d2ebcc4ee00d41eca181a09ef8411513fc0ad851a6fb23db80c589a4d5c49e -DIST github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.30.9.zip 15946941 BLAKE2B 2c3a6974c590028f3fa8be84cda950b108d687e5ca409f4c7ba94b9eda5f3a431b4fd7046d6f9708d721decedff301eacc0b8e67e4b8f6b5d754e132602c3923 SHA512 9fff780f1b36b92244ac96a330ed37d11ec9ee7d533a7f1e79f052b95c930b57ce67c714f03c3eda9111d80cc030a7d6d73948d4da203b4365dfa6d83912efba -DIST github.com%2Fbenbjohnson%2Fclock%2F@v%2Fv1.0.3.mod 45 BLAKE2B 57350526cf25f10ae2018fd72f9944dae239a72c2a44db02f0a7414d802cd03b48e58d3c63fea3cf02cffc26e6c7b334190b2f7a76b7e24ec50aaecdeba1a442 SHA512 d17d2e4a7184b75fde3ef47d7158c9913611ae55dc2e67ad2d0db87afaaf894d0eaf5f0f5b027e2d888c592735dec2d381c83c7992576eb164492e98b24b5f1d -DIST github.com%2Fbenbjohnson%2Fclock%2F@v%2Fv1.0.3.zip 7220 BLAKE2B 0a7e9be6781be8c5c8726ac7acdce2d55c4b6690c151954442577b7a10005329261b1bac7d0ec9e0b15dd712762ad81c9614d90e03f7d32541eb99de904c8e2d SHA512 acb1039ee94aedeaab9cb25b218a2b7953ba22352198260630a168b1341f1d04dff827142a968b039cc03295055d2528fda134c696573ec1bee02648915ab22c -DIST github.com%2Fbeorn7%2Fperks%2F@v%2Fv0.0.0-20180321164747-3a771d992973.mod 31 BLAKE2B f69b0989e51b0b649f81b044169fe4309f130eba5bcc6ff33aa9666b1b754aa0e524b8c7a627a91000ccc4f93bf93cdee3e97bd3b2184b050878bc3f413f0c72 SHA512 f21fd002853e4435421f8396e6be016f65be1537815c60d23940caf26e3f14dd6f2caac802cb64cd586b1b1f1220b2727de347b3d1816b8e741f68d87ebcf03f -DIST github.com%2Fbeorn7%2Fperks%2F@v%2Fv0.0.0-20180321164747-3a771d992973.zip 15013 BLAKE2B daecbcbb12a60a1423c4f419db44a0d63108fe622cf843593abb16fd75dcea703b3cf56f1c13433959eccbfb2a9bd5640f837f4be3296220366438dd7ed04f86 SHA512 44ccb3d6134742a80ac15830613c169d1b0d43e6ce40c2f2fdea07203bec134e1ba80dc57c6d14a007014ea141dca311b3ebe61b12d2181311665a9ffe83ca39 -DIST github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.0.mod 40 BLAKE2B ce42c81a7dcb03d21a99d6240ce12f8455297722513497b1a75f2c848b5fb7ef70b577c2406638442f16beedd68806de890a5c299cf1c008c439df23df2f5bb1 SHA512 ec4424da8e1e3849408da7bfe83d37e21ac75edb889de8ef63be897d59678679b018f4606be78500952e7eee73a6252ee6e477b1a1612e2d036dbf72c17b9c9b -DIST github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.1.mod 40 BLAKE2B 6cc86f2bceda8617678a251604b6c049cfdc80f9afcae0cead6b2cd04f90fe1b5d5d56d0c29f98fddd7f4ff6fb4a0f97c052193b153dbfc772cf6597d664c09d SHA512 d0c78b8f08d177e05148ce845f8d720fe79a193a420c12ce15504af8fa3dffc4d2fcebea8030f5cca90aff5775013e2252e0c289d4ed5094e07657ea97a79570 -DIST github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.1.zip 14678 BLAKE2B 6647c66a45f2dc67b83a1e493bc73d4439de7962f7f1472dc267be9a9408b5ddda66b8ee2fdadf18b2973648035fb3907fe539a8b7ccb768b8c99c4cae573eab SHA512 f973efba5ce7c651d9c3e4e467a1423b00b102034a054874d09977957b7b55557e05da06fb4c158e693db7bac01bf601f950cae0d411dc92afd0686d7e1de4cf -DIST github.com%2Fbitly%2Fgo-hostpool%2F@v%2Fv0.1.0.mod 89 BLAKE2B b68fd2c6a898a78e0ef4c6221cb03178392bc0ce452a41e9ac949323c23c9f936a808c458e635193354476fe1fd4590f423bd465b1362f423bf6bcfcf708bb9b SHA512 a8e8f81ee547936bad0ed6edc017302dc6cd21159d08d699f2d7d757ff5a202a0b91e860d941e1338d5e005f035bfc19c8f09304903f396e00508f7f468145fa -DIST github.com%2Fbitly%2Fgo-hostpool%2F@v%2Fv0.1.0.zip 10765 BLAKE2B 3d3551ddbfcc012b9750dbf1975b46e9858b6b2087e2cc61b44955b928983398c7817014e1451866df7039682debabcb5122a0b2954a7e813d51fc18a81b8c36 SHA512 0bcd62b9934cfc33e95fe1b3ddcbdc34ad8e1f25d48ec971c64b2c498ea59242e5350543915bdc47644db8e82adfe120669f04ce114bdffa33bcdba3d1c27d74 -DIST github.com%2Fbmizerany%2Fassert%2F@v%2Fv0.0.0-20160611221934-b7ed37b82869.mod 35 BLAKE2B 253b8f5c57339e04a68fcd945f25b655ae0d9b6a265fc3e02c9ab2a5cd0e41d68f5866e80aad321eda2e3fe0ae8b311ec0c4eb922d67e0c7f425ebff5d6dba69 SHA512 c19ab1ccc5297aae6bc7e3536b97091f3f877b1b76e5d93b89842e48ae3c9d4cf49a471ecf72ce6e2da001bd51ef3eb126a83bf5a35e50acc30a43db4d37c301 -DIST github.com%2Fbmizerany%2Fassert%2F@v%2Fv0.0.0-20160611221934-b7ed37b82869.zip 2791 BLAKE2B 1b30acfdb53d25ff60ec9041b3b07a54e8dc30b17c39328b0d93cba3ed86f9eba4ba2f8cc2d907910fe899cd9ac9061c53cacb7bade5695896d58ae71bd4c1a7 SHA512 808ca0f09864cb498234e6309ad017ec92b379068c407f1a9fc640dbbfbc9ff8b4f1b82db9dcccec294e8c70dc2df618203ce5ac1134abe70dc364d4458cd871 -DIST github.com%2Fcaio%2Fgo-tdigest%2F@v%2Fv2.3.0+incompatible.mod 34 BLAKE2B 59ba01f2586c2bc7378f8d741573d9b6a2146f099eb87fb7736f18ab816f81081fd31f29fe624c70992d60772da7673f6ff5e84176e2872b1beea20002567e17 SHA512 5e664a7410e09a648922fa41ae1e0f33837f1831915f4a9c76fa9a6a637e6057bc3df207dc136b53fb1123d05bff48e9f9229cd2021951cea62696536ad4c84b -DIST github.com%2Fcaio%2Fgo-tdigest%2F@v%2Fv2.3.0+incompatible.zip 30261 BLAKE2B 296354083ff0adce858bc7da36b61073531339087908b3a488a78efba12d3f991949aa4b91506a4f3b07960ca6dc1edd22027b3c7a1ce636cddad098d21f51ea SHA512 9e21ca32bbe3fd3dc3e0c2f613d1cf5235873c1dc87c03a52f84608f155bba3d6d5dc1bfad38bdd968c8532b9bd87cf874abfff436d6c8b18f14341bb4c0d7cf -DIST github.com%2Fcenkalti%2Fbackoff%2F@v%2Fv2.0.0+incompatible.mod 35 BLAKE2B 6b99dc9054d6616c7f66e1f0a76a11cadf095b8661aa92aaa97aaac4c2fd943a972f9947fa64167241747f633ca9f2a74e9ddd122dc39a083223912886e04b24 SHA512 b21cab6683819e3029097ac203e35963aa69e47c32cd88017f640f976da0fb64dae5a62d9c76f64868618be6df14603c9a72f24333d1639e654eedb5125421ab -DIST github.com%2Fcenkalti%2Fbackoff%2F@v%2Fv2.0.0+incompatible.zip 14233 BLAKE2B 8589421a47b476853bf26542617b5bd8137b2870ecf33364b807f9ae500947b58fa8aec5ceae61f2c33c2584a96f0c20313d3f32d6821d806400e826b883baa2 SHA512 fa80de459130188afc579edce2263f4ca928536e5d84a276583817809b841d4443cd9182bd95c8520a5fcdd9e33e3739fe84856b8db439bbce180028dd598b46 -DIST github.com%2Fcensus-instrumentation%2Fopencensus-proto%2F@v%2Fv0.2.1.mod 58 BLAKE2B d724c8e5ab039b227f3c437ba570398b789f53fe80db6f8e57fd2cb2199a5e7acef24d7451f9b27a4da464770660d31fc785c7165deafbc35009718851329fc6 SHA512 23d6171dbcf339c72fe25ab7a7e70cb385dffd654998824fac0f6b6464717873332d39fe1f96101414f5e2d240faaab0b960da2e31c08ef98443aa238bbf02d4 -DIST github.com%2Fcespare%2Fxxhash%2Fv2%2F@v%2Fv2.1.1.mod 45 BLAKE2B 350e937e3f7b254b5c590445a9a7f7cc908daa2a5f208e293ac414d50b46bd29671bb483e55daeedca41d70a42fdcc62ce17fffd9992a932e29153ab6ca1168e SHA512 c1b9f572957bc4ed1ad0c61d22b7b5d6a4c863df2aaeb4cf914e304af21d949c9cfc53dc8eb67aacdf3dd56f339ee6f4a1f5fa464121d9db79b7b3febfb3251b -DIST github.com%2Fcespare%2Fxxhash%2Fv2%2F@v%2Fv2.1.1.zip 12031 BLAKE2B 47bd92ee66282b671cdfea60969710e371540e79b3c1e2f510380e3dbbfe40ff76be23ab48f44855b1cbbbed7cdbfc4f1ea21bc4bd7a37716de7c27a7ef81329 SHA512 dc5efd476875fe3cfb3c5f5ce9314920bb2175be85fd1a4667faddee1b5360113b66bdc2f17e4fe889a7d104d684558744bdc6c56c8ac3afc585d7aad0114486 -DIST github.com%2Fchzyer%2Flogex%2F@v%2Fv1.1.10.mod 31 BLAKE2B 683f04ea11a77fcee27cfc84f41a1974ca6d61ee854dc77f072493358099ec03e94f01b5cd5cbb5ef69c856dc36790b660a3e90d7d520fd553e572f1b01a2304 SHA512 0e40cd7ff22a86cd23b49b509f5b5653f67e31ca67a07ab82743f56e5504f126cb2c11d88da644afbaf024dffa657560a420ec6d82f6b463452ad8a8bdb576d2 -DIST github.com%2Fchzyer%2Freadline%2F@v%2Fv0.0.0-20180603132655-2972be24d48e.mod 34 BLAKE2B b1e2e3052b202324b63ddd8e580c76da40ff0bdf1df2e9e2f3d7b2f5287d75469a544e1a586352130ce636bb08c9d4ca517f0fd49c892bc17365412cb791dcaa SHA512 c0d4f293bac15a26df2433bb909794b75ecbc5cb4ffdb33a8fbf3c8f421597780eb6bb036cfb11a8346ec959ceb8e36efa8ebb84d8ebbd606485735ba171f98d -DIST github.com%2Fchzyer%2Ftest%2F@v%2Fv0.0.0-20180213035817-a1ea475d72b1.mod 30 BLAKE2B 9ec507e8410331513ba11ed5432f95b9141e41125975204c2dcb50b5fbe6f7117430ed9b1b0df44fcb45843f75ca862070f85cb40a5c4f6a8d13c066d2d6741a SHA512 528f23910ca94ddf6f811331dc7ed615b2949b2cb04c630e4e2b0ba4a6dadac1396268c4c3251a77af25db3e94dc8b0a0a66d365a8d3feaa78f31192a40e2556 -DIST github.com%2Fcirconus-labs%2Fcirconus-gometrics%2F@v%2Fv2.3.1+incompatible.mod 51 BLAKE2B 3d0af1f8d7979de88067539579b73ce3d5d81a477ff042831692c738e9b4c99de13a3beb20fde003df06145e26d472621a2ff2857fd584aa1527df3730fc5efd SHA512 d1c83d2dbd4e242bfa9d8b9b58cddbd4a1ad112d1f5d1ca757fc31c6a31bf460d08cc3c9bf14c977fa74d2099ec83d5e45c05fd6121f800e26da6a837d862ccd -DIST github.com%2Fcirconus-labs%2Fcirconusllhist%2F@v%2Fv0.1.3.mod 47 BLAKE2B ef512f7530c4c3fc3319129afa2fdb655d40af9aca697d22e4470528cc41ef9dd5ffea2258792d0efc7e1e5de2de2fe760651df84c3d39989c4d96b58e85371c SHA512 027b177fb04d5bcfaa0e524e6682b639bd91f7aad9ba14e22cc1b4f352e2c3bcd4d93348ed013cd839eccdb01449db40170243e7895c2cfa3f6980279faf39e3 -DIST github.com%2Fcisco-ie%2Fnx-telemetry-proto%2F@v%2Fv0.0.0-20190531143454-82441e232cf6.mod 46 BLAKE2B 36de2ce4928f8b9c303bdccf81097b2c694dad10c8821bb9fef05677af26a3bb48cdc402d6844bf98896c256ad5dc0da2a78dcc6bb21cc57c27e23a07ce7b3cf SHA512 1a3ff1c3f7b66a9a3e27df4cb95d69f60eb06b56eb48d638367a68685499e340d5f1ae8822c1ef63832d44cac9a6c644357781c6f0eaf94598868d618ff69f0b -DIST github.com%2Fcisco-ie%2Fnx-telemetry-proto%2F@v%2Fv0.0.0-20190531143454-82441e232cf6.zip 18315 BLAKE2B 00b9877f8b81270a3825a617d276463534f2f1843f5aea33d8275a9177d69c282a6580842f78fd402534f20cdc44a5d36b092ddc32f7bbb7600afbc62ce8ba9a SHA512 feec8b8b430c34fc868746df88640baf4e44361bbfbffed40d426164de04d88f1290a88e616e80375d2ee7ffd4db6b185745c8d713ba7e5699011092987e8b3a -DIST github.com%2Fclient9%2Fmisspell%2F@v%2Fv0.3.4.mod 35 BLAKE2B 45d27e6bbd9255a355b6bd14ac839c7d87fabb393693a8b862ad974017af01309e5d36fa99d4925905c1617c0d90b5263b54cd95af2dbab186e293936dc86459 SHA512 ca8192c6321468b4332eb63c765a5798150dce9312873123b48d9ec67ebb4229cffc7b7e8054b8b0a6f45611f08130008031edf33da3468bb9a4ee9455fa02a5 -DIST github.com%2Fcncf%2Fudpa%2Fgo%2F@v%2Fv0.0.0-20191209042840-269d4d468f6f.mod 170 BLAKE2B 68adbd7d4176fc66228fa579cbbffb2239322158a9fe1226a106a2db6a7210cf9811ec30fbed4bd26e260906a214b9546d178cc1f6efef57866d378cda457166 SHA512 3877a1f5b47e6316c7a4d4e14959b355381eb3a32fb11270c646617b9908299d7dc806869d21b1fa6faca7a326f168dd1a268735cd1d532be2c318ddf9237014 -DIST github.com%2Fcockroachdb%2Fapd%2F@v%2Fv1.1.0.mod 34 BLAKE2B 21714162b9a8fd9c535eb49321b31d8c574339b2f548a64d4c224323f87e795b5412d502499e83917a1395dabcc9e2455f5e786ae2c3f204688d5c6ca402cdfc SHA512 58f3cc974ff4897b4f160dc47440241bc7084dd62f20c16c019b0c3090d3c8a8adb46ee8cab1afa675c9d3830cfb2eee97e1eb1315a683307d87ea3d2b403efa -DIST github.com%2Fcockroachdb%2Fapd%2F@v%2Fv1.1.0.zip 319838 BLAKE2B 3ee867c0230906ed6f30b32c00e20eff9a087e2b5524b862fd8d7dffbf8145a9511c2cb91e475e50b5415a87be9fd1944fc85019273be4f0b83d4d2dd4504ce6 SHA512 73dae30bad1f236d871b0e4420426a339427150e7bd9ac60f588131a09d267286ac22a9fa907d7c7c7f79bd5935de02666bab0f0c18b9ae7f711deeeaf9115c6 -DIST github.com%2Fcouchbase%2Fgo-couchbase%2F@v%2Fv0.0.0-20180501122049-16db1f1fe037.mod 41 BLAKE2B eff79f5b11fb7b901673496e804ebac23d62c9ff2ffb3bc13e0918a426ff63e3e55a9d8a7c795523979674df326918c2bb9570b766f148ae293055febaca3e3a SHA512 85c389e49a8b0c256f65f7854d06d7dbfc43888556b771b6dc524bf0fb7720a5aebb2b71f0661485ab552c3c48fa333fcefc76cc2ae5400df98029d3e9e9a6d2 -DIST github.com%2Fcouchbase%2Fgo-couchbase%2F@v%2Fv0.0.0-20180501122049-16db1f1fe037.zip 112284 BLAKE2B 11199dbef1f9ac363fa22c22c0ad46bc362efee2806e18084e604594b928a3077895b9d364b2142716b02e3e876a3946faa01ff037d6d72fbac90ce8c777c00a SHA512 b0534e800e2112224106771e4857c8a23bd64fd7b0a691c4b3e0831c61db6f2e4523a16430b36fb8d3306372b0437fe08fd18b51a978f31315f9ac6fc95e0d77 -DIST github.com%2Fcouchbase%2Fgomemcached%2F@v%2Fv0.0.0-20180502221210-0da75df14530.mod 40 BLAKE2B 3c5aee24aea9297a432e2103245e7fcd5addae31a7de3cd9d3025ad40f558063ee9ae5dd5fb5b9f547d593e1eb70e4e66fdcd714d2b7ddab65caf54486fcc353 SHA512 afa6a3cb03f5a277f6c448420b5ff87b84ca67ab28afb3f14ce62dcd2eb82b3108834f2af1354f0cb404465cf695bd1407e2ed1ce087f2d279ca7432ce00a1f1 -DIST github.com%2Fcouchbase%2Fgomemcached%2F@v%2Fv0.0.0-20180502221210-0da75df14530.zip 53503 BLAKE2B c61844fac73f7f217e814d7a6c7eb70471b99709fb7c43cb909462326f9774622cf789425714d07e9adc7bd0a3f38acf7900d1a7d82ef1ff7aac1d5534a06ec6 SHA512 d0f2265f1fdaa740de4e9fa744a8adb9c246817db075201417430f040c1f93b80aa9e895274de87e40b3aeb8decac6f382b8043b70a37cfef2e63a364feaa218 -DIST github.com%2Fcouchbase%2Fgoutils%2F@v%2Fv0.0.0-20180530154633-e865a1461c8a.mod 36 BLAKE2B 81955e18f8a1068b66b01bb462581d0eb7ff5008634a72f5182f9c4e6c6dc6f428cd59019027b69d1cf4541284ef3808ff0577a81217315072556ec27c68c426 SHA512 2380b55ac21e0893481a8d11da97c25c2aacf084a0e4bc9577c42f66ca28207e04ea1df11a02b83349eee80494a57e0e0a70be9c0bb415e1e493eadd56c7449a -DIST github.com%2Fcouchbase%2Fgoutils%2F@v%2Fv0.0.0-20180530154633-e865a1461c8a.zip 18099 BLAKE2B edff3ff3448f92cf65ce8ad3178dd5b12ef1ababac95237cbed2bc323e6469632e652fd96567d04a12ec024cba5566728cb67a15b7c59b3c67715db1cee65a11 SHA512 0268c6fbdfeadae4a8daffe8009abed3a5dde82ed3102bd7921bec714303963ca56a414bf8e96e8d29ff6ccdb13ed00b62b64e3139681164899f2e315fbecac9 -DIST github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv0.0.0-20151105211317-5215b55f46b2.mod 34 BLAKE2B 7e09c2779bf7a84a9271e31522ebbe600a1c11b107d651d91f58c8373e4336332a3a881f3e12b382543d75f20398af66085fcb3e780eed341e870e9c30f29267 SHA512 5e079462f7e0dff0efda71f580aa185700cfa936b718a19d0e2a8c63212e47a07022dca0c282832d48e5165aae8e82aeeeb2ac3664268f1148fc772010fb860e -DIST github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.0.mod 34 BLAKE2B 7e09c2779bf7a84a9271e31522ebbe600a1c11b107d651d91f58c8373e4336332a3a881f3e12b382543d75f20398af66085fcb3e780eed341e870e9c30f29267 SHA512 5e079462f7e0dff0efda71f580aa185700cfa936b718a19d0e2a8c63212e47a07022dca0c282832d48e5165aae8e82aeeeb2ac3664268f1148fc772010fb860e -DIST github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.mod 34 BLAKE2B 7e09c2779bf7a84a9271e31522ebbe600a1c11b107d651d91f58c8373e4336332a3a881f3e12b382543d75f20398af66085fcb3e780eed341e870e9c30f29267 SHA512 5e079462f7e0dff0efda71f580aa185700cfa936b718a19d0e2a8c63212e47a07022dca0c282832d48e5165aae8e82aeeeb2ac3664268f1148fc772010fb860e -DIST github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.zip 60320 BLAKE2B 86bdbc333e5c23ccf4f805945ca9f2aecc5c242d2ae824d20127eceaa2bf7bbab239ff2799572a2c8fa206166a36e97d5eccc8fc5021743d8ad32f39cd53b9eb SHA512 7b4e4df2fea731e23e05437f26f24e32b2e99028d685b72e3a726c1cb616ada4a77ca4fb9db4a6fae48178cc5172e724b74499bc776d63a9110cb97377d5edeb -DIST github.com%2Fdenisenkom%2Fgo-mssqldb%2F@v%2Fv0.0.0-20190707035753-2be1aa521ff4.mod 250 BLAKE2B 9471836a5e2d1c25d6cc99df4ed2c674f9fff051f66bdb45c8731a17a76846844efc28d90bfbbdcdc995f51b2ac50d29c935aec164d0eda50d626086edc34397 SHA512 43f9b5d4c71ae8b2cc1fe69f91d1caac0271a0b8095ea41b1e2dad811cad277d71de4c31da9bed0f5190f6831ae9493d4da40fdd6d47b4bcdce0ab180156c5c3 -DIST github.com%2Fdenisenkom%2Fgo-mssqldb%2F@v%2Fv0.0.0-20190707035753-2be1aa521ff4.zip 558314 BLAKE2B bcdc18b8bc54b9f5f55cc84c46f638a9535e91be2953607308aa0c9037fe0f8ab8b35390fc93049905e295bf2ab7ac04fa279df338ad31801b927790a19b6d58 SHA512 db0cbe25bd4a92042210e6f49f970f5de8b11950311a83922350d884a7f61dd4bef4986227250a1af9b235b0ee26fd2857033f0ec429a5cba4fc1b7d2c00e6cc -DIST github.com%2Fdevigned%2Ftab%2F@v%2Fv0.1.1.mod 40 BLAKE2B 3090a8e1737078a28e24c1a01f78a18ca2ab94c0cd297a9ab04f970ffe05a6db291561b893c345c1d4f023a0743adf0a769f58365251ec94e3925da9187aaf62 SHA512 de55ba427379e57d671a31a72b9295e8e7fbe3bc0b80d05e63ccd31c1fd7030e74fd39fb0347d87f10f19bed208df6317714b0d1028057fa40e633820d49a03a -DIST github.com%2Fdevigned%2Ftab%2F@v%2Fv0.1.1.zip 5629 BLAKE2B 4fc866fd2f2167df11e059bf3a04bc62c0ddbbc11c92b79d66b82083d97eef09592b55dd8d8546a5e0dd56a3d326badb4081e9d97d5f6eb3f2f9168deaa6589c SHA512 d4842f3039d8a747907de9ee6b44c44ccbf593499aaf38776442da41068b923762f34eda9188efab7b6a01451c9b1f8da3f195164fdfe069958e486bf9046376 -DIST github.com%2Fdgrijalva%2Fjwt-go%2F@v%2Fv3.2.0+incompatible.mod 35 BLAKE2B ae3ae89fc373221646f196cb2112e003afec9206977905007426d522c584b455fa207f105eaa35cc716fae74d605fcc2a88c0ab5b62e4025b7a739749410fbd9 SHA512 4d46c1b3280c5b4984d22e57b0541cc6762853c0f6cea19a7a5f392c23039e29ca616a4bd8f283c2a35c3c045ec54716f5000cb4f0f43f07f0464c12ed1369ec -DIST github.com%2Fdgrijalva%2Fjwt-go%2F@v%2Fv3.2.0+incompatible.zip 57069 BLAKE2B 2c921bf5a88bf293a4c86bbaed6d7c391a323cf3ac39a54ac10fb74da5498e0f565db5e5220a9871ad5c4dedad7eacc0657ad9f8907c2bfccf147384b53b37b9 SHA512 c937c8b98196eb8496735410324a6a845e618d47e4631c500c9def70d8effb27cfb4efb17f81a8d304ce1a9d27fa6fbcfdec11ea10355de3d1918f1ddeef81d2 -DIST github.com%2Fdimchansky%2Futfbom%2F@v%2Fv1.1.0.mod 35 BLAKE2B 4e9e86f0f7f18e47c80b9f4a0abff3f07d47814a9c54b297a2419265fd91b16c2780e170ded80589dac290cc3262aad162911b789510703d973f3f891d5e0849 SHA512 6a786a38aae43d8a7532621bac8c4c053624f39573a37bd66fef9048a7eff36ea55778ac8a4bf3d18cc1e6faf352dc2365e6f819053359df9ac98129e16f422f -DIST github.com%2Fdimchansky%2Futfbom%2F@v%2Fv1.1.0.zip 9787 BLAKE2B bf52b08f028e5117fe9cf9554ffcfbddec214b1dc972e8be2511b5571fa15cd433b3528ddf9c8805b3a71455a94f859d3aa90348e4648300121be269d2ad5f84 SHA512 83a35ee1aaa0aa34e86db32471f18c2ecee57c8962eacd44ce492a29cd9f630318411535d3474ad10c5ec5a5634caf619eae8a06e911c37c6e8fc8d022aebe3e -DIST github.com%2Fdocker%2Fdistribution%2F@v%2Fv2.6.0-rc.1.0.20170726174610-edc3ab29cdff+incompatible.mod 38 BLAKE2B cd95ca3c9baa32743ad6a0c2359dfb95eaa79009366a4019e5e1a4d3ded54090b005d307ef18942fe4de4027e7fe688e7ad046f226c77a3495e2ec579223a9ee SHA512 662e7810daa3242958f5ac7c71bccd25fc39ce814db684641cf69e96a5573dff638faff15aad77b7abddce767f4ddbfbd8a1bbb85a2aee5a0e80c96baa3f39a3 -DIST github.com%2Fdocker%2Fdistribution%2F@v%2Fv2.6.0-rc.1.0.20170726174610-edc3ab29cdff+incompatible.zip 670439 BLAKE2B 19d27f2608369a4564fb990c1cc7f59e92f229e6c793fd918bc53b63d30bf69de3034893c117e4fc100c3ac2019fba6d7027b0810c7c45a11c4a1c46a3924719 SHA512 c5e053079e297d5b7c8bbc147fa154291348e369393fa78de0c7c8f94f057ccd0dfff325cd275789026f33c56927c175bd1e8a2fec055cbdff2d8b74da917a0f -DIST github.com%2Fdocker%2Fdocker%2F@v%2Fv1.4.2-0.20180327123150-ed7b6428c133.mod 32 BLAKE2B 60d7bedad25f2503b81b09e753b7f5aac1ce61c5b128e08dbb42f73cb5f3748d376aafcd475cda1f50f97a88790992ec920d2309e8b3faf914640ebdf4b21404 SHA512 ac7ef0a0baf8fd96efb31c685f838842cecc51e9332cafefab138f16438fe00962e91b31e53d93214ff9d18558634d4b9bed4a0a9567e06646da2d2bd3e9c439 -DIST github.com%2Fdocker%2Fdocker%2F@v%2Fv1.4.2-0.20180327123150-ed7b6428c133.zip 3634964 BLAKE2B 7d7eece3901967215b739eda2730d745c7ec7a9e46961a9485fdd7bab14ba9975e7503d58d49e6a25be6e407a3c323cb529be5fe1b9bb3669d16846afa89d158 SHA512 aa7ea792558a2476cc0bf000208518ff7e6f4b2ee105c90c60a11044873ad1c345c59eb1c255a15188e88552002a2daa0faee11794deb75f4ac18f2991202027 -DIST github.com%2Fdocker%2Fgo-connections%2F@v%2Fv0.3.0.mod 40 BLAKE2B 13f8b46e2e71edb04180a1734d63e1e84dc75661ca635d150fd2bb8b1213df768520fc1c5cffa7a9cb224cb11788efc5242dd85138915fc21dfc9ff95b1d2737 SHA512 721f6b5cc358f8ee7093f7c80e4153ebc474f2052bdb3a91bf2a4ae9d2dbd2e2e50635a5bb8f9b62bd8ee7a0b7420ca9f18c60abcfd5287a953ea63d21aec53d -DIST github.com%2Fdocker%2Fgo-connections%2F@v%2Fv0.3.0.zip 42715 BLAKE2B d34249f3328c742dbedfd2620ca178ff29b909c31606fe7abff0eb9e04dfdd488bf51f4faf489061cf540fc765a5d0842ae3e0d9840894ebe8b4c6d8d7793847 SHA512 ca175bd5bcc7757538ad04b6953287f8c869d5c5ed2e4f930cb3104b7a96f73a34c656e85d1de054f2b982eb813bdf5b02cf7dd89c4824a25c8385add7778598 -DIST github.com%2Fdocker%2Fgo-units%2F@v%2Fv0.3.3.mod 34 BLAKE2B 37c07a43d4e36f25bb5bbc10a863a717fa114a5eb980f17942f5bc5b1d1a4f58de5301ce871ec5d41f5dae3f05edd7c03a5c9246317ebf089c1cff27d6634aa1 SHA512 53dd482245593fe74b94c319cf4f3079b47313a22aaa69ba023b9e60e8b5dc81177ecfac49e0cbd9b1eb6706f654f387301ceb00313f8cbe530b4dc24eaefe97 -DIST github.com%2Fdocker%2Fgo-units%2F@v%2Fv0.3.3.zip 13789 BLAKE2B 1961aff6de16c83f1a771b94965a6e5fc95a951033d93b576cb1567b008473b5fde0a12078179738a921ec88752621281a36137ee6719d4a1110ce072f450bb0 SHA512 66587313fba838dcea2a00bc81222924d1dbf77bfe47b7ed0443a071c249f14204b8e0765146f060009c8d840dc802ff701d6905a4c05b816ded9adbb0a0e981 -DIST github.com%2Fdocker%2Flibnetwork%2F@v%2Fv0.8.0-dev.2.0.20181012153825-d7b61745d166.mod 36 BLAKE2B 4b8cf468872414728e3cb5f49eff6ba10147cd8f2803b0cc415506dd82ce017facd77e78a9875d83f5c759de443a82545d5f447ac8351b4d74ca77892cb94f45 SHA512 abfe66b3242eed64b0a243bac35f2dc06faefb3b5c1dc27b60b150990a2e0c6527e359b0d4e1b48d05e6bcb5f1ef8f6f67e011691b57d4eb8b8a0208f6c8135a -DIST github.com%2Fdocker%2Flibnetwork%2F@v%2Fv0.8.0-dev.2.0.20181012153825-d7b61745d166.zip 797295 BLAKE2B 7e4ce1301e2d401201f569922c8d4f36fadaccedcbe40b8920751baf38b48cbe06edafd0c35dfeb4df7db33df11dba233bd35e7f2e8a6b49b37f3a57c6809b3e SHA512 224d91fa0b4a08c90ad3e8194c603ebce33707d40ef4769c71cb5fb141979b609d4e8639a62a634382361d7a311f438eeb12ac73523b1a238edaa7a0312d0343 -DIST github.com%2Fdocker%2Fspdystream%2F@v%2Fv0.0.0-20160310174837-449fdfce4d96.mod 36 BLAKE2B d46b14a3eed14f8d5886e333deada157d9484ad3bab124d3d57d9fd6a39242c2272417df8bb31e08361f2be8b11dda9e96600aa800879f393c8753330eac4e68 SHA512 7ffd6ce59d5c5fffc6ee8e8f48e1e7114628ee2631abbb1a3591b794c23b2ce6dab10f67b8b76bf82c73e1cd8614313b2bb1152b829a8875425f1a603ee394d4 -DIST github.com%2Feapache%2Fgo-resiliency%2F@v%2Fv1.1.0.mod 40 BLAKE2B 9300f3006801602e05416487e6021123ff345e36835b5f4841158bc87556afa086470218c3f2178d125baae065c1af3cb27e210a50173a5bc9a469c592758eb6 SHA512 fb616884898669f21d53576f0fb70c8babc38bb98da066a2cb77fa85ceab6bcc8775feea3d3bcec19ea3b25544c776b8d55ad82f8876da5d0ed5176768da735f -DIST github.com%2Feapache%2Fgo-resiliency%2F@v%2Fv1.1.0.zip 17986 BLAKE2B dd2bcaa3f080dc5ed1b1da8d1f2ab7573577e5dce76e23d323310419bb0e3128003715bb023c4c4533e8e3297b795b30a95801cc68129f19844f433026ff8433 SHA512 64d611c7646011f9ad2f9ac423a9ba8154d9e6713611dff5481cf585c18c0a2bde3f32b26ce8647134f2e8338c08fe32b0dce4f3ff591a8a2b2601e29ea1f00d -DIST github.com%2Feapache%2Fgo-xerial-snappy%2F@v%2Fv0.0.0-20180814174437-776d5712da21.mod 43 BLAKE2B 500b3a85f43db1d61f037f437b3290888204aef8b80aabf42d70c37607fdac86e8b1f7f4e41ad3709ad7015a78b934ed7d6d254522eb3e2baba4ae24619ea4d2 SHA512 da87f8eea5497796badaa6bdd1c67ae04e75deb7595f10739f30f20364f22e588a449aacf603f2c8d738b365ac14211c7cfe8e1bfb91f220f5c9d547007ad453 -DIST github.com%2Feapache%2Fgo-xerial-snappy%2F@v%2Fv0.0.0-20180814174437-776d5712da21.zip 19526 BLAKE2B 87715fa440e98bd4c44516e419c0f0495da8fbad415c59361ac53008553c4ab16aaaf37581edaa6a50fa443b9ee28cb426f7e58a921f3a3490fabfa4248245fb SHA512 e8756683977e2dceeaeb1bfb63ec8fe4c7083cc1c7b242d59080a3078cfa5aa73d43f203470b140c1714a30a97dc843adf723243a072b7529c22e1fd72d7ac69 -DIST github.com%2Feapache%2Fqueue%2F@v%2Fv1.1.0.mod 32 BLAKE2B 51c322074fb7a69418dcdfd2e54b187fbfe541c21a979c8bf8b155a6264cc670eeaa95c2949f2b760b187fa582e86688a045f3f022cb45f053a58e00ec2c0c60 SHA512 bc43f85d5a21cbdf4b3821e707c845d08f8a6d8f2c6ef0f6ec76f7711c53bb4407f2a356c79bbbda438fe138a3cf74a4b279e8757cec7aa134a93f2173b931a0 -DIST github.com%2Feapache%2Fqueue%2F@v%2Fv1.1.0.zip 4517 BLAKE2B 6408d130bb158559f4b955de57bb8b7acac1676e0e3fae8027d5bc9aa3b6b4a2cc335cc9c5a3c86fdd5f26aea8f30fa30c6c549fe824763890863026ed296772 SHA512 513221d40f43fcc6ea1baff5aff926dfda8505eb4a4735e73d17cceb5560d94b7b9eb5e6e0bc5ea61cc733ec750c901e41239e07d2ce95bef20aff654d0c406f -DIST github.com%2Feclipse%2Fpaho.mqtt.golang%2F@v%2Fv1.2.0.mod 43 BLAKE2B 1431139ee59695bdb732385a06f05f26856117d6fde79f5aa3e3bac98bd7f10e6786600c90b414baf7d10c2bde471ceaf265e471b3159a00a13dac8cd4736b57 SHA512 9b87dd132016fb64ec4679aabaca500e4d07b1131affaf5bd1eb2e780b48f2e1364d1cc9e655a6a298d5e2e2b74aa554b228d636e294f01c3ce53f6f53837f0e -DIST github.com%2Feclipse%2Fpaho.mqtt.golang%2F@v%2Fv1.2.0.zip 108829 BLAKE2B efac4fdf409c984caf579ffc34c94419b0d9ff5d559dd02f763cbf7bfe853e167debe82696ce3a16764bccb885987ba68ff85938a5618738ef13d198bd004c33 SHA512 723c089d31c2b5d843c4b27e79a23a80504222da1019b6c6f92bde4a54e3b156d6ff33effe987482921c2d71eacdd4c1140cf87f13f2b5430d30b836fbb80d83 -DIST github.com%2Felazarl%2Fgoproxy%2F@v%2Fv0.0.0-20170405201442-c4fc26588b6e.mod 34 BLAKE2B f28e4e0816416341c47f1050c45c142e5f54ea8461f335b1303def3516a3642a4cf29341cb16aa3fe7a8f78439732058a3712b3831dc35b2db3bbfdc8289ba2d SHA512 df974cf26d8392df0aa30b39a28ad4b6fa2c128cc6e4be98e91aad8f997e76f98d16a5c19cb3aaa510f659ed8c02b05e7d93888648f30c701fa02e63707075be -DIST github.com%2Femicklei%2Fgo-restful%2F@v%2Fv0.0.0-20170410110728-ff4f55a20633.mod 38 BLAKE2B 10c510e0332f88b1c489b5787540e7db93d5babe8fddd2d1603991bd08408a590d133646697604ee008f8a16f1cc384d8223d07e74d5da7e2242434accd1bb9f SHA512 d4d6319d58284419a3bfbe6eef0623570cacf0cd75a192cf5ce49846d75f02dee4188a68b9c62a6c38864503a7884e08d03a44a35296d1a077ea46ad5d68c820 -DIST github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.0.mod 378 BLAKE2B 571b914afee85b0d13a567132dd40a80f60224e20685279cfaa1e5e875897c8e0fc94d7097992881495f4c0c090b27c87f6d95db0161e1064434ca0434ae06dd SHA512 f0135b61ef0638fe384c875786abbf8ed9a93836f6ed29d19a2e9a626cf6d6c6a252146352eb32298b826e93bb61b8c733f8a6aa683e5856ebec37cccc64ce58 -DIST github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.1-0.20191026205805-5f8ba28d4473.mod 378 BLAKE2B 571b914afee85b0d13a567132dd40a80f60224e20685279cfaa1e5e875897c8e0fc94d7097992881495f4c0c090b27c87f6d95db0161e1064434ca0434ae06dd SHA512 f0135b61ef0638fe384c875786abbf8ed9a93836f6ed29d19a2e9a626cf6d6c6a252146352eb32298b826e93bb61b8c733f8a6aa683e5856ebec37cccc64ce58 -DIST github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.4.mod 471 BLAKE2B bc51330df71ca612b3a573a93a8ebe57ef4e677157835221dfc5f7bcbada1fd90f7a6a3a002cbde08c6a95642477789d532ddc80e7ecae1f9e6e7c081364e970 SHA512 323c4b1c27bdc5bfb1795f1353d21ad6b7a2056bb0b364adab5960aabb7bea20ab3287ba60685df130abddbd66c3d82dc98a291aff1849dbce8c182c63c7b0bf -DIST github.com%2Fenvoyproxy%2Fprotoc-gen-validate%2F@v%2Fv0.1.0.mod 49 BLAKE2B d910253a9c976078b790d134a9d75e53cbde427e7733ab9e09c9060b312a5749aa083fc48263501e3339a580cc409b5859dafb820a4465827e7fba4eaca31ecd SHA512 755a3d173d43e70ca40fde2d5ce16c405365da90ff595003ef64598c9b9734b7200fe07a16fd555e4209f83e5e17561d18227c46a5f25a41976ff7ac024cb9aa -DIST github.com%2Fericchiang%2Fk8s%2F@v%2Fv1.2.0.mod 33 BLAKE2B d6e529df5338dcf65963f893e563ea26630ca79318ed73741ddd2ff1a6332d1e5847552aad2076c3adedd47f5f342abf2dd4f3ad749912acf4c2a97a684a347b SHA512 ed71c46ef9b121be04725848b5860e731dbcf89b502d0d6ac0fe2f1cdacaa77959e1bc2887bf1fe729b8602f520a8bd3630a7001e2ec53acf0a9090cc3bbe039 -DIST github.com%2Fericchiang%2Fk8s%2F@v%2Fv1.2.0.zip 557358 BLAKE2B 192496d0980143b87662e69c58e7cf2dd206b2b03587cc17e5e7662b6688a6b85b8f2c3773a4583218c48e3444df0f1d8d4cb90e8aaf1c22fcd8a72a3f10899f SHA512 9e9b991da69bdc428f4255cf64759256419cf214b0eb6fc7701038ecde5da95238b938b038561f502132bca4e8f2b57519cfcf957470fe07481ec645491edd7d -DIST github.com%2Fevanphx%2Fjson-patch%2F@v%2Fv4.2.0+incompatible.mod 37 BLAKE2B cc30b89e62bb3a524aa3d6c55c472d2b157d3cd3b06d63b8f68c5ec035b6281dfef631064cd836f696317bd0ab517eeff464fedcf629491ed87b748281f9508b SHA512 f3ebd49ed1f05193a2999ce7178a9bbee1d1feae8b13c612a8a57d5c836eed66307271d9dd21de79800bbe9773364e826502287c366c4d3e2ef16d4a346378a0 -DIST github.com%2Ffogleman%2Fgg%2F@v%2Fv1.2.1-0.20190220221249-0403632d5b90.mod 30 BLAKE2B 725b27caadd05c18fc518e46ce4f1a213cd6ed7b4da3edb02cd74b7c7d3dc37891692f195144bbfc455bdc9bc77e683b41122bb3d646796555e92f565cc0133c SHA512 d64a7c87d6a40c48684a61ed0f6a7e75590df7d72d55242863f1bf18af9bb9ef51c40ecf0c41fbc039e06f1651898a238375afb12f41af5978195887a9a16c9c -DIST github.com%2Ffortytw2%2Fleaktest%2F@v%2Fv1.3.0.mod 36 BLAKE2B 0b3e2e38c2a6c708af475f5550f4e6b366b9218fb9e29b9ace6fd61775be5635b5dfb237170e5c4a84c82a4f62e3901ce8854cc5f9a81aeb1e2da6f788470e1a SHA512 88ca10cb6af255e2e0ff960df075cbaf39e8baeb3b65e35b9a8f48843520a4cefe410765d0890781dc0429aebaa183aeda2290fc0643b852b9ef269c009ecbd1 -DIST github.com%2Ffortytw2%2Fleaktest%2F@v%2Fv1.3.0.zip 6665 BLAKE2B f9bdacdd7f4cb7149fbf6297d3ab38c3a9527e0af158b933fbc673b96c5ffb684d6511b1679e03a142e4db5dafffc7b1e2edf24ac2d0f4e8faad32041e3e1165 SHA512 77f320b3a94a6da76051d6c15a7c31bfe9dd50b463ad9a354b0ccd4e24df3ea14ce026a1f509d2125f9603ff95db4ee001f9910fd6db05c9bca7b1b15ec304f2 -DIST github.com%2Ffrankban%2Fquicktest%2F@v%2Fv1.4.1.mod 112 BLAKE2B d5d3a6674d915a64981d16e50519ddcb083e77a5bc0e2474fb1e2d718512edd48534c11e13c4acc7d403da5778cb6f04c275c8f208d14d54880cdceadbfff872 SHA512 b2b728fab00b8cfb86dcfb042631a37025bd981364c068990abca3ed57b3f47837ae71e568bb2a60a2c941aa2a35ff1bb24a336e786d20ff0bebb63384fee5a4 -DIST github.com%2Ffrankban%2Fquicktest%2F@v%2Fv1.4.1.zip 36823 BLAKE2B 748629d0224bc4598ca2573286d49e8623ca17a9438cb525a8d080d14cf37549943418d170dc5b107e2a39271be21e1ffe2f9224b469b3eb82574a0c64218851 SHA512 1d451dc97018060ba5fee2dc1696807fb98aee809bc8cd2994bb83a35550edae819fb46cf17ecaf89fa8a22b277ae20b35c32c779640a47679e5ec965bca007c -DIST github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.7.mod 36 BLAKE2B 2b77fbdbb6c6c20767c120b390fbd2992bf79dcae0a35c27121a6e755233da3ecb7d74e74c38c0a2463976b546ed8bbfb8a8d8cb140526dd9a0c4f524cc131a4 SHA512 5749d33fb085d63b7c12f43df824c96f168323cf6d88cfea3e2536eeb7b56689dab9dddb8cde1ec8bc9c2848e7148b8a37abf8523a99c55ce10f896245c5f341 -DIST github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.7.zip 41278 BLAKE2B e0b440a81efbe3c7c16ad276b4509652fd58bc94cd162b9ab13bb37c1e6edcd561e3fbb999e55619d58c8e3279b785b8eb67fa4e200b38fe6fcb60f0918e6e8a SHA512 9b1075ccd3d1f53773db97687e06fb777741d6c3b228bcc329be580562fb3c34006768eb3f989f92367ca116c597140045b3c345fe36065f5015d1d4652633c3 -DIST github.com%2Fghodss%2Fyaml%2F@v%2Fv0.0.0-20150909031657-73d445a93680.mod 30 BLAKE2B 6a680b6e14f0cbca536b1ca02d633e16b2010cee7f590088748339785b2989cb0f86a51fba709da938d4c10ec810d5fe022d7d1a5c269d5ece253a78a5b2069f SHA512 7ffc7a5c3e0b39831e590ce3402dbf5c95392e88a08576a16d9e1887b11400efa71a9d183d3f1e080081246f28a70262a679348f009f7da6bd41f253a60b0741 -DIST github.com%2Fghodss%2Fyaml%2F@v%2Fv1.0.1-0.20190212211648-25d852aebe32.mod 63 BLAKE2B e418e27df957221db7dab3effe8b7b68da72098f4a90ff3f78902c446dcd25d720874a1d5f8fc6dc916f32fd7d87a79ced65c792e6e7b2f670d32cb78c8fff8f SHA512 041fc2aa6cc90c78e270fb4d902d857f83b7837d3bc0c4073cd4efacb078016d740fbd9b3e0d78eb1984071974a2efe1a04dd5d2cc474b8b29de60e6fd1638c9 -DIST github.com%2Fghodss%2Fyaml%2F@v%2Fv1.0.1-0.20190212211648-25d852aebe32.zip 18157 BLAKE2B 542e807e061369d9aff457bdd1ab4dcdab25378d6766ee2d7b618093e06a15d3cec0c1460613e81160fdd8f5da6732fdedbbf7203ebad80892aac70f3ae9fa1d SHA512 132d763eeb2d4729d86e2b7a0afd15f9f0b3f5f9380529867bbd6e71cc827d73664b96a7ccf84a44590a4d8eeca311b6ff83497ced3a0ebb2f7c1ad66cbebac0 -DIST github.com%2Fglinton%2Fping%2F@v%2Fv0.1.4-0.20200311211934-5ac87da8cd96.mod 101 BLAKE2B 9ba8bb2d47a1a3c64921756d42b8f152e31eb620954fc8402889a312b1d2129f2956f9f1619e5d796e3903a9432fcf02e5acc46cf95bf886b8b4997860c4f60f SHA512 24852bf603415e1dfb183db4649e24eb1a626c024343ad7bb68bc918485f8bc9ecbf2a5eac14d61eb83626fe9739c5a1f5eed016f6d4492c75a08770dace7bff -DIST github.com%2Fglinton%2Fping%2F@v%2Fv0.1.4-0.20200311211934-5ac87da8cd96.zip 12734 BLAKE2B 169ee6e0f1f8c0f915f717efd8733db88eb80e50c32f8e89263cb43eb5aa8b2acf11e1ba934336ecdf0c037785d17717fd1031ab08a8509d8e3c120f84274081 SHA512 8e3d9d2d1846f21580a7afddae0b88f164371e5d5075d549cff47994db4b4b7d1f95afae7ce85c702ddb5efa6a01c383188694042ff48383d61079e331208e8c -DIST github.com%2Fgo-gl%2Fglfw%2F@v%2Fv0.0.0-20190409004039-e6da0acd62b1.mod 29 BLAKE2B 1cefa73995b3d0b4206aea263f55c672b675dd22d42c61a92f7380b6e726f2d7ea40e0a9e456181f34808f5386eae3c485bd2872857caf1824254fe4a55cb635 SHA512 a709c650da5d5f513e94891b88c26697826fafebc1ca964fb9544415637ca14e3b9f1f4ddcf738e28032e10a2d39b619678ec5c8d44cc0a1dff738c75645e2f8 -DIST github.com%2Fgo-gl%2Fglfw%2Fv3.3%2Fglfw%2F@v%2Fv0.0.0-20191125211704-12ad95a8df72.mod 48 BLAKE2B 7d441b7bef1f34bd7065c63630add910d504ba5a2897d6a0b7cf9c9456337b8e55e1ffd9e12cb3fb8c7f021e51cc045ea41cdf62f2c33555f4b61aeda07c332b SHA512 06dd140361d7cc1af9e37de85402631a5310d34198e20d6ce1521dca15d1fba1dc9e40b512a30b8e850e105e9fbcfe0691b298d092eb92b79da564532dba721e -DIST github.com%2Fgo-gl%2Fglfw%2Fv3.3%2Fglfw%2F@v%2Fv0.0.0-20200222043503-6f7a984d4dc4.mod 48 BLAKE2B 7d441b7bef1f34bd7065c63630add910d504ba5a2897d6a0b7cf9c9456337b8e55e1ffd9e12cb3fb8c7f021e51cc045ea41cdf62f2c33555f4b61aeda07c332b SHA512 06dd140361d7cc1af9e37de85402631a5310d34198e20d6ce1521dca15d1fba1dc9e40b512a30b8e850e105e9fbcfe0691b298d092eb92b79da564532dba721e -DIST github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.8.0.mod 29 BLAKE2B e43df3e551bcfb1d4a4843ddf00f1a9432cf768420f49943ee2936fcf3e890e59734b71ecbfcb85a70212122df3f03582335e37ca7330df9e335214e75a849d6 SHA512 2ace9d4bc029947991eb7237e7343fa31c5192d63927de1701434c305a659cb88fdae12e9b604f06ab318f1c26b207821edbe11e8d9382a0447544b782630c6c -DIST github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.9.0.mod 29 BLAKE2B e43df3e551bcfb1d4a4843ddf00f1a9432cf768420f49943ee2936fcf3e890e59734b71ecbfcb85a70212122df3f03582335e37ca7330df9e335214e75a849d6 SHA512 2ace9d4bc029947991eb7237e7343fa31c5192d63927de1701434c305a659cb88fdae12e9b604f06ab318f1c26b207821edbe11e8d9382a0447544b782630c6c -DIST github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.3.0.mod 35 BLAKE2B 0868f712c026b68559846a28bd29f39f584603cd79e1189a9ad76909cce7423a811f71265baf5b7f381a33bee76917759a9cb6ac131ab21450b4b52558cb6190 SHA512 526b97ecd0ccf878c0ada56c5217405c34c59d4c9cb53808f98b24a2823c0b3f1a74e862b9b1a5594034e570aa6749574d5e49212d6d48724e984f528b8c67ea -DIST github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.4.0.mod 100 BLAKE2B 2558b7edc234429c8bc0926d347231c2352cbfe83d83bc3c7e76ed0ac4b3a843de65cc3e0dede3f0acb7a2dedc623584eff8cb236787c12d7f5a47c9e1c39145 SHA512 5782a5d5e5d4c64244a8463e0f15dfb97de4b60b9fed527ebbd8dc5a26999af8ad0b3ce0064da30182c757785ea9b35f253c5946b233fa3d9a61c873b23011c7 -DIST github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.4.0.zip 17559 BLAKE2B a527ab39ba8646129de4c22303bc8c1c58e9834b8ee898a55cfd6940c665134305290fe531e9c8f5c9a1d8d7171db671e479af5679c8abfc4b60c1200761d894 SHA512 a47e8dfb165764ae38985658525e16d7e0942248aae078d2bed543c355ab177e49743556503b59a27cdb33935954ba5d8f08d890b29e5d7fe5d606f2c5b57bdd -DIST github.com%2Fgo-logr%2Flogr%2F@v%2Fv0.1.0.mod 31 BLAKE2B d141d98fd2673b422369b754fbd430a465f08bcdb07fbbf1ed626304ecd0843255fd2e909fc395b04c7adec18a15dea65ede0c64689be98b7491729d13363db7 SHA512 45bbb63ae2dda8c2ea63c9e38405b379708326c3f2e7963e3589ea53d06fd3bdce1613b5a0c1ef66f9c6ddc21374b1669218bd6b3210918df0a4b205116f3e14 -DIST github.com%2Fgo-ole%2Fgo-ole%2F@v%2Fv1.2.1.mod 32 BLAKE2B 165b3724097f123b839b3f65d2e401caf6d8046fe822d3d9b9f15d74e1da21c45b77706f79716fc1b9c5322127bec754b2dd35442fe077dad4f3e301cd168ca2 SHA512 14e60a75a483ff4a1f6313a7a8a1dbfbc6ed4c223c7a9d18c0b355e84261084204a22ef1125a40e30acb1b43abfc97e60c045dd91a16d2b4068a78a54d854d28 -DIST github.com%2Fgo-ole%2Fgo-ole%2F@v%2Fv1.2.1.zip 78166 BLAKE2B 1a7b655abbaad2d27ca38c60ebd39a1b186fc49c9ef7bbdcd2610603af1074f0df7777e480eb5d9b5deb09edee32ec959daccc0f5fd33a8f18c85e219367a144 SHA512 69395f0457365d57b43086d52ca9c77ead9d74c52bb66c9687fb4c26164eedbf4322c129d55408ba96c9985b081ea8335be1587a63f29d53183f542130a409ec -DIST github.com%2Fgo-openapi%2Fjsonpointer%2F@v%2Fv0.0.0-20160704185906-46af16f9f7b1.mod 41 BLAKE2B f496cc326aeee2c6f1547b802fa1ea13a578144331451bb772a33e2934dcc655c9355f06f7845684130c6647d00decfa937c839909baa01a6d84f6e601a427e8 SHA512 56fe1d995f8f51197d68494fb2edc2d5c5cc863c881ed640a74ba80e292a54a0600f10c727b3dc8a209fc33c750d92ad658374d0dc3d083fa9750bb7174f5613 -DIST github.com%2Fgo-openapi%2Fjsonreference%2F@v%2Fv0.0.0-20160704190145-13c6e3589ad9.mod 43 BLAKE2B ab024fc86c325a82315f5a99c39e1fc08440ee35d81fe09959816a0fff09aa5d852431fcc370dde082963ccbd0d79d74d987f1bacdd4796d6d1d11eb80089d63 SHA512 b3548cd55d406b9148e992e276f7178d68116825198f359971f22a1d9e7e2548cdf9605a1b8b6f04b3b66d92faa906dae781a53624344733fc471452f16f4312 -DIST github.com%2Fgo-openapi%2Fspec%2F@v%2Fv0.0.0-20160808142527-6aced65f8501.mod 34 BLAKE2B da7fc8b2c3dd4e49dc2efc50ae5d50571e906f68ebbaaeb863f4b3f6f03160a381d7b0e743863cb4253ba36afa2f5d7e518ac08fb4d6c08566d9931396d87fa9 SHA512 b75a0212825e9e0554f7654b1da4050ddda233853ddd86fcfeaac0202dcc4605f0608f3e5ea90056407ccef504330ac407493187a759a36fd716f508b20dc60c -DIST github.com%2Fgo-openapi%2Fswag%2F@v%2Fv0.0.0-20160704191624-1d0bd113de87.mod 34 BLAKE2B 3eae155bd845592809662beb61207107add5a1e0edf380e313e262699dc421b3bbeabad5ea9ee73d29b6a694b2e58854b888e8fdb3dd9c7176ce637056cb90cc SHA512 81cbe6c6c48012994253a40b9c897207b8b4b79f35c09ede64ad7f8d22db8861ec823f2b4a7185334554c75bae3b614de236f804312c77b0027e97114ed4839e -DIST github.com%2Fgo-redis%2Fredis%2F@v%2Fv6.12.0+incompatible.mod 33 BLAKE2B f773c657bb78f4ed9b9f416c2937b9aac09523b89e9c8c5e6dfd577f968355359dbe799cd3a9d338572f5b3fc47e069a1bfb52976cc907d4f286371675e6b485 SHA512 0679350ba72b8ac3edcc78261e7bdfab2d60ef315924251a8e437af1cb08e6b1fb6f9b748c445c6146650e735cdb9af52ab262f2de1ad3b1035f8348663e2d70 -DIST github.com%2Fgo-redis%2Fredis%2F@v%2Fv6.12.0+incompatible.zip 109138 BLAKE2B 41c69ea421e67243c34a14ef9212a94b3c91ec5d7d5f6e794eb885064255c14d248b12a2ccfcc0e6f76805260fe48ee55971d52770782073e9238e537be83cdc SHA512 d1d8cb91d3ee3ac918b6d5ca014e139ed37eabf7193f774093141a50217ef6556688e30242b8c2f0eb83251e1b41587a3ebb1e2507252e09bb9b0a4b7a1bbfec -DIST github.com%2Fgo-sql-driver%2Fmysql%2F@v%2Fv1.4.1.mod 38 BLAKE2B 198f3a6fb7348bf50286e1dbb067e72ff854b1daedf1d181b643872aab377b930029feeb95d5d6ca21109facde089527a06922b9ea52cdd59ef553d69b984e06 SHA512 21ac6d6f8fd92ccbe09cb30d0dd6a37142907048cc5f9d0574824765918dfd8ccef96b7ceab9dd259f9a95f5c5be566ac00ff4eb3e37ba7c7c98f25b3185baef -DIST github.com%2Fgo-sql-driver%2Fmysql%2F@v%2Fv1.4.1.zip 106521 BLAKE2B c7c61852b093d2b0452e9daf9ab26b83ee6426a9afa4f67abb0e0f98ef28961017f774075f5d90fc05d6de3c26fdf90a1916b426b32a41e2cee8fb0452e21f03 SHA512 023209372d47d4b5279789f581a6f4452aaff1e262ecbdb3fbdc48a0939599e319109b99d1c79414716f1c426c143cc1ce506dcd38f304dd5aa3e9348084628e -DIST github.com%2Fgo-sql-driver%2Fmysql%2F@v%2Fv1.5.0.mod 47 BLAKE2B 7252c3d085ad65bc8d2694f6fabeaf42736c8af8f4e061f1b6f254c35859619db00c1e204057cf355434b40f403b1c67c29fa5f93661626284bde20c8877a606 SHA512 149783bbdf84f15c29931e06d98707db26048d13ae9fd157600b522c0ddc60612c39764dc177e063f844205321ba98a01eefc1744dbc6f786861d0607dbdb0bc -DIST github.com%2Fgo-sql-driver%2Fmysql%2F@v%2Fv1.5.0.zip 113293 BLAKE2B 1bc68747a73c39e2b21bd2c45dbdc3cb41a6c69f9a2a5167a6960b4ed583fbc888a41f559a8866a004703939230ccf3536cb2dae43ff5a078d21151a115898c2 SHA512 d18a710e77e830e7a1e80a16a7743cfac418832c16a8e08da7749af791e2bc8116c2c3e7f028bcf9c4431cf8e61478d6f1a3549a47e569f725db2a623460986b -DIST github.com%2Fgo-stack%2Fstack%2F@v%2Fv1.8.0.mod 33 BLAKE2B 366a1ff397488b2b1c7e42db8a946bced1eb8d4260a6c177a978eb978e14f89265e7ac1d0bcd77905bc89eb35b68b3ebb028c0dfc67ff71395ab14b62335d16c SHA512 f3dc70dfcf086b785750d5b346ea07d0dc7903937bdbba58eace0fb903e656b02ddf3a1d49b486ac29b1cac9ca9d346e964d55d3a4cc5ee5ae79ac40b24d0cd0 -DIST github.com%2Fgoburrow%2Fmodbus%2F@v%2Fv0.1.0.mod 34 BLAKE2B 932f1630c22a0d624a5acc23a0a9e323381437d7e3b8b09c545c4e147d40807adfd41d54c80f0bd6cc00af9a7bbdc68bf357b70142999a886dd751d498793abb SHA512 9e271e8231e87d8bc337b3a76c8f86155d461f045e9db65b4488f842a7c6dfc8b6158e9fbbdd9b405f57f79ee3beeb8cb827cbc8022a3dc5366cb602c6373cae -DIST github.com%2Fgoburrow%2Fmodbus%2F@v%2Fv0.1.0.zip 28066 BLAKE2B 5437c9a233702a920e3b4b59d185c9235dbf80c38ed704e220607cb53dfbf4d65c46e4252b75c45f4e6f1b35029e195a065c699dc201789b0bb7fd18b1433a89 SHA512 a8052c898744ba0e4390a910e6f62049c256bda57b6b2303173064223e91910642d6d26d237aca75ccb425121e616f1fc928bffaaa8557cf39ff93d8b6e09922 -DIST github.com%2Fgoburrow%2Fserial%2F@v%2Fv0.1.0.mod 34 BLAKE2B 2ecf7e61e93c4e024b15d30f88866f020e9d7c812b6442acb82907a37d5a276a2d8c107efe17c3bcb3fecf85c916ad4f416c367fbcd117086d7f78d90b97edb0 SHA512 b494afdc4c1df4425d49ef59a7a17c41bf9cbd5fbb498c1f538ce945a6c83157c26b7d9f251b84df50af1faceaa18dad1253d7d122461c4ba31bdbdb5470a3f1 -DIST github.com%2Fgoburrow%2Fserial%2F@v%2Fv0.1.0.zip 14614 BLAKE2B 0da30751a36ed55e89ceda4078397c1bb31b95ef5a11d9514d550b0f5ef59d5fa0e8029a77e73510cdd8900c9fc76bb1433467b6e7cd20b76784a945a6337f5f SHA512 d2d38874fbb877675ca02aedf3926cc2452fbee57a84311feb3ddcaf7e3371afa1df54a5ececed66112aa73e3e0c02810e8f3601bd13e0fb217e4758635c81de -DIST github.com%2Fgobwas%2Fglob%2F@v%2Fv0.2.3.mod 30 BLAKE2B c4b58079c7f353b01123ed35c24b8c9dc43139a9c87b12fd90cb99e41b97d6e2ce646710b261dedd2a6c9572ee42e677be0ffb43cbb8cb55b99d1eb92ac68f4b SHA512 e0a6df51284e6b2faa2ae12bbc2c53c649fc503427f0651fefe99cd852a012a76a9c5d967cd1a088e1b3270f9b68abc39f56a6d823c5913fa025b771145f80c6 -DIST github.com%2Fgobwas%2Fglob%2F@v%2Fv0.2.3.zip 50402 BLAKE2B 361f6199022b22ba47eb17a7d85a670c4843cc4269df2587e8d9fcd1083525308b74f0a164dd1a59aec04b473da7eaf003bd005b92558126f282600b3cd4e262 SHA512 87e7c1792bb3a5ba1c78ea5844c0083abcc10f60d19019bcb763cac5aa7dd7625903e074228562207e836803a83bfb086148d886edc6d24e5fae7fc6d8abf11a -DIST github.com%2Fgofrs%2Fuuid%2F@v%2Fv2.1.0+incompatible.mod 29 BLAKE2B 5311a22dbbbedd78a98e34293e79fb5443c57774fa9049665943e377fd07984a9316f3ec5c8fb70da9b133c6390d32ab28b97e939f938bfeeef78883cca6fba2 SHA512 8a1ab67bf3555ca17b7efb1042fb6a7d58b225b4186302b0cf289e7b60f9aeaf23e36ff6d4e8da2ed728dcd676cb2f30f0625c430c0b6943dd25ee02d2c27247 -DIST github.com%2Fgofrs%2Fuuid%2F@v%2Fv2.1.0+incompatible.zip 34239 BLAKE2B d96c20f0bffba6c5c6f1e0f12401f131ec15eeec42ac811ce77811640a00390b0dc01841a13d3e72d226b44babde0a7c692feec4b0a3314b335d783cce22d711 SHA512 c1c2c39a6c6b7254aeaaa214bc4586385d3a0bdc23b778e70036d65e0fec99f1350f759ccb69b28a767664190b4b2e3039e042c0b1cb423185db579fe5f91063 -DIST github.com%2Fgofrs%2Fuuid%2F@v%2Fv3.2.0+incompatible.mod 29 BLAKE2B 5311a22dbbbedd78a98e34293e79fb5443c57774fa9049665943e377fd07984a9316f3ec5c8fb70da9b133c6390d32ab28b97e939f938bfeeef78883cca6fba2 SHA512 8a1ab67bf3555ca17b7efb1042fb6a7d58b225b4186302b0cf289e7b60f9aeaf23e36ff6d4e8da2ed728dcd676cb2f30f0625c430c0b6943dd25ee02d2c27247 -DIST github.com%2Fgofrs%2Fuuid%2F@v%2Fv3.2.0+incompatible.zip 36892 BLAKE2B 86fda2a386b182044a4482b9cbb90fdca1c07b45b6c0f0a6f2c63468263840ea99f22140a3d7a9f68836674f884c425d8d44c6583df554ea6bbd1b7b84add874 SHA512 c8c217d61335e9b4c9ebad513fea36f7bc529d398ee7bf6f538bdc355ef62f0597aa7aa3d78b57e6571198cd43e53ef032e8ffb66650fdfd25fe49e17c7ce84d -DIST github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.1.1.mod 32 BLAKE2B 939b72a591bc5fbb649c21a95b2c4b3f5d3ade273377f1f89407e55f436e7a863f15d708aabfc5435334500c8cb1e3ba057439c8ec81cfde68c1ec6794c6de6e SHA512 ab6c57ada3b0d1e36c91f3e0f45e573b91a4869f230f02a7e5e3e5a8f7e020bf56c63df1cbdc5b552ef9a4229ab739cf76df7f799091a2efa148ab9e5c12b1c5 -DIST github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.2.0.mod 32 BLAKE2B 939b72a591bc5fbb649c21a95b2c4b3f5d3ade273377f1f89407e55f436e7a863f15d708aabfc5435334500c8cb1e3ba057439c8ec81cfde68c1ec6794c6de6e SHA512 ab6c57ada3b0d1e36c91f3e0f45e573b91a4869f230f02a7e5e3e5a8f7e020bf56c63df1cbdc5b552ef9a4229ab739cf76df7f799091a2efa148ab9e5c12b1c5 -DIST github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.2.2-0.20190723190241-65acae22fc9d.mod 139 BLAKE2B 0c793b0070acfae7ad92de8d8e177d6b9a2519d521bb397da4dc2610927374e4c010db6a4454783556edaabf64e585b00112aea05820874c49f9bb4c4f049fb4 SHA512 232bef55468d9ff66ef7f446d8096a44a0a947533c8665f0f018300b7ec1804a634299a1a6ab64deaa67f1475e9ef68e7be233dc72fb2d9173559800f01af142 -DIST github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.2.2-0.20190723190241-65acae22fc9d.zip 2737734 BLAKE2B 6d5345f7334008fd717d25d3a3d8f18b77408de943a1deb60ec3fc488ead17a2d41fb2f91ee174195b87f01446fcb61106fa2798acbfd2c477863e7a1740a71f SHA512 b86f02e94eccf0d66190b6ce8025774e2c9d181d4308a4725c2dcd3e7234e71965250826c6ef604665922a2986c3c7e54309b22004fddafe8ebbabe33baafbe1 -DIST github.com%2Fgolang%2Ffreetype%2F@v%2Fv0.0.0-20170609003504-e2365dfdc4a0.mod 34 BLAKE2B 55487f18e815e30ee3653a5dcc9370d2cf044641f7cf12c566e165fa173efe9af3ab18fed752dc36ee0fa25ae2e81a5094e18cebaa61d997ae599b9cc3d09bf1 SHA512 a34e950c565fa284163c40712c9f5e53881996c85153f972a78f27a5cdcaebfdbcce60556e173bbef2db32939f1b8721325846b705ef1504a1c5680598343b10 -DIST github.com%2Fgolang%2Fgeo%2F@v%2Fv0.0.0-20190916061304-5b978397cfec.mod 38 BLAKE2B 3dd22c8b8c82e80965988cbaf0b8241af2d32273ae0bffc30f3da0522a327ea65f2f93a0496558551f2799ac7fa4cb8f103d80de25ec8def97ba34578bdbce77 SHA512 d7a817fa0adf48e773c941af6f6207d87204e153ddec86cc4bdc9508411fcec5179b4bcd6bdeaacf5512d50afc5f4ae4f5f25354acbd665698e6110ed4e400fe -DIST github.com%2Fgolang%2Fgeo%2F@v%2Fv0.0.0-20190916061304-5b978397cfec.zip 468305 BLAKE2B 6e31468404432f25552cffa1214cc144df2fca016663b506bb1e79e32d444d64b232220a94615f13b503a03fa89fa318799968b8bd04fde2b7ad52beae4d9b6c SHA512 05aa995076c218e0faf316d9443a1fe1f26eee7373846873ea406cafc52e090eda044abd663a3b26258c71edcb2543d597e51eda83fb2d12e3aa4f7246029abd -DIST github.com%2Fgolang%2Fglog%2F@v%2Fv0.0.0-20160126235308-23def4e6c14b.mod 30 BLAKE2B 6dea6116bb7fb72123a93cc8b83dca5455b76591c7948524ffe664bf966780799c4d007154502922e21f688aef5148211db6b0e3dd3f6b545c4192f5bd5166a8 SHA512 3714d2a95d0435a113c36df5feb13f77a07a1514fdf6b5f01e6e8cc5d159067736e0065bad8062dc636fa5c52c98e3fea6985075005b2838bdf53e0b07093024 -DIST github.com%2Fgolang%2Fglog%2F@v%2Fv0.0.0-20160126235308-23def4e6c14b.zip 22449 BLAKE2B 8d2eaf41ab75e870a445d50b62c02877ae8049e282f066d9aedc0dfb54d04af55d921ebc84d1e4131cc66a3f9efdf8270a0e423e563d3f8fc5a6bdd403bcdb39 SHA512 a3c086e660f2285d9fb7d56d1eba74994e8f0052363413337413cb50009ba46d3a432e2b4c67a73bfb753e7c60646d96bdad308d8e634e53f0bb0bb97ea17bda -DIST github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20160516000752-02826c3e7903.mod 36 BLAKE2B 3eee85c76d1ccaca7488ee3039bae6a7a9b4c8253481cdf6d62d1126623312a07264ed0e061bf5d7bde3aafb23e078b2bc86c3718cb2fff6618976c420c7dcae SHA512 5a0f44d45d666885e31206077a515fa02246d56699aa02f7809868029fdf6a718a5df8edac0ec245880f982882c2f4ca1d13a1dc0c7c0f79d7e89c6c46fab523 -DIST github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20190702054246-869f871628b6.mod 36 BLAKE2B 3eee85c76d1ccaca7488ee3039bae6a7a9b4c8253481cdf6d62d1126623312a07264ed0e061bf5d7bde3aafb23e078b2bc86c3718cb2fff6618976c420c7dcae SHA512 5a0f44d45d666885e31206077a515fa02246d56699aa02f7809868029fdf6a718a5df8edac0ec245880f982882c2f4ca1d13a1dc0c7c0f79d7e89c6c46fab523 -DIST github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20191227052852-215e87163ea7.mod 36 BLAKE2B 3eee85c76d1ccaca7488ee3039bae6a7a9b4c8253481cdf6d62d1126623312a07264ed0e061bf5d7bde3aafb23e078b2bc86c3718cb2fff6618976c420c7dcae SHA512 5a0f44d45d666885e31206077a515fa02246d56699aa02f7809868029fdf6a718a5df8edac0ec245880f982882c2f4ca1d13a1dc0c7c0f79d7e89c6c46fab523 -DIST github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20200121045136-8c9f03a8e57e.mod 36 BLAKE2B 3eee85c76d1ccaca7488ee3039bae6a7a9b4c8253481cdf6d62d1126623312a07264ed0e061bf5d7bde3aafb23e078b2bc86c3718cb2fff6618976c420c7dcae SHA512 5a0f44d45d666885e31206077a515fa02246d56699aa02f7809868029fdf6a718a5df8edac0ec245880f982882c2f4ca1d13a1dc0c7c0f79d7e89c6c46fab523 -DIST github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20200121045136-8c9f03a8e57e.zip 39701 BLAKE2B ecac1c4212267252571babe2c7332b517c22a7c535777a40b6e318299bc284ba3676ca75df60670dad69698450e97dc614b98c6c9fa793a4f3daa3bf88859167 SHA512 e4cc88b9e484d43a328c2ce80b812d4886fee13b915a41fb64b28cacb163960059de066b9be8aec33be081fdcd3db847ee491aeeb1a74b25aadca2c206c9587f -DIST github.com%2Fgolang%2Fmock%2F@v%2Fv1.1.1.mod 30 BLAKE2B 5c355e64d858c99536e459f9fc4428dc00435bea944b67bf3dda5b61edb5f0c193c5857eb10bed926987cef865836c3f7ae3d8f081a58551ccd0772e4eb565b1 SHA512 ae6a1a6f8d31592ea6141f2ea39c9b60cd28e73ffae74bcf370fa739865b95a7ed56f687975f017b42c59e3b0f1c02884fbd5c93140bce268771380c8c7a7a96 -DIST github.com%2Fgolang%2Fmock%2F@v%2Fv1.2.0.mod 30 BLAKE2B 5c355e64d858c99536e459f9fc4428dc00435bea944b67bf3dda5b61edb5f0c193c5857eb10bed926987cef865836c3f7ae3d8f081a58551ccd0772e4eb565b1 SHA512 ae6a1a6f8d31592ea6141f2ea39c9b60cd28e73ffae74bcf370fa739865b95a7ed56f687975f017b42c59e3b0f1c02884fbd5c93140bce268771380c8c7a7a96 -DIST github.com%2Fgolang%2Fmock%2F@v%2Fv1.3.1.mod 93 BLAKE2B aa4bc48d8914434d540f570e6017b3572dc4b75563174e73ecce9f86460669a264389e1e24ce26cbe056a26865b3cee294457315034b6ae9779001b7306d91a3 SHA512 5dff0170dc085e1be63ce69886cb019b9df09a5678128b3b0a1b174756500f7d4bd62dc25ee7546977e298f719746ce951119908ff59463a79a1aec7a8882e32 -DIST github.com%2Fgolang%2Fmock%2F@v%2Fv1.4.0.mod 131 BLAKE2B cbc0f2260c45f1696c2dbe5b134328dc37ea8f95f75817da19f64b15d26cc4942aedec755155c21fe1ca2288190738702bea99511af61dd11e2071e9d423489a SHA512 fd32c642f3512807877fbaa2332c9b83a02d025d469226a527c19c144c8f6b20ca4bae3f6d1f17da74469d6396c1079014493b50ea8a1e7b4be3bb015a82aead -DIST github.com%2Fgolang%2Fmock%2F@v%2Fv1.4.3.mod 131 BLAKE2B cbc0f2260c45f1696c2dbe5b134328dc37ea8f95f75817da19f64b15d26cc4942aedec755155c21fe1ca2288190738702bea99511af61dd11e2071e9d423489a SHA512 fd32c642f3512807877fbaa2332c9b83a02d025d469226a527c19c144c8f6b20ca4bae3f6d1f17da74469d6396c1079014493b50ea8a1e7b4be3bb015a82aead -DIST github.com%2Fgolang%2Fmock%2F@v%2Fv1.4.3.zip 96207 BLAKE2B 237265e691ebbc93bd0906c79c29826a43bdfa2a2967b82f0513d2856090b5118232c84028c6668b0c2d6d3f25a3b3ebe0a44c68a12a3d1e7dd225af25ae8492 SHA512 cc3e9455289dda38a8895a0388641724db44ff7408c6d05d01a5a9df8e3e9d4b0b62c9bc9e6083438c0c6530d213c590b290d3e45ba8f4516b62fb2556bb98a9 -DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv0.0.0-20161109072736-4bd1920723d7.mod 34 BLAKE2B a4239cba934b6e80714b93d47e88f22ad28ce41d1d984c4261cc3f5f3b857fb28785223fa911b258e2665be2a9d24ffbd925e9e0f374452a2aacd712ad9d5f75 SHA512 e059a34363bb826bbcb8981adbfc10da90e04b86dc5376ab20bdfe1fab135953cff41ef1daa116aff10e9f3e6503168f6baf902f09aa0e8cd9a0da96b932f4b6 -DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.2.0.mod 34 BLAKE2B a4239cba934b6e80714b93d47e88f22ad28ce41d1d984c4261cc3f5f3b857fb28785223fa911b258e2665be2a9d24ffbd925e9e0f374452a2aacd712ad9d5f75 SHA512 e059a34363bb826bbcb8981adbfc10da90e04b86dc5376ab20bdfe1fab135953cff41ef1daa116aff10e9f3e6503168f6baf902f09aa0e8cd9a0da96b932f4b6 -DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.1.mod 34 BLAKE2B a4239cba934b6e80714b93d47e88f22ad28ce41d1d984c4261cc3f5f3b857fb28785223fa911b258e2665be2a9d24ffbd925e9e0f374452a2aacd712ad9d5f75 SHA512 e059a34363bb826bbcb8981adbfc10da90e04b86dc5376ab20bdfe1fab135953cff41ef1daa116aff10e9f3e6503168f6baf902f09aa0e8cd9a0da96b932f4b6 -DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.2.mod 34 BLAKE2B a4239cba934b6e80714b93d47e88f22ad28ce41d1d984c4261cc3f5f3b857fb28785223fa911b258e2665be2a9d24ffbd925e9e0f374452a2aacd712ad9d5f75 SHA512 e059a34363bb826bbcb8981adbfc10da90e04b86dc5376ab20bdfe1fab135953cff41ef1daa116aff10e9f3e6503168f6baf902f09aa0e8cd9a0da96b932f4b6 -DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.2.zip 465217 BLAKE2B 4caaf832a22faf1c45e04bebf35d29b38bfab18a490ad1fd7b2c6cd85ae678fd3991505f68e526f9f2205cf919374b07d57f8abe95d8f74dc8263cd37a9db3dd SHA512 7fe69c066b2407e6000ae21888f6cc696e51df2342a71e196aba1a9a9ecce630bd9a4d41c58b3105002508a4d0efb9c5ae2b8a87f848b8e2c6293558b8c4b4ad -DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.3.mod 43 BLAKE2B 1985b508a7ca5fbf7283bfe42510dd54e1e409894b4bf404c918943c8bbc38a3682d00322514c8fef7d6528059fc547534bd956fb262f91fc63dfd6e97fe0bcd SHA512 17d97ea39719fd59908591504c8df288f5914243fcc43a2cd8cba6c2c50fd6f5315b17afa008f92ecdbda732d5447f848d31bbbfe59ef9bec78aaa3f25f51833 -DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.5.mod 42 BLAKE2B 5e9f93d89d4f9aa6ac98c9fcf3f44177e95f08fa3d86789f56b6c52afa19c663fb36ec477a04611be15f51e8862ba90641fef9bac7c09b1baa7321b71b5c31e6 SHA512 603005008f167e32ed8984657a85676cc140d57adf0177895f6f4282a301c7f1fa2d826abddc0c59c725c810cf2356c820ac7fd64c6ccb2be132bead79603090 -DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.5.zip 458317 BLAKE2B df49024ad50c301d81d451351fec1ce0e3706c602de5068deeda6a0614412e49c0d230b47cd630cdc90a6a5bd4761e66f4f38554fd4b60b8896aec768cb98e19 SHA512 bc1c7eeac13afd27ba62c1343b697480a61812ab15231efae740c716f0a6abe2b53c8a40787601624af9017cd36463cc7cb5e895f4fed0de6e52a3c248bd0a9e -DIST github.com%2Fgolang%2Fsnappy%2F@v%2Fv0.0.0-20180518054509-2e65f85255db.mod 32 BLAKE2B 8b498b103962181cf69cf5de686eee1a7f0e481ccd35430e33999c951b91ebb98e9dcb1dc9c4e40cb379fe4abae40a47eb36d9456fea076e44245022552d055a SHA512 c9faa5760addf2869df9a3ec5ed9da02944823afc5be93b8b6193c43261d167cff2aeb65bb844d959d368ada83932c86056aefbff799be326e889d3de4c2b8f5 -DIST github.com%2Fgolang%2Fsnappy%2F@v%2Fv0.0.1.mod 32 BLAKE2B 8b498b103962181cf69cf5de686eee1a7f0e481ccd35430e33999c951b91ebb98e9dcb1dc9c4e40cb379fe4abae40a47eb36d9456fea076e44245022552d055a SHA512 c9faa5760addf2869df9a3ec5ed9da02944823afc5be93b8b6193c43261d167cff2aeb65bb844d959d368ada83932c86056aefbff799be326e889d3de4c2b8f5 -DIST github.com%2Fgolang%2Fsnappy%2F@v%2Fv0.0.1.zip 69641 BLAKE2B 7d5306ebb893e705188699f7b5e690c375bda9e0ab4c904aec10560dd75f278016c9f69ce4973260a4e5a8d8d7dd7c2f12a59f98e96a4456af6f23fd0db224c2 SHA512 fa400e3e1b6f57e29c93ecfb1dd94ccb1e4e4924f3b62ae125ad0bd88d56b5c48080ad78dbf545c1056bcacf860b93363a27780dbce2b812c5b58ca3c74fd11e -DIST github.com%2Fgoogle%2Fbtree%2F@v%2Fv0.0.0-20180813153112-4030bb1f1f0c.mod 31 BLAKE2B 910f367210db741c9f31a77f8eaaea348d3accbf0f219efbed95a780b93e2416fe64dd420ae45ff13da94a8f2a0c7b19850b13e1d9fc6cc1249d327bf04b5fd9 SHA512 f2ff873ecf0144b7f434810af1b49f66f09b4bcadc91d99201465a6ce36c7e7f05996f52800be287dcb3b62e14b75fcebb7c32be0eeda6bb0a15a23058c2d410 -DIST github.com%2Fgoogle%2Fbtree%2F@v%2Fv0.0.0-20180813153112-4030bb1f1f0c.zip 17980 BLAKE2B b0947bc6a71032e97255b113d70760d85eb09f72e8733a9d660b5b45b7eb3e2bf67b00b57c674a3b6c1a90388e7e80569ac8d36ff5aff7d50af9f7c28f22c3aa SHA512 d30c86fa4d25a5f542ef349e0ae2fd4579de5c3c1bb69ea3cd1bf20978a772ab9934ca68e01b9e5db2e5d8d6d7cfa96a4547ae7330e97c03670ae1dc8585bbd2 -DIST github.com%2Fgoogle%2Fbtree%2F@v%2Fv1.0.0.mod 31 BLAKE2B 910f367210db741c9f31a77f8eaaea348d3accbf0f219efbed95a780b93e2416fe64dd420ae45ff13da94a8f2a0c7b19850b13e1d9fc6cc1249d327bf04b5fd9 SHA512 f2ff873ecf0144b7f434810af1b49f66f09b4bcadc91d99201465a6ce36c7e7f05996f52800be287dcb3b62e14b75fcebb7c32be0eeda6bb0a15a23058c2d410 -DIST github.com%2Fgoogle%2Fbtree%2F@v%2Fv1.0.0.zip 17644 BLAKE2B 2ab156c678ef5120adab042c415b287bfa6ebf901181837122bbf83867ff312900a16a24c0f375708f915628ae5bac93b42f659663cf827b81e5e6c4c6e47769 SHA512 b54c7f94aef24c769a0478aea5dedbf67309dc3f59a5d7cf52ea8b49e81783d87bf80e5bcfa36f1f95a65e64bdd8312d20ebf81cd73952af5481b2f1f3619eb9 -DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.2.0.mod 32 BLAKE2B 7c7baa1e29b9806fb97e0d557200e8722f2d373e149127307efa285cdfedb36dd57355168554d1a1bada62144e6a6a00c4d3246aa9afc7d0ffae0f087459c552 SHA512 7229d917bb0c788b07297e1b09b8f7952f951998a56f17ea1f69ff7c2f565a5686b212f42f45c6b8351905d6740a2ec5a235e493daa531ae00cb709faf67ae45 -DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.0.mod 40 BLAKE2B c717b6aaf18662c20120746a021b0ca878e7b190b3456cab24ec98032390a85b0af8540295e470647d403bf1beb582c8f8a74fa7129c4cbf747257206235c5a5 SHA512 351dc24af135b9c9d714aadce40fe9fa1ec05a35a4df90af79926d5119c3f33a6510ab9d78243748d7dad10bd2178f47d342ea2389972b88d5e9b4be6dee7daa -DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.1.mod 40 BLAKE2B c717b6aaf18662c20120746a021b0ca878e7b190b3456cab24ec98032390a85b0af8540295e470647d403bf1beb582c8f8a74fa7129c4cbf747257206235c5a5 SHA512 351dc24af135b9c9d714aadce40fe9fa1ec05a35a4df90af79926d5119c3f33a6510ab9d78243748d7dad10bd2178f47d342ea2389972b88d5e9b4be6dee7daa -DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.1.zip 99651 BLAKE2B 14632f8da685fecc046b2cc9e61eecca02e7bd4720ebb1d3cd01a299e59d47cc604abc57d5518e18dea69785e3d5d539d87da211279e238a78dd23e3d7f8c7bd SHA512 4b47aa3677a464af17f3e320f41f59e775b45f04cabf2cf749e00ba1aa97e27ee78a07daad347bac4b5c41e2c430634fba57c6edbcd7ad405b5a084142871362 -DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.4.0.mod 105 BLAKE2B ffd22df03c1b351fb766a97818d46cc6aebeef365632d5263c90cf45a4acffdf5811da10ea2cd4747bc9691f74661c0b655961a065ed15a0194eeb4d1d12ca9b SHA512 cb203760fc6ca9c9d64811cf1342752faa5a95f27934c298407dc865f9561081210dd1b82b15ee2f5337b70d4c55d102d8884b5b9a5f70d9cbf85227a32b9713 -DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.4.0.zip 105396 BLAKE2B 8b45b030824cf6ad208a00e36c7098b59e89c2725702926092baa11e82bd395d52b5daf26af57cd5edb01bee6ac2b8c4e3379e357e3a6cef69550d9403090c53 SHA512 bd13e72e46a82b149661a61dfc36dc6e0471dd4161f2291f301e871811e5b2a7976a49cf2af10eee1b7b2f6ad68583c240cba007ec163cea157f24bbe51d3b3a -DIST github.com%2Fgoogle%2Fgo-github%2F@v%2Fv17.0.0+incompatible.mod 35 BLAKE2B 87a5884f51a766419a5bfaca4d6b317f2e86680e7347d29dba287e4c2004db6b8a8afcb2b2b8145cc3f9a502b768105eab89ba0f3e99db44427fd3eab9d3ac8c SHA512 6d285a58dc91fb57f990b76b3c2634247bee990ec1bb3e0f11b19fe1edb3b9b1998030def12b20a6f05c574965ddcefda6883121f5aae70c695e031e72425178 -DIST github.com%2Fgoogle%2Fgo-github%2F@v%2Fv17.0.0+incompatible.zip 347066 BLAKE2B 5ef49f931c987f9a24880afbd3ca231093bb43f0c059df9110c38ffe3ad54c4de3851cc36cc9af15b49112462cc164b0812c8872d5fb2d61d0cf751040213762 SHA512 3a24fd40eec7d23c69143355338019544fcc935b01f63f604419a5d7b5f1222e89de7e28dc86454e57e262f9bee5e4333395f3b8d7392c6e87b7e8c442e05709 -DIST github.com%2Fgoogle%2Fgo-querystring%2F@v%2Fv1.0.0.mod 40 BLAKE2B 081291e204018d8256655052c8f518c8d489818e899a6932325f2efe7a33dd7228f1bab1fe31f190c2cd1a022b8f320c2a779910231122de430bdb6c196ca95e SHA512 b47c833f93e2d2f9746276fb7608dfe01295cead6b0c9cad36863e9c6da80e3abe8e7d79afb113fe382f73b641fcfd717090a8d6ca2d94bf2807fec07cd57574 -DIST github.com%2Fgoogle%2Fgo-querystring%2F@v%2Fv1.0.0.zip 9151 BLAKE2B 853a982f1c3b2b60fb44e3da969f7cdbeb6e5214c549e47dee57329a9c93c8786bcb2af6e3aab5f7aacf0bf0c70beb26f95c42b796cc2cff5b9b825040cf5a11 SHA512 e13c7622fe1c4ba73fe147255c02d6828f5d5deaea74ee14a97dd689819547b913caef4721838a68490991c710156307cf0487866d200021cf9d774a4600e52e -DIST github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv0.0.0-20161122191042-44d81051d367.mod 32 BLAKE2B 11dbff4f4352c70c63b410ec8fb7986235dbaedd97ed64d665ab465898df351f2ec3eb9758c165812d5f97bd7b409e90f2db6ee41d73ac9d13fb96c638b42c38 SHA512 8720691f3968ccec689b3c777eeb9b5dd2932f16f77760db3e51fc0315405f7d96711fe0683d6bea810c8ec4e5b320fbd16e228f5f407b12ac5ff896cb263372 -DIST github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.0.0.mod 41 BLAKE2B 32370943a480c13662a0847b33fadc7d7f909784d044619ae8b00f03c9f537115448140ef2ea1b47606dbc64d7593e07cc8f9b9000fc5382e4f1ae94ae4086e9 SHA512 3dcfdb76a938cf370310213720ca952c6aa99c8b1b96afe41eb05f1bff15df7d98d279509d921893c0c749337c83d4bf40613813e117c01205859a041716b2ee -DIST github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.0.0.zip 16584 BLAKE2B 91b7f51050c2ee0261447144d1f86c7952cdd5f3096d72040b069dd2737c008084bb456b57400d3fa5cd26ce3bb34265c0cfcee94c4dace3468ef13b62d73c74 SHA512 6e265617828739486750cb8c5a8337f3e17f83664821208778528d93e608bd142902aaefcd64d4e6fb8542e5b0938b12191ea070fb5deefbff946daa146e9278 -DIST github.com%2Fgoogle%2Fmartian%2F@v%2Fv2.1.0+incompatible.mod 33 BLAKE2B 694b57887cca857fe6950b0df444dc6e3d757dde540c1846ddcd4bb8f96a5eef3f469eaec30cf415541ff2f53acaafffbf4032189122875603d7e5e3dad2ef97 SHA512 cffb5dc1c6531ae9d5998b3a57ba14de5dd8631a36dd48975da07ce5ec052d97b6f632c5d30ab9ab695f178758837aae8a6344c67d57c7a39ca8e9243f8211df -DIST github.com%2Fgoogle%2Fmartian%2F@v%2Fv2.1.0+incompatible.zip 259222 BLAKE2B a40b65755786c83fc0cc40de98de0c7f734b54c0441617f0274890f823175b4e44e721d4ca3c46a7551bddb5487c7d992459c928ff4abc435acb5bba5a302a96 SHA512 26ffdf319d3c952533c25c487e027bf219be3f7ec7345f9d155a480e1e5f3006fe335ba790cbfed00487e23a8506a8208ed7223a514da11b7a4bb069337573ef -DIST github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20181206194817-3ea8567a2e57.mod 31 BLAKE2B 705b12f16ca8f0258457d0972bc8845b553e9e8d9001de0f4a4a548afe23424b0902fee4c84e94bcbc4615401d1369730a60bc57de85aa674300c1a96ad1f128 SHA512 c7e8b1bdd0360b88ccdcfd0cfe73e5cce50010a21db41ec2d533f7863b67930fbb84f430b9ffb663c394256628b05e884b812c040354779e0fdac2a422ac57e9 -DIST github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20190515194954-54271f7e092f.mod 31 BLAKE2B 705b12f16ca8f0258457d0972bc8845b553e9e8d9001de0f4a4a548afe23424b0902fee4c84e94bcbc4615401d1369730a60bc57de85aa674300c1a96ad1f128 SHA512 c7e8b1bdd0360b88ccdcfd0cfe73e5cce50010a21db41ec2d533f7863b67930fbb84f430b9ffb663c394256628b05e884b812c040354779e0fdac2a422ac57e9 -DIST github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20191218002539-d4f498aebedc.mod 368 BLAKE2B 5cc8fedbc9bb93a20e0ae5cb9a69dd5a92ee4a7f55c6b5a93e7925b402b830316038cf99d0c80bec2cf5c8ae1593cb879dd8ad29dbb10b66c64fca856367f816 SHA512 9b278d6667d9380f84c972ee1d383e2b54b460ded5b84e872aa3d64336ab059a8a747c442f4227d60e7dbfb67414ffc98a26bc2507327d9ac85ed1c493a5fc02 -DIST github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20200212024743-f11f1df84d12.mod 368 BLAKE2B 5cc8fedbc9bb93a20e0ae5cb9a69dd5a92ee4a7f55c6b5a93e7925b402b830316038cf99d0c80bec2cf5c8ae1593cb879dd8ad29dbb10b66c64fca856367f816 SHA512 9b278d6667d9380f84c972ee1d383e2b54b460ded5b84e872aa3d64336ab059a8a747c442f4227d60e7dbfb67414ffc98a26bc2507327d9ac85ed1c493a5fc02 -DIST github.com%2Fgoogle%2Frenameio%2F@v%2Fv0.1.0.mod 34 BLAKE2B 1eabef50b2977886d7980d7da197828b826c54018766418b3160f5cd512784635e5791a40cc4fb806d52f5ead99f941fae8037872d6cedfd6c851103f3be1a74 SHA512 a46cae976ce90d1cef802eeaa873c059cc9ec3678d5c3c304a9de45f44f20a24d68fa290cfdcf78c4ac222a6d619a005825de8f11e72b9a5af476a0b0180092b -DIST github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.1.1.mod 30 BLAKE2B 704029826c505198458e86463528ce2c1b209376f376b92d4f05a0f4094d161b45470d04ed3c1b5635397aca3126c25911299711139d794cca3e9b2bb373ee17 SHA512 695f3424e0cc247a069fbd6b94820554e003030eb0e208ba7be38f660c5fc29f74a057e60031ec77918b5b320913d6deabdf19a0f0666b0f5bc5e2724e1fddba -DIST github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.1.1.zip 21279 BLAKE2B d8013c686f7cd497091f4c7d782b283eb95faa7617d68ec7f8cf937c5925d677d8552c662291e41cf2c137fce163d45fb62dfcde88088225c13e0980fcde3d7e SHA512 f28071ffb6515262fb73276725181a806740688fea8de8d9484e1204fcfe6e5fd437e38a3299acec6bb545deb31373d910a09d92937308176b2043ccc9f5397f -DIST github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.4.mod 88 BLAKE2B 840afaa28e8d5b816289e6556e114311f039b477e5ac86fc1c2ac80b1f8d7729ab6a83b99baa4c03de9634240481feb13900fd4049753b8de839656d6a7cef8f SHA512 31e50016a01fd485775368e2e430959278cb6c03ae6b1871b3d0c173fd43e91654ae87d1758c08daf897e55be8b4044bcb47fc072ec645d16e2594f345b46c73 -DIST github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.4.zip 14233 BLAKE2B e8823d65705a9ee5cc0bb6e3e2d99800d9c94ba6d65d6bcaf45687312bd28a48a6f814b3e40f7e7cef7e750c64034c7cb537efaaac1a7d213cdc89a886dc52c8 SHA512 30f32cc78130823149f4cef944582435bc7ed15279dd04e0273ee1d9361d01546c68f4485cc230d2b1582f21093a39f4279aafff827d0c6f0da5ab595a60de58 -DIST github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.5.mod 79 BLAKE2B 21f442637ef0be838858e192b563e158bf6ed1f7e06e09a3872fbcd613046b095c5209d9ccd9cc0853ef14947b6b70d4483675505d0905a1d2aab15e7bfdf80a SHA512 2af320b0514b032ee87a92d99d673579981571f325d0d46133e212a639eca274d5a6f8164a7256cfa6c063967b98ace36e637f53d90331903fd6e4a21f1a5a19 -DIST github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.5.zip 16077 BLAKE2B f05e4ad34d0ca2cf07ed10f5b4510f277fb4fe621523c213016171a42be56edc1b33185a93226b0d04ae6f629358603030083c7b5ba03a36fadf8349b0ebaa9f SHA512 240fccffe9eef7f5900b7e3add1fc95b45efbca63d6c09086ed4a0d4c50d470fddeb01672da067222c107b794c204f8da63c366782c52e7b7de6514c310bcb7d -DIST github.com%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.0.0-20170729233727-0c5108395e2d.mod 37 BLAKE2B 80edfcae1f7fa1ded69a583baaca5b236f4f9539d6e63b3b59557a8407bedd0bc3cab897d50292cb7d2a75bb52b67435f4bdda71e9cc55d901cbe574f16f3cb7 SHA512 c69dc49bd88fca7c67f4b866008d9f253387c1806c55fe82bbca0c99136b58020058e0681659e74b8f96e53d74d39d5ccbf11eec6291a0e0eac1998ba39f4d50 -DIST github.com%2Fgorilla%2Fcontext%2F@v%2Fv1.1.1.mod 34 BLAKE2B 378e68460634c64da8779bea61bcf813ce4c5797c3ea541362d1409bff606626917c1bc4cbd030d98077819c5a8abf2ded047c047c2fc6b58977093e67e7b6ab SHA512 1db09f5968fde5c7877937c2ba476afb8a07832943f66c24cda7669ccde744ecc5ebd6e9efee9427b24e10fafba5f7acba7416f9c4e438c2ae2ab22c4483127b -DIST github.com%2Fgorilla%2Fcontext%2F@v%2Fv1.1.1.zip 6042 BLAKE2B e2f7528550bb8f14d3f1546786616d85248b896e5859c0cba4ed17cab5af3f37765064621fa41fe0ecd46646b547ac54a48fc42070be9271f6dc333eb7d174d0 SHA512 b062352a9628f1bd9408dcca0e1062fd2c20c7bb7e2ab03518f866236e914706412cfefdc21e7b836ab9f569ba0d93733bc1a3f3f0ef1ded5086075826b0c708 -DIST github.com%2Fgorilla%2Fmux%2F@v%2Fv1.6.2.mod 30 BLAKE2B e02807a9c1526691f789f8b176ad7757507d87fc5fe0d52b8997d72e9d528682a6fd10aea2426d11649c3caa7b6e4ae3c552e86fa30f3f710e6354caace3a88b SHA512 2facee17b28c8b9111ec642ffa0975e7f80601b4ffcc4d1756468e963236fc303cf69d3b5129287b746dc08a66fb719706bef277171b709a3013e6b4ce7e43c9 -DIST github.com%2Fgorilla%2Fmux%2F@v%2Fv1.6.2.zip 49324 BLAKE2B f38fcc4e7ebfe5ae0c0ca5eec73bc1f160e9e1467582b4ba8fadd019e8172d5c92814ce0a041e3f33d63129d80cd8210ef6ad14648b73ba483c7e4a9e47f464c SHA512 ba82f8bac4bbca155cdcb7ca59a4e9754cefbd65e45f84a7cd1cedde5e415c59e7a2a4f7ead37a615e3622cb8fd792070cb8f6fce4b9387067074ce89fb9b3a2 -DIST github.com%2Fgotestyourself%2Fgotestyourself%2F@v%2Fv2.2.0+incompatible.mod 48 BLAKE2B 1928fe4e63005bf9d678f5d275400bd3519d679207918c44b0d93e829e1171dd1dded06cb8d82109e1f0b06b5b8a3f5124f1596e736ed83c15b6831de57a271c SHA512 dc9bf8e49c8937007be31d97dac8bc58e0ff9e983b8f287c50944ba074281c1e2d20e643cb26fb207a936a1703680a2884ef10d07bb0b9fa0c545d5414dcdb91 -DIST github.com%2Fgotestyourself%2Fgotestyourself%2F@v%2Fv2.2.0+incompatible.zip 93535 BLAKE2B 5bf87f311a8e5467a6202c59609ea2620aedfcde525a1ff7e7ce2c6b436a4eb965ba7bfc2d19883ba467395629d9f0835e9b55f795e9456fc29974d37e6be12c SHA512 9e7aff78ddfa1ef1f98af32b05d6f8da72fcc49dd1cc3b9297d803cb5d6709e8135bf43aedab7ce5a55b29891964f15aa36029893c069b9088c65d225783d3ae -DIST github.com%2Fhailocab%2Fgo-hostpool%2F@v%2Fv0.0.0-20160125115350-e80d13ce29ed.mod 39 BLAKE2B c5448e753ad6977fcb533ce8a4cb69f2368a5de08335f39627f010f4efd5a7651b6f2292e508781e21618d16cbfcd1d21471c406f70271ea8da75fdf38deb9e5 SHA512 35c1d78a8870a8b6236254d3ddb28c571c3a04c13768f107da64f89e7759313c5959de2292770ffb01695abb0e1c5cf513ae5ce59adc4b943e2ba45d62b60d4e -DIST github.com%2Fhailocab%2Fgo-hostpool%2F@v%2Fv0.0.0-20160125115350-e80d13ce29ed.zip 10501 BLAKE2B 872147c7196877fa0344fd3be0c925575044f284a0c5a33c95cf7d08907b5674b7dac356544791c6722c59f14da958e538610fe35bd28faadbaaeaa21b0fe22f SHA512 c9050d3959318f6aedda175a6b39a2d0c9d82074ca6c85cf7a6afba0e05b342997307e91fd65cb359db91bd8d6a9bbcb11886e690003f86520c2ad9c3962cd10 -DIST github.com%2Fharlow%2Fkinesis-consumer%2F@v%2Fv0.3.1-0.20181230152818-2f58b136fee0.mod 42 BLAKE2B 5e2c15f1bdfe2c7e2107b9af2319e049756667adbee48f7ca4ccea86a74ee4d1a9cae81f8a3ebfb322992b9678a3cdd086f86bdce93f41191794359a4a44f402 SHA512 3c4faf2a621e647224516b61a1b78e22c79fde1b7dc7c4977f508c9a42d1ce6b90decfa099313e194ae41593b2f8210438f507b0ccf751f2ec52db589e38081e -DIST github.com%2Fharlow%2Fkinesis-consumer%2F@v%2Fv0.3.1-0.20181230152818-2f58b136fee0.zip 343717 BLAKE2B 6acf764bda95dd8ff34f7f9f49dcdd4e65af35bfff2705daa03de399be2c9b130ef3ff165a0ffab19fcd6d92a293f5a8f4a63ad129286e5bfd08d7c19aadd8d5 SHA512 cf3a0810b3ee624c114f9356714fafffcbc10c006836bcd7b78f2574d799a4674ae33a3ec8ea56908c39382f5f35c8f09abc0f32806b9b27d2e7364b0ee46ba1 -DIST github.com%2Fhashicorp%2Fconsul%2F@v%2Fv1.2.1.mod 35 BLAKE2B abe58b21d1d4bfd808722eedf7c5539a14f98cf479cca98e38905373a84b0d230168d22f6cade1576e145585289a01a69597d1158a893db6b8393a203d4b295a SHA512 30a341d9047bc35fa2911b119514c68e9a29ac0b57ab84e820b5a52f968fa7968d662777dbdabf06f96f0a4398339ab4d25c714ab7addb833e5c4d6e938a9fb9 -DIST github.com%2Fhashicorp%2Fconsul%2F@v%2Fv1.2.1.zip 8956670 BLAKE2B 8d64e26bfc7ed40d21be63e1ffbad50141ee3c06f89b2204a167bf3926cee95fb5138ee698f4142ed5ac74730a8a7ec7cd9e1d19b69ddd70fa467db50ef640e9 SHA512 06b91c4a9160e842af81761707f2d5eadb5b7cca4c1b6c22ea3d5d8b2559dbe83b45b683f667d929005181c4503a11356a8f086d9868a3a2ed269f8990d6729b -DIST github.com%2Fhashicorp%2Ferrwrap%2F@v%2Fv1.0.0.mod 36 BLAKE2B e3101c1f32c24b5d5bd3de55b4f15645e7f0b338cdcfa00d30cc4c063bf4e9e31e68972979e8282d04920ffcb54f112c8c8f6e0e109824e56881a6a699cdf622 SHA512 2b68ca06311d8602f04eb738a68a24951a9187aa70018d938e549cf7b555bf54dadbda5825501436c52f6103bcd220ed170c99e4cf777187e2b997c87f05fb0d -DIST github.com%2Fhashicorp%2Ferrwrap%2F@v%2Fv1.0.0.zip 9306 BLAKE2B 1172cbdefac5f63dc5dc155b38f1f6e63bafdcc4a9ec057c3714a93251fa88d9cf29aae780587b13dd4eb4af10fde2dd305c4ff774bd843068726c05861ccc4a SHA512 fcecaaf6496b11fb35d01da0d3375508c978b0a319d344c61f77539be199f1f13ed892f2019d5b6d8ee1603c576064203ab87e235bab4b0bcb96d28f9e16e88d -DIST github.com%2Fhashicorp%2Fgo-cleanhttp%2F@v%2Fv0.5.0.mod 41 BLAKE2B 927bedbe012a3bba2fb1363bf0157795f58be7dde5d303332f72ae6d7bd13775e9e1e034db821821857801b21b2366a92a28bcb84c00704a12925db0ce19a4e4 SHA512 302b6f472b54597aaeb4b43528098b5a5264acc97abf2228d8cb62bf32e6a29a7171ec6fb8898b494ffe837ee044e58f5596bff425214985aacd2b8b69934341 -DIST github.com%2Fhashicorp%2Fgo-cleanhttp%2F@v%2Fv0.5.0.zip 9548 BLAKE2B 42b7838560a999f9e5993ddb0d2c56df785334d7a53a66a1165acfcdad1d61c74711f70963bcc606e8dc20635cef940e1f0f921310bd25731923be21d79d1490 SHA512 ab85daa699ca551b48699cb4e41e449f9ce46bc8921c7aa149b6148499e0b369d60df79de1568119c20cfbed7b2febd7ce2df3800f73315da3357b2a373d7cf4 -DIST github.com%2Fhashicorp%2Fgo-immutable-radix%2F@v%2Fv1.0.0.mod 137 BLAKE2B ca790b5dd3ebd80c7fa24936acad0e033a7376302440c349d53debe64672d75703e83086fdaab607bb87dca35fe7640b2ed941069692dfc9ae37d4a256c7be3e SHA512 aadecf34782d4b40af684ef29e5e45f560d3593b52d5b6ac6b95664c02c04565fd29dc2d48bf1519091129b86856aec732fde408a8acdba41ff9a7ca12bab140 -DIST github.com%2Fhashicorp%2Fgo-immutable-radix%2F@v%2Fv1.0.0.zip 23003 BLAKE2B fa553bc49f3f28624830aa0323b0c668db17d7628ca24b280eb718711c240e67fa6ec86b61c7fb5799b63085b570238d07c925a8cbc13e95b9d73d00e4a2ff65 SHA512 91c7b40e4125c3350ac4700bab85547840a8cc848f01bab06bde2eb51693a6dfd584fff718bd2425c67b15757e6e3f8a779cdbb051afff2094444f4bcb080ba8 -DIST github.com%2Fhashicorp%2Fgo-msgpack%2F@v%2Fv0.5.3.mod 39 BLAKE2B c5b445c060258545233b5453482e0c739f815c1ff605b539610f3b0bdbadb6da88954c6a408084f171354256bb8521b528573f56080d4125f4fac474ff9bde83 SHA512 45b4424a023ea15d95167322e022269e32f7a718dbeaf192d0cee9f6bd136f5b4a26827d6d041a8103a95f622a0dc92123b32e6463254199893f360ad8680de0 -DIST github.com%2Fhashicorp%2Fgo-msgpack%2F@v%2Fv0.5.5.mod 39 BLAKE2B c5b445c060258545233b5453482e0c739f815c1ff605b539610f3b0bdbadb6da88954c6a408084f171354256bb8521b528573f56080d4125f4fac474ff9bde83 SHA512 45b4424a023ea15d95167322e022269e32f7a718dbeaf192d0cee9f6bd136f5b4a26827d6d041a8103a95f622a0dc92123b32e6463254199893f360ad8680de0 -DIST github.com%2Fhashicorp%2Fgo-msgpack%2F@v%2Fv0.5.5.zip 63182 BLAKE2B 6f6ca7aef3a60232a715cecb6f2a4f642fc32388229890699371d7a901498726bace0e37c800db4096769c65cebef01dc4abff9a111daa3cae8fd8352ff18174 SHA512 a50702f312dc7b0a9dc95c3415980e51d082e0c36820917b7ff5bc0965e06d5ead6d7749cf8c87c7671456e9c07e9625e342b644aa6f49a10b4483a198f845b4 -DIST github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.0.0.mod 87 BLAKE2B 34587a565b583aac6338d7d23b4e7c2ce12deb6700e00bec711d3d8d829ef1ae356eb1b28873d5bc2a0d6ed249dd6095539a1dfd8c177bec32e08d97f4003620 SHA512 d47dfa43806a386eb74b60f692b3bc580997edb9d7feff6633992a5adbf94d102a238e036d828952e204960152c62895288af6f09e2582e8b1408d259fb834c0 -DIST github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.0.0.zip 14840 BLAKE2B afc6e5519fc2dc1209382c6ffb6f73d29dc97b6cfa03ef525d6095e65870a1ce25ca59d56648e24bc399f53f6879c0a3ce91e27645a48734602292c7d99bfe16 SHA512 8f86f79788cec64d9ce4f02af2ab7acd64f2014e5b592256f07563841444520bf4810a1dfa76abf04909dbe5f3298c67c0a88e636e45a181e461a2fac08d385c -DIST github.com%2Fhashicorp%2Fgo-retryablehttp%2F@v%2Fv0.5.3.mod 95 BLAKE2B 66af3c20daaa7307f453ab70f7f8db429de6202fef7ad27c4c54f6a37d5c06c253df6ea24ed2315fa8208107187615b7e5d7a5aeae2cd1fcfd3be407e8f67fe7 SHA512 472addc2b61db4d72d356e2033b0963352d5baed7e2c28a567ec4f4f8a4cdf199d50de2022d136f9ef85ee5e0329c2e4b9a6797e4ef07e348fe7976aec56088b -DIST github.com%2Fhashicorp%2Fgo-rootcerts%2F@v%2Fv0.0.0-20160503143440-6bb64b370b90.mod 41 BLAKE2B 6718f09b4f6e2a582b9a3cad01f048403edc8a98175e561516a719f52bd7d9c143cd623bfa3907e54c04070ce16d127320cf96ea6704138653093a8473cef7aa SHA512 316770a6c57be834722af8c8ed9acc353aa424ed864bac1cae33446309eae419cbb9829c2acf7d7bd514e38cdba4563fda2d6dd0e41b03ce46a6bf5f214b62c2 -DIST github.com%2Fhashicorp%2Fgo-rootcerts%2F@v%2Fv0.0.0-20160503143440-6bb64b370b90.zip 15036 BLAKE2B a39fa4b52728e3c61a0145b36d9774ed9b4ee4433f005f01fa2d1b3bacf0e877711b89e7449e260f8f88835392e55e1504585af9aaac48011fc03eb43cb705a8 SHA512 7eddaad836fb8c50e0b76085be96f6e0cb18092d910480f6f44a3758adbdde836cf288bd2115cfd5fcf68fc7f58750475b9fceb0c4b2c6cad5e98713fb538b94 -DIST github.com%2Fhashicorp%2Fgo-sockaddr%2F@v%2Fv1.0.0.mod 40 BLAKE2B 211ec0a2a2a91bfe13a6ad5d7c6cac97497b62796053c633e945a51aa13dc946b6dee1adf040db0e270e1aeca614a43242673dfe44baf06034856d89a61b4030 SHA512 756eee5fa17dc2f37aa9bd623aa2ea86e6ca35a804da1b48067b08fcabd4083ebcca867bb3562453d17f517aa1e6aaec0143cf5776fdf3686ed562f11147293d -DIST github.com%2Fhashicorp%2Fgo-sockaddr%2F@v%2Fv1.0.0.zip 130743 BLAKE2B d7e78c75b2a9cf89b07fc1c1ebd0f93668d595e21d13f45fe7cb98f09a8e7539cbc2acd2d14527370c6d4e219c0d5dadf414a8504930b499dd306a08117d774f SHA512 718496a1cd900d52b314a0113729906e42940f9e3caed0f989f16d7e28a5b8476400c00917f05e669737c5c45da3af95741c99a188698b628497ab2eb18ec49b -DIST github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.0.mod 36 BLAKE2B 8596defaedca9def85f29cb25a0ae25f8d2ec8eb64d64bd143a237d54d4d23b6851cad71a580667127188cc22d499be07628ce9c916dba946e7b189b612cfc76 SHA512 900755decba72d81cb348184648aa676c4a4c7359cc88ba3b41ebdd7691eeff401a41a495bdca7747e82274b3b2b61499b599e67b5c7369caaf766ea3e488d0e -DIST github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.1.mod 36 BLAKE2B 8596defaedca9def85f29cb25a0ae25f8d2ec8eb64d64bd143a237d54d4d23b6851cad71a580667127188cc22d499be07628ce9c916dba946e7b189b612cfc76 SHA512 900755decba72d81cb348184648aa676c4a4c7359cc88ba3b41ebdd7691eeff401a41a495bdca7747e82274b3b2b61499b599e67b5c7369caaf766ea3e488d0e -DIST github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.1.zip 7804 BLAKE2B 118a166e041d64c446114e195ab870455fb75db45554e02f0ca1b0a2ee76938022120848bcd5d3668a9711c32345db5911cc627977a602bfdcaa875be791199e SHA512 3a3e4b23b82bea9b094f407662f5c63659ae427bd0e922c37f0dcafa1e3cbb16f4117f265cacf2a0219f5240d378aad7aa4cd2f9960e07b7cc7200859b0d6699 -DIST github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.0.mod 39 BLAKE2B 13f90f934356dd1daefd27a94bb7a8c31f09835ea69f3fc83d343004858c6728bdd6bfaaa919331f7ee04744d18ac37f46a13be9feaa20e24e88ee364991a9b0 SHA512 bc3e0c3b16454e0f079bef539857c22f09ebf11e78ac1744a22f5af87d7297979b7ccdd48e4f59605cac562c268c3cacdbf2745f65be5c934f73f216707120e1 -DIST github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.1.mod 39 BLAKE2B 13f90f934356dd1daefd27a94bb7a8c31f09835ea69f3fc83d343004858c6728bdd6bfaaa919331f7ee04744d18ac37f46a13be9feaa20e24e88ee364991a9b0 SHA512 bc3e0c3b16454e0f079bef539857c22f09ebf11e78ac1744a22f5af87d7297979b7ccdd48e4f59605cac562c268c3cacdbf2745f65be5c934f73f216707120e1 -DIST github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.1.zip 19548 BLAKE2B fe48c3db37bc280cf5f36e522f4b13f7daa45768cad11c1148634ce7af618c1c20f568f98ea7193b0be7021fe8a4d209a4a7f1c94be3c05924a36022a57c46b1 SHA512 6927a910a368e1f2b0792989858d25c5a55891082cc38f5907c539a35919916e02872619cbf45ed583c6f6f8e85936a3fa790a161b071dddc922383e983d37ee -DIST github.com%2Fhashicorp%2Fmemberlist%2F@v%2Fv0.1.5.mod 921 BLAKE2B df064db28a23bae411857c5abc0e9a0e4635556e51326db806eaa79008505c49b9ed1579a7db6f72a9cbd6128fc10cb858cdaac6d71725fa4b21b43526767c04 SHA512 8128789efce7912b540284205af308c33ab47af7dcbcb165c1d0a86e342b17bbc8dc5c8cd6d5c5e751c412b6b4b8e80bb6d2f3b4fadd813dc147301ec27c45b6 -DIST github.com%2Fhashicorp%2Fmemberlist%2F@v%2Fv0.1.5.zip 104669 BLAKE2B 60a2eee7a4300ed4d9362685dd5537d51f884036c7ef5005243a3dc3a06c5e74c2e3d39d67fea2f51bb6a54497dba77b6bac95c85fe27147d8f6bddb9e842502 SHA512 c6ab6dd7f53e78a4aadb04e7ba169a8826225822efda73f4864f0c146f4dcae81ef6a2d3e4dc64729f26bec185dab3af73040a5abe588c599695dc516e4f5cce -DIST github.com%2Fhashicorp%2Fserf%2F@v%2Fv0.8.1.mod 33 BLAKE2B 2afbed06d8fdb0b51c45d20761df6eb7567fbb6e71bc9c2496118a18fcb317022aec325c46367fa2e043a281b80b0249f3cd6d1f9665b15378426c460dd68297 SHA512 fa1952ff68a6c2b0b16f7eda3fa87aeabf4990c565910c85619f8befe88db3c97a75c3eeb5f7585c0d2a763bd88f63e5b053320ae112e74cf3f92e2721c906f5 -DIST github.com%2Fhashicorp%2Fserf%2F@v%2Fv0.8.1.zip 758923 BLAKE2B 1395590a04d98d24dcae8505960b20fea7a6e9c6bacb6b03d6ef40f27c64814df46da75183914991c32ce64da5e967849f97ef5f37e30b1f4db684ac557a45df SHA512 85ed83e91db124ee725a50d35e51374eb1ba0d241eecc59f6e12d7e4d3eac6424703c26509cda5b25c6d83c3c08e88d9f0da9f2301cacd0d8b35f8a293df188a -DIST github.com%2Fhpcloud%2Ftail%2F@v%2Fv1.0.0.mod 31 BLAKE2B 7202132cff9b47a4484c61586949dbf7e13622067675cdd09dace3ce2e5b3a37b6fc5275b3bd6dbb0ec6ca0335bb7c9a036cc043b2d8ff1f38bc90ce13041aec SHA512 54a5bbc02b82693a977a4f690314b16d94cf071decddee3a4af2a90398e626ff188bc34ab3517278e7aac4e657f3f3070a020c85274be3750371dfdeee139b23 -DIST github.com%2Fhpcloud%2Ftail%2F@v%2Fv1.0.0.zip 24894 BLAKE2B ab55c48bafc78202f2a0a494c6b00657dd81c078c0a23f797a59049e8ac59bc399f784ff81beb710aabd1d035e7ee3db5a4c90653d6e57dc3b3f0bcbd098fd39 SHA512 b77e39712e985744e277604bbbcd48f32d28ea69eac7a6b6cc0a3f8706e2970ccd5410761784b64eae73a07786cf81c665934c145369317b8b961b503582643a -DIST github.com%2Fianlancetaylor%2Fdemangle%2F@v%2Fv0.0.0-20181102032728-5e5cf60278f6.mod 42 BLAKE2B a20b1ee1675ded231069e976e9e3812b116d80b207914ecd1266ce87160bd6fd3c0bdfd7f7afa4a2a4d7891a01cd7e4a7b7bcafa90ae31c5875f6b0eca00268b SHA512 ff238b036db5df69dc734f4a0db4d1fd1a94a04131d64ea20c5268078a645327527f185da4aab38b2aca60da8c6a5f8f118b660f5b0773cc76d7d108a47297c9 -DIST github.com%2Finfluxdata%2Fgo-syslog%2Fv2%2F@v%2Fv2.0.1.mod 247 BLAKE2B 22cadf66a220d8b6049c54d100560675ed838a3dabcc7cf8acc7d0714a619f4b2040e0f4cd9c9619dd226a69a621821b81bf0ca578f0a5c9b35bcd00eb981eda SHA512 eb51aff592bd4a5a73f9adbc18e88613af46ac212163041aec4af37f33b49a255a5b854b169ff5a8441a02097ee304eae55fd4f24f0b09fec8e70eb0918b5551 -DIST github.com%2Finfluxdata%2Fgo-syslog%2Fv2%2F@v%2Fv2.0.1.zip 131544 BLAKE2B bb66de5debf59ec455caea71b12b150716a4a5bcb9f47113b289edd93b4926206a50d17a45d12e78340e5e294d98959ddd0c8233c28b68953146e5506bf60633 SHA512 3422caa4fdcc7133dc63d93cd0528b7457a6dbf8ed3fe8d7f4a805db7593f02f5ff2915bb577275b057a5f2c0506ddccd1de87cf2307101db6543c5484dd1308 -DIST github.com%2Finfluxdata%2Ftail%2F@v%2Fv1.0.1-0.20180327235535-c43482518d41.mod 34 BLAKE2B 22d6a3b6430914ca7c7a3df5d96815f4dea8041a46bff11dfc0c0345db147a891f5e89fc6cb6157b69a33c18b9f447da5c83fc39f4c80f2e1f40e319a6c6affc SHA512 022b5ded27174a7fb4b05639eff508edf3e1ce696531170966dabb47de4614a126191735754221b9afd7314e54ca74915c4f122dda02ee0cc29a37ec6f575d1d -DIST github.com%2Finfluxdata%2Ftail%2F@v%2Fv1.0.1-0.20180327235535-c43482518d41.zip 27200 BLAKE2B ade667a3ce1911cca715390a8825eb932f0768dfb2e7bdb35af957c6ada464bfb37f4efb4c79749a33a505e88cb7e615745080a7e211d57df64ac07470e30c75 SHA512 ca06eb56701d4bb7d50479cd967b73d44f7bc871283cb9e799c950c7b8b2a0372f6cfcd759759e027bccafad6ac1b54702dfbc4864c7f338cd39ec78a7cbc7d4 -DIST github.com%2Finfluxdata%2Ftail%2F@v%2Fv1.0.1-0.20200707181643-03a791b270e4.mod 138 BLAKE2B 1760ffeaead1dcb0b0ed0f22fb6ca697cc34b7a00affa06fe1a58aa2fd0a243e84ab1f61b54d9655d2c955c41d208993aed9537cb54df63b9dee974d065abcc8 SHA512 deee34b9935d72a18426c7284cfadcf42520f8ea5af35312663eb47575f557375aa3a0aea3c34ca769b935160d9a7aa43307fbb7c1e95e0993bfd47976b3176a -DIST github.com%2Finfluxdata%2Ftail%2F@v%2Fv1.0.1-0.20200707181643-03a791b270e4.zip 28176 BLAKE2B a37734d0e54369c38fdbf4ffddc0ef89627f7dc57a70897905391c0c7867b1cfedcfddb693df663ac9ea69015282e851694a5743fb487d7d38be86c7bdec02c6 SHA512 50c3972c30f5ce6f17b188309b8c5f6dec68d83b8ec59a449fda7d05f9206a71c6810388ea2272a6ba96bef170b6641958c127e0bbe5b8b1fb28088030c86241 -DIST github.com%2Finfluxdata%2Ftoml%2F@v%2Fv0.0.0-20190415235208-270119a8ce65.mod 34 BLAKE2B ed78bee0fcfe193ae63e0d0b28fd300c90b0e3ffba8dbfa2097b621ba89b88c753aba68ede896b40624be6972c279b77dbb7980eb2b98572c4cf0f379f397463 SHA512 be5038b1002a96ddb05ccbc793ba42804c83085730a7d4c9d96fc56d7975beb1c8ba85a07739f6d85702287d0018818955d85501313441357856a921d6ef48ad -DIST github.com%2Finfluxdata%2Ftoml%2F@v%2Fv0.0.0-20190415235208-270119a8ce65.zip 62213 BLAKE2B a669654efd803965b540493fcedb45e48e2129e01617531802c3f47eb0dd6a660b3a7866349739de6a7fcecda259e4ac36661f564dc0d2d804e1b1707440383b SHA512 00ff42eabadc8cf02f28d29796cbfc90798fc257ac03fceef116b98b6ea2626ce4bf775778326e610fa3ed265d90856ffa83c3f3e95ef6ebeb004da83a1a0611 -DIST github.com%2Finfluxdata%2Fwlog%2F@v%2Fv0.0.0-20160411224016-7c63b0a71ef8.mod 34 BLAKE2B d1935ffb0787f6c524db337ccf616db4508713079f66aa431fdfdfa4e1c643828b7099a77a61c375a98995944f190de35849bd00d46b4e5a40de6dfd5e8cfc44 SHA512 77d616e07fe71612d72dbdd993cb7219a5ca5adb6dbe34ff0fb996c4aa77acbac3f35073827374145c0bc025ab8f4f640a32a48b541ca7caefd29baa91c1e9ed -DIST github.com%2Finfluxdata%2Fwlog%2F@v%2Fv0.0.0-20160411224016-7c63b0a71ef8.zip 3356 BLAKE2B 42eaeb1adc8d2d5451829111328c5cfd13fcb51dcc50d55e1fd448ba6e81f29414b61adeba62dbb1f283e381cadcf52aa85202008ae478cb4351d43e0f1ae334 SHA512 912643ccdf4302b28ee6ccb7afe6229aeee2c390f94a51a1d1d8a0f71a7f77ca194c9ab54e823daefc3da500bdba0b377325d98ac3c99e526d37b19cde729c5c -DIST github.com%2Fjackc%2Ffake%2F@v%2Fv0.0.0-20150926172116-812a484cc733.mod 29 BLAKE2B 3d5b46c50c2c48a41de97e3fc038e4ea6b6cc84c3c518bd867ce8c8c1518c7b28886533e6e8a9e5e64b949348b0b15c193ef29bc236e7e81bbf46e6f79163ee9 SHA512 002762fc54b7db0152d59a6388108b028f089c21f024353ba85795e00db73b93c73377ecb728b1ab801e915c20d3d3482e32b467187cc05c37c8d163d53c5e5c -DIST github.com%2Fjackc%2Ffake%2F@v%2Fv0.0.0-20150926172116-812a484cc733.zip 94860 BLAKE2B a648fe1ca6c4ced3f5419d04fa35b67bba768103bb448b722e355b653f858caae42194a22d17cae2541d0bc81d74963d3cdb40dfbddefbd90bc8719d270a53b9 SHA512 b0645f73224bfa22d2efd3f6acaf0cc940b8319378e06cfcd9cc407526fb988dbf23f75ad56ac8085152425b2561391e0342faddd276373e5228d7440038e877 -DIST github.com%2Fjackc%2Fpgx%2F@v%2Fv3.6.0+incompatible.mod 28 BLAKE2B c6ec1d0b807ad4dd8c0a9ce726d1c1d93d964c07100d8c9684f59fe5f348a5a6b158feb2181d43ddfb0586a0d0a124605aa6baf4559b380b4e359e9c8dfbfe78 SHA512 76a383265779809a87851fce9a713884b6d9e2c69966153f3ab67c566eeddc149c6a21266e91d91fee790edf6654d1b80c197513aa4a8617e044f08e91c91f5c -DIST github.com%2Fjackc%2Fpgx%2F@v%2Fv3.6.0+incompatible.zip 381211 BLAKE2B f4f683b6b9b878ed4a1392d72602057be5932e0b8fc063800a8208bc4cc11264b68495ad832296a4eaa4143ccf1df4aed2e91a6762207b2e28b230b0c44204f9 SHA512 f2905226b7100cb3ae44dc4d2ee70a1bbfb9d31dae9673d9e7b29c3224b75daa0be77bc592b5d77579408cc987e6f7929e09aac393e69de537f60a4d3974d5ee -DIST github.com%2Fjcmturner%2Fgofork%2F@v%2Fv0.0.0-20190328161633-dc7c13fece03.mod 35 BLAKE2B 152ed61bf84dd1666421e11827c23eeee0c7c50edd35851a50ce21f4fefa13660a7a6cead25a0f9d8f1b748c2c4277d21639eb781c484359aef00e77921139e0 SHA512 5e94601c72f24a3d8a115759a8fd6fd3420b662995ce94d7dbcfe4f86437bdf81a42c77c82accf7fdb926b75a5898bb34706fff864e00b38d891cdd076fc89ec -DIST github.com%2Fjcmturner%2Fgofork%2F@v%2Fv1.0.0.mod 35 BLAKE2B 152ed61bf84dd1666421e11827c23eeee0c7c50edd35851a50ce21f4fefa13660a7a6cead25a0f9d8f1b748c2c4277d21639eb781c484359aef00e77921139e0 SHA512 5e94601c72f24a3d8a115759a8fd6fd3420b662995ce94d7dbcfe4f86437bdf81a42c77c82accf7fdb926b75a5898bb34706fff864e00b38d891cdd076fc89ec -DIST github.com%2Fjcmturner%2Fgofork%2F@v%2Fv1.0.0.zip 31175 BLAKE2B 17e0ba33bedb9809d12ffefe034baf727e7c2a66aa19adeb87de3e3659c085f176fa48951f1afff4e5fe132c73d4520ac7061deb0e24d86520936e6ed6b63845 SHA512 d1717086c3d429838c88ad276d3bebda858fb4afafff46a204cf252685d9c7f1e2b15916f3cf7f8c03fd54e68d2d1c3ecb64e9d73975ebe9ae188039f0aa4570 -DIST github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.0.0-20180206201540-c2b33e8439af.mod 39 BLAKE2B 6129177aeb4cc82860b5e233715d4330fc61c4b6783af687d936a5d783b32f7192f268ee0954d8a37fc1a6c22c147e86a1fc1c9ee8f48cc979931b0500fc92b9 SHA512 19819e43a514d9d7b1c8703c06c3729456a39a963a1cd3cdce7f6318a3ef67f8663c5a66b6bc402cf422d823b1b63540a6c79f371cb81ecd1f13de646598566a -DIST github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.0.0-20180206201540-c2b33e8439af.zip 231432 BLAKE2B 99b12826322d86b39d622bba690286fbc43b9e0336161d5218e6620caac0580fc7b3a021e60047a19815e35a4821d31066bf1ee6ca0e49f7bbfb1df10df21380 SHA512 331f1c4fa97173f022210d15719a9ae8a0dcc1c7574e1f019959070bd8cc3f77e34dba16d78e8d9e0083fee2ac24751aa36d5cdc0b2d1303a5118156ea514b7f -DIST github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.3.0.mod 92 BLAKE2B 8b5eebcb883871ea090297a64f2ac5171b87eb4881fab71e73fc737e2ca4c301d8fa3a14f184d5c468120ea4b3f22c89867c952795fedbea7abc9b7e618d14c1 SHA512 8361dae50e9bc2db7887bd94f516f817dfc1a3c509c776640b0f9380343236d52a3f43a5ca0093a49a4ab6b5474ec2ad24a4c8549d5949e4f5fed0b322b83c21 -DIST github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.3.0.zip 195553 BLAKE2B 82dfb1c701a06e1759c91bede2d7ac9614b92909431a1619d6bbb2dc2977d7628379c6ed622b57562ff6f2a1b063f1d8bf325435c85bc66f1a684adc29011a95 SHA512 8eba43cd8e422879a1b92a672826867a89691207b99cde00ed906c4fd6fa87b5c2ba4b0e58f5f1b1dd79bf7376aa790aa18b1d3eaec4b144cc1d789ff763c4f4 -DIST github.com%2Fjoho%2Fgodotenv%2F@v%2Fv1.3.0.mod 32 BLAKE2B 108af2b21e180487fb535381cee881222cd34895f1b3d78561bee6bdfee40e7b9681c74345d10881fbe519fc496181b85eb880b5ec411e13b24926a39ae8a512 SHA512 5b3e66c42da78c7df031089cc05aabe56671eeda4617683a1e9857677108cd0dec00332f5b05f29923b1314fa1d1c88e57fac1b653808cadf5a3cde93daab03e -DIST github.com%2Fjoho%2Fgodotenv%2F@v%2Fv1.3.0.zip 12758 BLAKE2B 09c81f777d01c390e78ceb0b3bdb54c0ab19e1dc8f1d8747ff79e96c12b9fb700e3affa05a65b2bd36b42cd86979a45a78cb3c7288ec9dbe3b8c972313dd83a2 SHA512 73928846a03ba2fc7df0952deddcfd553e2decfc4b336f4c60b90caace96621b2b01057319706d4e52c6590c4963c049a496aaae92bb054d0467a9977c4befb7 -DIST github.com%2Fjpillora%2Fbackoff%2F@v%2Fv0.0.0-20180909062703-3050d21c67d7.mod 35 BLAKE2B f55b1c507e5054287bb6637b3c799d7d56342906f680ed3f691be557e93a417204fcc5a9c1a6c62a6081b895ffbd2558d7d2cd5e064672e2cd47472a92b15a30 SHA512 75c03e33527b1b86b6355b533ae18cc7d87df77338d8627602b7af2068fb020c94cffc51c971fcba4338aa166cc6722847e3437a6db1ccf209145314d60bcb45 -DIST github.com%2Fjpillora%2Fbackoff%2F@v%2Fv0.0.0-20180909062703-3050d21c67d7.zip 4232 BLAKE2B 97e018373ce6fd37b21ff0e158cfa19ffd7e81e1ca791a5de8e84791b0b3af4e882d27b99784497271ec7f998012765ffc91874fa5046f2a4871cc6848c3cad4 SHA512 50999c6713b07d6e0abaeba84f59dfefe45cd445216c3a327f980e46d0101ff29c096e07dec5e70c1f648498ec5016afa74343ed5668a68ccbf898be2ce495c0 -DIST github.com%2Fjsimonetti%2Frtnetlink%2F@v%2Fv0.0.0-20190606172950-9527aa82566a.mod 178 BLAKE2B 305d9f2431b92866a80f6d956d8c0e0825857da7177e9c628d2cfb88b6995a49696d9274d7e0a8ae5e3ec8a1e490f3e5ac74f8f1decf6730ce70bfc9d3681ec3 SHA512 9dae3380dc38404b99d1a7119e3607aae1cd1132f8d7a808733cc22ed21fbc4edc2d1320d008cb63439812151f44a69938abcff05a6c8727d1bc58b2c973dcc4 -DIST github.com%2Fjsimonetti%2Frtnetlink%2F@v%2Fv0.0.0-20200117123717-f846d4f6c1f4.mod 215 BLAKE2B 290912a223a80b17cda3da4e72cb5a149e6c3e2fa8d79bf221d6529eb74c1e88c602bffe1234f16657433128f0ef3c9091b723689be39a6193e421b44bee1715 SHA512 549d0522fff36f194065fb864e65e0d11fb5aa45f4720d38c74049af138d75a1f7680489d5e7c4adca47abaf902dfdb202d05e8b040f119c1fcec2c22f412d0a -DIST github.com%2Fjsimonetti%2Frtnetlink%2F@v%2Fv0.0.0-20200117123717-f846d4f6c1f4.zip 244042 BLAKE2B faa111681131e76d0e5f2a1f667705cde703918b229e031bb20b7e7e8eb397500d27de90cc61b968849d436a1ba392cf6b9290f41572cafc3a17f4554eb60f6a SHA512 350c63f32591be74831e8d5d671366ef4b81ed73863b084c6eb63a4f98ce811290738909ef3a0d73429a187172a1f6c2983b187092c12f5ed68cd05ba6a306a1 -DIST github.com%2Fjson-iterator%2Fgo%2F@v%2Fv0.0.0-20180612202835-f2b4162afba3.mod 35 BLAKE2B aa26eb3b67893fa913ea0f88bf22ac283c6cbac246683f41ede681940cb2e4437d033811fc12f2b47f9d94337dca9cdc926fbb5f044b2caed19c8e46a5879432 SHA512 e8bb59637bc1154ed648179314c4e20fa7f549353d094f4861e2fdfaeb70da1c1711c1159e78d82914a35b8ce184641937efd8808ffb1384136c7a6f3fbeb78c -DIST github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.6.mod 35 BLAKE2B aa26eb3b67893fa913ea0f88bf22ac283c6cbac246683f41ede681940cb2e4437d033811fc12f2b47f9d94337dca9cdc926fbb5f044b2caed19c8e46a5879432 SHA512 e8bb59637bc1154ed648179314c4e20fa7f549353d094f4861e2fdfaeb70da1c1711c1159e78d82914a35b8ce184641937efd8808ffb1384136c7a6f3fbeb78c -DIST github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.8.mod 295 BLAKE2B c143c3fdf7abf77b2a2f55a66f8efff4f0e99478a89cd3cfaf50fb042e0da2fda5dd1e203c227597cc2caa7039f269daa48339701233a3e21f898eaa028ecc87 SHA512 395eb3069c417f996120ec06ea8d7a712f6d8915c7398da1f346c5bf5e0fde4492bae0ff3833f3316a41a28d23fc7c9c494db312da72d5cacdf52b2bb95da6ff -DIST github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.9.mod 295 BLAKE2B c143c3fdf7abf77b2a2f55a66f8efff4f0e99478a89cd3cfaf50fb042e0da2fda5dd1e203c227597cc2caa7039f269daa48339701233a3e21f898eaa028ecc87 SHA512 395eb3069c417f996120ec06ea8d7a712f6d8915c7398da1f346c5bf5e0fde4492bae0ff3833f3316a41a28d23fc7c9c494db312da72d5cacdf52b2bb95da6ff -DIST github.com%2Fjstemmer%2Fgo-junit-report%2F@v%2Fv0.0.0-20190106144839-af01ea7f8024.mod 43 BLAKE2B 02346f7c8a28f8d40ef233bc1fc6f3cee54a54bfd79b374ab7f3435039a5d9f7da5d7fb7824c618d25034cde1d355b503bddd76b804d610828a080ccb2707dc2 SHA512 801663d67d1aead6b01df89e329c8ca969a1f860b5ee2c2018094791060bf6e8cddac8e2d788ac823e32278d4e9ad1dbd72935e4da2cf6e65a34dc97f195ce7c -DIST github.com%2Fjstemmer%2Fgo-junit-report%2F@v%2Fv0.9.1.mod 51 BLAKE2B 4cf5f813ed021b04c810da33b332dbf44f45594e3657779687cd24391d2a93770f2a0e8999fa5a8b6564da5e08ed9fea1e52394907d518ea14a9568adf263e67 SHA512 c5761bc45d554ee6639c4ca23fefa5fc5c8a7c818f8f18d0b43aaab26c8114615543a1be207f5aedaef53c2dda623edeb7d3ae1c5ce6b72ea42605a1d5c31667 -DIST github.com%2Fjstemmer%2Fgo-junit-report%2F@v%2Fv0.9.1.zip 42083 BLAKE2B 5f9cc715c99fa4058551abcdabb96e2294cd50c79f49e8acd42b0e37cc990599a1eab827121b259b47d7af6fc62f1b75791c4916feafe6be08e2df3932e49fba SHA512 9f5d126347316b497910b30fa2905e6b6c119fa975adc6bd4f17f5a346cbe110c10f33a7df6ecc63e086c082f61ce493e4ca5efefbf2eb8d024f2a07cd80e093 -DIST github.com%2Fjulienschmidt%2Fhttprouter%2F@v%2Fv1.2.0.mod 43 BLAKE2B 2b7883d00bddf90261a91670917e335bf5c59101032ed3ef5ab6752eb4da25e8417071b1d0021441fd887158b519f4fca4b028b6ea52fe3ae9a41b84441c8c06 SHA512 60340233f2a0205ee4b1a7b2d78ed52d88fe5d39887413d0e62d6ed006c51eda83ac117454b0c1a31ab29c5aceae13810ec719dadc554d10480219c1afc3e5bc -DIST github.com%2Fjung-kurt%2Fgofpdf%2F@v%2Fv1.0.3-0.20190309125859-24315acbbda5.mod 35 BLAKE2B c1b6f3da9b37c5e0888f6ae304f7885901fb5f90bd94de7c980b7089d2477ea25f0fecf30b502f55fdb6a8dd7ba49683f33b89d761de0acd0e9ccbeff53a183b SHA512 824e0e8c8fe3985feb5f25c43725d4ff70f577373406b08767795e691f0bb10594dcbba4149e000bcebaf231bca5f72649c0d078b86cd4df38d0805e1939d63c -DIST github.com%2Fkardianos%2Fservice%2F@v%2Fv1.0.0.mod 106 BLAKE2B 29635d818c715605a16a0306bf6d39398b40027cdd5f803d0ff380066ae73929819d977fabe852d70d4265e08c88e594c3ea2a41d3f8b4146dae495842eb8a61 SHA512 0d10077eac1aeee58db445ade2b67246f9b47c600d70c4a751c20c6569df39d23f1ea480a90b9f061beac8f21a6a6cb6f17ec5430c9c70ae40a8331a4a79ed7a -DIST github.com%2Fkardianos%2Fservice%2F@v%2Fv1.0.0.zip 35322 BLAKE2B 0f5633488edc5982faeda96642a60932105e1680d88ca1d6d2cefb63f03fd17789d2d1f39c43eb7f374ec21c9540b7c5ac3fa4cdf025d3fb77d43d4eb09c428e SHA512 04a612ae506c509a36317ed2ee0f34c7c1880035e654061f0bf5a77b27d40d6a9ed7880679b67ddafdf4424e1adce03555f49a6eb6bddc51d8efbc946a3466dd -DIST github.com%2Fkarrick%2Fgodirwalk%2F@v%2Fv1.12.0.mod 36 BLAKE2B 473d06ea15a3992475608d6b784ae45908e77494d007d63599aafebf49b54abe9068bc58b581bf1be6a686c679048ef5c9ac127b4c00aefe9b65328dcce8b3b3 SHA512 0e4f2430ce02a71bce1b8ac38df95b86332db955a8e7d9d59d59c094c5003adf8af5a3073e350fdd06ac06ae9d8a1a30b4d8b2c8f84e2a5c5e9c720bd0727fd4 -DIST github.com%2Fkarrick%2Fgodirwalk%2F@v%2Fv1.12.0.zip 32029 BLAKE2B 0528fae59cc8c4c2b9ef085be257b301e9a6cebc899c006c2ead8eb4efa8f8d3bbd037e4f787b94a04ba66cc2cc7d9faf079fc9629efc9a36fd69755b9128347 SHA512 59bb65ae4f9a32662a2473a01cb7ede88882ee959e7c135727155ef5eae5f70da1a79ef3727b12272b57f5573e4b9b8b25297f2bf4b8911f334b7497ed7f684b -DIST github.com%2Fkballard%2Fgo-shellquote%2F@v%2Fv0.0.0-20180428030007-95032a82bc51.mod 41 BLAKE2B e9dae477e838938303749c4e7f1d0ece371d20bfb8f0d6fbb915a9ec249b82e300ef691c2175137488065828f67b02503576420fc95c2aa40f4fda262526dc7a SHA512 ab1be2f5ee91ad8c24a7c1d3c2277506dd76f85e8511f53e923ea7e0ecba140303c9312f0ecd2e09631e2e6591ad31a3b19e900ec102b486ed9b56c38a0d0c84 -DIST github.com%2Fkballard%2Fgo-shellquote%2F@v%2Fv0.0.0-20180428030007-95032a82bc51.zip 7034 BLAKE2B 7732946a34f604c858bda571c3afee7e0e02720d02127d8b4887f4f0363389b50088727de91b0436f0c943d11de80dfb766208f15665d0b4e5cf68f2a7b00817 SHA512 f9c4eaeeb1380aa5e219a19923cfd51f2612fbf11b7f37c710cdb0dfe20270f8cc7841d50dfd17110b004ec46e4c90329286213e04de481a54094df73efc9fe4 -DIST github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.2.0.mod 98 BLAKE2B b9d3c55999054ed927f666a43066ccc6758a6c5f550651f43ad5d85b5403c882ee76ac2b2553803d71789da33c60ea41857ed545003072ab6c666dbb77118e00 SHA512 3529b37d770af511a716a612b7fd7fb6a4805d13166e3a6f9378950443f6eceb2f3d95db5a46027437ce55b36e571c75bba72a03769d21ecdc97888019d80a68 -DIST github.com%2Fkisielk%2Fgotool%2F@v%2Fv1.0.0.mod 35 BLAKE2B 2f43dcbab430f12316fde243db4bafe24372c74d60874b05917269e249a36660309c23da151db31d89c0d0a8fd0f179e2dd7f386af3ca533c95ef74017609af9 SHA512 86aca37f7f94ada381e0528a535b344c8fdbab9e0dcc7b71d716083501ad3d61db701ee159ccfb5455a351fc18a405301abe798037dd1200f9950bdd805d3dc9 -DIST github.com%2Fklauspost%2Fcompress%2F@v%2Fv1.8.2.mod 37 BLAKE2B aee0c04f2b8e92b2b4fb2aed9691b2e55f27eae078ca0d7161866b1f815b14e6b7de03c80c567e6f1407cf9e48606bb097eaa0a26c5b7d46db4a0d18852fd233 SHA512 18830e82c89186889b494ac46cc8c4fb398f3aff5416eb1cec3e3b09af281ebd50bb0e8ac7751f6cd89bb1bab3738a354183ba12eb3ea42aa7dab36177b613ec -DIST github.com%2Fklauspost%2Fcompress%2F@v%2Fv1.9.2.mod 37 BLAKE2B aee0c04f2b8e92b2b4fb2aed9691b2e55f27eae078ca0d7161866b1f815b14e6b7de03c80c567e6f1407cf9e48606bb097eaa0a26c5b7d46db4a0d18852fd233 SHA512 18830e82c89186889b494ac46cc8c4fb398f3aff5416eb1cec3e3b09af281ebd50bb0e8ac7751f6cd89bb1bab3738a354183ba12eb3ea42aa7dab36177b613ec -DIST github.com%2Fklauspost%2Fcompress%2F@v%2Fv1.9.2.zip 15250054 BLAKE2B 08c03efb0c26b71262822fcf9a33ce15704a46b5a0d34ce7e93a326bc66f0c828e54a1dd05cb04c9c7a29dd3eae04d21ee79a126ce459495b8059bcc93a0ac9d SHA512 9f2cf982e384ce11720e611bfb00f3fb4c58fbac700d17cbca89d83ee2845fab41ded10ce27c0f84773406b345055494d53d7ac7292f9817b07f533f8b8fd67d -DIST github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.1.mod 58 BLAKE2B 4cf48282c28d2b8237fe9ff852ad25d102cce038fbd1852a1938bcf69c895df05dfdef6e533b3c0b4da28103eb5e3a9561f802414ccdd99b2d3ec2e2db0807ee SHA512 fe33ca4de6588b95f0155458b8b6daab218553b58de5dac220efe54019dfab085838cc6a22012a106fa36a6094447f744825cad04aaf0b158fce5aa676048fe5 -DIST github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.1.zip 3567 BLAKE2B 80b7bf217df9367160180d44c1fab6a9f10154bb9a6455538860158a08c5bf8c794fff973b899b1376e4e65764a9aa0d6b8b162a6d9ebe1adb1368b9a2a42786 SHA512 27910ae03fc9fbf573ac31454635c43bfd771d2a91325eca544f7be0e24b43c2798ed8e74b4c31e8c20c1a9cd266b835017aea3a3e24c2ecb43a14a6143af8e1 -DIST github.com%2Fkr%2Flogfmt%2F@v%2Fv0.0.0-20140226030751-b84e30acd515.mod 28 BLAKE2B fddd4b3cdef60f53bc3f8da5a3154d10b49dd180c12837d3740c22b442947cba2025649f3ac7321bcf0c73a272527659b0ccd9be141ddca13caa7594bf6ad3fe SHA512 3c623d077e39697506174a50c0380cb7787a05a52819b1a73c2f64ba8dd819fd500777de83c83d8d9e80f19c828128a569b4cd783667b4d6b9a375b0e3d527a7 -DIST github.com%2Fkr%2Flogfmt%2F@v%2Fv0.0.0-20140226030751-b84e30acd515.zip 9142 BLAKE2B 0db0e9a6ba33fd156c75943cce1b95385e53593d7f6957f0e6375b38625e1ee60a86b80229ce6cf0ee33de603fb0788892d0a3c3cd20a6969c1acca2521953da SHA512 5e493f08d6a45e8e12160b8c51eb380156ba1d2382523e1be159fa16d15d7ac32c8bbf2861e74791a0fdaa06155e95ad12b5f4999515a9a69dad1384ebbdfad0 -DIST github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.mod 67 BLAKE2B 2e1b4a8a38998179a32db321d331db54f881770a89719410876cdde1799cb8558ca2862bc70838d606540606d05918c4b115cf1c125945a77ed376c2efc4aa85 SHA512 4d841fc7a022e4e09e0a95925ad92a75809a67c30fb88de9190e4a2196383038dab9a5b3294b6a0b4786248977a0e09eea857a34100cbf22f8a52912ce9fa58d -DIST github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.zip 11159 BLAKE2B c176e4bc9b5534b0df153e027f22be7d28eefbea1c0adab10979f19d601b95d300c54086b5ee388f453c73b9931339b9b04208fc5e6512385b348c49faff5488 SHA512 bad73f3c47f70de55a90a977a1e2b4a68de545a8425c71533de081c7a8f71d7ab1b489001c56ba2e88dcb78c08804275f7f8128c812f50d005a074ed6dd9286f -DIST github.com%2Fkr%2Fpty%2F@v%2Fv1.1.1.mod 25 BLAKE2B 63db8520df2f699bca5a7ccecc44ee04973307d86099cfe66ded30e2ca1bdd76fc3db48cfca0138673c20c6f94061caf219f018b21b9d67231fe959eef338596 SHA512 967fcdce835c12afbf3b12bb204a256f32d46a3da535e2a7250159f62781a163ee107dd2a4fa20743b76bbf52b97e627e11e895c8d5ef73aede37d6a89e326eb -DIST github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.mod 64 BLAKE2B 475c51201a379df2cc4ff8c5681b6a7a1524f60d0b8fd0853fef569dea754efabf3425cd4b84e8427db8a6cf3e9b1141d5050d48d5d429cc1ce82162aa70050c SHA512 11d2502a7d241a0edf4e67bcb651a890a12f49d00f8b944cc9eb8f6e9cf5fbb2b2827e696021649bc795ffa275e95ee700e4a1706e03e88fa9ae079f5b9f48ce -DIST github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.zip 12591 BLAKE2B 944b0b9a802757e78e3dfb11d6c4d79e0e0d90489d49262b7079e6ea4728328457f8773b392c8a618aacb5fdec78948a16cc852eff71ca6f4fb9eb422c03890b SHA512 3f0d00b0545769ad882e25a9a6f30b96ce4b72a8a46bb3c064907c94e2dda4e499eb32354c149f89752f9bc5d1ee5cb2ee5cafa46e2f65ea329fb432d0c0029f -DIST github.com%2Fkubernetes%2Fapimachinery%2F@v%2Fv0.0.0-20190119020841-d41becfba9ee.mod 42 BLAKE2B 3c95efc431dc5c78c28953c2a2033a980000bf6741ef3a9f26ae7e51c35783d17e0e7797c26b6e9d0575f756a4d52e1754c0c16ceb01e4242856d2118bc382ef SHA512 c66033add6ada3158b5429c71866dfa8fec7b5182a384937725151d8e888ffa653efeea6a6a455c2b20ede12059142e4d60be908137fc4bb1d96410862c5ab3c -DIST github.com%2Fkubernetes%2Fapimachinery%2F@v%2Fv0.0.0-20190119020841-d41becfba9ee.zip 741151 BLAKE2B cbaf0338ba4f49590f0da866a1d000f5460f4ddeb4774c6b6bfa1399d9d31748bd04c2f6f7d080c984c91b3c9cdf032588c9bb108c8cf0132916845f79119502 SHA512 c5754b7cacf6180dbc97ac55f1a8b81fec49407906cfa7159ae97d9e572b1f780bec5a828176feec93ad68a3ff1f9121b517d33ab6a251e5f1a2c94219a0b17a -DIST github.com%2Fkylelemons%2Fgodebug%2F@v%2Fv1.1.0.mod 46 BLAKE2B 1989fd1b186328abc02f8dcd503bf396ee63b55630d3f37f576c7e55b4c48623f62d5f2b16d047afeaa13cd423ab014f254df5f210da52535bb8818a60b375d4 SHA512 4fcffc595708aba2673e895182e695e91d6d239f8feaaaeaf15d75fcff398112af0f0d5ebdb28506d95eae30533dcbb54112ac0b0a4034ee11d7a35b78674915 -DIST github.com%2Fkylelemons%2Fgodebug%2F@v%2Fv1.1.0.zip 25634 BLAKE2B a236740e22b6dcadaf27ea0f90a68c15bed68599ef6cb086acfb1c555a8c0210663f165f3bc64bd9cfc20f3b8a9f1c5828a4a658699d3bda97104f759aef78b4 SHA512 a5ffd5713ddc3d9bd49ee9cbb0a8f5154bcf0eb073c9a772c24a6e11e824b2deee18425347f84b267192c52f3559086573e966fdd8e73e84fcee03c1971e1b7f -DIST github.com%2Fleesper%2Fgo_rng%2F@v%2Fv0.0.0-20190531154944-a612b043e353.mod 33 BLAKE2B 38c2b02eef81805a7d39706fe72c3c8d1a836e1806315e017f76f484179d29d7c9f2a3d611c3eec4f20a681d87d9dddf7996aab42cd88cddccfce2a2b9efd09c SHA512 0abe0b01c7e4fa3e784fa6374bebe6fd9452bd66435ff50e2cb5eba94ea67fad144419882b14e36b23d7421d67f7295e6f949414dfdeb56280a6ffaa315554d1 -DIST github.com%2Fleesper%2Fgo_rng%2F@v%2Fv0.0.0-20190531154944-a612b043e353.zip 23009 BLAKE2B 80036de08d86ec62794fb6a0c0fa5019cb0273d949986c9a808d36076f795fd71c9f1c31cfdd6424fc156d629f666ea072b1f42d806504edb19ab9fd683acea5 SHA512 72271a1ae2b70c04bbeb5335a45b90c3da505fe4e6eafa702ae622258aa2c83a7a4b79c1ce47340b361ef3314d3428e880b2ce27e0effe387e19aa6401a66c9e -DIST github.com%2Fleodido%2Fragel-machinery%2F@v%2Fv0.0.0-20181214104525-299bdde78165.mod 83 BLAKE2B 61960345c1d7ecbf46393c994ef306e05f4b847a8c6139ac9ac5b2be687164f91d12112ed1df0548e3f7dd3b4a8f2fe1b6145239f9ac9dd6018a1742bd1decda SHA512 47e43f1c9bfaa56d430a0a9d575c22b4e2d5320e82ffe940f936ab616490b4cd1bcf30f30a784749d382e693b0479e1c40178a93dc7fa2ba30dd504edead8d4c -DIST github.com%2Fleodido%2Fragel-machinery%2F@v%2Fv0.0.0-20181214104525-299bdde78165.zip 13817 BLAKE2B 7d5f689240d6ea8c93419c1c52e02074b3bc1cedc53302a5025389baba7c78a8a0ad979e6f0d86625998072d33289af86cb5823f2d5535605021614765181d0e SHA512 fac4265ae19c467c1a23062dff59538f42e5a99df32862092402e7da122f79cf66f4ce771ee6553962eef1b6fb14a2156dd3abe4ebbf4dea7c3e4215a8e9064e -DIST github.com%2Flib%2Fpq%2F@v%2Fv1.3.0.mod 25 BLAKE2B f81559c285e1be835f5ba6f95730022986373524dc66f0ff825885bc3d959ebef5711ccaae86983c0710da8a501a3e97829a01cf67bbd560dc7fdae682b0b7f6 SHA512 493893b0368a6e9ba2c2aab1650135de1dcc087e6eb172226a623d62a48e4102857f68f9ab6cd4f7047e6a291c62824ba924076891d162bbae846d97166bd1e9 -DIST github.com%2Flib%2Fpq%2F@v%2Fv1.3.0.zip 114746 BLAKE2B 19f9157f1a163b5dfd9e5a2b09d92873c8ac191aade266d1706aff1624f3bb0d87fe7cfe0c00c4c02a7cb649a98d931d1f95ab547961778117b61909982d0231 SHA512 3da4292db7b32b1422a7c85497cd4f8e27b532dbd7570e41b17f9388f9377912cd9c8fc6c205bc504f652f7b3c6945ea21f125c14c5bde97dd4a629e327ef516 -DIST github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.0.0-20160728113105-d5b7844b561a.mod 34 BLAKE2B 0f1af1d8e53c7b13c36f0a436cfc14eb8fc7a7bd4df72d4e9315ffda79ce20852ce50ff6297daf8fb2998e1d76af4082f71c94555ed919170d0003483de94f4d SHA512 8a3f702f8044a984fb6e1b9c73d837cea4b7f51783fbd03c6a957b58a0b4084461c63c94367314ea91f4684612b1f7b8d4eba8c1cb3522913d51db41edb73cd1 -DIST github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.0.0-20180717111219-efc7eb8984d6.mod 34 BLAKE2B 0f1af1d8e53c7b13c36f0a436cfc14eb8fc7a7bd4df72d4e9315ffda79ce20852ce50ff6297daf8fb2998e1d76af4082f71c94555ed919170d0003483de94f4d SHA512 8a3f702f8044a984fb6e1b9c73d837cea4b7f51783fbd03c6a957b58a0b4084461c63c94367314ea91f4684612b1f7b8d4eba8c1cb3522913d51db41edb73cd1 -DIST github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.0.0-20180717111219-efc7eb8984d6.zip 107723 BLAKE2B 6010f8a48db41df47b2a4962aca479872feb426299bd2cc7e39a9f3a2451ba26b31a280fd75f2f13ca82800ecc9f5b9a90ca5c06c2447bf270c633421f95f13b SHA512 520a5196d4a4264a697dbee35546d1128aefce7b20f3112fbfc8be7fcda688163b64a709d12b4a86a0237c1ec7261ab3960b1f5cc5967d29eb1a1c9c421dd583 -DIST github.com%2Fmatttproud%2Fgolang_protobuf_extensions%2F@v%2Fv1.0.1.mod 56 BLAKE2B 50d2d6dc9c1ee92d629af8c9aae9fe5f70a0c6fe270a95a8232cee3c50132ef90c68218ac64a3b5b72d94e23ecbea5f567fef39a81be3d4585bae3f4f5348545 SHA512 5235188477921a263176fefaffccdaca4bf8175a2e248356a06596e37fa868400203172c7fe9fb80d0a65d335d23d80edefd242657de0eb83d9360589e063bba -DIST github.com%2Fmatttproud%2Fgolang_protobuf_extensions%2F@v%2Fv1.0.1.zip 44378 BLAKE2B 15ccda2b94bb024656859fb8a6968782b9a1bffb786b0b1ed69a3284b01f4a2100b3f3c46b6ebcb8f7febedb5bd4f6762fe333b7d4f1d14c700f8fce60843352 SHA512 e9349ee2a7d5e5b129ec6a1c0507854aebca82cf9ac2d0a681cac2f4630ea35551ede48e1931494362232a83dc9f26b6b4162c6114e0176084c50101b1da46b0 -DIST github.com%2Fmdlayher%2Fapcupsd%2F@v%2Fv0.0.0-20190314144147-eb3dd99a75fe.mod 44 BLAKE2B 4a697783c81fca0bfa4c9dc6b189abbfdd902d44a2a9e5c4acf5841868cde4231f2e1ccc0c0f92158669a228ef508b692599767e68bbdc49be0d23216c78dbb6 SHA512 0bd6dfbb4147ccba31d510473e10d435e9507d1749abb759a4e453ba9fafb89bb138bfa58fa67fb81ca9f97f7520388ff7934893261e20840b22d59ece848c18 -DIST github.com%2Fmdlayher%2Fapcupsd%2F@v%2Fv0.0.0-20190314144147-eb3dd99a75fe.zip 11381 BLAKE2B 6b02ff3082189def3fd8e7f0de2e8c158d4e8ecbd138a39fb10a86ba38e0a119e8c6a1aa370e9ea089782409a6a7f069004c1d5de24d1f9645ee02fc01a02bc9 SHA512 4626ef93115bf3d6999d19bd6cb672ef0ad1fa5555513677ed6a1bab614adc431e86d1a560cc560a112c8f5518e8906e848b19275bfb3cc09df7b852c5a4187a -DIST github.com%2Fmdlayher%2Fgenetlink%2F@v%2Fv1.0.0.mod 234 BLAKE2B b1660dbb5765757fc3386a77b371bc5425822dc3d6840428a046e8223ff2c609302e6735a8e2e525ad643eaf300199d03d8c2f2ffdc4f2643a3caf3f7dc568c0 SHA512 a8c90ea59e48146137faa902e0948d73fb2e877d8e7cc18979f2e62ccd2b640bf67e4d718b7b3d3d17b1ef187012a23ebd91bd4f539e97219db318a28fbe7f0d -DIST github.com%2Fmdlayher%2Fgenetlink%2F@v%2Fv1.0.0.zip 26695 BLAKE2B 9d585bc8b3f4a7365e1bc772869723190647722ab35777eb70e1b2df520bce470ecb02ab45ae620ba87d12fc86ef4bf4b5c8edb1a7bcbdd91f5a5f5821c8c6b1 SHA512 9d0d6f4853a857f7778a7c1521fd8a6a870de22483bfa19cdc6b46106798b16434f25c3ffeadb3f59a75665bbbcd93c8615854aaa8584ad8dd1abc7459b87307 -DIST github.com%2Fmdlayher%2Fnetlink%2F@v%2Fv0.0.0-20190409211403-11939a169225.mod 196 BLAKE2B 69661cd95029a767e20e49762a593633d3acd11e44b489bedc3f52c0a997826b5a07e9706b74edfebcf3aa94706836ee6362edcd32a9a7b6ff33dbb01ab0c1df SHA512 edb2c00f2879dfedf8116e6f21f8358ad89750e1b26ab25db625c55fcfbeface38b523c72e376bd7a5eee333d33e883cbf7ed26d07b4b3a567a162283d9aa006 -DIST github.com%2Fmdlayher%2Fnetlink%2F@v%2Fv1.0.0.mod 264 BLAKE2B afcb7c0ee7467a383178aed08ff780382ee1efbda1101cd944cba4dd653974153654b3ff38943fb7d6ecece515997384e8eb6f9be2aaceaa4b09bec6fbfddfe7 SHA512 e59cba812a94c451a95be9347f148f0341d0803f32f5f387f6b9dafc96bd4072b035e6fc504235554585338ef448304fcefbc50b1b345d80b27f1cc1b2b571b2 -DIST github.com%2Fmdlayher%2Fnetlink%2F@v%2Fv1.1.0.mod 264 BLAKE2B ac83365044a3a4cf949e88ebfa21128e7af58e00b1681d94165dccbd57c8cbc45079b84d0da814312f60baeb0bc8209a66f5edbc6c9b376ed2068ae167f35eff SHA512 18c6cda418f62c68b1f39b3d40ae8f6a81442f577bf8eb3180df408c0ed9e05e4f43b57d0bc54f4d51b1c13d8fbb436f01895c3a3c70ce08d7d47ebca1e46726 -DIST github.com%2Fmdlayher%2Fnetlink%2F@v%2Fv1.1.0.zip 74437 BLAKE2B 2be63a0aa702e9058b30dd748b107531f4eff9d45f75e9c19f9201fb004459f000068680e087de25dae41e078a635583748d57a7e8ca61d11a371b92a34b823e SHA512 6352cd230bd13320273b41b39e2b7b8736a8a51149772e20a1656b83081112663ad8a9143a2507fac52114aa44afe391ab4302f6b2541b014e2f4e2784a4a640 -DIST github.com%2Fmiekg%2Fdns%2F@v%2Fv1.0.14.mod 28 BLAKE2B 7846fb7a9c146e4b4cd0db250d3a84bca13c7c3b8292ba71215a041006c8ea39a36b88dac7749a9bba96dc463b499633591f6f19d43369067b0f4f46594b8ddc SHA512 4ce4d3df63fbdbfe3505816e81dc7e806554d79cfe0254ce8e0228bc16eafc014c98475c24f4a6e0c6efb6fa16e891e2e47c43c9ea10ce20a95dc69f686f6361 -DIST github.com%2Fmiekg%2Fdns%2F@v%2Fv1.0.14.zip 205179 BLAKE2B fb8268a263b729fdeebf985c355c67aa1f3d2d9cfa21dc8268852df9788a2b27b06586be0d715e0d65211272b41117810e2441594bb1f74013cfcfd794baed18 SHA512 21644fd845a9e20e7b142e5671cc53cc39a0de3461b8374b6fb1719b44d464014041458e547e1621a765c3156742b0d5f2c6bd168f4ea49e9819af0d9f25ac79 -DIST github.com%2Fmikioh%2Fipaddr%2F@v%2Fv0.0.0-20190404000644-d465c8ab6721.mod 32 BLAKE2B 91a9ff4954d5d7fc828666e1d280db97ff3d4394812cceb5887bb2f6bf6f68ec8fff9a2124793abebd51148a3b31dd036c28e4a98bf78a2728f5a2535c29e47f SHA512 5a1ce7f2f85fba9589f1e430e7feaa897f45088543cab41e2e664039bce7a9310cf4aeaaae056889603a1cbb9553bc37aa153e124ec8e245d464468e38d7ce54 -DIST github.com%2Fmikioh%2Fipaddr%2F@v%2Fv0.0.0-20190404000644-d465c8ab6721.zip 24270 BLAKE2B 8f722104a0c1017e3d5527ea1a93ebf79557d33633055045fa9a55a0748dbd4ed816658adcaee91c29691ecf08587356fe303319aec3cf7783f5c6a1a507bbb3 SHA512 9f5fab77744850d9e92785d07b93bd0f794e7c4d8a1664abaf4e840304a52b8772e3a12d0fbdbaf3689f74c5519791b2560e7e802a1cc96acb1f48bf30788d51 -DIST github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.1.0.mod 39 BLAKE2B e28ca0cdd6db21c4b97e47151a6c11487314f26d5a259f9d7f5581f3d92648a57d931e1d6b004597f76cf10916fbe14728c99192e24b6da674de2cdc9cc4e78e SHA512 a2b7ed5a25e6dcab620357d5c216546bdb554edbc6fd927a0703e788d7e7a10a743471d10f5c7cc56ad829ab35c7272c61d210e55947363447832e924844e9ee -DIST github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.1.0.zip 4163 BLAKE2B 7e00360086a04fb62a46ba20a10ac3460b364aa6ee09bf46f9769980c086db04aad45c4cbaa809a218f207c086876678d708a74d0a7679a48cf62b0b5edd48b7 SHA512 06bd620730c303df004e1d6a06a1aab8d83551d594c28e42f8d43613153ac28e6a5dcffaede69c84b2b49027b62581851a332f1397a2d6df9a46078510f7d1e2 -DIST github.com%2Fmitchellh%2Fgo-testing-interface%2F@v%2Fv1.0.0.mod 49 BLAKE2B d388b11419bfd0c80b52fb3bb5a2600712364115efe7b40ac02ba2da11d40ca30dffac19646056a4aa754de05c490d1f68af4549bdd1fab7596dae593eada97d SHA512 3e334e248e9584b050eb81bd23071a8542185c64b5f112f46b82c6842d2b8707099403bbba1b8485d64cd62faaacab3fd52e868bb405ca6e6067034e66ffc51b -DIST github.com%2Fmitchellh%2Fgo-testing-interface%2F@v%2Fv1.0.0.zip 4603 BLAKE2B 409e75eaeb540957751fdf5471d8db1aecefc29511c1344edb6b9091c1052bcf22c06611d929b652682434fbd50f0b730d959e69a1979737ef29cb101ac5aba2 SHA512 e4c9a39de4fcc5087e1dfc0071920c53a95fdbd23c8e0b30cf56f7d11625e6eec44f5fd0ab6b942a5cbed86ee2b02d525f03ee026f7d60f70d1e14a82d9b335b -DIST github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.1.2.mod 41 BLAKE2B 291f73049327af60c94a2b2113b8e370f90d2a3fc7074c58ac523ce2a613ebada88ce048a73cf882c68ff552dd6df0be42f796f4ed11a549c0b7ca6c67f61c38 SHA512 7816e3703475601df65f20ad4e5d1f6bbedc4a7c87c594518358c1a9c24421aa5ccb6e8389ad983a514a823674c6f0f771f1f367b10d99691dbd8db7105ec44e -DIST github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.1.2.zip 25943 BLAKE2B 9cf08441a9bb45da31ac429a372a969a822a0c5de569352bc25403cdc3e8559a7110dd2612cc9b93c91882973aefdc70f8ddadf44c1488eb0c3f5bc62cca2b73 SHA512 43d57d9ca99ee6af49e8a39be4d65799afccc8cb077a8c5b473a9147eba30d4653a8a4cb86abce66d4c8639d1eb0d961c4a50907ce9af2b2864acb615a2ecfc8 -DIST github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180228061459-e0a39a4cb421.mod 39 BLAKE2B a4d082021123db99b5d72a1d8d0011a517a79ff7b07238f0f01e550be684f18be03907b6280e673aaabee5ea837ce14b9e4daf278a23605c8dca8fba76bf40ac SHA512 4f29e15b1d18a8952c14f5142aa863b77b7be820129512cfeb3f8bc3335ff637a8a86c0284832a20543abc2c5351a3c0f992d52db895385e45f176af899b5844 -DIST github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180306012644-bacd9c7ef1dd.mod 39 BLAKE2B a4d082021123db99b5d72a1d8d0011a517a79ff7b07238f0f01e550be684f18be03907b6280e673aaabee5ea837ce14b9e4daf278a23605c8dca8fba76bf40ac SHA512 4f29e15b1d18a8952c14f5142aa863b77b7be820129512cfeb3f8bc3335ff637a8a86c0284832a20543abc2c5351a3c0f992d52db895385e45f176af899b5844 -DIST github.com%2Fmodern-go%2Freflect2%2F@v%2Fv0.0.0-20180320133207-05fbef0ca5da.mod 37 BLAKE2B 3643a4250f81729708917dc751cbff6ab6e37761ca94784062a4eaf243682a9e2c755ce793024cba1737d0eee1c52c29984fe3008a2471ed24a759da87ec7081 SHA512 72fe8dfeed7041bf92af829dd84513f0c97f709d69586a044f830fd3de43deb27d0b02000338e00897a44c57806ad036cafcdb9661b1852ff76886ad92bd83f9 -DIST github.com%2Fmodern-go%2Freflect2%2F@v%2Fv0.0.0-20180701023420-4b7aa43c6742.mod 37 BLAKE2B 3643a4250f81729708917dc751cbff6ab6e37761ca94784062a4eaf243682a9e2c755ce793024cba1737d0eee1c52c29984fe3008a2471ed24a759da87ec7081 SHA512 72fe8dfeed7041bf92af829dd84513f0c97f709d69586a044f830fd3de43deb27d0b02000338e00897a44c57806ad036cafcdb9661b1852ff76886ad92bd83f9 -DIST github.com%2Fmodern-go%2Freflect2%2F@v%2Fv1.0.1.mod 37 BLAKE2B 3643a4250f81729708917dc751cbff6ab6e37761ca94784062a4eaf243682a9e2c755ce793024cba1737d0eee1c52c29984fe3008a2471ed24a759da87ec7081 SHA512 72fe8dfeed7041bf92af829dd84513f0c97f709d69586a044f830fd3de43deb27d0b02000338e00897a44c57806ad036cafcdb9661b1852ff76886ad92bd83f9 -DIST github.com%2Fmultiplay%2Fgo-ts3%2F@v%2Fv1.0.0.mod 35 BLAKE2B 341110b766b39352a873106425f46057d95930d536a28d8f49e30e618a78cda194ba26a147b9fcfce0b15a4fb37d54e62f438e45e30ae1bf1e2e4e0cf73a45e7 SHA512 4c97ca7e2eca4d25d59d00692b11608aefd18c9f42b63753a8d4ba1609d624dffedb58d57d5323381494adfb7daa4f2913b615ed38f1d721249e9261c780da07 -DIST github.com%2Fmultiplay%2Fgo-ts3%2F@v%2Fv1.0.0.zip 23313 BLAKE2B e9f530b751b6c168d244fbfc055aa770ef2a8b7c1009ceb43c49ff4a078fde0ed687323a06f4d0b1e18ba46ab21b0c8319bb684935def1ec5ff62ea9bba8931f SHA512 4f8f1fc1b7a3debee83aef386784fc676d49f6110ebff0acdda651d2b0bc3b9a5b736dee9f1a03d1aa466a4ad6b489efecd6af3bc287298bc82c999b16b5867f -DIST github.com%2Fmunnerz%2Fgoautoneg%2F@v%2Fv0.0.0-20120707110453-a547fc61f48d.mod 36 BLAKE2B 636b2a1011ff647b1597c535916bdde712e45585b9be3e90191d474e88e293df5b30e2e15adbd2f6d631a57ac81b59b02055b439390664fbc8a8e224cfc51e39 SHA512 7873fe200c30b46285fa8a001345428db580c67cf634c1b1e4aef6a4a82d7b975545b827d00b1a3dad86b2f3f7681df739915f95144d4d3a3553f055fa70781a -DIST github.com%2Fmwitkow%2Fgo-conntrack%2F@v%2Fv0.0.0-20161129095857-cc309e4a2223.mod 39 BLAKE2B 391eaf696f1a5c764f9e156ae3f6285ae5bf8a4abf2a735fd13fd1591f3bb97737502b79df093156305503ed4b63e0d458900e61fa8717f96ee17a6d43bc2f79 SHA512 9fccb6717f5b37cff2d858cc31f7e16aed120a67498c2f0d24aa30ffac4eba2e87822b12d62f700a0c62d7561708bab2e13e35e89cf5407cfb06a0de5c70808b -DIST github.com%2Fmxk%2Fgo-flowrate%2F@v%2Fv0.0.0-20140419014527-cca7078d478f.mod 34 BLAKE2B 315fe4d5620c1d1c92df3fd382560ac2cf164aa17a741c1a74fc25807819de811705467227923fee7f804c6b6e96606c87b4adb11a6b722f367b543c2792cda0 SHA512 b1c163d7a6a139eeee1457fa07933f01eaf6d2ff24d10385e75f87b443a95fe1b08e9e144d3c18eb6a77d34e8521cc6dbd486fefe908e60452c5a80f654c551a -DIST github.com%2Fnaoina%2Fgo-stringutil%2F@v%2Fv0.1.0.mod 39 BLAKE2B 7703b0d2668b61ecc03faf6c5d2acc198afe36da786cf9b3e0c7c52a62af3acabd59f4981abe0e6c99428a0a77264712c015985be45b0b65ee03b80900ea2d91 SHA512 18998ee91dba5395b06f49ab9b9b14b8f3f6271d9bd145ef0c536b62a121d062276fa03e0af4b540b838b30d927f39ad6403a51c1ed5e7185dc52700cf79ab00 -DIST github.com%2Fnaoina%2Fgo-stringutil%2F@v%2Fv0.1.0.zip 7604 BLAKE2B aba667c2c6a82e62059cdd544863b93e1804623695f4bdceb369a91063ede2d0c9913f20d5b6442ba00f64433b72d797ed47bff65130f5cdebe269d9fa62cc39 SHA512 45d442c6e218e185b3f76d2d49c3c6ed5400b078c77aaf475ebb299685d62ddbd645d2cffb04774f3f49fcf340751a997480a6258bc20e9315c3731d2fad35ea -DIST github.com%2Fnats-io%2Fjwt%2F@v%2Fv0.3.0.mod 71 BLAKE2B 01b34bcadbbfc83fd26f11a51b23b66f59212c6c9f9f669ddff2d19c7d563df24839933473705b86c235cc143732398d11f0ce2af1979cebc7594a742e325019 SHA512 8df11664ca01688c0fb0648e6943c13fe0c892ddd94cdf88da039470449726ecec8b0eaf69f0e41f277e9248502325093e698a8f949a7fb2ed9b59fa28bfa4a0 -DIST github.com%2Fnats-io%2Fjwt%2F@v%2Fv0.3.2.mod 71 BLAKE2B 329c114697ca9dc1dc69c4fcffbf488631b0a9648533db756495778f7ceb6de109798fc9c7e473c3cdfec6a049d6e21acb10ba6b1e2ec11cc2c2a99c03f7da81 SHA512 8745b75071b79f3dea777d3eec1e0f74cdefe5b202c8075994f7e68ba8e9bb87afb70d494fbf55944b12182d480da1c1f45c9f057c789b82ec2da81eff6079a2 -DIST github.com%2Fnats-io%2Fjwt%2F@v%2Fv0.3.2.zip 58554 BLAKE2B d5afac79067d21312a6d14caf0f0454ccdea43f699a073b03a909675dd367d050dc3aa4966d359e540bcfc945300851f12b73b57c4b5df867a182b801a860992 SHA512 2a7512428585894b1f6c443218cb44aae5d75269bacc933b1bc5aea1e9387dca78f3676a59aa66fb5b0e8db849d8d28ff63b5dfe5b875ec726856047529a2232 -DIST github.com%2Fnats-io%2Fnats-server%2Fv2%2F@v%2Fv2.1.4.mod 350 BLAKE2B fa1b0d1f56d25d7c2aba13e3931697a1d7666be2ef8999ab3a0e0e24bdd2a8ff688cf7d375c0aaa9e77d8d3de650a0baa4625f88030941c116e0d7ddab54809a SHA512 0a8a0b6938cd6a9c451caa30c8f87f9184a591d759e9e6ab01cae30980ec17fc6c335463b8ac1ebf96a1ad58639316b95caed58b64715ddf38da5dc429b670ca -DIST github.com%2Fnats-io%2Fnats-server%2Fv2%2F@v%2Fv2.1.4.zip 737484 BLAKE2B f06d9e67263988bed62f16d45b6b60da62d906e96d833f7c5247d6abf7ba9b2ba347c48ce35c80a56635c90bedd01d20509c6f5e6c8c8772240c69ac2bfc1196 SHA512 e39cb0e2599343a717f6b210abd23e41781ef1abe49ebe7fa4dc5bc69f164fee7542c5d946da6aae2b8b71ff13678f0632f4fe5fe72e32bb77762f6a0f30dea9 -DIST github.com%2Fnats-io%2Fnats.go%2F@v%2Fv1.9.1.mod 143 BLAKE2B 946454f6ede7f2a46621597850fa560fdfa9b6a08a53c0aa95652fc08178dcfea523a57fc8030e5fa101128d697794f5a3bac20a3d92fd436f960975c3b18d63 SHA512 9937550a5df4b906c0e3af1777b64d119f6adc98f73738c2a8d376d665baa7bd4d0e97da7d93f0622325d80f84c3fa374d72e706bd945e50006b10f8ccce6a4e -DIST github.com%2Fnats-io%2Fnats.go%2F@v%2Fv1.9.1.zip 166476 BLAKE2B 94e97d6b464c9abfa1bbcf62bcdfeca099203893ce731b6572ac58dc996ef70011ca1edf29c3cac182c841a3d62ca3fabf96d2baabcdc40a5d3c5d8709083ae3 SHA512 737c2d48e60d94fdd9f0d8bf14b219f8dadaeaa09cc0872c9c9e86fe8fe7e03960dde3ecf1d878c0c8a419abaacabf64081210741c31e0ae78967a8ff6f03ab8 -DIST github.com%2Fnats-io%2Fnkeys%2F@v%2Fv0.1.0.mod 96 BLAKE2B 071f4237c2606c161d8fc6160c818259807572f1e41dec9b753653b9dfcf4bab8c2c7d201f35d803ed876b99da693d15c1f5ac4075b556bfcf78e9fbec4d2dae SHA512 eb91e385e6161b3bc7e3e2e337519c1435a368fd98a26880cb37f3d52bdaaf23d7b07e1c7430592d0c960050a08c3f94e0a18576da214e50fe7047f2324b0ea0 -DIST github.com%2Fnats-io%2Fnkeys%2F@v%2Fv0.1.3.mod 96 BLAKE2B 071f4237c2606c161d8fc6160c818259807572f1e41dec9b753653b9dfcf4bab8c2c7d201f35d803ed876b99da693d15c1f5ac4075b556bfcf78e9fbec4d2dae SHA512 eb91e385e6161b3bc7e3e2e337519c1435a368fd98a26880cb37f3d52bdaaf23d7b07e1c7430592d0c960050a08c3f94e0a18576da214e50fe7047f2324b0ea0 -DIST github.com%2Fnats-io%2Fnkeys%2F@v%2Fv0.1.3.zip 25321 BLAKE2B 7a8a5f7c251d00627f30c988a0920cee7cdcd98e54aedb324a7b7fe2884542e0d27cca6f825a06bb9599b3e2fc07c6018840d4bbabcb3afbbf7bcd18501c69c0 SHA512 7ec852fd776067da58acd3e04ad13dbfeed7f17a2213341ba8ad406c1981efd0c8ec68a244b1bb98c7055fa001b75212400cbe314145dcf8eb9b223cab80c18e -DIST github.com%2Fnats-io%2Fnuid%2F@v%2Fv1.0.1.mod 31 BLAKE2B 294aaa7492b6b42b366e5130e12ca72a84223fe02b4f01281ccbe3ba68dc5b515428ce95a9b575219b4688a42aaeb1a5e0dfa3bc06a1db47b8afdda282cbb991 SHA512 918b829894cfd626c011f7ff13934a2c1c12c3482ed61652ec2c59f5b94a0e8c8510e3bef4f5cbfae977df177f8eb9a123738d7382a6a6e2f8cc582d50eb10c9 -DIST github.com%2Fnats-io%2Fnuid%2F@v%2Fv1.0.1.zip 10281 BLAKE2B 78f309117cefd950c5e784bb64f6774f62797dd8419678f1d17d44c9f9b092eb7378f47f6bc4e1199043e261240f5b3493994e97a269fdfd1533c7438f6e00c1 SHA512 cc4067a1094494f168b72cc174ded31b29dfa044eac0c86c4993938561d63b7319cf2e47154c7c62afe96efbba6468bb495c0a00990d3ad2a075167e135469c5 -DIST github.com%2Fnewrelic%2Fnewrelic-telemetry-sdk-go%2F@v%2Fv0.2.0.mod 53 BLAKE2B 8c24a8a45b09b1ed20f25ee381488a8cb0961be5377aed0ee6db100a277b41b211f876253aae9d845bf8edce532722ee7ab5f72a15abdf368ae9965be956b39b SHA512 39001292602e01ee91ff73c55c369ffa628e013be93f941147ece0a1bbd8e4cc4ad0a34079385576968c00f7f38583b40719540bbbb14dba41a247ac18620b1c -DIST github.com%2Fnewrelic%2Fnewrelic-telemetry-sdk-go%2F@v%2Fv0.2.0.zip 59591 BLAKE2B ba2a60fc88e16bc7ad17be184d7236519057f030222cec21f670f0f5475c844b2910303093c4de498f126336c3cab4aced905d8eb113a170b12a9d2de452dfcc SHA512 a483fd784539b59d611815b0db4557d466034de571062c99bc9e85c71ebb4cd39a4a50d819d5fe357d04ea9b41189372aa445c03a6a4fcf55727390bfe6cc1e1 -DIST github.com%2Fnsqio%2Fgo-nsq%2F@v%2Fv1.0.7.mod 31 BLAKE2B c5fca911d9a7c9f244149c6123b6ef3904afd74589c37f51ac24d6eebe4c20c4a850b0b7226b5073974303dece2b87decc55a20395ea36ff0f6ce0904270d208 SHA512 02227ef5bd46a087ea66e6cd08845049a3c6342f92afc97112ac8744ef1a424384a07617395f21852d8ba0c23a2f5b8b117b7ad30cb6f8e9676c78647ee16fcb -DIST github.com%2Fnsqio%2Fgo-nsq%2F@v%2Fv1.0.7.zip 55108 BLAKE2B c8039c30c03a9d397df9a8d2274b89b6ee447bc2037e047e41d86f3cb45765353abcd038d7dd2ba374253ebe1c3246002ea842e1ac22de79d8ce3ef6aa8719c0 SHA512 d1db449034b7c15c91bd9010db60aa98a6401529ee82be75aa1a75ab6cc4378f31fdc315bb2b16a29e7c418ab6deba9d5533379879a1f1581fe53450dedfb6bc -DIST github.com%2Fonsi%2Fginkgo%2F@v%2Fv0.0.0-20170829012221-11459a886d9c.mod 30 BLAKE2B 54980427295e87f99bc189c9ec00c2167e9aa771cd8777d61cec8127a3eb19f718843e2e736a6d4c08877d23528bc6da810da0c61a1dc07620422fb1b5434684 SHA512 1b8b7ce4a8f0092f0b2a2395fbcafa8cfd6830183bc36fdd58e740dc9ec4fc5201f5eec2daa6e2effeb59f9e1c0ce986ceef838d16876c9fbf0fffad4b7660ba -DIST github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.10.1.mod 30 BLAKE2B 54980427295e87f99bc189c9ec00c2167e9aa771cd8777d61cec8127a3eb19f718843e2e736a6d4c08877d23528bc6da810da0c61a1dc07620422fb1b5434684 SHA512 1b8b7ce4a8f0092f0b2a2395fbcafa8cfd6830183bc36fdd58e740dc9ec4fc5201f5eec2daa6e2effeb59f9e1c0ce986ceef838d16876c9fbf0fffad4b7660ba -DIST github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.10.1.zip 243243 BLAKE2B ab663a1a0cbe337fee8b519154c18aeb568da73186d92e7cb122650e68aa22a728c04b91992660a8626c78be5e5550f1538611718052348a2a760ad040191ef2 SHA512 9269de68436cafd9f729f88cc0b8775ff2e94a7ac17f691c4eaf8e2645808558797937b8f1de857122daf2e31ac2a2c13d5264085360530b3ed09bba40f5081f -DIST github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.6.0.mod 30 BLAKE2B 54980427295e87f99bc189c9ec00c2167e9aa771cd8777d61cec8127a3eb19f718843e2e736a6d4c08877d23528bc6da810da0c61a1dc07620422fb1b5434684 SHA512 1b8b7ce4a8f0092f0b2a2395fbcafa8cfd6830183bc36fdd58e740dc9ec4fc5201f5eec2daa6e2effeb59f9e1c0ce986ceef838d16876c9fbf0fffad4b7660ba -DIST github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.7.0.mod 30 BLAKE2B 54980427295e87f99bc189c9ec00c2167e9aa771cd8777d61cec8127a3eb19f718843e2e736a6d4c08877d23528bc6da810da0c61a1dc07620422fb1b5434684 SHA512 1b8b7ce4a8f0092f0b2a2395fbcafa8cfd6830183bc36fdd58e740dc9ec4fc5201f5eec2daa6e2effeb59f9e1c0ce986ceef838d16876c9fbf0fffad4b7660ba -DIST github.com%2Fonsi%2Fgomega%2F@v%2Fv0.0.0-20170829124025-dcabb60a477c.mod 30 BLAKE2B b8bfc20c2ecd93e4a49b1feb791a29d894d57325b04e5f36fde625431886515b2e1de0d11a384fb8138e28a131a027088c7173ffc7f8731f9f352ff521977ac0 SHA512 47de77b79abbc314a3e8c90f8d69f51fc9e99ff160a49cf6e87621183f7acdfa2dc5911877ec45111081426a4c0a6f0da55ce0491e95064a8bd416db33f25624 -DIST github.com%2Fonsi%2Fgomega%2F@v%2Fv1.4.3.mod 555 BLAKE2B b182f5a37e6169f7e40ea33bdda2790e7e1b01c1e61cc9d109ca6b8803ce9161cc0c2e2ee857ef5af582b1b9317c58734683ac3e8a8d11c620865b3b12c6baf6 SHA512 a7ef7e84c93e09b01b83de08580bec055f0164d3272a3e2571707d0b33f4b4616a379d440ab3835d455d8d573e357a6df1163fa8415684d5d55af8e22c68f7d8 -DIST github.com%2Fonsi%2Fgomega%2F@v%2Fv1.7.0.mod 555 BLAKE2B b182f5a37e6169f7e40ea33bdda2790e7e1b01c1e61cc9d109ca6b8803ce9161cc0c2e2ee857ef5af582b1b9317c58734683ac3e8a8d11c620865b3b12c6baf6 SHA512 a7ef7e84c93e09b01b83de08580bec055f0164d3272a3e2571707d0b33f4b4616a379d440ab3835d455d8d573e357a6df1163fa8415684d5d55af8e22c68f7d8 -DIST github.com%2Fonsi%2Fgomega%2F@v%2Fv1.7.0.zip 157659 BLAKE2B 2e4a53ddeea8a6076af3dbc356f34d898c0189871a6328f00f0690479ca34d2efdb670a3c0a67c19a4d34684f25145d4bda7ea9a9cee1e26cc6d941a274ecbb9 SHA512 279292e468d786f0f94b627b00b7eda5049dfa9be7423ed5c26e80fc2c020787f5feceb7571654d903787089c0fba05f49539eed958f97238065924d6eccc003 -DIST github.com%2Fopenconfig%2Fgnmi%2F@v%2Fv0.0.0-20180912164834-33a1865c3029.mod 34 BLAKE2B 3280ad7767af171082a24bee15929a74aee41303c37d60a94715e43dec57a6ba73be210e83ad3f5464456fc564a07d6ef523841e00735dae89ac62d174168788 SHA512 4c8874a667f6d43523f15931055032f5495c91e68976823e31b4746e49820367fbafff16473319309d9acfbeee4afad4ff1d6b7c8bf16a70904c10b51cb6608a -DIST github.com%2Fopenconfig%2Fgnmi%2F@v%2Fv0.0.0-20180912164834-33a1865c3029.zip 232085 BLAKE2B c25916ce0c54a1fad44b4ba9e961b184bcbfe2a28d3964e86c9feeee82d67d0d97496ba5ae8eba57490c7761f06374dc11fffd5bc8641e34a0d52fbbb465edc8 SHA512 e011bba70552b13736a6c6b19dc33077c580cc2c4dc420f128cf036c7ad5becdd2080041aa0c0e35a1ba1b425d7e58e5c7e4bffe1c024551fb026950cc166ccb -DIST github.com%2Fopencontainers%2Fgo-digest%2F@v%2Fv1.0.0-rc1.mod 43 BLAKE2B 42ef42def0f24844eed6bfc710d0c5070a2bee3a4f5aa8b0ec68f862840385f035fdf6b7206d7e15a94ca419af29f7fc86358aa6fdd1a014f71f5acbebc4c182 SHA512 2fcb2cf84eb579794ba81bc9f79090999b3fded538a1649fee55d1e973425a775dcfba008a11ec1ba873bfbd3c2ce13abcd99fcbd9b0ca67fd35925896bca588 -DIST github.com%2Fopencontainers%2Fgo-digest%2F@v%2Fv1.0.0-rc1.zip 27125 BLAKE2B ace23a65113f48afafaf52d19231b51238dba82a08a85dc615a0037b037530f3fa3bba1af1ad885eed9ca453aeaa0e2585d2f1b94cecdccccf2e32d36a86f11b SHA512 95dd5f43096dcde7c21338e393977b2d8ff3389b9c9b24ffc11df2cffc73b26f3f16a6406b10281add7d6d952ce2276639ba94929491be7792a2cb8f40746bee -DIST github.com%2Fopencontainers%2Fimage-spec%2F@v%2Fv1.0.1.mod 44 BLAKE2B e60ef6b775d320cbbd7d0d655e4a0d855f79c0f563ff3aaf0cf0a13485005c800680cb95535d57342c6f23a69da021089f7cb4d3caa3021852e1462126137887 SHA512 e7d3276e531b754a441e94acc632d7322837cc2320ced66e3e91e3512164ff84428a4665493bb3a7cf7e1057e82097bc54d0b811738b1e967b9c248b907d777b -DIST github.com%2Fopencontainers%2Fimage-spec%2F@v%2Fv1.0.1.zip 170576 BLAKE2B 52c16c643c1e621cb967bfcfa1e1209b564dd81bbf1b0427cd5c02b85160c444fcbe2ad9563bd491f040df2c4c6b9cc35f6ec83f671fc00e3cd5f40c8ca3af25 SHA512 04aa87f93002428f1ab79190ea584b23363126390dbdd6c05064646e7c5c3710da712b730f8da194bd83c7b95f260eb1773fd8c1c9daa9f41891a765e6a21742 -DIST github.com%2Fopentracing%2Fopentracing-go%2F@v%2Fv1.0.2.mod 45 BLAKE2B 7a7820ed255877b390c76ffd281258a8e70dbb2812b7d2d0bf63bb431e8e4f52faad48d4e6801b301ce35cd6dcd49ceac6ab94b32e35befe2e6df56e1a1e8eec SHA512 13b356ebfd062cecffa1e323aa7768d933c6915c2963eff50b1f743712d48cb24f137ba839a7df211e6e02979a4d1c9d32eec8194227edd995c3d35849edeb54 -DIST github.com%2Fopentracing%2Fopentracing-go%2F@v%2Fv1.0.2.zip 34113 BLAKE2B 29aea1a410735b812d7a0df30523e7632929f836ba18cf7329e0c1bae5b918ea898c8b10e59b9407b6862d28236c8877492a16e48fce256c0a5dc2ed6e798cab SHA512 5f35c076ac542650bc8d43fa4937f8f3e2de363d61909928d165a7673718f5fae0b0ca4d5276b31e044aff3f725982f4b56eed908312959dab24b344aeb5b88f -DIST github.com%2Fopentracing-contrib%2Fgo-observer%2F@v%2Fv0.0.0-20170622124052-a52f23424492.mod 50 BLAKE2B 45544c1be596ddeb8fa01c80e7d96799912343c885784b18c114716ffdcbeaa05a772d819b9a762b7f155045be1ab3409d423c173356c6fb61b9dbf810c606e9 SHA512 edf1afd7200a64b2feecdcb8f1007e58444ab9737bc0e9d4cea67cf286116fb0ebd4d9b9ae10786bf71265d9b813b175f78deb0b416346736c9a7e39d741b6c8 -DIST github.com%2Fopentracing-contrib%2Fgo-observer%2F@v%2Fv0.0.0-20170622124052-a52f23424492.zip 7087 BLAKE2B b642ce670c6cf20fd48b5a6d682691ce8929695641bec2e864a6c42f09dbf6d573a9cd2f739c2ce340dc6f5d64896cb0ce8adf6d9347404c1a0dc397fe5bc14a SHA512 bdefd37d8bdf19330eff551b293ee70ae1a404a841aacd6bc3940be3153c4e99f60064e9a238292a86a2b2913d14b9155511be9cd5ba4f65c6680af2dcbb75c3 -DIST github.com%2Fopenzipkin%2Fzipkin-go%2F@v%2Fv0.1.6.mod 1010 BLAKE2B 6bef0142218537a9452ead65865ba25d9bd2c9773cd87e199a72ec57c7de0143088044bb79e23c2d7a29d4275713efaeab457d8fe2b519006883b0c15f11e24d SHA512 10181677125b9bccfca933fa3ccc84c81381548b0bcbbf1c7423822f13902eca3907e06d9cff462126b4795b8ecba9fd0525e4dd9f90962697829b99dbc20bc7 -DIST github.com%2Fopenzipkin%2Fzipkin-go-opentracing%2F@v%2Fv0.3.4.mod 51 BLAKE2B dd2b42d4de200ac851a518e008a834617061e7db168b95a444634ac12ca06f2db29810f5adbe1cd169eebbc95058e8951a3d6986783671fc8c8a12fb4435f62c SHA512 58355032b1dbd06f535cf41ff95220d1d60e03e7834b5554349bf411791bafb53c6bf0d4505bb21984471cf053c13bb74e96e8b2c82abf2e18381e494a2f675d -DIST github.com%2Fopenzipkin%2Fzipkin-go-opentracing%2F@v%2Fv0.3.4.zip 95861 BLAKE2B 1117835ed6547675bb3c397fbe2c7798912f04c0475af776dd95641da6ff046c2c45dfcecc67089850864c04d187a487320edefbae80563e099f7578ec0be825 SHA512 6984d889c2a9106cb4a619d5d499a59add1470b73ed284f4fbef8cc7b46ca1a7f17fcfe03a803caa565eeaf15fed7426db14c47bba475feff0e1082f2f9a3fa0 -DIST github.com%2Fpascaldekloe%2Fgoe%2F@v%2Fv0.0.0-20180627143212-57f6aae5913c.mod 35 BLAKE2B 3db6c40257f2c4b0254a26c6e414fdc87c037f6312d4bf7bbd39420d6df70f50eab84c387b54cc71fe16068e1b25e3fc63a833e11cf5b4346f842bc61328b0dc SHA512 0b378d1e15db4fc5a3d7d711b63dedefd141d607192344c8d1ab2ac755ab9c6e91b2c320378ac8a485cf94deee59e6628e7930017c6d659bead6ba89cd78a802 -DIST github.com%2Fpascaldekloe%2Fgoe%2F@v%2Fv0.1.0.mod 35 BLAKE2B 3db6c40257f2c4b0254a26c6e414fdc87c037f6312d4bf7bbd39420d6df70f50eab84c387b54cc71fe16068e1b25e3fc63a833e11cf5b4346f842bc61328b0dc SHA512 0b378d1e15db4fc5a3d7d711b63dedefd141d607192344c8d1ab2ac755ab9c6e91b2c320378ac8a485cf94deee59e6628e7930017c6d659bead6ba89cd78a802 -DIST github.com%2Fpascaldekloe%2Fgoe%2F@v%2Fv0.1.0.zip 24373 BLAKE2B 48d3d48ea7431eba6946ec134f22d789b1e71d5ed5d421214f7c8b1803e0c44988375f1464206209a30cd20ab22da83d34ac27a3efeac55869ec24219fd835d0 SHA512 540d0f75e2fc27aeada7b736a896555732d8f4940462003fa574921d4479523ec1d7cf08697dae09a9bc1aba37b06557639ffdd8458c73346a114fa445dcc9e0 -DIST github.com%2Fpierrec%2Flz4%2F@v%2Fv2.0.5+incompatible.mod 30 BLAKE2B 007bbbe9dc603d92170e1aa89946c3df382b73e60a01f247ff3c28c56eec5c06b1f901cd3f52a81ed967949436fe0d2a7b4dc70088dbb38de97705967f127aa3 SHA512 e3f6142da79fb97efb98b7bac49f4fdcc16f2c59b40ac87ca98b633874bac81105a0bcff20045bed75d39ba3922093102f9e74462356d6dda6147f6be4d31703 -DIST github.com%2Fpierrec%2Flz4%2F@v%2Fv2.2.6+incompatible.mod 30 BLAKE2B 007bbbe9dc603d92170e1aa89946c3df382b73e60a01f247ff3c28c56eec5c06b1f901cd3f52a81ed967949436fe0d2a7b4dc70088dbb38de97705967f127aa3 SHA512 e3f6142da79fb97efb98b7bac49f4fdcc16f2c59b40ac87ca98b633874bac81105a0bcff20045bed75d39ba3922093102f9e74462356d6dda6147f6be4d31703 -DIST github.com%2Fpierrec%2Flz4%2F@v%2Fv2.2.6+incompatible.zip 20567035 BLAKE2B fc4282618ff1d2d426080e969b1645fd4c8ca72464438fdd2a63feac6743ca15b0522ac6e2e069ebf5c0cbda2b43618253ecf17f271daafc61f03b2aee9f51df SHA512 7c218059eaeb85ef6313c5ea25c9c0118daae8d2795094a3046a020029aa53ce0a55b688fbc9b70999c8c1d93e1d6e11f4977b871e7b3f5cfd2b3aecbac4f97b -DIST github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.0.mod 29 BLAKE2B 7fb53b19bd1be0e783039647b42ecbe2070f51af102e473ec6d3544eea0ffa5863f1874ca1615348d5f8abbaa39c841b4fe18d43a8a615fa648cf22f35955e38 SHA512 0c156e21d35c45a89c1a1b69ff1976b4f7511b3870bf96126121f5a5effa3723eb45bf080e840d5c8b96898c65207dba83eb3e1a23668dd8a5e20ee6be775cc0 -DIST github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.1.mod 29 BLAKE2B 7fb53b19bd1be0e783039647b42ecbe2070f51af102e473ec6d3544eea0ffa5863f1874ca1615348d5f8abbaa39c841b4fe18d43a8a615fa648cf22f35955e38 SHA512 0c156e21d35c45a89c1a1b69ff1976b4f7511b3870bf96126121f5a5effa3723eb45bf080e840d5c8b96898c65207dba83eb3e1a23668dd8a5e20ee6be775cc0 -DIST github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.1.zip 14339 BLAKE2B 9332d9cac7dd3aa2f4d756f0d92c911cd0fb8e00232db3bb013a0ef12addae0aea2388ce3adf79407a81e13cfe9cd4b45aeb2bc9f8b84b4e3c5dfa63b59d46a1 SHA512 f97471d54c5e73b3f59326847cdd4dbbb142a9ae790df83493f11a851d716fb407e01a857152812caf731b8f3e0f37ae151ee83300feaa73152173f6cb5b8515 -DIST github.com%2Fpkg%2Ferrors%2F@v%2Fv0.9.1.mod 29 BLAKE2B 7fb53b19bd1be0e783039647b42ecbe2070f51af102e473ec6d3544eea0ffa5863f1874ca1615348d5f8abbaa39c841b4fe18d43a8a615fa648cf22f35955e38 SHA512 0c156e21d35c45a89c1a1b69ff1976b4f7511b3870bf96126121f5a5effa3723eb45bf080e840d5c8b96898c65207dba83eb3e1a23668dd8a5e20ee6be775cc0 -DIST github.com%2Fpkg%2Ferrors%2F@v%2Fv0.9.1.zip 17866 BLAKE2B bb8d50b9e736f5f1e129482bd50f720b7dbe80935fcb6cfbec6d5a5f5ba5d5434476d66a362f12bedc304e89c9886d4868d310710aa100c357900a742d4ee341 SHA512 82b0ed1ceadd44a2871b56e733a118003b1bae9e38fe95251e0aa06a0a4c9b4940c485336fa11335974e0df536dcd0491ec1b2e545ecdddc7f9ce59771f86321 -DIST github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv0.0.0-20151028094244-d8ed2627bdf0.mod 37 BLAKE2B 94636062c94f8ff68cdcab7593a3acae7b9ffff616cad7b1d5c9cd147a4a1042d33666cbeed6fd816d6793113abfb595183097dcc46de7a3dfadc1423ed43e79 SHA512 c3d5c48cdb8ba6af7071a07cfede06e0ab67e3726d9de592a952fad40167dcbdd9621dc2c4df1bd3c28eb99d70b1b6d8d812441237c35bf492e5b7f07bd33902 -DIST github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.mod 37 BLAKE2B 94636062c94f8ff68cdcab7593a3acae7b9ffff616cad7b1d5c9cd147a4a1042d33666cbeed6fd816d6793113abfb595183097dcc46de7a3dfadc1423ed43e79 SHA512 c3d5c48cdb8ba6af7071a07cfede06e0ab67e3726d9de592a952fad40167dcbdd9621dc2c4df1bd3c28eb99d70b1b6d8d812441237c35bf492e5b7f07bd33902 -DIST github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.zip 12433 BLAKE2B 0c911c9d173080abd8edbbab1f47222343801d8eeae36b4add24773e3282fc2a39283fdf519a3d4483e39cdb7d9509b8570d151f46841ac1a616f312dc4cb0ba SHA512 3b85697185ba85cdef6202444ab6cabeabfad8a03d66b3839a852586b1f91ddae7897a57c8c138d5647022aa44906c7ef3c5339d520f90eeea0742a935da8cf2 -DIST github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.1.mod 43 BLAKE2B 2bfedb841a10d8d6a861189203de74eb9bc6bc37bb10cdfc2404b1e972b7672568ed27d235e143d831cf2f840943c039398296cb78f1309f00d1ad9e0ce21056 SHA512 191cf6496c41b2b82c9a8f2ab2aeab63ede47807160f7cf746c548b3e92e367fc8f80ff8c6efbb7e91ca5903d5672b235c1ab9f14d3f9f988e8ff1c821d3b8bf -DIST github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.2.mod 540 BLAKE2B 4d43a0901fa46da74e62fa22f61dfebdf6468f2766bd43dfd487d7a5434f961d181ecf26015ff9134e8d3f9c2dc03da6abbcd0030348facda3a499af9a04665d SHA512 9add81238044589ae2cf38042b963953d507e40945118fd62ac1cbf41bde1b001a69423c50b7045b721488b3d53489b4ce3c544b68f6c4e31e340d2581f7c8a6 -DIST github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.3-0.20190127221311-3c4408c8b829.mod 443 BLAKE2B 2bc1a0ca986dd17787cbf528312efc6e721d3d9a46126b90537b7cae6681192e74afc83f3b64f8835314a0608a3f146e3fb74afc3339bb7b009d16ba04208cbe SHA512 e45c711b58e0453c63b899faabfb662fe743085dbc82782ef730ef6797fd8d372208d4fa887168ac920d6b1d15f7f65fc9a3fbff25a4474915d858411a7adee8 -DIST github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.3-0.20190127221311-3c4408c8b829.zip 203807 BLAKE2B 38f6971c3cde204ef50304cce44c09a0e8b6f4bfd793a50255edc97fa28358259943fe8892427eefcc74d96aebb2378e655b90247d54e39802f3161a1d9b15ef SHA512 0d5c11527f2c8d41dcc962a3750bc8b6e25acc8e53089c9394744bc85690aa132f961cba7ecd5c7a41b1a8b338b8d6badcf13810ad640900e3fdbd0d4f0e5c31 -DIST github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.0.0.mod 535 BLAKE2B a8d3fb22b519e88dcb6b6f305a80c94e8b40fba8bdc96941230b354cc6bd8ec4bfd121b8e5ee57e9883e0b01b6224ff22a55fa8434bee1623133cf59489e64d0 SHA512 1d3646f93821b2ff1a4d80074f773eca22ff3675caca9d267762a31c1ec719ab464ba7ade7c8e2aa79b16a4f35f5a64f779fd909060a0c3056f09af77cebd655 -DIST github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.5.1.mod 612 BLAKE2B e77946b5137a632121f113e6d7b390d25891d1fdf214b7c07ee0307aa4e78f5d19e96d1f4bf01aa1d62a2b0918727db1e128fdca6b6f1daeb08632b940a3084e SHA512 46eb82a74b845f5eda8cd01e8ae182e5dec7867306b31a40cb5c6bb9df2045c3259070b57388cc7826f54ee7b9fddaf980436f74ed500ab88748a13f12b30ff8 -DIST github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.5.1.zip 213040 BLAKE2B f249bee112f34f59d075157c194ec5d08682e43049539fcb64ae8c195bf25b2b8e04732be7e4aba9425e3d430fd8ccce0e4a69b20a5deb9300a23926fd1565c7 SHA512 ac41ce53a3f71ed5e83ebd06cb013e7b1328a152453bde6d82ecd9eb48e5d5a5cddd19f1e3e131cbb009fa1c686a7bcffad18c84e4c20eb93605405d37519e75 -DIST github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20180712105110-5c3871d89910.mod 42 BLAKE2B 5519896b44b7bc3089a8965dc61aae63745c64ba1a390d3fff1202be7f8dd34f59862c04b49e377d6616a93a0341662becce65d431d445703a160ba49eda208b SHA512 c84dfe43954b19c1e4ac5ff8738e79db469f3bc1dc55e69b12503d0a5cf125cc74f4797ddbfe64b2a1bd1e2940575c32678671d51f67161c4f5b53b2a85ac46a -DIST github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190115171406-56726106282f.mod 42 BLAKE2B 5519896b44b7bc3089a8965dc61aae63745c64ba1a390d3fff1202be7f8dd34f59862c04b49e377d6616a93a0341662becce65d431d445703a160ba49eda208b SHA512 c84dfe43954b19c1e4ac5ff8738e79db469f3bc1dc55e69b12503d0a5cf125cc74f4797ddbfe64b2a1bd1e2940575c32678671d51f67161c4f5b53b2a85ac46a -DIST github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190115171406-56726106282f.zip 68327 BLAKE2B 9450f4f080ab5390bcd480cbdf8735965e2f67309b39a82febf5cef1186cb5f24e6e7cb5eff4f5b4b2dbfe84d0c41c9e167f92580f5b7e22c36ea9c5e1f29a1e SHA512 c94590036dafeea7cb96d34a1a5db1e5a4d087d164f784d89ddd8d3c5a89326b8d9d78a2862e88ec0abee639d03e210b638640d9754ddd35c357e7ca1a61183d -DIST github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190129233127-fd36f4220a90.mod 164 BLAKE2B ed42e8dec25021e488793be8e008c34ab5bdd6b5b884762d69f40d6c8968bb539041920ac7108e685ae56f2ef71b7174245772d96cc8f20463eba71580afae29 SHA512 4e0e6941b43c17cdce0205e9ba3d9fb18937f426ea2ac9a9e53396c906101d6ec2eb501cd8a791ee3ba9a32185f86495e9189134b8a9858134c73238d98ce0f6 -DIST github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190812154241-14fe0d1b01d4.mod 164 BLAKE2B ed42e8dec25021e488793be8e008c34ab5bdd6b5b884762d69f40d6c8968bb539041920ac7108e685ae56f2ef71b7174245772d96cc8f20463eba71580afae29 SHA512 4e0e6941b43c17cdce0205e9ba3d9fb18937f426ea2ac9a9e53396c906101d6ec2eb501cd8a791ee3ba9a32185f86495e9189134b8a9858134c73238d98ce0f6 -DIST github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190812154241-14fe0d1b01d4.zip 69219 BLAKE2B 6ecc62f2f3ae4622ba6e19c51f7ff7ca3bafcadcb38cb7a9d79dfcc2ddd7183d79dca8e0d6b534f5a2dc508c21e0fb349310b4feaac35c1f7b1166c3febd1228 SHA512 934c3e50ebdc1ea65ccfd4de1e2e0f0ebdece54be1cccaffa5e325c667ab22bae84a7fc7ead1066e75094697a86452fdc36fab57b955f42337708de32e7eec32 -DIST github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.2.0.mod 164 BLAKE2B ed42e8dec25021e488793be8e008c34ab5bdd6b5b884762d69f40d6c8968bb539041920ac7108e685ae56f2ef71b7174245772d96cc8f20463eba71580afae29 SHA512 4e0e6941b43c17cdce0205e9ba3d9fb18937f426ea2ac9a9e53396c906101d6ec2eb501cd8a791ee3ba9a32185f86495e9189134b8a9858134c73238d98ce0f6 -DIST github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.2.0.zip 13785 BLAKE2B 2cd44410ea7af88683792807b0f2c31b0943d8664a4be050f2e422095ef3674e6d42f4b9b6a76083e13bc9f44be1578cb06a7389b4a4b201b5a88e756b40193c SHA512 db2396362357b6d5e99b21bd4aa8d8dc193dd2676a8f437c62eafae849a56a53875bce7411d58ad78e4fe36445b72ee1a34360b174a23ca84de911f5df189354 -DIST github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.0.0-20181126121408-4724e9255275.mod 36 BLAKE2B 39120b6af83d45857c990115ff52d8828278a9ce158b01621d8dcc517c23ff139532a2c2e53ec97616f0c65a2e0db3ede7c5fe59eb33be277e2c60650362b232 SHA512 1b262da0100655c3a56c0e551866491b81d2b88fd5fed9cc43a57bce3634c88c82c798ed1a823237011f6be68b5f0e1fe8284526cd68204851de30a44fc34fbf -DIST github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.2.0.mod 1223 BLAKE2B 969e069f2e210c2863b54504d62dec9ca606c485612ab1c42249e623a4bbde4e4ad0b41da30f83594b7efb4d4a44e0a68a5faa8c115263d73738773c35a98dab SHA512 02db8fa79cd8368060c72ba3925624c779bcc9e39817b6ed86ba143024959496db2c23c1aefe93a5d9f22b48e742072382e2ccaab430c1c9eae6254184e2358f -DIST github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.2.0.zip 139422 BLAKE2B 8a7bae0792b45bbc14f152be071b52651c125f64630709bd7539a4a6bebb9a2305a4dc5c39b882190a46699124ca491e5045ec631d0a544c5ec03f1fb00d303e SHA512 83799d97c51ca8f9a557366506ad82a9e1edeee8388ac77f0cf86ccb17f84d99a3e3efabcbb21c31e2eef50a59aa860482900c0dd103b27bdaf141328f830fec -DIST github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.4.1.mod 1223 BLAKE2B 969e069f2e210c2863b54504d62dec9ca606c485612ab1c42249e623a4bbde4e4ad0b41da30f83594b7efb4d4a44e0a68a5faa8c115263d73738773c35a98dab SHA512 02db8fa79cd8368060c72ba3925624c779bcc9e39817b6ed86ba143024959496db2c23c1aefe93a5d9f22b48e742072382e2ccaab430c1c9eae6254184e2358f -DIST github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.9.1.mod 829 BLAKE2B 14a7c9b3754cce16715135e33ee294058d999f343d74281b9fd111a9c0a5632b90b6594d1ed220165b58614a695b2b2aae27b2ed9aa35ba1acc768ad12e46ea3 SHA512 4cb3dba50a3b47b9db735de9df4bd7b35d02464065919502bb1e17236c2f6b1bf1e74f312a8d0127d2d570344c30d58063d62031d3439f52a6dd8f47b29b9996 -DIST github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.9.1.zip 161521 BLAKE2B a412eaeb17bb3e932cb53393de6eeab563068918c9ff384ce32d2caf958b3e3e472f554c70b518b472663f42e2060a97062029e55b694a6c93a67af4eec2d626 SHA512 692c2ceadacddee42e9415892d7eaec95cbf5319db3cfd6b5406b39c99df942b4dec7095003ffb8a36a82424b9ebb312f8bf28913ff902320cad2253337e899e -DIST github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20181005140218-185b4288413d.mod 36 BLAKE2B 3c6acbd1022261065a321c6f3cfa2946b58011f45fae9b98761397eb7e5e0984dae4ea34c4f837f798ab29ca8e26ed3f07771be10e500a99ce7e5e9f4c401b5c SHA512 05f032eba0c264b186936c2b9831624a01999972d4f1bba6aa15c452407eb10d402f1ac674eb41e2d24fa66e85ae2e56efd2326fc4ecc741169b9908d7935335 -DIST github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20181204211112-1dc9a6cbc91a.mod 36 BLAKE2B 3c6acbd1022261065a321c6f3cfa2946b58011f45fae9b98761397eb7e5e0984dae4ea34c4f837f798ab29ca8e26ed3f07771be10e500a99ce7e5e9f4c401b5c SHA512 05f032eba0c264b186936c2b9831624a01999972d4f1bba6aa15c452407eb10d402f1ac674eb41e2d24fa66e85ae2e56efd2326fc4ecc741169b9908d7935335 -DIST github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20190117184657-bf6a532e95b1.mod 36 BLAKE2B 3c6acbd1022261065a321c6f3cfa2946b58011f45fae9b98761397eb7e5e0984dae4ea34c4f837f798ab29ca8e26ed3f07771be10e500a99ce7e5e9f4c401b5c SHA512 05f032eba0c264b186936c2b9831624a01999972d4f1bba6aa15c452407eb10d402f1ac674eb41e2d24fa66e85ae2e56efd2326fc4ecc741169b9908d7935335 -DIST github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20190117184657-bf6a532e95b1.zip 103441 BLAKE2B 0db2c582c9c3b88adfde32eb9fac2bf855daf5392e0ce4b712a12bac78ae1825e2c74d64f69e85430dc2da800f47a8437c3b12531ad0941d2e3ff08e757718a0 SHA512 6e1bbf3b89c135896ca3d0f520bff89a54be03299a2408f81f727fbfe8f933abb11a2e4e2fcebba0dc3fa464fbef2fe8a02f397c9f590c6bcae4053851f0c6af -DIST github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.2.mod 98 BLAKE2B 23576c142554e5a22a11d704cbff1bbaf1029518ceec7f04e22aa849763a7aa5e26ad1405a8cbc0d87097264a5fa7cfa3d655cad18148f5de6209a06580722d3 SHA512 0897ba1b7b4a32f206763327e138d3b460194097d19bedb8ee1bb6889b9d188afae9439178d1c2151fbe17b7d18545cd6cfebd050bade93cd39b435b35b6acdb -DIST github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.8.mod 145 BLAKE2B 8c6ed8a28b2f2fa7e97cfcb545ff7604eeb5802bf301ecfd574c1bd5bbd59172479a55c9f42f42a13a85daeb77e730dcf5cdb78aa9b7c499f3ded0584163d75b SHA512 0d285b677b209f7973ddf036b2f2463aacd060e58db9a0721e85d40d513f8befe3605677dca1040fe9dce006e3d5d3246d876224f05c45757505696122a3153c -DIST github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.8.zip 210499 BLAKE2B c21ca6fdd64535b648cacfb74fa2d23d05d493703cb7b775ec014a9efcf3e07557e0276901db2c309174f12800c6e2f438fadc5054f0ca233c65d3523937bebb SHA512 f9f9fe1e114a4e2fe4d27a836d3989b838b1bad72cbc1652570d26ac9253cc26aab01ca28c949b2c4441a7cb17e87c1689d21588093836873350d7342e8d543b -DIST github.com%2Frcrowley%2Fgo-metrics%2F@v%2Fv0.0.0-20181016184325-3113b8401b8a.mod 38 BLAKE2B 091e64943724001796bfb662a26443a681d4db705219a1d7601c350b94105caa1584c62a4befd1aa0c634268867c84bacc79e235d5a8b416f6a8aa8e12192261 SHA512 f22213d29e8a0914fc947e08d8c85dbcab835cd7587e45cf5458a1cff074359fcb187ab47bdfd933c8937e393975a29e872b744ad61295fb1dee3783877e81df -DIST github.com%2Frcrowley%2Fgo-metrics%2F@v%2Fv0.0.0-20181016184325-3113b8401b8a.zip 57982 BLAKE2B 07c3ac2d98a119485695f6b96c4aae0bca36a305cd38e90f40afeae5746fcf0f78c0f389930b28184ab9ed6750746bea8939ffb8d569b0ef3552a3c3c0eada35 SHA512 0502f433987c5a02ae81f156f4b2916b6de0ac2f3e55a2117ccad7ecf94dc25a8bf952fd70bb7d37b82cc8302280c92f70b94606c8c2d125e505669a72e2e7b6 -DIST github.com%2Frogpeppe%2Fgo-internal%2F@v%2Fv1.3.0.mod 73 BLAKE2B 21e3545a4518c64daac1cf36e47a2c8e1fc8ab7402372f2e871052d0dd9d83fc2aa44babb2f8751180cb66dcd2af82ed202afbf5ad3a219c4562da23ae8ce185 SHA512 4fd07ae7c00bcc135cc10a0b34ab102a893ed8ea4708f9d38da52f98b09fb66144f970ffd8795476fd6625b25c9e48390a5b1c5c99bd0c8d536a94201dc96613 -DIST github.com%2Fsafchain%2Fethtool%2F@v%2Fv0.0.0-20200218184317-f459e2d13664.mod 35 BLAKE2B bcdc10d46ac3b8a6a83e1cf12d688dea82392c2ccb341edbfc922324b689ecdbe9a2c3449030cefa1ad723976364b8f774e3d6f51dd944fefaabd84b3eb203e0 SHA512 96b3521ffde2955dd8ea8b22b14dfdc829fad79e89a4c54e9c243cf34829e650d40f3e176157bde0b3ba3ec89c40c67f51c49d4ab1e08bfed762018e12ab7024 -DIST github.com%2Fsafchain%2Fethtool%2F@v%2Fv0.0.0-20200218184317-f459e2d13664.zip 18117 BLAKE2B 90172a9998af921ef5b9282a57487f6585e5ffdcf38ea0fe413e8bc22d6ec376b0f352396c713d8f13a5a305d6ec5840f79f7fafd18e46c3b930c6fb5e6db648 SHA512 cec2f5ea88370ad5d7536ca4fe20f918d77e0f7e13c6992adb0aad3eb2d0b0dcfec32226bb4d4d0f3f7635ef327bdc549fadc1fdf323dacbf4c298e28d0b4952 -DIST github.com%2Fsamuel%2Fgo-zookeeper%2F@v%2Fv0.0.0-20180130194729-c4fab1ac1bec.mod 38 BLAKE2B ce3c91e2fcd6c3748acf0e0f6355a0af01db3c7b36a793fc07b94b1072133f7f25f4c49473bb27007ba2de7233454a3728f24eacecda76388570810e62a5d161 SHA512 54235e8bcd2f98cfbfdfe187ee4b2cc7d0efe155710474100709b1a8c2e55cc2e24a16559857fb9edf484a0b76debbcef69d5c182efe52594c9858a37b6b10f0 -DIST github.com%2Fsamuel%2Fgo-zookeeper%2F@v%2Fv0.0.0-20180130194729-c4fab1ac1bec.zip 47220 BLAKE2B caa1a4a09692b877abe25a2e27ffbc60364ade5881f883f540eab82a24e597b3026582eab0fe377cd4db097fa8b68d9623478e7ba3da04ef7c6749a123e0d9c4 SHA512 84c16a9a52e1d2ff597b1847e292eb325b3832b4b3633de469ee90be1dbea9a3f8789b0df850ab8e1862abc42d1a678b30e44c30083e557b4cf87fabdf2b60e4 -DIST github.com%2Fsean-%2Fseed%2F@v%2Fv0.0.0-20170313163322-e2103e2c3529.mod 29 BLAKE2B 8f509981164937fb0aab63b0344ddbf25c183b926a6e87400e745f6aee9dcc478f0ed455c62a9753722954acb3506be5f7810915a15d03647668e7bb707c09c0 SHA512 c7dc34c7a73c5899ca207c0cac88dd38ddebaffa04b5dd511a86dd10160e60be2806dfc6e079a5871b0cb6142f53d7d7dc87ddbe3fb19240bf894430feac5875 -DIST github.com%2Fsean-%2Fseed%2F@v%2Fv0.0.0-20170313163322-e2103e2c3529.zip 4415 BLAKE2B f50a9fd1f74506625ae9460c6071bbbd1dd3ad3d83264fb7def028c757e8ad8f865fc7255db6e9b5cdb7a1744ac1f741bc6184f064eee7108f6fc0facc81f639 SHA512 acd19ece301ac146ae50dd784e3dc1c2cbc0c00a562fc5d2759b7b8a4acf0b5bf83d5bcd54122130877a1568a13709c28ab7e1cc7ba269ec91aa1b1a86c2065a -DIST github.com%2Fshirou%2Fgopsutil%2F@v%2Fv2.20.2+incompatible.mod 34 BLAKE2B 790ec7277e4654961540dd09fcb7962328547009b0181183b7cb64972b872d30986d1e53ded5961588d89508c913b2b56dd7af3625d0e8d7be2253b6bcf59576 SHA512 a5f5d88a767a855b6ff24d7e2e0c4aeb81fb1365a7e81ed989b4c605a7a6c61dc52d7ce97fc672c21020ef56f597dce679184e5e8d3d199678487e6bebaa8127 -DIST github.com%2Fshirou%2Fgopsutil%2F@v%2Fv2.20.2+incompatible.zip 225817 BLAKE2B d893801f7dda01840824b35bf0e92f7a633ce14e9dc6342974220d21d23dd4ca5cc30b4cb9f98a77339335e50721376bb911b329bb2a7aa9ba8c8a73b2d3f077 SHA512 e5008e6629b8b4d8140722fca351e99721c4fc5a468d4e9bd4044e1b9ed0d1b4f3cf70b2f75ae0281497d61737e40289f865e9bb25fd49ad4ccd07728451929e -DIST github.com%2Fshirou%2Fgopsutil%2F@v%2Fv2.20.5+incompatible.mod 34 BLAKE2B 790ec7277e4654961540dd09fcb7962328547009b0181183b7cb64972b872d30986d1e53ded5961588d89508c913b2b56dd7af3625d0e8d7be2253b6bcf59576 SHA512 a5f5d88a767a855b6ff24d7e2e0c4aeb81fb1365a7e81ed989b4c605a7a6c61dc52d7ce97fc672c21020ef56f597dce679184e5e8d3d199678487e6bebaa8127 -DIST github.com%2Fshirou%2Fgopsutil%2F@v%2Fv2.20.5+incompatible.zip 228947 BLAKE2B 2d2ceb62706f94858798a7c73063618457d0ca3b042bf1703ca30e521f24b6b13d8eea70207927a61f30804ac14b6037fc8c63d4a23a365aed8f2759f9740ade SHA512 2decdf2ef4e21e028a07a98324aaae8f2ae8b87d8d82ed43dafc2f15127896b3e8ab1101ac6b59ad11bcd88e67b7ef7ef53086b295cbcc0a4af51d3e9e09e527 -DIST github.com%2Fshopspring%2Fdecimal%2F@v%2Fv0.0.0-20200105231215-408a2507e114.mod 46 BLAKE2B 3cb92e307bc5aac1956bdffd31a5a60e4b4bb1bc0c3684ed54f7eb1a046250996d3775ce0976dc664fc57728378a17a2cd2bf83ab14ef690462a4292d539fae2 SHA512 6bf9d42d1762f17ff218fbe14cc5aedf285556aba1fe7157a9b19e25b6ff99007d01a4e278e799a9b4ef2570a4b8d1cccd38615e0a1385498b56afcbb8d649c7 -DIST github.com%2Fshopspring%2Fdecimal%2F@v%2Fv0.0.0-20200105231215-408a2507e114.zip 40610 BLAKE2B 5a199f6c966dcac328d9bed4c3315a2c58a28d88be02b9743b226acc01fc4d7cea53fb4847ffa77c3b0986eb617f36cd2b94fcad32e45eeeb56921b48db45fd2 SHA512 9037e8ca2c8c675dc7bde7e0c13a9c42de3268a1c00463853ea93a605eaef4b6888ce6babd67dae95cdf513c836bf99cf1b9d6b6df450193071b5d128ee72c91 -DIST github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.2.0.mod 393 BLAKE2B b9d712acd24d7a0605c74920733902a8eb1f9151fe0b0c575f01e2f821705ca7323f854c5b88d5bc534ccc9155571c083d4f53c6f6892879c829146bd95729f3 SHA512 c1621afd4618d1027b2d89a8e9653d18dabe098a7004b376ca2be63955ab783879540a890ab1324c2560dae9e6f3198dacc32d5fb0afd4b5a779d29a8c28f035 -DIST github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.2.0.zip 52967 BLAKE2B ffc9e503771f88257408708b3e0bf6f1d0c9a36dfb10d6f4f6377fa7e97599b1993f6198a8dc013d29ef17929a83562eac4f5eba1e8f51148b189a94128a4314 SHA512 d30efcc17654904bafaa3cbac0c2aae4b44f83dd347c8ae4ea77f5b637ef4371e08e6d8483ccb8a73273ff9fc91dcad43e8c536ebf5de9b69bac66cdfbf6efe8 -DIST github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.4.2.mod 337 BLAKE2B 94ce7d2e23281061ee0ac0b1be2f8c3439c86e62c56ecf556a81123d57d819b1e0e95ec3b7c6425f13abaaa1683942b7a3d0bb8ad489577284b2a6063c777b37 SHA512 38a79599dbd09661614d54fc92149fe581575b7833e89dd73a3f754fafa4bc549c6c9078753ab8e2a85ce2be3ab81e528e29b6d19e7c329e0cb0f74896d2e418 -DIST github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.4.2.zip 58627 BLAKE2B f4276f0095188324c06e4412303ac19e3006b18823985e26ca49b2de54ef58cade626b3d2439f5f2a29c47618420b890951f94e5a4801dbaad4c3294f6555a4e SHA512 3bf6be07dd9a97bde938309857e16dc425587c100e35b2acd1a6f11a9ac196238b0844abbaded43fcc01be0664efa15b64f159f6259322043e3046e7d361dc20 -DIST github.com%2Fsoniah%2Fgosnmp%2F@v%2Fv1.22.0.mod 112 BLAKE2B 373e7ed00b33a1a73b8854c9a2f0f59cc44e4059b3c50fe4f42bb02b6e9ceb37fe12d6b9b550092cd45e803f6e3fadd062516b7b42dd5214bfa6d6f9ccf00aa0 SHA512 0bf244a0ad3b7584f5ebecd54e8fed277a6cf9dd1e3cdc068059dc9442148b0ec67c2339c2d1c5773ecc5d63699f0b6fe15747228fa238dbb5f37372849a0f8e -DIST github.com%2Fsoniah%2Fgosnmp%2F@v%2Fv1.22.0.zip 74724 BLAKE2B f0dc4e9a8468f8845fd85726ae1b756bbb00d84ea4c1e4a42ef5de237c8eb44758d587ad25063185ca2ce0c3b00cd8baba1f66d3dcb7023483cd5f0d8dba8d5e SHA512 5fab7c8c78391beb8a976ea29065a3485b2746fde85ab0aaacecb63c8c99033972a779e87a5857800856e779683d306755cdfa43ba283a397a67151adb41e311 -DIST github.com%2Fsoniah%2Fgosnmp%2F@v%2Fv1.25.0.mod 113 BLAKE2B ed93206419ab6a9c4f37455ab80fba5efc6b71f3365563ae493cf42cc0469eae88d94aa886217fb776ddd458e44503043a7bb41b03cd4180485d55b7d99ad3c5 SHA512 cd9992833aafc01d1d2fe43c0c67d582dbd6d9b331d73abb3b700422cec99700aeb3e9828a7c38b07db16f2b64ec35e0c6bd95e5099856d38caae5ee081dd9e9 -DIST github.com%2Fsoniah%2Fgosnmp%2F@v%2Fv1.25.0.zip 83901 BLAKE2B 080b9fed8a2d57c074eec8e68c4be481cab9b3c3f5d73fabd7818426bcdeedd60e0bd034353a30d993486eff6197886a9d636f78f4675d879255ab9d300c4413 SHA512 9c053dc11835ca330b48d21da1440a9c49d8f3a37a1c5f0a342f393ef618880ce4c3b7b4373dad2b0204c9f024e855bfcbf5d4d5abc17f36487ad4975e87254d -DIST github.com%2Fspf13%2Fpflag%2F@v%2Fv0.0.0-20170130214245-9ff6c6923cff.mod 30 BLAKE2B 18c9fb79a291aaf800991a296c8d7b1933cf45bf56082301a64ce17ea64dd15fd304094fd4b0561bd99c48ada545dfe7fa8cf47a15593cd3166eb66657a5e114 SHA512 d08b4540b799cee9c5f088c4e1fe002c9fda86f1634380409eec1404598b84376d3ca26b4c1cbcf58bc19234ab56531ab11db8a00c6dd2e15a53f3b4ae757efc -DIST github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.5.mod 39 BLAKE2B c9d700f96874e0a3977c2ffc7fd321acfffd8081aaa70ca50421ca55253fbe0636d48eca8f7093df202861f0a5f908fa00303533232c83c78bdba84e2973bba7 SHA512 8071c316d33aff1d8ffcabaeb42e8f9320465d83600cb57ac5ef071569f948d5cfd69e1bd2e92855c061395c1b814e84d1705f42e37f00d5bc713b6e724f29f5 -DIST github.com%2Fstreadway%2Famqp%2F@v%2Fv0.0.0-20180528204448-e5adc2ada8b8.mod 33 BLAKE2B e7c2e25be1f0f55f7151edd2fd2d950f0df79fb11df2d41eff974221966ccef68ebb2677a79835d709542ca2e9fcbc612f37ff2a1f1820e95eb5051094fc8f6c SHA512 0326d100a45d3c9f7a7547a6a37d38884ef807b89f8e9583c1c8c5698a3a3aa05fc4d99a96872ec2a00d3079cbad441bb312045351f6d364d5a66de9956220df -DIST github.com%2Fstreadway%2Famqp%2F@v%2Fv0.0.0-20180528204448-e5adc2ada8b8.zip 103989 BLAKE2B ff9a2c92cfb9d97450854452ba164a63ba369d637b51c0fff8bcec9ca63d9f090b40a1e7f20a7d22398815ebba694b6875a5d91417fd4f4874f9a8d038aa2b67 SHA512 a974455cd57f4c669f4e8297f80a6cc455d7b3096ee18f85982098233764b989b24dfa93cc4f099286410f70ab3f6a827d6006f42fd802ed8ee4831cade034e0 -DIST github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.0.mod 32 BLAKE2B d698910da1ef00a70a1673b8c74105de195020ccd95d1e70c5dd1e1615210886ff9acbc9cfd03f46e99f5223b60b04695b8d362b9e0edd4e485480f802bd229a SHA512 4e366e5a60559a8863cb2a50280deb307d8bf885ca5440cce1b49a084b4cc4583b3481240125f35f161226592a43f2c0a426152f117d79b68c92c72a93f751d5 -DIST github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.1.mod 32 BLAKE2B d698910da1ef00a70a1673b8c74105de195020ccd95d1e70c5dd1e1615210886ff9acbc9cfd03f46e99f5223b60b04695b8d362b9e0edd4e485480f802bd229a SHA512 4e366e5a60559a8863cb2a50280deb307d8bf885ca5440cce1b49a084b4cc4583b3481240125f35f161226592a43f2c0a426152f117d79b68c92c72a93f751d5 -DIST github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.1.zip 37190 BLAKE2B 7c8b79cb736f53337fdd2878cd1d745a6da3d803c3d3f6a0ed53a86f1d4789d2c656c6e7a17f90caed496fac91fdc89fa66b1de7b2caf97409114aa59658efa3 SHA512 b2af82dccd20e9539d72c8629f2d4babd573f711a810fa77e629fec897a614776cc4ff857700c0b6eb32370a13d122504c0a4abdd3d9111eb8ac0938a0e7234f -DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv0.0.0-20151208002404-e3a8ff8ce365.mod 35 BLAKE2B 0357260904c9ba41892132c7e07d2add9b10ce4a09e8db4966219d1f515f917581e2afa0987094c90759634bc2aeb66e758074e023ff331a8337f5090c0102f6 SHA512 5b7ce867497852e4918b8cde5f75ecf2f24b9c95ad112478ac132322e904243f1cea3d16f5731646efb669256dbefc129ac70a499c8b1d25403a14c7e4fad10b -DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.2.2.mod 35 BLAKE2B 0357260904c9ba41892132c7e07d2add9b10ce4a09e8db4966219d1f515f917581e2afa0987094c90759634bc2aeb66e758074e023ff331a8337f5090c0102f6 SHA512 5b7ce867497852e4918b8cde5f75ecf2f24b9c95ad112478ac132322e904243f1cea3d16f5731646efb669256dbefc129ac70a499c8b1d25403a14c7e4fad10b -DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.3.0.mod 154 BLAKE2B 60cd7801e7cd33746305cd636b048b25a86270ec3b29a21c3c078c7e95b769bce7e80c2c7c5474113786bd788c7f88f3719e34f02141038e0d161b36e32f39b9 SHA512 bb808fad059f5abd0171e4bdc724411eff2c7e8d303a4ffb3608a00e21bb3cfafe9e83b4b4e9bccd42c9a4331f67ddc6043e3dd5eaa9a122c86626eed43a8383 -DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.4.0.mod 179 BLAKE2B 3bb7cee3118f0d335ade107dfefc3a594dc3883564fe4c9e96d615e179d394a49a3d6cd6584ba9c684772bc3dc6479af6a168dd3841c03957252667384f6ba11 SHA512 243bf1f69c146252164ad72f853773dcc77f15d7c9e9b731bee26a95e7c8f4ce9ed9738db601b01edb82f4b3808873e1f153a6d4a0c97be0babbe65abc0f8d52 -DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.4.0.zip 90474 BLAKE2B 2f79f0cac2c15acaeae764aeb640534f58ec2ae86fe88a82533498e718cf37d67c563606090ad39b38e22ffca1e63a25cd881d6a472b862ddaf150c7d329b16a SHA512 a047ba8d5f529d459fb6ae8dd39367e6f6cd2e785e90f54a5f8759ff76e4cfff990f1b8c1e0cf49c67b97ca8de36ecf8fdeb3b8f16e579aeae2d563d38da69db -DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.5.1.mod 188 BLAKE2B e47d78f037db3684a329905985b02b7ddf0a609ab4c69dd4346202ed0981712d54d0fa1b9c230b50d1857854edbbf77ee144d54b12c7c46833e6542d6034171e SHA512 70adf6a86dc6f934ee611f6aefa459f1287b7294297eb9221a747427d031b10c3e606696a656be4c2746a25480c322106099ea2bb360cbe782f4d03c85cd9fcb -DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.5.1.zip 91883 BLAKE2B 8bb8f10ba7a3c719844dbbcbdbb87773487921f493cf6f72d1a9fd1d553f7f7784b01b9795a5c26a352490ed6d75c29a542a0b3d7c18d8888c57e447d9d227eb SHA512 c539cd964718439715caee454b38fdb61eb5d4e20489e10f7f6a030b4b941b2ca52d33f950c0b04149962399f0c3cb5b6a90efa2d79acc0f57a7f49d508c67c7 -DIST github.com%2Ftbrandon%2Fmbserver%2F@v%2Fv0.0.0-20170611213546-993e1772cc62.mod 36 BLAKE2B ce5d3b880dff92c8f09162eb94ad1c907d54f1c2391649f68255818f8bae282780a4c09f0da3d0cab368d4ebcd10b42b47222e199c4b73005348676a975551b7 SHA512 001656605bf10e560769958bddea2f3c9e8eb37974be71ec63a0d4e2d45bab0437622267138cc476fd7a76ed4f37de4ad07b1fada3cdcf9d0e976cdca0f853d6 -DIST github.com%2Ftbrandon%2Fmbserver%2F@v%2Fv0.0.0-20170611213546-993e1772cc62.zip 20639 BLAKE2B c9dd8f90c8fc8c6ada02b99e75314a755dcac3cccf2f8ec37e7264b11d5c0c6d4164a70cfc44671d6d42d64cfea650e7fd2a6b3db551e0bfc156c1bf842b9d1f SHA512 dd0d34a5551cb8c25e01c3a29ddd65220726b0d22686061577155f658f8e525b0326a4d7a47ef63fe445cb18c9ccdaa86f4d3594fe32ab0fc06816bf5e69a1d2 -DIST github.com%2Ftedsuo%2Fifrit%2F@v%2Fv0.0.0-20191009134036-9a97d0632f00.mod 31 BLAKE2B 5a8d1b4e26294c229697ba464c14e6be4c383e52d04e3c5d20f62b6643e8002d5938c7df5ec23d6ec78da5f3a2f9915865006570b87d8e94027d2f5e87b88ca8 SHA512 65793597b46751e4fb5ba338a731ef020d4b90bff03b57bd2867af28a2580ee37beda62c35f33d58f6c0dade9f3de9b19f2fd35caaba9e2ddbf4af4a1a95709a -DIST github.com%2Ftedsuo%2Fifrit%2F@v%2Fv0.0.0-20191009134036-9a97d0632f00.zip 61355 BLAKE2B ab5570b141da9654fb9e078ffd86bd8451dfed6e8071a3cbef8c35fec167e6f593f94ccba5e44cd4ecac189e39933bbe3a71675c40a265f5aa8b6b0f04a335a7 SHA512 0de8699dd9bbd0550b0cba4e6d869e6748f8237277ab7abeee5f252984cbf0b60a84f6f7d689b1fa8ff12bbe573b9b3727c3d21250f376d53f1e509929580fb3 -DIST github.com%2Ftidwall%2Fgjson%2F@v%2Fv1.6.0.mod 121 BLAKE2B 3d75e9b7319b937df20925cb169d9d03a60b37c6123d576eaaa5e5f2bfbd0d4288dba5db1bb85a25b785bd3321c8923e786d5fcf691f68805a88f0280e0f954f SHA512 656b8cb034328253243e0e4a59962e59dedb681e98ff4d0c3925d16791e03466d39bdbe2d13a9c8842a804fffc1bf92e016008aade9bb111420ed01aa8ff9d19 -DIST github.com%2Ftidwall%2Fgjson%2F@v%2Fv1.6.0.zip 53478 BLAKE2B a30d2cdb825df54e4ebcfbc3167527293d57a329ce1909ab1bb4c3444b858ca1876819be39b92ae05f643fbe01c99df44f5d99076bb621271c447fdedd535c27 SHA512 c7e91d1f9c627865ce0f08de9f6f40ddefe447a2eb38e120b3730073772ef7ba47401febdc1e78c83a62ec2581992c139c99679aa5162b3079aa7f952b22d349 -DIST github.com%2Ftidwall%2Fmatch%2F@v%2Fv1.0.1.mod 32 BLAKE2B 0352a43289e6d2cf597bdd8f2979d70ad3d11a415ad38d5a334e141b1d818fb605e847f4f988ac021ffbf5b2984a36f0ee28c0d722c30919921e8629ae9c6454 SHA512 e4f197f4e75c8936e7a7e1f6cba2f6bc5d7be5a674a05d7b23e1901fdd9a4f638a377c1c82ff6c0e9615997fcdfbe59bc35a9db43427bb48ae9cd21a3bae98c9 -DIST github.com%2Ftidwall%2Fmatch%2F@v%2Fv1.0.1.zip 5099 BLAKE2B ec7d5ccd4ab6a80971c002d4958a0980bd87099882ca1c38c38002d0e0587f938836d7a60e642161aba4d097d50a1fa2709cac03ec69e87dc4a94925838a2b80 SHA512 4fb1b86da8ed5c1c3de201502954e92787148deab29bd6780de9b9b2e827e144c1dac5c8bbc80fe2e9cb477274062e37d2ec7d9648e274caa1c49e77465cba47 -DIST github.com%2Ftidwall%2Fpretty%2F@v%2Fv1.0.0.mod 33 BLAKE2B 2f2161156210fb855e4efe08126e21b4fed0ff111b4f03679aa26051e23ac71f9d269c26088262a3ebeb6364fa60cb9e85c1850d8fd1674ab488c6583d6034ac SHA512 39a892eb40bdbf1398cde6fe8575bf4fea604e3bb21473de5b2316ea182130b92c9dd2467e2807c0421a35cddd0096fa99134a9f9de02fe79bb59d82e2762937 -DIST github.com%2Ftidwall%2Fpretty%2F@v%2Fv1.0.0.zip 9803 BLAKE2B dbb2623f6e506180cc64bd0d00d88c0fae0f5334f21bedb6f23757a3fd297d11c91ea6726ac9ff1d3de7dbf4a3d400cc7771412ba7978034e78c170b635672d2 SHA512 760da1b31d891006582c28c8394a0cc3494adefbe76ae77882b8340f1ed057011d96ca10bce9d86e881899ea683e6af402770f6f769726811c7776e040c3a787 -DIST github.com%2Ftv42%2Fhttpunix%2F@v%2Fv0.0.0-20150427012821-b75d8614f926.mod 32 BLAKE2B c5bd918ed79f8ad33509bee3028b85da9941f721e12735da810f7cf4238ddf83d3c5b7634c01944ebbe9d0c77fea36d5480d945d2dad9d9126cdb5ceb1cc1d11 SHA512 4168487b908d7fbec0813e5ac4d1cc854216d2355fd2843c2856ce81ee7bc399d9fc2b0811b5fbf1f0f1f26e92d327aab3d54b30809ffed621aff37a706e3417 -DIST github.com%2Fvishvananda%2Fnetlink%2F@v%2Fv0.0.0-20171020171820-b2de5d10e38e.mod 38 BLAKE2B 3ade12a1ed924c4e12dd9422b763bf2cadf710ef072d593dc40923d48477b792d87aaa3035e020bcab860da3ceeddcadc44afd74d9e11c3902a5d6241c8826b9 SHA512 637521629966c8f1b3d711a2b2b7b1753bed946f26570cd8e5e55ee3da5b106d418e0b80f48cac7a2651b71103c0d09116707d7b9d8cfb2d78d7bac2e908560a -DIST github.com%2Fvishvananda%2Fnetlink%2F@v%2Fv0.0.0-20171020171820-b2de5d10e38e.zip 150518 BLAKE2B d0fe6f5d5caca67fab12257784cf9bab46b65ef913655c6e5f842701dc78aa8ceee96efbe3205d10cb8ebdd46db5b073e68ef01203d6f066da82031187c4593b SHA512 bd535b9d102724ea502361d241bee39db7b57cbffc54d4172a29b81de4bd10c11caa1cb794ea3518af23b0708aed05c073aed98a42b12e82db3d5dca8c9ed709 -DIST github.com%2Fvishvananda%2Fnetns%2F@v%2Fv0.0.0-20180720170159-13995c7128cc.mod 36 BLAKE2B 89b77c2e7582554fd3a63f99bc03f2886e9f554e579ee4e0a99160385d8704b5f983e5680da06accae6bab806d303b726b22f2b4a6c2b03e82bd6bf9a9ddde7e SHA512 8f581beb7e676d082a76b9bf47b7d04c486d5e96e4f69f17fd99efc101e408cd7cd1c8d51a46ab1cbb55f7bb35b08ba8dd875f18e430f30ba9c88c43e44056fb -DIST github.com%2Fvishvananda%2Fnetns%2F@v%2Fv0.0.0-20180720170159-13995c7128cc.zip 9506 BLAKE2B f2ca36cdbfaed586696e77a17fd3ee88c158d5fba569d57685a09e6bc6eafdc36ce041d58002b19dc7a87ece0fdba73c793fa443ec31a2a33ef0f4030edcb447 SHA512 0baf36e3d814a78b868cfb028e116b734907c1cdb8898d5cb28986861e96f75ea8d61725f55c01974b4b5d74a4494a5f52a34fd38c9d82ebf97691244af8682d -DIST github.com%2Fvjeantet%2Fgrok%2F@v%2Fv1.0.0.mod 32 BLAKE2B 6a3a9d699425bd455bac81d43e069706e712d267166ab55ece3b31ffb5705bc665b3d5cfb41a677fd61d47522d1c0c8d125186407db8f13978d2ad26afe6c9e5 SHA512 5570ef0f8054658b464dc6067341b8354303b2de6963800813798bd71729881194ea92d924ee2870df0e38770869cda8a9176a6143099f08dc64e7b25183b136 -DIST github.com%2Fvjeantet%2Fgrok%2F@v%2Fv1.0.0.zip 34620 BLAKE2B 4c81abca3673ffc4f94d7048b7fe9c4a4169388363f3aafb2105010cc92246f632528e70997ce62277d7f5358446460dfd4acf982a6a43de808cc39ff8a45c25 SHA512 c42c72bd637a36bfe949409dcb46f23ff0bce3ff234ccd013dee5ef84c536ad7f15c2435c33028aeba26746ed7e6b95066ba45f6c24cfef04824f6b1d726b9e9 -DIST github.com%2Fvmware%2Fgovmomi%2F@v%2Fv0.19.0.mod 33 BLAKE2B cd0b56c3105d5a303d3e19c1b7fe5231ea3d9454e9b1f67047cbaaae6b5689f2d48fd6ef31c58bbf1453d995045709eacc57b6e9adf1a3c9613b0512dad62868 SHA512 483d88e041bc73a30a83559b427d454381c2774acf67edba69d8dff8034992b6f2435c472e32391f6b6c7c1f0c52715fb554c01890e9da1c173f481df51f51f2 -DIST github.com%2Fvmware%2Fgovmomi%2F@v%2Fv0.19.0.zip 1576750 BLAKE2B 73117ff52fa687657c4fbbfd81cfc76abf57c995ece4ffaa698c9e5846fd35f56ed37c5bc25af5c7e24ffcceb61e0da1e70cf1a4d3b834fc2bcb48883226fb28 SHA512 18e558f6234bdbcb9dcc5b7d1d98463250a2c290e5cc63615bf1c289562d72f592b35f0409eca0195e6b3cbbb37d1eac0e787c1fece4be52e3e7a78cbad244fb -DIST github.com%2Fwavefronthq%2Fwavefront-sdk-go%2F@v%2Fv0.9.2.mod 47 BLAKE2B 4d1a70983dd3296b17b17baa4cf413ebb8929092eb5f33902a481f53304bb3ad886f1a2d6723b58ab860edca26490f8771c22c79593edb3e5101c2d4447d28c6 SHA512 de987b641cdcab2ddd709e18dd6588ceeeb591981319af66be376d84528e7dac7045b605596c3ddb9bbc5f16b3b64ab36e4964004fad3d59defa023befd07bba -DIST github.com%2Fwavefronthq%2Fwavefront-sdk-go%2F@v%2Fv0.9.2.zip 27927 BLAKE2B 171dcac156901ca308f103668f3c0dfd31b6e0e3d838a80d1fcf5099393540816bdf6f4d76c89de177c5d1d98ecc33802591b251b4489d71ccbc7a32f0c8fbee SHA512 035ecf912a2343e1da0fa2592cdf1436cf424b281fb5bcf49ab94377d219e0b3f9be70f1d5375551115a9972ff455b4da5a39d2164a3a0300d40e88ae5ca9761 -DIST github.com%2Fwvanbergen%2Fkafka%2F@v%2Fv0.0.0-20171203153745-e2edea948ddf.mod 35 BLAKE2B 82bed67fb03711e74fbb26206af9f550221238b87eed22783713671fb47ff0c6e651182007a5f190870db65f20550062e36e044633c13876ae550e130ea0bb2b SHA512 76e3cb614193a8c94a481c5ce8446a73a13fda2ab1163485bb51c955670812c4431a848effe3c7be82992d98cbc0314d23284cc173a91b253ffec4027f9a9e79 -DIST github.com%2Fwvanbergen%2Fkafka%2F@v%2Fv0.0.0-20171203153745-e2edea948ddf.zip 25226 BLAKE2B bb05b0fe71b34f46f20418456611cf6ca65ae48a37fb3333b51dcfc4c0b3cfa5f25244c0f6e1e18e1ca747792b85048220d6ac35056feefa2b406a1ec20be2b3 SHA512 959f07a5ce4b77befda482035ce7d57d5fd91a54d1ef6fa807ef0a83447069e5a40d7e92bdbce414dcd8d0e34a4bbcf012d50b2ea504fa762f07ceaccfcce369 -DIST github.com%2Fwvanbergen%2Fkazoo-go%2F@v%2Fv0.0.0-20180202103751-f72d8611297a.mod 38 BLAKE2B a5a325176e94f20bb20c4aedd39d57d09dbed7eda5e377a41e32504a8f89c2eadda995906d56690001bb5be548b9c1f7278417111560a4461a08615e706555f7 SHA512 2b5eb21f03280b29926553a8737c528dc0baf47b00deea6e3bf272700b3dc605cb64d8fbc003304746c4b06f56e63cc52d3b15c27b2c3c52ccda0b663324e38a -DIST github.com%2Fwvanbergen%2Fkazoo-go%2F@v%2Fv0.0.0-20180202103751-f72d8611297a.zip 24322 BLAKE2B 9be0587911177f20707339057eb60612f2d3e799c5fe434f68b0aa8705f02daaeaa5bfb2a9fa3db96ca54a746472690fd38a96ddbf771667d1dfca0c944fa42c SHA512 993867a4fbf57de75c5b50350a2e78b74b9d968641b0fe266da99d807856aa65e7603cfcbb2430b707383008ed502d052c16e214db89966ceb742864b02d7f49 -DIST github.com%2Fxdg%2Fscram%2F@v%2Fv0.0.0-20180814205039-7eeb5667e42c.mod 28 BLAKE2B 87b79aaa3dda433afe275fbb69b3abfaf808a8a992f37846b51a3cb9069b1a0e5506ce6166d5186eef8656b451c3f6fad5bdfb58a213a9dbab2e7820e9062c81 SHA512 2303a64b0acb96f5f73dc64468a81d6aa6fd9a08240a04d5025884d6076cf90eeb5b132979488431d6f885138702a22a606419cfc0aecd05798deeb3acc4fa1e -DIST github.com%2Fxdg%2Fstringprep%2F@v%2Fv1.0.0.mod 33 BLAKE2B 602b301b7da6b66bdb3a5c9c88d4a74f776ea535fe1c4b1085840eaaea4ea5d9a05fc2f088b92fb85152d22025e89801eb476cdc26e031f8e3adb68fbb62542e SHA512 9c89175c24f82cba599f754d2efb8dec6def64b32735f9733b883b20a0758a6769afc527322ec5059ce275df6e034bc631a32c0a392a66e96c9d4d4a1087c4c8 -DIST github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.1.25.mod 41 BLAKE2B 44917ea3a6fc533933ccd76d1594e19246c682d96311e030eeeeaeac3c126f6cd2c2de67ca410c89738918c5ab0594f1e9b2c2202c48f462c368ad31fb5feff6 SHA512 b7d81f5cbf1b55ebebcbb86ae89899ffec6fcd730144f1719947a76080f587d298d0e37a073a8768d7768ef64fc47b1673104335203a32a557f31e42a4e5a950 -DIST github.com%2Fyuin%2Fgopher-lua%2F@v%2Fv0.0.0-20180630135845-46796da1b0b4.mod 34 BLAKE2B 58672703644ac6739cc829047dc75265ef7c6c4ab2783595819e7f1c4edee8a4ca4b6820f5734dc387882b780dab7f786e03291af2edce3e1bf839dad060c22f SHA512 a93071d377a3b10b4220e71d7ad8bbcae0c55746f11f44f59deec7bc4216e19e4ceb375ee2c0d3ec8ae7f9e78be1a4b93eae6ecb6668936783c778ade75d6cc7 -DIST github.com%2Fyuin%2Fgopher-lua%2F@v%2Fv0.0.0-20180630135845-46796da1b0b4.zip 183730 BLAKE2B 9e83664bf7a7d77109b3a08471da1a794fd87ea91afde2f821cb04386e3f5284342512cd11b749649c33f587968ce85e154a2fc629e5dbd633902b8cf59627f5 SHA512 7d96c0a260a0e2de8105188b66f96d345afba21cf8745286a8ba3b993d6dba20e0cd49842a3805b7f2589a5ede7a92bc399c352a0cdb0e4a324b3948f5c9731d -DIST go.opencensus.io%2F@v%2Fv0.20.1.mod 408 BLAKE2B 01a022e76e1605416e74ffa8aafc0868304c7810d9e9de804bd611a2eb7417adf113cf10ecf607d89d1ef18f1e17fdbd1efc35f889854210114fb8a4e8db1d6f SHA512 2bfbe633ffde1f91834ca77f19d0b32cc4c9480b8a59e101199cf3e8ab0285c16fb45a00326353f02a7dbe06c1562c4695ce7d98767c4149ed2321acd527bebd -DIST go.opencensus.io%2F@v%2Fv0.20.1.zip 307969 BLAKE2B 172f25fc5db57fd1f63755af81b82869661f690ef78b3b23b210b4bf2680913e4e69f23a640209feea31263af832cf753786f8266a661f5346e5046f6339fa26 SHA512 65be8cb4694d4878896361dbc44449aacd554b9bd9c7c64de78280ab3c4de6adfb2908f00399783a0a759ba35c6032d22e7972d30a9222e96affaf36e20bca44 -DIST go.opencensus.io%2F@v%2Fv0.21.0.mod 305 BLAKE2B 73735106ac582b2e9d5f0d739412c3396e0df8627a6adbe810ac560998e4cf2eda12e449b6e336dd6b433eaf57c885b4a927359d0bc1bd6eba9432bb0793c35d SHA512 448e90223b8d67e4d5e4b150055ac83eacf9ef48aa34036c2e59559f21443f796e721df3c0395a829bf5d10d229cdc7beb956c8f90273e50f0989e45a82aace8 -DIST go.opencensus.io%2F@v%2Fv0.22.0.mod 408 BLAKE2B c96dc637d392594cdf710b9542b90504fb090392662ab45208d45abe2cbaac5b64e55f2f62d1afe5542d2747abef1eedfcff97cfc48d6e0649c23b9b8293f7e5 SHA512 823e1ca3a9adedb1a98f5ac900e190bd51480686872bd901cc20a394cf03be6c8fd69cfe7343e42cb6f9d3500282a8097b6c32376aeb3e92bf0b1ce3e75872d1 -DIST go.opencensus.io%2F@v%2Fv0.22.2.mod 478 BLAKE2B 534d5c63341897b7213d30ae225708b5465b0bc5efd7b42ecfdd7fd67fe6e8fb5ec7a20345b734d07fc2793b41a115dde74a1f80510f3970aaee8f6d4effd7b8 SHA512 62820051cdf582849bd310ca77bba4b2caef82c9e6bb27e7c2de6c3bb1be0af90443770971e893d0eb466832857190a9908633d069880cb1980120c14ef391c0 -DIST go.opencensus.io%2F@v%2Fv0.22.3.mod 478 BLAKE2B 534d5c63341897b7213d30ae225708b5465b0bc5efd7b42ecfdd7fd67fe6e8fb5ec7a20345b734d07fc2793b41a115dde74a1f80510f3970aaee8f6d4effd7b8 SHA512 62820051cdf582849bd310ca77bba4b2caef82c9e6bb27e7c2de6c3bb1be0af90443770971e893d0eb466832857190a9908633d069880cb1980120c14ef391c0 -DIST go.opencensus.io%2F@v%2Fv0.22.3.zip 299798 BLAKE2B 6adc76c28569e177bf40cd2d4c7de912e92bb679c29ce669bda7e001d33f8e758d3f2a413857b2b74efc676d4d0cf239e9c7acefd2cb7cc502121f07b31d640a SHA512 99fe389fbe5fed1db31068ce5c4ebf597ac5b39203e3c5f13b0f92c3e66ed0b1ee9f6f3ec0d953a7f5d02d2db46969b8d3cb642703acf43cc0df5cda61c3e355 -DIST go.starlark.net%2F@v%2Fv0.0.0-20191227232015-caa3e9aa5008.mod 289 BLAKE2B 5b1d75d67c4e88e00aaad96b3f1d5666f1a24c0f2224cd4b2ff94056eb0f4d723852c233493a5974440bf51fc27cbcf3f167eafbf5612d84b7a28cf54d78640e SHA512 00d29b9d080aa455ad5fcf13e5bd5bb831edacb3fef6997ac19aba7b77eb02f096d96e1e35bee24dc0455a3d998f8e80f35b75d9bf7cf6f51bc251587b2da218 -DIST go.starlark.net%2F@v%2Fv0.0.0-20191227232015-caa3e9aa5008.zip 261745 BLAKE2B 3484d11c8bf21497b51646aec4f9eebd2503070e5e045067f54382a31ce8f339eff37d7ec7ba65c69772d49a7c144d3498d5f203500278e0d596da4c8c1880aa SHA512 bd17ec9dea74adc5fa250cea31c309168993a22e038c49aac1a7ec7310471937996792f7e109df6424f8d363a7e6e59c65fcb970c2d5e3ace182d0c5e6d5bff4 -DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20180904163835-0709b304e793.mod 27 BLAKE2B f91145aab2cee00c3567772e97f6162b9681d6cbcbe67a1b5b2f59b8f912572f705a0d1280fdced086d92efd10c50ecede26d1cfa3d5419217e5eef95097b4b1 SHA512 a88da5b983ff482a4e8b512761eeee466a8b0664b42da54ec9772c2eb3cb1bc5b7545045e283bac82552336802d8bc8efe137ba16f3530228b529366744a33e6 -DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20181029021203-45a5f77698d3.mod 27 BLAKE2B f91145aab2cee00c3567772e97f6162b9681d6cbcbe67a1b5b2f59b8f912572f705a0d1280fdced086d92efd10c50ecede26d1cfa3d5419217e5eef95097b4b1 SHA512 a88da5b983ff482a4e8b512761eeee466a8b0664b42da54ec9772c2eb3cb1bc5b7545045e283bac82552336802d8bc8efe137ba16f3530228b529366744a33e6 -DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190308221718-c2843e01d9a2.mod 88 BLAKE2B aec7d0eea1278eb3d1568d5bfb4041267501ad14457ebfcbdbc5fe21473170b8616ca4028f52af2edbfd85922cbe04540b4b0df7f69f63197698143cc5557a7a SHA512 2df49895053b36fed7ea905aa73f86568fbafd79ff0a7976679d8c77cf15025129435d9dbfd89367b611b1aadbea4f4bd1835eb4efa9ea702466e443638d379e -DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190325154230-a5d413f7728c.mod 88 BLAKE2B aec7d0eea1278eb3d1568d5bfb4041267501ad14457ebfcbdbc5fe21473170b8616ca4028f52af2edbfd85922cbe04540b4b0df7f69f63197698143cc5557a7a SHA512 2df49895053b36fed7ea905aa73f86568fbafd79ff0a7976679d8c77cf15025129435d9dbfd89367b611b1aadbea4f4bd1835eb4efa9ea702466e443638d379e -DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190404164418-38d8ce5564a5.mod 88 BLAKE2B 22568b660b7e13eed0dd423bfb6b033adf659a2c2b59c6ab12d707aca9f6f7317b7b438640caf6233dea4d9840aec4eb997eff5fcccbcdb193ba81db52d814d7 SHA512 fcfc8d63d333065f1193e9c27efe32a1fab270e450fbe1db533156e00427a13c75691163cd1bc7e9aa26b84d4142625c9fbd755535c575f83d63d82d7a276066 -DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190510104115-cbcb75029529.mod 146 BLAKE2B 6fe18cbe4eb6c3f6c26a4d2f9f309c48eb9ea59017125179cbfd61bb1e62395515c8cb286e1139fbcf54d37dcb2baa1a2f98dcfbcb6178b7f7df3b51929ff5c5 SHA512 f40c7b620b28b5bdc6ce92d43768af71b5869e7f0eb7872dd0f2751eed2bd15a17f7af26bf2dc5c6f7e6b816a174d010bfd22b3f8f5dd72f22dc4e4357dea842 -DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190605123033-f99c8df09eb5.mod 146 BLAKE2B 6fe18cbe4eb6c3f6c26a4d2f9f309c48eb9ea59017125179cbfd61bb1e62395515c8cb286e1139fbcf54d37dcb2baa1a2f98dcfbcb6178b7f7df3b51929ff5c5 SHA512 f40c7b620b28b5bdc6ce92d43768af71b5869e7f0eb7872dd0f2751eed2bd15a17f7af26bf2dc5c6f7e6b816a174d010bfd22b3f8f5dd72f22dc4e4357dea842 -DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190701094942-4def268fd1a4.mod 146 BLAKE2B 6fe18cbe4eb6c3f6c26a4d2f9f309c48eb9ea59017125179cbfd61bb1e62395515c8cb286e1139fbcf54d37dcb2baa1a2f98dcfbcb6178b7f7df3b51929ff5c5 SHA512 f40c7b620b28b5bdc6ce92d43768af71b5869e7f0eb7872dd0f2751eed2bd15a17f7af26bf2dc5c6f7e6b816a174d010bfd22b3f8f5dd72f22dc4e4357dea842 -DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20191002192127-34f69633bfdc.mod 146 BLAKE2B 6fe18cbe4eb6c3f6c26a4d2f9f309c48eb9ea59017125179cbfd61bb1e62395515c8cb286e1139fbcf54d37dcb2baa1a2f98dcfbcb6178b7f7df3b51929ff5c5 SHA512 f40c7b620b28b5bdc6ce92d43768af71b5869e7f0eb7872dd0f2751eed2bd15a17f7af26bf2dc5c6f7e6b816a174d010bfd22b3f8f5dd72f22dc4e4357dea842 -DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20191011191535-87dc89f01550.mod 146 BLAKE2B 6fe18cbe4eb6c3f6c26a4d2f9f309c48eb9ea59017125179cbfd61bb1e62395515c8cb286e1139fbcf54d37dcb2baa1a2f98dcfbcb6178b7f7df3b51929ff5c5 SHA512 f40c7b620b28b5bdc6ce92d43768af71b5869e7f0eb7872dd0f2751eed2bd15a17f7af26bf2dc5c6f7e6b816a174d010bfd22b3f8f5dd72f22dc4e4357dea842 -DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20191206172530-e9b2fee46413.mod 155 BLAKE2B 8bba3353db8ceb3b9fe40b8fd59aacde169776a4a553a069a04836bbf15e5a9a8d7a2d39feed98dac6cb890198180fda39f26b528ff95f24c5b2bbf6601b45c3 SHA512 7c5a755a03063d47d259fda0a6c2faa63c2f30b98dbac583e106aaa817d6cde3e07551e0b5e08f3a25db4c4ca45a23cebe993ae6f3d39c88deeaf2c7d8086a06 -DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20191206172530-e9b2fee46413.zip 1859923 BLAKE2B 289c9b56814fd50a40a350f1e325381ab0789ec38e161eb7c64a988e6fa46dca70892de0b1fa21636d10ff7f8870160714d30d294781024c45782c5e6ff165e8 SHA512 f54cb2da01ee50f7e04fa3caecd06a794c70e9b58c6ac05fee6d09d7a8cf4f0d8ed129f981d457b8ae1ffc79316744b3e6d0ef8534e61fdc4127d41da8cf2700 -DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200204104054-c9f3fb736b72.mod 155 BLAKE2B 8bba3353db8ceb3b9fe40b8fd59aacde169776a4a553a069a04836bbf15e5a9a8d7a2d39feed98dac6cb890198180fda39f26b528ff95f24c5b2bbf6601b45c3 SHA512 7c5a755a03063d47d259fda0a6c2faa63c2f30b98dbac583e106aaa817d6cde3e07551e0b5e08f3a25db4c4ca45a23cebe993ae6f3d39c88deeaf2c7d8086a06 -DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200204104054-c9f3fb736b72.zip 1863059 BLAKE2B ffa21e8af27abc68c144798d86da766b0c246f68c8a35dc94b29b31234e5b7c611651a1b1f79ea70d0fdf3fd54190df608a23f3a0931271e962ea28bd18fb0bc SHA512 0256e72c4734509cd52a04f4cb6e37837ea352fb649d716bd35befedfc825f531b1b07a0f1427cca08f379989c7a1e2a13c9a62de17fee09fb72e647cee367bd -DIST golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20180321215751-8460e604b9de.mod 24 BLAKE2B 9615629f1bf7d58419f5b73842e19f6be3a8c8cefb217364917f1aaf68aec00de41d96700378b048d6cc385e154ed6d3db59256b4a00e9165bac7951cd0bcbab SHA512 9131017b8ab0c2362b74e0c010daeb849689025aa31cb464dc379b0e34d0fcdb66749329b111041127997440bac052249dab522ab27239858405c056e3ac5dbf -DIST golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20180807140117-3d87b88a115f.mod 24 BLAKE2B 9615629f1bf7d58419f5b73842e19f6be3a8c8cefb217364917f1aaf68aec00de41d96700378b048d6cc385e154ed6d3db59256b4a00e9165bac7951cd0bcbab SHA512 9131017b8ab0c2362b74e0c010daeb849689025aa31cb464dc379b0e34d0fcdb66749329b111041127997440bac052249dab522ab27239858405c056e3ac5dbf -DIST golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190121172915-509febef88a4.mod 24 BLAKE2B 9615629f1bf7d58419f5b73842e19f6be3a8c8cefb217364917f1aaf68aec00de41d96700378b048d6cc385e154ed6d3db59256b4a00e9165bac7951cd0bcbab SHA512 9131017b8ab0c2362b74e0c010daeb849689025aa31cb464dc379b0e34d0fcdb66749329b111041127997440bac052249dab522ab27239858405c056e3ac5dbf -DIST golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190125153040-c74c464bbbf2.mod 24 BLAKE2B 9615629f1bf7d58419f5b73842e19f6be3a8c8cefb217364917f1aaf68aec00de41d96700378b048d6cc385e154ed6d3db59256b4a00e9165bac7951cd0bcbab SHA512 9131017b8ab0c2362b74e0c010daeb849689025aa31cb464dc379b0e34d0fcdb66749329b111041127997440bac052249dab522ab27239858405c056e3ac5dbf -DIST golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190125153040-c74c464bbbf2.zip 1453241 BLAKE2B 3cefe5395bcd715cedaeff2add4c77d057025fb96b9bec7732d044cfcad027fd6c47633543957560194c04f4649646c72e12f998b17d6709965eb9c196ab4f14 SHA512 904202536557a2a73c421e242cbba38c1d68a94d49e3b80649c85f3353b7612cf0005325dbdc7b1c0b10d4334f2b59599278d5686843c479944eca58e8d84134 -DIST golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190306152737-a1d7652674e8.mod 24 BLAKE2B 9615629f1bf7d58419f5b73842e19f6be3a8c8cefb217364917f1aaf68aec00de41d96700378b048d6cc385e154ed6d3db59256b4a00e9165bac7951cd0bcbab SHA512 9131017b8ab0c2362b74e0c010daeb849689025aa31cb464dc379b0e34d0fcdb66749329b111041127997440bac052249dab522ab27239858405c056e3ac5dbf -DIST golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190510132918-efd6b22b2522.mod 327 BLAKE2B 209bd1491b6099491fca7ccfd2fabb500b56112557b4b359819b5f9d18e1587b8b1551acab53ac6c222b66b825c4058ecd6adb1d886f1868b7b96ebbd5865eea SHA512 e16919da8b2302c45f8fab5f0d200f41c2c978ad31eab2b4db18310bfbe09079d738f682920ef6530f1d5f53359ddc3d4bf33fe5cefbcefd440212b31e72ef28 -DIST golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190829153037-c13cbed26979.mod 352 BLAKE2B 5e146ef1d6b71ec65511cb06d8392eddb9a126b6194213f3b2ac6b675977dcdc77cbb3e46fc936189269583df4d0d80d2e393523c3ba4c55f1e8f9294e0dcaa1 SHA512 8ea874c371c0a582410e682cf475628b4fe6a0c0f57b05566a03343999da063250dcb987d9a863b96a8e1ee913612f323de296b4ddbcfecb166884bee06a8af9 -DIST golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20191030013958-a1ab85dbe136.mod 475 BLAKE2B 3be94804cb1c692471ca7f2af890586ef57ed45a306a50fd6d6eaec9c7a161e2e4945ed11640ed30ab6f0e48ca644ec06b6b12e232b0990d4e9a08347c27491a SHA512 4b495d303e08e9bb4b43ff0c82665107a6e0a9cdd33a6d14aea491e634901fedb6341fe9e47c45fca1f89688ea3548f57ac8d62b79ef4ccb596ef4eb2e809241 -DIST golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20191129062945-2f5052295587.mod 485 BLAKE2B 84e7d8f764e53841999e798d24dcbffea37708b68eb430f91e3e09f77cca2a2d36d9bfd115f0fdc9eb87e967d6ffeb0ff6f6990afd722e86b40046995f22600e SHA512 2c7217344b34e4870f799968403146268e8e6f85680aac25702f22e69bc4954d35a70a0743646ee8aa36f268c252a9c647e88b1dce8c47db302a1d3eca638aec -DIST golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20191227195350-da58074b4299.mod 485 BLAKE2B 84e7d8f764e53841999e798d24dcbffea37708b68eb430f91e3e09f77cca2a2d36d9bfd115f0fdc9eb87e967d6ffeb0ff6f6990afd722e86b40046995f22600e SHA512 2c7217344b34e4870f799968403146268e8e6f85680aac25702f22e69bc4954d35a70a0743646ee8aa36f268c252a9c647e88b1dce8c47db302a1d3eca638aec -DIST golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20200119233911-0405dc783f0a.mod 485 BLAKE2B 84e7d8f764e53841999e798d24dcbffea37708b68eb430f91e3e09f77cca2a2d36d9bfd115f0fdc9eb87e967d6ffeb0ff6f6990afd722e86b40046995f22600e SHA512 2c7217344b34e4870f799968403146268e8e6f85680aac25702f22e69bc4954d35a70a0743646ee8aa36f268c252a9c647e88b1dce8c47db302a1d3eca638aec -DIST golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20200207192155-f17229e696bd.mod 515 BLAKE2B b37d0d779f058e58ca3e350248cceaac958c4e406d70872fc3682f49b862391dc75d0a17a9ecac8a5dde4339552a222ce2f36b99d8daa3ad01fa5d8632351b3e SHA512 c5f79afe4531059fbc6acf58b7ec7f1e9558df83c4936c830dcb138cbfd7dbc4bab6c0acce6e0c588cc742ec3984d4116ad3e03be815c4f64af32f7ea5024053 -DIST golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20200224162631-6cc2880d07d6.mod 572 BLAKE2B fe37c4263fa4f07a01e65941f859f6abd92e26911622e8b06464ca1e4b65efa46b43eb1c475d6888a67d21b6104aca3c227f42210f0ea8e6709a497f13e1b45f SHA512 a773e3b5c26e95dd24414b9f2aa88225a330581cd9ed0c1ca83a3a6712dd3639e1526abe7c0ea47f9ca701828eb39e1df2144edd6ab261caf584a058f092f0fb -DIST golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20200224162631-6cc2880d07d6.zip 1564884 BLAKE2B 88e3cf309f9f29f1d6e997f3efb29cbaff2ed09577a9212a97d8e1a64b118dcf9128e46ee725f70d550b968570e8e74187feea3c6bf66843ebbe32043dd85c94 SHA512 5de4e96349919839fb4a91a9b0bb3ba8d94efe63970e44bb76ea366bb0abd3e4e70b36260346054c1525f04d518cf7270400eac7c054cc10c7be63d87d318a4a -DIST golang.org%2Fx%2Fimage%2F@v%2Fv0.0.0-20180708004352-c73c2afc3b81.mod 26 BLAKE2B 99ea5bcf900233680c1e0fd7526b1e12c79143afc9e545e59796fe734cb5b788536d332179d2432924b39670e4067fb3d13752735e59b8b19b3d27e9de9403ef SHA512 e78afa02a8d030fcd336ae1c1d5d4071d14f2873a1ad72af64a744c0e5e3ec795957fbc527557f4ba5b747cbcdf31c0109b43a6d75342d85a69fac6cf97f233a -DIST golang.org%2Fx%2Fimage%2F@v%2Fv0.0.0-20190227222117-0694c2d4d067.mod 60 BLAKE2B 1c8445e3c9313293a0551c8a2acc31a1738724b96886bdf165c74de6cf2d25b784baefa2c41997a64ff189333a8c59756fac7ac41b0ae1d4f167c38574905351 SHA512 c466f8b348acdc26208bcb782cf330a979d9af086a95f307a785884492430f11fe45d1ddc3abdc1b092654b3880a5e7a456740293935b1912a1d39b658de80e8 -DIST golang.org%2Fx%2Fimage%2F@v%2Fv0.0.0-20190802002840-cff245a6509b.mod 69 BLAKE2B f2318e92793bd626374b94e2917ea05ec2b41285c169f1461365edfa00412a798775a8ce137221e1c280983a62d03bf1cc97eadaf8668661ed4387ef5823963b SHA512 d463167481b44386a011b867d6e26eaf2fe81c750325ea89f631af7b065c5152249084c45e7195a662d9b9ddde0e81a5273d8110f73a18c4d841c155c67ea0f6 -DIST golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20181026193005-c67002cb31c3.mod 25 BLAKE2B 8942ceba0f85f2e950663feb634e602815315834dea89d18f7319100c19a27f15746a11b50157d682756fc922138660512cd6c8e75a2458b0cd512aba19760da SHA512 3ba23f3472e0ae7904b4250e2e3a1b04c719c4bb66c59ccfaf96fae2fb25ae0abf19f542f03c7179a312a008521acaf4ff389517b11dba8b6f581a9dded44883 -DIST golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190227174305-5b3e6a55c961.mod 88 BLAKE2B ce393846b227c374753f46fc076385826a6288b0c85095e097c041b844f46b87120774c68924492c4f33c33729103a2d916d2335e24953022630314b63f606d0 SHA512 0097db2957ab98a21a73960d2a37c526e5cabcd5ba4825e44f0ec4851ef83743ae171c8dc4b6c09ea4d931c15879c247e362ca53ef8dc762b484f1ddcc483d04 -DIST golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190301231843-5614ed5bae6f.mod 25 BLAKE2B 8942ceba0f85f2e950663feb634e602815315834dea89d18f7319100c19a27f15746a11b50157d682756fc922138660512cd6c8e75a2458b0cd512aba19760da SHA512 3ba23f3472e0ae7904b4250e2e3a1b04c719c4bb66c59ccfaf96fae2fb25ae0abf19f542f03c7179a312a008521acaf4ff389517b11dba8b6f581a9dded44883 -DIST golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190313153728-d0100b6bd8b3.mod 88 BLAKE2B 04ec98f76d6779784920b4f746fccafdba5ee6f365edc58985219675791d417746575165985de6d866ee891b6c768d317360a4229e61f19a1f05e4f0bafdb111 SHA512 5e787e9d2c16c87238995214eab353f87d009acf8ef78889295d11dfabef73cea4e8cabfc2999f9ef0c936efb84c22963e0aa2bce4b3678680a389cbe23df961 -DIST golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190409202823-959b441ac422.mod 88 BLAKE2B 04ec98f76d6779784920b4f746fccafdba5ee6f365edc58985219675791d417746575165985de6d866ee891b6c768d317360a4229e61f19a1f05e4f0bafdb111 SHA512 5e787e9d2c16c87238995214eab353f87d009acf8ef78889295d11dfabef73cea4e8cabfc2999f9ef0c936efb84c22963e0aa2bce4b3678680a389cbe23df961 -DIST golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190909230951-414d861bb4ac.mod 88 BLAKE2B 04ec98f76d6779784920b4f746fccafdba5ee6f365edc58985219675791d417746575165985de6d866ee891b6c768d317360a4229e61f19a1f05e4f0bafdb111 SHA512 5e787e9d2c16c87238995214eab353f87d009acf8ef78889295d11dfabef73cea4e8cabfc2999f9ef0c936efb84c22963e0aa2bce4b3678680a389cbe23df961 -DIST golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190930215403-16217165b5de.mod 88 BLAKE2B 04ec98f76d6779784920b4f746fccafdba5ee6f365edc58985219675791d417746575165985de6d866ee891b6c768d317360a4229e61f19a1f05e4f0bafdb111 SHA512 5e787e9d2c16c87238995214eab353f87d009acf8ef78889295d11dfabef73cea4e8cabfc2999f9ef0c936efb84c22963e0aa2bce4b3678680a389cbe23df961 -DIST golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20191125180803-fdd1cda4f05f.mod 97 BLAKE2B ec2dbdd2dad833a979dc53c8d170b4d0f5d336f4c52f36e3116cba2f3549e42fc3191fa56b81d3b9378a52322b86cf5eb0e947e6002dc1d1bee12f7a6bc2eb36 SHA512 23082eb3c6f3e4330e88178c7511b83a06288b678e517cf8ad5062943d0a0fdcea16973425a8dc01cfeacc32ec05b2dba8edb1adfba2e0bcb2d81cb5060c6085 -DIST golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20200130185559-910be7a94367.mod 97 BLAKE2B 6bf1c22438e1c18af0d845f52a62fc4c96b6752486228e0201a794540a44aca52a045366ef1beee95fb7780c9d0a37aa53fea0b669241d45a0529731bd91c2c4 SHA512 5e1e301c678b32fcb56cd538fb907900e5e60162a44c285e04f0fc8db49f1b31f346e736055872ae9a69fe63798823466d7f159d2ffffb4880bb39b17d4ba5fe -DIST golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20200302205851-738671d3881b.mod 97 BLAKE2B 6bf1c22438e1c18af0d845f52a62fc4c96b6752486228e0201a794540a44aca52a045366ef1beee95fb7780c9d0a37aa53fea0b669241d45a0529731bd91c2c4 SHA512 5e1e301c678b32fcb56cd538fb907900e5e60162a44c285e04f0fc8db49f1b31f346e736055872ae9a69fe63798823466d7f159d2ffffb4880bb39b17d4ba5fe -DIST golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20200302205851-738671d3881b.zip 46076 BLAKE2B a3611608a1963ae2e1e326da29671c30a1d44c7afd2698f85081aed84ae5699c16362af284e299bd4ed721d20052801a79886f0b1305f91b17a2bc5a091a3f27 SHA512 b35cfd6b7640a526780db3c3bc62a89ec731793e350a49894c1de278b8033c4105b5534b09c1ffbfedc8e020fce2f42757808550e98e0ef5d493891f971bf247 -DIST golang.org%2Fx%2Fmobile%2F@v%2Fv0.0.0-20190312151609-d3739f865fa6.mod 27 BLAKE2B 9bc664bbb78cd778f132bf3504160bf8f6d9950342fa73c461db815f07c0ce2ae5bb2a0ac099457d022e1edf2d07e536566fea043a77aa8b21054254ae854c46 SHA512 a105eb088532321694d3adb5da0b3cdceb7781670a2d4a8a757799e3c8fde02784b981747714cfa8770ed29eb1a0228e0945ad3c363220c39108a7432fc29a32 -DIST golang.org%2Fx%2Fmobile%2F@v%2Fv0.0.0-20190719004257-d2bd2a29d028.mod 222 BLAKE2B 5f1962cf1df6a0e8d748eacc5616c3bf0b8de117d29e57da32017cfe26eafc879d33427deeb888b283eeab56d48b3c72ef1ad0aa3706a1dcaed208026eeb0054 SHA512 6689d7c55fea7d8cfb8d2b1a934ca45793dc8d4cf4fc5b001bafe676367a93b8a8c4964d8131ba145e5e41c4da50a238d6df01dd3fc336eeb18be61b49e62416 -DIST golang.org%2Fx%2Fmod%2F@v%2Fv0.0.0-20190513183733-4bf6d317e70e.mod 97 BLAKE2B f6c97d5de5c229ab22e047250a7030c201829f8237b63c0b272c0453dd8ea91360f4a73f9d2b56212103c76c36c01699231d9dd31d48ba8624554b5b36499190 SHA512 15deca99c6d866dcffdd51b1334fbe7f33ce88e1fd82badec64f5155782681887e7fd959ec2686fb35adf70afbe08d743e36c6a891f43462074663357e5b309a -DIST golang.org%2Fx%2Fmod%2F@v%2Fv0.1.0.mod 97 BLAKE2B 54b5bbd5b0908619326ca8bcebebf13f45b2838737d22008f20d3f40ae52fb4f8fdb8c73cbd98b57873aefc8b37c7328aab2bf02ad82a7d5f83e0d75a9283e81 SHA512 4e955424df3c1cce0b716fc518eed10196feb34ec718c1fe537350ce99efd0676276c2000feca6faaa6f3db8ce626e2d330f700fa43a10c73120dd13f5f1a764 -DIST golang.org%2Fx%2Fmod%2F@v%2Fv0.1.1-0.20191105210325-c90efee705ee.mod 159 BLAKE2B 7124b4e21f0b1ff142fe4cd5c57a22de7bc5b1c578e16e8661085d475d67573279c1ce3165e05a28c77a41eac43fe29b1d98854abdcc7b0b66167f82db652dd8 SHA512 5e225da646ef87b8bf435b745313187cecd1bd3e88660f8a90cd2a6fdcadbe8fc51f53edae4b3aa2357ad273a8e58034920bb61a1cd5898b95d3fe39f30ec648 -DIST golang.org%2Fx%2Fmod%2F@v%2Fv0.1.1-0.20191107180719-034126e5016b.mod 159 BLAKE2B 7124b4e21f0b1ff142fe4cd5c57a22de7bc5b1c578e16e8661085d475d67573279c1ce3165e05a28c77a41eac43fe29b1d98854abdcc7b0b66167f82db652dd8 SHA512 5e225da646ef87b8bf435b745313187cecd1bd3e88660f8a90cd2a6fdcadbe8fc51f53edae4b3aa2357ad273a8e58034920bb61a1cd5898b95d3fe39f30ec648 -DIST golang.org%2Fx%2Fmod%2F@v%2Fv0.2.0.mod 214 BLAKE2B 9a9c23e4a6fbf1e2168cc2559ab0eea14e2a1bbf32cab7eb95e276c3c1f2e06dadf6c58e39a4722211fb882e48f25a8de2969422590c62851292747f1da76b02 SHA512 16d72a943c436bf27c18ee65deb1e1a3b1283dcfcc76a49f01919df97f41ae6ef7c5fe7f95b5bb62cf6f6fee57eb9654ca27ec3bae448ebfe894f8d6d0101fa1 -DIST golang.org%2Fx%2Fmod%2F@v%2Fv0.2.0.zip 126236 BLAKE2B 48caec10f6bf4b8da7028b0358645ab0414b5526004479ceececbd68380586bfbc5b4cfb9d43f8c608565f30521a0dbfe005669db7d5e245a1b63ddc8171d3e3 SHA512 2735c124a735b4cba606e4e3de5bb39c889aae2516525f778764d987b58677dd263cb286604fee63bc45636662c11e3dcc2c9726dcaf85a26e072ccd56597b93 -DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20170114055629-f2499483f923.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a -DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180724234803-3673e40ba225.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a -DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180826012351-8a410e7b638d.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a -DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180906233101-161cd47e91fd.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a -DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181023162649-9b4f9f5ad519.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a -DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181114220301-adae6a3d119a.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a -DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181201002055-351d144fa1fc.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a -DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190108225652-1e06a53dbb7e.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a -DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190125091013-d26f9f9a57f3.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a -DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190213061140-3a22650c66bd.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a -DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190311183353-d8887717615a.mod 119 BLAKE2B e042b2716739483252c3340451b2c3c7b421fdf8d6b3e0333e979802fca66159596982ea63a24b6a64457b2757a0ad24cbb9ea032bab4c5377edf84a3ea18b97 SHA512 26b6c92eecd2208967336d4d23f8a71f77f9a73643ad1e5cd84dee36b2f626fffc806e4dd33acc284831a0961e2b363d898a747903235945fbfb665c5b4d5ef2 -DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190404232315-eb5bcb51f2a3.mod 119 BLAKE2B e042b2716739483252c3340451b2c3c7b421fdf8d6b3e0333e979802fca66159596982ea63a24b6a64457b2757a0ad24cbb9ea032bab4c5377edf84a3ea18b97 SHA512 26b6c92eecd2208967336d4d23f8a71f77f9a73643ad1e5cd84dee36b2f626fffc806e4dd33acc284831a0961e2b363d898a747903235945fbfb665c5b4d5ef2 -DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190501004415-9ce7a6920f09.mod 119 BLAKE2B e042b2716739483252c3340451b2c3c7b421fdf8d6b3e0333e979802fca66159596982ea63a24b6a64457b2757a0ad24cbb9ea032bab4c5377edf84a3ea18b97 SHA512 26b6c92eecd2208967336d4d23f8a71f77f9a73643ad1e5cd84dee36b2f626fffc806e4dd33acc284831a0961e2b363d898a747903235945fbfb665c5b4d5ef2 -DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190503192946-f4e77d36d62c.mod 119 BLAKE2B e042b2716739483252c3340451b2c3c7b421fdf8d6b3e0333e979802fca66159596982ea63a24b6a64457b2757a0ad24cbb9ea032bab4c5377edf84a3ea18b97 SHA512 26b6c92eecd2208967336d4d23f8a71f77f9a73643ad1e5cd84dee36b2f626fffc806e4dd33acc284831a0961e2b363d898a747903235945fbfb665c5b4d5ef2 -DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190603091049-60506f45cf65.mod 172 BLAKE2B 6c58510adee25cabb2e31dcbd88939145c6c0856ba2fd1f0b78f82ec6f2589fe0dcce736a192d145dbab8f4ba892bebb80cb6cea4ea89fbef72f7822d157c1a1 SHA512 5b9748f38f64301e4895d9d2bc106fc9bd05a29feff5cfb53e248d168af998fd1a501c1a3c27e23af663b283093d2a48393bb0798bea449256d89ae119b225eb -DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190613194153-d28f0bde5980.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236 -DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190620200207-3b0461eec859.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236 -DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190628185345-da137c7871d7.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236 -DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190724013045-ca1201d0de80.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236 -DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190827160401-ba9fcec4b297.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236 -DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20191003171128-d98b1b443823.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236 -DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20191004110552-13f9640d40b9.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236 -DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20191004110552-13f9640d40b9.zip 1422609 BLAKE2B 9d879e8be7102a414510c297e078d409982052dea09b5990d3c2618e8f0ec94ba220c972356b1dc7dcce4941b7d5ba6dfc2e0490a37bccdd34e63bd4f71810c7 SHA512 d0608d4fa986159af8c4977c62d99e9b98cef21cbab548246deef3e1b054941f1576b6243e65de6855740869907098721be140fcdbff6bae9e523af736979fb6 -DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20191007182048-72f939374954.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236 -DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20191209160850-c0dbc17a3553.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236 -DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200114155413-6afb5195e5aa.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236 -DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200202094626-16171245cfb2.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236 -DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200202094626-16171245cfb2.zip 1499901 BLAKE2B c60f861c6531bcfe3b3ba34efc287605a9e7089a7fcb98546a3b9ea46dc982821d3233d613c96d4e4660ca00923cdbc1593d94469fff552882ab83e3eb35d2c0 SHA512 8585cf85ad230928be11a456d2153f918d8403da892e1ccf0b638d0f79e2edbf30d9e18e687c33dba4d486ef743226c5f8ed23ef96b14f6c8910aa550b2e0f3b -DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200226121028-0de0cce0169b.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236 -DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200301022130-244492dfa37a.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236 -DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200301022130-244492dfa37a.zip 1500173 BLAKE2B 6b2b9d94b3d6dd87fe74caceeb75254930831b14e03a54c4774374c96e74ee05917bc2e92aa38ccaa2ec41a02134b6303b668947ac336e3635aa43b7e97d2272 SHA512 63daa5add6fb2c5d315b507208a42a08a65d122b7ee1ce5772087453940b25c2c59e404ba283fc543b4814df9f1bd900e18c5c3cc4e2acd9c70fb26e46949ae8 -DIST golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20180821212333-d2e6202438be.mod 27 BLAKE2B 078fc99b981406f4ee3f8da94c83954e80619e76ea63cf6323f27614bbcb870bb650eb5ffaac865a374f3ed0ef0619d97e11f05924c92e395e72cb73f28630e6 SHA512 53431e560b5d6a9b50f44997ef6755f71741ccca155767dd954da41f11f53a3e8d01d7e01a2bb9de1fdd551dd2e734cb65e5641cf5de5c9a8a6a25a4894336f5 -DIST golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190226205417-e64efc72b421.mod 233 BLAKE2B 5a1feba7e2d9703a864889f35f70eb18d30f9c0179a1425b0f4cddf17b03d2d187ba36346243a97820ae45e03a136ac26aedfefa09c0c7bf6cbd246eddf36c50 SHA512 9e91ec99aeb8b639d63fde3cc38f750d0a29d4a05864595beec0de0667ef9193007d89cb899b1d5ba44f0675121b2cff1e09b86bad4331378a66e15ef2f4e26b -DIST golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190226205417-e64efc72b421.zip 81372 BLAKE2B 46b673266c761439a95c89293e800ddb92b6cc7c1ad7c982acb26415983681bfe628957a9f7d5cf36dd8c2d519372f07644fcec6f5efffd8e37584f8ef4cb8d2 SHA512 130d81179637a116a43ddb7e1eecc7eaa9599313a30fade2d7743a80bf5409c66dbcc3b1e7e922a854e7fec9f42249d6cd7845be49122ce0e100cd98348f5ecc -DIST golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190604053449-0f29369cfe45.mod 233 BLAKE2B 5a1feba7e2d9703a864889f35f70eb18d30f9c0179a1425b0f4cddf17b03d2d187ba36346243a97820ae45e03a136ac26aedfefa09c0c7bf6cbd246eddf36c50 SHA512 9e91ec99aeb8b639d63fde3cc38f750d0a29d4a05864595beec0de0667ef9193007d89cb899b1d5ba44f0675121b2cff1e09b86bad4331378a66e15ef2f4e26b -DIST golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20191202225959-858c2ad4c8b6.mod 233 BLAKE2B 5a1feba7e2d9703a864889f35f70eb18d30f9c0179a1425b0f4cddf17b03d2d187ba36346243a97820ae45e03a136ac26aedfefa09c0c7bf6cbd246eddf36c50 SHA512 9e91ec99aeb8b639d63fde3cc38f750d0a29d4a05864595beec0de0667ef9193007d89cb899b1d5ba44f0675121b2cff1e09b86bad4331378a66e15ef2f4e26b -DIST golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20200107190931-bf48bf16ab8d.mod 233 BLAKE2B 5a1feba7e2d9703a864889f35f70eb18d30f9c0179a1425b0f4cddf17b03d2d187ba36346243a97820ae45e03a136ac26aedfefa09c0c7bf6cbd246eddf36c50 SHA512 9e91ec99aeb8b639d63fde3cc38f750d0a29d4a05864595beec0de0667ef9193007d89cb899b1d5ba44f0675121b2cff1e09b86bad4331378a66e15ef2f4e26b -DIST golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20200107190931-bf48bf16ab8d.zip 84373 BLAKE2B 39bd0256afae566a53bb0b7b95adf0416653fd003bf5312c7a316a2d7c3e5d1fa25fd08bdbcdf75df45a56116fea54dcb1bf9b68b07d15d3a909e072f8f9fa06 SHA512 10a924e5fb556c2726795462c91fe7086472d6baab511ac21c1fb3c137e5a3e0db55f9ce8fe1952566d887225e3528ec8b747136f8984163acf71e869a0d8c58 -DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20180314180146-1d60e4601c6f.mod 25 BLAKE2B 01f7f78a0324ca728efd4d662ea130d7e200ab25805125e472720ca01feaaf2625b15bf53f51837a6913e35e060a19018928a38851d7445f39e6e42e237dfda2 SHA512 a9dd073f69c5be1153aaab6e84dd3bb1610a0df8b9882ca4c486c6625d4b5201e5032f86e5014421358dff564d93c4e67f20e5fd1d21ed5e259ddfbc90af43c0 -DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181108010431-42b317875d0f.mod 25 BLAKE2B 01f7f78a0324ca728efd4d662ea130d7e200ab25805125e472720ca01feaaf2625b15bf53f51837a6913e35e060a19018928a38851d7445f39e6e42e237dfda2 SHA512 a9dd073f69c5be1153aaab6e84dd3bb1610a0df8b9882ca4c486c6625d4b5201e5032f86e5014421358dff564d93c4e67f20e5fd1d21ed5e259ddfbc90af43c0 -DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181221193216-37e7f081c4d4.mod 25 BLAKE2B 01f7f78a0324ca728efd4d662ea130d7e200ab25805125e472720ca01feaaf2625b15bf53f51837a6913e35e060a19018928a38851d7445f39e6e42e237dfda2 SHA512 a9dd073f69c5be1153aaab6e84dd3bb1610a0df8b9882ca4c486c6625d4b5201e5032f86e5014421358dff564d93c4e67f20e5fd1d21ed5e259ddfbc90af43c0 -DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190227155943-e225da77a7e6.mod 25 BLAKE2B 01f7f78a0324ca728efd4d662ea130d7e200ab25805125e472720ca01feaaf2625b15bf53f51837a6913e35e060a19018928a38851d7445f39e6e42e237dfda2 SHA512 a9dd073f69c5be1153aaab6e84dd3bb1610a0df8b9882ca4c486c6625d4b5201e5032f86e5014421358dff564d93c4e67f20e5fd1d21ed5e259ddfbc90af43c0 -DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190423024810-112230192c58.mod 25 BLAKE2B 01f7f78a0324ca728efd4d662ea130d7e200ab25805125e472720ca01feaaf2625b15bf53f51837a6913e35e060a19018928a38851d7445f39e6e42e237dfda2 SHA512 a9dd073f69c5be1153aaab6e84dd3bb1610a0df8b9882ca4c486c6625d4b5201e5032f86e5014421358dff564d93c4e67f20e5fd1d21ed5e259ddfbc90af43c0 -DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190423024810-112230192c58.zip 25620 BLAKE2B 770b7dc9bdd8999123fb58cfd951dcbd5592172fd394f1a70abc918e3d7adee5273da1c757f95be15a0ede27f4fd00804564828251ab308d6fc4b116415ac144 SHA512 5a9db9d294b5f2121f3de994da38161f013a0512ad64aaf51f1c7a94b7cdb1ec4102f7c457d29f9bde209e8c254f6ad034c294af3649dbd10d5349c05874f74c -DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190911185100-cd5d95a43a6e.mod 25 BLAKE2B 01f7f78a0324ca728efd4d662ea130d7e200ab25805125e472720ca01feaaf2625b15bf53f51837a6913e35e060a19018928a38851d7445f39e6e42e237dfda2 SHA512 a9dd073f69c5be1153aaab6e84dd3bb1610a0df8b9882ca4c486c6625d4b5201e5032f86e5014421358dff564d93c4e67f20e5fd1d21ed5e259ddfbc90af43c0 -DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20200317015054-43a5402ce75a.mod 25 BLAKE2B 01f7f78a0324ca728efd4d662ea130d7e200ab25805125e472720ca01feaaf2625b15bf53f51837a6913e35e060a19018928a38851d7445f39e6e42e237dfda2 SHA512 a9dd073f69c5be1153aaab6e84dd3bb1610a0df8b9882ca4c486c6625d4b5201e5032f86e5014421358dff564d93c4e67f20e5fd1d21ed5e259ddfbc90af43c0 -DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20200317015054-43a5402ce75a.zip 27020 BLAKE2B 0ba91b5129426896f009357980019a5e1c4cd5568108e615346a2d65421a6a595035069e6366d98af40260a020f90f6b55214e273a7dc92a80d3faee540bc0d0 SHA512 a9408e27c31248e5e6b24c0f255512c97e73e0a972a94e0bf0b0181eae42c1213e02e6988a71178abb05c2624da2e6b7beb12f2a494b630753a083dc3133b58d -DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20170830134202-bb24a47a89ea.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c -DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180830151530-49385e6e1522.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c -DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180905080454-ebe1bf3edb33.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c -DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180909124046-d0be0721c37e.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c -DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181026203630-95b1ffbd15a5.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c -DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181116152217-5ac8a444bdc5.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c -DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181122145206-62eef0e2fa9b.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c -DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190204203706-41f3e6584952.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c -DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190215142949-d0b11bdaac8a.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c -DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190312061237-fead79001313.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab -DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190403152447-81d4e9dc473e.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab -DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190411185658-b44545bcd369.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab -DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190412213103-97732733099d.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab -DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190422165155-953cdadca894.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab -DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190502145724-3ef323f4f1fd.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab -DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190507160741-ecd444e8653b.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab -DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190606165138-5da285871e9c.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab -DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190624142023-c5567b49c5d0.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab -DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190726091711-fc99dfbffb4e.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab -DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190826190057-c7b8b68b1456.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab -DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190826190057-c7b8b68b1456.zip 1818872 BLAKE2B f8bb456d6c12b800b7a572f686788454dc81f4f65f61d2f5f7986e936a7dcd4a57417137df2ff16d229adafe2a2daddd9622cb558454648419fbf293857a0382 SHA512 15544b523ad8b302ab9f9fffaf971decb598f3f7789296125523638d5ebb56218312ba2b0d7d43dd8e786ffb761b012d957c8f123dcdcec8c967bb28a544f84d -DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191001151750-bb3f8db39f24.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab -DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191002063906-3421d5a6bb1c.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab -DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191002063906-3421d5a6bb1c.zip 1856709 BLAKE2B 5195473fe1a0a10ed317b10ae436251bff2e5d3a5f82644b25cc57f25db28d1012c6d6b0a8383ef4db3121a2b711963f84b0c35e225d5afa626cb40f97e60185 SHA512 db25a2559da6f9f60a72398062feab15cbe1a989c9fc79972f74693c91b71bf8d5d4b647f14528ed385165fc168bd52b9104d05008ef535ebad6b5fd939a45dc -DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191003212358-c178f38b412c.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab -DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191008105621-543471e840be.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab -DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191204072324-ce4227a45e2e.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab -DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191228213918-04cbcbbfeed8.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab -DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200113162924-86b910548bc1.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab -DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200122134326-e047566fdf82.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab -DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200202164722-d101bd2416d5.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab -DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200212091648-12a6c2dcc1e4.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab -DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200212091648-12a6c2dcc1e4.zip 1916451 BLAKE2B da323af18ec6dbb2c7cfcc267ceaeddb5e452789f3ed5797345020ccbf118992e9972fc652b20d8cd5a023c96613d5a770f71e6384b6576a271bc322d02a450b SHA512 13fcebd117456775d53483f713e5a090321ab1159048b92252aee953c294dc174d7f5695e8d09f272203786143bdd6b15ff32c979aef5a30b442a56aa09d1a7d -DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.0.0-20160726164857-2910a502d2bf.mod 25 BLAKE2B 31009af0fdcd0f8730c9985287e6e364ec4e5183e57e92560dbc80a2010eced51b8a90f01a82b49384268c8a0adbf69d179c205d3f68e0eb459169d2ea9528f0 SHA512 ca081ef7cccd7bbedc6843fbe0c452352661a07e1298cd02ff338ed79d807c6401d613a3cf20011189d2f98a794ffa410547b3e352eb58a6f0a84822285d391d -DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.0.0-20170915032832-14c0d48ead0c.mod 25 BLAKE2B 31009af0fdcd0f8730c9985287e6e364ec4e5183e57e92560dbc80a2010eced51b8a90f01a82b49384268c8a0adbf69d179c205d3f68e0eb459169d2ea9528f0 SHA512 ca081ef7cccd7bbedc6843fbe0c452352661a07e1298cd02ff338ed79d807c6401d613a3cf20011189d2f98a794ffa410547b3e352eb58a6f0a84822285d391d -DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.mod 25 BLAKE2B 31009af0fdcd0f8730c9985287e6e364ec4e5183e57e92560dbc80a2010eced51b8a90f01a82b49384268c8a0adbf69d179c205d3f68e0eb459169d2ea9528f0 SHA512 ca081ef7cccd7bbedc6843fbe0c452352661a07e1298cd02ff338ed79d807c6401d613a3cf20011189d2f98a794ffa410547b3e352eb58a6f0a84822285d391d -DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.1-0.20180807135948-17ff2d5776d2.mod 25 BLAKE2B 31009af0fdcd0f8730c9985287e6e364ec4e5183e57e92560dbc80a2010eced51b8a90f01a82b49384268c8a0adbf69d179c205d3f68e0eb459169d2ea9528f0 SHA512 ca081ef7cccd7bbedc6843fbe0c452352661a07e1298cd02ff338ed79d807c6401d613a3cf20011189d2f98a794ffa410547b3e352eb58a6f0a84822285d391d -DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.2.mod 88 BLAKE2B f3dd520e0e4e9b57feab62ecabb9169f37f1ce49b2846b949f9266f807767d38f55e4aa8ea006229c6f81cfc1e2c9dc0d1e3c186235e416dfb90fe7e04751d07 SHA512 d9361afb453b10c9d02787568ec33ea4c97a115899c6b3d1a1246547a749244e9218475ae5ae9f741d9b355260d2d3c33852673e805fcdd5f26f3ca40f035884 -DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.2.zip 7430601 BLAKE2B d2403817cb6b7e32462b90995412c4e63cfdeaf3710fc9386f4b708e0ae2be9593649e923f0d844dc4420b177e42e7abfa7657e03e27fa08be9e98d76da4cb9c SHA512 8d8dad296f1497f352e94c416711dbb1f468901a3fd2dfd0a9c67f2d59306ea611d77917289521d2845f6958f571f6c3fe2d3dab289524d8145489d5b386fbaa -DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.3.mod 97 BLAKE2B ed93c1d43f199d8cbd43cb25edac5de569cb78773d7f3232d59a0a4de6d174c5c100db2b02ca42c51f3e17e0f5e781ba9b5641a512b0dc72dcfaa5f6bd7d451b SHA512 f3f68808ccf5223453f765f59db1ef551b2130069eb83518878961c2d4a2044f9049f8d49df6e67699fcd2645cf90b84d35626590b2cfbca302fcf0eac76dc8b -DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.3.zip 8010747 BLAKE2B 78d999113a75f84966ffd23356e7cf60811b614754936851f197e547657cb6ff40acd074593c9cb6a2ae39ba625b36731c2fc0bc4b2b5ff68a2d377a6c7192db SHA512 024719305765ca737b225fec6268f84fc4c7d17c04e31eadfacafbb24a5f30af61920f4633e95d74dd2a266de40d1d2d13587881a3c22829ffeafb01fd75959f -DIST golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20181108054448-85acf8d2951c.mod 25 BLAKE2B ba9e31cf2a4ab0f78a5c67d78026c2ef9571bcff7c820ce212637c8360420af274bfc47cb14bbc3df24457a4d3acb5dee38448a848abbd4e82232bef05b6b2e9 SHA512 6e51811c33b84ddd4a7548013579204266e466bd2e87aa9b6e34892570aa09c607ffa806f8a420474e26ca0e277ab23c81bb07b0ebf2c3b6ed193014c1bc37a7 -DIST golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20181108054448-85acf8d2951c.zip 11430 BLAKE2B 71f78b102648ec8bbc2dddfff5744befa947cb4080dea3e9889e27096e261f2dc3d7b2e413d69408d01251a6c7f256238e514a23b4c633b7eabeb198d7835c85 SHA512 2485a31f9a111dbe614d619f6007fc973006f372c6104d5549ac4661d838ab46b42d2d03ed7fbe1ca9231ba4d247a4af584833ce172ae9f48ea42519a25401d0 -DIST golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20190308202827-9d24e82272b4.mod 25 BLAKE2B ba9e31cf2a4ab0f78a5c67d78026c2ef9571bcff7c820ce212637c8360420af274bfc47cb14bbc3df24457a4d3acb5dee38448a848abbd4e82232bef05b6b2e9 SHA512 6e51811c33b84ddd4a7548013579204266e466bd2e87aa9b6e34892570aa09c607ffa806f8a420474e26ca0e277ab23c81bb07b0ebf2c3b6ed193014c1bc37a7 -DIST golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20191024005414-555d28b269f0.mod 25 BLAKE2B ba9e31cf2a4ab0f78a5c67d78026c2ef9571bcff7c820ce212637c8360420af274bfc47cb14bbc3df24457a4d3acb5dee38448a848abbd4e82232bef05b6b2e9 SHA512 6e51811c33b84ddd4a7548013579204266e466bd2e87aa9b6e34892570aa09c607ffa806f8a420474e26ca0e277ab23c81bb07b0ebf2c3b6ed193014c1bc37a7 -DIST golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20191024005414-555d28b269f0.zip 11971 BLAKE2B 7b29c746b75b42c23fca353b8299a4feaf69556ce1395872470e891835a8dec88a4e4c3b64ba6dcb4b5512aafb9bb44cc38c68915a0f6702f1027cda89d03d81 SHA512 58cb42ebeb88c06e049caf8c609e95243e7bdba51057de7d7301885aa904111dbe85962b5faef216ae45aa73f371b5de6516800a6f5765219cfde3fb06372afe -DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180525024113-a5b4c53f6e8b.mod 26 BLAKE2B 2a44c2cc034af3473d9a1d4e1c23b0f4542333853bfc0ecbfcf9eacacbb3593b449fcfc94d23f49ccc16e5a844bc72a3462a3e08a5c26194106a64d1f2732e0a SHA512 3c166b18c0ce47a47e95da9eeede63879a92b0205bd4589d554f7bae89699be0efa83e1f5bba8e50f47714ea23e759b07f4543fe06301995d39373da2db16fc0 -DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180828015842-6cd1fcedba52.mod 26 BLAKE2B 2a44c2cc034af3473d9a1d4e1c23b0f4542333853bfc0ecbfcf9eacacbb3593b449fcfc94d23f49ccc16e5a844bc72a3462a3e08a5c26194106a64d1f2732e0a SHA512 3c166b18c0ce47a47e95da9eeede63879a92b0205bd4589d554f7bae89699be0efa83e1f5bba8e50f47714ea23e759b07f4543fe06301995d39373da2db16fc0 -DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180917221912-90fa682c2a6e.mod 26 BLAKE2B 2a44c2cc034af3473d9a1d4e1c23b0f4542333853bfc0ecbfcf9eacacbb3593b449fcfc94d23f49ccc16e5a844bc72a3462a3e08a5c26194106a64d1f2732e0a SHA512 3c166b18c0ce47a47e95da9eeede63879a92b0205bd4589d554f7bae89699be0efa83e1f5bba8e50f47714ea23e759b07f4543fe06301995d39373da2db16fc0 -DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20181011042414-1f849cf54d09.mod 26 BLAKE2B 2a44c2cc034af3473d9a1d4e1c23b0f4542333853bfc0ecbfcf9eacacbb3593b449fcfc94d23f49ccc16e5a844bc72a3462a3e08a5c26194106a64d1f2732e0a SHA512 3c166b18c0ce47a47e95da9eeede63879a92b0205bd4589d554f7bae89699be0efa83e1f5bba8e50f47714ea23e759b07f4543fe06301995d39373da2db16fc0 -DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20181030221726-6c7e314b6563.mod 26 BLAKE2B 2a44c2cc034af3473d9a1d4e1c23b0f4542333853bfc0ecbfcf9eacacbb3593b449fcfc94d23f49ccc16e5a844bc72a3462a3e08a5c26194106a64d1f2732e0a SHA512 3c166b18c0ce47a47e95da9eeede63879a92b0205bd4589d554f7bae89699be0efa83e1f5bba8e50f47714ea23e759b07f4543fe06301995d39373da2db16fc0 -DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190114222345-bf090417da8b.mod 26 BLAKE2B 2a44c2cc034af3473d9a1d4e1c23b0f4542333853bfc0ecbfcf9eacacbb3593b449fcfc94d23f49ccc16e5a844bc72a3462a3e08a5c26194106a64d1f2732e0a SHA512 3c166b18c0ce47a47e95da9eeede63879a92b0205bd4589d554f7bae89699be0efa83e1f5bba8e50f47714ea23e759b07f4543fe06301995d39373da2db16fc0 -DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190206041539-40960b6deb8e.mod 26 BLAKE2B 2a44c2cc034af3473d9a1d4e1c23b0f4542333853bfc0ecbfcf9eacacbb3593b449fcfc94d23f49ccc16e5a844bc72a3462a3e08a5c26194106a64d1f2732e0a SHA512 3c166b18c0ce47a47e95da9eeede63879a92b0205bd4589d554f7bae89699be0efa83e1f5bba8e50f47714ea23e759b07f4543fe06301995d39373da2db16fc0 -DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190226205152-f727befe758c.mod 194 BLAKE2B 94f62204dd4fd9b865aca70366a7a7754e2e92ed27591beaf789b268ad272dfb34ca0906d888c608393b4c71bc5c9f975fc86c164528ed7d0390e41b66206ec4 SHA512 8b68acbca48744320e64a70a983a471e9e2fc2249562064b10256269033473fd50264b6544646227fb666f075c4f266df1835ca3f88ee679bb97d34bf62bd195 -DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190311212946-11955173bddd.mod 87 BLAKE2B 32cb406deea05323b1121386bf61f344f8eda0b5370e95bb73828ce0bea50bee375ae3e9b076b9d683a4d89561709c5e97e45e6b08344fbdf6b03b3ce4398dcd SHA512 18ae9b2f54109b4ec5cdea433ee0e3b7006e4d5ea57022d6e8151d4d364735a6b55cf7b5eb2f43b602ec786b2b6819ad78dfc33151ee1a63a0b1199f54ce34a1 -DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190312151545-0bb0c0a6e846.mod 87 BLAKE2B 32cb406deea05323b1121386bf61f344f8eda0b5370e95bb73828ce0bea50bee375ae3e9b076b9d683a4d89561709c5e97e45e6b08344fbdf6b03b3ce4398dcd SHA512 18ae9b2f54109b4ec5cdea433ee0e3b7006e4d5ea57022d6e8151d4d364735a6b55cf7b5eb2f43b602ec786b2b6819ad78dfc33151ee1a63a0b1199f54ce34a1 -DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190312170243-e65039ee4138.mod 87 BLAKE2B 32cb406deea05323b1121386bf61f344f8eda0b5370e95bb73828ce0bea50bee375ae3e9b076b9d683a4d89561709c5e97e45e6b08344fbdf6b03b3ce4398dcd SHA512 18ae9b2f54109b4ec5cdea433ee0e3b7006e4d5ea57022d6e8151d4d364735a6b55cf7b5eb2f43b602ec786b2b6819ad78dfc33151ee1a63a0b1199f54ce34a1 -DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190425150028-36563e24a262.mod 146 BLAKE2B 78e7f7eaadf244c74a90edd8a3e8d092b255cc9246320ca921558467fa02e84ccc68bc6c4d1d5d4baf3c9cab7da37cf6515e4d4889d490d21f374fc4415f1733 SHA512 e9c7b67e28905435e1420333a531e6c0a8f025dc3023f22e5067d5395c8d081bd7993ceeb6ae08c4cd2d1f13aa0f46274a8788e1be085e4b12eaef785f3d7213 -DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190506145303-2d16b83fe98c.mod 146 BLAKE2B 78e7f7eaadf244c74a90edd8a3e8d092b255cc9246320ca921558467fa02e84ccc68bc6c4d1d5d4baf3c9cab7da37cf6515e4d4889d490d21f374fc4415f1733 SHA512 e9c7b67e28905435e1420333a531e6c0a8f025dc3023f22e5067d5395c8d081bd7993ceeb6ae08c4cd2d1f13aa0f46274a8788e1be085e4b12eaef785f3d7213 -DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190524140312-2c0ae7006135.mod 146 BLAKE2B 78e7f7eaadf244c74a90edd8a3e8d092b255cc9246320ca921558467fa02e84ccc68bc6c4d1d5d4baf3c9cab7da37cf6515e4d4889d490d21f374fc4415f1733 SHA512 e9c7b67e28905435e1420333a531e6c0a8f025dc3023f22e5067d5395c8d081bd7993ceeb6ae08c4cd2d1f13aa0f46274a8788e1be085e4b12eaef785f3d7213 -DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190606124116-d0a3d012864b.mod 155 BLAKE2B 538451f0cc08c6752c81241193caad56fcb8fb7a5cdc2ad6840ae44a1f5c3e1539067634352ded872712c84da7046b32053f9634da76c4888eec9046035a0935 SHA512 5823f6ea0fb08243f243a9577cd31397999bb387c8e29312304ca2dd0e73391cad60891a2a1181ac5fb665c1b01824933c295289a5d4cd580fc77f1bd828955b -DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190621195816-6e04913cbbac.mod 155 BLAKE2B 538451f0cc08c6752c81241193caad56fcb8fb7a5cdc2ad6840ae44a1f5c3e1539067634352ded872712c84da7046b32053f9634da76c4888eec9046035a0935 SHA512 5823f6ea0fb08243f243a9577cd31397999bb387c8e29312304ca2dd0e73391cad60891a2a1181ac5fb665c1b01824933c295289a5d4cd580fc77f1bd828955b -DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190628153133-6cdbf07be9d0.mod 155 BLAKE2B 538451f0cc08c6752c81241193caad56fcb8fb7a5cdc2ad6840ae44a1f5c3e1539067634352ded872712c84da7046b32053f9634da76c4888eec9046035a0935 SHA512 5823f6ea0fb08243f243a9577cd31397999bb387c8e29312304ca2dd0e73391cad60891a2a1181ac5fb665c1b01824933c295289a5d4cd580fc77f1bd828955b -DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190816200558-6889da9d5479.mod 212 BLAKE2B ab1d99a25eed3af5426d8a58d249b827e4d30a046302df72c7e0b59955e65b636f4645c5c436bb21ec54ec3745b9996bce92d29826ad93cbc9120a06dc19b49a SHA512 6a0316ac3b01aba3f186b5db540a368ab780a821252f7f0975f9e44afea9170c4b3e7027dc5f79a54ebc6af290cbb59b876d3b53bbf26fd05fc3a80a06fae109 -DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190911174233-4f2ddba30aff.mod 212 BLAKE2B ab1d99a25eed3af5426d8a58d249b827e4d30a046302df72c7e0b59955e65b636f4645c5c436bb21ec54ec3745b9996bce92d29826ad93cbc9120a06dc19b49a SHA512 6a0316ac3b01aba3f186b5db540a368ab780a821252f7f0975f9e44afea9170c4b3e7027dc5f79a54ebc6af290cbb59b876d3b53bbf26fd05fc3a80a06fae109 -DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191012152004-8de300cfc20a.mod 212 BLAKE2B ab1d99a25eed3af5426d8a58d249b827e4d30a046302df72c7e0b59955e65b636f4645c5c436bb21ec54ec3745b9996bce92d29826ad93cbc9120a06dc19b49a SHA512 6a0316ac3b01aba3f186b5db540a368ab780a821252f7f0975f9e44afea9170c4b3e7027dc5f79a54ebc6af290cbb59b876d3b53bbf26fd05fc3a80a06fae109 -DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191113191852-77e3bb0ad9e7.mod 212 BLAKE2B ab1d99a25eed3af5426d8a58d249b827e4d30a046302df72c7e0b59955e65b636f4645c5c436bb21ec54ec3745b9996bce92d29826ad93cbc9120a06dc19b49a SHA512 6a0316ac3b01aba3f186b5db540a368ab780a821252f7f0975f9e44afea9170c4b3e7027dc5f79a54ebc6af290cbb59b876d3b53bbf26fd05fc3a80a06fae109 -DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191115202509-3a792d9c32b2.mod 212 BLAKE2B ab1d99a25eed3af5426d8a58d249b827e4d30a046302df72c7e0b59955e65b636f4645c5c436bb21ec54ec3745b9996bce92d29826ad93cbc9120a06dc19b49a SHA512 6a0316ac3b01aba3f186b5db540a368ab780a821252f7f0975f9e44afea9170c4b3e7027dc5f79a54ebc6af290cbb59b876d3b53bbf26fd05fc3a80a06fae109 -DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191119224855-298f0cb1881e.mod 212 BLAKE2B ab1d99a25eed3af5426d8a58d249b827e4d30a046302df72c7e0b59955e65b636f4645c5c436bb21ec54ec3745b9996bce92d29826ad93cbc9120a06dc19b49a SHA512 6a0316ac3b01aba3f186b5db540a368ab780a821252f7f0975f9e44afea9170c4b3e7027dc5f79a54ebc6af290cbb59b876d3b53bbf26fd05fc3a80a06fae109 -DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191125144606-a911d9008d1f.mod 212 BLAKE2B ab1d99a25eed3af5426d8a58d249b827e4d30a046302df72c7e0b59955e65b636f4645c5c436bb21ec54ec3745b9996bce92d29826ad93cbc9120a06dc19b49a SHA512 6a0316ac3b01aba3f186b5db540a368ab780a821252f7f0975f9e44afea9170c4b3e7027dc5f79a54ebc6af290cbb59b876d3b53bbf26fd05fc3a80a06fae109 -DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191130070609-6e064ea0cf2d.mod 212 BLAKE2B ab1d99a25eed3af5426d8a58d249b827e4d30a046302df72c7e0b59955e65b636f4645c5c436bb21ec54ec3745b9996bce92d29826ad93cbc9120a06dc19b49a SHA512 6a0316ac3b01aba3f186b5db540a368ab780a821252f7f0975f9e44afea9170c4b3e7027dc5f79a54ebc6af290cbb59b876d3b53bbf26fd05fc3a80a06fae109 -DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191216173652-a0e659d51361.mod 267 BLAKE2B d21181b3e1491ef78b09fc3546ed8ffbfeb7a4578039aaa24e2f5cc2352885c1a4d7dbfaf2853c421daa2a06691ac47513b5f186d31893fb1ef476cf9d4bb9bc SHA512 91b0380c7073eac4442bfd1924d311fc7b50b098ec4c72ea72fcc831273012326a44245add9b05a90895be46d11052ddcc942ea6bb909bda51d782f95acddff8 -DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191227053925-7b8e75db28f4.mod 267 BLAKE2B d21181b3e1491ef78b09fc3546ed8ffbfeb7a4578039aaa24e2f5cc2352885c1a4d7dbfaf2853c421daa2a06691ac47513b5f186d31893fb1ef476cf9d4bb9bc SHA512 91b0380c7073eac4442bfd1924d311fc7b50b098ec4c72ea72fcc831273012326a44245add9b05a90895be46d11052ddcc942ea6bb909bda51d782f95acddff8 -DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200117161641-43d50277825c.mod 267 BLAKE2B d21181b3e1491ef78b09fc3546ed8ffbfeb7a4578039aaa24e2f5cc2352885c1a4d7dbfaf2853c421daa2a06691ac47513b5f186d31893fb1ef476cf9d4bb9bc SHA512 91b0380c7073eac4442bfd1924d311fc7b50b098ec4c72ea72fcc831273012326a44245add9b05a90895be46d11052ddcc942ea6bb909bda51d782f95acddff8 -DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200122220014-bf1340f18c4a.mod 267 BLAKE2B d21181b3e1491ef78b09fc3546ed8ffbfeb7a4578039aaa24e2f5cc2352885c1a4d7dbfaf2853c421daa2a06691ac47513b5f186d31893fb1ef476cf9d4bb9bc SHA512 91b0380c7073eac4442bfd1924d311fc7b50b098ec4c72ea72fcc831273012326a44245add9b05a90895be46d11052ddcc942ea6bb909bda51d782f95acddff8 -DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200130002326-2f3ba24bd6e7.mod 267 BLAKE2B d21181b3e1491ef78b09fc3546ed8ffbfeb7a4578039aaa24e2f5cc2352885c1a4d7dbfaf2853c421daa2a06691ac47513b5f186d31893fb1ef476cf9d4bb9bc SHA512 91b0380c7073eac4442bfd1924d311fc7b50b098ec4c72ea72fcc831273012326a44245add9b05a90895be46d11052ddcc942ea6bb909bda51d782f95acddff8 -DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200204074204-1cc6d1ef6c74.mod 267 BLAKE2B d21181b3e1491ef78b09fc3546ed8ffbfeb7a4578039aaa24e2f5cc2352885c1a4d7dbfaf2853c421daa2a06691ac47513b5f186d31893fb1ef476cf9d4bb9bc SHA512 91b0380c7073eac4442bfd1924d311fc7b50b098ec4c72ea72fcc831273012326a44245add9b05a90895be46d11052ddcc942ea6bb909bda51d782f95acddff8 -DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200207183749-b753a1ba74fa.mod 267 BLAKE2B d21181b3e1491ef78b09fc3546ed8ffbfeb7a4578039aaa24e2f5cc2352885c1a4d7dbfaf2853c421daa2a06691ac47513b5f186d31893fb1ef476cf9d4bb9bc SHA512 91b0380c7073eac4442bfd1924d311fc7b50b098ec4c72ea72fcc831273012326a44245add9b05a90895be46d11052ddcc942ea6bb909bda51d782f95acddff8 -DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200212150539-ea181f53ac56.mod 267 BLAKE2B d21181b3e1491ef78b09fc3546ed8ffbfeb7a4578039aaa24e2f5cc2352885c1a4d7dbfaf2853c421daa2a06691ac47513b5f186d31893fb1ef476cf9d4bb9bc SHA512 91b0380c7073eac4442bfd1924d311fc7b50b098ec4c72ea72fcc831273012326a44245add9b05a90895be46d11052ddcc942ea6bb909bda51d782f95acddff8 -DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200317043434-63da46f3035e.mod 271 BLAKE2B daceb2d4e388208a2619f2476085e0daa6b6546122a32355a3e005e6ac51ce72069c959a72c76078dedf82201fb217941091d3cc2b1bf4be8c77949b78ef6cd5 SHA512 c2c79e2a50a05d79909d58a13703e35f9cc9cf209be9593546c84883ac272e4e31a8ec9b2247d750b7cb42b088ad90214279c04b83a48173388fa13a71b6572d -DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200317043434-63da46f3035e.zip 3039195 BLAKE2B c6d9d22b06c262370f3a2bce3f518f888fdc89459bc2fcc205c012ca614a8792f8b41e3a1dfecd0028ea23cfea5c6d729036152f54604f194449461d96158d6c SHA512 9dc81b205d8166a226e86fa52b592df9e68c277479a643ce5d792adcf4ea5753844ebf4bed5c9c18fda490cd688ef235062c804a13365d33b32c6bc231c8f000 -DIST golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20190717185122-a985d3407aa7.mod 37 BLAKE2B 7449be81e1998a6439070de1a0ddf5bfd1e4971c90c2e358590a9c1c41128bfc1daa42a9bbc3709506df2442ec8420e6354343a095c837be46335c180083f28a SHA512 659d18a7a3a1be45ff6dc9e7475276b82ee7f11c47d39b0c237d7f872836a1dbdfff0902f21d6cd8093663997865da92e3e5a4acf1ad6129f972dc5e667b4f05 -DIST golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191011141410-1b5146add898.mod 37 BLAKE2B 7449be81e1998a6439070de1a0ddf5bfd1e4971c90c2e358590a9c1c41128bfc1daa42a9bbc3709506df2442ec8420e6354343a095c837be46335c180083f28a SHA512 659d18a7a3a1be45ff6dc9e7475276b82ee7f11c47d39b0c237d7f872836a1dbdfff0902f21d6cd8093663997865da92e3e5a4acf1ad6129f972dc5e667b4f05 -DIST golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191204190536-9bdfabe68543.mod 37 BLAKE2B 7449be81e1998a6439070de1a0ddf5bfd1e4971c90c2e358590a9c1c41128bfc1daa42a9bbc3709506df2442ec8420e6354343a095c837be46335c180083f28a SHA512 659d18a7a3a1be45ff6dc9e7475276b82ee7f11c47d39b0c237d7f872836a1dbdfff0902f21d6cd8093663997865da92e3e5a4acf1ad6129f972dc5e667b4f05 -DIST golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191204190536-9bdfabe68543.zip 22282 BLAKE2B 68df6b35d9043f23df13432b80074544f46833467294955ae5706713055d0cc9ababda892853c14e99c80a3571fd4a807a019a098fdd2ca695ba90c577ead5c4 SHA512 c72b8b73f89624889a2874c1b2445cb82f0e545fccf6a7761a278f3f659eb19f5f1c8585641b8f89f2bcfc3817ad2c0e267751cfeeab949e287e43af5df57e28 -DIST golang.zx2c4.com%2Fwireguard%2F@v%2Fv0.0.20200121.mod 244 BLAKE2B e6ad7b1df6c02ad10598b6015b858ab86f8b04b1c52975bf3656305dfe7a1185af76b7abbdf8cebe3ed90d60b5c90cde8d8dc2b5f0491332a7540c2286e73be7 SHA512 a66e915386e51051527ad94bd37834df9cf91af8a97e2b95792bf22de1e261f7120160bc808d3980c45f3111f1f0d7e383e3875afb5c72a7ec6dcf0b1aa3e6b2 -DIST golang.zx2c4.com%2Fwireguard%2F@v%2Fv0.0.20200121.zip 146869 BLAKE2B 0ec351584880c51c28053d02885b3ed3120d08bf45f6613e31ed34f8fc06b91a426d11967e0e890dc65f2ede8010891d8c0ce7909841abfe2593cf8403f8be30 SHA512 b21f30722df49b6c44791615cb8527b6df91e2eba1b455b75651a58ab44ddc62df24ace6cd3c1e5d6a4ba6313a7abd8a9e4d8b579c57f51f2c2182acf74e2c6a -DIST golang.zx2c4.com%2Fwireguard%2Fwgctrl%2F@v%2Fv0.0.0-20200205215550-e35592f146e4.mod 382 BLAKE2B bb3575171719c57be219bdb810e95e4c935f5614e43fcb0e87e8c6af5b8568f1919898f90c02a4ef20b2cbd165ea4aa708fcc7bb3fe89b11bdffe1a1b171a657 SHA512 9b8cc2db36051f68868db09cbc46a84981c385bc1c705c2175790d1cb679e225b4210e7be38f41df37eaedff7574448f200cfebeb1acf6101741fe13f096e36b -DIST golang.zx2c4.com%2Fwireguard%2Fwgctrl%2F@v%2Fv0.0.0-20200205215550-e35592f146e4.zip 73834 BLAKE2B 4f4e081f7960e729b688a26e9678dc4d4275efadd62cb4dea92aa81c7248bc0b4ae0256b06c20bf350685ac50055872f1f618eacc51c847a9d9c8abaea58b882 SHA512 9f3bb59d2b5ab0552698d0dbeac8ba18ca0f09e5a2c99254a5fc9f4eb7e3297cb5a24a92bf7a9e66f9b31754df67c6840825c25dac327789fa3fdd33dbb9f873 -DIST gonum.org%2Fv1%2Fgonum%2F@v%2Fv0.0.0-20180816165407-929014505bf4.mod 147 BLAKE2B 6124c221210cb16cf7f0ea44ad962d904b2e8b050b4a86777f8a21114609c99866c53cd32572005bce9778317e2e13425cafee613ccacefa52933ae35c2fa65f SHA512 ff99bdfc473f5d75904731fc4e507a08743e5f4943d3fda12160a81dbcd1d7340935effad4e053be14da69240d6797d0462a823ba705e9f849607b8a069720d2 -DIST gonum.org%2Fv1%2Fgonum%2F@v%2Fv0.6.2.mod 266 BLAKE2B a396e867f12af9acaa0ba4901fce9488d91292bbc1395946347017863a80e2ce4c6208e3a21294f970c8fa5e1ff81855a606e9ee44fe17228e79e4bb74569402 SHA512 7cbcd41fd71c39cae85710571902f9cf2a477d8ef8eedcd2b47cca7d8d36056b1c897f790714dd905e0872546eef853cb52b1aa6c39366149e69d912cf26d567 -DIST gonum.org%2Fv1%2Fgonum%2F@v%2Fv0.6.2.zip 5560437 BLAKE2B cc1f3781b896f661d60601d68ceef397fae8963cddeecb6e710e680568d65b980f22b16ef40d21814fa1079e2a54137e05855aebae46614aeeb1460d40c9c273 SHA512 9f0c9ad62d47a1c566dda491a419cc339cd5a2216168c567398fd983f78872daee537d7e43a0375183c5469fd5a2b39d1c78853d0d38413d6c193a8f8f4dc338 -DIST gonum.org%2Fv1%2Fnetlib%2F@v%2Fv0.0.0-20190313105609-8cb42192e0e0.mod 27 BLAKE2B 7947d397295d9d1d7bd22c96f4310e54ade7afe7baf1850cead3176780d46b4f517dc1a1e3ee22e15f0345a043110cb0f32bc0175ad70de62fbaf2ee755e25a2 SHA512 1576aa0b64384add0cbec0e1e5187ba992022ba5d1ac2ed6ad2d3cd888a8f97218bd42aeb8cb5e53677e8192dc4db4c7800b15fb18c6bcc320a2c67b5bd07a37 -DIST gonum.org%2Fv1%2Fnetlib%2F@v%2Fv0.0.0-20190313105609-8cb42192e0e0.zip 220616 BLAKE2B ee0e947ce59df10c713766f1c8fdf27d37f64da46ffb095e7ff30da8583309f8ee15c9fa38a1790b71da466fadf87b1918600b5610fc632cd051658da32bfa50 SHA512 4439ea5da9742ca27d2ccb0604edae491594299db5b2062a4a117e8f2c08a64c6e3a87c5a3d9a606d816e89aab5eb870c13a0849b79cbb47b2659840efebc355 -DIST gonum.org%2Fv1%2Fplot%2F@v%2Fv0.0.0-20190515093506-e2840ee46a6b.mod 471 BLAKE2B 92356c493b1e94781571e05eb5096e6b40beb88c57927a955f899e8610597192fe82622f8e8f84b4c96ec00b1965552e6d5fb9166a6e3fa4f603d4fba72a4913 SHA512 ee8422d1041c7ba9306c5a49eb3bebb8c8243563250b7b3f19326769a3fb08660414625130cc1941077e7778104f6243aa5a5eb45797b72b4daf4f6abddaa32b -DIST google.golang.org%2Fapi%2F@v%2Fv0.13.0.mod 851 BLAKE2B 16f0842a8e0082a8532a7c8f5cf5092cd196a90197b3e05c6fe0275e10390e0b97477f60c07d26b422d0da9289fe3c8f2d8fb8fe2fec63af9e005adc26921724 SHA512 bd693c28b65c1b369f89a6b1926a127c91df98feb137ab5595bf141c1a67e3adcf25f79b4cbf3e4c44755d45b9f4876dacafbf18afa1e8c09fd89a8f9d0e9330 -DIST google.golang.org%2Fapi%2F@v%2Fv0.14.0.mod 851 BLAKE2B 16f0842a8e0082a8532a7c8f5cf5092cd196a90197b3e05c6fe0275e10390e0b97477f60c07d26b422d0da9289fe3c8f2d8fb8fe2fec63af9e005adc26921724 SHA512 bd693c28b65c1b369f89a6b1926a127c91df98feb137ab5595bf141c1a67e3adcf25f79b4cbf3e4c44755d45b9f4876dacafbf18afa1e8c09fd89a8f9d0e9330 -DIST google.golang.org%2Fapi%2F@v%2Fv0.15.0.mod 851 BLAKE2B 16f0842a8e0082a8532a7c8f5cf5092cd196a90197b3e05c6fe0275e10390e0b97477f60c07d26b422d0da9289fe3c8f2d8fb8fe2fec63af9e005adc26921724 SHA512 bd693c28b65c1b369f89a6b1926a127c91df98feb137ab5595bf141c1a67e3adcf25f79b4cbf3e4c44755d45b9f4876dacafbf18afa1e8c09fd89a8f9d0e9330 -DIST google.golang.org%2Fapi%2F@v%2Fv0.17.0.mod 804 BLAKE2B 5b2735ad23db8b4226ee4eaaf2f3cc4e905f0ddb30a401e48373cf1acbdb598927805554c4adc2d3b9749bde8304204fb118bb06a523390e47fa2d1cfeccf459 SHA512 0ed74ff1f7a8a6a315189890ec2609476f76b46316a672dfa8150066f3d9d6faf2089bc53d756bce2c0c546dd36c00b668d979e91e766a698ab1c6ad31a5436d -DIST google.golang.org%2Fapi%2F@v%2Fv0.20.0.mod 804 BLAKE2B 5b2735ad23db8b4226ee4eaaf2f3cc4e905f0ddb30a401e48373cf1acbdb598927805554c4adc2d3b9749bde8304204fb118bb06a523390e47fa2d1cfeccf459 SHA512 0ed74ff1f7a8a6a315189890ec2609476f76b46316a672dfa8150066f3d9d6faf2089bc53d756bce2c0c546dd36c00b668d979e91e766a698ab1c6ad31a5436d -DIST google.golang.org%2Fapi%2F@v%2Fv0.20.0.zip 14949265 BLAKE2B 6329dba62db106b5231dd7caa92f6656221439d3283cbb1d96d1bbcd6dc9becbb71a03ecdeb41e92a71e60fdbddabb7153da6ebd78b3036e0ee95ae12c2a0c67 SHA512 f41425c9a9d4148d2539efdda6bccfbb610d0cd0a6fdb8b74b5ea175bb8c304dc0bff7bbbe9e2a0d521846764a5b884b7dfee2a38cdb8780374dd85375b5311a -DIST google.golang.org%2Fapi%2F@v%2Fv0.3.1.mod 506 BLAKE2B 106ba1eae2f79ddc10b69e21988215a1be000c5b32a4bd8315d473748780be8785e89ce269f1560dc23a8afcb199c8a0428aefdf8035991051021443c17fd206 SHA512 37d49dd9c576465cc9dec58fab5cd9c0fa84ab472d46c961e64f34fcda27f88c45925da72368268f857db22bc9cd1378c6595933ee33ed5a6253f62c221ca6ef -DIST google.golang.org%2Fapi%2F@v%2Fv0.3.1.zip 12595521 BLAKE2B 6a91f9636076c53671d5a17a50c2750cffeb8196144ccd59ab35bd33a02bfda821b13f9e9ba9b8f412cdd581b8a284139d864b585bcd9ca939dc7c8e9c759a5b SHA512 af407df6350e5b67e0f8858a5b32983de2162bdf2dff8021e595e28b8d9a12c139d9133a88d3385e6f78ccb051194944da3543a872626605121593ab22c21c92 -DIST google.golang.org%2Fapi%2F@v%2Fv0.4.0.mod 506 BLAKE2B 6933fe30be88a21cca041b800cb9d095b1daf787f3701c0311da2606287d03799df9b556451d9170d02be8028ce686aaf69eaf941d2a8bdb4769c319c50c9905 SHA512 9fa566a26f8345a101dc94986755468b4782d78689d5a163aa5b960b507d4a0e8e435a8ce84073e07187745a156e2c9f586136895db2f08cfc4cd3329fc1e23a -DIST google.golang.org%2Fapi%2F@v%2Fv0.7.0.mod 802 BLAKE2B 59277c0ab43500926ae727289dfd892ce524164f7acea3d6ede2f4efceb5e89e71e88c2c9fa3e4785da4d2a69c59e5c81c4d735887a6ab52c0b07a8b6baca88d SHA512 617883d94a4de6e07dfd82d046148ccfc5ab4eaf73840a76a9823e5cf03a60b0e0b4f1b62712620de28895d013f01bcd39477cb87bfb94524a634be8818c268c -DIST google.golang.org%2Fapi%2F@v%2Fv0.8.0.mod 850 BLAKE2B c338a815e2222182387fe11a60a2eb1e463851f38725da6e7884be1c2dbdea72473ecee4fca65bd50299c5f9095ac5e52848569b7979106da3876205e5cde41f SHA512 37c90eac881c258cb947f9507ae97466b355df015f64ef2d3ecbcbc154216623676340a000362e8229f3e842e68818a73ae64b5f63e3e1820cbff7b1e7b6d89e -DIST google.golang.org%2Fapi%2F@v%2Fv0.9.0.mod 850 BLAKE2B c338a815e2222182387fe11a60a2eb1e463851f38725da6e7884be1c2dbdea72473ecee4fca65bd50299c5f9095ac5e52848569b7979106da3876205e5cde41f SHA512 37c90eac881c258cb947f9507ae97466b355df015f64ef2d3ecbcbc154216623676340a000362e8229f3e842e68818a73ae64b5f63e3e1820cbff7b1e7b6d89e -DIST google.golang.org%2Fappengine%2F@v%2Fv1.1.0.mod 35 BLAKE2B 24fb6ba95138448c45da7f1ecc4c87391485006b54b8e7ff96ec582c2659f9ea77574b4d5fef2442eff9e5564f3c3263ed8e6963c5d21cde8772a7143d82f3ed SHA512 6644c398d639794470e49cad4402d17765422934915b5a13e13e1f84d8890cc8fad9e6ea8c580d114aefea70d894242e05ce3a432ee596f772b98b6b73069fe2 -DIST google.golang.org%2Fappengine%2F@v%2Fv1.4.0.mod 162 BLAKE2B 21c4d160665b6a87101d2aec39d2f7faef9a66f6be50f7293706686022f808b131c9ce7ddfcba6c2b6d27d15f9414101650436a2403f156a0368de2bce72e482 SHA512 60fb2454326103e4905f79f23a25320cb2c0035b7a0e3c228af845ed7dae23014efb81685f29805303edf277e8b1a2d9a7530b8f3a1a8e57caa1a85edeb52475 -DIST google.golang.org%2Fappengine%2F@v%2Fv1.4.0.zip 408151 BLAKE2B 9f815084675da034d639cf3e8648ee5dd2d1282d2bb6937ffc91956b5cfa46809499441a39636e4f0565c4307854977201ecc8cfaf38b46557c3e715cef0722e SHA512 1eeb760cf1057c306f2301ef4c7065cdd6dc18cdeefefd3a1cc8cc22efa312ee5ba7da6b79a4e7666bc09429d1ca73d7bc1db574f9cd33d271a72700a070a219 -DIST google.golang.org%2Fappengine%2F@v%2Fv1.5.0.mod 162 BLAKE2B 21c4d160665b6a87101d2aec39d2f7faef9a66f6be50f7293706686022f808b131c9ce7ddfcba6c2b6d27d15f9414101650436a2403f156a0368de2bce72e482 SHA512 60fb2454326103e4905f79f23a25320cb2c0035b7a0e3c228af845ed7dae23014efb81685f29805303edf277e8b1a2d9a7530b8f3a1a8e57caa1a85edeb52475 -DIST google.golang.org%2Fappengine%2F@v%2Fv1.6.1.mod 362 BLAKE2B 2d6d24186c2748c4d8f559feb269b351d4260c9c0e0b9342377f23af9e5ecc02fc7f84f7be299aedb0da1b1a6d6d67c3271a826b776bb7cc034256550479a0f5 SHA512 e3c391dfcc5f14fdc5430d7a1d239d4ebec89399b17851e4d7643b8c0c70077aaec3a1bc1a8dd5e3320d8bc6e1562a26e3fe1121d75ce578f37f5d2e84a4ddf6 -DIST google.golang.org%2Fappengine%2F@v%2Fv1.6.5.mod 171 BLAKE2B 09b1ead1721eaa1dab7106f0206fd6f1c1509ddd07f70d7a23f73a1c047b9b33b41bae2519d2ba7e5c6ca632a9082483080dbffe0af3c371934f2ceab9ad334c SHA512 f99bba4e696291aae951ea3865a1cbaf0ba2df7cde4f86e942b2e5f5a4dfc6dfde95c74e52ff31ba69f2aa2a838d21843343b2203c732279eede5936b92d7c8c -DIST google.golang.org%2Fappengine%2F@v%2Fv1.6.5.zip 417678 BLAKE2B cdb4e693ed5fb2bb77ed1ce0e0b1b25dbc3648c00554ade874ce28fffd5824f487fac744f9f2cb0920aad2c94a82024e1d233d1663887f0681790488a3af6f3c SHA512 1ffe3894d8fd004f6c28916e06d8e64708c20321ff914e82d05c50ce4c62b76bcd93e74e45871f7adc779791240ef8e25df08fdaaf2abdce20a3640d8964bb28 -DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20180817151627-c66870c02cf8.mod 34 BLAKE2B cd6cb61b9f55a3c1e8b33588e98e62c9c27613ac20fb039cd70c9ecbe41c34d11d80246290ab73a9faf3ec809a15fc00267654b0eb00dbf23fe5c9758c705d9c SHA512 1c29af2b4f8b54234f09dfbfad120b4b11d4fe67e9578b0553412f1587cac2fa2bfe5537fbf15e6d52dcb04332413231c250c3c460b04e64326d2eaed3102464 -DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190307195333-5fe7a883aa19.mod 450 BLAKE2B bf0efd5f0ff915b9f59fa81611892e70644a4b14fefd15190d0ff68043f7809f51d53766dc50fc0eb9372df3e6590d3fbcf51aec5e9b0c18027e156ce53b8df1 SHA512 37a99611220df08ac5f15ed6f718f37a35523f5cef392b7b7da86b0eaf05e4fa5e52aceb42a6b6ddf6924b1f7cc151876d2e532c83dd2edbcca7c41b9191c427 -DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190404172233-64821d5d2107.mod 450 BLAKE2B bf0efd5f0ff915b9f59fa81611892e70644a4b14fefd15190d0ff68043f7809f51d53766dc50fc0eb9372df3e6590d3fbcf51aec5e9b0c18027e156ce53b8df1 SHA512 37a99611220df08ac5f15ed6f718f37a35523f5cef392b7b7da86b0eaf05e4fa5e52aceb42a6b6ddf6924b1f7cc151876d2e532c83dd2edbcca7c41b9191c427 -DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190404172233-64821d5d2107.zip 6533885 BLAKE2B 194748b0fc9279db95843c40fb88495765086b0aa42472c3952ca9b58e1c5ec1b90654e63ecd308a474d8afb846c9fc233a7f298b7c53efc5e48453409878e80 SHA512 676aa55eade0c609837f446ca93b9b823cb0943ccfff344808f7a2b2e4a0d7c8d34674d7b218d6a5fde6d98be5d8ca4a3f6e4476c69c2e9df3a22c8c662a1414 -DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190418145605-e7d98fc518a7.mod 450 BLAKE2B bf0efd5f0ff915b9f59fa81611892e70644a4b14fefd15190d0ff68043f7809f51d53766dc50fc0eb9372df3e6590d3fbcf51aec5e9b0c18027e156ce53b8df1 SHA512 37a99611220df08ac5f15ed6f718f37a35523f5cef392b7b7da86b0eaf05e4fa5e52aceb42a6b6ddf6924b1f7cc151876d2e532c83dd2edbcca7c41b9191c427 -DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190425155659-357c62f0e4bb.mod 450 BLAKE2B bf0efd5f0ff915b9f59fa81611892e70644a4b14fefd15190d0ff68043f7809f51d53766dc50fc0eb9372df3e6590d3fbcf51aec5e9b0c18027e156ce53b8df1 SHA512 37a99611220df08ac5f15ed6f718f37a35523f5cef392b7b7da86b0eaf05e4fa5e52aceb42a6b6ddf6924b1f7cc151876d2e532c83dd2edbcca7c41b9191c427 -DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190502173448-54afdca5d873.mod 450 BLAKE2B bf0efd5f0ff915b9f59fa81611892e70644a4b14fefd15190d0ff68043f7809f51d53766dc50fc0eb9372df3e6590d3fbcf51aec5e9b0c18027e156ce53b8df1 SHA512 37a99611220df08ac5f15ed6f718f37a35523f5cef392b7b7da86b0eaf05e4fa5e52aceb42a6b6ddf6924b1f7cc151876d2e532c83dd2edbcca7c41b9191c427 -DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190801165951-fa694d86fc64.mod 331 BLAKE2B 63923e4fcfa896f163dc77009fbdee8ce8c2e31a4694b6ccddf3397cad5c89a3be5796dbc65b77cf059f1601729d976f9afd2969bd426c0cd8781b106ffe0be8 SHA512 9f22a11a1d639cc7a465b6e826c2bc3915fe0ac847159a38c470f0b1631d6f6b2e0ae0548344f7a8e97161d4c6b80113062c04062b7ab887d7d615c39cbfc2dd -DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190819201941-24fa4b261c55.mod 331 BLAKE2B 63923e4fcfa896f163dc77009fbdee8ce8c2e31a4694b6ccddf3397cad5c89a3be5796dbc65b77cf059f1601729d976f9afd2969bd426c0cd8781b106ffe0be8 SHA512 9f22a11a1d639cc7a465b6e826c2bc3915fe0ac847159a38c470f0b1631d6f6b2e0ae0548344f7a8e97161d4c6b80113062c04062b7ab887d7d615c39cbfc2dd -DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190911173649-1774047e7e51.mod 339 BLAKE2B 06dd6c875e6235007ea4f4a8350a7f80b3285e21f8ef599ea1e955a6185c5e11658040d073937a4110910c3d21d923487427c0dc626e342e10fef8efbfa95b2b SHA512 8d2fe5cf81319645c17ff8be71f966294976889b7aff74a5b234913dc34a1c7ac03548bcc9ed29120ef651705e7dc6da0c2aff892c9262d67d0044fec5685ac3 -DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20191108220845-16a3f7862a1a.mod 340 BLAKE2B bb2207855662037de3179be2e667a9cd8798e2d3c1b1eeb939f76095b9c32cca6dacd47439429b5705ad1d5c5597cb4170f17e49bcfa310c0733f1e68ffc1610 SHA512 1095755ae781f0370bb3dd72fca348c5d6640a4f89b6eddfcdd349f320ae117a4da47e48707f66743fc8dc4067285750d816d178b484dee0d21de0b2d1b129b2 -DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20191115194625-c23dd37a84c9.mod 340 BLAKE2B bb2207855662037de3179be2e667a9cd8798e2d3c1b1eeb939f76095b9c32cca6dacd47439429b5705ad1d5c5597cb4170f17e49bcfa310c0733f1e68ffc1610 SHA512 1095755ae781f0370bb3dd72fca348c5d6640a4f89b6eddfcdd349f320ae117a4da47e48707f66743fc8dc4067285750d816d178b484dee0d21de0b2d1b129b2 -DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20191216164720-4f79533eabd1.mod 340 BLAKE2B bb2207855662037de3179be2e667a9cd8798e2d3c1b1eeb939f76095b9c32cca6dacd47439429b5705ad1d5c5597cb4170f17e49bcfa310c0733f1e68ffc1610 SHA512 1095755ae781f0370bb3dd72fca348c5d6640a4f89b6eddfcdd349f320ae117a4da47e48707f66743fc8dc4067285750d816d178b484dee0d21de0b2d1b129b2 -DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20191230161307-f3c370f40bfb.mod 340 BLAKE2B bb2207855662037de3179be2e667a9cd8798e2d3c1b1eeb939f76095b9c32cca6dacd47439429b5705ad1d5c5597cb4170f17e49bcfa310c0733f1e68ffc1610 SHA512 1095755ae781f0370bb3dd72fca348c5d6640a4f89b6eddfcdd349f320ae117a4da47e48707f66743fc8dc4067285750d816d178b484dee0d21de0b2d1b129b2 -DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200115191322-ca5a22157cba.mod 340 BLAKE2B bb2207855662037de3179be2e667a9cd8798e2d3c1b1eeb939f76095b9c32cca6dacd47439429b5705ad1d5c5597cb4170f17e49bcfa310c0733f1e68ffc1610 SHA512 1095755ae781f0370bb3dd72fca348c5d6640a4f89b6eddfcdd349f320ae117a4da47e48707f66743fc8dc4067285750d816d178b484dee0d21de0b2d1b129b2 -DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200122232147-0452cf42e150.mod 340 BLAKE2B bb2207855662037de3179be2e667a9cd8798e2d3c1b1eeb939f76095b9c32cca6dacd47439429b5705ad1d5c5597cb4170f17e49bcfa310c0733f1e68ffc1610 SHA512 1095755ae781f0370bb3dd72fca348c5d6640a4f89b6eddfcdd349f320ae117a4da47e48707f66743fc8dc4067285750d816d178b484dee0d21de0b2d1b129b2 -DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200204135345-fa8e72b47b90.mod 340 BLAKE2B 70822d80e0c64a18bea901e30359c66d790629dfcfd7b4512b215b2c29bcfcc862bb68f9480357118c7adbe6a1b42754ef7703bb28e608abef8f8cdcbf6d2396 SHA512 461bf9e9c747d61500f3884c67f82cdf9394b186b512f6ff7537620a8f7a8de7a5c30af81c9a1303c0babfbc748c80460313e6b8e440e1f553fd4e1e8e12321c -DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200212174721-66ed5ce911ce.mod 287 BLAKE2B ac895df309c4c2533900f7ff3aaecd59bf883fad6fde8fc7ffef9928fc8f18402fb2198bb3f0b75e876adb7d5d0e37073fc251d149245847ebdd95de1cdf6cd3 SHA512 44dc287d4a33c4225229768c59d1b9e61b51fdc27b1745a8161b17bdef4499cb08ebc565c56caa01673317cbef46cb228ac69b9ada7d4bac870b22eddf5a2977 -DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200317114155-1f3552e48f24.mod 287 BLAKE2B ac895df309c4c2533900f7ff3aaecd59bf883fad6fde8fc7ffef9928fc8f18402fb2198bb3f0b75e876adb7d5d0e37073fc251d149245847ebdd95de1cdf6cd3 SHA512 44dc287d4a33c4225229768c59d1b9e61b51fdc27b1745a8161b17bdef4499cb08ebc565c56caa01673317cbef46cb228ac69b9ada7d4bac870b22eddf5a2977 -DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200317114155-1f3552e48f24.zip 10765659 BLAKE2B 8d6a0c11c19aa16e03ab3c1cd87767f0e40db66544bb61ed5d587a9968b73f4d727420757fcc2f11a854249a7cbaafc355e64f68cba122561e8c17d66f2fb94c SHA512 431691e6be96553528ba00e18fb93e06722fa710950ad2b3b68866f1d2db905881dbdcd2cdd37eb6a40f1aabd8768569836a6718a779b9b5647afdf49cd6eea9 -DIST google.golang.org%2Fgrpc%2F@v%2Fv1.17.0.mod 832 BLAKE2B 9de27394e05cf42e762a8b7ed42b6715244ea1086acd7c44f71b04bc0dc23c31ab236e6474fea423953eb3001dcaa357938daad1d54debfb5d52bdecc1de6bda SHA512 ac90f3fc374cc1ac7706146efaa8488a59634a209c30bf87453fa150bf8849870db2ec04e854438d59911ea35930a5dd8f40f5d5954786d0e0565907fc42f711 -DIST google.golang.org%2Fgrpc%2F@v%2Fv1.19.0.mod 833 BLAKE2B 71052eaeaf40883bff624eecce8fd6f5669fdea9355e6ae0db9c86c841a62f7176d5ab58838d1645f59b9cb4ad4b636048aa3e9f1d7db521104b8f09dc535bc7 SHA512 38c4f75a0121cecd31b2628da3c3d77aeeb9b2c1974eef2d2d2bb7a3eb507d330debb7f14a724c8910174439b38ab54458096aaf665ea4af87a83f866ca0452e -DIST google.golang.org%2Fgrpc%2F@v%2Fv1.19.0.zip 856318 BLAKE2B 1e6caee44e8839463776d42a897d5de0e8ec0f76a080d9290346f4c777042753e14f7e136be92347e8d0c60c18d0b1d53f55a7eeeaff8d220837645af5bff583 SHA512 f1c7963c187d23174094f1659974e12d23b1c42761915cb5a06ce3a0a043716863703d856451e570b2f56034e83d528e817dbd849584f79444c2228c8fe1f44c -DIST google.golang.org%2Fgrpc%2F@v%2Fv1.20.1.mod 795 BLAKE2B b825f2ab62a96b9b164410f761228575fd9882de37635c09803b9d2ce682ebbec30f301fd874aafaad95a5aa2431ba25962073e1bd4f336d8cb137e5939a8708 SHA512 585d4cf68b50a70d7967ac3941a7a83b83ed5df1a31773589a38348b6fdf247eb49e7778f7054b78ba1a65eef48d004a815abad932876cb1af2c09deea9c0db8 -DIST google.golang.org%2Fgrpc%2F@v%2Fv1.21.1.mod 828 BLAKE2B a57ef0fe7edabd002918282ba9ef83386689db2688fd8f1b9ebedd191bb0b7059cc0b99d95974ab68112cd48e1865558d314dda64c71ab239de39fe6e8f0db5b SHA512 f9ab0c8ed5a58799a39f64c63b995badb24d8ba1148c7a1be1e3342d1b0d6a6e334fa2cab16f8e9396907e60386cbccb6495dbbe3ca09440bb878e10e1686d62 -DIST google.golang.org%2Fgrpc%2F@v%2Fv1.23.0.mod 762 BLAKE2B 3c67c1bfdf0cef36f702e4a56d42cd7861cc573282ecf1667c7b19b97b8329a67f34a4c2ef3b2b865cabbd35a03dc43284e4c1af90dd8bb6018b0d8a192484b5 SHA512 4ea69ff3644e3e51f4a9ce73325a995b119088a9c97fec4a4811d1d9f119799182cd4dac377e3b58d96e10b8f6ba500a85ad72463ef4305d04ed1c55261526c2 -DIST google.golang.org%2Fgrpc%2F@v%2Fv1.25.1.mod 532 BLAKE2B 4c46c03905fc660d54c7acdb5cd614db9429b0e1add087fa5068f41a72d04b2f776e8326d1181e63ce29078f075d2312f9b0baeaeb048ea3d73f2fdba111e35d SHA512 0171fadf89079d7c0f18b1401aedfd886888d0a4ec4e107aec191c3875c640990532e1f57a3f5306a2e5705ddcf7e09ab2ce4953710347c09deb1d9d5f2d3c1f -DIST google.golang.org%2Fgrpc%2F@v%2Fv1.26.0.mod 562 BLAKE2B 33a46aa2516aa10a1bfed0431c4f3d41554aa8ab5cff1f259323c47999696d0cdf9113f162eebf3bbc18cea163f1c6f8225777653191380cfccf06e5921db81e SHA512 6e06146c3ee73338a24698b08d0091dca5cc67d033e1a98ca28157dccd8e056a3a2624c798180eda5917f90e1e37aff31158cb8ab2cedeb8e4578324719605ef -DIST google.golang.org%2Fgrpc%2F@v%2Fv1.27.0.mod 562 BLAKE2B 33a46aa2516aa10a1bfed0431c4f3d41554aa8ab5cff1f259323c47999696d0cdf9113f162eebf3bbc18cea163f1c6f8225777653191380cfccf06e5921db81e SHA512 6e06146c3ee73338a24698b08d0091dca5cc67d033e1a98ca28157dccd8e056a3a2624c798180eda5917f90e1e37aff31158cb8ab2cedeb8e4578324719605ef -DIST google.golang.org%2Fgrpc%2F@v%2Fv1.27.1.mod 562 BLAKE2B 33a46aa2516aa10a1bfed0431c4f3d41554aa8ab5cff1f259323c47999696d0cdf9113f162eebf3bbc18cea163f1c6f8225777653191380cfccf06e5921db81e SHA512 6e06146c3ee73338a24698b08d0091dca5cc67d033e1a98ca28157dccd8e056a3a2624c798180eda5917f90e1e37aff31158cb8ab2cedeb8e4578324719605ef -DIST google.golang.org%2Fgrpc%2F@v%2Fv1.28.0.mod 532 BLAKE2B ebe5fc28123fed2d7c497a7e237039a4a90f6eeb389b61650cede1d3bb850a1cd09c1574ee57fe65b6f4d338bb440a67ff802a28805b044bcc78b39ce2acd5b6 SHA512 85a0f6a03de8c151aacca3944a75738ac01ba368be98d6e4756a772976fccfd0faac55df170feb51ac86a10241a613b2ce1ac7d7c5cbef41ee2ed8eb93416801 -DIST google.golang.org%2Fgrpc%2F@v%2Fv1.28.0.zip 1198538 BLAKE2B 5341833998b96b52e75a00a527ad0e8ba7914634be6f2b4bd596bcb5a3551153fe75480f6b3cf5c89e7571e0b636ed2147fe64ad56b83ed715b2584f9ecf4ddf SHA512 00ba0e0b6b45e1501a7170ad4d9c9495f13bcfbca444c82560f72d3ef41e62c0488690ce0ce9ac2b60a2b8e3d4b19f683892ae45b87fcfc3ce32eb4740c39cfe -DIST gopkg.in%2Falecthomas%2Fkingpin.v2%2F@v%2Fv2.2.6.mod 38 BLAKE2B e7781691d8c15b764ef6c89fcdf20e69fc28d46e8df2703b6fdc342247595c10ed25e3cc5b30cd29b81c57837f5685e4122e1b2c218a51fffbb1567c85b0835a SHA512 585188d3a75067e6b7d8a8321959fe7df80c6a19f8668a87f0d1b8687c4d2cefc039167446f6d02f7eeeb147371bc7a673348213bcb07f4d90bebc0ccf9f2015 -DIST gopkg.in%2Fasn1-ber.v1%2F@v%2Fv1.0.0-20181015200546-f715ec2f112d.mod 28 BLAKE2B 0fbbe5d1e239fce8fc245a0a54a09a57ba1a669a6ed93aabefe8fd333549b3309ad9e6eb15cff2f0a853d3830e6b5cd60961835b14e2dd13aad5812cca6ee04c SHA512 00151108bdaa29a2097ab78c99c93bf0ec27af203696a11bc7ba55e36d7115ad13279110c245bd3a2cc84b63bb2a8840964e3b2e1334a0d085ac1e8ec5239bad -DIST gopkg.in%2Fasn1-ber.v1%2F@v%2Fv1.0.0-20181015200546-f715ec2f112d.zip 29965 BLAKE2B 43a72ac189d5bb6a581938910c317ec96c39c3c32695d844c1a9cd83243a567505d388f045e6c514d077e27857a6e206d628851454eef97ec14b52ccfc2a5da3 SHA512 4624295283c43a64b2413e25c3ca5a91c798d2b2cd7e60313b92c58d048404b12052dca119f6906e1fa0419bafd2e02c160b486856e2e88f75bfb2d08fd662f3 -DIST gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.mod 25 BLAKE2B 6470f3d94700c4d8b3176d692bdb91646750f2c6a866ff2ef4183aff1de01f024a8757f97b4626ec0355092e5f25e7ded91cd5be845f627d107c58b1daf400d7 SHA512 9ac0f80ef05881387cb2f48f81560f3207fe586ea16495383662e6d62e43d93fac01dfe72e1d0063d3ab065331dab3a8098d7da4f1830ba1aff6f27f8e1bc1b2 -DIST gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20161208181325-20d25e280405.mod 25 BLAKE2B 6470f3d94700c4d8b3176d692bdb91646750f2c6a866ff2ef4183aff1de01f024a8757f97b4626ec0355092e5f25e7ded91cd5be845f627d107c58b1daf400d7 SHA512 9ac0f80ef05881387cb2f48f81560f3207fe586ea16495383662e6d62e43d93fac01dfe72e1d0063d3ab065331dab3a8098d7da4f1830ba1aff6f27f8e1bc1b2 -DIST gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20180628173108-788fd7840127.mod 25 BLAKE2B 6470f3d94700c4d8b3176d692bdb91646750f2c6a866ff2ef4183aff1de01f024a8757f97b4626ec0355092e5f25e7ded91cd5be845f627d107c58b1daf400d7 SHA512 9ac0f80ef05881387cb2f48f81560f3207fe586ea16495383662e6d62e43d93fac01dfe72e1d0063d3ab065331dab3a8098d7da4f1830ba1aff6f27f8e1bc1b2 -DIST gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20180628173108-788fd7840127.zip 41465 BLAKE2B 9a7183d3ac6591399b5208026208047a670c85e8b6014ad29955b168c63bb4953fa972d31025613c2ab12d7207adeebe9578b3c15b65ebb792f1e41df2668297 SHA512 fa7c68a2b5a6bb14f99cda92a3e77aad0e4160f659c54ea73e9813af9ff9449df6b0cab42ee283971e778b6b9da4a6098df805dd284c3b1aedfcd3a0b8504bde -DIST gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20190902080502-41f04d3bba15.mod 25 BLAKE2B 6470f3d94700c4d8b3176d692bdb91646750f2c6a866ff2ef4183aff1de01f024a8757f97b4626ec0355092e5f25e7ded91cd5be845f627d107c58b1daf400d7 SHA512 9ac0f80ef05881387cb2f48f81560f3207fe586ea16495383662e6d62e43d93fac01dfe72e1d0063d3ab065331dab3a8098d7da4f1830ba1aff6f27f8e1bc1b2 -DIST gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20190902080502-41f04d3bba15.zip 41481 BLAKE2B b952f04dc8d4717c839de5a5b7780ec2434915d11f897cc759647f71073dd3df717e1195ff2f4f804457195886c63620b342a089fc489f5deafa9c928708d4bb SHA512 40a523fc1dcc36677a0dc0e626313d44a308fa2ad5eedf7b616470ae2972dd8f5b78c18384efffa65d58391e60b704ed35db5557a5dce8362ae45204f64b721d -DIST gopkg.in%2Ferrgo.v2%2F@v%2Fv2.1.0.mod 133 BLAKE2B c4ac637e2bf2d6635065be5213d73f23a1870054c58e9f1cce93af4627ed6fdefa96798b0fbbd27666573757f8b4a48c694ddf3f86c98e898124294459500771 SHA512 cac59fd7470fc9d3203dab6b9e881d4182cfca5acf0a19207a9aff2964d42f20422f9a164bb52b2fa73c523e3caafd63028189bd4190a1670870154dbf3e8178 -DIST gopkg.in%2Ffatih%2Fpool.v2%2F@v%2Fv2.0.0.mod 30 BLAKE2B d5f9c67d0aec004093184d9f53344f3ae02e7a6b2fa5d7c874cc7d09a93f5f4bd3cd8d9e1779ea759043faefdf97a8f262cc63a425056df9085343940bf9ba6a SHA512 4fdf708c08e705456024f356fb99db91ea87db90ac68f52946f7cd88bafb949d27637a8af2afffd2e9212644ef8ce9fcbc099a60e24f9451a38e605d2136cec0 -DIST gopkg.in%2Ffatih%2Fpool.v2%2F@v%2Fv2.0.0.zip 6846 BLAKE2B 6757f851a68882aefa8507f483e39d7226bfc8fe718a1be915bdc1110b5cffeb3871cc9d897d65ecce8edede530445835e6eb4baca966bf44b57602713260ffa SHA512 94ff89bea69f9e551c3b4a723d9b288e7d04a89e4c37e0c1d1b243191e0262e0d04f224e6ca8d947f5341892dd3ba777b147ad651fa49c025a9d54efdbdb87f2 -DIST gopkg.in%2Ffsnotify.v1%2F@v%2Fv1.2.1.mod 28 BLAKE2B ee2514c386f6cb3ff4a9b829d903e57372ce765aeab91fb2f29e95358e3472e0612a00f2982f53790159738e416819e368afa03e44bf8f6b43511347bc6d6995 SHA512 7cf7d1933039974dd4fa16febc52cc118bcd0e35c329d4c563c7f411b8000d9e17be5bca9a60d94f5309cbef97b3d176110704ebfbc3c114572cbadf63a55a34 -DIST gopkg.in%2Ffsnotify.v1%2F@v%2Fv1.4.7.mod 28 BLAKE2B ee2514c386f6cb3ff4a9b829d903e57372ce765aeab91fb2f29e95358e3472e0612a00f2982f53790159738e416819e368afa03e44bf8f6b43511347bc6d6995 SHA512 7cf7d1933039974dd4fa16febc52cc118bcd0e35c329d4c563c7f411b8000d9e17be5bca9a60d94f5309cbef97b3d176110704ebfbc3c114572cbadf63a55a34 -DIST gopkg.in%2Ffsnotify.v1%2F@v%2Fv1.4.7.zip 40894 BLAKE2B 5edf237401ae1a48c425ffec6fc67146850d7137c7026260e894656f6c832066321d930151bdd7624489e1f768fc04b47b0fd3dac3b2171bd092dff344de16a7 SHA512 f99afc545324e49ef1de05fd4c8dde0dae37094e2fb1b81de8d8c9b8ba9b28f39f9b5ab715c728e4a0375544a48d49c2dbd719fc178d222e0b914a425d9aeb63 -DIST gopkg.in%2Fgorethink%2Fgorethink.v3%2F@v%2Fv3.0.5.mod 39 BLAKE2B 25d546ada8cf65a9209bf4a81e1370b5be809f424c8e2a8c1ad7aed3b4483e0de2fb1bff392fda44f7dc811f1a35c00d36aab460318afb437484f396cbf19112 SHA512 72e9b6330a12931bf148fcf16893b771aee31e71b6dcb281ac707c602ab9b98c5efda04ae24bf7107ab182431f99257983cf349ae88c32f218094676fe477604 -DIST gopkg.in%2Fgorethink%2Fgorethink.v3%2F@v%2Fv3.0.5.zip 377829 BLAKE2B 041054cb0f99470e8b166861ad03050496c023193b45e3de6e6a63b368a799041768e6fd3680c02ce7b88abec3dd40656648e54375cc22873cb42318c9c8dad5 SHA512 8e57e592e4028a299289bd3ee2e972d1ced18df561b5ca9b907580100703ff23f2834ededa1e413482fa481672cdf8302e710a30a918f40d8ee8f65563a918a3 -DIST gopkg.in%2Finf.v0%2F@v%2Fv0.9.1.mod 23 BLAKE2B 7e865218970f4a4fa06035c7474ea6a854843051fafd593b393007eb606d813e7817d2444697c68a3c63ce44d57b2f7bd47348ae6e4481bd11f43ed6ace64e5a SHA512 cb350a878f5cb581d62859e605c732ff92a0b92295c28eb17f17768845feef85c1838bda755ff952a8c939f6a46e9cbf5dd77b6e278adf8197a418111e2f98dc -DIST gopkg.in%2Finf.v0%2F@v%2Fv0.9.1.zip 15882 BLAKE2B 00d4a14f02231cee71bf55946b52e491df36745bffbc58affd61d73e0266bf259bd19595364c094dda028f84838442c65be69e240f8a23aa5d83f4eb7b3d3d84 SHA512 bfd1d29d3514659d778c1ef699b23bd6b5980620992d9aba56f62bc3870cf438a7f179e9b7bfc02f398cf1ffaf13652fd9b8d1c90c0fbf2ab315bf0b02a97c2b -DIST gopkg.in%2Fjcmturner%2Faescts.v1%2F@v%2Fv1.0.1.mod 36 BLAKE2B 1f653e0e7fe93701b9e5c212697ee615f635c03fad64811a4741f57b9df6e53a632cd6665c12d2d56b5788639c386ec8461cafb4c5721610787e63b82579c539 SHA512 508e5b91b64eda9f137bdeb45512ca617294a48b9078670938190231eac59f96169462ab6dba748b9344df62479a48588db73c1d211977514f1e9baec3013167 -DIST gopkg.in%2Fjcmturner%2Faescts.v1%2F@v%2Fv1.0.1.zip 8138 BLAKE2B d74df3115a331373ed39003d512a89a9c6fe59d571d74bbf1a6ff3ebb06b87a71bc9ec11df8105c1dccf58226fa9a354d5ebfec11a74c05d5a9b689cd6ca20c2 SHA512 a4583a6b2c3a476459184ae8890109d36594a37ed9884fcdb42a8c6985c17edaa20179233750116bb262a851aee59520030c9f4ef36639d56219e6df7f250489 -DIST gopkg.in%2Fjcmturner%2Fdnsutils.v1%2F@v%2Fv1.0.1.mod 38 BLAKE2B d1cedc414de193540de5ac312000e4304212ba989a9b7bbe10b1a2db5effa33c82ec01cfd5ac4cb9d826460a1a0dd11c4f932c8649831d9b0ca3c21db602effe SHA512 894183b8527a1a4b541f8e5dc359e62d05dfa8aa66fabe8438db3f376e4075af51e781717e6ad01b3266384719bade2bf85dbb161c3c6468a40b9640f50d1cd8 -DIST gopkg.in%2Fjcmturner%2Fdnsutils.v1%2F@v%2Fv1.0.1.zip 7425 BLAKE2B e25afce5349dcf85fff01c6282db6db594626bb20a021e77330868d666cd283306b5efacf2f8d8cc9627380e81763a50477b4ffdf1c0a0f4a71f2b2ba7d8f4ba SHA512 1aac5cca82fd087586924f69e49ecd68c7401a46368fa980c2e1ddcd3e59e170d8e2dc067d96c235442db9fac53817b631c0ded1b75557217385a3888ab5833e -DIST gopkg.in%2Fjcmturner%2Fgoidentity.v3%2F@v%2Fv3.0.0.mod 40 BLAKE2B 3e77c43f0108e2eb7585bd5558385a198b301e2adc7f813cce7981d0979567808d015e60cfd7ac7c6a17e9c0a5d616642c4b9bec919cd5de8d2fd6f86dd00845 SHA512 c498fb321f358d43c35d98913d17242517c415fc3c26d497fd821f30e6c656ca9ba3ce3a73657c43c677d35eab70c90065a7f93dab73214502e604efbc44a180 -DIST gopkg.in%2Fjcmturner%2Fgoidentity.v3%2F@v%2Fv3.0.0.zip 7069 BLAKE2B db430bd56c95cb5a40e95368be1f8b23ffa067e4f491ba6a641c12f78855bbd691268f60b4d57307aeede99671a23c437171a446a47ca6ebc1eeaf9defb0755d SHA512 4972724984d58b174b50c1ea81842bc5baa1fca3d74ea5163b6339c2f4a9fee1731eae3dd19f8cb67bca9465a762e44f856537bdc907bbf37394dfc656b2edbc -DIST gopkg.in%2Fjcmturner%2Fgokrb5.v7%2F@v%2Fv7.2.3.mod 36 BLAKE2B 268adc19223fdd60f8dc01a4eb96290f6c4ae0fe2576d3bac9f82caa3e683e79151d9147a8bf76bfe9b2341ec2bd28d6447248fccfd10e4ed348fd02a88473ed SHA512 a963f19cd93e788d0f5de9873a5b0aa152ea592d829c1513e74c277718ac496d6d2a9dcae0462951fb92ad1fdc59381c30eb5b1bcc2dbb3bcab1cb11928ce05e -DIST gopkg.in%2Fjcmturner%2Fgokrb5.v7%2F@v%2Fv7.3.0.mod 36 BLAKE2B 268adc19223fdd60f8dc01a4eb96290f6c4ae0fe2576d3bac9f82caa3e683e79151d9147a8bf76bfe9b2341ec2bd28d6447248fccfd10e4ed348fd02a88473ed SHA512 a963f19cd93e788d0f5de9873a5b0aa152ea592d829c1513e74c277718ac496d6d2a9dcae0462951fb92ad1fdc59381c30eb5b1bcc2dbb3bcab1cb11928ce05e -DIST gopkg.in%2Fjcmturner%2Fgokrb5.v7%2F@v%2Fv7.3.0.zip 55262753 BLAKE2B 42ecb6953d818d5b70bb6ca430ffbb5ee9d2e66feca01d89c41856b99c5d3738b031a1c743cd45860499ae6dd8c0fbe6e949c4954f969dc6bf20be39744f5afd SHA512 8d24dac1e8429af5d26697bb75407490f5a36860cfe5fcb4303c17e931c37454b17d51dd54d6b70112475704da0cdbcb851ed21e1303bde950768192749a822b -DIST gopkg.in%2Fjcmturner%2Frpc.v1%2F@v%2Fv1.1.0.mod 33 BLAKE2B 0c256369010fa14f2dd95100b3f1b75357816012d226e52588c91c6615eb5b56459061d3bdc8201a84985136912c4d8e62dc281600cb53fd2e9e2a545eb3f35d SHA512 0513089b977716c7cb885b4edced551183b397858963f74f002a078920fd1e2178376261abad2c1c475e7de7ba262670de9d25e8a6e801b4c78385370cd0a489 -DIST gopkg.in%2Fjcmturner%2Frpc.v1%2F@v%2Fv1.1.0.zip 42124 BLAKE2B 172da6e6ccc58989dc4827d113bc8b93dfefef6321344bc9f569786ca152dd50369e98e7fdf718096d42eec90c1cd14d05cf908afbcc12dce8de6e2248d8463d SHA512 056ad239cc4831d56ef60f0e36c7cfe78a3a4d67160ee81619f63f27ff975247eb53e2b3461b8ee461f8aeee2fe8c37131832304e3eafadbc5ed5a4fb90a994a -DIST gopkg.in%2Fldap.v3%2F@v%2Fv3.1.0.mod 89 BLAKE2B 6d0cea65306cd89cd87fca7a6e406d08208c411321c9f76734a706df82ee0133ed98c351e26343370c6b63191531d20c6e73974badde75d8127f3b531777b485 SHA512 6b6f30dd0b1521551ed1ea5992eae4d1dc03d6f80bc2c8fbb58c8671e721ad90704a4f2e3e93cd6dd35348df649f9c9e24b4d38eac7d296576b1952bb8cab8a6 -DIST gopkg.in%2Fldap.v3%2F@v%2Fv3.1.0.zip 54772 BLAKE2B aadc312df948555700c896aca003e58f5220f447cfb8968a6e2822ffd3bb615ea63c2b9052064eb493a7f8e8485e59176e02fd95f29c38e3534011fddc501285 SHA512 b0d1fee8ad5fd89cb3f0f3296de09bd004de9df6224fbb87acdfcdcf6584f8493a1525baa24fcb7413bb89da772447d03903e6924553e9ed9a17c1812e2d0add -DIST gopkg.in%2Fmgo.v2%2F@v%2Fv2.0.0-20180705113604-9856a29383ce.mod 23 BLAKE2B 43e4570f039747c5b2ecef5c736a4316d8517a202a587de55165960ba41b79431b8f1d3544b02581c224c5cffaf13e2ddefca0b67e14b9227ab136f285a183d0 SHA512 28d79dd9430ce03c7f67d3c798b1dff21019fb5fe588cffa5003fcad5fc1fe5d7c19c8bd7fd4f132acd59f6c24df7aefd4f1b72eb5b7cd45f2d11302f1560c36 -DIST gopkg.in%2Fmgo.v2%2F@v%2Fv2.0.0-20180705113604-9856a29383ce.zip 443061 BLAKE2B 941f1f0624e07b437d116670d78d191e3dbb40d6cbb06fc82154bf443f45d08f25df9ba07d47d3e18421d3ad35869c632ac2a574ce2a0dd329966c30e4748905 SHA512 28be6fa763c30ccf1b347fddc11057943667554c3a69ded8a8e5c58c02db49d14a5d54bd240b7dccbaac4d4c8ef74ebd372cf67c5ee3212565be54ad6a3f5d27 -DIST gopkg.in%2Folivere%2Felastic.v5%2F@v%2Fv5.0.70.mod 35 BLAKE2B 60e9ee95d6e9be318c4fe8f0759818566a0fead879c0dc0bb2266d7580984e945925393272401aa7d81987fdc31f454504d2c9bd75cc63bdf003a038767432f3 SHA512 f176deef5893ed6b0dfff847a35e077b8941b9139c0cb68a71ad27faf1f76fbedbb763f161ad3617ceafc610c9f1798076511fbf5699b7066ec21fcba397747f -DIST gopkg.in%2Folivere%2Felastic.v5%2F@v%2Fv5.0.70.zip 597866 BLAKE2B 6adc9a49a8aac36b23745023f446bad36cabd4953038e21588f13e518a9028c4d12bb9440347b206b6b35f2d7e1d16d887575d201cdb8531601b5a235f9369b3 SHA512 a973b73c16e90f4db7ffdcbbb198b6e3da85c037729047391a0591ead8f6657e84ee55d91cc5ae022a91fb500fbfd24fc543aaf9b6d57d95d08b7d9c6c26c318 -DIST gopkg.in%2Ftomb.v1%2F@v%2Fv1.0.0-20140529071818-c131134a1947.mod 24 BLAKE2B 24a0c476e6590543f1b46175c4f0e036498afd9af616f6e204cac280e61cc10454e0c2a54fe10b9a7a306715ab966a5822ad78626c6cf20c2c78aac02598c922 SHA512 b147b03cabc4666519b94f4d9c7d9fefdea45810e3e35a9b3d303dba491d486fe03c0d5969a6186adbb9c75665e4f3e9811c7bf4ce72c46280b053611c198c41 -DIST gopkg.in%2Ftomb.v1%2F@v%2Fv1.0.0-20141024135613-dd632973f1e7.mod 24 BLAKE2B 24a0c476e6590543f1b46175c4f0e036498afd9af616f6e204cac280e61cc10454e0c2a54fe10b9a7a306715ab966a5822ad78626c6cf20c2c78aac02598c922 SHA512 b147b03cabc4666519b94f4d9c7d9fefdea45810e3e35a9b3d303dba491d486fe03c0d5969a6186adbb9c75665e4f3e9811c7bf4ce72c46280b053611c198c41 -DIST gopkg.in%2Ftomb.v1%2F@v%2Fv1.0.0-20141024135613-dd632973f1e7.zip 5099 BLAKE2B 56a68e317ccf9e6b0912331e7006742c3bfffd087742293b3d48ca7069c707db57b3722179c76b8c724303c8d58ac9ebf847c4277ed38a59e1510c676ebc941c SHA512 658ebdf931b23afe9d9d5d33d6c910fba7cf37740efe7052ba7627199c1a5fa4f93f093796674e341109430ba1f1b5ea933ea4a32356f63eaf337f05a562004a -DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.1.mod 95 BLAKE2B adb3684980f1d8e6c23444e91028f8db55f1bc496114eb3508dbecf9917dbc8a0a4bed7c0d761123335a75b9ffe727e180f2d6aa5f84312edb05a798185c8362 SHA512 916ff67ddb6c2ba39905db4277ce42596d9ca5a42f8aa7f47f16335e78d91a1b30419fd1b7b6967b37e248363397ec527b38d2f500b3546edda5d2bce1944379 -DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.mod 95 BLAKE2B adb3684980f1d8e6c23444e91028f8db55f1bc496114eb3508dbecf9917dbc8a0a4bed7c0d761123335a75b9ffe727e180f2d6aa5f84312edb05a798185c8362 SHA512 916ff67ddb6c2ba39905db4277ce42596d9ca5a42f8aa7f47f16335e78d91a1b30419fd1b7b6967b37e248363397ec527b38d2f500b3546edda5d2bce1944379 -DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.4.mod 95 BLAKE2B adb3684980f1d8e6c23444e91028f8db55f1bc496114eb3508dbecf9917dbc8a0a4bed7c0d761123335a75b9ffe727e180f2d6aa5f84312edb05a798185c8362 SHA512 916ff67ddb6c2ba39905db4277ce42596d9ca5a42f8aa7f47f16335e78d91a1b30419fd1b7b6967b37e248363397ec527b38d2f500b3546edda5d2bce1944379 -DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.4.zip 80160 BLAKE2B 7c19bcfee1136e9afaa54bb36a296e48c276e21517eead613313409f3ff85f4a961c1dca7926d3c4fd51feb0f537a85de905294d2a310276bb8177f27f3776c3 SHA512 a8fa21d2f84f8c6f28250e9ec7d678ae160963eaa0a373f345fe67804925b2647239a6117ad6f253f458f34ec9f62bc21e8f2071fc9dfe76dbd2a7ded1e1a0e0 -DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.5.mod 95 BLAKE2B adb3684980f1d8e6c23444e91028f8db55f1bc496114eb3508dbecf9917dbc8a0a4bed7c0d761123335a75b9ffe727e180f2d6aa5f84312edb05a798185c8362 SHA512 916ff67ddb6c2ba39905db4277ce42596d9ca5a42f8aa7f47f16335e78d91a1b30419fd1b7b6967b37e248363397ec527b38d2f500b3546edda5d2bce1944379 -DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.5.zip 80253 BLAKE2B 175e08dfe0913765b5a913c23cf2803dbbdfa007430caaaa5a8e46cd9df8e1c48e3b84ffe248800422b963ad2d5db8031c86df926cc6f413b0ce05fa21326113 SHA512 371da5f4c32800cadd40127a78d4ae29918f4477ca87e42c414bdb7adfb9e9ab22e5f22e821d76f543204b0be8b9297dfe1b4e20814ab8015088492309676e0a -DIST gotest.tools%2F@v%2Fv2.2.0+incompatible.mod 20 BLAKE2B 25d11078b1caa5a705f3ae32f28d155683dfe0109d96531b1fc20e632acdc2f8429395975e6509f5dc78bc042b5e70e90fa2daa9790c39eb3422cbc189fb21af SHA512 5a73bc54777766425ba833348d2986408baedcaff86acf1648384bbcb31e302b0b0de38e1a92d53083551e35c62f375262497c0d5a37c9fb39824ae68fe8113e -DIST gotest.tools%2F@v%2Fv2.2.0+incompatible.zip 88327 BLAKE2B 8730134244a00fb47b24b347ee4758fac8c11e3f627788c03d6568af129acb5b911b08857ab77a619bf571986ee90dd1c6c6aa12fd8e6e26d395a64bb7513a8b SHA512 66a13fedc358399644b869ac4b39a295c6c15d642e074ec66ff042e1b109f9603bc941ff25aaf7d9bc700f6c2fb1f60bf2a637a471e26ae037d822f0f1e2c518 -DIST honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20180728063816-88497007e858.mod 26 BLAKE2B db6cc87a17bed88b955e6b36a17568930239c94a969211b02c2d5acc70386fbea63ac44365a0d3241e900125bd64644d698d8f1bdcabc3e6cf99c47259c63df5 SHA512 d00ae74b24e7fb3ff351ff68b88e59636153bbcf92b36e81e91556e3e75a7ccfb08ce471f757f92fd7612378944de3d7309c73923812e2df6a26b74e999ca9ce -DIST honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190102054323-c2f93a96b099.mod 26 BLAKE2B db6cc87a17bed88b955e6b36a17568930239c94a969211b02c2d5acc70386fbea63ac44365a0d3241e900125bd64644d698d8f1bdcabc3e6cf99c47259c63df5 SHA512 d00ae74b24e7fb3ff351ff68b88e59636153bbcf92b36e81e91556e3e75a7ccfb08ce471f757f92fd7612378944de3d7309c73923812e2df6a26b74e999ca9ce -DIST honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190106161140-3f1c8253044a.mod 26 BLAKE2B db6cc87a17bed88b955e6b36a17568930239c94a969211b02c2d5acc70386fbea63ac44365a0d3241e900125bd64644d698d8f1bdcabc3e6cf99c47259c63df5 SHA512 d00ae74b24e7fb3ff351ff68b88e59636153bbcf92b36e81e91556e3e75a7ccfb08ce471f757f92fd7612378944de3d7309c73923812e2df6a26b74e999ca9ce -DIST honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190418001031-e561f6794a2a.mod 26 BLAKE2B db6cc87a17bed88b955e6b36a17568930239c94a969211b02c2d5acc70386fbea63ac44365a0d3241e900125bd64644d698d8f1bdcabc3e6cf99c47259c63df5 SHA512 d00ae74b24e7fb3ff351ff68b88e59636153bbcf92b36e81e91556e3e75a7ccfb08ce471f757f92fd7612378944de3d7309c73923812e2df6a26b74e999ca9ce -DIST honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190523083050-ea95bdfd59fc.mod 26 BLAKE2B db6cc87a17bed88b955e6b36a17568930239c94a969211b02c2d5acc70386fbea63ac44365a0d3241e900125bd64644d698d8f1bdcabc3e6cf99c47259c63df5 SHA512 d00ae74b24e7fb3ff351ff68b88e59636153bbcf92b36e81e91556e3e75a7ccfb08ce471f757f92fd7612378944de3d7309c73923812e2df6a26b74e999ca9ce -DIST honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2019.2.3.mod 300 BLAKE2B 3e3f5a2be0918cbaacd5e43e59fcc6c7c6999645f0c9214cd5a522c31d34b6d3dad61e3ddae8ccdb2f3f0d90b406c047802ee3d9d54dc40fe6eff9cd35620792 SHA512 0c8aa788d0c03d6d049f0dd7468d0f81ce2131ccedd5a5a3a18362b7d30eef7ef325277844eefe4b707b1ad71c6f83a44e110b7af7b98e05406d347237a7bafb -DIST honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2020.1.3.mod 300 BLAKE2B 3aa707c72ce7e402cc1765fed30253eb87e9e87aecc8096130e973623f53ded2a7572ca3d464e4db9de524cd651b3aa8fbc9fa0ef6bdc4eb9670b4d8652f4dfc SHA512 d814675e448688f6a506397bedb262fb2583c913ec1f8ca9ffc11206bdcd7e1f4ee3c561aee366eb2cdaede8c522a6f58f116236f3033bc7e91ec139bdd140f9 -DIST honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2020.1.3.zip 559809 BLAKE2B 55392e0d6cdb68f21348ef9c86b46797aedc94f8a47d7d7611be4fe489c1fca867ac184d1382480ce4a873cd5c435cf21825418bb3153420bd6f38157c332ae1 SHA512 64e810b40c1f64117074791cdab1dea4f282fb0a47df1cf82c6e26eae38bb893c9241119024d004b00dcb05d485bd5536f6ca90aee13200631c09da5c819c1c3 -DIST k8s.io%2Fapimachinery%2F@v%2Fv0.17.1.mod 1618 BLAKE2B 3adab28947dc91814453d8ad3929935f8e863ddcb272266e30a55bce506b05e361eb621e1227a420f90c6b6a58fb0da3c528d524d10a912ee7d75f7b6ea42ce7 SHA512 53c488b7ffbc76d32f905b0dd92577c9a9b9d5c30b810e09ecf2242cb3fec1033a71aef4bbcc53bcf4d4096d0cfa3069acbe49c40c7548553a0ae7b0af4d8ef4 -DIST k8s.io%2Fapimachinery%2F@v%2Fv0.17.1.zip 779247 BLAKE2B 359f742c0b48557c840df06ffafe5b993e171864e8195e963b9a29dba843e9d44ab96179b96f248d3a96204cc010b83058c2faf57f2bdd45d6c5ba0ffbd20331 SHA512 3fad25a3c0287797e3c7cae6b6e2ab59664839b29a802efcce74ab10846a822c3de961df083b62fa03edec5e25028f7503dda054cd2d208e8239c26c094a1ca6 -DIST k8s.io%2Fgengo%2F@v%2Fv0.0.0-20190128074634-0689ccc1d7d6.mod 20 BLAKE2B ccdc31e151abf5dd6ff0453cb723ffae550c67c154d9de14cc2aaac1efac32063e57a1092e4341db6cbc6f58f639e3b34734859052ae76f21ce92af3ef61ffa4 SHA512 854a60e4fe9dec8121b68fa3102f977ad14264ed89bce9a6860117e80a3830a58565be00260da435f40452b28c6445fd191c90ca5134afea49458d676da49b07 -DIST k8s.io%2Fklog%2F@v%2Fv0.0.0-20181102134211-b9b56d5dfc92.mod 19 BLAKE2B 2af8f84f1cc7227be731c55dbe33e87e9d4fbba134ae86b6a86bac30260f32c7f17422789189486b17e1a2b84cfdca35984dd6d6079aab621620e90da230a6ac SHA512 cd5afa0488338a1b22bb852219078d74d61f894fd075b60b22bf062dbc49ad16c1088ab55bc8ae72aeadb4f7fb9534b99adceeaf3913e47bbf00df1ead1c7aaf -DIST k8s.io%2Fklog%2F@v%2Fv1.0.0.mod 68 BLAKE2B f745a62a974a42d1692705de032c8c651477ec71f32b0515adc02360e5a3de6c7d65f5d97960e78da06e99b0843c312a09701c08c6a5c112af832e3cd2e43649 SHA512 cfee3f10c26fafe7cbc510ff8cba479dfacedf1d95b4e25b75978656862067524b4b9f5e889455f2d74eacf07df7895fe266415a05b9502a759baf2e4bd3884a -DIST k8s.io%2Fklog%2F@v%2Fv1.0.0.zip 39827 BLAKE2B 441907426e07ed46aeeb6314c615fceedd43bf1b21b07a31960b23e1cf31dc400f1d7f0304cd5c13db8c2d54aaec47d05425798508978cb25c7d05aa3fcf2fa4 SHA512 b28b559a8a6e46b206ac005497d2e061645a81a3dc4b4f2c2a9f84065aae024dfbe7c64e9a446f72f7f88b5dea31d0ee725b273fb79877e24fb27906e1500c2b -DIST k8s.io%2Fkube-openapi%2F@v%2Fv0.0.0-20191107075043-30be4d16710a.mod 2088 BLAKE2B 407e0a8a7b3fdf35034c02c9a2b22a1dcb43347d3ce85b89088b04884d49a3a24eeb80a20263699bbce415707462375a420c92fd458016ea151884ac8d2da151 SHA512 b0969627b58ab34c898af158e1dceb5427a621c39c563537ac547c2213cd7034a5eb152840e359821d152bdb47b32426264bb3b86cf64cc1359191a943712340 -DIST rsc.io%2Fbinaryregexp%2F@v%2Fv0.2.0.mod 36 BLAKE2B 61110bed2b9e99e0250cf6e8b842257202c89b3462edf9368b73cab29f9dbd4dcc66c3e290a1d6329b7d62321eecc52082a8c4c0797eac743a29a8a00910a93f SHA512 db50ff677b0bdccbc1a1ad3df7c5cc76f2fcccf3ab99d08d1c2868440eb9b893fe89452f4286f7d42f2f16abf0f4acda67fe86e174dcfa730a743aafcc166774 -DIST rsc.io%2Fpdf%2F@v%2Fv0.1.1.mod 18 BLAKE2B 02f32b5a77e5009f179cf1fdc9acbb977fe219698f19ef41acee8129e0de7ad93b0b39ce82ac1538c82a7cdd33776e270f0acec114716c791727b021a4d3e147 SHA512 f911a889614d9177295952c82f8b4a0942fcbb7b4fca7378c0b98a63ed0e37e1319d51905f906ad08144eb0f3f829a2ccc2af04c2147e60cc2ac1ea8d7dab16f -DIST rsc.io%2Fquote%2Fv3%2F@v%2Fv3.1.0.mod 55 BLAKE2B f1f0ba35f0ffd200ed37c06b2025c1fd436e3fd857bd525b9295c0cbcade7e1f037e3f566124a7ef428384d50525426f0d40468c967e39bac6057174710e2566 SHA512 e6357ddd7d09692c60e59e6cb80469ade8284052cdd3ea520ec4dbcb42c1cabe045c599e43cce94bec022bd82e87a554ecac42f8c917cf2ff44daff9c1a147d5 -DIST rsc.io%2Fsampler%2F@v%2Fv1.3.0.mod 88 BLAKE2B c2ac3c9619e396db470c9951dfc11cdacccd56ae09b3b353015ee7e5fbb023df288dbf48d81b44c309241d1ea89a2e0ee42ee1d17e536fcfa531aaee0e651ab7 SHA512 2137507eb25fbae419605e0cd6bca4cfa584110eebc276cd759a4dcb6f97e52928e5b2d9b276e76bcabcec3bbfc2c42f97fa29f54695d27fb00f9423e1638863 -DIST sigs.k8s.io%2Fstructured-merge-diff%2F@v%2Fv0.0.0-20190525122527-15d366b2352e.mod 74 BLAKE2B c2d88e59e640cf540f7547fa0b67caeecd7424a1dc243681a020d233fab5126dc11f73c18032e0eb8edc7bf9d32dc2902183bf76af255f60f186f16c97055e2d SHA512 94785a6d41763ef86959d6ba291cfb34eb7b35f6599042299604fe6f35a666fa388e9d7bcac282d1370dcc5f99c6ac22f2b677ff9b9920aae8f0d9097ea224c5 -DIST sigs.k8s.io%2Fyaml%2F@v%2Fv1.1.0.mod 24 BLAKE2B d33080dbc62b185d029eb43f75d66328dbfa7c463a3117b3efd5419ab8e1e52cc6f5d5a288d553421025c785ec6948b3aa68588cae19bd325f6acc0d043bb5fb SHA512 78f6402daccb04510f4ef35ee457ee13e4f447fba8e6aa33b4d32aa666e925861bf3b3f22c5ba9573871ec7e830f99e4caae0969724a54eadf40e6a7ed7931a0 -DIST telegraf-1.10.4-vendor.tar.gz 69744868 BLAKE2B 97123bb14b89d28519c73426491189a9245450c72bd59e6745a76c61730a730cd5b2c59c7f205c0dfd058b3d5fce4d331a3e39ecc1a5da1ac439c8946e634fab SHA512 53f5bc9fc60ccae3a9549ab38cb4b558a331524351b70b83deb483090a45edf8868856c1311893d9d8e091e649769ccb580bb32cc46a16da1deb8390704a6c84 -DIST telegraf-1.10.4.tar.gz 1372505 BLAKE2B f3064cd71b1b6f9a8aae8e5425813386bd6d4e4f06c2e95f35c09d055aef6b811867bb1fe1724e88311f82e8214a1c7ae23a0b5ab8461cfa6b0adebe3b86cb28 SHA512 7e6c27bb5b94382f00f48ce98906f7e505abe734b47e29c2c07f245c2c5c12c522eb3f59be2773bfea78316b7b808d0d425d07fa7c247af7cd280a041759cc34 -DIST telegraf-1.11.5-vendor.tar.gz 70214304 BLAKE2B 64cfaa9f207835e043f5df002d140d572a95dc58b9310c860fc682f8cc3a02c77f8d2035576d296d89c3da30ebca2e6e3ce27b514419a60d6a82f3b9645bae3a SHA512 00e143110126c18bbe45ad0b14e6e688030c3f15366ae0e59ac157b49090644cbf96a4b95fa46eaa3fbbd1eb68c09c3747172585a42f65876e0d78a505b07363 -DIST telegraf-1.11.5.tar.gz 1471311 BLAKE2B 7c5b7c2b835ee8c943baf01bb3515fb724b10b04682254e0fd501c7f066fe67a4ef18c0d3442b676448ccb8cd0430099e56ad0cc3970eee3f9d80d540271f4df SHA512 1e6001981693e4612ba34a680f1c3349c2f203d8ba2983f3841fad08b68251a942beef6cc462cb64b95eba1412ea6a35a863ff9426270896c50c83e6f177ca5d -DIST telegraf-1.12.1-vendor.tar.gz 128021524 BLAKE2B f4db3e4d2998959c850a82ea77c1c02c5195e6bd5eef4d55521bbaa0e3355b21554e1a179585d57d8fce1fd061d8f157fddb2dde5091c15062811902c014b835 SHA512 2a501d9456a3a130a4202e87e2c0b44c9b2d5fefca12601f0a3fea6073c97fb7b40dd86546fe291b740b38ecf57843fff18a6f4280482af915b3be9e7270b597 -DIST telegraf-1.12.1.tar.gz 1561005 BLAKE2B 997e3deddc13acb6c0af41d5f622353facfd1c09e76640965c8ebe447e06a7cf5bb25753b8c67b2c7c1af7c3d50f787acc23e5b5a45253db943031a130c33d39 SHA512 8018d48482ec1cdada9d57bb6b8068a0758d58908a4c88deb089645282fde662191bd356e0081178b0e7bc1be6bb19cb2c29bba0039398b7d64f53de9fbf87d6 -DIST telegraf-1.13.3-vendor.tar.gz 142151740 BLAKE2B 9068835a6b75721732998ed50f23a6e6e90d92eee32c3ff1bb07fb19942e6f808289b459b34a6b83920c323c00063a91d2bb2e38d457a7a512b43715bc7d7dc0 SHA512 db56f4ecf1802a21405ae7db80281b5155b6f4922dd8e49aa48b554ff3bf179810fae3de3f6ea0e6ee661683e0e9f0536919fd912ea3de827f7c85aa314fff36 -DIST telegraf-1.13.3.tar.gz 1640358 BLAKE2B eda968676b42ddfd1f447326463feaabe0860425ea1688ccf19a248f652ec4828c5cae1c302a7129a62a6557eb2c0a206476bfc7082a89d4bffcd3113bad0e81 SHA512 ac71f054ffccf5f1d27db6e68989a2440b975087f91cce487b58df2bd6984378d86fb992f7a7f11aabf7b20937258d05893b74fb5d6f83a8db8449e80cf1d2fd -DIST telegraf-1.14.5.tar.gz 1754310 BLAKE2B c1c09712e0c5731019e9ea1a5ddb0d2300acb0d334e2ecb0804b7d94c7ee3fbd23f1c0a6c7a0c863ca7eb78f7f9d150f9918dd990c0b27f2dca97fb82517ce12 SHA512 4edd3c852d4091a1a4bc93983bc99164384b2722860ff256cf9c560242d68221fc5f7b253e58ed7a2383ce4343ddac236e586da00927dc6b5bab0bf1124837a2 -DIST telegraf-1.15.2.tar.gz 1874762 BLAKE2B 13ee4ce3fb20fb5b86fdeb6666ae41571053e2c9847e305f11969e29a19e429ae6a7c8331977c2da14b134989fb9dec9d54384526d1d154883aaee8ea8df3ec7 SHA512 96f344573af5c5a575e56895bffa70e9701278d9e32f5ba63b39e7a0153d1a7d9e9ab9f304e9db872b029dcd137ed199ba42757c6f365823955cc2cb04e154d9 +DIST telegraf-1.18.3-deps.tar.xz 430779112 BLAKE2B c9e7f815e6e4070632b0edb2a53a65b9402828a39ee680c43a40dac0145423b45d1319f34faa8e9c1412f0cfb60ea90008b8bc98f9c3213de054897547a8e53c SHA512 2e9ad5110931a38195bf9b3e2f51684904ba86aa59f3e5acb87763c2260368f0456a122024607a58445df6ba26406206df0cbdcf1d297638e3b66f976830f3c8 +DIST telegraf-1.18.3.tar.gz 2647798 BLAKE2B 82556544d6a3e1f349c711a4964d842fbe245bef6f1801eefa4e52071410a77bd6ae9da33682966eaac2fda2d5ac3afb100de03ac5a0fa9ec4185524d15e68fc SHA512 e9e7aaf408aed62bebf2812db1f2ea6e0d744c30d53e03a5c203e79673871971121024ee4c57d3a919d31dbc83bbad3ffdece55ca2d94c62976329a0195d3b03 +DIST telegraf-1.26.3-deps.tar.xz 598542112 BLAKE2B 654e2543b79927409a7f51a3b13ca5d917ef35559351ee48a581b0699ec4fe1eece9f8a3278243b02c79e17b08557d6f3d23584050cdaf461077c61f3435743c SHA512 8afdec12df3105678fad3272d80ab86438546a7de5190b01cbb0bffc3443deb6f4fd9540432c3b6e06dbfbc0739167daf15934248dea73bd59b5b2376fe4b5d2 +DIST telegraf-1.26.3.tar.gz 3893039 BLAKE2B 4285416c2e2a6e63dfbb3261cb5ef90c5fc0d2752e78913a2d8cd59a45b990e9735d65e9c762188325cf5696ac6fb619ff1d88f0b0017445fe3039d56c488b27 SHA512 c153d7eb19319d669328a94eade041ecaa6a30cc180915ca2b51b67c2d1d2e98572573c8970b78f815e74dec814ea9c02f4170aff1021fcb9e97c8974a0d0d6e diff --git a/net-analyzer/telegraf/metadata.xml b/net-analyzer/telegraf/metadata.xml index c36c37139fad..894d232badaa 100644 --- a/net-analyzer/telegraf/metadata.xml +++ b/net-analyzer/telegraf/metadata.xml @@ -1,8 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> <email>williamh@gentoo.org</email> <name>William Hubbs</name> </maintainer> + <upstream> + <remote-id type="github">influxdata/telegraf</remote-id> + </upstream> </pkgmetadata> diff --git a/net-analyzer/telegraf/telegraf-1.10.4.ebuild b/net-analyzer/telegraf/telegraf-1.10.4.ebuild deleted file mode 100644 index ed1cb6058ca1..000000000000 --- a/net-analyzer/telegraf/telegraf-1.10.4.ebuild +++ /dev/null @@ -1,61 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -EGO_PN=github.com/influxdata/telegraf - -inherit systemd user - -MY_PV="${PV/_rc/-rc.}" -COMMIT=3548ce47 -DESCRIPTION="The plugin-driven server agent for collecting & reporting metrics." -HOMEPAGE="https://github.com/influxdata/telegraf" -VENDOR_URI="https://dev.gentoo.org/~williamh/dist/${P}-vendor.tar.gz" -SRC_URI="https://github.com/influxdata/telegraf/archive/${MY_PV}.tar.gz -> ${P}.tar.gz - ${VENDOR_URI}" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64" - -RESTRICT="strip" - -DEPEND="dev-lang/go" - -pkg_setup() { - enewgroup telegraf - enewuser telegraf -1 -1 -1 telegraf -} - -src_prepare() { - default - ln -s ../vendor -} - -src_compile() { - echo module ${EGO_PN} > go.mod - set -- env GO111MODULE=on go build -mod vendor -v -x -o telegraf \ - -ldflags="-X main.commit=${COMMIT} -X main.version=${PV}" \ - cmd/telegraf/telegraf.go - echo "$@" - "$@" || die -} - -src_install() { - dobin telegraf - insinto /etc/telegraf - doins etc/telegraf.conf - keepdir /etc/telegraf/telegraf.d - - insinto /etc/logrotate.d - doins etc/logrotate.d/telegraf - -systemd_dounit scripts/telegraf.service - newconfd "${FILESDIR}"/telegraf.confd telegraf - newinitd "${FILESDIR}"/telegraf.rc telegraf - - dodoc -r docs/* - - keepdir /var/log/telegraf - fowners telegraf:telegraf /var/log/telegraf -} diff --git a/net-analyzer/telegraf/telegraf-1.11.5.ebuild b/net-analyzer/telegraf/telegraf-1.11.5.ebuild deleted file mode 100644 index b7f0834d1562..000000000000 --- a/net-analyzer/telegraf/telegraf-1.11.5.ebuild +++ /dev/null @@ -1,60 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -EGO_PN=github.com/influxdata/telegraf - -inherit systemd user - -MY_PV="${PV/_rc/-rc.}" -COMMIT=0ea49ea9 -DESCRIPTION="The plugin-driven server agent for collecting & reporting metrics." -HOMEPAGE="https://github.com/influxdata/telegraf" -SRC_URI="https://github.com/influxdata/telegraf/archive/${MY_PV}.tar.gz -> ${P}.tar.gz - https://dev.gentoo.org/~williamh/dist/${P}-vendor.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64" - -RESTRICT="strip" - -DEPEND="dev-lang/go" - -pkg_setup() { - enewgroup telegraf - enewuser telegraf -1 -1 -1 telegraf -} - -src_prepare() { - default - mv ../vendor . -} - -src_compile() { - echo module ${EGO_PN} > go.mod - set -- env GO111MODULE=on go build -mod vendor -v -x -o telegraf \ - -ldflags="-X main.commit=${COMMIT} -X main.version=${PV}" \ - cmd/telegraf/telegraf.go - echo "$@" - "$@" || die -} - -src_install() { - dobin telegraf - insinto /etc/telegraf - doins etc/telegraf.conf - keepdir /etc/telegraf/telegraf.d - - insinto /etc/logrotate.d - doins etc/logrotate.d/telegraf - -systemd_dounit scripts/telegraf.service - newconfd "${FILESDIR}"/telegraf.confd telegraf - newinitd "${FILESDIR}"/telegraf.rc telegraf - - dodoc -r docs/* - - keepdir /var/log/telegraf - fowners telegraf:telegraf /var/log/telegraf -} diff --git a/net-analyzer/telegraf/telegraf-1.12.1.ebuild b/net-analyzer/telegraf/telegraf-1.12.1.ebuild deleted file mode 100644 index 2a16e0960f79..000000000000 --- a/net-analyzer/telegraf/telegraf-1.12.1.ebuild +++ /dev/null @@ -1,60 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -EGO_PN=github.com/influxdata/telegraf - -inherit systemd user - -MY_PV="${PV/_rc/-rc.}" -COMMIT=8de41160 -DESCRIPTION="The plugin-driven server agent for collecting & reporting metrics." -HOMEPAGE="https://github.com/influxdata/telegraf" -SRC_URI="https://github.com/influxdata/telegraf/archive/${MY_PV}.tar.gz -> ${P}.tar.gz - https://dev.gentoo.org/~williamh/dist/${P}-vendor.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64" - -RESTRICT="strip" - -DEPEND="dev-lang/go" - -pkg_setup() { - enewgroup telegraf - enewuser telegraf -1 -1 -1 telegraf -} - -src_prepare() { - default - mv ../vendor . -} - -src_compile() { - echo module ${EGO_PN} > go.mod - set -- env GO111MODULE=on go build -mod vendor -v -x -o telegraf \ - -ldflags="-X main.commit=${COMMIT} -X main.version=${PV}" \ - cmd/telegraf/telegraf.go - echo "$@" - "$@" || die -} - -src_install() { - dobin telegraf - insinto /etc/telegraf - doins etc/telegraf.conf - keepdir /etc/telegraf/telegraf.d - - insinto /etc/logrotate.d - doins etc/logrotate.d/telegraf - -systemd_dounit scripts/telegraf.service - newconfd "${FILESDIR}"/telegraf.confd telegraf - newinitd "${FILESDIR}"/telegraf.rc telegraf - - dodoc -r docs/* - - keepdir /var/log/telegraf - fowners telegraf:telegraf /var/log/telegraf -} diff --git a/net-analyzer/telegraf/telegraf-1.13.3.ebuild b/net-analyzer/telegraf/telegraf-1.13.3.ebuild deleted file mode 100644 index 264ae05a70d3..000000000000 --- a/net-analyzer/telegraf/telegraf-1.13.3.ebuild +++ /dev/null @@ -1,59 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -EGO_PN=github.com/influxdata/telegraf - -inherit systemd - -MY_PV="${PV/_rc/-rc.}" -COMMIT=da364558 - -DESCRIPTION="The plugin-driven server agent for collecting & reporting metrics." -HOMEPAGE="https://github.com/influxdata/telegraf" -SRC_URI="https://github.com/influxdata/telegraf/archive/${MY_PV}.tar.gz -> ${P}.tar.gz - https://dev.gentoo.org/~williamh/dist/${P}-vendor.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64" - -RESTRICT="strip" - -BDEPEND="dev-lang/go" -DEPEND="acct-group/telegraf - acct-user/telegraf" - RDEPEND="${DEPEND}" - -src_prepare() { - default - mv ../vendor . -} - -src_compile() { - echo module ${EGO_PN} > go.mod - set -- env GO111MODULE=on go build -mod vendor -v -x -o telegraf \ - -ldflags="-X main.commit=${COMMIT} -X main.version=${PV}" \ - cmd/telegraf/telegraf.go - echo "$@" - "$@" || die -} - -src_install() { - dobin telegraf - insinto /etc/telegraf - doins etc/telegraf.conf - keepdir /etc/telegraf/telegraf.d - - insinto /etc/logrotate.d - doins etc/logrotate.d/telegraf - -systemd_dounit scripts/telegraf.service - newconfd "${FILESDIR}"/telegraf.confd telegraf - newinitd "${FILESDIR}"/telegraf.rc telegraf - - dodoc -r docs/* - - keepdir /var/log/telegraf - fowners telegraf:telegraf /var/log/telegraf -} diff --git a/net-analyzer/telegraf/telegraf-1.14.5.ebuild b/net-analyzer/telegraf/telegraf-1.14.5.ebuild deleted file mode 100644 index edbb0ca26a78..000000000000 --- a/net-analyzer/telegraf/telegraf-1.14.5.ebuild +++ /dev/null @@ -1,940 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit go-module systemd -MY_PV="${PV/_rc/-rc.}" -COMMIT=e77ce3d1 -BRANCH=release-1.14 -VERSION=v${MY_PV} - -DESCRIPTION="The plugin-driven server agent for collecting & reporting metrics." -HOMEPAGE="https://github.com/influxdata/telegraf" - -EGO_SUM=( - "cloud.google.com/go v0.26.0/go.mod" - "cloud.google.com/go v0.34.0/go.mod" - "cloud.google.com/go v0.37.4" - "cloud.google.com/go v0.37.4/go.mod" - "cloud.google.com/go v0.38.0/go.mod" - "cloud.google.com/go v0.44.1/go.mod" - "cloud.google.com/go v0.44.2/go.mod" - "cloud.google.com/go v0.45.1/go.mod" - "cloud.google.com/go v0.46.3/go.mod" - "cloud.google.com/go v0.50.0/go.mod" - "cloud.google.com/go v0.52.0/go.mod" - "cloud.google.com/go v0.53.0" - "cloud.google.com/go v0.53.0/go.mod" - "cloud.google.com/go/bigquery v1.0.1/go.mod" - "cloud.google.com/go/bigquery v1.3.0/go.mod" - "cloud.google.com/go/bigquery v1.4.0" - "cloud.google.com/go/bigquery v1.4.0/go.mod" - "cloud.google.com/go/datastore v1.0.0/go.mod" - "cloud.google.com/go/datastore v1.1.0" - "cloud.google.com/go/datastore v1.1.0/go.mod" - "cloud.google.com/go/pubsub v1.0.1/go.mod" - "cloud.google.com/go/pubsub v1.1.0/go.mod" - "cloud.google.com/go/pubsub v1.2.0" - "cloud.google.com/go/pubsub v1.2.0/go.mod" - "cloud.google.com/go/storage v1.0.0/go.mod" - "cloud.google.com/go/storage v1.5.0" - "cloud.google.com/go/storage v1.5.0/go.mod" - "code.cloudfoundry.org/clock v1.0.0" - "code.cloudfoundry.org/clock v1.0.0/go.mod" - "collectd.org v0.3.0" - "collectd.org v0.3.0/go.mod" - "dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod" - "github.com/Azure/azure-amqp-common-go/v3 v3.0.0" - "github.com/Azure/azure-amqp-common-go/v3 v3.0.0/go.mod" - "github.com/Azure/azure-event-hubs-go/v3 v3.2.0" - "github.com/Azure/azure-event-hubs-go/v3 v3.2.0/go.mod" - "github.com/Azure/azure-pipeline-go v0.1.8/go.mod" - "github.com/Azure/azure-pipeline-go v0.1.9" - "github.com/Azure/azure-pipeline-go v0.1.9/go.mod" - "github.com/Azure/azure-sdk-for-go v37.1.0+incompatible" - "github.com/Azure/azure-sdk-for-go v37.1.0+incompatible/go.mod" - "github.com/Azure/azure-storage-blob-go v0.6.0/go.mod" - "github.com/Azure/azure-storage-queue-go v0.0.0-20181215014128-6ed74e755687" - "github.com/Azure/azure-storage-queue-go v0.0.0-20181215014128-6ed74e755687/go.mod" - "github.com/Azure/go-amqp v0.12.6" - "github.com/Azure/go-amqp v0.12.6/go.mod" - "github.com/Azure/go-autorest/autorest v0.9.0/go.mod" - "github.com/Azure/go-autorest/autorest v0.9.3" - "github.com/Azure/go-autorest/autorest v0.9.3/go.mod" - "github.com/Azure/go-autorest/autorest/adal v0.5.0/go.mod" - "github.com/Azure/go-autorest/autorest/adal v0.8.0/go.mod" - "github.com/Azure/go-autorest/autorest/adal v0.8.1" - "github.com/Azure/go-autorest/autorest/adal v0.8.1/go.mod" - "github.com/Azure/go-autorest/autorest/azure/auth v0.4.2" - "github.com/Azure/go-autorest/autorest/azure/auth v0.4.2/go.mod" - "github.com/Azure/go-autorest/autorest/azure/cli v0.3.1" - "github.com/Azure/go-autorest/autorest/azure/cli v0.3.1/go.mod" - "github.com/Azure/go-autorest/autorest/date v0.1.0/go.mod" - "github.com/Azure/go-autorest/autorest/date v0.2.0" - "github.com/Azure/go-autorest/autorest/date v0.2.0/go.mod" - "github.com/Azure/go-autorest/autorest/mocks v0.1.0/go.mod" - "github.com/Azure/go-autorest/autorest/mocks v0.2.0/go.mod" - "github.com/Azure/go-autorest/autorest/mocks v0.3.0" - "github.com/Azure/go-autorest/autorest/mocks v0.3.0/go.mod" - "github.com/Azure/go-autorest/autorest/to v0.3.0" - "github.com/Azure/go-autorest/autorest/to v0.3.0/go.mod" - "github.com/Azure/go-autorest/autorest/validation v0.2.0" - "github.com/Azure/go-autorest/autorest/validation v0.2.0/go.mod" - "github.com/Azure/go-autorest/logger v0.1.0" - "github.com/Azure/go-autorest/logger v0.1.0/go.mod" - "github.com/Azure/go-autorest/tracing v0.5.0" - "github.com/Azure/go-autorest/tracing v0.5.0/go.mod" - "github.com/BurntSushi/toml v0.3.1" - "github.com/BurntSushi/toml v0.3.1/go.mod" - "github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod" - "github.com/DataDog/datadog-go v3.2.0+incompatible/go.mod" - "github.com/Mellanox/rdmamap v0.0.0-20191106181932-7c3c4763a6ee" - "github.com/Mellanox/rdmamap v0.0.0-20191106181932-7c3c4763a6ee/go.mod" - "github.com/Microsoft/ApplicationInsights-Go v0.4.2" - "github.com/Microsoft/ApplicationInsights-Go v0.4.2/go.mod" - "github.com/Microsoft/go-winio v0.4.9" - "github.com/Microsoft/go-winio v0.4.9/go.mod" - "github.com/NYTimes/gziphandler v0.0.0-20170623195520-56545f4a5d46/go.mod" - "github.com/PuerkitoBio/purell v1.0.0/go.mod" - "github.com/PuerkitoBio/urlesc v0.0.0-20160726150825-5bd2802263f2/go.mod" - "github.com/Shopify/sarama v1.19.0/go.mod" - "github.com/Shopify/sarama v1.24.1" - "github.com/Shopify/sarama v1.24.1/go.mod" - "github.com/Shopify/toxiproxy v2.1.4+incompatible" - "github.com/Shopify/toxiproxy v2.1.4+incompatible/go.mod" - "github.com/StackExchange/wmi v0.0.0-20180116203802-5d049714c4a6" - "github.com/StackExchange/wmi v0.0.0-20180116203802-5d049714c4a6/go.mod" - "github.com/aerospike/aerospike-client-go v1.27.0" - "github.com/aerospike/aerospike-client-go v1.27.0/go.mod" - "github.com/ajstarks/svgo v0.0.0-20180226025133-644b8db467af/go.mod" - "github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod" - "github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod" - "github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf" - "github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod" - "github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4" - "github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod" - "github.com/amir/raidman v0.0.0-20170415203553-1ccc43bfb9c9" - "github.com/amir/raidman v0.0.0-20170415203553-1ccc43bfb9c9/go.mod" - "github.com/apache/thrift v0.12.0" - "github.com/apache/thrift v0.12.0/go.mod" - "github.com/aristanetworks/glog v0.0.0-20191112221043-67e8567f59f3" - "github.com/aristanetworks/glog v0.0.0-20191112221043-67e8567f59f3/go.mod" - "github.com/aristanetworks/goarista v0.0.0-20190325233358-a123909ec740" - "github.com/aristanetworks/goarista v0.0.0-20190325233358-a123909ec740/go.mod" - "github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod" - "github.com/armon/go-metrics v0.3.0" - "github.com/armon/go-metrics v0.3.0/go.mod" - "github.com/aws/aws-sdk-go v1.19.41" - "github.com/aws/aws-sdk-go v1.19.41/go.mod" - "github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973" - "github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod" - "github.com/beorn7/perks v1.0.0/go.mod" - "github.com/beorn7/perks v1.0.1" - "github.com/beorn7/perks v1.0.1/go.mod" - "github.com/bitly/go-hostpool v0.1.0" - "github.com/bitly/go-hostpool v0.1.0/go.mod" - "github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869" - "github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869/go.mod" - "github.com/caio/go-tdigest v2.3.0+incompatible" - "github.com/caio/go-tdigest v2.3.0+incompatible/go.mod" - "github.com/cenkalti/backoff v2.0.0+incompatible" - "github.com/cenkalti/backoff v2.0.0+incompatible/go.mod" - "github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod" - "github.com/cespare/xxhash/v2 v2.1.1" - "github.com/cespare/xxhash/v2 v2.1.1/go.mod" - "github.com/chzyer/logex v1.1.10/go.mod" - "github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod" - "github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod" - "github.com/circonus-labs/circonus-gometrics v2.3.1+incompatible/go.mod" - "github.com/circonus-labs/circonusllhist v0.1.3/go.mod" - "github.com/cisco-ie/nx-telemetry-proto v0.0.0-20190531143454-82441e232cf6" - "github.com/cisco-ie/nx-telemetry-proto v0.0.0-20190531143454-82441e232cf6/go.mod" - "github.com/client9/misspell v0.3.4/go.mod" - "github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod" - "github.com/cockroachdb/apd v1.1.0" - "github.com/cockroachdb/apd v1.1.0/go.mod" - "github.com/couchbase/go-couchbase v0.0.0-20180501122049-16db1f1fe037" - "github.com/couchbase/go-couchbase v0.0.0-20180501122049-16db1f1fe037/go.mod" - "github.com/couchbase/gomemcached v0.0.0-20180502221210-0da75df14530" - "github.com/couchbase/gomemcached v0.0.0-20180502221210-0da75df14530/go.mod" - "github.com/couchbase/goutils v0.0.0-20180530154633-e865a1461c8a" - "github.com/couchbase/goutils v0.0.0-20180530154633-e865a1461c8a/go.mod" - "github.com/davecgh/go-spew v0.0.0-20151105211317-5215b55f46b2/go.mod" - "github.com/davecgh/go-spew v1.1.0/go.mod" - "github.com/davecgh/go-spew v1.1.1" - "github.com/davecgh/go-spew v1.1.1/go.mod" - "github.com/denisenkom/go-mssqldb v0.0.0-20190707035753-2be1aa521ff4" - "github.com/denisenkom/go-mssqldb v0.0.0-20190707035753-2be1aa521ff4/go.mod" - "github.com/devigned/tab v0.1.1" - "github.com/devigned/tab v0.1.1/go.mod" - "github.com/dgrijalva/jwt-go v3.2.0+incompatible" - "github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod" - "github.com/dimchansky/utfbom v1.1.0" - "github.com/dimchansky/utfbom v1.1.0/go.mod" - "github.com/docker/distribution v2.6.0-rc.1.0.20170726174610-edc3ab29cdff+incompatible" - "github.com/docker/distribution v2.6.0-rc.1.0.20170726174610-edc3ab29cdff+incompatible/go.mod" - "github.com/docker/docker v1.4.2-0.20180327123150-ed7b6428c133" - "github.com/docker/docker v1.4.2-0.20180327123150-ed7b6428c133/go.mod" - "github.com/docker/go-connections v0.3.0" - "github.com/docker/go-connections v0.3.0/go.mod" - "github.com/docker/go-units v0.3.3" - "github.com/docker/go-units v0.3.3/go.mod" - "github.com/docker/libnetwork v0.8.0-dev.2.0.20181012153825-d7b61745d166" - "github.com/docker/libnetwork v0.8.0-dev.2.0.20181012153825-d7b61745d166/go.mod" - "github.com/docker/spdystream v0.0.0-20160310174837-449fdfce4d96/go.mod" - "github.com/eapache/go-resiliency v1.1.0" - "github.com/eapache/go-resiliency v1.1.0/go.mod" - "github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21" - "github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21/go.mod" - "github.com/eapache/queue v1.1.0" - "github.com/eapache/queue v1.1.0/go.mod" - "github.com/eclipse/paho.mqtt.golang v1.2.0" - "github.com/eclipse/paho.mqtt.golang v1.2.0/go.mod" - "github.com/elazarl/goproxy v0.0.0-20170405201442-c4fc26588b6e/go.mod" - "github.com/emicklei/go-restful v0.0.0-20170410110728-ff4f55a20633/go.mod" - "github.com/envoyproxy/go-control-plane v0.9.0/go.mod" - "github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod" - "github.com/envoyproxy/go-control-plane v0.9.4/go.mod" - "github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod" - "github.com/ericchiang/k8s v1.2.0" - "github.com/ericchiang/k8s v1.2.0/go.mod" - "github.com/evanphx/json-patch v4.2.0+incompatible/go.mod" - "github.com/fogleman/gg v1.2.1-0.20190220221249-0403632d5b90/go.mod" - "github.com/fortytw2/leaktest v1.3.0" - "github.com/fortytw2/leaktest v1.3.0/go.mod" - "github.com/frankban/quicktest v1.4.1" - "github.com/frankban/quicktest v1.4.1/go.mod" - "github.com/fsnotify/fsnotify v1.4.7" - "github.com/fsnotify/fsnotify v1.4.7/go.mod" - "github.com/ghodss/yaml v0.0.0-20150909031657-73d445a93680/go.mod" - "github.com/ghodss/yaml v1.0.1-0.20190212211648-25d852aebe32" - "github.com/ghodss/yaml v1.0.1-0.20190212211648-25d852aebe32/go.mod" - "github.com/glinton/ping v0.1.4-0.20200311211934-5ac87da8cd96" - "github.com/glinton/ping v0.1.4-0.20200311211934-5ac87da8cd96/go.mod" - "github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod" - "github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod" - "github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod" - "github.com/go-kit/kit v0.8.0/go.mod" - "github.com/go-kit/kit v0.9.0/go.mod" - "github.com/go-logfmt/logfmt v0.3.0/go.mod" - "github.com/go-logfmt/logfmt v0.4.0" - "github.com/go-logfmt/logfmt v0.4.0/go.mod" - "github.com/go-logr/logr v0.1.0/go.mod" - "github.com/go-ole/go-ole v1.2.1" - "github.com/go-ole/go-ole v1.2.1/go.mod" - "github.com/go-openapi/jsonpointer v0.0.0-20160704185906-46af16f9f7b1/go.mod" - "github.com/go-openapi/jsonreference v0.0.0-20160704190145-13c6e3589ad9/go.mod" - "github.com/go-openapi/spec v0.0.0-20160808142527-6aced65f8501/go.mod" - "github.com/go-openapi/swag v0.0.0-20160704191624-1d0bd113de87/go.mod" - "github.com/go-redis/redis v6.12.0+incompatible" - "github.com/go-redis/redis v6.12.0+incompatible/go.mod" - "github.com/go-sql-driver/mysql v1.4.1" - "github.com/go-sql-driver/mysql v1.4.1/go.mod" - "github.com/go-stack/stack v1.8.0/go.mod" - "github.com/goburrow/modbus v0.1.0" - "github.com/goburrow/modbus v0.1.0/go.mod" - "github.com/goburrow/serial v0.1.0" - "github.com/goburrow/serial v0.1.0/go.mod" - "github.com/gobwas/glob v0.2.3" - "github.com/gobwas/glob v0.2.3/go.mod" - "github.com/gofrs/uuid v2.1.0+incompatible" - "github.com/gofrs/uuid v2.1.0+incompatible/go.mod" - "github.com/gofrs/uuid v3.2.0+incompatible" - "github.com/gofrs/uuid v3.2.0+incompatible/go.mod" - "github.com/gogo/protobuf v1.1.1/go.mod" - "github.com/gogo/protobuf v1.2.0/go.mod" - "github.com/gogo/protobuf v1.2.2-0.20190723190241-65acae22fc9d" - "github.com/gogo/protobuf v1.2.2-0.20190723190241-65acae22fc9d/go.mod" - "github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0/go.mod" - "github.com/golang/geo v0.0.0-20190916061304-5b978397cfec" - "github.com/golang/geo v0.0.0-20190916061304-5b978397cfec/go.mod" - "github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b" - "github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod" - "github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903/go.mod" - "github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod" - "github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod" - "github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e" - "github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod" - "github.com/golang/mock v1.1.1/go.mod" - "github.com/golang/mock v1.2.0/go.mod" - "github.com/golang/mock v1.3.1/go.mod" - "github.com/golang/mock v1.4.0/go.mod" - "github.com/golang/mock v1.4.3" - "github.com/golang/mock v1.4.3/go.mod" - "github.com/golang/protobuf v0.0.0-20161109072736-4bd1920723d7/go.mod" - "github.com/golang/protobuf v1.2.0/go.mod" - "github.com/golang/protobuf v1.3.1/go.mod" - "github.com/golang/protobuf v1.3.2" - "github.com/golang/protobuf v1.3.2/go.mod" - "github.com/golang/protobuf v1.3.3/go.mod" - "github.com/golang/protobuf v1.3.5" - "github.com/golang/protobuf v1.3.5/go.mod" - "github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db/go.mod" - "github.com/golang/snappy v0.0.1" - "github.com/golang/snappy v0.0.1/go.mod" - "github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c" - "github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod" - "github.com/google/btree v1.0.0" - "github.com/google/btree v1.0.0/go.mod" - "github.com/google/go-cmp v0.2.0/go.mod" - "github.com/google/go-cmp v0.3.0/go.mod" - "github.com/google/go-cmp v0.3.1" - "github.com/google/go-cmp v0.3.1/go.mod" - "github.com/google/go-cmp v0.3.1/go.mod" - "github.com/google/go-cmp v0.4.0" - "github.com/google/go-cmp v0.4.0" - "github.com/google/go-cmp v0.4.0/go.mod" - "github.com/google/go-cmp v0.4.0/go.mod" - "github.com/google/go-github v17.0.0+incompatible" - "github.com/google/go-github v17.0.0+incompatible/go.mod" - "github.com/google/go-querystring v1.0.0" - "github.com/google/go-querystring v1.0.0/go.mod" - "github.com/google/gofuzz v0.0.0-20161122191042-44d81051d367/go.mod" - "github.com/google/gofuzz v1.0.0" - "github.com/google/gofuzz v1.0.0/go.mod" - "github.com/google/martian v2.1.0+incompatible" - "github.com/google/martian v2.1.0+incompatible/go.mod" - "github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod" - "github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod" - "github.com/google/pprof v0.0.0-20191218002539-d4f498aebedc/go.mod" - "github.com/google/pprof v0.0.0-20200212024743-f11f1df84d12/go.mod" - "github.com/google/renameio v0.1.0/go.mod" - "github.com/google/uuid v1.1.1" - "github.com/google/uuid v1.1.1/go.mod" - "github.com/googleapis/gax-go/v2 v2.0.4" - "github.com/googleapis/gax-go/v2 v2.0.4/go.mod" - "github.com/googleapis/gax-go/v2 v2.0.5" - "github.com/googleapis/gax-go/v2 v2.0.5/go.mod" - "github.com/googleapis/gnostic v0.0.0-20170729233727-0c5108395e2d/go.mod" - "github.com/gorilla/context v1.1.1" - "github.com/gorilla/context v1.1.1/go.mod" - "github.com/gorilla/mux v1.6.2" - "github.com/gorilla/mux v1.6.2/go.mod" - "github.com/gotestyourself/gotestyourself v2.2.0+incompatible" - "github.com/gotestyourself/gotestyourself v2.2.0+incompatible/go.mod" - "github.com/hailocab/go-hostpool v0.0.0-20160125115350-e80d13ce29ed" - "github.com/hailocab/go-hostpool v0.0.0-20160125115350-e80d13ce29ed/go.mod" - "github.com/harlow/kinesis-consumer v0.3.1-0.20181230152818-2f58b136fee0" - "github.com/harlow/kinesis-consumer v0.3.1-0.20181230152818-2f58b136fee0/go.mod" - "github.com/hashicorp/consul v1.2.1" - "github.com/hashicorp/consul v1.2.1/go.mod" - "github.com/hashicorp/errwrap v1.0.0" - "github.com/hashicorp/errwrap v1.0.0/go.mod" - "github.com/hashicorp/go-cleanhttp v0.5.0" - "github.com/hashicorp/go-cleanhttp v0.5.0/go.mod" - "github.com/hashicorp/go-immutable-radix v1.0.0" - "github.com/hashicorp/go-immutable-radix v1.0.0/go.mod" - "github.com/hashicorp/go-msgpack v0.5.3/go.mod" - "github.com/hashicorp/go-msgpack v0.5.5" - "github.com/hashicorp/go-msgpack v0.5.5/go.mod" - "github.com/hashicorp/go-multierror v1.0.0" - "github.com/hashicorp/go-multierror v1.0.0/go.mod" - "github.com/hashicorp/go-retryablehttp v0.5.3/go.mod" - "github.com/hashicorp/go-rootcerts v0.0.0-20160503143440-6bb64b370b90" - "github.com/hashicorp/go-rootcerts v0.0.0-20160503143440-6bb64b370b90/go.mod" - "github.com/hashicorp/go-sockaddr v1.0.0" - "github.com/hashicorp/go-sockaddr v1.0.0/go.mod" - "github.com/hashicorp/go-uuid v1.0.0/go.mod" - "github.com/hashicorp/go-uuid v1.0.1" - "github.com/hashicorp/go-uuid v1.0.1/go.mod" - "github.com/hashicorp/golang-lru v0.5.0/go.mod" - "github.com/hashicorp/golang-lru v0.5.1" - "github.com/hashicorp/golang-lru v0.5.1/go.mod" - "github.com/hashicorp/memberlist v0.1.5" - "github.com/hashicorp/memberlist v0.1.5/go.mod" - "github.com/hashicorp/serf v0.8.1" - "github.com/hashicorp/serf v0.8.1/go.mod" - "github.com/hpcloud/tail v1.0.0" - "github.com/hpcloud/tail v1.0.0/go.mod" - "github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod" - "github.com/influxdata/go-syslog/v2 v2.0.1" - "github.com/influxdata/go-syslog/v2 v2.0.1/go.mod" - "github.com/influxdata/tail v1.0.1-0.20180327235535-c43482518d41" - "github.com/influxdata/tail v1.0.1-0.20180327235535-c43482518d41/go.mod" - "github.com/influxdata/toml v0.0.0-20190415235208-270119a8ce65" - "github.com/influxdata/toml v0.0.0-20190415235208-270119a8ce65/go.mod" - "github.com/influxdata/wlog v0.0.0-20160411224016-7c63b0a71ef8" - "github.com/influxdata/wlog v0.0.0-20160411224016-7c63b0a71ef8/go.mod" - "github.com/jackc/fake v0.0.0-20150926172116-812a484cc733" - "github.com/jackc/fake v0.0.0-20150926172116-812a484cc733/go.mod" - "github.com/jackc/pgx v3.6.0+incompatible" - "github.com/jackc/pgx v3.6.0+incompatible/go.mod" - "github.com/jcmturner/gofork v0.0.0-20190328161633-dc7c13fece03/go.mod" - "github.com/jcmturner/gofork v1.0.0" - "github.com/jcmturner/gofork v1.0.0/go.mod" - "github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af" - "github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod" - "github.com/joho/godotenv v1.3.0" - "github.com/joho/godotenv v1.3.0/go.mod" - "github.com/jpillora/backoff v0.0.0-20180909062703-3050d21c67d7" - "github.com/jpillora/backoff v0.0.0-20180909062703-3050d21c67d7/go.mod" - "github.com/jsimonetti/rtnetlink v0.0.0-20190606172950-9527aa82566a/go.mod" - "github.com/jsimonetti/rtnetlink v0.0.0-20200117123717-f846d4f6c1f4" - "github.com/jsimonetti/rtnetlink v0.0.0-20200117123717-f846d4f6c1f4/go.mod" - "github.com/json-iterator/go v0.0.0-20180612202835-f2b4162afba3/go.mod" - "github.com/json-iterator/go v1.1.6/go.mod" - "github.com/json-iterator/go v1.1.8/go.mod" - "github.com/json-iterator/go v1.1.9/go.mod" - "github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod" - "github.com/jstemmer/go-junit-report v0.9.1" - "github.com/jstemmer/go-junit-report v0.9.1/go.mod" - "github.com/julienschmidt/httprouter v1.2.0/go.mod" - "github.com/jung-kurt/gofpdf v1.0.3-0.20190309125859-24315acbbda5/go.mod" - "github.com/kardianos/service v1.0.0" - "github.com/kardianos/service v1.0.0/go.mod" - "github.com/karrick/godirwalk v1.12.0" - "github.com/karrick/godirwalk v1.12.0/go.mod" - "github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51" - "github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51/go.mod" - "github.com/kisielk/errcheck v1.2.0/go.mod" - "github.com/kisielk/gotool v1.0.0/go.mod" - "github.com/klauspost/compress v1.8.2/go.mod" - "github.com/klauspost/compress v1.9.2" - "github.com/klauspost/compress v1.9.2/go.mod" - "github.com/konsorten/go-windows-terminal-sequences v1.0.1" - "github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod" - "github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515" - "github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod" - "github.com/kr/pretty v0.1.0" - "github.com/kr/pretty v0.1.0/go.mod" - "github.com/kr/pty v1.1.1/go.mod" - "github.com/kr/text v0.1.0" - "github.com/kr/text v0.1.0/go.mod" - "github.com/kubernetes/apimachinery v0.0.0-20190119020841-d41becfba9ee" - "github.com/kubernetes/apimachinery v0.0.0-20190119020841-d41becfba9ee/go.mod" - "github.com/kylelemons/godebug v1.1.0" - "github.com/kylelemons/godebug v1.1.0/go.mod" - "github.com/leesper/go_rng v0.0.0-20190531154944-a612b043e353" - "github.com/leesper/go_rng v0.0.0-20190531154944-a612b043e353/go.mod" - "github.com/leodido/ragel-machinery v0.0.0-20181214104525-299bdde78165" - "github.com/leodido/ragel-machinery v0.0.0-20181214104525-299bdde78165/go.mod" - "github.com/lib/pq v1.3.0" - "github.com/lib/pq v1.3.0/go.mod" - "github.com/mailru/easyjson v0.0.0-20160728113105-d5b7844b561a/go.mod" - "github.com/mailru/easyjson v0.0.0-20180717111219-efc7eb8984d6" - "github.com/mailru/easyjson v0.0.0-20180717111219-efc7eb8984d6/go.mod" - "github.com/matttproud/golang_protobuf_extensions v1.0.1" - "github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod" - "github.com/mdlayher/apcupsd v0.0.0-20190314144147-eb3dd99a75fe" - "github.com/mdlayher/apcupsd v0.0.0-20190314144147-eb3dd99a75fe/go.mod" - "github.com/mdlayher/genetlink v1.0.0" - "github.com/mdlayher/genetlink v1.0.0/go.mod" - "github.com/mdlayher/netlink v0.0.0-20190409211403-11939a169225/go.mod" - "github.com/mdlayher/netlink v1.0.0/go.mod" - "github.com/mdlayher/netlink v1.1.0" - "github.com/mdlayher/netlink v1.1.0/go.mod" - "github.com/miekg/dns v1.0.14" - "github.com/miekg/dns v1.0.14/go.mod" - "github.com/mikioh/ipaddr v0.0.0-20190404000644-d465c8ab6721" - "github.com/mikioh/ipaddr v0.0.0-20190404000644-d465c8ab6721/go.mod" - "github.com/mitchellh/go-homedir v1.1.0" - "github.com/mitchellh/go-homedir v1.1.0/go.mod" - "github.com/mitchellh/go-testing-interface v1.0.0" - "github.com/mitchellh/go-testing-interface v1.0.0/go.mod" - "github.com/mitchellh/mapstructure v1.1.2" - "github.com/mitchellh/mapstructure v1.1.2/go.mod" - "github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod" - "github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod" - "github.com/modern-go/reflect2 v0.0.0-20180320133207-05fbef0ca5da/go.mod" - "github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod" - "github.com/modern-go/reflect2 v1.0.1/go.mod" - "github.com/multiplay/go-ts3 v1.0.0" - "github.com/multiplay/go-ts3 v1.0.0/go.mod" - "github.com/munnerz/goautoneg v0.0.0-20120707110453-a547fc61f48d/go.mod" - "github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod" - "github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod" - "github.com/naoina/go-stringutil v0.1.0" - "github.com/naoina/go-stringutil v0.1.0/go.mod" - "github.com/nats-io/jwt v0.3.0/go.mod" - "github.com/nats-io/jwt v0.3.2" - "github.com/nats-io/jwt v0.3.2/go.mod" - "github.com/nats-io/nats-server/v2 v2.1.4" - "github.com/nats-io/nats-server/v2 v2.1.4/go.mod" - "github.com/nats-io/nats.go v1.9.1" - "github.com/nats-io/nats.go v1.9.1/go.mod" - "github.com/nats-io/nkeys v0.1.0/go.mod" - "github.com/nats-io/nkeys v0.1.3" - "github.com/nats-io/nkeys v0.1.3/go.mod" - "github.com/nats-io/nuid v1.0.1" - "github.com/nats-io/nuid v1.0.1/go.mod" - "github.com/nsqio/go-nsq v1.0.7" - "github.com/nsqio/go-nsq v1.0.7/go.mod" - "github.com/onsi/ginkgo v0.0.0-20170829012221-11459a886d9c/go.mod" - "github.com/onsi/ginkgo v1.6.0/go.mod" - "github.com/onsi/ginkgo v1.7.0/go.mod" - "github.com/onsi/ginkgo v1.10.1" - "github.com/onsi/ginkgo v1.10.1/go.mod" - "github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod" - "github.com/onsi/gomega v1.4.3/go.mod" - "github.com/onsi/gomega v1.7.0" - "github.com/onsi/gomega v1.7.0/go.mod" - "github.com/openconfig/gnmi v0.0.0-20180912164834-33a1865c3029" - "github.com/openconfig/gnmi v0.0.0-20180912164834-33a1865c3029/go.mod" - "github.com/opencontainers/go-digest v1.0.0-rc1" - "github.com/opencontainers/go-digest v1.0.0-rc1/go.mod" - "github.com/opencontainers/image-spec v1.0.1" - "github.com/opencontainers/image-spec v1.0.1/go.mod" - "github.com/opentracing-contrib/go-observer v0.0.0-20170622124052-a52f23424492" - "github.com/opentracing-contrib/go-observer v0.0.0-20170622124052-a52f23424492/go.mod" - "github.com/opentracing/opentracing-go v1.0.2" - "github.com/opentracing/opentracing-go v1.0.2/go.mod" - "github.com/openzipkin/zipkin-go v0.1.6/go.mod" - "github.com/openzipkin/zipkin-go-opentracing v0.3.4" - "github.com/openzipkin/zipkin-go-opentracing v0.3.4/go.mod" - "github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod" - "github.com/pascaldekloe/goe v0.1.0" - "github.com/pascaldekloe/goe v0.1.0/go.mod" - "github.com/pierrec/lz4 v2.0.5+incompatible/go.mod" - "github.com/pierrec/lz4 v2.2.6+incompatible" - "github.com/pierrec/lz4 v2.2.6+incompatible/go.mod" - "github.com/pkg/errors v0.8.0/go.mod" - "github.com/pkg/errors v0.8.1" - "github.com/pkg/errors v0.8.1/go.mod" - "github.com/pmezard/go-difflib v0.0.0-20151028094244-d8ed2627bdf0/go.mod" - "github.com/pmezard/go-difflib v1.0.0" - "github.com/pmezard/go-difflib v1.0.0/go.mod" - "github.com/prometheus/client_golang v0.9.1/go.mod" - "github.com/prometheus/client_golang v0.9.2/go.mod" - "github.com/prometheus/client_golang v0.9.3-0.20190127221311-3c4408c8b829" - "github.com/prometheus/client_golang v0.9.3-0.20190127221311-3c4408c8b829/go.mod" - "github.com/prometheus/client_golang v1.0.0/go.mod" - "github.com/prometheus/client_golang v1.5.1" - "github.com/prometheus/client_golang v1.5.1/go.mod" - "github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod" - "github.com/prometheus/client_model v0.0.0-20190115171406-56726106282f" - "github.com/prometheus/client_model v0.0.0-20190115171406-56726106282f/go.mod" - "github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod" - "github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4" - "github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod" - "github.com/prometheus/client_model v0.2.0" - "github.com/prometheus/client_model v0.2.0/go.mod" - "github.com/prometheus/common v0.0.0-20181126121408-4724e9255275/go.mod" - "github.com/prometheus/common v0.2.0" - "github.com/prometheus/common v0.2.0/go.mod" - "github.com/prometheus/common v0.4.1/go.mod" - "github.com/prometheus/common v0.9.1" - "github.com/prometheus/common v0.9.1/go.mod" - "github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod" - "github.com/prometheus/procfs v0.0.0-20181204211112-1dc9a6cbc91a/go.mod" - "github.com/prometheus/procfs v0.0.0-20190117184657-bf6a532e95b1" - "github.com/prometheus/procfs v0.0.0-20190117184657-bf6a532e95b1/go.mod" - "github.com/prometheus/procfs v0.0.2/go.mod" - "github.com/prometheus/procfs v0.0.8" - "github.com/prometheus/procfs v0.0.8/go.mod" - "github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a" - "github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a/go.mod" - "github.com/rogpeppe/go-internal v1.3.0/go.mod" - "github.com/safchain/ethtool v0.0.0-20200218184317-f459e2d13664" - "github.com/safchain/ethtool v0.0.0-20200218184317-f459e2d13664/go.mod" - "github.com/samuel/go-zookeeper v0.0.0-20180130194729-c4fab1ac1bec" - "github.com/samuel/go-zookeeper v0.0.0-20180130194729-c4fab1ac1bec/go.mod" - "github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529" - "github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod" - "github.com/shirou/gopsutil v2.20.2+incompatible" - "github.com/shirou/gopsutil v2.20.2+incompatible/go.mod" - "github.com/shopspring/decimal v0.0.0-20200105231215-408a2507e114" - "github.com/shopspring/decimal v0.0.0-20200105231215-408a2507e114/go.mod" - "github.com/sirupsen/logrus v1.2.0" - "github.com/sirupsen/logrus v1.2.0/go.mod" - "github.com/sirupsen/logrus v1.4.2" - "github.com/sirupsen/logrus v1.4.2/go.mod" - "github.com/soniah/gosnmp v1.22.0" - "github.com/soniah/gosnmp v1.22.0/go.mod" - "github.com/spf13/pflag v0.0.0-20170130214245-9ff6c6923cff/go.mod" - "github.com/spf13/pflag v1.0.5/go.mod" - "github.com/streadway/amqp v0.0.0-20180528204448-e5adc2ada8b8" - "github.com/streadway/amqp v0.0.0-20180528204448-e5adc2ada8b8/go.mod" - "github.com/stretchr/objx v0.1.0/go.mod" - "github.com/stretchr/objx v0.1.1" - "github.com/stretchr/objx v0.1.1/go.mod" - "github.com/stretchr/testify v0.0.0-20151208002404-e3a8ff8ce365/go.mod" - "github.com/stretchr/testify v1.2.2/go.mod" - "github.com/stretchr/testify v1.3.0/go.mod" - "github.com/stretchr/testify v1.4.0" - "github.com/stretchr/testify v1.4.0/go.mod" - "github.com/tbrandon/mbserver v0.0.0-20170611213546-993e1772cc62" - "github.com/tbrandon/mbserver v0.0.0-20170611213546-993e1772cc62/go.mod" - "github.com/tedsuo/ifrit v0.0.0-20191009134036-9a97d0632f00" - "github.com/tedsuo/ifrit v0.0.0-20191009134036-9a97d0632f00/go.mod" - "github.com/tidwall/gjson v1.6.0" - "github.com/tidwall/gjson v1.6.0/go.mod" - "github.com/tidwall/match v1.0.1" - "github.com/tidwall/match v1.0.1/go.mod" - "github.com/tidwall/pretty v1.0.0" - "github.com/tidwall/pretty v1.0.0/go.mod" - "github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926/go.mod" - "github.com/vishvananda/netlink v0.0.0-20171020171820-b2de5d10e38e" - "github.com/vishvananda/netlink v0.0.0-20171020171820-b2de5d10e38e/go.mod" - "github.com/vishvananda/netns v0.0.0-20180720170159-13995c7128cc" - "github.com/vishvananda/netns v0.0.0-20180720170159-13995c7128cc/go.mod" - "github.com/vjeantet/grok v1.0.0" - "github.com/vjeantet/grok v1.0.0/go.mod" - "github.com/vmware/govmomi v0.19.0" - "github.com/vmware/govmomi v0.19.0/go.mod" - "github.com/wavefronthq/wavefront-sdk-go v0.9.2" - "github.com/wavefronthq/wavefront-sdk-go v0.9.2/go.mod" - "github.com/wvanbergen/kafka v0.0.0-20171203153745-e2edea948ddf" - "github.com/wvanbergen/kafka v0.0.0-20171203153745-e2edea948ddf/go.mod" - "github.com/wvanbergen/kazoo-go v0.0.0-20180202103751-f72d8611297a" - "github.com/wvanbergen/kazoo-go v0.0.0-20180202103751-f72d8611297a/go.mod" - "github.com/xdg/scram v0.0.0-20180814205039-7eeb5667e42c/go.mod" - "github.com/xdg/stringprep v1.0.0/go.mod" - "github.com/yuin/goldmark v1.1.25/go.mod" - "github.com/yuin/gopher-lua v0.0.0-20180630135845-46796da1b0b4" - "github.com/yuin/gopher-lua v0.0.0-20180630135845-46796da1b0b4/go.mod" - "go.opencensus.io v0.20.1" - "go.opencensus.io v0.20.1/go.mod" - "go.opencensus.io v0.21.0/go.mod" - "go.opencensus.io v0.22.0/go.mod" - "go.opencensus.io v0.22.2/go.mod" - "go.opencensus.io v0.22.3" - "go.opencensus.io v0.22.3/go.mod" - "golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod" - "golang.org/x/crypto v0.0.0-20181029021203-45a5f77698d3/go.mod" - "golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod" - "golang.org/x/crypto v0.0.0-20190325154230-a5d413f7728c/go.mod" - "golang.org/x/crypto v0.0.0-20190404164418-38d8ce5564a5/go.mod" - "golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod" - "golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod" - "golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4/go.mod" - "golang.org/x/crypto v0.0.0-20191002192127-34f69633bfdc/go.mod" - "golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod" - "golang.org/x/crypto v0.0.0-20191206172530-e9b2fee46413" - "golang.org/x/crypto v0.0.0-20191206172530-e9b2fee46413/go.mod" - "golang.org/x/crypto v0.0.0-20200204104054-c9f3fb736b72" - "golang.org/x/crypto v0.0.0-20200204104054-c9f3fb736b72/go.mod" - "golang.org/x/exp v0.0.0-20180321215751-8460e604b9de/go.mod" - "golang.org/x/exp v0.0.0-20180807140117-3d87b88a115f/go.mod" - "golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod" - "golang.org/x/exp v0.0.0-20190125153040-c74c464bbbf2" - "golang.org/x/exp v0.0.0-20190125153040-c74c464bbbf2/go.mod" - "golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod" - "golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod" - "golang.org/x/exp v0.0.0-20190829153037-c13cbed26979/go.mod" - "golang.org/x/exp v0.0.0-20191030013958-a1ab85dbe136/go.mod" - "golang.org/x/exp v0.0.0-20191129062945-2f5052295587/go.mod" - "golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod" - "golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod" - "golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod" - "golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6" - "golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod" - "golang.org/x/image v0.0.0-20180708004352-c73c2afc3b81/go.mod" - "golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod" - "golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod" - "golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod" - "golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod" - "golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod" - "golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod" - "golang.org/x/lint v0.0.0-20190409202823-959b441ac422/go.mod" - "golang.org/x/lint v0.0.0-20190909230951-414d861bb4ac/go.mod" - "golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod" - "golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f/go.mod" - "golang.org/x/lint v0.0.0-20200130185559-910be7a94367/go.mod" - "golang.org/x/lint v0.0.0-20200302205851-738671d3881b" - "golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod" - "golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod" - "golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod" - "golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod" - "golang.org/x/mod v0.1.0/go.mod" - "golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod" - "golang.org/x/mod v0.1.1-0.20191107180719-034126e5016b/go.mod" - "golang.org/x/mod v0.2.0" - "golang.org/x/mod v0.2.0/go.mod" - "golang.org/x/net v0.0.0-20170114055629-f2499483f923/go.mod" - "golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod" - "golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod" - "golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod" - "golang.org/x/net v0.0.0-20181023162649-9b4f9f5ad519/go.mod" - "golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod" - "golang.org/x/net v0.0.0-20181201002055-351d144fa1fc/go.mod" - "golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod" - "golang.org/x/net v0.0.0-20190125091013-d26f9f9a57f3/go.mod" - "golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod" - "golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod" - "golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod" - "golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod" - "golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod" - "golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod" - "golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod" - "golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod" - "golang.org/x/net v0.0.0-20190628185345-da137c7871d7/go.mod" - "golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod" - "golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297/go.mod" - "golang.org/x/net v0.0.0-20191003171128-d98b1b443823/go.mod" - "golang.org/x/net v0.0.0-20191004110552-13f9640d40b9" - "golang.org/x/net v0.0.0-20191004110552-13f9640d40b9/go.mod" - "golang.org/x/net v0.0.0-20191007182048-72f939374954/go.mod" - "golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod" - "golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa/go.mod" - "golang.org/x/net v0.0.0-20200202094626-16171245cfb2" - "golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod" - "golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod" - "golang.org/x/net v0.0.0-20200301022130-244492dfa37a" - "golang.org/x/net v0.0.0-20200301022130-244492dfa37a/go.mod" - "golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod" - "golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421" - "golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod" - "golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod" - "golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6/go.mod" - "golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d" - "golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod" - "golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod" - "golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod" - "golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod" - "golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod" - "golang.org/x/sync v0.0.0-20190423024810-112230192c58" - "golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod" - "golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod" - "golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a" - "golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod" - "golang.org/x/sys v0.0.0-20170830134202-bb24a47a89ea/go.mod" - "golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod" - "golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod" - "golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod" - "golang.org/x/sys v0.0.0-20181026203630-95b1ffbd15a5/go.mod" - "golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod" - "golang.org/x/sys v0.0.0-20181122145206-62eef0e2fa9b/go.mod" - "golang.org/x/sys v0.0.0-20190204203706-41f3e6584952/go.mod" - "golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod" - "golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod" - "golang.org/x/sys v0.0.0-20190403152447-81d4e9dc473e/go.mod" - "golang.org/x/sys v0.0.0-20190411185658-b44545bcd369/go.mod" - "golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod" - "golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod" - "golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod" - "golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod" - "golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod" - "golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod" - "golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod" - "golang.org/x/sys v0.0.0-20190826190057-c7b8b68b1456" - "golang.org/x/sys v0.0.0-20190826190057-c7b8b68b1456/go.mod" - "golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24/go.mod" - "golang.org/x/sys v0.0.0-20191003212358-c178f38b412c/go.mod" - "golang.org/x/sys v0.0.0-20191008105621-543471e840be/go.mod" - "golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod" - "golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/go.mod" - "golang.org/x/sys v0.0.0-20200113162924-86b910548bc1/go.mod" - "golang.org/x/sys v0.0.0-20200122134326-e047566fdf82/go.mod" - "golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod" - "golang.org/x/sys v0.0.0-20200212091648-12a6c2dcc1e4" - "golang.org/x/sys v0.0.0-20200212091648-12a6c2dcc1e4/go.mod" - "golang.org/x/text v0.0.0-20160726164857-2910a502d2bf/go.mod" - "golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod" - "golang.org/x/text v0.3.0/go.mod" - "golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod" - "golang.org/x/text v0.3.2" - "golang.org/x/text v0.3.2/go.mod" - "golang.org/x/time v0.0.0-20181108054448-85acf8d2951c" - "golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod" - "golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod" - "golang.org/x/time v0.0.0-20191024005414-555d28b269f0" - "golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod" - "golang.org/x/tools v0.0.0-20180525024113-a5b4c53f6e8b/go.mod" - "golang.org/x/tools v0.0.0-20180828015842-6cd1fcedba52/go.mod" - "golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod" - "golang.org/x/tools v0.0.0-20181011042414-1f849cf54d09/go.mod" - "golang.org/x/tools v0.0.0-20181030221726-6c7e314b6563/go.mod" - "golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod" - "golang.org/x/tools v0.0.0-20190206041539-40960b6deb8e/go.mod" - "golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod" - "golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod" - "golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod" - "golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod" - "golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod" - "golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod" - "golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod" - "golang.org/x/tools v0.0.0-20190606124116-d0a3d012864b/go.mod" - "golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod" - "golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod" - "golang.org/x/tools v0.0.0-20190816200558-6889da9d5479/go.mod" - "golang.org/x/tools v0.0.0-20190911174233-4f2ddba30aff/go.mod" - "golang.org/x/tools v0.0.0-20191012152004-8de300cfc20a/go.mod" - "golang.org/x/tools v0.0.0-20191113191852-77e3bb0ad9e7/go.mod" - "golang.org/x/tools v0.0.0-20191115202509-3a792d9c32b2/go.mod" - "golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod" - "golang.org/x/tools v0.0.0-20191125144606-a911d9008d1f/go.mod" - "golang.org/x/tools v0.0.0-20191130070609-6e064ea0cf2d/go.mod" - "golang.org/x/tools v0.0.0-20191216173652-a0e659d51361/go.mod" - "golang.org/x/tools v0.0.0-20191227053925-7b8e75db28f4/go.mod" - "golang.org/x/tools v0.0.0-20200117161641-43d50277825c/go.mod" - "golang.org/x/tools v0.0.0-20200122220014-bf1340f18c4a/go.mod" - "golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod" - "golang.org/x/tools v0.0.0-20200204074204-1cc6d1ef6c74/go.mod" - "golang.org/x/tools v0.0.0-20200207183749-b753a1ba74fa/go.mod" - "golang.org/x/tools v0.0.0-20200212150539-ea181f53ac56/go.mod" - "golang.org/x/tools v0.0.0-20200317043434-63da46f3035e" - "golang.org/x/tools v0.0.0-20200317043434-63da46f3035e/go.mod" - "golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod" - "golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod" - "golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543" - "golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod" - "golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod" - "golang.zx2c4.com/wireguard v0.0.20200121" - "golang.zx2c4.com/wireguard v0.0.20200121/go.mod" - "golang.zx2c4.com/wireguard/wgctrl v0.0.0-20200205215550-e35592f146e4" - "golang.zx2c4.com/wireguard/wgctrl v0.0.0-20200205215550-e35592f146e4/go.mod" - "gonum.org/v1/gonum v0.0.0-20180816165407-929014505bf4/go.mod" - "gonum.org/v1/gonum v0.6.2" - "gonum.org/v1/gonum v0.6.2/go.mod" - "gonum.org/v1/netlib v0.0.0-20190313105609-8cb42192e0e0" - "gonum.org/v1/netlib v0.0.0-20190313105609-8cb42192e0e0/go.mod" - "gonum.org/v1/plot v0.0.0-20190515093506-e2840ee46a6b/go.mod" - "google.golang.org/api v0.3.1" - "google.golang.org/api v0.3.1/go.mod" - "google.golang.org/api v0.4.0/go.mod" - "google.golang.org/api v0.7.0/go.mod" - "google.golang.org/api v0.8.0/go.mod" - "google.golang.org/api v0.9.0/go.mod" - "google.golang.org/api v0.13.0/go.mod" - "google.golang.org/api v0.14.0/go.mod" - "google.golang.org/api v0.15.0/go.mod" - "google.golang.org/api v0.17.0/go.mod" - "google.golang.org/api v0.20.0" - "google.golang.org/api v0.20.0/go.mod" - "google.golang.org/appengine v1.1.0/go.mod" - "google.golang.org/appengine v1.4.0" - "google.golang.org/appengine v1.4.0/go.mod" - "google.golang.org/appengine v1.5.0/go.mod" - "google.golang.org/appengine v1.6.1/go.mod" - "google.golang.org/appengine v1.6.5" - "google.golang.org/appengine v1.6.5/go.mod" - "google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod" - "google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod" - "google.golang.org/genproto v0.0.0-20190404172233-64821d5d2107" - "google.golang.org/genproto v0.0.0-20190404172233-64821d5d2107/go.mod" - "google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod" - "google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod" - "google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873/go.mod" - "google.golang.org/genproto v0.0.0-20190801165951-fa694d86fc64/go.mod" - "google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod" - "google.golang.org/genproto v0.0.0-20190911173649-1774047e7e51/go.mod" - "google.golang.org/genproto v0.0.0-20191108220845-16a3f7862a1a/go.mod" - "google.golang.org/genproto v0.0.0-20191115194625-c23dd37a84c9/go.mod" - "google.golang.org/genproto v0.0.0-20191216164720-4f79533eabd1/go.mod" - "google.golang.org/genproto v0.0.0-20191230161307-f3c370f40bfb/go.mod" - "google.golang.org/genproto v0.0.0-20200115191322-ca5a22157cba/go.mod" - "google.golang.org/genproto v0.0.0-20200122232147-0452cf42e150/go.mod" - "google.golang.org/genproto v0.0.0-20200204135345-fa8e72b47b90/go.mod" - "google.golang.org/genproto v0.0.0-20200212174721-66ed5ce911ce/go.mod" - "google.golang.org/genproto v0.0.0-20200317114155-1f3552e48f24" - "google.golang.org/genproto v0.0.0-20200317114155-1f3552e48f24/go.mod" - "google.golang.org/grpc v1.17.0/go.mod" - "google.golang.org/grpc v1.19.0" - "google.golang.org/grpc v1.19.0/go.mod" - "google.golang.org/grpc v1.20.1/go.mod" - "google.golang.org/grpc v1.21.1/go.mod" - "google.golang.org/grpc v1.23.0/go.mod" - "google.golang.org/grpc v1.25.1/go.mod" - "google.golang.org/grpc v1.26.0/go.mod" - "google.golang.org/grpc v1.27.0/go.mod" - "google.golang.org/grpc v1.27.1/go.mod" - "google.golang.org/grpc v1.28.0" - "google.golang.org/grpc v1.28.0/go.mod" - "gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod" - "gopkg.in/asn1-ber.v1 v1.0.0-20181015200546-f715ec2f112d" - "gopkg.in/asn1-ber.v1 v1.0.0-20181015200546-f715ec2f112d/go.mod" - "gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod" - "gopkg.in/check.v1 v1.0.0-20161208181325-20d25e280405/go.mod" - "gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127" - "gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod" - "gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15" - "gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod" - "gopkg.in/errgo.v2 v2.1.0/go.mod" - "gopkg.in/fatih/pool.v2 v2.0.0" - "gopkg.in/fatih/pool.v2 v2.0.0/go.mod" - "gopkg.in/fsnotify.v1 v1.4.7" - "gopkg.in/fsnotify.v1 v1.4.7/go.mod" - "gopkg.in/gorethink/gorethink.v3 v3.0.5" - "gopkg.in/gorethink/gorethink.v3 v3.0.5/go.mod" - "gopkg.in/inf.v0 v0.9.1" - "gopkg.in/inf.v0 v0.9.1/go.mod" - "gopkg.in/jcmturner/aescts.v1 v1.0.1" - "gopkg.in/jcmturner/aescts.v1 v1.0.1/go.mod" - "gopkg.in/jcmturner/dnsutils.v1 v1.0.1" - "gopkg.in/jcmturner/dnsutils.v1 v1.0.1/go.mod" - "gopkg.in/jcmturner/goidentity.v3 v3.0.0" - "gopkg.in/jcmturner/goidentity.v3 v3.0.0/go.mod" - "gopkg.in/jcmturner/gokrb5.v7 v7.2.3/go.mod" - "gopkg.in/jcmturner/gokrb5.v7 v7.3.0" - "gopkg.in/jcmturner/gokrb5.v7 v7.3.0/go.mod" - "gopkg.in/jcmturner/rpc.v1 v1.1.0" - "gopkg.in/jcmturner/rpc.v1 v1.1.0/go.mod" - "gopkg.in/ldap.v3 v3.1.0" - "gopkg.in/ldap.v3 v3.1.0/go.mod" - "gopkg.in/mgo.v2 v2.0.0-20180705113604-9856a29383ce" - "gopkg.in/mgo.v2 v2.0.0-20180705113604-9856a29383ce/go.mod" - "gopkg.in/olivere/elastic.v5 v5.0.70" - "gopkg.in/olivere/elastic.v5 v5.0.70/go.mod" - "gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7" - "gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod" - "gopkg.in/yaml.v2 v2.2.1/go.mod" - "gopkg.in/yaml.v2 v2.2.2/go.mod" - "gopkg.in/yaml.v2 v2.2.4" - "gopkg.in/yaml.v2 v2.2.4/go.mod" - "gopkg.in/yaml.v2 v2.2.5" - "gopkg.in/yaml.v2 v2.2.5/go.mod" - "gotest.tools v2.2.0+incompatible" - "gotest.tools v2.2.0+incompatible/go.mod" - "honnef.co/go/tools v0.0.0-20180728063816-88497007e858/go.mod" - "honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod" - "honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod" - "honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod" - "honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod" - "honnef.co/go/tools v0.0.1-2019.2.3/go.mod" - "honnef.co/go/tools v0.0.1-2020.1.3" - "honnef.co/go/tools v0.0.1-2020.1.3/go.mod" - "k8s.io/apimachinery v0.17.1" - "k8s.io/apimachinery v0.17.1/go.mod" - "k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6/go.mod" - "k8s.io/klog v0.0.0-20181102134211-b9b56d5dfc92/go.mod" - "k8s.io/klog v1.0.0" - "k8s.io/klog v1.0.0/go.mod" - "k8s.io/kube-openapi v0.0.0-20191107075043-30be4d16710a/go.mod" - "rsc.io/binaryregexp v0.2.0/go.mod" - "rsc.io/pdf v0.1.1/go.mod" - "rsc.io/quote/v3 v3.1.0/go.mod" - "rsc.io/sampler v1.3.0/go.mod" - "sigs.k8s.io/structured-merge-diff v0.0.0-20190525122527-15d366b2352e/go.mod" - "sigs.k8s.io/yaml v1.1.0/go.mod" - ) -go-module_set_globals -SRC_URI="https://github.com/influxdata/telegraf/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz - ${EGO_SUM_SRC_URI}" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64" - -RESTRICT+=" strip" - -DEPEND="acct-group/telegraf - acct-user/telegraf" - RDEPEND="${DEPEND}" - -src_compile() { - unset LDFLAGS - emake \ - COMMIT=${COMMIT} \ - BRANCH=${BRANCH} \ - VERSION=v${MY_PV} \ - telegraf -} - -src_install() { - dobin telegraf - insinto /etc/telegraf - doins etc/telegraf.conf - keepdir /etc/telegraf/telegraf.d - - insinto /etc/logrotate.d - doins etc/logrotate.d/telegraf - -systemd_dounit scripts/telegraf.service - newconfd "${FILESDIR}"/telegraf.confd telegraf - newinitd "${FILESDIR}"/telegraf.rc telegraf - - dodoc -r docs/* - - keepdir /var/log/telegraf - fowners telegraf:telegraf /var/log/telegraf -} diff --git a/net-analyzer/telegraf/telegraf-1.15.2.ebuild b/net-analyzer/telegraf/telegraf-1.15.2.ebuild deleted file mode 100644 index 607b7dc09d87..000000000000 --- a/net-analyzer/telegraf/telegraf-1.15.2.ebuild +++ /dev/null @@ -1,954 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit go-module systemd -MY_PV="${PV/_rc/-rc.}" -COMMIT=cd037b49 -BRANCH=release-1.15 -VERSION=v${MY_PV} - -DESCRIPTION="The plugin-driven server agent for collecting & reporting metrics." -HOMEPAGE="https://github.com/influxdata/telegraf" - -EGO_SUM=( - "cloud.google.com/go v0.26.0/go.mod" - "cloud.google.com/go v0.34.0/go.mod" - "cloud.google.com/go v0.37.4" - "cloud.google.com/go v0.37.4/go.mod" - "cloud.google.com/go v0.38.0/go.mod" - "cloud.google.com/go v0.44.1/go.mod" - "cloud.google.com/go v0.44.2/go.mod" - "cloud.google.com/go v0.45.1/go.mod" - "cloud.google.com/go v0.46.3/go.mod" - "cloud.google.com/go v0.50.0/go.mod" - "cloud.google.com/go v0.52.0/go.mod" - "cloud.google.com/go v0.53.0" - "cloud.google.com/go v0.53.0/go.mod" - "cloud.google.com/go/bigquery v1.0.1/go.mod" - "cloud.google.com/go/bigquery v1.3.0/go.mod" - "cloud.google.com/go/bigquery v1.4.0" - "cloud.google.com/go/bigquery v1.4.0/go.mod" - "cloud.google.com/go/datastore v1.0.0/go.mod" - "cloud.google.com/go/datastore v1.1.0" - "cloud.google.com/go/datastore v1.1.0/go.mod" - "cloud.google.com/go/pubsub v1.0.1/go.mod" - "cloud.google.com/go/pubsub v1.1.0/go.mod" - "cloud.google.com/go/pubsub v1.2.0" - "cloud.google.com/go/pubsub v1.2.0/go.mod" - "cloud.google.com/go/storage v1.0.0/go.mod" - "cloud.google.com/go/storage v1.5.0" - "cloud.google.com/go/storage v1.5.0/go.mod" - "code.cloudfoundry.org/clock v1.0.0" - "code.cloudfoundry.org/clock v1.0.0/go.mod" - "collectd.org v0.3.0" - "collectd.org v0.3.0/go.mod" - "dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod" - "github.com/Azure/azure-amqp-common-go/v3 v3.0.0" - "github.com/Azure/azure-amqp-common-go/v3 v3.0.0/go.mod" - "github.com/Azure/azure-event-hubs-go/v3 v3.2.0" - "github.com/Azure/azure-event-hubs-go/v3 v3.2.0/go.mod" - "github.com/Azure/azure-pipeline-go v0.1.8/go.mod" - "github.com/Azure/azure-pipeline-go v0.1.9" - "github.com/Azure/azure-pipeline-go v0.1.9/go.mod" - "github.com/Azure/azure-sdk-for-go v37.1.0+incompatible" - "github.com/Azure/azure-sdk-for-go v37.1.0+incompatible/go.mod" - "github.com/Azure/azure-storage-blob-go v0.6.0/go.mod" - "github.com/Azure/azure-storage-queue-go v0.0.0-20181215014128-6ed74e755687" - "github.com/Azure/azure-storage-queue-go v0.0.0-20181215014128-6ed74e755687/go.mod" - "github.com/Azure/go-amqp v0.12.6" - "github.com/Azure/go-amqp v0.12.6/go.mod" - "github.com/Azure/go-autorest/autorest v0.9.0/go.mod" - "github.com/Azure/go-autorest/autorest v0.9.3" - "github.com/Azure/go-autorest/autorest v0.9.3/go.mod" - "github.com/Azure/go-autorest/autorest/adal v0.5.0/go.mod" - "github.com/Azure/go-autorest/autorest/adal v0.8.0/go.mod" - "github.com/Azure/go-autorest/autorest/adal v0.8.1" - "github.com/Azure/go-autorest/autorest/adal v0.8.1/go.mod" - "github.com/Azure/go-autorest/autorest/azure/auth v0.4.2" - "github.com/Azure/go-autorest/autorest/azure/auth v0.4.2/go.mod" - "github.com/Azure/go-autorest/autorest/azure/cli v0.3.1" - "github.com/Azure/go-autorest/autorest/azure/cli v0.3.1/go.mod" - "github.com/Azure/go-autorest/autorest/date v0.1.0/go.mod" - "github.com/Azure/go-autorest/autorest/date v0.2.0" - "github.com/Azure/go-autorest/autorest/date v0.2.0/go.mod" - "github.com/Azure/go-autorest/autorest/mocks v0.1.0/go.mod" - "github.com/Azure/go-autorest/autorest/mocks v0.2.0/go.mod" - "github.com/Azure/go-autorest/autorest/mocks v0.3.0" - "github.com/Azure/go-autorest/autorest/mocks v0.3.0/go.mod" - "github.com/Azure/go-autorest/autorest/to v0.3.0" - "github.com/Azure/go-autorest/autorest/to v0.3.0/go.mod" - "github.com/Azure/go-autorest/autorest/validation v0.2.0" - "github.com/Azure/go-autorest/autorest/validation v0.2.0/go.mod" - "github.com/Azure/go-autorest/logger v0.1.0" - "github.com/Azure/go-autorest/logger v0.1.0/go.mod" - "github.com/Azure/go-autorest/tracing v0.5.0" - "github.com/Azure/go-autorest/tracing v0.5.0/go.mod" - "github.com/BurntSushi/toml v0.3.1" - "github.com/BurntSushi/toml v0.3.1/go.mod" - "github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod" - "github.com/DataDog/datadog-go v3.2.0+incompatible/go.mod" - "github.com/Mellanox/rdmamap v0.0.0-20191106181932-7c3c4763a6ee" - "github.com/Mellanox/rdmamap v0.0.0-20191106181932-7c3c4763a6ee/go.mod" - "github.com/Microsoft/ApplicationInsights-Go v0.4.2" - "github.com/Microsoft/ApplicationInsights-Go v0.4.2/go.mod" - "github.com/Microsoft/go-winio v0.4.9" - "github.com/Microsoft/go-winio v0.4.9/go.mod" - "github.com/NYTimes/gziphandler v0.0.0-20170623195520-56545f4a5d46/go.mod" - "github.com/PuerkitoBio/purell v1.0.0/go.mod" - "github.com/PuerkitoBio/urlesc v0.0.0-20160726150825-5bd2802263f2/go.mod" - "github.com/Shopify/sarama v1.19.0/go.mod" - "github.com/Shopify/sarama v1.24.1" - "github.com/Shopify/sarama v1.24.1/go.mod" - "github.com/Shopify/toxiproxy v2.1.4+incompatible" - "github.com/Shopify/toxiproxy v2.1.4+incompatible/go.mod" - "github.com/StackExchange/wmi v0.0.0-20180116203802-5d049714c4a6" - "github.com/StackExchange/wmi v0.0.0-20180116203802-5d049714c4a6/go.mod" - "github.com/aerospike/aerospike-client-go v1.27.0" - "github.com/aerospike/aerospike-client-go v1.27.0/go.mod" - "github.com/ajstarks/svgo v0.0.0-20180226025133-644b8db467af/go.mod" - "github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod" - "github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod" - "github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf" - "github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod" - "github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4" - "github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod" - "github.com/amir/raidman v0.0.0-20170415203553-1ccc43bfb9c9" - "github.com/amir/raidman v0.0.0-20170415203553-1ccc43bfb9c9/go.mod" - "github.com/apache/thrift v0.12.0" - "github.com/apache/thrift v0.12.0/go.mod" - "github.com/aristanetworks/glog v0.0.0-20191112221043-67e8567f59f3" - "github.com/aristanetworks/glog v0.0.0-20191112221043-67e8567f59f3/go.mod" - "github.com/aristanetworks/goarista v0.0.0-20190325233358-a123909ec740" - "github.com/aristanetworks/goarista v0.0.0-20190325233358-a123909ec740/go.mod" - "github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod" - "github.com/armon/go-metrics v0.3.0" - "github.com/armon/go-metrics v0.3.0/go.mod" - "github.com/aws/aws-sdk-go v1.30.9" - "github.com/aws/aws-sdk-go v1.30.9/go.mod" - "github.com/benbjohnson/clock v1.0.3" - "github.com/benbjohnson/clock v1.0.3/go.mod" - "github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973" - "github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod" - "github.com/beorn7/perks v1.0.0/go.mod" - "github.com/beorn7/perks v1.0.1" - "github.com/beorn7/perks v1.0.1/go.mod" - "github.com/bitly/go-hostpool v0.1.0" - "github.com/bitly/go-hostpool v0.1.0/go.mod" - "github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869" - "github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869/go.mod" - "github.com/caio/go-tdigest v2.3.0+incompatible" - "github.com/caio/go-tdigest v2.3.0+incompatible/go.mod" - "github.com/cenkalti/backoff v2.0.0+incompatible" - "github.com/cenkalti/backoff v2.0.0+incompatible/go.mod" - "github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod" - "github.com/cespare/xxhash/v2 v2.1.1" - "github.com/cespare/xxhash/v2 v2.1.1/go.mod" - "github.com/chzyer/logex v1.1.10/go.mod" - "github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod" - "github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod" - "github.com/circonus-labs/circonus-gometrics v2.3.1+incompatible/go.mod" - "github.com/circonus-labs/circonusllhist v0.1.3/go.mod" - "github.com/cisco-ie/nx-telemetry-proto v0.0.0-20190531143454-82441e232cf6" - "github.com/cisco-ie/nx-telemetry-proto v0.0.0-20190531143454-82441e232cf6/go.mod" - "github.com/client9/misspell v0.3.4/go.mod" - "github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod" - "github.com/cockroachdb/apd v1.1.0" - "github.com/cockroachdb/apd v1.1.0/go.mod" - "github.com/couchbase/go-couchbase v0.0.0-20180501122049-16db1f1fe037" - "github.com/couchbase/go-couchbase v0.0.0-20180501122049-16db1f1fe037/go.mod" - "github.com/couchbase/gomemcached v0.0.0-20180502221210-0da75df14530" - "github.com/couchbase/gomemcached v0.0.0-20180502221210-0da75df14530/go.mod" - "github.com/couchbase/goutils v0.0.0-20180530154633-e865a1461c8a" - "github.com/couchbase/goutils v0.0.0-20180530154633-e865a1461c8a/go.mod" - "github.com/davecgh/go-spew v0.0.0-20151105211317-5215b55f46b2/go.mod" - "github.com/davecgh/go-spew v1.1.0/go.mod" - "github.com/davecgh/go-spew v1.1.1" - "github.com/davecgh/go-spew v1.1.1/go.mod" - "github.com/denisenkom/go-mssqldb v0.0.0-20190707035753-2be1aa521ff4" - "github.com/denisenkom/go-mssqldb v0.0.0-20190707035753-2be1aa521ff4/go.mod" - "github.com/devigned/tab v0.1.1" - "github.com/devigned/tab v0.1.1/go.mod" - "github.com/dgrijalva/jwt-go v3.2.0+incompatible" - "github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod" - "github.com/dimchansky/utfbom v1.1.0" - "github.com/dimchansky/utfbom v1.1.0/go.mod" - "github.com/docker/distribution v2.6.0-rc.1.0.20170726174610-edc3ab29cdff+incompatible" - "github.com/docker/distribution v2.6.0-rc.1.0.20170726174610-edc3ab29cdff+incompatible/go.mod" - "github.com/docker/docker v1.4.2-0.20180327123150-ed7b6428c133" - "github.com/docker/docker v1.4.2-0.20180327123150-ed7b6428c133/go.mod" - "github.com/docker/go-connections v0.3.0" - "github.com/docker/go-connections v0.3.0/go.mod" - "github.com/docker/go-units v0.3.3" - "github.com/docker/go-units v0.3.3/go.mod" - "github.com/docker/libnetwork v0.8.0-dev.2.0.20181012153825-d7b61745d166" - "github.com/docker/libnetwork v0.8.0-dev.2.0.20181012153825-d7b61745d166/go.mod" - "github.com/docker/spdystream v0.0.0-20160310174837-449fdfce4d96/go.mod" - "github.com/eapache/go-resiliency v1.1.0" - "github.com/eapache/go-resiliency v1.1.0/go.mod" - "github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21" - "github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21/go.mod" - "github.com/eapache/queue v1.1.0" - "github.com/eapache/queue v1.1.0/go.mod" - "github.com/eclipse/paho.mqtt.golang v1.2.0" - "github.com/eclipse/paho.mqtt.golang v1.2.0/go.mod" - "github.com/elazarl/goproxy v0.0.0-20170405201442-c4fc26588b6e/go.mod" - "github.com/emicklei/go-restful v0.0.0-20170410110728-ff4f55a20633/go.mod" - "github.com/envoyproxy/go-control-plane v0.9.0/go.mod" - "github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod" - "github.com/envoyproxy/go-control-plane v0.9.4/go.mod" - "github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod" - "github.com/ericchiang/k8s v1.2.0" - "github.com/ericchiang/k8s v1.2.0/go.mod" - "github.com/evanphx/json-patch v4.2.0+incompatible/go.mod" - "github.com/fogleman/gg v1.2.1-0.20190220221249-0403632d5b90/go.mod" - "github.com/fortytw2/leaktest v1.3.0" - "github.com/fortytw2/leaktest v1.3.0/go.mod" - "github.com/frankban/quicktest v1.4.1" - "github.com/frankban/quicktest v1.4.1/go.mod" - "github.com/fsnotify/fsnotify v1.4.7" - "github.com/fsnotify/fsnotify v1.4.7/go.mod" - "github.com/ghodss/yaml v0.0.0-20150909031657-73d445a93680/go.mod" - "github.com/ghodss/yaml v1.0.1-0.20190212211648-25d852aebe32" - "github.com/ghodss/yaml v1.0.1-0.20190212211648-25d852aebe32/go.mod" - "github.com/glinton/ping v0.1.4-0.20200311211934-5ac87da8cd96" - "github.com/glinton/ping v0.1.4-0.20200311211934-5ac87da8cd96/go.mod" - "github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod" - "github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod" - "github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod" - "github.com/go-kit/kit v0.8.0/go.mod" - "github.com/go-kit/kit v0.9.0/go.mod" - "github.com/go-logfmt/logfmt v0.3.0/go.mod" - "github.com/go-logfmt/logfmt v0.4.0" - "github.com/go-logfmt/logfmt v0.4.0/go.mod" - "github.com/go-logr/logr v0.1.0/go.mod" - "github.com/go-ole/go-ole v1.2.1" - "github.com/go-ole/go-ole v1.2.1/go.mod" - "github.com/go-openapi/jsonpointer v0.0.0-20160704185906-46af16f9f7b1/go.mod" - "github.com/go-openapi/jsonreference v0.0.0-20160704190145-13c6e3589ad9/go.mod" - "github.com/go-openapi/spec v0.0.0-20160808142527-6aced65f8501/go.mod" - "github.com/go-openapi/swag v0.0.0-20160704191624-1d0bd113de87/go.mod" - "github.com/go-redis/redis v6.12.0+incompatible" - "github.com/go-redis/redis v6.12.0+incompatible/go.mod" - "github.com/go-sql-driver/mysql v1.5.0" - "github.com/go-sql-driver/mysql v1.5.0/go.mod" - "github.com/go-stack/stack v1.8.0/go.mod" - "github.com/goburrow/modbus v0.1.0" - "github.com/goburrow/modbus v0.1.0/go.mod" - "github.com/goburrow/serial v0.1.0" - "github.com/goburrow/serial v0.1.0/go.mod" - "github.com/gobwas/glob v0.2.3" - "github.com/gobwas/glob v0.2.3/go.mod" - "github.com/gofrs/uuid v2.1.0+incompatible" - "github.com/gofrs/uuid v2.1.0+incompatible/go.mod" - "github.com/gofrs/uuid v3.2.0+incompatible" - "github.com/gofrs/uuid v3.2.0+incompatible/go.mod" - "github.com/gogo/protobuf v1.1.1/go.mod" - "github.com/gogo/protobuf v1.2.0/go.mod" - "github.com/gogo/protobuf v1.2.2-0.20190723190241-65acae22fc9d" - "github.com/gogo/protobuf v1.2.2-0.20190723190241-65acae22fc9d/go.mod" - "github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0/go.mod" - "github.com/golang/geo v0.0.0-20190916061304-5b978397cfec" - "github.com/golang/geo v0.0.0-20190916061304-5b978397cfec/go.mod" - "github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b" - "github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod" - "github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903/go.mod" - "github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod" - "github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod" - "github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e" - "github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod" - "github.com/golang/mock v1.1.1/go.mod" - "github.com/golang/mock v1.2.0/go.mod" - "github.com/golang/mock v1.3.1/go.mod" - "github.com/golang/mock v1.4.0/go.mod" - "github.com/golang/protobuf v0.0.0-20161109072736-4bd1920723d7/go.mod" - "github.com/golang/protobuf v1.2.0/go.mod" - "github.com/golang/protobuf v1.3.1/go.mod" - "github.com/golang/protobuf v1.3.2" - "github.com/golang/protobuf v1.3.2/go.mod" - "github.com/golang/protobuf v1.3.3/go.mod" - "github.com/golang/protobuf v1.3.5" - "github.com/golang/protobuf v1.3.5/go.mod" - "github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db/go.mod" - "github.com/golang/snappy v0.0.1" - "github.com/golang/snappy v0.0.1/go.mod" - "github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c" - "github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod" - "github.com/google/btree v1.0.0" - "github.com/google/btree v1.0.0/go.mod" - "github.com/google/go-cmp v0.2.0/go.mod" - "github.com/google/go-cmp v0.3.0/go.mod" - "github.com/google/go-cmp v0.3.1" - "github.com/google/go-cmp v0.3.1/go.mod" - "github.com/google/go-cmp v0.3.1/go.mod" - "github.com/google/go-cmp v0.4.0" - "github.com/google/go-cmp v0.4.0" - "github.com/google/go-cmp v0.4.0/go.mod" - "github.com/google/go-cmp v0.4.0/go.mod" - "github.com/google/go-github v17.0.0+incompatible" - "github.com/google/go-github v17.0.0+incompatible/go.mod" - "github.com/google/go-querystring v1.0.0" - "github.com/google/go-querystring v1.0.0/go.mod" - "github.com/google/gofuzz v0.0.0-20161122191042-44d81051d367/go.mod" - "github.com/google/gofuzz v1.0.0" - "github.com/google/gofuzz v1.0.0/go.mod" - "github.com/google/martian v2.1.0+incompatible" - "github.com/google/martian v2.1.0+incompatible/go.mod" - "github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod" - "github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod" - "github.com/google/pprof v0.0.0-20191218002539-d4f498aebedc/go.mod" - "github.com/google/pprof v0.0.0-20200212024743-f11f1df84d12/go.mod" - "github.com/google/renameio v0.1.0/go.mod" - "github.com/google/uuid v1.1.1" - "github.com/google/uuid v1.1.1/go.mod" - "github.com/googleapis/gax-go/v2 v2.0.4" - "github.com/googleapis/gax-go/v2 v2.0.4/go.mod" - "github.com/googleapis/gax-go/v2 v2.0.5" - "github.com/googleapis/gax-go/v2 v2.0.5/go.mod" - "github.com/googleapis/gnostic v0.0.0-20170729233727-0c5108395e2d/go.mod" - "github.com/gorilla/context v1.1.1" - "github.com/gorilla/context v1.1.1/go.mod" - "github.com/gorilla/mux v1.6.2" - "github.com/gorilla/mux v1.6.2/go.mod" - "github.com/gotestyourself/gotestyourself v2.2.0+incompatible" - "github.com/gotestyourself/gotestyourself v2.2.0+incompatible/go.mod" - "github.com/hailocab/go-hostpool v0.0.0-20160125115350-e80d13ce29ed" - "github.com/hailocab/go-hostpool v0.0.0-20160125115350-e80d13ce29ed/go.mod" - "github.com/harlow/kinesis-consumer v0.3.1-0.20181230152818-2f58b136fee0" - "github.com/harlow/kinesis-consumer v0.3.1-0.20181230152818-2f58b136fee0/go.mod" - "github.com/hashicorp/consul v1.2.1" - "github.com/hashicorp/consul v1.2.1/go.mod" - "github.com/hashicorp/errwrap v1.0.0" - "github.com/hashicorp/errwrap v1.0.0/go.mod" - "github.com/hashicorp/go-cleanhttp v0.5.0" - "github.com/hashicorp/go-cleanhttp v0.5.0/go.mod" - "github.com/hashicorp/go-immutable-radix v1.0.0" - "github.com/hashicorp/go-immutable-radix v1.0.0/go.mod" - "github.com/hashicorp/go-msgpack v0.5.3/go.mod" - "github.com/hashicorp/go-msgpack v0.5.5" - "github.com/hashicorp/go-msgpack v0.5.5/go.mod" - "github.com/hashicorp/go-multierror v1.0.0" - "github.com/hashicorp/go-multierror v1.0.0/go.mod" - "github.com/hashicorp/go-retryablehttp v0.5.3/go.mod" - "github.com/hashicorp/go-rootcerts v0.0.0-20160503143440-6bb64b370b90" - "github.com/hashicorp/go-rootcerts v0.0.0-20160503143440-6bb64b370b90/go.mod" - "github.com/hashicorp/go-sockaddr v1.0.0" - "github.com/hashicorp/go-sockaddr v1.0.0/go.mod" - "github.com/hashicorp/go-uuid v1.0.0/go.mod" - "github.com/hashicorp/go-uuid v1.0.1" - "github.com/hashicorp/go-uuid v1.0.1/go.mod" - "github.com/hashicorp/golang-lru v0.5.0/go.mod" - "github.com/hashicorp/golang-lru v0.5.1" - "github.com/hashicorp/golang-lru v0.5.1/go.mod" - "github.com/hashicorp/memberlist v0.1.5" - "github.com/hashicorp/memberlist v0.1.5/go.mod" - "github.com/hashicorp/serf v0.8.1" - "github.com/hashicorp/serf v0.8.1/go.mod" - "github.com/hpcloud/tail v1.0.0" - "github.com/hpcloud/tail v1.0.0/go.mod" - "github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod" - "github.com/influxdata/go-syslog/v2 v2.0.1" - "github.com/influxdata/go-syslog/v2 v2.0.1/go.mod" - "github.com/influxdata/tail v1.0.1-0.20200707181643-03a791b270e4" - "github.com/influxdata/tail v1.0.1-0.20200707181643-03a791b270e4/go.mod" - "github.com/influxdata/toml v0.0.0-20190415235208-270119a8ce65" - "github.com/influxdata/toml v0.0.0-20190415235208-270119a8ce65/go.mod" - "github.com/influxdata/wlog v0.0.0-20160411224016-7c63b0a71ef8" - "github.com/influxdata/wlog v0.0.0-20160411224016-7c63b0a71ef8/go.mod" - "github.com/jackc/fake v0.0.0-20150926172116-812a484cc733" - "github.com/jackc/fake v0.0.0-20150926172116-812a484cc733/go.mod" - "github.com/jackc/pgx v3.6.0+incompatible" - "github.com/jackc/pgx v3.6.0+incompatible/go.mod" - "github.com/jcmturner/gofork v0.0.0-20190328161633-dc7c13fece03/go.mod" - "github.com/jcmturner/gofork v1.0.0" - "github.com/jcmturner/gofork v1.0.0/go.mod" - "github.com/jmespath/go-jmespath v0.3.0" - "github.com/jmespath/go-jmespath v0.3.0/go.mod" - "github.com/joho/godotenv v1.3.0" - "github.com/joho/godotenv v1.3.0/go.mod" - "github.com/jpillora/backoff v0.0.0-20180909062703-3050d21c67d7" - "github.com/jpillora/backoff v0.0.0-20180909062703-3050d21c67d7/go.mod" - "github.com/jsimonetti/rtnetlink v0.0.0-20190606172950-9527aa82566a/go.mod" - "github.com/jsimonetti/rtnetlink v0.0.0-20200117123717-f846d4f6c1f4" - "github.com/jsimonetti/rtnetlink v0.0.0-20200117123717-f846d4f6c1f4/go.mod" - "github.com/json-iterator/go v0.0.0-20180612202835-f2b4162afba3/go.mod" - "github.com/json-iterator/go v1.1.6/go.mod" - "github.com/json-iterator/go v1.1.8/go.mod" - "github.com/json-iterator/go v1.1.9/go.mod" - "github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod" - "github.com/jstemmer/go-junit-report v0.9.1" - "github.com/jstemmer/go-junit-report v0.9.1/go.mod" - "github.com/julienschmidt/httprouter v1.2.0/go.mod" - "github.com/jung-kurt/gofpdf v1.0.3-0.20190309125859-24315acbbda5/go.mod" - "github.com/kardianos/service v1.0.0" - "github.com/kardianos/service v1.0.0/go.mod" - "github.com/karrick/godirwalk v1.12.0" - "github.com/karrick/godirwalk v1.12.0/go.mod" - "github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51" - "github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51/go.mod" - "github.com/kisielk/errcheck v1.2.0/go.mod" - "github.com/kisielk/gotool v1.0.0/go.mod" - "github.com/klauspost/compress v1.8.2/go.mod" - "github.com/klauspost/compress v1.9.2" - "github.com/klauspost/compress v1.9.2/go.mod" - "github.com/konsorten/go-windows-terminal-sequences v1.0.1" - "github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod" - "github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515" - "github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod" - "github.com/kr/pretty v0.1.0" - "github.com/kr/pretty v0.1.0/go.mod" - "github.com/kr/pty v1.1.1/go.mod" - "github.com/kr/text v0.1.0" - "github.com/kr/text v0.1.0/go.mod" - "github.com/kubernetes/apimachinery v0.0.0-20190119020841-d41becfba9ee" - "github.com/kubernetes/apimachinery v0.0.0-20190119020841-d41becfba9ee/go.mod" - "github.com/kylelemons/godebug v1.1.0" - "github.com/kylelemons/godebug v1.1.0/go.mod" - "github.com/leesper/go_rng v0.0.0-20190531154944-a612b043e353" - "github.com/leesper/go_rng v0.0.0-20190531154944-a612b043e353/go.mod" - "github.com/leodido/ragel-machinery v0.0.0-20181214104525-299bdde78165" - "github.com/leodido/ragel-machinery v0.0.0-20181214104525-299bdde78165/go.mod" - "github.com/lib/pq v1.3.0" - "github.com/lib/pq v1.3.0/go.mod" - "github.com/mailru/easyjson v0.0.0-20160728113105-d5b7844b561a/go.mod" - "github.com/mailru/easyjson v0.0.0-20180717111219-efc7eb8984d6" - "github.com/mailru/easyjson v0.0.0-20180717111219-efc7eb8984d6/go.mod" - "github.com/matttproud/golang_protobuf_extensions v1.0.1" - "github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod" - "github.com/mdlayher/apcupsd v0.0.0-20190314144147-eb3dd99a75fe" - "github.com/mdlayher/apcupsd v0.0.0-20190314144147-eb3dd99a75fe/go.mod" - "github.com/mdlayher/genetlink v1.0.0" - "github.com/mdlayher/genetlink v1.0.0/go.mod" - "github.com/mdlayher/netlink v0.0.0-20190409211403-11939a169225/go.mod" - "github.com/mdlayher/netlink v1.0.0/go.mod" - "github.com/mdlayher/netlink v1.1.0" - "github.com/mdlayher/netlink v1.1.0/go.mod" - "github.com/miekg/dns v1.0.14" - "github.com/miekg/dns v1.0.14/go.mod" - "github.com/mikioh/ipaddr v0.0.0-20190404000644-d465c8ab6721" - "github.com/mikioh/ipaddr v0.0.0-20190404000644-d465c8ab6721/go.mod" - "github.com/mitchellh/go-homedir v1.1.0" - "github.com/mitchellh/go-homedir v1.1.0/go.mod" - "github.com/mitchellh/go-testing-interface v1.0.0" - "github.com/mitchellh/go-testing-interface v1.0.0/go.mod" - "github.com/mitchellh/mapstructure v1.1.2" - "github.com/mitchellh/mapstructure v1.1.2/go.mod" - "github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod" - "github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod" - "github.com/modern-go/reflect2 v0.0.0-20180320133207-05fbef0ca5da/go.mod" - "github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod" - "github.com/modern-go/reflect2 v1.0.1/go.mod" - "github.com/multiplay/go-ts3 v1.0.0" - "github.com/multiplay/go-ts3 v1.0.0/go.mod" - "github.com/munnerz/goautoneg v0.0.0-20120707110453-a547fc61f48d/go.mod" - "github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod" - "github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod" - "github.com/naoina/go-stringutil v0.1.0" - "github.com/naoina/go-stringutil v0.1.0/go.mod" - "github.com/nats-io/jwt v0.3.0/go.mod" - "github.com/nats-io/jwt v0.3.2" - "github.com/nats-io/jwt v0.3.2/go.mod" - "github.com/nats-io/nats-server/v2 v2.1.4" - "github.com/nats-io/nats-server/v2 v2.1.4/go.mod" - "github.com/nats-io/nats.go v1.9.1" - "github.com/nats-io/nats.go v1.9.1/go.mod" - "github.com/nats-io/nkeys v0.1.0/go.mod" - "github.com/nats-io/nkeys v0.1.3" - "github.com/nats-io/nkeys v0.1.3/go.mod" - "github.com/nats-io/nuid v1.0.1" - "github.com/nats-io/nuid v1.0.1/go.mod" - "github.com/newrelic/newrelic-telemetry-sdk-go v0.2.0" - "github.com/newrelic/newrelic-telemetry-sdk-go v0.2.0/go.mod" - "github.com/nsqio/go-nsq v1.0.7" - "github.com/nsqio/go-nsq v1.0.7/go.mod" - "github.com/onsi/ginkgo v0.0.0-20170829012221-11459a886d9c/go.mod" - "github.com/onsi/ginkgo v1.6.0/go.mod" - "github.com/onsi/ginkgo v1.7.0/go.mod" - "github.com/onsi/ginkgo v1.10.1" - "github.com/onsi/ginkgo v1.10.1/go.mod" - "github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod" - "github.com/onsi/gomega v1.4.3/go.mod" - "github.com/onsi/gomega v1.7.0" - "github.com/onsi/gomega v1.7.0/go.mod" - "github.com/openconfig/gnmi v0.0.0-20180912164834-33a1865c3029" - "github.com/openconfig/gnmi v0.0.0-20180912164834-33a1865c3029/go.mod" - "github.com/opencontainers/go-digest v1.0.0-rc1" - "github.com/opencontainers/go-digest v1.0.0-rc1/go.mod" - "github.com/opencontainers/image-spec v1.0.1" - "github.com/opencontainers/image-spec v1.0.1/go.mod" - "github.com/opentracing-contrib/go-observer v0.0.0-20170622124052-a52f23424492" - "github.com/opentracing-contrib/go-observer v0.0.0-20170622124052-a52f23424492/go.mod" - "github.com/opentracing/opentracing-go v1.0.2" - "github.com/opentracing/opentracing-go v1.0.2/go.mod" - "github.com/openzipkin/zipkin-go v0.1.6/go.mod" - "github.com/openzipkin/zipkin-go-opentracing v0.3.4" - "github.com/openzipkin/zipkin-go-opentracing v0.3.4/go.mod" - "github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod" - "github.com/pascaldekloe/goe v0.1.0" - "github.com/pascaldekloe/goe v0.1.0/go.mod" - "github.com/pierrec/lz4 v2.0.5+incompatible/go.mod" - "github.com/pierrec/lz4 v2.2.6+incompatible" - "github.com/pierrec/lz4 v2.2.6+incompatible/go.mod" - "github.com/pkg/errors v0.8.0/go.mod" - "github.com/pkg/errors v0.8.1" - "github.com/pkg/errors v0.8.1/go.mod" - "github.com/pkg/errors v0.9.1" - "github.com/pkg/errors v0.9.1/go.mod" - "github.com/pmezard/go-difflib v0.0.0-20151028094244-d8ed2627bdf0/go.mod" - "github.com/pmezard/go-difflib v1.0.0" - "github.com/pmezard/go-difflib v1.0.0/go.mod" - "github.com/prometheus/client_golang v0.9.1/go.mod" - "github.com/prometheus/client_golang v0.9.2/go.mod" - "github.com/prometheus/client_golang v0.9.3-0.20190127221311-3c4408c8b829" - "github.com/prometheus/client_golang v0.9.3-0.20190127221311-3c4408c8b829/go.mod" - "github.com/prometheus/client_golang v1.0.0/go.mod" - "github.com/prometheus/client_golang v1.5.1" - "github.com/prometheus/client_golang v1.5.1/go.mod" - "github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod" - "github.com/prometheus/client_model v0.0.0-20190115171406-56726106282f" - "github.com/prometheus/client_model v0.0.0-20190115171406-56726106282f/go.mod" - "github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod" - "github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4" - "github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod" - "github.com/prometheus/client_model v0.2.0" - "github.com/prometheus/client_model v0.2.0/go.mod" - "github.com/prometheus/common v0.0.0-20181126121408-4724e9255275/go.mod" - "github.com/prometheus/common v0.2.0" - "github.com/prometheus/common v0.2.0/go.mod" - "github.com/prometheus/common v0.4.1/go.mod" - "github.com/prometheus/common v0.9.1" - "github.com/prometheus/common v0.9.1/go.mod" - "github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod" - "github.com/prometheus/procfs v0.0.0-20181204211112-1dc9a6cbc91a/go.mod" - "github.com/prometheus/procfs v0.0.0-20190117184657-bf6a532e95b1" - "github.com/prometheus/procfs v0.0.0-20190117184657-bf6a532e95b1/go.mod" - "github.com/prometheus/procfs v0.0.2/go.mod" - "github.com/prometheus/procfs v0.0.8" - "github.com/prometheus/procfs v0.0.8/go.mod" - "github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a" - "github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a/go.mod" - "github.com/rogpeppe/go-internal v1.3.0/go.mod" - "github.com/safchain/ethtool v0.0.0-20200218184317-f459e2d13664" - "github.com/safchain/ethtool v0.0.0-20200218184317-f459e2d13664/go.mod" - "github.com/samuel/go-zookeeper v0.0.0-20180130194729-c4fab1ac1bec" - "github.com/samuel/go-zookeeper v0.0.0-20180130194729-c4fab1ac1bec/go.mod" - "github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529" - "github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod" - "github.com/shirou/gopsutil v2.20.5+incompatible" - "github.com/shirou/gopsutil v2.20.5+incompatible/go.mod" - "github.com/shopspring/decimal v0.0.0-20200105231215-408a2507e114" - "github.com/shopspring/decimal v0.0.0-20200105231215-408a2507e114/go.mod" - "github.com/sirupsen/logrus v1.2.0" - "github.com/sirupsen/logrus v1.2.0/go.mod" - "github.com/sirupsen/logrus v1.4.2" - "github.com/sirupsen/logrus v1.4.2/go.mod" - "github.com/soniah/gosnmp v1.25.0" - "github.com/soniah/gosnmp v1.25.0/go.mod" - "github.com/spf13/pflag v0.0.0-20170130214245-9ff6c6923cff/go.mod" - "github.com/spf13/pflag v1.0.5/go.mod" - "github.com/streadway/amqp v0.0.0-20180528204448-e5adc2ada8b8" - "github.com/streadway/amqp v0.0.0-20180528204448-e5adc2ada8b8/go.mod" - "github.com/stretchr/objx v0.1.0/go.mod" - "github.com/stretchr/objx v0.1.1" - "github.com/stretchr/objx v0.1.1/go.mod" - "github.com/stretchr/testify v0.0.0-20151208002404-e3a8ff8ce365/go.mod" - "github.com/stretchr/testify v1.2.2/go.mod" - "github.com/stretchr/testify v1.3.0/go.mod" - "github.com/stretchr/testify v1.4.0" - "github.com/stretchr/testify v1.4.0/go.mod" - "github.com/stretchr/testify v1.5.1" - "github.com/stretchr/testify v1.5.1/go.mod" - "github.com/tbrandon/mbserver v0.0.0-20170611213546-993e1772cc62" - "github.com/tbrandon/mbserver v0.0.0-20170611213546-993e1772cc62/go.mod" - "github.com/tedsuo/ifrit v0.0.0-20191009134036-9a97d0632f00" - "github.com/tedsuo/ifrit v0.0.0-20191009134036-9a97d0632f00/go.mod" - "github.com/tidwall/gjson v1.6.0" - "github.com/tidwall/gjson v1.6.0/go.mod" - "github.com/tidwall/match v1.0.1" - "github.com/tidwall/match v1.0.1/go.mod" - "github.com/tidwall/pretty v1.0.0" - "github.com/tidwall/pretty v1.0.0/go.mod" - "github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926/go.mod" - "github.com/vishvananda/netlink v0.0.0-20171020171820-b2de5d10e38e" - "github.com/vishvananda/netlink v0.0.0-20171020171820-b2de5d10e38e/go.mod" - "github.com/vishvananda/netns v0.0.0-20180720170159-13995c7128cc" - "github.com/vishvananda/netns v0.0.0-20180720170159-13995c7128cc/go.mod" - "github.com/vjeantet/grok v1.0.0" - "github.com/vjeantet/grok v1.0.0/go.mod" - "github.com/vmware/govmomi v0.19.0" - "github.com/vmware/govmomi v0.19.0/go.mod" - "github.com/wavefronthq/wavefront-sdk-go v0.9.2" - "github.com/wavefronthq/wavefront-sdk-go v0.9.2/go.mod" - "github.com/wvanbergen/kafka v0.0.0-20171203153745-e2edea948ddf" - "github.com/wvanbergen/kafka v0.0.0-20171203153745-e2edea948ddf/go.mod" - "github.com/wvanbergen/kazoo-go v0.0.0-20180202103751-f72d8611297a" - "github.com/wvanbergen/kazoo-go v0.0.0-20180202103751-f72d8611297a/go.mod" - "github.com/xdg/scram v0.0.0-20180814205039-7eeb5667e42c/go.mod" - "github.com/xdg/stringprep v1.0.0/go.mod" - "github.com/yuin/goldmark v1.1.25/go.mod" - "github.com/yuin/gopher-lua v0.0.0-20180630135845-46796da1b0b4" - "github.com/yuin/gopher-lua v0.0.0-20180630135845-46796da1b0b4/go.mod" - "go.opencensus.io v0.20.1" - "go.opencensus.io v0.20.1/go.mod" - "go.opencensus.io v0.21.0/go.mod" - "go.opencensus.io v0.22.0/go.mod" - "go.opencensus.io v0.22.2/go.mod" - "go.opencensus.io v0.22.3" - "go.opencensus.io v0.22.3/go.mod" - "go.starlark.net v0.0.0-20191227232015-caa3e9aa5008" - "go.starlark.net v0.0.0-20191227232015-caa3e9aa5008/go.mod" - "golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod" - "golang.org/x/crypto v0.0.0-20181029021203-45a5f77698d3/go.mod" - "golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod" - "golang.org/x/crypto v0.0.0-20190325154230-a5d413f7728c/go.mod" - "golang.org/x/crypto v0.0.0-20190404164418-38d8ce5564a5/go.mod" - "golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod" - "golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod" - "golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4/go.mod" - "golang.org/x/crypto v0.0.0-20191002192127-34f69633bfdc/go.mod" - "golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod" - "golang.org/x/crypto v0.0.0-20191206172530-e9b2fee46413" - "golang.org/x/crypto v0.0.0-20191206172530-e9b2fee46413/go.mod" - "golang.org/x/crypto v0.0.0-20200204104054-c9f3fb736b72" - "golang.org/x/crypto v0.0.0-20200204104054-c9f3fb736b72/go.mod" - "golang.org/x/exp v0.0.0-20180321215751-8460e604b9de/go.mod" - "golang.org/x/exp v0.0.0-20180807140117-3d87b88a115f/go.mod" - "golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod" - "golang.org/x/exp v0.0.0-20190125153040-c74c464bbbf2" - "golang.org/x/exp v0.0.0-20190125153040-c74c464bbbf2/go.mod" - "golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod" - "golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod" - "golang.org/x/exp v0.0.0-20190829153037-c13cbed26979/go.mod" - "golang.org/x/exp v0.0.0-20191030013958-a1ab85dbe136/go.mod" - "golang.org/x/exp v0.0.0-20191129062945-2f5052295587/go.mod" - "golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod" - "golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod" - "golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod" - "golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6" - "golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod" - "golang.org/x/image v0.0.0-20180708004352-c73c2afc3b81/go.mod" - "golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod" - "golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod" - "golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod" - "golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod" - "golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod" - "golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod" - "golang.org/x/lint v0.0.0-20190409202823-959b441ac422/go.mod" - "golang.org/x/lint v0.0.0-20190909230951-414d861bb4ac/go.mod" - "golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod" - "golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f/go.mod" - "golang.org/x/lint v0.0.0-20200130185559-910be7a94367/go.mod" - "golang.org/x/lint v0.0.0-20200302205851-738671d3881b" - "golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod" - "golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod" - "golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod" - "golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod" - "golang.org/x/mod v0.1.0/go.mod" - "golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod" - "golang.org/x/mod v0.1.1-0.20191107180719-034126e5016b/go.mod" - "golang.org/x/mod v0.2.0" - "golang.org/x/mod v0.2.0/go.mod" - "golang.org/x/net v0.0.0-20170114055629-f2499483f923/go.mod" - "golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod" - "golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod" - "golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod" - "golang.org/x/net v0.0.0-20181023162649-9b4f9f5ad519/go.mod" - "golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod" - "golang.org/x/net v0.0.0-20181201002055-351d144fa1fc/go.mod" - "golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod" - "golang.org/x/net v0.0.0-20190125091013-d26f9f9a57f3/go.mod" - "golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod" - "golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod" - "golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod" - "golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod" - "golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod" - "golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod" - "golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod" - "golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod" - "golang.org/x/net v0.0.0-20190628185345-da137c7871d7/go.mod" - "golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod" - "golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297/go.mod" - "golang.org/x/net v0.0.0-20191003171128-d98b1b443823/go.mod" - "golang.org/x/net v0.0.0-20191004110552-13f9640d40b9" - "golang.org/x/net v0.0.0-20191004110552-13f9640d40b9/go.mod" - "golang.org/x/net v0.0.0-20191007182048-72f939374954/go.mod" - "golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod" - "golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa/go.mod" - "golang.org/x/net v0.0.0-20200202094626-16171245cfb2" - "golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod" - "golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod" - "golang.org/x/net v0.0.0-20200301022130-244492dfa37a" - "golang.org/x/net v0.0.0-20200301022130-244492dfa37a/go.mod" - "golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod" - "golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421" - "golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod" - "golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod" - "golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6/go.mod" - "golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d" - "golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod" - "golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod" - "golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod" - "golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod" - "golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod" - "golang.org/x/sync v0.0.0-20190423024810-112230192c58" - "golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod" - "golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod" - "golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a" - "golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod" - "golang.org/x/sys v0.0.0-20170830134202-bb24a47a89ea/go.mod" - "golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod" - "golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod" - "golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod" - "golang.org/x/sys v0.0.0-20181026203630-95b1ffbd15a5/go.mod" - "golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod" - "golang.org/x/sys v0.0.0-20181122145206-62eef0e2fa9b/go.mod" - "golang.org/x/sys v0.0.0-20190204203706-41f3e6584952/go.mod" - "golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod" - "golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod" - "golang.org/x/sys v0.0.0-20190403152447-81d4e9dc473e/go.mod" - "golang.org/x/sys v0.0.0-20190411185658-b44545bcd369/go.mod" - "golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod" - "golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod" - "golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod" - "golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod" - "golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod" - "golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod" - "golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod" - "golang.org/x/sys v0.0.0-20190826190057-c7b8b68b1456" - "golang.org/x/sys v0.0.0-20190826190057-c7b8b68b1456/go.mod" - "golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24/go.mod" - "golang.org/x/sys v0.0.0-20191002063906-3421d5a6bb1c" - "golang.org/x/sys v0.0.0-20191002063906-3421d5a6bb1c/go.mod" - "golang.org/x/sys v0.0.0-20191003212358-c178f38b412c/go.mod" - "golang.org/x/sys v0.0.0-20191008105621-543471e840be/go.mod" - "golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod" - "golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/go.mod" - "golang.org/x/sys v0.0.0-20200113162924-86b910548bc1/go.mod" - "golang.org/x/sys v0.0.0-20200122134326-e047566fdf82/go.mod" - "golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod" - "golang.org/x/sys v0.0.0-20200212091648-12a6c2dcc1e4" - "golang.org/x/sys v0.0.0-20200212091648-12a6c2dcc1e4/go.mod" - "golang.org/x/text v0.0.0-20160726164857-2910a502d2bf/go.mod" - "golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod" - "golang.org/x/text v0.3.0/go.mod" - "golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod" - "golang.org/x/text v0.3.2" - "golang.org/x/text v0.3.2/go.mod" - "golang.org/x/text v0.3.3" - "golang.org/x/text v0.3.3/go.mod" - "golang.org/x/time v0.0.0-20181108054448-85acf8d2951c" - "golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod" - "golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod" - "golang.org/x/time v0.0.0-20191024005414-555d28b269f0" - "golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod" - "golang.org/x/tools v0.0.0-20180525024113-a5b4c53f6e8b/go.mod" - "golang.org/x/tools v0.0.0-20180828015842-6cd1fcedba52/go.mod" - "golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod" - "golang.org/x/tools v0.0.0-20181011042414-1f849cf54d09/go.mod" - "golang.org/x/tools v0.0.0-20181030221726-6c7e314b6563/go.mod" - "golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod" - "golang.org/x/tools v0.0.0-20190206041539-40960b6deb8e/go.mod" - "golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod" - "golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod" - "golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod" - "golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod" - "golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod" - "golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod" - "golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod" - "golang.org/x/tools v0.0.0-20190606124116-d0a3d012864b/go.mod" - "golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod" - "golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod" - "golang.org/x/tools v0.0.0-20190816200558-6889da9d5479/go.mod" - "golang.org/x/tools v0.0.0-20190911174233-4f2ddba30aff/go.mod" - "golang.org/x/tools v0.0.0-20191012152004-8de300cfc20a/go.mod" - "golang.org/x/tools v0.0.0-20191113191852-77e3bb0ad9e7/go.mod" - "golang.org/x/tools v0.0.0-20191115202509-3a792d9c32b2/go.mod" - "golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod" - "golang.org/x/tools v0.0.0-20191125144606-a911d9008d1f/go.mod" - "golang.org/x/tools v0.0.0-20191130070609-6e064ea0cf2d/go.mod" - "golang.org/x/tools v0.0.0-20191216173652-a0e659d51361/go.mod" - "golang.org/x/tools v0.0.0-20191227053925-7b8e75db28f4/go.mod" - "golang.org/x/tools v0.0.0-20200117161641-43d50277825c/go.mod" - "golang.org/x/tools v0.0.0-20200122220014-bf1340f18c4a/go.mod" - "golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod" - "golang.org/x/tools v0.0.0-20200204074204-1cc6d1ef6c74/go.mod" - "golang.org/x/tools v0.0.0-20200207183749-b753a1ba74fa/go.mod" - "golang.org/x/tools v0.0.0-20200212150539-ea181f53ac56/go.mod" - "golang.org/x/tools v0.0.0-20200317043434-63da46f3035e" - "golang.org/x/tools v0.0.0-20200317043434-63da46f3035e/go.mod" - "golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod" - "golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod" - "golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543" - "golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod" - "golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod" - "golang.zx2c4.com/wireguard v0.0.20200121" - "golang.zx2c4.com/wireguard v0.0.20200121/go.mod" - "golang.zx2c4.com/wireguard/wgctrl v0.0.0-20200205215550-e35592f146e4" - "golang.zx2c4.com/wireguard/wgctrl v0.0.0-20200205215550-e35592f146e4/go.mod" - "gonum.org/v1/gonum v0.0.0-20180816165407-929014505bf4/go.mod" - "gonum.org/v1/gonum v0.6.2" - "gonum.org/v1/gonum v0.6.2/go.mod" - "gonum.org/v1/netlib v0.0.0-20190313105609-8cb42192e0e0" - "gonum.org/v1/netlib v0.0.0-20190313105609-8cb42192e0e0/go.mod" - "gonum.org/v1/plot v0.0.0-20190515093506-e2840ee46a6b/go.mod" - "google.golang.org/api v0.3.1" - "google.golang.org/api v0.3.1/go.mod" - "google.golang.org/api v0.4.0/go.mod" - "google.golang.org/api v0.7.0/go.mod" - "google.golang.org/api v0.8.0/go.mod" - "google.golang.org/api v0.9.0/go.mod" - "google.golang.org/api v0.13.0/go.mod" - "google.golang.org/api v0.14.0/go.mod" - "google.golang.org/api v0.15.0/go.mod" - "google.golang.org/api v0.17.0/go.mod" - "google.golang.org/api v0.20.0" - "google.golang.org/api v0.20.0/go.mod" - "google.golang.org/appengine v1.1.0/go.mod" - "google.golang.org/appengine v1.4.0" - "google.golang.org/appengine v1.4.0/go.mod" - "google.golang.org/appengine v1.5.0/go.mod" - "google.golang.org/appengine v1.6.1/go.mod" - "google.golang.org/appengine v1.6.5" - "google.golang.org/appengine v1.6.5/go.mod" - "google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod" - "google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod" - "google.golang.org/genproto v0.0.0-20190404172233-64821d5d2107" - "google.golang.org/genproto v0.0.0-20190404172233-64821d5d2107/go.mod" - "google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod" - "google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod" - "google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873/go.mod" - "google.golang.org/genproto v0.0.0-20190801165951-fa694d86fc64/go.mod" - "google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod" - "google.golang.org/genproto v0.0.0-20190911173649-1774047e7e51/go.mod" - "google.golang.org/genproto v0.0.0-20191108220845-16a3f7862a1a/go.mod" - "google.golang.org/genproto v0.0.0-20191115194625-c23dd37a84c9/go.mod" - "google.golang.org/genproto v0.0.0-20191216164720-4f79533eabd1/go.mod" - "google.golang.org/genproto v0.0.0-20191230161307-f3c370f40bfb/go.mod" - "google.golang.org/genproto v0.0.0-20200115191322-ca5a22157cba/go.mod" - "google.golang.org/genproto v0.0.0-20200122232147-0452cf42e150/go.mod" - "google.golang.org/genproto v0.0.0-20200204135345-fa8e72b47b90/go.mod" - "google.golang.org/genproto v0.0.0-20200212174721-66ed5ce911ce/go.mod" - "google.golang.org/genproto v0.0.0-20200317114155-1f3552e48f24" - "google.golang.org/genproto v0.0.0-20200317114155-1f3552e48f24/go.mod" - "google.golang.org/grpc v1.17.0/go.mod" - "google.golang.org/grpc v1.19.0" - "google.golang.org/grpc v1.19.0/go.mod" - "google.golang.org/grpc v1.20.1/go.mod" - "google.golang.org/grpc v1.21.1/go.mod" - "google.golang.org/grpc v1.23.0/go.mod" - "google.golang.org/grpc v1.25.1/go.mod" - "google.golang.org/grpc v1.26.0/go.mod" - "google.golang.org/grpc v1.27.0/go.mod" - "google.golang.org/grpc v1.27.1/go.mod" - "google.golang.org/grpc v1.28.0" - "google.golang.org/grpc v1.28.0/go.mod" - "gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod" - "gopkg.in/asn1-ber.v1 v1.0.0-20181015200546-f715ec2f112d" - "gopkg.in/asn1-ber.v1 v1.0.0-20181015200546-f715ec2f112d/go.mod" - "gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod" - "gopkg.in/check.v1 v1.0.0-20161208181325-20d25e280405/go.mod" - "gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127" - "gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod" - "gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15" - "gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod" - "gopkg.in/errgo.v2 v2.1.0/go.mod" - "gopkg.in/fatih/pool.v2 v2.0.0" - "gopkg.in/fatih/pool.v2 v2.0.0/go.mod" - "gopkg.in/fsnotify.v1 v1.2.1/go.mod" - "gopkg.in/fsnotify.v1 v1.4.7" - "gopkg.in/fsnotify.v1 v1.4.7/go.mod" - "gopkg.in/gorethink/gorethink.v3 v3.0.5" - "gopkg.in/gorethink/gorethink.v3 v3.0.5/go.mod" - "gopkg.in/inf.v0 v0.9.1" - "gopkg.in/inf.v0 v0.9.1/go.mod" - "gopkg.in/jcmturner/aescts.v1 v1.0.1" - "gopkg.in/jcmturner/aescts.v1 v1.0.1/go.mod" - "gopkg.in/jcmturner/dnsutils.v1 v1.0.1" - "gopkg.in/jcmturner/dnsutils.v1 v1.0.1/go.mod" - "gopkg.in/jcmturner/goidentity.v3 v3.0.0" - "gopkg.in/jcmturner/goidentity.v3 v3.0.0/go.mod" - "gopkg.in/jcmturner/gokrb5.v7 v7.2.3/go.mod" - "gopkg.in/jcmturner/gokrb5.v7 v7.3.0" - "gopkg.in/jcmturner/gokrb5.v7 v7.3.0/go.mod" - "gopkg.in/jcmturner/rpc.v1 v1.1.0" - "gopkg.in/jcmturner/rpc.v1 v1.1.0/go.mod" - "gopkg.in/ldap.v3 v3.1.0" - "gopkg.in/ldap.v3 v3.1.0/go.mod" - "gopkg.in/mgo.v2 v2.0.0-20180705113604-9856a29383ce" - "gopkg.in/mgo.v2 v2.0.0-20180705113604-9856a29383ce/go.mod" - "gopkg.in/olivere/elastic.v5 v5.0.70" - "gopkg.in/olivere/elastic.v5 v5.0.70/go.mod" - "gopkg.in/tomb.v1 v1.0.0-20140529071818-c131134a1947/go.mod" - "gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7" - "gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod" - "gopkg.in/yaml.v2 v2.2.1/go.mod" - "gopkg.in/yaml.v2 v2.2.2/go.mod" - "gopkg.in/yaml.v2 v2.2.4" - "gopkg.in/yaml.v2 v2.2.4/go.mod" - "gopkg.in/yaml.v2 v2.2.5" - "gopkg.in/yaml.v2 v2.2.5/go.mod" - "gotest.tools v2.2.0+incompatible" - "gotest.tools v2.2.0+incompatible/go.mod" - "honnef.co/go/tools v0.0.0-20180728063816-88497007e858/go.mod" - "honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod" - "honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod" - "honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod" - "honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod" - "honnef.co/go/tools v0.0.1-2019.2.3/go.mod" - "honnef.co/go/tools v0.0.1-2020.1.3" - "honnef.co/go/tools v0.0.1-2020.1.3/go.mod" - "k8s.io/apimachinery v0.17.1" - "k8s.io/apimachinery v0.17.1/go.mod" - "k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6/go.mod" - "k8s.io/klog v0.0.0-20181102134211-b9b56d5dfc92/go.mod" - "k8s.io/klog v1.0.0" - "k8s.io/klog v1.0.0/go.mod" - "k8s.io/kube-openapi v0.0.0-20191107075043-30be4d16710a/go.mod" - "rsc.io/binaryregexp v0.2.0/go.mod" - "rsc.io/pdf v0.1.1/go.mod" - "rsc.io/quote/v3 v3.1.0/go.mod" - "rsc.io/sampler v1.3.0/go.mod" - "sigs.k8s.io/structured-merge-diff v0.0.0-20190525122527-15d366b2352e/go.mod" - "sigs.k8s.io/yaml v1.1.0/go.mod" - ) -go-module_set_globals -SRC_URI="https://github.com/influxdata/telegraf/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz - ${EGO_SUM_SRC_URI}" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64" - -RESTRICT+=" test" - -DEPEND="acct-group/telegraf - acct-user/telegraf" - RDEPEND="${DEPEND}" - -src_compile() { - unset LDFLAGS - emake \ - COMMIT=${COMMIT} \ - BRANCH=${BRANCH} \ - VERSION=v${MY_PV} \ - telegraf -} - -src_install() { - dobin telegraf - insinto /etc/telegraf - doins etc/telegraf.conf - keepdir /etc/telegraf/telegraf.d - - insinto /etc/logrotate.d - doins etc/logrotate.d/telegraf - -systemd_dounit scripts/telegraf.service - newconfd "${FILESDIR}"/telegraf.confd telegraf - newinitd "${FILESDIR}"/telegraf.rc telegraf - - dodoc -r docs/* - - keepdir /var/log/telegraf - fowners telegraf:telegraf /var/log/telegraf -} diff --git a/net-analyzer/telegraf/telegraf-1.18.3.ebuild b/net-analyzer/telegraf/telegraf-1.18.3.ebuild new file mode 100644 index 000000000000..2b39c65a9268 --- /dev/null +++ b/net-analyzer/telegraf/telegraf-1.18.3.ebuild @@ -0,0 +1,53 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +inherit go-module systemd +MY_PV="${PV/_rc/-rc.}" +COMMIT=cd037b49 +BRANCH=release-1.18 +VERSION=v${MY_PV} + +DESCRIPTION="The plugin-driven server agent for collecting & reporting metrics" +HOMEPAGE="https://github.com/influxdata/telegraf" + +SRC_URI="https://github.com/influxdata/telegraf/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz" +SRC_URI+=" https://dev.gentoo.org/~williamh/dist/${P}-deps.tar.xz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~arm64" + +RESTRICT+=" test" + +DEPEND="acct-group/telegraf + acct-user/telegraf" + RDEPEND="${DEPEND}" + +src_compile() { + unset LDFLAGS + emake \ + COMMIT=${COMMIT} \ + BRANCH=${BRANCH} \ + VERSION=v${MY_PV} \ + telegraf +} + +src_install() { + dobin telegraf + insinto /etc/telegraf + doins etc/telegraf.conf + keepdir /etc/telegraf/telegraf.d + + insinto /etc/logrotate.d + doins etc/logrotate.d/telegraf + + systemd_dounit scripts/telegraf.service + newconfd "${FILESDIR}"/telegraf.confd telegraf + newinitd "${FILESDIR}"/telegraf.rc telegraf + + dodoc -r docs/* + + keepdir /var/log/telegraf + fowners telegraf:telegraf /var/log/telegraf +} diff --git a/net-analyzer/telegraf/telegraf-1.26.3-r1.ebuild b/net-analyzer/telegraf/telegraf-1.26.3-r1.ebuild new file mode 100644 index 000000000000..7cef4e8b9482 --- /dev/null +++ b/net-analyzer/telegraf/telegraf-1.26.3-r1.ebuild @@ -0,0 +1,47 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +inherit go-module systemd +MY_PV="${PV/_rc/-rc.}" +COMMIT=90f4eb29 +BRANCH=HEAD +VERSION=v${MY_PV} + +DESCRIPTION="The plugin-driven server agent for collecting & reporting metrics" +HOMEPAGE="https://github.com/influxdata/telegraf" + +SRC_URI="https://github.com/influxdata/telegraf/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz" +SRC_URI+=" https://dev.gentoo.org/~williamh/dist/${P}-deps.tar.xz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~arm64" + +RESTRICT+=" test" + +DEPEND="acct-group/telegraf + acct-user/telegraf" + RDEPEND="${DEPEND}" + +src_compile() { + unset LDFLAGS + emake -j1 \ + COMMIT=${COMMIT} \ + BRANCH=${BRANCH} \ + VERSION=v${MY_PV} +} + +src_install() { + dobin telegraf + insinto /etc/logrotate.d + doins etc/logrotate.d/telegraf + keepdir /etc/telegraf + keepdir /etc/telegraf/telegraf.d + systemd_dounit scripts/telegraf.service + newconfd "${FILESDIR}"/telegraf.confd telegraf + newinitd "${FILESDIR}"/telegraf.rc telegraf + dodoc -r *.md docs + keepdir /var/log/telegraf + fowners telegraf:telegraf /var/log/telegraf +} diff --git a/net-analyzer/termshark/Manifest b/net-analyzer/termshark/Manifest new file mode 100644 index 000000000000..759fadd45ab8 --- /dev/null +++ b/net-analyzer/termshark/Manifest @@ -0,0 +1,2 @@ +DIST termshark-2.4.0-deps.tar.xz 64667348 BLAKE2B 2406756070dfcb813a7e24ce4eb0790a17b4ecf865440c801bbaa07d0d5eb8c2eed1a37111bd59e8104f450464aa702d07fb483d4d7b2f51fb3cd272994bf6f6 SHA512 78d964d8fe317b4a70ba18bbd6bcf02cb1208c02b6d95018dfb49561996c3d3e0ba898d483cd4814b4ee0f28f1f757dc937829af5f6ffb4c36f98c480e8e324b +DIST termshark-2.4.0.tar.gz 427503 BLAKE2B df232595477d62480ba8ba994e635f01bc5a5ffd09378da37c01847d899e4938a92c8304e26ea425b7a72cfd71f918686a4683e1a04883c3c92e26104b9f84be SHA512 378bb67ff50a8dfa80f614540371f326627e73bdf63bceb183ed73afbbf9dead4e0597fb969ba49c4ee3d3de00ac7bb91166421c19c788df47ff8d9fcbc5b9fc diff --git a/net-analyzer/termshark/metadata.xml b/net-analyzer/termshark/metadata.xml new file mode 100644 index 000000000000..09186a431868 --- /dev/null +++ b/net-analyzer/termshark/metadata.xml @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="person" proxied="yes"> + <email>mario.haustein@hrz.tu-chemnitz.de</email> + <name>Mario Haustein</name> + </maintainer> + <maintainer type="person"> + <email>sam@gentoo.org</email> + <name>Sam James</name> + </maintainer> + <upstream> + <remote-id type="github">gcla/termshark</remote-id> + </upstream> +</pkgmetadata> diff --git a/net-analyzer/termshark/termshark-2.4.0.ebuild b/net-analyzer/termshark/termshark-2.4.0.ebuild new file mode 100644 index 000000000000..8c20d52c4d9d --- /dev/null +++ b/net-analyzer/termshark/termshark-2.4.0.ebuild @@ -0,0 +1,37 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit go-module + +DESCRIPTION="A terminal UI for tshark, inspired by Wireshark" +HOMEPAGE="https://termshark.io/" +SRC_URI="https://github.com/gcla/termshark/archive/v${PV}.tar.gz -> ${P}.tar.gz" +SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-deps.tar.xz" + +LICENSE="Apache-2.0 BSD-2 BSD MIT MPL-2.0" +SLOT="0" +KEYWORDS="~amd64 ~arm64" + +# termshark doesn't link against wireshark. It reads data via IPC during +# runtime. +RDEPEND=" + net-analyzer/wireshark[dumpcap,pcap,tshark] +" + +src_compile() { + ego build ./... +} + +src_test() { + ego test ./... +} + +src_install() { + GOBIN="${S}/bin" ego install ./... + + dobin bin/${PN} + dodoc README.md + dodoc docs/* +} diff --git a/net-analyzer/testssl/Manifest b/net-analyzer/testssl/Manifest index 6559d0d0b0b5..aaca702899cd 100644 --- a/net-analyzer/testssl/Manifest +++ b/net-analyzer/testssl/Manifest @@ -1,2 +1 @@ -DIST testssl-3.0.2.tar.gz 9208016 BLAKE2B cacb21f34d769f3e255d1db01bf197c0dcb0dc619c09d8153b65ef1ce5daaddb0b43ba698c765de1993023992a101ca6a5cde66da098e3eba3e81df81b3cc824 SHA512 ad886d556d6682bc99d45a9719abf6ee00f4e0f763795a79e46e0495bc355ede56204b6f1fb0db19311e42913990b57016fb6a4adb7414bb7283d847c19e9fb2 -DIST testssl-3.0.4.tar.gz 9223535 BLAKE2B 658947ca7afc2b080edeed724f8185a3292736df1c71bd0bffd5a6f7ecfef7c56a1589c29eff84f278b2b788e63a881139a62ac714684209ed0cb8425f9a749e SHA512 663dc71dcaa37fe969121980274489fc2cf91450122001e98b8e78e510b1e3741b801fd767f6fca2d0735a184ea919b1672b2ba154ef074b146b6d5d47adc277 +DIST testssl-3.0.8.tar.gz 9372229 BLAKE2B cf463236fb0812c2bc5fd5673d0d2d395fc405697817827ee8c660c96d789601a090b57febd48400e33fd9f28b23d42d432734b176b23a8e8ddf710c9b275485 SHA512 4634bc5dc57ad8910ca097b22d86511a26e855fb4dc7bef9550a795cb1f53a959b8472008756b40a670d7433ad56236b5a36fe0c88c15de99fdf586e9919b080 diff --git a/net-analyzer/testssl/metadata.xml b/net-analyzer/testssl/metadata.xml index ffc44aeef678..734e80ca03a7 100644 --- a/net-analyzer/testssl/metadata.xml +++ b/net-analyzer/testssl/metadata.xml @@ -1,9 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>kensington@gentoo.org</email> - </maintainer> + <!-- maintainer-needed --> <use> <flag name="bundled-openssl">Install precompiled versions of OpenSSL for greater testing coverage</flag> </use> diff --git a/net-analyzer/testssl/testssl-3.0.2.ebuild b/net-analyzer/testssl/testssl-3.0.2.ebuild deleted file mode 100644 index f8845bdafb9c..000000000000 --- a/net-analyzer/testssl/testssl-3.0.2.ebuild +++ /dev/null @@ -1,74 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -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/${MY_PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2 bundled-openssl? ( openssl )" -SLOT="0" -KEYWORDS="amd64 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 ) -" - -S=${WORKDIR}/${MY_PN}-${MY_PV} - -QA_PREBUILT="opt/${PN}/*" - -pkg_setup() { - if use amd64; then - if use kerberos; then - BUNDLED_OPENSSL="openssl.Linux.x86_64.krb5" - 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/testssl/testssl-3.0.4.ebuild b/net-analyzer/testssl/testssl-3.0.4.ebuild deleted file mode 100644 index 8a2472e4e275..000000000000 --- a/net-analyzer/testssl/testssl-3.0.4.ebuild +++ /dev/null @@ -1,74 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -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/${MY_PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2 bundled-openssl? ( openssl )" -SLOT="0" -KEYWORDS="~amd64 ~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 ) -" - -S=${WORKDIR}/${MY_PN}-${MY_PV} - -QA_PREBUILT="opt/${PN}/*" - -pkg_setup() { - if use amd64; then - if use kerberos; then - BUNDLED_OPENSSL="openssl.Linux.x86_64.krb5" - 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/testssl/testssl-3.0.8.ebuild b/net-analyzer/testssl/testssl-3.0.8.ebuild new file mode 100644 index 000000000000..895f0662c62e --- /dev/null +++ b/net-analyzer/testssl/testssl-3.0.8.ebuild @@ -0,0 +1,74 @@ +# 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" + +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 ) +" + +S=${WORKDIR}/${MY_PN}-${MY_PV} + +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/metadata.xml b/net-analyzer/thc-ipv6/metadata.xml index 6f49eba8f496..00be373465d6 100644 --- a/net-analyzer/thc-ipv6/metadata.xml +++ b/net-analyzer/thc-ipv6/metadata.xml @@ -1,5 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<!-- maintainer-needed --> + <!-- maintainer-needed --> + <upstream> + <remote-id type="github">vanhauser-thc/thc-ipv6</remote-id> + </upstream> </pkgmetadata> diff --git a/net-analyzer/thc-ipv6/thc-ipv6-3.2-r1.ebuild b/net-analyzer/thc-ipv6/thc-ipv6-3.2-r1.ebuild index 71f98da3f733..b5817554f26c 100644 --- a/net-analyzer/thc-ipv6/thc-ipv6-3.2-r1.ebuild +++ b/net-analyzer/thc-ipv6/thc-ipv6-3.2-r1.ebuild @@ -1,46 +1,44 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 -[[ ${PV} == *9999 ]] && SCM="git-r3" -EGIT_REPO_URI="https://github.com/vanhauser-thc/thc-ipv6.git" -EGIT_BRANCH=master +EAPI=7 -inherit eutils toolchain-funcs ${SCM} +inherit toolchain-funcs -DESCRIPTION="complete tool set to attack the inherent protocol weaknesses of IPV6 and ICMP6" +DESCRIPTION="Complete tool set to attack the inherent protocol weaknesses of IPV6 and ICMP6" HOMEPAGE="https://www.thc.org/thc-ipv6/" -LICENSE="AGPL-3 openssl" -SLOT="0" -IUSE="ssl" -if [[ ${PV} != *9999 ]]; then +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/${PV}.tar.gz -> ${P}.tar.gz" KEYWORDS="~amd64 ~x86" fi -DEPEND="net-libs/libpcap +LICENSE="AGPL-3 openssl" +SLOT="0" +IUSE="ssl" + +DEPEND=" net-libs/libnetfilter_queue - ssl? ( dev-libs/openssl:0= )" + net-libs/libpcap + ssl? ( dev-libs/openssl:0= ) +" RDEPEND="${DEPEND}" PATCHES=( "${FILESDIR}/${PN}-3.2-stdint.patch" ) -src_unpack() { - if [[ ${PV} != *9999 ]]; then - default_src_unpack - else - git-r3_src_unpack - fi -} - src_prepare() { sed -e '/^CFLAGS=/s,CFLAGS=,CFLAGS?=,' \ -i Makefile || die - if ! use ssl ; then + + if ! use ssl; then sed -e '/^HAVE_SSL/s:^:#:' \ - -i Makefile + -i Makefile || die fi + default } diff --git a/net-analyzer/thc-ipv6/thc-ipv6-9999.ebuild b/net-analyzer/thc-ipv6/thc-ipv6-9999.ebuild index 71f98da3f733..b5817554f26c 100644 --- a/net-analyzer/thc-ipv6/thc-ipv6-9999.ebuild +++ b/net-analyzer/thc-ipv6/thc-ipv6-9999.ebuild @@ -1,46 +1,44 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 -[[ ${PV} == *9999 ]] && SCM="git-r3" -EGIT_REPO_URI="https://github.com/vanhauser-thc/thc-ipv6.git" -EGIT_BRANCH=master +EAPI=7 -inherit eutils toolchain-funcs ${SCM} +inherit toolchain-funcs -DESCRIPTION="complete tool set to attack the inherent protocol weaknesses of IPV6 and ICMP6" +DESCRIPTION="Complete tool set to attack the inherent protocol weaknesses of IPV6 and ICMP6" HOMEPAGE="https://www.thc.org/thc-ipv6/" -LICENSE="AGPL-3 openssl" -SLOT="0" -IUSE="ssl" -if [[ ${PV} != *9999 ]]; then +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/${PV}.tar.gz -> ${P}.tar.gz" KEYWORDS="~amd64 ~x86" fi -DEPEND="net-libs/libpcap +LICENSE="AGPL-3 openssl" +SLOT="0" +IUSE="ssl" + +DEPEND=" net-libs/libnetfilter_queue - ssl? ( dev-libs/openssl:0= )" + net-libs/libpcap + ssl? ( dev-libs/openssl:0= ) +" RDEPEND="${DEPEND}" PATCHES=( "${FILESDIR}/${PN}-3.2-stdint.patch" ) -src_unpack() { - if [[ ${PV} != *9999 ]]; then - default_src_unpack - else - git-r3_src_unpack - fi -} - src_prepare() { sed -e '/^CFLAGS=/s,CFLAGS=,CFLAGS?=,' \ -i Makefile || die - if ! use ssl ; then + + if ! use ssl; then sed -e '/^HAVE_SSL/s:^:#:' \ - -i Makefile + -i Makefile || die fi + default } diff --git a/net-analyzer/thcrut/Manifest b/net-analyzer/thcrut/Manifest deleted file mode 100644 index 2c53d56971d0..000000000000 --- a/net-analyzer/thcrut/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST thcrut-1.2.5.tar.gz 667929 BLAKE2B c7b5f252006ab06a6886efe82a6d9438df3fe3c61b277bc725f2d8a7ba7f86488b89e0254dfa53f16b5f14f9e0f58bb247e6697db10f1e5e87625322ae633ae4 SHA512 cbef051f0e668e57e13cd3435c109c01aac66a31d5c7a6a1b60a7767fb740d50489c9caefeb8a188d803d5ee3a22e5b7cedf425462a9424ace2dbc2dfe0dda39 diff --git a/net-analyzer/thcrut/files/thcrut-1.2.5-configure.patch b/net-analyzer/thcrut/files/thcrut-1.2.5-configure.patch deleted file mode 100644 index daa069e22afd..000000000000 --- a/net-analyzer/thcrut/files/thcrut-1.2.5-configure.patch +++ /dev/null @@ -1,42 +0,0 @@ ---- a/configure.in -+++ b/configure.in -@@ -153,10 +153,8 @@ - dnl libnet_init_packet only available in < libnet-1.1.x - dnl AC_CHECK_LIB(net, libnet_init_packet,, AC_MSG_ERROR(We need libnet. - dnl Get libnet from http://www.packetfactory.net or try --with-[[libs,includes]]=DIR)) --AC_CHECK_LIB(net, libnet_init_packet, [NET=yes], [NET=no]) -+AC_CHECK_LIB(net-1.0, libnet_init_packet, [NET=yes], [NET=no]) - if test x"$NET" = x"no" -o x"$DIST" = x"yes"; then -- AC_CONFIG_SUBDIRS(Libnet-1.0.2a) -- THCRUT_SUBDIRS="$THCRUT_SUBDIRS Libnet-1.0.2a" - CPPFLAGS="-I../Libnet-1.0.2a/include ${CPPFLAGS}" - LDFLAGS="-L../Libnet-1.0.2a/src ${LDFLAGS}" - PRG_LIBNET_CONFIG_CFLAGS="../Libnet-1.0.2a/libnet-config --cflags --defines | tr '\n' ' '" -@@ -164,14 +162,12 @@ - dnl CFLAGS="`${srcdir}/Libnet-1.0.2a/libnet-config --cflags --defines | tr '\n' ' '` $CFLAGS" - dnl LIBS="`${srcdir}/Libnet-1.0.2a/libnet-config --libs` $LIBS" - else -- CFLAGS="`libnet-config --cflags --defines | tr '\n' ' '` $CFLAGS" -- LIBS="`libnet-config --libs` $LIBS" -+ CFLAGS="`libnet-1.0-config --cflags --defines | tr '\n' ' '` $CFLAGS" -+ LIBS="`libnet-1.0-config --libs` $LIBS" - fi - - AC_CHECK_LIB(pcre, pcre_compile, [PCRE=yes], [PCRE=no]) - if test x"$PCRE" = x"no" -o x"$DIST" = x"yes"; then -- AC_CONFIG_SUBDIRS(pcre-3.9) -- THCRUT_SUBDIRS="$THCRUT_SUBDIRS pcre-3.9" - CPPFLAGS="-I../pcre-3.9 ${CPPFLAGS}" - LDFLAGS="-L../pcre-3.9 ${LDFLAGS}" - PRG_PCRE_CONFIG_CFLAGS="../pcre-3.9/pcre-config --cflags" -@@ -199,8 +195,8 @@ - AC_OUTPUT(Makefile src/Makefile) - - dnl Just to show the correct values... --CFLAGS="`${srcdir}/pcre-3.9/pcre-config --cflags` `${srcdir}/Libnet-1.0.2a/libnet-config --cflags --defines | tr '\n' ' '` $CFLAGS" --LIBS="`${srcdir}/pcre-3.9/pcre-config --libs` `${srcdir}/Libnet-1.0.2a/libnet-config --libs` $LIBS" -+CFLAGS="`${srcdir}/pcre-3.9/pcre-config --cflags` `libnet-config --cflags --defines | tr '\n' ' '` $CFLAGS" -+LIBS="`${srcdir}/pcre-3.9/pcre-config --libs` `libnet-config --libs` $LIBS" - - echo "THCrut has been configured with the following options:" - echo " User binaries: $B" diff --git a/net-analyzer/thcrut/files/thcrut-1.2.5-flags.patch b/net-analyzer/thcrut/files/thcrut-1.2.5-flags.patch deleted file mode 100644 index 0a6bcaf4ebce..000000000000 --- a/net-analyzer/thcrut/files/thcrut-1.2.5-flags.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/configure.in -+++ b/configure.in -@@ -23,7 +23,7 @@ - dnl - dnl Use these compiler flags if we have gcc. - dnl --if test $ac_cv_prog_gcc = yes; then -+if test $ac_cv_prog_gcc_not_on_gentoo = yes; then - CCOPTS='-O2 -Wall' - CFLAGS="$CCOPTS" - fi diff --git a/net-analyzer/thcrut/files/thcrut-1.2.5-fno-common.patch b/net-analyzer/thcrut/files/thcrut-1.2.5-fno-common.patch deleted file mode 100644 index a934048f341e..000000000000 --- a/net-analyzer/thcrut/files/thcrut-1.2.5-fno-common.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- a/src/discover_dispatch.c -+++ b/src/discover_dispatch.c -@@ -81,7 +81,6 @@ - - unsigned short ip_tcp_sync_chksum; - unsigned short ip_tcp_fp_chksum; --struct sockaddr_in ip_tcp_sync_addr; - static dispatch_func_recv_t dispatch_funcs[] = { - dis_recvdummy, - dis_recv, ---- a/src/discover_main.c -+++ b/src/discover_main.c -@@ -22,7 +22,6 @@ - extern struct _opt opt; - extern char ip_tcp_sync[]; - --struct sockaddr_in ip_tcp_sync_addr; - int rawsox; - - #define DFL_HOSTS_PARALLEL (5000) diff --git a/net-analyzer/thcrut/files/thcrut-1.2.5-libnet.patch b/net-analyzer/thcrut/files/thcrut-1.2.5-libnet.patch deleted file mode 100644 index 87488c8c5196..000000000000 --- a/net-analyzer/thcrut/files/thcrut-1.2.5-libnet.patch +++ /dev/null @@ -1,65 +0,0 @@ ---- a/src/arp_main.c -+++ b/src/arp_main.c -@@ -18 +18 @@ --#include <libnet.h> -+#include <libnet-1.0.h> ---- a/src/arpg.c -+++ b/src/arpg.c -@@ -12 +12 @@ --#include <libnet.h> -+#include <libnet-1.0.h> ---- a/src/dhcp_main.c -+++ b/src/dhcp_main.c -@@ -14 +14 @@ --#include <libnet.h> -+#include <libnet-1.0.h> ---- a/src/discover_dispatch.c -+++ b/src/discover_dispatch.c -@@ -10 +10 @@ --#include <libnet.h> -+#include <libnet-1.0.h> ---- a/src/discover_main.c -+++ b/src/discover_main.c -@@ -8 +8 @@ --#include <libnet.h> -+#include <libnet-1.0.h> ---- a/src/fp.h -+++ b/src/fp.h -@@ -10 +10 @@ --#include <libnet.h> -+#include <libnet-1.0.h> ---- a/src/icmp_main.c -+++ b/src/icmp_main.c -@@ -14 +14 @@ --#include <libnet.h> -+#include <libnet-1.0.h> ---- a/src/network_raw.c -+++ b/src/network_raw.c -@@ -10 +10 @@ --#include <libnet.h> -+#include <libnet-1.0.h> ---- a/src/packets.c -+++ b/src/packets.c -@@ -6 +6 @@ --#include <libnet.h> -+#include <libnet-1.0.h> ---- a/src/thcrut.c -+++ b/src/thcrut.c -@@ -87 +87 @@ --#include <libnet.h> -+#include <libnet-1.0.h> ---- a/src/thcrut.h -+++ b/src/thcrut.h -@@ -7 +7 @@ --#include <libnet.h> -+#include <libnet-1.0.h> ---- a/src/thcrut_libnet.c -+++ b/src/thcrut_libnet.c -@@ -5 +5 @@ --#include <libnet.h> -+#include <libnet-1.0.h> ---- a/src/thcrut_libnet.h -+++ b/src/thcrut_libnet.h -@@ -5 +5 @@ --#include <libnet.h> -+#include <libnet-1.0.h> diff --git a/net-analyzer/thcrut/metadata.xml b/net-analyzer/thcrut/metadata.xml deleted file mode 100644 index 74c2baebb4ec..000000000000 --- a/net-analyzer/thcrut/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://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/thcrut/thcrut-1.2.5-r2.ebuild b/net-analyzer/thcrut/thcrut-1.2.5-r2.ebuild deleted file mode 100644 index 0e41e8ac8281..000000000000 --- a/net-analyzer/thcrut/thcrut-1.2.5-r2.ebuild +++ /dev/null @@ -1,35 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit autotools - -DESCRIPTION="Network discovery and fingerprinting tool" -HOMEPAGE="http://www.thc.org/thc-rut/" -SRC_URI="https://github.com/vanhauser-thc/THC-Archive/raw/master/Tools/${P}.tar.gz" - -LICENSE="free-noncomm PCRE GPL-1+" -SLOT="0" -KEYWORDS="amd64 ~ppc sparc x86" - -DEPEND=" - dev-libs/libpcre - net-libs/libnet:1.0 - net-libs/libpcap -" -RDEPEND=" - ${DEPEND} -" -DOCS=( ChangeLog FAQ README TODO thcrutlogo.txt ) -PATCHES=( - "${FILESDIR}"/${P}-configure.patch - "${FILESDIR}"/${P}-flags.patch - "${FILESDIR}"/${P}-fno-common.patch - "${FILESDIR}"/${P}-libnet.patch -) - -src_prepare() { - rm -r Libnet-1.0.2a pcre-3.9 || die - default - eautoreconf -} diff --git a/net-analyzer/thrulay/metadata.xml b/net-analyzer/thrulay/metadata.xml index 7fb9c5a520e9..43854ecbacb0 100644 --- a/net-analyzer/thrulay/metadata.xml +++ b/net-analyzer/thrulay/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> <email>robbat2@gentoo.org</email> diff --git a/net-analyzer/thrulay/thrulay-0.9-r1.ebuild b/net-analyzer/thrulay/thrulay-0.9-r1.ebuild index 388b9ba4e265..97d1f5c8c503 100644 --- a/net-analyzer/thrulay/thrulay-0.9-r1.ebuild +++ b/net-analyzer/thrulay/thrulay-0.9-r1.ebuild @@ -11,7 +11,8 @@ SRC_URI=" http://www.internet2.edu/~shalunov/thrulay/${P}.tar.gz mirror://sourceforge/${PN}/${P}.tar.gz" -LICENSE="BSD" +# init.d is GPL-2 +LICENSE="BSD GPL-2" SLOT="0" KEYWORDS="amd64 ppc x86" diff --git a/net-analyzer/tleds/files/tleds.conf.d b/net-analyzer/tleds/files/tleds.conf.d index 477408d30ed0..cfca606342c9 100644 --- a/net-analyzer/tleds/files/tleds.conf.d +++ b/net-analyzer/tleds/files/tleds.conf.d @@ -1,4 +1,4 @@ -# Copyright 2003-2004 Gentoo Foundation +# Copyright 2003-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 IFACE="eth0" diff --git a/net-analyzer/tleds/metadata.xml b/net-analyzer/tleds/metadata.xml index 74c2baebb4ec..dce3f3be66c0 100644 --- a/net-analyzer/tleds/metadata.xml +++ b/net-analyzer/tleds/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>netmon@gentoo.org</email> diff --git a/net-analyzer/tleds/tleds-1.05_beta11-r2.ebuild b/net-analyzer/tleds/tleds-1.05_beta11-r2.ebuild index 56abdfd1f3cd..50d2d48db744 100644 --- a/net-analyzer/tleds/tleds-1.05_beta11-r2.ebuild +++ b/net-analyzer/tleds/tleds-1.05_beta11-r2.ebuild @@ -1,17 +1,18 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 -inherit eutils toolchain-funcs +EAPI=7 + +inherit toolchain-funcs MY_P="${P/_/}" -S="${WORKDIR}/${MY_P/eta11/}" -DESCRIPTION="Blinks keyboard LEDs indicating outgoing and incoming network packets on selected network interface" +DESCRIPTION="Blinks keyboard LEDs indicating outgoing and incoming network packets" HOMEPAGE="http://www.hut.fi/~jlohikos/tleds_orig.html" SRC_URI=" http://www.hut.fi/~jlohikos/tleds/public/${MY_P/11/10}.tgz http://www.hut.fi/~jlohikos/tleds/public/${MY_P}.patch.bz2 " +S="${WORKDIR}/${MY_P/eta11/}" LICENSE="GPL-2" SLOT="0" @@ -21,15 +22,15 @@ IUSE="X" DEPEND="X? ( x11-libs/libX11 )" RDEPEND="${DEPEND}" -src_prepare() { - # code patches - epatch \ - "${WORKDIR}"/${MY_P}.patch \ - "${FILESDIR}"/${P}-gentoo.patch -} +PATCHES=( + "${WORKDIR}"/${MY_P}.patch + "${FILESDIR}"/${P}-gentoo.patch +) src_compile() { - emake CC=$(tc-getCC) $(usex X all tleds) + emake \ + CC="$(tc-getCC)" \ + $(usex X all tleds) } src_install() { diff --git a/net-analyzer/tptest/files/tptest-3.1.7-clang16-build-fix.patch b/net-analyzer/tptest/files/tptest-3.1.7-clang16-build-fix.patch new file mode 100644 index 000000000000..69b27d97ad05 --- /dev/null +++ b/net-analyzer/tptest/files/tptest-3.1.7-clang16-build-fix.patch @@ -0,0 +1,11 @@ +Bug: https://bugs.gentoo.org/897832 +--- a/apps/unix/server/server.c ++++ b/apps/unix/server/server.c +@@ -50,6 +50,7 @@ + #include <sys/file.h> + #include <sys/stat.h> + #include <sys/wait.h> ++#include <fcntl.h> + + // #include <net/if.h> + // #include <netinet/in.h> diff --git a/net-analyzer/tptest/metadata.xml b/net-analyzer/tptest/metadata.xml index 43601ae2ee47..7a32825289e8 100644 --- a/net-analyzer/tptest/metadata.xml +++ b/net-analyzer/tptest/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>netmon@gentoo.org</email> diff --git a/net-analyzer/tptest/tptest-3.1.7-r2.ebuild b/net-analyzer/tptest/tptest-3.1.7-r2.ebuild index 709ad3a89a3e..6187c9661381 100644 --- a/net-analyzer/tptest/tptest-3.1.7-r2.ebuild +++ b/net-analyzer/tptest/tptest-3.1.7-r2.ebuild @@ -1,35 +1,42 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 -inherit toolchain-funcs eutils +EAPI=7 + +inherit toolchain-funcs MY_PV="${PV/./_}" DESCRIPTION="Internet bandwidth tester" HOMEPAGE="http://tptest.sourceforge.net/" SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" + LICENSE="GPL-2" SLOT="0" - KEYWORDS="amd64 ppc sparc x86" +PATCHES=( + "${FILESDIR}"/${PN}-3.1.7-getstatsfromlinevuln.patch +) + src_prepare() { + default + sed -i apps/unix/{client,server}/Makefile \ -e "s:^CFLAGS[[:space:]]*=:CFLAGS+=:" \ || die - epatch "${FILESDIR}/${PN}-3.1.7-getstatsfromlinevuln.patch" - cp -f os-dep/unix/* . - cp -f engine/* . + + cp -f os-dep/unix/* . || die + cp -f engine/* . || die } src_compile() { emake -C apps/unix/client \ - CC=$(tc-getCC) \ + CC="$(tc-getCC)" \ LDFLAGS="${LDFLAGS}" emake -C apps/unix/server \ - CC=$(tc-getCC) \ + CC="$(tc-getCC)" \ LDFLAGS="${LDFLAGS}" } diff --git a/net-analyzer/tptest/tptest-3.1.7-r3.ebuild b/net-analyzer/tptest/tptest-3.1.7-r3.ebuild new file mode 100644 index 000000000000..4ebd77d40ee6 --- /dev/null +++ b/net-analyzer/tptest/tptest-3.1.7-r3.ebuild @@ -0,0 +1,50 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit toolchain-funcs + +MY_PV="${PV/./_}" + +DESCRIPTION="Internet bandwidth tester" +HOMEPAGE="http://tptest.sourceforge.net/" +SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64 ppc sparc x86" + +PATCHES=( + "${FILESDIR}"/${PN}-3.1.7-getstatsfromlinevuln.patch + "${FILESDIR}"/${PN}-3.1.7-clang16-build-fix.patch +) + +src_prepare() { + default + + sed -i apps/unix/{client,server}/Makefile \ + -e "s:^CFLAGS[[:space:]]*=:CFLAGS+=:" \ + || die + + cp -f os-dep/unix/* . || die + cp -f engine/* . || die +} + +src_compile() { + emake -C apps/unix/client \ + CC="$(tc-getCC)" \ + LDFLAGS="${LDFLAGS}" + + emake -C apps/unix/server \ + CC="$(tc-getCC)" \ + LDFLAGS="${LDFLAGS}" +} + +src_install() { + dobin apps/unix/client/tptestclient + dosbin apps/unix/server/tptestserver + + insinto /etc + doins apps/unix/server/tptest.conf +} diff --git a/net-analyzer/tracebox/files/tracebox-0.4.4-autotools.patch b/net-analyzer/tracebox/files/tracebox-0.4.4-autotools.patch new file mode 100644 index 000000000000..612132d157f4 --- /dev/null +++ b/net-analyzer/tracebox/files/tracebox-0.4.4-autotools.patch @@ -0,0 +1,214 @@ +- do not link to bundled + * dev-libs/json-c + * net-libs/libcrafter +- allow different lua versions + +--- a/configure.ac ++++ b/configure.ac +@@ -14,6 +14,8 @@ + AC_HEADER_STDC + AC_HEADER_ASSERT + ++PKG_PROG_PKG_CONFIG ++ + AX_CXX_COMPILE_STDCXX_11 + + # Checks for header files. +@@ -32,40 +34,14 @@ + AC_FUNC_FORK + AC_CHECK_FUNCS([gettimeofday memset select socket strtol]) + +-AC_ARG_WITH(lua, +-[ --with-lua=DIR use lua in DIR], +-[ case "$withval" in +- yes|no) +- AC_MSG_RESULT(no) +- ;; +- *) +- AC_MSG_RESULT($withval) +- if test -f $withval/lua.h -a -f $withval/liblua.a; then +- owd=`pwd` +- if cd $withval; then withval=`pwd`; cd $owd; fi +- LUA_INCLUDE="-I$withval" +- LUA_LIB="-L$withval -llua" +- LIBS="$LIBS -lm" +- elif test -f $withval/include/lua.h -a -f $withval/lib/liblua.a; then +- owd=`pwd` +- if cd $withval; then withval=`pwd`; cd $owd; fi +- LUA_INCLUDE="-I$withval/include" +- LUA_LIB="-L$withval/lib -llua" +- LIBS="$LIBS -lm" +- else +- AC_ERROR("lua.h or liblua.a not found in $withval") +- fi +- ;; +- esac ], +- [ +- AX_PROG_LUA +- AX_LUA_HEADERS +- AX_LUA_LIBS +- if test x"$LUA_LIB" = x; then +- AC_MSG_ERROR([Lua library not found. You may try option --with-lua-suffix.]) +- fi +- ] +-) ++PKG_CHECK_MODULES([LUA53], [lua-5.3], [LUA_FOUND=5.3; LUA_INCLUDE="${LUA53_CFLAGS}"; LUA_LIB="${LUA53_LIBS}"],AC_MSG_WARN([lua 5.3 not found])) ++PKG_CHECK_MODULES([LUA52], [lua-5.2], [LUA_FOUND=5.2; LUA_INCLUDE="${LUA52_CFLAGS}"; LUA_LIB="${LUA52_LIBS}"],AC_MSG_WARN([lua 5.2 not found])) ++PKG_CHECK_MODULES([LUA51], [lua5.1], [LUA_FOUND=5.1; LUA_INCLUDE="${LUA51_CFLAGS}"; LUA_LIB="${LUA51_LIBS}"],AC_MSG_WARN([lua 5.1 not found])) ++PKG_CHECK_MODULES([LUA], [lua], [LUA_FOUND=5.1-noSLOT; LUA_INCLUDE="${LUA_CFLAGS}"; LUA_LIB="${LUA_LIBS}"],AC_MSG_WARN([lua 5.1 not found])) ++ ++if test -z "$LUA_FOUND"; then ++ AC_MSG_ERROR([lua 5.3, 5.2 or 5.1 is required]) ++fi + AC_SUBST(LUA_INCLUDE) + AC_SUBST(LUA_LIB) + +@@ -121,24 +97,12 @@ + AC_ARG_WITH(json, + [ --with-json=DIR use json-c in DIR], + [ case "$withval" in +- yes|no) ++ no) + AC_MSG_RESULT(no) + ;; + *) + AC_MSG_RESULT($withval) +- if test -f $withval/json.h -a -f $withval/libjson-c.a; then +- owd=`pwd` +- if cd $withval; then withval=`pwd`; cd $owd; fi +- JSON_INCLUDE="-I$withval" +- JSON_LIB="-L$withval -ljson-c" +- elif test -f $withval/include/json-c/json.h -a -f $withval/lib/libjson-c.a; then +- owd=`pwd` +- if cd $withval; then withval=`pwd`; cd $owd; fi +- JSON_INCLUDE="-I$withval/include" +- JSON_LIB="-L$withval/lib -ljson-c" +- else +- AC_ERROR("json.h or libjson-c.a not found in $withval") +- fi ++ PKG_CHECK_MODULES([JSON], [json-c], [JSON_INCLUDE="${JSON_CFLAGS}"; JSON_LIB="${JSON_LIBS}"],AC_MSG_ERROR([json-c was requested but not found])) + AC_SUBST(JSON_INCLUDE) + AC_SUBST(JSON_LIB) + AC_DEFINE([HAVE_JSONC], [1], [Using json-c]) +@@ -153,41 +117,7 @@ + ] + ) + +-AC_MSG_CHECKING(for libpcap) +-AC_ARG_WITH(libpcap, +-[ --with-libpcap=DIR use libpcap in DIR], +-[ case "$withval" in +- yes|no) +- AC_MSG_RESULT(no) +- ;; +- *) +- AC_MSG_RESULT($withval) +- if test -f $withval/pcap.h -a \ +- -f $withval/libpcap.a -a \ +- -d $withval/pcap; then +- owd=`pwd` +- if cd $withval; then withval=`pwd`; cd $owd; fi +- PCAPINC="-I$withval -I$withval/bpf" +- PCAPLIB="-L$withval -lpcap" +- else +- AC_ERROR(pcap.h, net/bpf.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_ERROR(libpcap not found) +- fi +- AC_MSG_RESULT(yes) ] +-) ++PKG_CHECK_MODULES([PCAP], [libpcap], [PCAPINC="${PCAP_CFLAGS}"; PCAPLIB="${PCAP_LIBS}"],AC_MSG_ERROR([libpcap is required])) + AC_SUBST(PCAPINC) + AC_SUBST(PCAPLIB) + +@@ -234,17 +164,7 @@ + AC_CHECK_LIB([pthread], [pthread_create]) + ]) + +-# Make sure libcrafter build a static library by adding the --disable-shared +-# argument to the configure script. +-ac_configure_args_pre="$ac_configure_args" +-ac_configure_args_post="$ac_configure_args --disable-shared" +-ac_configure_args="$ac_configure_args_post" +- +-AC_CONFIG_COMMANDS_PRE([ac_configure_args="$ac_configure_args_pre"]) +-AC_CONFIG_COMMANDS_POST([ac_configure_args="$ac_configure_args_post"]) +-AC_CONFIG_SUBDIRS(noinst/libcrafter/libcrafter) +- +-ac_configure_args="$ac_configure_args_pre" ++PKG_CHECK_MODULES([crafter], [crafter], [LIBS="$LIBS $crafter_LIBS"],AC_MSG_ERROR([libcrafter is required])) + + # Enable click submodule + AS_IF([test "x$enable_tests" = "xyes"], [ +@@ -254,7 +174,6 @@ + + AC_CONFIG_COMMANDS_PRE([ac_configure_args="$ac_configure_args_pre"]) + AC_CONFIG_COMMANDS_POST([ac_configure_args="$ac_configure_args_post"]) +- AC_CONFIG_SUBDIRS(tests/tools/click) + + ac_configure_args="$ac_configure_args_pre" + ]) +@@ -271,7 +190,6 @@ + + AC_CONFIG_FILES([ + Makefile +- noinst/Makefile + src/Makefile + src/tracebox/Makefile + tests/Makefile +--- a/Makefile.am ++++ b/Makefile.am +@@ -8,8 +8,8 @@ + MAYBE_DOC = doc + endif + +-SUBDIRS = noinst src $(MAYBE_OPT) $(MAYBE_DOC) +-DIST_SUBDIRS = noinst src tests doc ++SUBDIRS = src $(MAYBE_OPT) $(MAYBE_DOC) ++DIST_SUBDIRS = src tests doc + + debian-package: + dpkg-buildpackage -rfakeroot -tc -us -uc +--- a/noinst/Makefile.am ++++ b/noinst/Makefile.am +@@ -1,4 +1,3 @@ +-DIST_SUBDIRS = libcrafter/libcrafter + + all-local: + cd libcrafter/libcrafter && $(MAKE) $(AM_MAKEFLAGS) all +--- a/src/tracebox/Makefile.am ++++ b/src/tracebox/Makefile.am +@@ -4,7 +4,6 @@ + + dist_man_MANS = tracebox.1 + +-dist_bin_SCRIPTS = luatracebox + + SUBDIRS = examples + +@@ -78,13 +77,11 @@ + + tracebox_LDADD = \ + $(EXTRALIBS) \ +- $(abs_top_builddir)/noinst/libcrafter/libcrafter/libcrafter.la \ + $(LUA_LIB) \ + $(PCAPLIB) \ + $(JSON_LIB) + + tracebox_CPPFLAGS = \ +- -I$(top_srcdir)/noinst/libcrafter/libcrafter \ + $(LUA_INCLUDE) \ + $(PCAPINC) \ + $(JSON_INCLUDE) \ diff --git a/net-analyzer/tracebox/files/tracebox-0.4.4-deps.patch b/net-analyzer/tracebox/files/tracebox-0.4.4-deps.patch deleted file mode 100644 index 43c0132a49a7..000000000000 --- a/net-analyzer/tracebox/files/tracebox-0.4.4-deps.patch +++ /dev/null @@ -1,157 +0,0 @@ ---- a/configure.ac -+++ b/configure.ac -@@ -14,6 +14,8 @@ - AC_HEADER_STDC - AC_HEADER_ASSERT - -+PKG_PROG_PKG_CONFIG -+ - AX_CXX_COMPILE_STDCXX_11 - - # Checks for header files. -@@ -32,40 +34,14 @@ - AC_FUNC_FORK - AC_CHECK_FUNCS([gettimeofday memset select socket strtol]) - --AC_ARG_WITH(lua, --[ --with-lua=DIR use lua in DIR], --[ case "$withval" in -- yes|no) -- AC_MSG_RESULT(no) -- ;; -- *) -- AC_MSG_RESULT($withval) -- if test -f $withval/lua.h -a -f $withval/liblua.a; then -- owd=`pwd` -- if cd $withval; then withval=`pwd`; cd $owd; fi -- LUA_INCLUDE="-I$withval" -- LUA_LIB="-L$withval -llua" -- LIBS="$LIBS -lm" -- elif test -f $withval/include/lua.h -a -f $withval/lib/liblua.a; then -- owd=`pwd` -- if cd $withval; then withval=`pwd`; cd $owd; fi -- LUA_INCLUDE="-I$withval/include" -- LUA_LIB="-L$withval/lib -llua" -- LIBS="$LIBS -lm" -- else -- AC_ERROR("lua.h or liblua.a not found in $withval") -- fi -- ;; -- esac ], -- [ -- AX_PROG_LUA -- AX_LUA_HEADERS -- AX_LUA_LIBS -- if test x"$LUA_LIB" = x; then -- AC_MSG_ERROR([Lua library not found. You may try option --with-lua-suffix.]) -- fi -- ] --) -+PKG_CHECK_MODULES([LUA53], [lua-5.3], [LUA_FOUND=5.3; LUA_INCLUDE="${LUA53_CFLAGS}"; LUA_LIB="${LUA53_LIBS}"],AC_MSG_WARN([lua 5.3 not found])) -+PKG_CHECK_MODULES([LUA52], [lua-5.2], [LUA_FOUND=5.2; LUA_INCLUDE="${LUA52_CFLAGS}"; LUA_LIB="${LUA52_LIBS}"],AC_MSG_WARN([lua 5.2 not found])) -+PKG_CHECK_MODULES([LUA51], [lua5.1], [LUA_FOUND=5.1; LUA_INCLUDE="${LUA51_CFLAGS}"; LUA_LIB="${LUA51_LIBS}"],AC_MSG_WARN([lua 5.1 not found])) -+PKG_CHECK_MODULES([LUA], [lua], [LUA_FOUND=5.1-noSLOT; LUA_INCLUDE="${LUA_CFLAGS}"; LUA_LIB="${LUA_LIBS}"],AC_MSG_WARN([lua 5.1 not found])) -+ -+if test -z "$LUA_FOUND"; then -+ AC_MSG_ERROR([lua 5.3, 5.2 or 5.1 is required]) -+fi - AC_SUBST(LUA_INCLUDE) - AC_SUBST(LUA_LIB) - -@@ -121,24 +97,12 @@ - AC_ARG_WITH(json, - [ --with-json=DIR use json-c in DIR], - [ case "$withval" in -- yes|no) -+ no) - AC_MSG_RESULT(no) - ;; - *) - AC_MSG_RESULT($withval) -- if test -f $withval/json.h -a -f $withval/libjson-c.a; then -- owd=`pwd` -- if cd $withval; then withval=`pwd`; cd $owd; fi -- JSON_INCLUDE="-I$withval" -- JSON_LIB="-L$withval -ljson-c" -- elif test -f $withval/include/json-c/json.h -a -f $withval/lib/libjson-c.a; then -- owd=`pwd` -- if cd $withval; then withval=`pwd`; cd $owd; fi -- JSON_INCLUDE="-I$withval/include" -- JSON_LIB="-L$withval/lib -ljson-c" -- else -- AC_ERROR("json.h or libjson-c.a not found in $withval") -- fi -+ PKG_CHECK_MODULES([JSON], [json-c], [JSON_INCLUDE="${JSON_CFLAGS}"; JSON_LIB="${JSON_LIBS}"],AC_MSG_ERROR([json-c was requested but not found])) - AC_SUBST(JSON_INCLUDE) - AC_SUBST(JSON_LIB) - AC_DEFINE([HAVE_JSONC], [1], [Using json-c]) -@@ -153,41 +117,7 @@ - ] - ) - --AC_MSG_CHECKING(for libpcap) --AC_ARG_WITH(libpcap, --[ --with-libpcap=DIR use libpcap in DIR], --[ case "$withval" in -- yes|no) -- AC_MSG_RESULT(no) -- ;; -- *) -- AC_MSG_RESULT($withval) -- if test -f $withval/pcap.h -a \ -- -f $withval/libpcap.a -a \ -- -d $withval/pcap; then -- owd=`pwd` -- if cd $withval; then withval=`pwd`; cd $owd; fi -- PCAPINC="-I$withval -I$withval/bpf" -- PCAPLIB="-L$withval -lpcap" -- else -- AC_ERROR(pcap.h, net/bpf.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_ERROR(libpcap not found) -- fi -- AC_MSG_RESULT(yes) ] --) -+PKG_CHECK_MODULES([PCAP], [libpcap], [PCAPINC="${PCAP_CFLAGS}"; PCAPLIB="${PCAP_LIBS}"],AC_MSG_ERROR([libpcap is required])) - AC_SUBST(PCAPINC) - AC_SUBST(PCAPLIB) - -@@ -234,17 +164,7 @@ - AC_CHECK_LIB([pthread], [pthread_create]) - ]) - --# Make sure libcrafter build a static library by adding the --disable-shared --# argument to the configure script. --ac_configure_args_pre="$ac_configure_args" --ac_configure_args_post="$ac_configure_args --disable-shared" --ac_configure_args="$ac_configure_args_post" -- --AC_CONFIG_COMMANDS_PRE([ac_configure_args="$ac_configure_args_pre"]) --AC_CONFIG_COMMANDS_POST([ac_configure_args="$ac_configure_args_post"]) --AC_CONFIG_SUBDIRS(noinst/libcrafter/libcrafter) -- --ac_configure_args="$ac_configure_args_pre" -+PKG_CHECK_MODULES([crafter], [crafter], [LIBS="$LIBS $crafter_LIBS"],AC_MSG_ERROR([libcrafter is required])) - - # Enable click submodule - AS_IF([test "x$enable_tests" = "xyes"], [ -@@ -254,7 +174,6 @@ - - AC_CONFIG_COMMANDS_PRE([ac_configure_args="$ac_configure_args_pre"]) - AC_CONFIG_COMMANDS_POST([ac_configure_args="$ac_configure_args_post"]) -- AC_CONFIG_SUBDIRS(tests/tools/click) - - ac_configure_args="$ac_configure_args_pre" - ]) diff --git a/net-analyzer/tracebox/files/tracebox-0.4.4-include-crafter.patch b/net-analyzer/tracebox/files/tracebox-0.4.4-include-crafter.patch new file mode 100644 index 000000000000..bedd0208303a --- /dev/null +++ b/net-analyzer/tracebox/files/tracebox-0.4.4-include-crafter.patch @@ -0,0 +1,44 @@ +--- a/src/tracebox/PacketModification.h ++++ b/src/tracebox/PacketModification.h +@@ -8,7 +8,7 @@ + #ifndef __PACKETMODIFICATION_H__ + #define __PACKETMODIFICATION_H__ + +-#include "crafter.h" ++#include <crafter.h> + #ifdef HAVE_LIBJSON + #include <json/json.h> + #endif +--- a/src/tracebox/PartialHeader.h ++++ b/src/tracebox/PartialHeader.h +@@ -8,7 +8,7 @@ + #ifndef __PARTIALHEADER_H__ + #define __PARTIALHEADER_H__ + +-#include "crafter.h" ++#include <crafter.h> + + /* ICMP message can contains partial header information */ + +--- a/src/tracebox/script.h ++++ b/src/tracebox/script.h +@@ -9,7 +9,7 @@ + #ifndef __TRACEBOX_SCRIPT_H__ + #define __TRACEBOX_SCRIPT_H__ + +-#include "crafter.h" ++#include <crafter.h> + + Crafter::Packet *script_packet(std::string& cmd); + int script_exec(const char*, int, char**); +--- a/src/tracebox/tracebox.h ++++ b/src/tracebox/tracebox.h +@@ -11,7 +11,7 @@ + + #include <memory> + +-#include "crafter.h" ++#include <crafter.h> + #include "config.h" + #include "PacketModification.h" + diff --git a/net-analyzer/tracebox/metadata.xml b/net-analyzer/tracebox/metadata.xml index 1de26c104467..ac76e7334ff3 100644 --- a/net-analyzer/tracebox/metadata.xml +++ b/net-analyzer/tracebox/metadata.xml @@ -1,13 +1,13 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!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> <use> -<flag name='curl'>Build the curl component for uploading capture files using <pkg>net-misc/curl</pkg></flag> -<flag name='sniffer'>Build the sniffer component using <pkg>net-libs/libnetfilter_queue</pkg></flag> +<flag name="curl">Build the curl component for uploading capture files using <pkg>net-misc/curl</pkg></flag> +<flag name="sniffer">Build the sniffer component using <pkg>net-libs/libnetfilter_queue</pkg></flag> </use> <upstream> <remote-id type="github">tracebox/tracebox</remote-id> diff --git a/net-analyzer/tracebox/tracebox-0.4.4-r100.ebuild b/net-analyzer/tracebox/tracebox-0.4.4-r100.ebuild index 63a8ba122cbd..3020846855b4 100644 --- a/net-analyzer/tracebox/tracebox-0.4.4-r100.ebuild +++ b/net-analyzer/tracebox/tracebox-0.4.4-r100.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -LUA_COMPAT=( lua5-{1..4} luajit ) +LUA_COMPAT=( lua5-{2..4} ) -inherit autotools lua-single +inherit autotools flag-o-matic lua-single DESCRIPTION="A Middlebox Detection Tool" HOMEPAGE="http://www.tracebox.org/" @@ -15,51 +15,37 @@ LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="curl sniffer" - REQUIRED_USE="${LUA_REQUIRED_USE}" +RESTRICT="test" RDEPEND="${LUA_DEPS} >=net-libs/libcrafter-0.3_p20171019 dev-libs/json-c net-libs/libpcap curl? ( net-misc/curl ) - sniffer? ( net-libs/libnetfilter_queue ) -" -DEPEND=" - ${RDEPEND} -" -BDEPEND=" - virtual/pkgconfig -" -RESTRICT="test" + sniffer? ( net-libs/libnetfilter_queue )" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" + PATCHES=( - "${FILESDIR}"/${PN}-0.4.4-deps.patch + "${FILESDIR}"/${P}-autotools.patch + "${FILESDIR}"/${P}-include-crafter.patch ) src_prepare() { default - - sed -i -e '/SUBDIRS/s|noinst||g' Makefile.am || die - sed -i -e '/DIST_SUBDIRS.*libcrafter/d' noinst/Makefile.am || die - - sed -i \ - -e '/[[:graph:]]*libcrafter[[:graph:]]*/d' \ - -e '/dist_bin_SCRIPTS/d' \ - src/${PN}/Makefile.am \ - || die - - sed -i \ - -e 's|"crafter.h"|<crafter.h>|g' \ - src/${PN}/PacketModification.h \ - src/${PN}/PartialHeader.h \ - src/${PN}/script.h \ - src/${PN}/${PN}.h \ - || die - + # remove bundled + # - dev-libs/json-c + # - net-libs/libcrafter + rm -r noinst || die eautoreconf } src_configure() { + # https://bugs.gentoo.org/786687 + # std::byte clashes with crafter/Types.h typedef + append-cxxflags -std=c++14 + econf \ $(use_enable curl) \ $(use_enable sniffer) diff --git a/net-analyzer/tracebox/tracebox-0.4.4.ebuild b/net-analyzer/tracebox/tracebox-0.4.4.ebuild deleted file mode 100644 index a463e775906c..000000000000 --- a/net-analyzer/tracebox/tracebox-0.4.4.ebuild +++ /dev/null @@ -1,62 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit autotools - -DESCRIPTION="A Middlebox Detection Tool" -HOMEPAGE="http://www.tracebox.org/" -SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="curl sniffer" - -RDEPEND=" - >=net-libs/libcrafter-0.3_p20171019 - dev-lang/lua:0= - dev-libs/json-c - net-libs/libpcap - curl? ( net-misc/curl ) - sniffer? ( net-libs/libnetfilter_queue ) -" -DEPEND=" - ${RDEPEND} -" -BDEPEND=" - virtual/pkgconfig -" -RESTRICT="test" -PATCHES=( - "${FILESDIR}"/${PN}-0.4.4-deps.patch -) - -src_prepare() { - default - - sed -i -e '/SUBDIRS/s|noinst||g' Makefile.am || die - sed -i -e '/DIST_SUBDIRS.*libcrafter/d' noinst/Makefile.am || die - - sed -i \ - -e '/[[:graph:]]*libcrafter[[:graph:]]*/d' \ - -e '/dist_bin_SCRIPTS/d' \ - src/${PN}/Makefile.am \ - || die - - sed -i \ - -e 's|"crafter.h"|<crafter.h>|g' \ - src/${PN}/PacketModification.h \ - src/${PN}/PartialHeader.h \ - src/${PN}/script.h \ - src/${PN}/${PN}.h \ - || die - - eautoreconf -} - -src_configure() { - econf \ - $(use_enable curl) \ - $(use_enable sniffer) -} diff --git a/net-analyzer/traceproto/metadata.xml b/net-analyzer/traceproto/metadata.xml index d46f35d35c2d..c757a1817318 100644 --- a/net-analyzer/traceproto/metadata.xml +++ b/net-analyzer/traceproto/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>netmon@gentoo.org</email> diff --git a/net-analyzer/traceproto/traceproto-1.1.2_beta1.ebuild b/net-analyzer/traceproto/traceproto-1.1.2_beta1.ebuild index 28f0ddbe591e..5b09f203a538 100644 --- a/net-analyzer/traceproto/traceproto-1.1.2_beta1.ebuild +++ b/net-analyzer/traceproto/traceproto-1.1.2_beta1.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 @@ -24,7 +24,7 @@ RDEPEND=" " DEPEND="${RDEPEND}" BDEPEND=" - app-doc/doxygen[dot] + app-text/doxygen[dot] virtual/pkgconfig " diff --git a/net-analyzer/traceroute-nanog/Manifest b/net-analyzer/traceroute-nanog/Manifest deleted file mode 100644 index 354b4b7c5d13..000000000000 --- a/net-analyzer/traceroute-nanog/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST traceroute-nanog_6.4.2-1.diff.gz 18417 BLAKE2B eec999aae1e728e9c255715042ee7be66bc32c19eff3ab32b85fecd281032d24eea27fa19d27793d9820b61539791ed82b0a0a7845636970a8d2433d0e3ba40a SHA512 62c2df3db292ab263a2d076689b80ff156bd4a3b4f604974ad8210a700bee80055e21165909eeff138d03570ffe4a44b983ed0cf5ba0c6a914af1928ae82038e -DIST traceroute-nanog_6.4.2.orig.tar.gz 34429 BLAKE2B 427a7af1f65271b1b4f46522d76da00628e1c6b877b576ff571dc09d7c1bd0232abd626296b46a16785cccaf091b086ea61b5081035572b846e04fff97d0dafb SHA512 1cd4c98404e7b25b2c1f1e4018fc1774f09822df8e597022c7b31b9cf20ce3c5649fd90337c62c65d163fb9c896bd9e19277febb5312d4afe347eac328c6e304 diff --git a/net-analyzer/traceroute-nanog/metadata.xml b/net-analyzer/traceroute-nanog/metadata.xml deleted file mode 100644 index 74c2baebb4ec..000000000000 --- a/net-analyzer/traceroute-nanog/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://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/traceroute-nanog/traceroute-nanog-6.4.2_p1.ebuild b/net-analyzer/traceroute-nanog/traceroute-nanog-6.4.2_p1.ebuild deleted file mode 100644 index e2c94b97847c..000000000000 --- a/net-analyzer/traceroute-nanog/traceroute-nanog-6.4.2_p1.ebuild +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit toolchain-funcs - -DEB_PL="1" -DESCRIPTION="Traceroute with AS lookup, TOS support, MTU discovery and other features" -HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage" -SRC_URI=" - https://dev.gentoo.org/~jer/${PN}_${PV/_p*}.orig.tar.gz - https://dev.gentoo.org/~jer/${PN}_${PV/_p*}-${PV/*_p}.diff.gz -" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="amd64 ~arm ~ppc x86" - -S=${WORKDIR}/${P/_p*}.orig - -src_prepare() { - eapply "${WORKDIR}"/${PN}_${PV/_p*}-${PV/*_p}.diff - - eapply \ - $( - for i in $( cat "${S}"/debian/patches/00list ) - do - echo "${S}"/debian/patches/$i.dpatch - done - ) - - eapply_user -} - -src_compile() { - $(tc-getCC) traceroute.c -o ${PN} ${CFLAGS} -DSTRING ${LDFLAGS} -lresolv -lm \ - || die -} - -src_install() { - dosbin traceroute-nanog - dodoc 0_readme.txt faq.txt - newman "${S}"/debian/traceroute-nanog.genuine.8 traceroute-nanog.8 -} diff --git a/net-analyzer/traceroute/Manifest b/net-analyzer/traceroute/Manifest index 5105dae9abdc..ea14b7f70581 100644 --- a/net-analyzer/traceroute/Manifest +++ b/net-analyzer/traceroute/Manifest @@ -1 +1,3 @@ -DIST traceroute-2.1.0.tar.gz 71460 BLAKE2B 4c2126fa98625d525d0a1b0075d16a6ff37836e18d2ce8319f58c89bfa22a6a5e3bbe2ded22fa98d5128c7bb58578327db08120a5b78c1c4ff5673dcc0dea7e6 SHA512 3578007c734091ea0c906637c03fd133a8b0154fbf2e6b5c0c881184947918196bc03aeaf872d3bd53777b9b771cba5cf97f73fb5916bb53b75037f429b40ed3 +DIST traceroute-2.1.1.tar.gz 73063 BLAKE2B 89a828f7a0fec30ece599ee7fdd13fd93db0668f6c9f930f1d6d7d94140bcfdf0c75d2d8c5cc52d699e5c4377239f1a4123ad73a98b619968955d029d0842d9f SHA512 f3358e57ffb4a8dc40650e941da879c60407414e44f9887ae65820d1089491dbfac579bd06c1df296738af89a6c61c1e7944ae4495464f8c9ae21afb19b8f296 +DIST traceroute-2.1.3.tar.gz 73171 BLAKE2B a723bdc8ed5f12f6b53552cf7d330eb028deb55ae85c785451d282be1946cdc57ff428a755cc2bbd71495b49cbc89c1707d2686a553029220f8a089fed1c1fc2 SHA512 db96214e6957fffe17c013044fdc20be6cf94fe5249c9adac77e62e20327c4d582b2ddf4b511f93f30be0cba9f67b0f3f61490745f35ff5a32c63ed66cb0c444 +DIST traceroute-2.1.5.tar.gz 75453 BLAKE2B b2e99398b23d064f96319c9ca677589175f4bde64bce1f1d3236fc94f0ae3aa00499a2ef4a5c66c3a5815e09e16c534d049c36745119850c90c8af879ef66c6b SHA512 4557e6091cd34edd9761ffa5c75e13d63e7ae17c9d060f18306487cd5c1e7eece8a7ef3ddc6bf40f78d1014ed38ce2411c14d839251412978b2da0915180be93 diff --git a/net-analyzer/traceroute/metadata.xml b/net-analyzer/traceroute/metadata.xml index c688b57c016e..85a3686f583a 100644 --- a/net-analyzer/traceroute/metadata.xml +++ b/net-analyzer/traceroute/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>netmon@gentoo.org</email> @@ -7,5 +7,6 @@ </maintainer> <upstream> <remote-id type="sourceforge">traceroute</remote-id> + <remote-id type="cpe">cpe:/a:buc:traceroute</remote-id> </upstream> </pkgmetadata> diff --git a/net-analyzer/traceroute/traceroute-2.1.0.ebuild b/net-analyzer/traceroute/traceroute-2.1.0.ebuild deleted file mode 100644 index f84fb8817101..000000000000 --- a/net-analyzer/traceroute/traceroute-2.1.0.ebuild +++ /dev/null @@ -1,32 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -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" - -LICENSE="GPL-2 LGPL-2.1" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux" -IUSE="static" - -RDEPEND="!<net-misc/iputils-20121221-r1 - !net-misc/iputils[traceroute6]" - -src_compile() { - use static && append-ldflags -static - append-ldflags -L../libsupp #432116 - tc-export AR CC RANLIB - emake env=yes -} - -src_install() { - emake DESTDIR="${D}" prefix="${EPREFIX}/usr" install - dodoc ChangeLog CREDITS README TODO - dosym traceroute /usr/bin/traceroute6 - dosym traceroute.8 /usr/share/man/man8/traceroute6.8 -} diff --git a/net-analyzer/traceroute/traceroute-2.1.1.ebuild b/net-analyzer/traceroute/traceroute-2.1.1.ebuild new file mode 100644 index 000000000000..328a9946483f --- /dev/null +++ b/net-analyzer/traceroute/traceroute-2.1.1.ebuild @@ -0,0 +1,31 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +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" + +LICENSE="GPL-2 LGPL-2.1" +SLOT="0" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" +IUSE="static" + +RDEPEND="!net-misc/iputils[traceroute6(-)]" + +src_compile() { + use static && append-ldflags -static + append-ldflags -L../libsupp #432116 + tc-export AR CC RANLIB + emake env=yes +} + +src_install() { + emake DESTDIR="${D}" prefix="${EPREFIX}/usr" install + dodoc ChangeLog CREDITS README TODO + dosym traceroute /usr/bin/traceroute6 + dosym traceroute.8 /usr/share/man/man8/traceroute6.8 +} diff --git a/net-analyzer/traceroute/traceroute-2.1.3.ebuild b/net-analyzer/traceroute/traceroute-2.1.3.ebuild new file mode 100644 index 000000000000..704e481d5e1a --- /dev/null +++ b/net-analyzer/traceroute/traceroute-2.1.3.ebuild @@ -0,0 +1,33 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +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" + +LICENSE="GPL-2 LGPL-2.1" +SLOT="0" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" +IUSE="static" + +RDEPEND="!net-misc/iputils[traceroute6(-)]" + +src_compile() { + use static && append-ldflags -static + # bug #432116 + append-ldflags -L../libsupp + tc-export AR CC RANLIB + + emake env=yes +} + +src_install() { + emake DESTDIR="${D}" prefix="${EPREFIX}/usr" install + dodoc ChangeLog CREDITS README TODO + dosym traceroute /usr/bin/traceroute6 + dosym traceroute.8 /usr/share/man/man8/traceroute6.8 +} diff --git a/net-analyzer/traceroute/traceroute-2.1.5.ebuild b/net-analyzer/traceroute/traceroute-2.1.5.ebuild new file mode 100644 index 000000000000..f7fbff47aa10 --- /dev/null +++ b/net-analyzer/traceroute/traceroute-2.1.5.ebuild @@ -0,0 +1,33 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +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" + +LICENSE="GPL-2 LGPL-2.1" +SLOT="0" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" +IUSE="static" + +RDEPEND="!net-misc/iputils[traceroute6(-)]" + +src_compile() { + use static && append-ldflags -static + # bug #432116 + append-ldflags -L../libsupp + tc-export AR CC RANLIB + + emake env=yes +} + +src_install() { + emake DESTDIR="${D}" prefix="${EPREFIX}/usr" install + dodoc ChangeLog CREDITS README TODO + dosym traceroute /usr/bin/traceroute6 + dosym traceroute.8 /usr/share/man/man8/traceroute6.8 +} diff --git a/net-analyzer/trafshow/metadata.xml b/net-analyzer/trafshow/metadata.xml index 74c2baebb4ec..dce3f3be66c0 100644 --- a/net-analyzer/trafshow/metadata.xml +++ b/net-analyzer/trafshow/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>netmon@gentoo.org</email> diff --git a/net-analyzer/trippy/Manifest b/net-analyzer/trippy/Manifest new file mode 100644 index 000000000000..5f290c357170 --- /dev/null +++ b/net-analyzer/trippy/Manifest @@ -0,0 +1,338 @@ +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 +DIST paste-1.0.14.crate 18157 BLAKE2B 35e8548611c51ee75f4d04926149e5e54870d7073d9b635d550a6fa0f85891f57f326bdbcff3dd8618cf40f8e08cf903ef87d9c034d5921d8b91e1db842cdd7c SHA512 3a793f0e5e773a7f7defc798a4c17ae9a40d715144632ea6cb0a8c785e14c4212046491df016bb9838281f8eaf327a79f01c1e2ac5f26785c028bc880faff9ee +DIST percent-encoding-2.3.1.crate 10235 BLAKE2B cf8e2fd7b359a05b7bdaf731f9ae84c7fe6f468a53482eb2db7f93dfdaab64ac812b3664899db260055a93449462e6d219c695942fc5b030517b197b4df9b95f SHA512 5951ea8315e52cf3acfbaa023cb9e13a136b114c54a7da0bd44619ae24cd2159d4a96469d7572a2fdabd94e19513a033387117d7ca81d0eb409fb383e4acda44 +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 +DIST windows-targets-0.52.0.crate 6229 BLAKE2B 4b1efdd32202f112d3782b586ce60667f5d3b6f97ccae0d7da833aee2ae81ceece88b5ef4126db2448c9019de3f77e4fe66ed4286bb6275d9a5e8ab74725b804 SHA512 0ea09552d89b802ec0d419b640fa02d0af7af602704a0e88ba10f81d123dee0c907460f6ec91224177ec9a948970abd7414740eb219148a4d66c269c2362740e +DIST windows_aarch64_gnullvm-0.48.5.crate 418492 BLAKE2B 5c6f7d73ad05740f0bac304ed1ef9b2ea63b0d6ca8f875552ae299a0b73b1557e8fe996f1c2b69be9f2df350c9288690f49ee62239a2896991364331d6c55462 SHA512 20158d31454488f6053d3ad7b97d7fc6eae6cf37e4ba0e50c28bd29b368505eed64199ae31104d5f97b66846be54e5ed25c0ad31ea850819205c573a31ac0996 +DIST windows_aarch64_gnullvm-0.52.0.crate 430182 BLAKE2B f23370c62c4ab3fd885e3ee22e8ec2fb5a3a837a57044c1df3f9986dd4e7e9d0a44ec58be1648a41e1ea4d037afa3077f0f03de0204199a82fb8395731815a4a SHA512 b7c3fe0a2ad5149be0df48fc7a4d15879eb130bd9441c58c25fc71b8a91483f0b553fb1bf29a9302acd348e9083a547430a840b059b0cfe19867ecaffcae986f +DIST windows_aarch64_msvc-0.48.5.crate 798483 BLAKE2B 60c466d6536426425a34b5ca20da97c8127ebeb4fb9b1363911165bada484f8913fcd50e90410b5661e0c27dbfe8f4eeaa62fb17d1f3566bfc82b6255e11619b SHA512 223f016c6f1a44dbc5c8a8428b39438f75380ea06951b7c26ed0877b19d79410c6fde5e4c7f2c839b6e76159131f39a1230e0e3a208dfc425ba9117e3665c4ff +DIST windows_aarch64_msvc-0.52.0.crate 821663 BLAKE2B e6f772858205f7cd871722136aec4d00daea4793ff9dcae53e6311e74526c46aa11c2b3df7a85e6c577757254cbfa5a713e68c694625ca274b64e7a1c5532c23 SHA512 8446bfe5b9fe538415762c8129ab3bf2fe45482e045bce367475747786602ad4ae1187c6e508dd9d7b6be81bfc8d430e0db9c624e35c7cc52e823023e46f5cf1 +DIST windows_i686_gnu-0.48.5.crate 844891 BLAKE2B fdc37cd74a4982056bf22fdb7b84e1c55dc838f3cb19ff3648730a77e673ef4ecc0380b3e4277bb8df2fcfa25f57b69014713d9e3ed27c28e19b25b3ea2ab774 SHA512 931ba5c1e4eb8ae73248e00d9611298d1c4b4b0dae719fdeb9243930cd420a103a7bc2738e0a4887c42c8f25728d6c5d64ad141dc092bc3f1d0f35dbe37d303a +DIST windows_i686_gnu-0.52.0.crate 870285 BLAKE2B a7688062a128a1b1394b3978210334e4e2aaa10dce131457c4a11ce0cb3f551e7f4962d1ece1846d8e9526983ced0e0a3ee8c933858e9314b62e76381e086ef9 SHA512 fe993f5bb6e039c257be9b35337e0221f718d23866818bfd19c76aaae236aafc2de4bb5014fcdf919563b5901cdaa14a2136cd086eeed3c83e46a5d02f6aa77e +DIST windows_i686_msvc-0.48.5.crate 864300 BLAKE2B 3d3ea8be55e2d6ced0eeda18abe1dffb925a1a78f456d683e4450d9f2fd287ad2e8494d65b2b770c677a12b3a60d10f0435e16c61880e3867c3657fd44892442 SHA512 70e2fb4fdb006a4cbd43ab2c7e940b277a15fb1790dfa2d1fc1f1fd18bead4886f6dc046e44326603e4894d988578917b8932aba5d9a6a4cc8424911cad9dc7e +DIST windows_i686_msvc-0.52.0.crate 888693 BLAKE2B 7a6e9d03e503c8f543e80a8c7bcf3f50cfa7eed462e487ae7b581746d7cc4d871b33e307110d3a3a75226d88e837f9452ac56bf3baf71b66cfab2626cc15558a SHA512 817ac796fd00bed51d80133ec873cf3d3d582ba41fec8a6f6407fbd7544f198e928aa5d710f70c13bbf74a1dde4c91c54e65eb9d3b7518a7f011ea42725eb671 +DIST windows_x86_64_gnu-0.48.5.crate 801619 BLAKE2B aa7e7e6a6ff9f9553ada3a0a39a9aa798e9d995a8eef36e0b6fdb2a0db93ddecee5548970575271fe43aec74797a420d0ee231d503b5bad1bd999059261e0e33 SHA512 1d6056fae430b3d042bdff3c6217c76be4b8b9f5dada9bad06beaac2db7d7ab9b0a82e44f498ec88e61afa73e99f56d84d445dc3847732b9ce5d947e08485f74 +DIST windows_x86_64_gnu-0.52.0.crate 826213 BLAKE2B 3ca03285ef289fc844261142154e710e996c29940b1c0a7dc3016906ff6452fa50b24f8668fce0ca44bf169ab1228c217fece9f7bddac9ab8bdc54fddafaf8a8 SHA512 2d81af56ad0bc9536f6e066776642a546ce6c6d99551edc0603ffcafe6db15d5d5a32a642b204bbfadf34231daa3894ad7897a9c0c575c2b6bc1e3e58a9a3eb7 +DIST windows_x86_64_gnullvm-0.48.5.crate 418486 BLAKE2B 12a2199d434617c1df1a839e9f435620ad64b40c579f6d0c3677553ad7a48e5765d12c266b04946402e15c92cff2e4ac4979ce2130750ef426e2672119680284 SHA512 c016d5b5e73832b61ff67929d92fa8c16e154656294357266ad29ce1f44db4ca2d2935dba31a6b571187dc838b1d22f1e3b41fefffd1d719a338439adf1646aa +DIST windows_x86_64_gnullvm-0.52.0.crate 430165 BLAKE2B af9345a1f6e0ed1392ca1534c68d23f3be0fbb6a42b3c5518cee14373e645038526da15e849d14abe45c53766a30c6c2042a626482ba4a05409f325eb6aa36b1 SHA512 e88af35fd1c694dc189783e5c81aafa61aeffbddce4d7130e1125d0ce3d932fafeb345990ffd98477c41b578b7f5090f4f9c0457b02146309b95549c9f8f44f0 +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/metadata.xml b/net-analyzer/trippy/metadata.xml new file mode 100644 index 000000000000..a273e2950d9b --- /dev/null +++ b/net-analyzer/trippy/metadata.xml @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type='person'> + <name>Florian Schmaus</name> + <email>flow@gentoo.org</email> + </maintainer> + <upstream> + <remote-id type="github">fujiapple852/trippy</remote-id> + </upstream> +</pkgmetadata> 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 new file mode 100644 index 000000000000..e1dfbdbbc957 --- /dev/null +++ b/net-analyzer/trippy/trippy-0.9.0.ebuild @@ -0,0 +1,252 @@ +# 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.6 + aho-corasick@1.1.2 + allocator-api2@0.2.16 + android-tzdata@0.1.1 + android_system_properties@0.1.5 + anstream@0.6.4 + anstyle@1.0.4 + anstyle-parse@0.2.2 + anstyle-query@1.0.0 + anstyle-wincon@3.0.1 + anyhow@1.0.75 + arrayvec@0.7.4 + async-trait@0.1.74 + autocfg@1.1.0 + backtrace@0.3.69 + bitflags@1.3.2 + bitflags@2.4.1 + bumpalo@3.14.0 + bytes@1.5.0 + caps@0.5.5 + cassowary@0.3.0 + cc@1.0.83 + cfg-if@1.0.0 + chrono@0.4.31 + clap@4.4.8 + clap_builder@4.4.8 + clap_complete@4.4.4 + clap_derive@4.4.7 + clap_lex@0.6.0 + colorchoice@1.0.0 + comfy-table@7.1.0 + core-foundation-sys@0.8.4 + crossbeam@0.8.2 + crossbeam-channel@0.5.8 + crossbeam-deque@0.8.3 + crossbeam-epoch@0.9.15 + crossbeam-queue@0.3.8 + crossbeam-utils@0.8.16 + crossterm@0.27.0 + crossterm_winapi@0.9.1 + csv@1.3.0 + csv-core@0.1.11 + data-encoding@2.5.0 + derive_more@0.99.17 + diff@0.1.13 + dns-lookup@2.0.4 + either@1.9.0 + enum-as-inner@0.6.0 + equivalent@1.0.1 + errno@0.3.7 + etcetera@0.8.0 + fixedbitset@0.4.2 + form_urlencoded@1.2.1 + futures-channel@0.3.29 + futures-core@0.3.29 + futures-io@0.3.29 + futures-task@0.3.29 + futures-util@0.3.29 + getrandom@0.2.11 + gimli@0.28.1 + hashbrown@0.14.3 + heck@0.4.1 + hermit-abi@0.3.3 + hex-literal@0.4.1 + hickory-proto@0.24.0 + hickory-resolver@0.24.0 + home@0.5.5 + hostname@0.3.1 + humantime@2.1.0 + iana-time-zone@0.1.58 + iana-time-zone-haiku@0.1.2 + idna@0.4.0 + idna@0.5.0 + indexmap@2.1.0 + indoc@2.0.4 + ipconfig@0.3.2 + ipnet@2.9.0 + ipnetwork@0.18.0 + itertools@0.11.0 + itertools@0.12.0 + itoa@1.0.9 + js-sys@0.3.65 + lazy_static@1.4.0 + libc@0.2.150 + linked-hash-map@0.5.6 + linux-raw-sys@0.4.11 + lock_api@0.4.11 + log@0.4.20 + lru@0.12.1 + lru-cache@0.1.2 + match_cfg@0.1.0 + matchers@0.1.0 + maxminddb@0.23.0 + memchr@2.6.4 + memoffset@0.9.0 + miniz_oxide@0.7.1 + mio@0.8.9 + nix@0.27.1 + nu-ansi-term@0.46.0 + num-traits@0.2.17 + num_cpus@1.16.0 + object@0.32.1 + once_cell@1.18.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 + ppv-lite86@0.2.17 + pretty_assertions@1.4.0 + proc-macro2@1.0.70 + quick-error@1.2.3 + quote@1.0.33 + rand@0.8.5 + rand_chacha@0.3.1 + rand_core@0.6.4 + ratatui@0.24.0 + redox_syscall@0.4.1 + regex@1.10.2 + regex-automata@0.1.10 + regex-automata@0.4.3 + regex-syntax@0.6.29 + regex-syntax@0.8.2 + resolv-conf@0.7.0 + rustc-demangle@0.1.23 + rustix@0.38.25 + rustversion@1.0.14 + ryu@1.0.15 + scopeguard@1.2.0 + serde@1.0.193 + serde_derive@1.0.193 + serde_json@1.0.108 + serde_spanned@0.6.4 + sharded-slab@0.1.7 + signal-hook@0.3.17 + signal-hook-mio@0.2.3 + signal-hook-registry@1.4.1 + slab@0.4.9 + smallvec@1.11.2 + socket2@0.5.5 + strum@0.25.0 + strum_macros@0.25.3 + syn@1.0.109 + syn@2.0.39 + terminal_size@0.3.0 + test-case@3.3.1 + test-case-core@3.3.1 + test-case-macros@3.3.1 + thiserror@1.0.50 + thiserror-impl@1.0.50 + thread_local@1.1.7 + tinyvec@1.6.0 + tinyvec_macros@0.1.1 + tokio@1.34.0 + toml@0.8.8 + toml_datetime@0.6.5 + toml_edit@0.21.0 + tracing@0.1.40 + tracing-attributes@0.1.27 + tracing-chrome@0.7.1 + tracing-core@0.1.32 + tracing-log@0.2.0 + tracing-serde@0.1.3 + tracing-subscriber@0.3.18 + unicode-bidi@0.3.13 + unicode-ident@1.0.12 + unicode-normalization@0.1.22 + unicode-segmentation@1.10.1 + unicode-width@0.1.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@0.2.88 + wasm-bindgen-backend@0.2.88 + wasm-bindgen-macro@0.2.88 + wasm-bindgen-macro-support@0.2.88 + wasm-bindgen-shared@0.2.88 + widestring@1.0.2 + winapi@0.3.9 + winapi-i686-pc-windows-gnu@0.4.0 + winapi-x86_64-pc-windows-gnu@0.4.0 + windows-core@0.51.1 + windows-sys@0.48.0 + windows-sys@0.52.0 + windows-targets@0.48.5 + windows-targets@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.5.19 + winreg@0.50.0 + yansi@0.5.1 + zerocopy@0.7.26 + zerocopy-derive@0.7.26 +" + +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 + || ( Apache-2.0 Boost-1.0 ) +" +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/tsung/Manifest b/net-analyzer/tsung/Manifest index 4846012062ba..7b130044521f 100644 --- a/net-analyzer/tsung/Manifest +++ b/net-analyzer/tsung/Manifest @@ -1 +1 @@ -DIST tsung-1.7.0.tar.gz 1572265 BLAKE2B 8227e14106943071e7a3759b2bd06a92af55889ecf22b1a74432fd2f6d03196a9e321d16f1e291dcd71d4af560f4f2b38193326a9a87fec671dcda23ab0ecb1b SHA512 67490a95fb54f5196ae0302190190a6b8e79bbeba9a7c1932d83a949504489d4cc3ce048380c0cb09c6cae4c1e203d52de9ea0e2f4e7c3d7438b836aef532dac +DIST tsung-1.8.0.tar.gz 1662056 BLAKE2B 7d61fbba7981214b91c16d07cdf69e54e6bf5d39f7c4856b58ff87fc9ee4e5e850d8e075aa6cd0c2d725d92c42eb3ea619139c1754abd20b446f0bdb05d8cb39 SHA512 e025b59674c05eee8069982888eddd1cdb92f3984e1b0694aa06b22041f8072b2e8cf5358154cd9b80a83412d0e767f7ae9c47e09ba43db15b319537553e9ded diff --git a/net-analyzer/tsung/metadata.xml b/net-analyzer/tsung/metadata.xml index 40aa45df2b01..2ce0e74f9864 100644 --- a/net-analyzer/tsung/metadata.xml +++ b/net-analyzer/tsung/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> <email>patrick@gentoo.org</email> diff --git a/net-analyzer/tsung/tsung-1.7.0.ebuild b/net-analyzer/tsung/tsung-1.7.0.ebuild deleted file mode 100644 index 80940ea2f4aa..000000000000 --- a/net-analyzer/tsung/tsung-1.7.0.ebuild +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" - -# Seems to be misconfigured -RESTRICT="test" - -inherit eutils - -DESCRIPTION="Erlang's multi-protocol distributed load testing tool" -HOMEPAGE="http://tsung.erlang-projects.org/" -SRC_URI="http://tsung.erlang-projects.org/dist/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="gnuplot" - -DEPEND="dev-lang/erlang" -RDEPEND=" - gnuplot? ( - sci-visualization/gnuplot - dev-perl/Template-Toolkit - ) - ${DEPEND} -" -src_configure() { - ./configure --prefix="/usr" || die "econf failed" -} - -src_compile() { - emake -} - -src_install() { - emake -j1 DESTDIR="${D}" install -} diff --git a/net-analyzer/tsung/tsung-1.8.0.ebuild b/net-analyzer/tsung/tsung-1.8.0.ebuild new file mode 100644 index 000000000000..fbee6e966333 --- /dev/null +++ b/net-analyzer/tsung/tsung-1.8.0.ebuild @@ -0,0 +1,36 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="8" + +# Seems to be misconfigured +RESTRICT="test" + +DESCRIPTION="Erlang's multi-protocol distributed load testing tool" +HOMEPAGE="http://tsung.erlang-projects.org/" +SRC_URI="http://tsung.erlang-projects.org/dist/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="gnuplot" + +DEPEND="dev-lang/erlang" +RDEPEND=" + gnuplot? ( + sci-visualization/gnuplot + dev-perl/Template-Toolkit + ) + ${DEPEND} +" +src_configure() { + ./configure --prefix="/usr" || die "econf failed" +} + +src_compile() { + emake +} + +src_install() { + emake -j1 DESTDIR="${D}" install +} diff --git a/net-analyzer/ttcp/metadata.xml b/net-analyzer/ttcp/metadata.xml index 74c2baebb4ec..dce3f3be66c0 100644 --- a/net-analyzer/ttcp/metadata.xml +++ b/net-analyzer/ttcp/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>netmon@gentoo.org</email> diff --git a/net-analyzer/ttcp/ttcp-1.12-r2.ebuild b/net-analyzer/ttcp/ttcp-1.12-r2.ebuild deleted file mode 100644 index 49e46e02dbd4..000000000000 --- a/net-analyzer/ttcp/ttcp-1.12-r2.ebuild +++ /dev/null @@ -1,26 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit toolchain-funcs - -DESCRIPTION="Tool to test TCP and UDP throughput" -HOMEPAGE=" - http://ftp.arl.mil/~mike/ttcp.html - http://www.netcore.fi/pekkas/linux/ipv6/ -" -LICENSE="public-domain" -SLOT="0" -KEYWORDS="~amd64 ~hppa ~mips ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos" -SRC_URI=" - mirror://gentoo/${P}.tar.bz2 - https://dev.gentoo.org/~jer/${P}.c -" -src_compile() { - $(tc-getCC) ${CFLAGS} ${LDFLAGS} -o ${PN} "${DISTDIR}"/${P}.c || die -} - -src_install() { - dobin ${PN} - newman sgi-${PN}.1 ${PN}.1 -} diff --git a/net-analyzer/ttcp/ttcp-1.12-r3.ebuild b/net-analyzer/ttcp/ttcp-1.12-r3.ebuild new file mode 100644 index 000000000000..1fae3ce9f5fa --- /dev/null +++ b/net-analyzer/ttcp/ttcp-1.12-r3.ebuild @@ -0,0 +1,36 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit toolchain-funcs + +DESCRIPTION="Tool to test TCP and UDP throughput" +HOMEPAGE=" + http://ftp.arl.mil/~mike/ttcp.html + http://www.netcore.fi/pekkas/linux/ipv6/" +SRC_URI=" + mirror://gentoo/${P}.tar.bz2 + https://dev.gentoo.org/~jsmolic/distfiles/${P}.c" + +LICENSE="public-domain" +SLOT="0" +KEYWORDS="~amd64 ~hppa ~mips ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos" + +src_prepare() { + cp "${DISTDIR}"/${P}.c ${PN}.c || die + default +} + +src_configure() { + tc-export CC +} + +src_compile() { + emake ttcp +} + +src_install() { + dobin ttcp + newman sgi-ttcp.1 ttcp.1 +} diff --git a/net-analyzer/upnpscan/metadata.xml b/net-analyzer/upnpscan/metadata.xml index 87ebba397bfa..bb35b1ef3034 100644 --- a/net-analyzer/upnpscan/metadata.xml +++ b/net-analyzer/upnpscan/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>netmon@gentoo.org</email> diff --git a/net-analyzer/upnpscan/upnpscan-0.4-r3.ebuild b/net-analyzer/upnpscan/upnpscan-0.4-r3.ebuild index 91839f3352c1..b92dcbfb3960 100644 --- a/net-analyzer/upnpscan/upnpscan-0.4-r3.ebuild +++ b/net-analyzer/upnpscan/upnpscan-0.4-r3.ebuild @@ -1,23 +1,27 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 -AUTOTOOLS_AUTORECONF=1 -AUTOTOOLS_IN_SOURCE_BUILD=1 +inherit autotools -inherit autotools-utils - -DESCRIPTION="Scans the network for UPNP capable devices" +DESCRIPTION="Scans the network for UPnP capable devices" HOMEPAGE="http://www.cqure.net/wp/upnpscan/" SRC_URI="http://www.cqure.net/tools/${PN}-v${PV}-src.tgz" +S="${WORKDIR}/${PN}" LICENSE="GPL-2" SLOT="0" KEYWORDS="amd64 x86" -S=${WORKDIR}/${PN} - DOCS=( AUTHORS ChangeLog NEWS README TODO ) -PATCHES=( "${FILESDIR}"/${P}-r2-cflags.patch ) +PATCHES=( + "${FILESDIR}"/${P}-r2-cflags.patch +) + +src_prepare() { + default + + eautoreconf +} diff --git a/net-analyzer/vnstat/Manifest b/net-analyzer/vnstat/Manifest index d1ad555e13f2..f0f9856c1819 100644 --- a/net-analyzer/vnstat/Manifest +++ b/net-analyzer/vnstat/Manifest @@ -1,2 +1,4 @@ -DIST vnstat-1.17.tar.gz 238397 BLAKE2B 73aaffda3c91a1146b1d6a21f637272be227a15a7964aad90fb76c407c5f7fb0085e6f9f54408e8ebc667475c15f260d701c5924737f20921ebc0a35affd52be SHA512 c9c119a89054dacdc15026c766a20d88336d7689dd4264530d0347fcc58f3cbfc806b271e0f83e76c3b4a31ab793a628ee7d7b696943da919ee4cd2fdb481cc3 -DIST vnstat-2.6.tar.gz 275751 BLAKE2B 7351b265d66e42d1e5450dae6f5eaa973a9cdc171b865689540b5838ddeb2629da968bc2ba655cb6ff909227a859f0334900a1597c78b772124a993343a4cf23 SHA512 1a62fc9c2379b050208945e85bad04f602a0f2c71e6bd069d241c1df77c76ec6258948fc3fdf633b15c52665782cae4f995a916103d330bfb46cab0291d3a1ea +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/files/vnstat-2.2-conf.patch b/net-analyzer/vnstat/files/vnstat-2.2-conf.patch deleted file mode 100644 index 7bea5d8ffe97..000000000000 --- a/net-analyzer/vnstat/files/vnstat-2.2-conf.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/cfg/vnstat.conf -+++ b/cfg/vnstat.conf -@@ -143,7 +143,7 @@ - LogFile "/var/log/vnstat/vnstat.log" - - # file used as daemon pid / lock file --PidFile "/var/run/vnstat/vnstat.pid" -+PidFile "/run/vnstat/vnstat.pid" - - # 1 = 64-bit, 0 = 32-bit, -1 = old style logic, -2 = automatic detection - 64bitInterfaceCounters -2 diff --git a/net-analyzer/vnstat/files/vnstat-2.2-drop-root.patch b/net-analyzer/vnstat/files/vnstat-2.2-drop-root.patch deleted file mode 100644 index 2ed3ec1404a4..000000000000 --- a/net-analyzer/vnstat/files/vnstat-2.2-drop-root.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- a/cfg/vnstat.conf -+++ b/cfg/vnstat.conf -@@ -69,10 +69,10 @@ - ## - - # switch to given user when started as root (leave empty to disable) --DaemonUser "" -+DaemonUser "vnstat" - - # switch to given group when started as root (leave empty to disable) --DaemonGroup "" -+DaemonGroup "vnstat" - - # try to detect interface maximum bandwidth, 0 = disable feature - # MaxBandwidth will be used as fallback value when enabled diff --git a/net-analyzer/vnstat/files/vnstat-2.2-run.patch b/net-analyzer/vnstat/files/vnstat-2.2-run.patch deleted file mode 100644 index bb9222b5fe2f..000000000000 --- a/net-analyzer/vnstat/files/vnstat-2.2-run.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/src/common.h -+++ b/src/common.h -@@ -229,7 +229,7 @@ - #define CREATEDIRS 1 - #define UPDATEFILEOWNER 1 - #define LOGFILE "/var/log/vnstat/vnstat.log" --#define PIDFILE "/var/run/vnstat/vnstat.pid" -+#define PIDFILE "/run/vnstat/vnstat.pid" - #define IS64BIT -2 - - /* no transparency by default */ diff --git a/net-analyzer/vnstat/files/vnstat-2.9-conf.patch b/net-analyzer/vnstat/files/vnstat-2.9-conf.patch new file mode 100644 index 000000000000..d2cfa3977cfb --- /dev/null +++ b/net-analyzer/vnstat/files/vnstat-2.9-conf.patch @@ -0,0 +1,39 @@ +diff --git a/cfg/vnstat.conf b/cfg/vnstat.conf +index f404de5..d2bd928 100644 +--- a/cfg/vnstat.conf ++++ b/cfg/vnstat.conf +@@ -80,10 +80,10 @@ + ## + + # switch to given user when started as root (leave empty to disable) +-;DaemonUser "" ++;DaemonUser "vnstat" + + # switch to given group when started as root (leave empty to disable) +-;DaemonGroup "" ++;DaemonGroup "vnstat" + + # try to detect interface maximum bandwidth, 0 = disable feature + # MaxBandwidth will be used as fallback value when enabled +@@ -161,7 +161,7 @@ + ;LogFile "/var/log/vnstat/vnstat.log" + + # file used as daemon pid / lock file +-;PidFile "/var/run/vnstat/vnstat.pid" ++;PidFile "/run/vnstat/vnstat.pid" + + # 1 = 64-bit, 0 = 32-bit, -1 = old style logic, -2 = automatic detection + ;64bitInterfaceCounters -2 +diff --git a/src/common.h b/src/common.h +index bb2fb56..f148004 100644 +--- a/src/common.h ++++ b/src/common.h +@@ -241,7 +241,7 @@ and most can be changed later from the config file. + #define CREATEDIRS 1 + #define UPDATEFILEOWNER 1 + #define LOGFILE "/var/log/vnstat/vnstat.log" +-#define PIDFILE "/var/run/vnstat/vnstat.pid" ++#define PIDFILE "/run/vnstat/vnstat.pid" + #define IS64BIT -2 + #define WALDB 0 + #define WALDBCHECKPOINTINTERVALMINS 240 diff --git a/net-analyzer/vnstat/files/vnstat.cron b/net-analyzer/vnstat/files/vnstat.cron deleted file mode 100644 index 690681327688..000000000000 --- a/net-analyzer/vnstat/files/vnstat.cron +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/bash - -# run vnstat if installed and at least one database exists - -# Uncomment the following to enable - -#if [ -x /usr/bin/vnstat ] && [ `ls /var/lib/vnstat/ | wc -l` -ge 1 ] ; then -# exec /usr/bin/vnstat -u -#fi diff --git a/net-analyzer/vnstat/files/vnstatd.confd b/net-analyzer/vnstat/files/vnstatd.confd deleted file mode 100644 index 17901419aacb..000000000000 --- a/net-analyzer/vnstat/files/vnstatd.confd +++ /dev/null @@ -1,7 +0,0 @@ -# /etc/conf.d/vnstatd: config file for /etc/init.d/vnstatd - -# Adjust scheduling priority on vnstatd (default: 0) -#VNSTATD_NICELEVEL="0" - -# Pass extra options to vnstatd -#VNSTATD_EXTRAOPTS="--config /etc/vnstat.conf" diff --git a/net-analyzer/vnstat/files/vnstatd.initd-r1 b/net-analyzer/vnstat/files/vnstatd.initd-r1 deleted file mode 100644 index a8d61efe0f2a..000000000000 --- a/net-analyzer/vnstat/files/vnstatd.initd-r1 +++ /dev/null @@ -1,37 +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" - -depend() { - use net -} - -VNSTATD_PIDFILE="${VNSTATD_PIDFILE:-/run/vnstatd/vnstatd.pid}" - -start() { - ebegin "Starting vnstatd" - checkpath -q -d -m 755 -o vnstat:vnstat /run/vnstatd - checkpath -q -d -m 755 -o vnstat:vnstat /var/lib/vnstat - start-stop-daemon --start --quiet \ - --pidfile "${VNSTATD_PIDFILE}" \ - --user vnstat --group vnstat \ - --nicelevel ${VNSTATD_NICELEVEL:-0} \ - --exec /usr/bin/vnstatd -- \ - -d ${VNSTATD_EXTRAOPTS} -p ${VNSTATD_PIDFILE} - eend $? -} - -stop() { - ebegin "Stopping vnstatd" - start-stop-daemon --stop --quiet \ - --pidfile "${VNSTATD_PIDFILE}" - eend $? -} - -reload() { - ebegin "Reloading vnstatd configuration" - kill -HUP $(cat "${VNSTATD_PIDFILE}") 2>&1 >/dev/null - eend $? -} diff --git a/net-analyzer/vnstat/metadata.xml b/net-analyzer/vnstat/metadata.xml index 815914aa1466..72f73094dea2 100644 --- a/net-analyzer/vnstat/metadata.xml +++ b/net-analyzer/vnstat/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> <email>sam@gentoo.org</email> diff --git a/net-analyzer/vnstat/vnstat-1.17.ebuild b/net-analyzer/vnstat/vnstat-1.17.ebuild deleted file mode 100644 index 161165265750..000000000000 --- a/net-analyzer/vnstat/vnstat-1.17.ebuild +++ /dev/null @@ -1,73 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit toolchain-funcs user - -DESCRIPTION="Console-based network traffic monitor that keeps statistics of network usage" -HOMEPAGE="https://humdi.net/vnstat/" -SRC_URI="https://humdi.net/vnstat/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 arm ~hppa ppc ppc64 sparc x86" -IUSE="gd selinux test" -RESTRICT="!test? ( test )" - -COMMON_DEPEND=" - gd? ( media-libs/gd[png] ) -" -DEPEND=" - ${COMMON_DEPEND} - test? ( dev-libs/check ) -" -RDEPEND=" - ${COMMON_DEPEND} - selinux? ( sec-policy/selinux-vnstatd ) -" - -pkg_setup() { - enewgroup vnstat - enewuser vnstat -1 -1 /dev/null vnstat -} - -src_prepare() { - default - - tc-export CC - - sed -i \ - -e 's|vnstat[.]log|vnstatd.log|' \ - -e 's|vnstat[.]pid|vnstatd/vnstatd.pid|' \ - -e 's|/var/run|/run|' \ - cfg/${PN}.conf || die - sed -i \ - -e '/PIDFILE/s|/var/run|/run|' \ - src/common.h || die -} - -src_compile() { - emake ${PN} ${PN}d $(usex gd ${PN}i '') -} - -src_install() { - use gd && dobin vnstati - dobin vnstat vnstatd - - exeinto /etc/cron.hourly - newexe "${FILESDIR}"/vnstat.cron vnstat - - insinto /etc - doins cfg/vnstat.conf - fowners root:vnstat /etc/vnstat.conf - - newconfd "${FILESDIR}"/vnstatd.confd vnstatd - newinitd "${FILESDIR}"/vnstatd.initd-r1 vnstatd - - use gd && doman man/vnstati.1 - doman man/vnstat.1 man/vnstatd.1 - - newdoc INSTALL README.setup - dodoc CHANGES README UPGRADE FAQ examples/vnstat.cgi -} diff --git a/net-analyzer/vnstat/vnstat-2.11.ebuild b/net-analyzer/vnstat/vnstat-2.11.ebuild new file mode 100644 index 000000000000..812aa69dbc7a --- /dev/null +++ b/net-analyzer/vnstat/vnstat-2.11.ebuild @@ -0,0 +1,90 @@ +# 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 new file mode 100644 index 000000000000..7403fef778be --- /dev/null +++ b/net-analyzer/vnstat/vnstat-2.12.ebuild @@ -0,0 +1,90 @@ +# Copyright 1999-2024 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.6.ebuild b/net-analyzer/vnstat/vnstat-2.6.ebuild deleted file mode 100644 index 956e883bd178..000000000000 --- a/net-analyzer/vnstat/vnstat-2.6.ebuild +++ /dev/null @@ -1,71 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit systemd user - -DESCRIPTION="Console-based network traffic monitor that keeps statistics of network usage" -HOMEPAGE="https://humdi.net/vnstat/" -SRC_URI="https://humdi.net/vnstat/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 arm ~arm64 ~hppa ~mips ppc ppc64 sparc x86" -IUSE="gd selinux test" -RESTRICT="!test? ( test )" - -COMMON_DEPEND=" - dev-db/sqlite - gd? ( media-libs/gd[png] ) -" -DEPEND=" - ${COMMON_DEPEND} - test? ( dev-libs/check ) -" -RDEPEND=" - ${COMMON_DEPEND} - selinux? ( sec-policy/selinux-vnstatd ) -" - -PATCHES=( - "${FILESDIR}"/${PN}-2.2-conf.patch - "${FILESDIR}"/${PN}-2.2-drop-root.patch - "${FILESDIR}"/${PN}-2.2-run.patch -) - -pkg_setup() { - enewgroup vnstat - enewuser vnstat -1 -1 /var/lib/vnstat vnstat -} - -src_compile() { - emake ${PN} ${PN}d $(usex 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 - systemd_newtmpfilesd "${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 -} diff --git a/net-analyzer/vnstat/vnstat-9999.ebuild b/net-analyzer/vnstat/vnstat-9999.ebuild index dd3a09ddf9ac..3c0d869f10c3 100644 --- a/net-analyzer/vnstat/vnstat-9999.ebuild +++ b/net-analyzer/vnstat/vnstat-9999.ebuild @@ -1,45 +1,60 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -inherit git-r3 systemd user +inherit systemd tmpfiles DESCRIPTION="Console-based network traffic monitor that keeps statistics of network usage" HOMEPAGE="https://humdi.net/vnstat/" -EGIT_REPO_URI="https://github.com/vergoh/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 )" -COMMON_DEPEND=" +RDEPEND=" + acct-group/vnstat + acct-user/vnstat dev-db/sqlite gd? ( media-libs/gd[png] ) " DEPEND=" - ${COMMON_DEPEND} + ${RDEPEND} test? ( dev-libs/check ) " -RDEPEND=" - ${COMMON_DEPEND} - selinux? ( sec-policy/selinux-vnstatd ) -" +RDEPEND+=" selinux? ( sec-policy/selinux-vnstatd )" PATCHES=( - "${FILESDIR}"/${PN}-2.2-conf.patch - "${FILESDIR}"/${PN}-2.2-drop-root.patch - "${FILESDIR}"/${PN}-2.2-run.patch + "${FILESDIR}"/${PN}-2.9-conf.patch ) -pkg_setup() { - enewgroup vnstat - enewuser vnstat -1 -1 /var/lib/vnstat vnstat -} - src_compile() { - emake ${PN} ${PN}d $(usex gd ${PN}i '') + emake \ + ${PN} \ + ${PN}d \ + $(usev gd ${PN}i) } src_install() { @@ -60,11 +75,16 @@ src_install() { newinitd "${FILESDIR}"/vnstatd.initd-r2 vnstatd systemd_newunit "${FILESDIR}"/vnstatd.systemd vnstatd.service - systemd_newtmpfilesd "${FILESDIR}"/vnstatd.tmpfile vnstatd.conf + newtmpfiles "${FILESDIR}"/vnstatd.tmpfile vnstatd.conf use gd && doman man/vnstati.1 - doman man/vnstat.1 man/vnstatd.1 - newdoc INSTALL.md README.setup - dodoc CHANGES README.md UPGRADE.md FAQ examples/vnstat.cgi + 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/wapiti/Manifest b/net-analyzer/wapiti/Manifest index 9ead88d6c3ae..4ca8b3c31830 100644 --- a/net-analyzer/wapiti/Manifest +++ b/net-analyzer/wapiti/Manifest @@ -1 +1,2 @@ -DIST wapiti3-3.0.3.tar.gz 553259 BLAKE2B c31a1ce3e367c7b85141b0a83c9617a901f01753ebcc56142092d475bf3d540fac6d4e529fc87f5919c962303451787db9e1f8872a5e70a646ff48c1b076139e SHA512 ed135a97ee0c2431fa15d87888eca424db389e9e54b1426e0efe7a83299ee110cb9895916c5f5f3690a99f81034e8ad0d97e3e432b2d478b89a3ba14534ddb96 +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/files/wapiti-3.1.6-setup_scripts.patch b/net-analyzer/wapiti/files/wapiti-3.1.6-setup_scripts.patch new file mode 100644 index 000000000000..8df972aeb1bc --- /dev/null +++ b/net-analyzer/wapiti/files/wapiti-3.1.6-setup_scripts.patch @@ -0,0 +1,14 @@ +diff -Naur wapiti3-3.1.6.orig/setup.py wapiti3-3.1.6/setup.py +--- wapiti3-3.1.6.orig/setup.py 2023-01-31 22:19:30.000000000 +0100 ++++ wapiti3-3.1.6/setup.py 2023-02-09 21:56:43.644507169 +0100 +@@ -81,10 +81,6 @@ + packages=find_packages(exclude=["tests", "tests.*"]), + data_files=doc_and_conf_files, + include_package_data=True, +- scripts=[ +- "bin/wapiti", +- "bin/wapiti-getcookie" +- ], + classifiers=[ + "Development Status :: 5 - Production/Stable", + "Environment :: Console", diff --git a/net-analyzer/wapiti/metadata.xml b/net-analyzer/wapiti/metadata.xml index 59ef9906d471..4de9c0e68a4e 100644 --- a/net-analyzer/wapiti/metadata.xml +++ b/net-analyzer/wapiti/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> <email>voyageur@gentoo.org</email> @@ -14,7 +14,6 @@ Once it gets this list, Wapiti acts like a fuzzer, injecting payloads to see if <remote-id type="sourceforge">wapiti</remote-id> </upstream> <use> - <flag name="kerberos">Support Kerberos authentication</flag> - <flag name="ntlm">Support NTLM authentication</flag> + <!-- Need extra dep <flag name="ntlm">Support NTLM authentication</flag> --> </use> </pkgmetadata> diff --git a/net-analyzer/wapiti/wapiti-3.0.3.ebuild b/net-analyzer/wapiti/wapiti-3.0.3.ebuild deleted file mode 100644 index 4537e62437ab..000000000000 --- a/net-analyzer/wapiti/wapiti-3.0.3.ebuild +++ /dev/null @@ -1,36 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DISTUTILS_USE_SETUPTOOLS=rdepend -PYTHON_COMPAT=( python3_{6,7,8} ) -PYTHON_REQ_USE='xml' - -inherit distutils-r1 - -MY_P=${PN}3-${PV} -DESCRIPTION="Web-application vulnerability scanner" -HOMEPAGE="http://wapiti.sourceforge.net/" -SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="kerberos ntlm" - -RDEPEND="dev-python/beautifulsoup:4[${PYTHON_USEDEP}] - dev-python/lxml[${PYTHON_USEDEP}] - dev-python/mako[${PYTHON_USEDEP}] - >=dev-python/requests-1.2.3[${PYTHON_USEDEP}] - dev-python/tld[${PYTHON_USEDEP}] - dev-python/yaswfp[${PYTHON_USEDEP}] - kerberos? ( dev-python/requests-kerberos[${PYTHON_USEDEP}] ) - ntlm? ( dev-python/requests-ntlm[${PYTHON_USEDEP}] )" - -S=${WORKDIR}/${MY_P} - -python_prepare_all() { - sed -e 's/"pytest-runner"//' -i setup.py || die - distutils-r1_python_prepare_all -} diff --git a/net-analyzer/wapiti/wapiti-3.1.6.ebuild b/net-analyzer/wapiti/wapiti-3.1.6.ebuild new file mode 100644 index 000000000000..e8ed137b349e --- /dev/null +++ b/net-analyzer/wapiti/wapiti-3.1.6.ebuild @@ -0,0 +1,68 @@ +# Copyright 1999-2023 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_REQ_USE='xml(+)' + +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" + +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.11.1[${PYTHON_USEDEP}] + >=dev-python/aiohttp-3.8.1[${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/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 ) + +S=${WORKDIR}/${MY_P} + +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/wapiti/wapiti-3.1.7.ebuild b/net-analyzer/wapiti/wapiti-3.1.7.ebuild new file mode 100644 index 000000000000..a797b298522c --- /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_{9..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="mirror://sourceforge/${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/wapiti/wapiti-9999.ebuild b/net-analyzer/wapiti/wapiti-9999.ebuild deleted file mode 100644 index 95af12c83a0c..000000000000 --- a/net-analyzer/wapiti/wapiti-9999.ebuild +++ /dev/null @@ -1,36 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DISTUTILS_USE_SETUPTOOLS=rdepend -PYTHON_COMPAT=( python3_{6,7,8} ) -PYTHON_REQ_USE='xml' - -inherit distutils-r1 git-r3 - -DESCRIPTION="Web-application vulnerability scanner" -HOMEPAGE="http://wapiti.sourceforge.net/" -EGIT_REPO_URI="https://git.code.sf.net/p/wapiti/git wapiti-git" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="" -IUSE="kerberos ntlm" - -RDEPEND="dev-python/beautifulsoup:4[${PYTHON_USEDEP}] - dev-python/lxml[${PYTHON_USEDEP}] - dev-python/mako[${PYTHON_USEDEP}] - >=dev-python/requests-1.2.3[${PYTHON_USEDEP}] - dev-python/tld[${PYTHON_USEDEP}] - dev-python/yaswfp[${PYTHON_USEDEP}] - kerberos? ( dev-python/requests-kerberos[${PYTHON_USEDEP}] ) - ntlm? ( dev-python/requests-ntlm[${PYTHON_USEDEP}] )" - -distutils_enable_tests pytest -BDEPEND+=" test? ( dev-python/responses[${PYTHON_USEDEP}] )" - -python_prepare_all() { - sed -e 's/"pytest-runner"//' -i setup.py || die - distutils-r1_python_prepare_all -} diff --git a/net-analyzer/webfuzzer/metadata.xml b/net-analyzer/webfuzzer/metadata.xml index 74c2baebb4ec..dce3f3be66c0 100644 --- a/net-analyzer/webfuzzer/metadata.xml +++ b/net-analyzer/webfuzzer/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>netmon@gentoo.org</email> diff --git a/net-analyzer/webfuzzer/webfuzzer-0.2.0-r2.ebuild b/net-analyzer/webfuzzer/webfuzzer-0.2.0-r2.ebuild index 66622a2b52db..f0f3240d23e2 100644 --- a/net-analyzer/webfuzzer/webfuzzer-0.2.0-r2.ebuild +++ b/net-analyzer/webfuzzer/webfuzzer-0.2.0-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -19,7 +19,7 @@ PATCHES=( ) src_compile() { - emake CC=$(tc-getCC) + emake CC="$(tc-getCC)" } src_install() { diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest index 1b280d0987c3..3959fedc5576 100644 --- a/net-analyzer/wireshark/Manifest +++ b/net-analyzer/wireshark/Manifest @@ -1 +1,6 @@ -DIST wireshark-3.4.2.tar.xz 32465900 BLAKE2B dab7e871c798a6e0f03f45eaa49ba5cbabc18afabd6a5675a3241e4f1e6d86ef21b56b4cee5d561da2f2ec2b274ac6c5a52ed7b8ad50cbf02949a3a7f68d4f09 SHA512 38dc62d306dafe1a25db16ca28e1f4181a83673700a0b4c6dd98c8cb27df51ad0c6414db0370c443250aeb2521eceefb183178fe7d23a11b697cbf3f5b06f53a +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.0.14-signatures.txt 2521 BLAKE2B 371bf67dc0f36fe46848fef77194e221879db1ff422420949ba0fce4280fb9ee84ca18363046a0ce6fd1e7879ba336c1c16c9bdea13b8d14f14137f59d76212e SHA512 f084d454d1756be35e1e1ed4636cb994bd9c49bd4666d355ce3719d526bf71f9e3cc929b4dca311231d43b046711b223a379c6d915aa260966f0b7bab8a8e352 +DIST wireshark-4.0.14.tar.xz 43186416 BLAKE2B 1b67079cc0f9cdc33ce7e2fce0b49deb4d3016db79099a3bd2003099477a3bac43d4e31d4820c72a92135cca14572ac46406f41e477d794a63e96a6329d30199 SHA512 e88a4b2f41489f3ffe82c4c79c9c89ec521d931a716a5dacaede28c03b0625a0603935e723d5d869f801cfcab440a7d2f310c910707e15f9b0bca0c131398d73 +DIST wireshark-4.2.4-signatures.txt 2706 BLAKE2B 169c7eea2d89f4eedc58e833512cf813dfe76cbb76eb505d47153c1dc55f6d838b7a0187fdee4dae214ea04a3e062dd13f64df460fb16c042a889aac28e4428e SHA512 273182a2364b46bdbe89928e4776cf61ff70b91fcea9cc730ace6cd3501b51388ca9a85552b2ee26a68da42d033fdc8b2cfa279f0c52cc4cdd5278fbccaa8fb9 +DIST wireshark-4.2.4.tar.xz 44986232 BLAKE2B 03806a167a4b055409fadbc54ba338c9d2790df3ac2b9fb547c640c67d7bee6a3f8f19d30549228e494cabf8d303cef42ff098a9e1f45b092589643e568632f5 SHA512 963ac6938c08c6526240c270977057eeff7814686e11d1f3c6641a4838eb66f8d4349e48aa7373d25a8ca8911ad12eb8162f1c55af043f571d74979ddf4fd9a6 diff --git a/net-analyzer/wireshark/files/README.gentoo b/net-analyzer/wireshark/files/README.gentoo new file mode 100644 index 000000000000..a26d2c4dcb76 --- /dev/null +++ b/net-analyzer/wireshark/files/README.gentoo @@ -0,0 +1,3 @@ +NOTE: To capture traffic with wireshark as normal user you have to +add yourself to the pcap group. This security measure ensures +that only trusted users are allowed to sniff your traffic. diff --git a/net-analyzer/wireshark/files/wireshark-99999999-ui-needs-wiretap.patch b/net-analyzer/wireshark/files/wireshark-99999999-ui-needs-wiretap.patch deleted file mode 100644 index c0bfc3acd5a6..000000000000 --- a/net-analyzer/wireshark/files/wireshark-99999999-ui-needs-wiretap.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/ui/CMakeLists.txt -+++ b/ui/CMakeLists.txt -@@ -76,6 +76,8 @@ - - add_library(ui STATIC ${UI_SRC}) - -+set(ui_LIBS wiretap) -+ - set_target_properties(ui PROPERTIES - LINK_FLAGS "${WS_LINK_FLAGS}" - FOLDER "UI" diff --git a/net-analyzer/wireshark/metadata.xml b/net-analyzer/wireshark/metadata.xml index 715f6af2e195..50ce497801f7 100644 --- a/net-analyzer/wireshark/metadata.xml +++ b/net-analyzer/wireshark/metadata.xml @@ -1,15 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> - <email>zlogene@gentoo.org</email> - <name>Mikle Kolyada</name> - </maintainer> - <maintainer type="person"> - <email>bman@gentoo.org</email> - <name>Aaron Bauman</name> - </maintainer> - <maintainer type="person"> <email>sam@gentoo.org</email> <name>Sam James</name> </maintainer> @@ -37,7 +29,6 @@ <use> <flag name="androiddump">Install androiddump, an extcap interface to capture from Android devices</flag> <flag name="bcg729">Use <pkg>media-libs/bcg729</pkg> for G.729 codec support in RTP Player</flag> - <flag name="brotli">Use <pkg>app-arch/brotli</pkg> for compression/decompression</flag> <flag name="capinfos">Install capinfos, to print information about capture files</flag> <flag name="captype">Install captype, to print the file types of capture files</flag> <flag name="ciscodump">Install ciscodump, extcap interface to capture from a remote Cisco router</flag> @@ -45,17 +36,16 @@ <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="http2">Use <pkg>net-libs/nghttp2</pkg> for HTTP/2 support</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="lto">Enable link time optimization</flag> <flag name="maxminddb">Use <pkg>dev-libs/libmaxminddb</pkg> for IP address geolocation</flag> <flag name="mergecap">Install mergecap, to merge two or more capture files into one</flag> <flag name="minizip">Build with zip file compression support</flag> <flag name="netlink">Use <pkg>dev-libs/libnl</pkg></flag> <flag name="pcap">Use <pkg>net-libs/libpcap</pkg> for network packet capturing (build dumpcap, rawshark)</flag> - <flag name="plugin-ifdemo">Install plugin interface demo</flag> <flag name="plugins">Install plugins</flag> + <flag name="qt6">Build with Qt6 support instead of the default Qt5 for GUI support</flag> <flag name="randpkt">Install randpkt, a utility for creating pcap trace files full of random packets</flag> <flag name="randpktdump">Install randpktdump, an extcap interface to provide access to the random packet generator (randpkt)</flag> <flag name="reordercap">Install reordercap, to reorder input file by timestamp into output file</flag> @@ -69,5 +59,12 @@ <flag name="tfshark">Install tfshark, a terminal-based version of the FileShark capability</flag> <flag name="tshark">Install tshark, to dump and analyzer network traffic from the command line</flag> <flag name="udpdump">Install udpdump, to get packets exported from a source (like a network device or a GSMTAP producer) that are dumped to a pcap file</flag> + <flag name="wifi">Install wifidump, to dump and analyse 802.11 traffic</flag> </use> + <upstream> + <changelog>https://www.wireshark.org/news/</changelog> + <remote-id type="github">wireshark/wireshark</remote-id> + <remote-id type="gitlab">wireshark/wireshark</remote-id> + <remote-id type="cpe">cpe:/a:wireshark:wireshark</remote-id> + </upstream> </pkgmetadata> diff --git a/net-analyzer/wireshark/wireshark-3.4.2-r100.ebuild b/net-analyzer/wireshark/wireshark-3.4.2-r100.ebuild deleted file mode 100644 index f71d5cd33abc..000000000000 --- a/net-analyzer/wireshark/wireshark-3.4.2-r100.ebuild +++ /dev/null @@ -1,266 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -LUA_COMPAT=( lua5-{1..2} ) -PYTHON_COMPAT=( python3_{6..9} ) - -inherit fcaps flag-o-matic lua-single python-any-r1 qmake-utils xdg-utils cmake - -DESCRIPTION="A network protocol analyzer formerly known as ethereal" -HOMEPAGE="https://www.wireshark.org/" -SRC_URI="https://www.wireshark.org/download/src/all-versions/${P/_/}.tar.xz" -LICENSE="GPL-2" - -SLOT="0/${PV}" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc64 x86" -IUSE=" - androiddump bcg729 brotli +capinfos +captype ciscodump +dftest doc dpauxmon - +dumpcap +editcap http2 ilbc kerberos libxml2 lto lua lz4 maxminddb - +mergecap +minizip +netlink opus +plugins plugin-ifdemo +pcap +qt5 +randpkt - +randpktdump +reordercap sbc selinux +sharkd smi snappy spandsp sshdump ssl - sdjournal test +text2pcap tfshark +tshark +udpdump zlib +zstd -" -S=${WORKDIR}/${P/_/} - -CDEPEND=" - acct-group/pcap - >=dev-libs/glib-2.32:2 - >=net-dns/c-ares-1.5 - dev-libs/libgcrypt:0 - bcg729? ( media-libs/bcg729 ) - brotli? ( app-arch/brotli ) - ciscodump? ( >=net-libs/libssh-0.6 ) - filecaps? ( sys-libs/libcap ) - http2? ( net-libs/nghttp2 ) - 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 ) - qt5? ( - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtmultimedia:5 - dev-qt/qtprintsupport:5 - dev-qt/qtwidgets:5 - x11-misc/xdg-utils - ) - 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:= ) - zlib? ( sys-libs/zlib ) - zstd? ( app-arch/zstd ) -" -# We need perl for `pod2html`. The rest of the perl stuff is to block older -# and broken installs. #455122 -DEPEND=" - ${CDEPEND} - ${PYTHON_DEPS} -" -BDEPEND=" - dev-lang/perl - sys-devel/bison - sys-devel/flex - virtual/pkgconfig - doc? ( - app-doc/doxygen - dev-ruby/asciidoctor - ) - qt5? ( - dev-qt/linguist-tools:5 - ) - test? ( - dev-python/pytest - dev-python/pytest-xdist - ) -" -RDEPEND=" - ${CDEPEND} - qt5? ( virtual/freedesktop-icon-theme ) - selinux? ( sec-policy/selinux-wireshark ) -" -REQUIRED_USE=" - lua? ( ${LUA_REQUIRED_USE} ) - plugin-ifdemo? ( plugins ) -" -RESTRICT="test" -PATCHES=( - "${FILESDIR}"/${PN}-2.6.0-redhat.patch - "${FILESDIR}"/${PN}-3.4.2-cmake-lua-version.patch - "${FILESDIR}"/${PN}-99999999-ui-needs-wiretap.patch -) - -pkg_setup() { - use lua && lua-single_pkg_setup -} - -src_configure() { - local mycmakeargs - - # 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 qt5; then - export QT_MIN_VERSION=5.3.0 - append-cxxflags -fPIC -DPIC - fi - - python_setup - - mycmakeargs+=( - $(use androiddump && use pcap && echo -DEXTCAP_ANDROIDDUMP_LIBPCAP=yes) - $(usex qt5 LRELEASE=$(qt5_get_bindir)/lrelease '') - $(usex qt5 MOC=$(qt5_get_bindir)/moc '') - $(usex qt5 RCC=$(qt5_get_bindir)/rcc '') - $(usex qt5 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 qt5) - -DDISABLE_WERROR=yes - -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) - -DENABLE_LTO=$(usex lto) - -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=$(usex plugin-ifdemo) - -DENABLE_SBC=$(usex sbc) - -DENABLE_SMI=$(usex smi) - -DENABLE_SNAPPY=$(usex snappy) - -DENABLE_SPANDSP=$(usex spandsp) - -DENABLE_ZLIB=$(usex zlib) - -DENABLE_ZSTD=$(usex zstd) - ) - - cmake_src_configure -} - -src_test() { - cmake_build test-programs - - myctestargs=( --disable-capture --skip-missing-programs=all --verbose ) - cmake_src_test -} - -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 ws_diag_control.h ws_symbol_export.h \ - "${BUILD_DIR}"/config.h "${BUILD_DIR}"/version.h - - local dir dirs=( - epan - epan/crypt - epan/dfilter - epan/dissectors - epan/ftypes - epan/wmem - wiretap - wsutil - ) - for dir in "${dirs[@]}" - do - insinto /usr/include/wireshark/${dir} - doins ${dir}/*.h - done - - #with the above this really shouldn't be needed, but things may be looking - # in wiretap/ instead of wireshark/wiretap/ - insinto /usr/include/wiretap - doins wiretap/wtap.h - - if use qt5; 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 image/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 image/WiresharkDoc-${s}.png application-vnd.tcpdump.pcap.png - done - fi - - if [[ -d "${D}"/usr/share/appdata ]]; then - rm -r "${D}"/usr/share/appdata || die - fi -} - -pkg_postinst() { - xdg_desktop_database_update - xdg_icon_cache_update - xdg_mimeinfo_database_update - - # 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." -} - -pkg_postrm() { - xdg_desktop_database_update - xdg_icon_cache_update - xdg_mimeinfo_database_update -} diff --git a/net-analyzer/wireshark/wireshark-3.4.2.ebuild b/net-analyzer/wireshark/wireshark-3.4.2.ebuild deleted file mode 100644 index ddabdfd5f7b5..000000000000 --- a/net-analyzer/wireshark/wireshark-3.4.2.ebuild +++ /dev/null @@ -1,259 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{6..9} ) - -inherit fcaps flag-o-matic multilib python-any-r1 qmake-utils xdg-utils cmake - -DESCRIPTION="A network protocol analyzer formerly known as ethereal" -HOMEPAGE="https://www.wireshark.org/" -SRC_URI="https://www.wireshark.org/download/src/all-versions/${P/_/}.tar.xz" -LICENSE="GPL-2" - -SLOT="0/${PV}" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc64 x86" -IUSE=" - androiddump bcg729 brotli +capinfos +captype ciscodump +dftest doc dpauxmon - +dumpcap +editcap http2 ilbc kerberos libxml2 lto lua lz4 maxminddb - +mergecap +minizip +netlink opus +plugins plugin-ifdemo +pcap +qt5 +randpkt - +randpktdump +reordercap sbc selinux +sharkd smi snappy spandsp sshdump ssl - sdjournal test +text2pcap tfshark +tshark +udpdump zlib +zstd -" -S=${WORKDIR}/${P/_/} - -CDEPEND=" - acct-group/pcap - >=dev-libs/glib-2.32:2 - >=net-dns/c-ares-1.5 - dev-libs/libgcrypt:0 - bcg729? ( media-libs/bcg729 ) - brotli? ( app-arch/brotli ) - ciscodump? ( >=net-libs/libssh-0.6 ) - filecaps? ( sys-libs/libcap ) - http2? ( net-libs/nghttp2 ) - ilbc? ( media-libs/libilbc ) - kerberos? ( virtual/krb5 ) - libxml2? ( dev-libs/libxml2 ) - lua? ( >=dev-lang/lua-5.1:0= ) - 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 ) - qt5? ( - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtmultimedia:5 - dev-qt/qtprintsupport:5 - dev-qt/qtwidgets:5 - x11-misc/xdg-utils - ) - 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:= ) - zlib? ( sys-libs/zlib ) - zstd? ( app-arch/zstd ) -" -# We need perl for `pod2html`. The rest of the perl stuff is to block older -# and broken installs. #455122 -DEPEND=" - ${CDEPEND} - ${PYTHON_DEPS} -" -BDEPEND=" - dev-lang/perl - sys-devel/bison - sys-devel/flex - virtual/pkgconfig - doc? ( - app-doc/doxygen - dev-ruby/asciidoctor - ) - qt5? ( - dev-qt/linguist-tools:5 - ) - test? ( - dev-python/pytest - dev-python/pytest-xdist - ) -" -RDEPEND=" - ${CDEPEND} - qt5? ( virtual/freedesktop-icon-theme ) - selinux? ( sec-policy/selinux-wireshark ) -" -REQUIRED_USE=" - plugin-ifdemo? ( plugins ) -" -RESTRICT="test" -PATCHES=( - "${FILESDIR}"/${PN}-2.6.0-redhat.patch - "${FILESDIR}"/${PN}-99999999-ui-needs-wiretap.patch -) - -src_configure() { - local mycmakeargs - - # 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 qt5; then - export QT_MIN_VERSION=5.3.0 - append-cxxflags -fPIC -DPIC - fi - - python_setup - - mycmakeargs+=( - $(use androiddump && use pcap && echo -DEXTCAP_ANDROIDDUMP_LIBPCAP=yes) - $(usex qt5 LRELEASE=$(qt5_get_bindir)/lrelease '') - $(usex qt5 MOC=$(qt5_get_bindir)/moc '') - $(usex qt5 RCC=$(qt5_get_bindir)/rcc '') - $(usex qt5 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 qt5) - -DDISABLE_WERROR=yes - -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) - -DENABLE_LTO=$(usex lto) - -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=$(usex plugin-ifdemo) - -DENABLE_SBC=$(usex sbc) - -DENABLE_SMI=$(usex smi) - -DENABLE_SNAPPY=$(usex snappy) - -DENABLE_SPANDSP=$(usex spandsp) - -DENABLE_ZLIB=$(usex zlib) - -DENABLE_ZSTD=$(usex zstd) - ) - - cmake_src_configure -} - -src_test() { - cmake_build test-programs - - myctestargs=( --disable-capture --skip-missing-programs=all --verbose ) - cmake_src_test -} - -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 ws_diag_control.h ws_symbol_export.h \ - "${BUILD_DIR}"/config.h "${BUILD_DIR}"/version.h - - local dir dirs=( - epan - epan/crypt - epan/dfilter - epan/dissectors - epan/ftypes - epan/wmem - wiretap - wsutil - ) - for dir in "${dirs[@]}" - do - insinto /usr/include/wireshark/${dir} - doins ${dir}/*.h - done - - #with the above this really shouldn't be needed, but things may be looking - # in wiretap/ instead of wireshark/wiretap/ - insinto /usr/include/wiretap - doins wiretap/wtap.h - - if use qt5; 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 image/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 image/WiresharkDoc-${s}.png application-vnd.tcpdump.pcap.png - done - fi - - if [[ -d "${D}"/usr/share/appdata ]]; then - rm -r "${D}"/usr/share/appdata || die - fi -} - -pkg_postinst() { - xdg_desktop_database_update - xdg_icon_cache_update - xdg_mimeinfo_database_update - - # 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." -} - -pkg_postrm() { - xdg_desktop_database_update - xdg_icon_cache_update - xdg_mimeinfo_database_update -} diff --git a/net-analyzer/wireshark/wireshark-4.0.11.ebuild b/net-analyzer/wireshark/wireshark-4.0.11.ebuild new file mode 100644 index 000000000000..f3715b72f3e7 --- /dev/null +++ b/net-analyzer/wireshark/wireshark-4.0.11.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.0.14.ebuild b/net-analyzer/wireshark/wireshark-4.0.14.ebuild new file mode 100644 index 000000000000..808132d6248f --- /dev/null +++ b/net-analyzer/wireshark/wireshark-4.0.14.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.2.4-r1.ebuild b/net-analyzer/wireshark/wireshark-4.2.4-r1.ebuild new file mode 100644 index 000000000000..0e0d86d74067 --- /dev/null +++ b/net-analyzer/wireshark/wireshark-4.2.4-r1.ebuild @@ -0,0 +1,348 @@ +# 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 ~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 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 +) + +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) + -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 + + 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() { + # 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 new file mode 100644 index 000000000000..0e0d86d74067 --- /dev/null +++ b/net-analyzer/wireshark/wireshark-9999.ebuild @@ -0,0 +1,348 @@ +# 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 ~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 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 +) + +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) + -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 + + 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() { + # 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-99999999.ebuild b/net-analyzer/wireshark/wireshark-99999999.ebuild deleted file mode 100644 index 61860be16a1b..000000000000 --- a/net-analyzer/wireshark/wireshark-99999999.ebuild +++ /dev/null @@ -1,266 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -LUA_COMPAT=( lua5-{1..2} ) -PYTHON_COMPAT=( python3_{6..9} ) - -inherit fcaps flag-o-matic git-r3 lua-single python-any-r1 qmake-utils xdg-utils cmake - -DESCRIPTION="A network protocol analyzer formerly known as ethereal" -HOMEPAGE="https://www.wireshark.org/" -EGIT_REPO_URI="https://gitlab.com/wireshark/wireshark" -LICENSE="GPL-2" - -SLOT="0/${PV}" -KEYWORDS="" -IUSE=" - androiddump bcg729 brotli +capinfos +captype ciscodump +dftest doc dpauxmon - +dumpcap +editcap http2 ilbc kerberos libxml2 lto lua lz4 maxminddb - +mergecap +minizip +netlink opus +plugins plugin-ifdemo +pcap +qt5 +randpkt - +randpktdump +reordercap sbc selinux +sharkd smi snappy spandsp sshdump ssl - sdjournal test +text2pcap tfshark +tshark +udpdump zlib +zstd -" -S=${WORKDIR}/${P/_/} - -CDEPEND=" - acct-group/pcap - >=dev-libs/glib-2.32:2 - >=net-dns/c-ares-1.5 - dev-libs/libgcrypt:0 - bcg729? ( media-libs/bcg729 ) - brotli? ( app-arch/brotli ) - ciscodump? ( >=net-libs/libssh-0.6 ) - filecaps? ( sys-libs/libcap ) - http2? ( net-libs/nghttp2 ) - 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 ) - qt5? ( - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtmultimedia:5 - dev-qt/qtprintsupport:5 - dev-qt/qtwidgets:5 - x11-misc/xdg-utils - ) - 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:= ) - zlib? ( sys-libs/zlib ) - zstd? ( app-arch/zstd ) -" -# We need perl for `pod2html`. The rest of the perl stuff is to block older -# and broken installs. #455122 -DEPEND=" - ${CDEPEND} - ${PYTHON_DEPS} -" -BDEPEND=" - dev-lang/perl - sys-devel/bison - sys-devel/flex - virtual/pkgconfig - doc? ( - app-doc/doxygen - dev-ruby/asciidoctor - ) - qt5? ( - dev-qt/linguist-tools:5 - ) - test? ( - dev-python/pytest - dev-python/pytest-xdist - ) -" -RDEPEND=" - ${CDEPEND} - qt5? ( virtual/freedesktop-icon-theme ) - selinux? ( sec-policy/selinux-wireshark ) -" -REQUIRED_USE=" - lua? ( ${LUA_REQUIRED_USE} ) - plugin-ifdemo? ( plugins ) -" -RESTRICT="!test? ( test )" -PATCHES=( - "${FILESDIR}"/${PN}-2.6.0-redhat.patch - "${FILESDIR}"/${PN}-3.4.2-cmake-lua-version.patch - "${FILESDIR}"/${PN}-99999999-ui-needs-wiretap.patch -) - -pkg_setup() { - use lua && lua-single_pkg_setup -} - -src_configure() { - local mycmakeargs - - # 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 qt5; then - export QT_MIN_VERSION=5.3.0 - append-cxxflags -fPIC -DPIC - fi - - python_setup - - mycmakeargs+=( - $(use androiddump && use pcap && echo -DEXTCAP_ANDROIDDUMP_LIBPCAP=yes) - $(usex qt5 LRELEASE=$(qt5_get_bindir)/lrelease '') - $(usex qt5 MOC=$(qt5_get_bindir)/moc '') - $(usex qt5 RCC=$(qt5_get_bindir)/rcc '') - $(usex qt5 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 qt5) - -DDISABLE_WERROR=yes - -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) - -DENABLE_LTO=$(usex lto) - -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=$(usex plugin-ifdemo) - -DENABLE_SBC=$(usex sbc) - -DENABLE_SMI=$(usex smi) - -DENABLE_SNAPPY=$(usex snappy) - -DENABLE_SPANDSP=$(usex spandsp) - -DENABLE_ZLIB=$(usex zlib) - -DENABLE_ZSTD=$(usex zstd) - ) - - cmake_src_configure -} - -src_test() { - cmake_build test-programs - - myctestargs=( --disable-capture --skip-missing-programs=all --verbose ) - cmake_src_test -} - -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 ws_diag_control.h ws_symbol_export.h \ - "${BUILD_DIR}"/config.h "${BUILD_DIR}"/version.h - - local dir dirs=( - epan - epan/crypt - epan/dfilter - epan/dissectors - epan/ftypes - epan/wmem - wiretap - wsutil - ) - for dir in "${dirs[@]}" - do - insinto /usr/include/wireshark/${dir} - doins ${dir}/*.h - done - - #with the above this really shouldn't be needed, but things may be looking - # in wiretap/ instead of wireshark/wiretap/ - insinto /usr/include/wiretap - doins wiretap/wtap.h - - if use qt5; 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 image/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 image/WiresharkDoc-${s}.png application-vnd.tcpdump.pcap.png - done - fi - - if [[ -d "${D}"/usr/share/appdata ]]; then - rm -r "${D}"/usr/share/appdata || die - fi -} - -pkg_postinst() { - xdg_desktop_database_update - xdg_icon_cache_update - xdg_mimeinfo_database_update - - # 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." -} - -pkg_postrm() { - xdg_desktop_database_update - xdg_icon_cache_update - xdg_mimeinfo_database_update -} diff --git a/net-analyzer/wtfis/Manifest b/net-analyzer/wtfis/Manifest new file mode 100644 index 000000000000..2f306e359f37 --- /dev/null +++ b/net-analyzer/wtfis/Manifest @@ -0,0 +1,2 @@ +DIST wtfis-0.7.1.gh.tar.gz 548395 BLAKE2B fbcc19358a0a357fdc9f4b5f27d4bda60e20a118c3c3b7cdfd90fad956d2ef0375efe4f0c8a3a94bfa8a6657d5bb710eaacb403b8c3d446921b963e3e8909442 SHA512 9a77c17e1e922e6d17aba9c6cc7364c8b65bc401cbca311280a4eef958056238aef87c2a8891c1bce5848083d1a7e5e00b0b63ead5ffefdea80ae7baee40c845 +DIST wtfis-0.8.0.gh.tar.gz 576810 BLAKE2B ac4573893aacc2533fe9ed3248613d3bf5ffb390a2dcbf01fd0590093a7bf753ee8da6e67b60142111726d55928a7913bb3f7ae1a22474876dec1cb3d81d3a3c SHA512 b709948d0ccd75472d9ccc0bfc4cec943700e57eccc42cc486075b8b89516fff054b6df92d6b23999987bab97b80db755de575cba4b56e2bd01a6bf24f058798 diff --git a/net-analyzer/wtfis/metadata.xml b/net-analyzer/wtfis/metadata.xml new file mode 100644 index 000000000000..495aa987e99e --- /dev/null +++ b/net-analyzer/wtfis/metadata.xml @@ -0,0 +1,22 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="person" proxied="yes"> + <email>mario.haustein@hrz.tu-chemnitz.de</email> + <name>Mario Haustein</name> + </maintainer> + <maintainer type="project" proxied="proxy"> + <email>proxy-maint@gentoo.org</email> + <name>Proxy Maintainers</name> + </maintainer> + <longdescription> + wtfis is a commandline tool that gathers information about a domain, + FQDN or IP address using various OSINT services. Unlike other tools of + its kind, it's built specifically for human consumption, providing + results that are pretty (YMMV) and easy to read and understand. + </longdescription> + <upstream> + <remote-id type="github">pirxthepilot/wtfis</remote-id> + <remote-id type="pypi">wtfis</remote-id> + </upstream> +</pkgmetadata> diff --git a/net-analyzer/wtfis/wtfis-0.7.1.ebuild b/net-analyzer/wtfis/wtfis-0.7.1.ebuild new file mode 100644 index 000000000000..08106d305363 --- /dev/null +++ b/net-analyzer/wtfis/wtfis-0.7.1.ebuild @@ -0,0 +1,39 @@ +# 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.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}] +" +BDEPEND=" + test? ( + dev-python/freezegun[${PYTHON_USEDEP}] + dev-python/rich[${PYTHON_USEDEP}] + ) +" + +distutils_enable_tests pytest diff --git a/net-analyzer/wtfis/wtfis-0.8.0.ebuild b/net-analyzer/wtfis/wtfis-0.8.0.ebuild new file mode 100644 index 000000000000..eb5e05b23963 --- /dev/null +++ b/net-analyzer/wtfis/wtfis-0.8.0.ebuild @@ -0,0 +1,39 @@ +# 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} ) +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.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}] +" +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 new file mode 100644 index 000000000000..27c081820a3e --- /dev/null +++ b/net-analyzer/wtfis/wtfis-9999.ebuild @@ -0,0 +1,39 @@ +# 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.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}] +" +BDEPEND=" + test? ( + dev-python/freezegun[${PYTHON_USEDEP}] + dev-python/rich[${PYTHON_USEDEP}] + ) +" + +distutils_enable_tests pytest diff --git a/net-analyzer/xnetload/files/xnetload-1.11.3-libdir.patch b/net-analyzer/xnetload/files/xnetload-1.11.3-libdir.patch new file mode 100644 index 000000000000..3bfbd619c112 --- /dev/null +++ b/net-analyzer/xnetload/files/xnetload-1.11.3-libdir.patch @@ -0,0 +1,11 @@ +--- a/Makefile ++++ b/Makefile +@@ -14,7 +14,7 @@ CC = gcc + + # The next two lines are for building an optimized and stripped program. + CFLAGS += -Wall -DNDEBUG -I/usr/include +-LFLAGS = $(LDFLAGS) -L/usr/lib ++LFLAGS = $(LDFLAGS) + + # These three lines are for building Athlon optimized programs on my system. + #CC=gcc-3.1 diff --git a/net-analyzer/xnetload/metadata.xml b/net-analyzer/xnetload/metadata.xml index 74c2baebb4ec..dce3f3be66c0 100644 --- a/net-analyzer/xnetload/metadata.xml +++ b/net-analyzer/xnetload/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>netmon@gentoo.org</email> diff --git a/net-analyzer/xnetload/xnetload-1.11.3-r1.ebuild b/net-analyzer/xnetload/xnetload-1.11.3-r1.ebuild index d1caa9933a52..1b3e67000f2a 100644 --- a/net-analyzer/xnetload/xnetload-1.11.3-r1.ebuild +++ b/net-analyzer/xnetload/xnetload-1.11.3-r1.ebuild @@ -1,14 +1,15 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 + inherit toolchain-funcs -DESCRIPTION="displays a count and a graph of the traffic over a specified network connection" -LICENSE="GPL-2" -HOMEPAGE="http://www.xs4all.nl/~rsmith/software/" -SRC_URI="http://www.xs4all.nl/~rsmith/software/${P}.tar.gz" +DESCRIPTION="Displays a count and a graph of the traffic over a specified network connection" +HOMEPAGE="https://www.xs4all.nl/~rsmith/software/" +SRC_URI="https://www.xs4all.nl/~rsmith/software/${P}.tar.gz" +LICENSE="GPL-2" SLOT="0" KEYWORDS="amd64 ppc ppc64 sparc x86" @@ -19,13 +20,19 @@ DEPEND=" " RDEPEND="${DEPEND}" +PATCHES=( + "${FILESDIR}/${PN}-1.11.3-libdir.patch" +) + src_prepare() { sed -i \ - -e 's:CFLAGS = -pipe -O2 -Wall:CFLAGS += -Wall:' \ - -e 's:LFLAGS = -s -pipe:LFLAGS = $(LDFLAGS):' \ + -e 's;CFLAGS = -pipe -O2 -Wall;CFLAGS += -Wall;' \ + -e 's;LFLAGS = -s -pipe;LFLAGS = $(LDFLAGS);' \ -e 's:gcc -MM:$(CC) -MM:' \ -e 's:/usr/X11R6:/usr:g' \ Makefile || die + + default } src_compile() { diff --git a/net-analyzer/xprobe/files/xprobe-0.3-gcc-12.patch b/net-analyzer/xprobe/files/xprobe-0.3-gcc-12.patch new file mode 100644 index 000000000000..534d17cb019b --- /dev/null +++ b/net-analyzer/xprobe/files/xprobe-0.3-gcc-12.patch @@ -0,0 +1,21 @@ +https://bugs.gentoo.org/852119 +--- a/libs-external/USI++/src/datalink.cc ++++ b/libs-external/USI++/src/datalink.cc +@@ -15,6 +15,7 @@ + #include <string.h> + #include <unistd.h> + #include <errno.h> ++#include <ctime> + #include <sys/ioctl.h> + + #ifdef IMMEDIATE +--- a/libs-external/USI++/src/tcp.cc ++++ b/libs-external/USI++/src/tcp.cc +@@ -16,6 +16,7 @@ + #include <string.h> + #include <stdlib.h> + #include <errno.h> ++#include <ctime> + + namespace usipp { + diff --git a/net-analyzer/xprobe/metadata.xml b/net-analyzer/xprobe/metadata.xml index 0552dd858870..5832f45c51f6 100644 --- a/net-analyzer/xprobe/metadata.xml +++ b/net-analyzer/xprobe/metadata.xml @@ -1,16 +1,16 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!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> -Active OS fingerprinting tool. This is the new xprobe, called xprobe2, due to -xprobe1 being obsoleted. xprobe2 has a different approach to OS fingerprinting. -xprobe2 relies on fuzzy signature matching, probabilistic guesses, multiple -matches simultaneously, and a signature database. -</longdescription> + Active OS fingerprinting tool. This is the new xprobe, called xprobe2, due to + xprobe1 being obsoleted. xprobe2 has a different approach to OS fingerprinting. + xprobe2 relies on fuzzy signature matching, probabilistic guesses, multiple + matches simultaneously, and a signature database. + </longdescription> <upstream> <remote-id type="sourceforge">xprobe</remote-id> </upstream> diff --git a/net-analyzer/xprobe/xprobe-0.3-r1.ebuild b/net-analyzer/xprobe/xprobe-0.3-r1.ebuild index db0208e8db4a..d630b7fd1214 100644 --- a/net-analyzer/xprobe/xprobe-0.3-r1.ebuild +++ b/net-analyzer/xprobe/xprobe-0.3-r1.ebuild @@ -1,7 +1,8 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 + inherit toolchain-funcs MY_P=${PN}2-${PV} @@ -9,6 +10,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" +S="${WORKDIR}"/${MY_P} LICENSE="GPL-2" SLOT="0" @@ -16,14 +18,16 @@ KEYWORDS="~amd64 ~ppc ~sparc x86" DEPEND="net-libs/libpcap" RDEPEND="${DEPEND}" + PATCHES=( "${FILESDIR}"/${P}-gcc43.patch "${FILESDIR}"/${P}-cxx11.patch + "${FILESDIR}"/${P}-gcc-12.patch ) -S=${WORKDIR}/${MY_P} src_prepare() { default + sed -i -e 's:strip:true:' src/Makefile.in || die sed -i -e 's:ar cr:$(AR) cr:g' $(find -name '*Makefile*') || die @@ -32,5 +36,6 @@ src_prepare() { src_install() { default + dodoc AUTHORS CHANGELOG CREDITS README TODO docs/*.{txt,pdf} } diff --git a/net-analyzer/yersinia/files/yersinia-0.8.2-configure-clang16-deux.patch b/net-analyzer/yersinia/files/yersinia-0.8.2-configure-clang16-deux.patch new file mode 100644 index 000000000000..427be023a021 --- /dev/null +++ b/net-analyzer/yersinia/files/yersinia-0.8.2-configure-clang16-deux.patch @@ -0,0 +1,38 @@ +https://github.com/tomac/yersinia/commit/867b309eced9e02b63412855440cd4f5f7727431 + +From 5db403f8aa4101589f33246eaa23b5f31228fc3b Mon Sep 17 00:00:00 2001 +From: Sam James <sam@gentoo.org> +Date: Sat, 19 Nov 2022 18:43:26 +0000 +Subject: [PATCH] configure: fix -Wimplicit-function-declaration, + -Wimplicit-int + +Clang 16 makes -Wimplicit-function-declaration and -Wimplicit-int errors by default. Unfortunately, +this can lead to misconfiguration or miscompilation of software as configure +tests may then return the wrong result. + +For more information, see LWN.net [0] or LLVM's Discourse [1], the Gentoo wiki [2], +or the (new) c-std-porting mailing list [3]. + +[0] https://lwn.net/Articles/913505/ +[1] https://discourse.llvm.org/t/configure-script-breakage-with-the-new-werror-implicit-function-declaration/65213 +[2] https://wiki.gentoo.org/wiki/Modern_C_porting +[3] hosted at lists.linux.dev. + +Followup to 6414681ae99d6a0f460f827648f114aa3cb2e419. + +Signed-off-by: Sam James <sam@gentoo.org> +--- a/acinclude.m4 ++++ b/acinclude.m4 +@@ -79,8 +79,10 @@ AC_DEFUN([AC_LBL_UNALIGNED_ACCESS], + # include <sys/types.h> + # include <sys/wait.h> + # include <stdio.h> ++# include <stdlib.h> ++# include <unistd.h> + unsigned char a[[5]] = { 1, 2, 3, 4, 5 }; +- main() { ++ int main(void) { + unsigned int i; + pid_t pid; + int status; + diff --git a/net-analyzer/yersinia/files/yersinia-0.8.2-configure-clang16.patch b/net-analyzer/yersinia/files/yersinia-0.8.2-configure-clang16.patch new file mode 100644 index 000000000000..f2366c02dfb4 --- /dev/null +++ b/net-analyzer/yersinia/files/yersinia-0.8.2-configure-clang16.patch @@ -0,0 +1,53 @@ +https://github.com/tomac/yersinia/pull/76 + +From ec9d31932fca39e3160b0d0bfd0383db82ff5bcf Mon Sep 17 00:00:00 2001 +From: Sam James <sam@gentoo.org> +Date: Wed, 16 Nov 2022 23:10:45 +0000 +Subject: [PATCH] configure: fix -Wimplicit-function-declaration, + -Wstrict-prototypes + +Clang 16 makes -Wimplicit-function-declaration an error by default. Unfortunately, +this can lead to misconfiguration or miscompilation of software as configure +tests may then return the wrong result. + +For more information, see LWN.net [0] or LLVM's Discourse [1], the Gentoo wiki [2], +or the (new) c-std-porting mailing list [3]. + +[0] https://lwn.net/Articles/913505/ +[1] https://discourse.llvm.org/t/configure-script-breakage-with-the-new-werror-implicit-function-declaration/65213 +[2] https://wiki.gentoo.org/wiki/Modern_C_porting +[3] hosted at lists.linux.dev. + +Signed-off-by: Sam James <sam@gentoo.org> +--- a/configure.in ++++ b/configure.in +@@ -233,12 +233,13 @@ dnl fi + + AC_MSG_CHECKING(if libnet is at least version 1.1.2) + AC_TRY_RUN([ +-#include<stdio.h> +-#include<libnet.h> ++#include <stdlib.h> ++#include <stdio.h> ++#include <libnet.h> + #define HOPE_MAJOR 1 + #define HOPE_MEDIUM 1 + #define HOPE_MINOR 2 +-int main() ++int main(void) + { + unsigned int major,medium,minor,current, desired; + desired = HOPE_MAJOR*10000 + HOPE_MEDIUM*100 + HOPE_MINOR; +@@ -419,9 +420,9 @@ AC_CHECK_FUNCS(strerror_r, have_strerror_r=yes,have_strerror_r=no) + if test $have_strerror_r = yes; then + AC_MSG_CHECKING(if strerror_r is on glibc version >= 2.0) + AC_TRY_RUN([ +-#include <stdio.h> ++#include <stdlib.h> + #include <features.h> +-int main() ++int main(void) + { + #if defined(__GLIBC__) && __GLIBC__ >= 2 && __GLIBC_MINOR__ >= 0 + exit(0); + diff --git a/net-analyzer/yersinia/files/yersinia-9999-tinfo.patch b/net-analyzer/yersinia/files/yersinia-9999-tinfo.patch deleted file mode 100644 index b5bf566c107d..000000000000 --- a/net-analyzer/yersinia/files/yersinia-9999-tinfo.patch +++ /dev/null @@ -1,27 +0,0 @@ ---- a/configure.ac -+++ b/configure.ac -@@ -467,6 +467,7 @@ - AC_DEFINE(HAVE_REMOTE_ADMIN) - fi - -+PKG_CHECK_MODULES(ncurses,ncurses) - - dnl Curses detection: Munged from Midnight Commander's configure.in - dnl -@@ -616,6 +617,16 @@ - AC_DEFINE(USE_NCURSES) - AC_DEFINE(HAS_CURSES) - has_curses=true -+ else -+ if test "$ncurses_LIBS" ; then -+ CURSES_LIBS="$ncurses_LIBS" -+ CURSES_INCLUDEDIR="$ncurses_CFLAGS" -+ search_ncurses=false -+ screen_manager="ncurses" -+ AC_DEFINE(USE_NCURSES) -+ AC_DEFINE(HAS_CURSES) -+ has_curses=true -+ fi - fi - ) - diff --git a/net-analyzer/yersinia/metadata.xml b/net-analyzer/yersinia/metadata.xml index a0e9a2ee4c47..6356df3a0a4c 100644 --- a/net-analyzer/yersinia/metadata.xml +++ b/net-analyzer/yersinia/metadata.xml @@ -1,13 +1,16 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!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> -Yersinia is a network tool designed to take advantage of some weakeness -in different network protocols. It intends to be a solid framework for -analyzing and testing the deployed networks and systems. -</longdescription> + <maintainer type="project"> + <email>netmon@gentoo.org</email> + <name>Gentoo network monitoring and analysis project</name> + </maintainer> + <longdescription> + Yersinia is a network tool designed to take advantage of some weakeness + in different network protocols. It intends to be a solid framework for + analyzing and testing the deployed networks and systems. + </longdescription> + <upstream> + <remote-id type="github">tomac/yersinia</remote-id> + </upstream> </pkgmetadata> diff --git a/net-analyzer/yersinia/yersinia-0.8.2-r2.ebuild b/net-analyzer/yersinia/yersinia-0.8.2-r2.ebuild new file mode 100644 index 000000000000..be2de6bbc614 --- /dev/null +++ b/net-analyzer/yersinia/yersinia-0.8.2-r2.ebuild @@ -0,0 +1,62 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools flag-o-matic + +DESCRIPTION="A framework for layer 2 attacks" +HOMEPAGE="http://www.yersinia.net/" +SRC_URI="https://github.com/tomac/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64 x86" +IUSE="gtk ncurses" + +RDEPEND=" + >=net-libs/libnet-1.1.2 + >=net-libs/libpcap-0.9.4 + ncurses? ( >=sys-libs/ncurses-5.5:= ) + gtk? ( + dev-libs/glib:2 + x11-libs/gdk-pixbuf + =x11-libs/gtk+-2* + ) +" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" + +DOCS=( AUTHORS ChangeLog FAQ README THANKS TODO ) + +PATCHES=( + "${FILESDIR}"/${PN}-0.7.1-no-ncurses.patch + "${FILESDIR}"/${PN}-0.7.3-tinfo.patch + "${FILESDIR}"/${PN}-0.8.2-configure-clang16.patch + "${FILESDIR}"/${PN}-0.8.2-configure-clang16-deux.patch +) + +src_prepare() { + default + + if ! use gtk; then + # bug #514802 + sed -i -e '/AM_GLIB_GNU_GETTEXT/d' configure.in || die + fi + + eautoreconf +} + +src_configure() { + append-cflags -fcommon + + econf \ + --enable-admin \ + --with-pcap-includes=/usr/include \ + $(use_with ncurses) \ + $(use_enable gtk) +} + +src_compile() { + emake CFLAGS="${CFLAGS}" +} diff --git a/net-analyzer/yersinia/yersinia-0.8.2.ebuild b/net-analyzer/yersinia/yersinia-0.8.2.ebuild deleted file mode 100644 index e216096f810c..000000000000 --- a/net-analyzer/yersinia/yersinia-0.8.2.ebuild +++ /dev/null @@ -1,59 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit autotools flag-o-matic - -DESCRIPTION="A framework for layer 2 attacks" -HOMEPAGE="http://www.yersinia.net/" -SRC_URI="https://github.com/tomac/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="gtk ncurses" - -RDEPEND=" - ncurses? ( >=sys-libs/ncurses-5.5:= ) - gtk? ( - dev-libs/glib:2 - x11-libs/gdk-pixbuf - =x11-libs/gtk+-2* - ) - >=net-libs/libnet-1.1.2 - >=net-libs/libpcap-0.9.4 -" -DEPEND=" - virtual/pkgconfig - ${RDEPEND} -" -DOCS=( AUTHORS ChangeLog FAQ README THANKS TODO ) -PATCHES=( - "${FILESDIR}"/${PN}-0.7.1-no-ncurses.patch - "${FILESDIR}"/${PN}-0.7.3-tinfo.patch -) - -src_prepare() { - default - - if ! use gtk; then - #bug #514802 - sed -i -e '/AM_GLIB_GNU_GETTEXT/d' configure.in || die - fi - - eautoreconf -} - -src_configure() { - append-cflags -fcommon - - econf \ - --enable-admin \ - --with-pcap-includes=/usr/include \ - $(use_with ncurses) \ - $(use_enable gtk) -} - -src_compile() { - emake CFLAGS="${CFLAGS}" -} diff --git a/net-analyzer/yersinia/yersinia-9999.ebuild b/net-analyzer/yersinia/yersinia-9999.ebuild deleted file mode 100644 index f2825d6f6f13..000000000000 --- a/net-analyzer/yersinia/yersinia-9999.ebuild +++ /dev/null @@ -1,59 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit autotools flag-o-matic git-r3 - -DESCRIPTION="A framework for layer 2 attacks" -HOMEPAGE="https://github.com/tomac/yersinia" -EGIT_REPO_URI="https://github.com/tomac/yersinia" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="" -IUSE="gtk ncurses" - -RDEPEND=" - ncurses? ( >=sys-libs/ncurses-5.5:= ) - gtk? ( - dev-libs/glib:2 - x11-libs/gdk-pixbuf - =x11-libs/gtk+-2* - ) - >=net-libs/libnet-1.1.2 - >=net-libs/libpcap-0.9.4 -" -DEPEND=" - virtual/pkgconfig - ${RDEPEND} -" -DOCS=( AUTHORS ChangeLog FAQ README THANKS TODO ) -PATCHES=( - "${FILESDIR}"/${PN}-0.7.1-no-ncurses.patch - "${FILESDIR}"/${PN}-9999-tinfo.patch -) - -src_prepare() { - default - - if ! use gtk; then - #bug #514802 - sed -i -e '/AM_GLIB_GNU_GETTEXT/d' configure.in || die - fi - - eautoreconf -} - -src_configure() { - append-cflags -fcommon - - econf \ - --enable-admin \ - --with-pcap-includes=/usr/include \ - $(use_with ncurses) \ - $(use_enable gtk) -} - -src_compile() { - emake CFLAGS="${CFLAGS}" -} diff --git a/net-analyzer/zabbix/Manifest b/net-analyzer/zabbix/Manifest index 5d89de66c67f..11a8d8b9ee38 100644 --- a/net-analyzer/zabbix/Manifest +++ b/net-analyzer/zabbix/Manifest @@ -1,6 +1,16 @@ -DIST zabbix-3.0.31.tar.gz 14698394 BLAKE2B b8b5f94fe7fe08385b1b358c628b2047b437e6068dab8c3dbdab03e55e95e27f1b77ede4a1a57c4f79bf4a629d9dc5671bd144c002ace7c915f2fed382ac13b2 SHA512 35fec45667cdf217c2be21a164181f92f8f11ef9bcfb0c8dad914726e7c436bae5f8a97aebc3af82499e37125f4d1896ef74ad061a1ee3cbb674562c22a832b1 -DIST zabbix-4.0.27.tar.gz 17426383 BLAKE2B 33381d3705bc7cb9d451b1a536fbb4f92a9e7e321afbe9363a7879cbea3cc5977a4866a5f4d1fb70120804edaffaf869ba8c4321a67898c42c9abe2341ee118b SHA512 54690dd778d09d7309c2e2ea3f0bfc6053ef097888bfccd140484e4677766ded829757eb4dfde7da8ce19335307ddbfbb1c132feabc13cc6727a6d28c1591cfa -DIST zabbix-5.0.6.tar.gz 19359566 BLAKE2B 375fcbed08be46c1f17c7979763dcdfb8a51a25c2523037a1992dbb7ceb798a665f5d01e97e2e6ef023d5170e3e71df933e0fc41d27fd905ba190497d6bcd28d SHA512 c136536eab3c0e3527e8db8528656776de8849554e0a85a1644000e51c66b09044b176985de1c6d1dcc1d4ec03fc2456111c4df8d896ca276eeed2744cdd48be -DIST zabbix-5.0.7.tar.gz 19382483 BLAKE2B fa0864ba1ac77659e9a18b0c22cee8be1078fad1e76017d01754b626151366bfeb67aa2a5b29ac1c0ac92ebaff53f7ca273a763158f7a37566dd41efe4dee7ff SHA512 8916ff44a2b3ad16e40d37b43ed540b4eefb91423ecbcc4ab9463477f6a29ed8417c79b0951a36e2798df1166a95ee5ed150bd61448b657df694498c2a274403 -DIST zabbix-5.2.2.tar.gz 19745101 BLAKE2B 651184d4645ff4cfac1317326bd846b4707d8556a30c64dd0b5ac923fb2bb4439b120a4c2bf43c1f73b57a919d5f3bfba28e3d9efde6a3f48587c5b7d0b1d7db SHA512 7bb79111ff809a90a5911d7f94f86eddec3a3fa4f91fdfbf013178442de81d22dc13359679570b8d62fe41b664c764c42cbe98936fd195521951aab507933d9b -DIST zabbix-5.2.3.tar.gz 19791383 BLAKE2B ad0c2306f05d1d664068d9dbc6983c79e1e4d13e605a4683076da51968d2ca2dd6330ca16ad5e24fcabca95565ff1c3e4246ce7352f23a32d419ba207869f8c2 SHA512 207d522ab728bb89f6aaf793af94848469210fb257ead34b93e0f7ba7b2a22b4cce65d516dfbb549a36ae873fe6b6d3486c47f11efff8950d3c81570c673ff9e +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-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.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.0.28-go-deps.tar.xz 30907444 BLAKE2B 3530aa97f3c6119005e9ca9d5e929f443b2fb068cc5bf8c207c12af9ff4a5bc3cf1fcf02bf564fa20db3b36e9b6e97aa31ab587b18c72636267a923019209a09 SHA512 ab57cf33df42179951df764a261be624b81f531d1376c55df80d6646024c186bed8525b2c261a56f9dec3521b08bc2d2be8f1f1ac3af69805ee154d7047d8724 +DIST zabbix-6.0.28.tar.gz 44803777 BLAKE2B ebf4ec01f31026e76db6fd06ef799918e556b42efebf6bd5ef3bd034f6334c3d0862bea275d04821e3ea2bbde4db8a49a280d896d59cfc758fd657fb5b1d7acf SHA512 3e392cd44ca98ef922913f3d47fe0b23559736384dfdb296212b766a5d599002ad22708c127e493282b885d0b0ca0b182a29d53e3dea92f83739d2bd14064c1d +DIST zabbix-6.0.29-go-deps.tar.xz 30833084 BLAKE2B 8d856dba3bcfce88c0ec68461b1de39b7d106303fc7d2997b9f508ad7ab32673ac08b7f6b2d0a99f3d9303afe02e60cb75764d47f2fde5f381405116bc6c0d75 SHA512 ecc7df70e5be5517295c83a688c22fa3fa74a58653900083caf9f1a9de3f3f33b0f261add4601175f289fd9c77975ad7a5ed5a2df039b67123cb14d0779b4698 +DIST zabbix-6.0.29.tar.gz 44962896 BLAKE2B dbf1031435b155c6122018fdeb18012bb7828c65b36f9384fb4c1bf90d703c939e68546749307fe76b9648633b050f1f1718c3dd20021fe642462347b5b5c848 SHA512 3189a534e250a02f7661340700d6c6d852eeae552db8a15f94e6d917aea84f7292660a22580d6fc59479498aedecdbf58b19c51b649266a9de229f0d0c35c3e0 +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-6.4.13-go-deps.tar.xz 33322660 BLAKE2B 36371454fcf3447325c19e5057a61b15db220412d56e5d0011a5d788b326f2c44b9f219c9a053334dfde460be3cffdc608d2b8a56c0cd246f47d6d610242599a SHA512 c975e11a18231522db7af86eb0763db26e5c1d0fba5a337d2224310e2c308a686a0749184dd32e0523f83381e299dfb1bc6f52d6681b117585ad70dd0f098f30 +DIST zabbix-6.4.13.tar.gz 46358395 BLAKE2B 316f476a94a6b19422cf4b81df3d2905d632ed78e52ece37c761035d20f928130d5d9ca85365c8f6bc61404aba15bb367b45d134ba15d21417af2754d2c1c6e6 SHA512 d268305dcda8f9384f1424d4f8f70c0006b48c832b24c633eac006e14ae0a5a788ea2205ecc423bbb44732eb6843a9dfd467ffb9ac24c0e4c6ca2553900ea8bd +DIST zabbix-6.4.14-go-deps.tar.xz 33272120 BLAKE2B 1554414dd9ed837938d6d560b01c14d63c49cbb7e927d9c15bbd8ec62246b808be27834c48a2e255a3d13bc0cb3062929ca48deafa8a6cf1bda84a0a7538acd5 SHA512 619c77dbbb26f0d5f7018fa5d80bdad4678f30cf2fe6127e6d3d37d21c28db41dcdf4b741fe8a27f98d2f7859a7db1b55824f808a9d147dba6ef0678a6443840 +DIST zabbix-6.4.14.tar.gz 46517773 BLAKE2B 5036019a051b6a84209a695b1a0aa33b65800e21ee77e61a80edd113999230c0566741b27cdc2c973051cfe8b87af446dd08ce1b92e6e1a71f844c16b17f8202 SHA512 fa1f404a509d0e7f78f195807469cedb049e06a9e6bd6afe53fa7f87bda008ad80158116b13558ef537ce25cb1974a920d73c6338cade9903b2d4d6d02b83317 diff --git a/net-analyzer/zabbix/files/zabbix-3.0.30-mysql8.patch b/net-analyzer/zabbix/files/zabbix-3.0.30-mysql8.patch deleted file mode 100644 index 7c3694a776ee..000000000000 --- a/net-analyzer/zabbix/files/zabbix-3.0.30-mysql8.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff --git a/src/libs/zbxdb/db.c b/src/libs/zbxdb/db.c -index a65b9c4..e011c51 100644 ---- a/src/libs/zbxdb/db.c -+++ b/src/libs/zbxdb/db.c -@@ -285,7 +285,11 @@ int zbx_db_connect(char *host, char *user, char *password, char *dbname, char *d - #if defined(HAVE_IBM_DB2) - char *connect = NULL; - #elif defined(HAVE_MYSQL) -- my_bool mysql_reconnect = 1; -+#if LIBMYSQL_VERSION_ID >= 80000 /* my_bool type is removed in MySQL 8.0 */ -+ bool mysql_reconnect = 1; -+#else -+ my_bool mysql_reconnect = 1; -+#endif - #elif defined(HAVE_ORACLE) - char *connect = NULL; - sword err = OCI_SUCCESS; diff --git a/net-analyzer/zabbix/files/zabbix-3.0.30-security-disable-PidFile.patch b/net-analyzer/zabbix/files/zabbix-3.0.30-security-disable-PidFile.patch index e0fd74de51c7..b2635ff7d8a1 100644 --- a/net-analyzer/zabbix/files/zabbix-3.0.30-security-disable-PidFile.patch +++ b/net-analyzer/zabbix/files/zabbix-3.0.30-security-disable-PidFile.patch @@ -1,5 +1,3 @@ -diff --git a/conf/zabbix_agentd.conf b/conf/zabbix_agentd.conf -index b73bd45..c10daca 100644 --- a/conf/zabbix_agentd.conf +++ b/conf/zabbix_agentd.conf @@ -5,6 +5,7 @@ @@ -10,8 +8,6 @@ index b73bd45..c10daca 100644 # # Mandatory: no # Default: -diff --git a/conf/zabbix_proxy.conf b/conf/zabbix_proxy.conf -index 082f14e..de0284d 100644 --- a/conf/zabbix_proxy.conf +++ b/conf/zabbix_proxy.conf @@ -109,6 +109,7 @@ LogFile=/tmp/zabbix_proxy.log @@ -22,8 +18,6 @@ index 082f14e..de0284d 100644 # # Mandatory: no # Default: -diff --git a/conf/zabbix_server.conf b/conf/zabbix_server.conf -index 9f754ca..3999196 100644 --- a/conf/zabbix_server.conf +++ b/conf/zabbix_server.conf @@ -62,6 +62,7 @@ LogFile=/tmp/zabbix_server.log @@ -34,8 +28,6 @@ index 9f754ca..3999196 100644 # # Mandatory: no # Default: -diff --git a/src/libs/zbxnix/pid.c b/src/libs/zbxnix/pid.c -index baa8415..04c7e0c 100644 --- a/src/libs/zbxnix/pid.c +++ b/src/libs/zbxnix/pid.c @@ -26,6 +26,8 @@ static int fdpid = -1; diff --git a/net-analyzer/zabbix/files/zabbix-3.0.31-fix-cve-2020-15803.patch b/net-analyzer/zabbix/files/zabbix-3.0.31-fix-cve-2020-15803.patch deleted file mode 100644 index 0cca60315581..000000000000 --- a/net-analyzer/zabbix/files/zabbix-3.0.31-fix-cve-2020-15803.patch +++ /dev/null @@ -1,83 +0,0 @@ -diff --git a/frontends/php/include/classes/screens/CScreenUrl.php b/frontends/php/include/classes/screens/CScreenUrl.php -index e35c5f1..1df396e 100644 ---- a/frontends/php/include/classes/screens/CScreenUrl.php -+++ b/frontends/php/include/classes/screens/CScreenUrl.php -@@ -29,18 +29,10 @@ class CScreenUrl extends CScreenBase { - public function get() { - // prevent from resolving macros in configuration page - if ($this->mode != SCREEN_MODE_PREVIEW && $this->mode != SCREEN_MODE_SLIDESHOW) { -- return $this->getOutput( -- CHtmlUrlValidator::validate($this->screenitem['url'], false) -- ? new CIFrame($this->screenitem['url'], $this->screenitem['width'], $this->screenitem['height'], -- 'auto') -- : makeMessageBox(false, [[ -- 'type' => 'error', -- 'message' => _s('Provided URL "%1$s" is invalid.', $this->screenitem['url']) -- ]] -- ) -- ); -+ return $this->getOutput($this->prepareElement()); - } -- elseif ($this->screenitem['dynamic'] == SCREEN_DYNAMIC_ITEM && $this->hostid == 0) { -+ -+ if ($this->screenitem['dynamic'] == SCREEN_DYNAMIC_ITEM && $this->hostid == 0) { - return $this->getOutput((new CTableInfo())->setNoDataMessage(_('No host selected.'))); - } - -@@ -54,14 +46,28 @@ class CScreenUrl extends CScreenBase { - - $this->screenitem['url'] = $url ? $url : $this->screenitem['url']; - -- return $this->getOutput( -- CHtmlUrlValidator::validate($this->screenitem['url'], false) -- ? new CIFrame($this->screenitem['url'], $this->screenitem['width'], $this->screenitem['height'], 'auto') -- : makeMessageBox(false, [[ -- 'type' => 'error', -- 'message' => _s('Provided URL "%1$s" is invalid.', $this->screenitem['url']) -- ]] -- ) -- ); -+ return $this->getOutput($this->prepareElement()); -+ } -+ -+ /** -+ * @return CTag -+ */ -+ public function prepareElement() { -+ if (CHtmlUrlValidator::validate($this->screenitem['url'], false)) { -+ $item = new CIFrame($this->screenitem['url'], $this->screenitem['width'], $this->screenitem['height'], -+ 'auto' -+ ); -+ -+ if (ZBX_IFRAME_SANDBOX !== false) { -+ $item->setAttribute('sandbox', ZBX_IFRAME_SANDBOX); -+ } -+ -+ return $item; -+ } -+ -+ return makeMessageBox(false, [[ -+ 'type' => 'error', -+ 'message' => _s('Provided URL "%1$s" is invalid.', $this->screenitem['url']) -+ ]]); - } - } -diff --git a/frontends/php/include/defines.inc.php b/frontends/php/include/defines.inc.php -index a67a625..c6a437c 100644 ---- a/frontends/php/include/defines.inc.php -+++ b/frontends/php/include/defines.inc.php -@@ -1284,6 +1284,14 @@ if (function_exists('bcscale')) { - bcscale(7); - } - -+/** -+ * The sandbox attribute enables an extra set of restrictions for the content in the iframe. Default is set to empty -+ * string, which means all restrictions are applied. To disable, set to FALSE. To set a specific set of restrictions, -+ * write a custom string. -+ * https://www.w3.org/TR/2010/WD-html5-20100624/the-iframe-element.html#attr-iframe-sandbox -+ */ -+define('ZBX_IFRAME_SANDBOX', ''); -+ - // HTTP headers - /* - * Value of HTTP X-Frame-options header. diff --git a/net-analyzer/zabbix/files/zabbix-4.0.18-modulepathfix.patch b/net-analyzer/zabbix/files/zabbix-4.0.18-modulepathfix.patch index c0d1650fb85c..3e4ed297ebc0 100644 --- a/net-analyzer/zabbix/files/zabbix-4.0.18-modulepathfix.patch +++ b/net-analyzer/zabbix/files/zabbix-4.0.18-modulepathfix.patch @@ -1,5 +1,5 @@ ---- zabbix-4.0.1/configure 2018-10-29 10:36:05.000000000 -0700 -+++ zfx/configure 2018-11-07 16:59:28.015968345 -0800 +--- zabbix-4.0.1/configure ++++ zfx/configure @@ -12510,7 +12510,7 @@ CURL_SSL_CERT_LOCATION="${datadir}/zabbix/ssl/certs" CURL_SSL_KEY_LOCATION="${datadir}/zabbix/ssl/keys" diff --git a/net-analyzer/zabbix/files/zabbix-5.0.22-system.sw.packages.patch b/net-analyzer/zabbix/files/zabbix-5.0.22-system.sw.packages.patch new file mode 100644 index 000000000000..537c3491bb5f --- /dev/null +++ b/net-analyzer/zabbix/files/zabbix-5.0.22-system.sw.packages.patch @@ -0,0 +1,26 @@ +From 884982a87fc14918b062f09aa2bc3f8d2f777a14 Mon Sep 17 00:00:00 2001 +From: Alexey Shvetsov <alexxy@gentoo.org> +Date: Mon, 21 Mar 2022 11:23:54 +0300 +Subject: [PATCH] Allow to use system.sw.packages on gentoo linux + +Signed-off-by: Alexey Shvetsov <alexxy@gentoo.org> +--- a/src/go/plugins/system/sw/sw.go ++++ b/src/go/plugins/system/sw/sw.go +@@ -164,6 +164,7 @@ func getManagers() []manager { + {"pkgtools", "[ -d /var/log/packages ] && echo true", "ls /var/log/packages", parseRegex}, + {"rpm", "rpm --version 2> /dev/null", "rpm -qa", parseRegex}, + {"pacman", "pacman --version 2> /dev/null", "pacman -Q", parseRegex}, ++ {"portage", "emerge --version 2> /dev/null", "qlist -IRCv", parseRegex}, + } + } + +--- a/src/libs/zbxsysinfo/linux/software.c ++++ b/src/libs/zbxsysinfo/linux/software.c +@@ -176,6 +176,7 @@ static ZBX_PACKAGE_MANAGER package_managers[] = + {"pkgtools", "[ -d /var/log/packages ] && echo true", "ls /var/log/packages", NULL}, + {"rpm", "rpm --version 2> /dev/null", "rpm -qa", NULL}, + {"pacman", "pacman --version 2> /dev/null", "pacman -Q", NULL}, ++ {"portage", "emerge --version 2> /dev/null", "qlist -IRCv", NULL}, + {NULL} + }; + diff --git a/net-analyzer/zabbix/files/zabbix-6.0.3-system.sw.packages.patch b/net-analyzer/zabbix/files/zabbix-6.0.3-system.sw.packages.patch new file mode 100644 index 000000000000..3cb4b74fb15d --- /dev/null +++ b/net-analyzer/zabbix/files/zabbix-6.0.3-system.sw.packages.patch @@ -0,0 +1,26 @@ +From 1869f67549ea9491377269ef11a99ed5fc38e3cc Mon Sep 17 00:00:00 2001 +From: Alexey Shvetsov <alexxy@gentoo.org> +Date: Mon, 21 Mar 2022 11:23:54 +0300 +Subject: [PATCH] Allow to use system.sw.packages on gentoo linux + +Signed-off-by: Alexey Shvetsov <alexxy@gentoo.org> +--- a/src/go/plugins/system/sw/sw.go ++++ b/src/go/plugins/system/sw/sw.go +@@ -165,6 +165,7 @@ func getManagers() []manager { + {"pkgtools", "[ -d /var/log/packages ] && echo true", "ls /var/log/packages", parseRegex}, + {"rpm", "rpm --version 2> /dev/null", "rpm -qa", parseRegex}, + {"pacman", "pacman --version 2> /dev/null", "pacman -Q", parseRegex}, ++ {"portage", "emerge --version 2> /dev/null", "qlist -IRCv", parseRegex}, + } + } + +--- a/src/libs/zbxsysinfo/linux/software.c ++++ b/src/libs/zbxsysinfo/linux/software.c +@@ -177,6 +177,7 @@ static ZBX_PACKAGE_MANAGER package_managers[] = + {"pkgtools", "[ -d /var/log/packages ] && echo true", "ls /var/log/packages", NULL}, + {"rpm", "rpm --version 2> /dev/null", "rpm -qa", NULL}, + {"pacman", "pacman --version 2> /dev/null", "pacman -Q", NULL}, ++ {"portage", "emerge --version 2> /dev/null", "qlist -IRCv", NULL}, + {NULL} + }; + diff --git a/net-analyzer/zabbix/files/zabbix-6.4.0-configure-sscanf.patch b/net-analyzer/zabbix/files/zabbix-6.4.0-configure-sscanf.patch new file mode 100644 index 000000000000..0a95780c4505 --- /dev/null +++ b/net-analyzer/zabbix/files/zabbix-6.4.0-configure-sscanf.patch @@ -0,0 +1,12 @@ +--- a/configure.ac ++++ b/configure.ac +@@ -952,8 +952,9 @@ dnl Check for %qu format (FreeBSD 4.x) + dnl FreeBSD 4.x does not support %llu + AC_MSG_CHECKING(for long long format) + AC_RUN_IFELSE([AC_LANG_SOURCE([[ ++#include <stdio.h> + #include <sys/types.h> +-int main() ++int main(void) + { + uint64_t i; diff --git a/net-analyzer/zabbix/files/zabbix-6.4.6-clang16-build-fix.patch b/net-analyzer/zabbix/files/zabbix-6.4.6-clang16-build-fix.patch new file mode 100644 index 000000000000..4160a42ee6eb --- /dev/null +++ b/net-analyzer/zabbix/files/zabbix-6.4.6-clang16-build-fix.patch @@ -0,0 +1,58 @@ +https://github.com/zabbix/zabbix/pull/110 +From: Brahmajit Das <brahmajit.xyz@gmail.com> +Date: Sun, 24 Sep 2023 14:40:05 +0000 +Subject: [PATCH] Fix incompatible pointer to integer conversion initializing + +Makes struct members explicit. + +First found on Gentoo linux, with MUSL LLVM profile. Most probably due +to newer compilers (like Clang 16 and GCC 14) have turned various errors +on by default and we get build errors such as: + +``` +net.c:115:79: error: incompatible pointer to integer conversion initializing 'int' with an expression of type 'void *' [-Wint-conversion] + struct msghdr s_msg = { (void *)&s_sa, sizeof(struct sockaddr_nl), s_io, 1, NULL, 0, 0}; + ^~~~ +/usr/include/unistd.h:25:14: note: expanded from macro 'NULL' + ^~~~~~~~~~ +net.c:121:79: error: incompatible pointer to integer conversion initializing 'int' with an expression of type 'void *' [-Wint-conversion] + struct msghdr r_msg = { (void *)&r_sa, sizeof(struct sockaddr_nl), r_io, 1, NULL, 0, 0}; + ^~~~ +/usr/include/unistd.h:25:14: note: expanded from macro 'NULL' +``` + +Bug: https://bugs.gentoo.org/897840 +Signed-off-by: Brahmajit Das <brahmajit.xyz@gmail.com> +--- a/src/libs/zbxsysinfo/linux/net.c ++++ b/src/libs/zbxsysinfo/linux/net.c +@@ -112,13 +112,25 @@ static int find_tcp_port_by_state_nl(unsigned short port, int state, int *found) + + struct sockaddr_nl s_sa = { AF_NETLINK, 0, 0, 0 }; + struct iovec s_io[1] = { { &request, sizeof(request) } }; +- struct msghdr s_msg = { (void *)&s_sa, sizeof(struct sockaddr_nl), s_io, 1, NULL, 0, 0}; ++ struct msghdr s_msg = { .msg_name = (void *)&s_sa, ++ .msg_namelen = sizeof(struct sockaddr_nl), ++ .msg_iov = s_io, ++ .msg_iovlen = 1, ++ .msg_control = NULL, ++ .msg_controllen = 0, ++ .msg_flags = 0}; + + char buffer[BUFSIZ] = { 0 }; + + struct sockaddr_nl r_sa = { AF_NETLINK, 0, 0, 0 }; + struct iovec r_io[1] = { { buffer, BUFSIZ } }; +- struct msghdr r_msg = { (void *)&r_sa, sizeof(struct sockaddr_nl), r_io, 1, NULL, 0, 0}; ++ struct msghdr r_msg = { .msg_name = (void *)&r_sa, ++ .msg_namelen = sizeof(struct sockaddr_nl), ++ .msg_iov = r_io, ++ .msg_iovlen = 1, ++ .msg_control = NULL, ++ .msg_controllen = 0, ++ .msg_flags = 0}; + + struct nlmsghdr *r_hdr; + +-- +2.42.0 + diff --git a/net-analyzer/zabbix/files/zabbix-agent2.init b/net-analyzer/zabbix/files/zabbix-agent2.init new file mode 100644 index 000000000000..6a88e62b429a --- /dev/null +++ b/net-analyzer/zabbix/files/zabbix-agent2.init @@ -0,0 +1,20 @@ +#!/sbin/openrc-run +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +command="/usr/sbin/zabbix_agent2" +command_args="--foreground --config /etc/zabbix/zabbix_agent2.conf" +command_background="true" +command_user="zabbix:zabbix" +pidfile="/run/${RC_SVCNAME}.pid" + +depend() { + need net + provide zabbix-agent + use zabbix-server +} + +start_pre() { + checkpath -q -d -m 0750 -o root:zabbix /etc/zabbix + checkpath -q -f -m 0640 -o root:zabbix /etc/zabbix/*.conf +} diff --git a/net-analyzer/zabbix/files/zabbix-agent2.service b/net-analyzer/zabbix/files/zabbix-agent2.service new file mode 100644 index 000000000000..b182482fde97 --- /dev/null +++ b/net-analyzer/zabbix/files/zabbix-agent2.service @@ -0,0 +1,12 @@ +[Unit] +Description=Zabbix agent +Documentation=https://zabbix.com/manuals +After=network.target network-online.target + +[Service] +User=zabbix +Group=zabbix +ExecStart=/usr/sbin/zabbix_agent2 --foreground --config /etc/zabbix/zabbix_agent2.conf + +[Install] +WantedBy=multi-user.target diff --git a/net-analyzer/zabbix/files/zabbix-agent2.tmpfiles b/net-analyzer/zabbix/files/zabbix-agent2.tmpfiles new file mode 100644 index 000000000000..56471bb42c0a --- /dev/null +++ b/net-analyzer/zabbix/files/zabbix-agent2.tmpfiles @@ -0,0 +1 @@ +d /run/zabbix 0755 zabbix zabbix - diff --git a/net-analyzer/zabbix/files/zabbix-server-r1.init b/net-analyzer/zabbix/files/zabbix-server-r1.init new file mode 100644 index 000000000000..1652ba782fa8 --- /dev/null +++ b/net-analyzer/zabbix/files/zabbix-server-r1.init @@ -0,0 +1,25 @@ +#!/sbin/openrc-run +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +command="/usr/sbin/zabbix_server" +command_args="--foreground --config /etc/zabbix/zabbix_server.conf" +command_background="true" +command_user="zabbix:zabbix" +pidfile="/run/${RC_SVCNAME}.pid" + +depend() { + need net + use mysql postgresql +} + +start_pre() { + checkpath -q -d -m 0750 -o root:zabbix /etc/zabbix + checkpath -q -f -m 0640 -o root:zabbix /etc/zabbix/*.conf +} + +reload() { + /usr/sbin/zabbix_server \ + -c /etc/zabbix/zabbix_server.conf \ + -R config_cache_reload +} diff --git a/net-analyzer/zabbix/files/zabbix-server.init b/net-analyzer/zabbix/files/zabbix-server.init deleted file mode 100644 index b0bf752abaf7..000000000000 --- a/net-analyzer/zabbix/files/zabbix-server.init +++ /dev/null @@ -1,19 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -command="/usr/sbin/zabbix_server" -command_args="--foreground --config /etc/zabbix/zabbix_server.conf" -command_background="true" -command_user="zabbix:zabbix" -pidfile="/run/${RC_SVCNAME}.pid" - -depend() { - need net - use mysql postgresql -} - -start_pre() { - checkpath -q -d -m 0750 -o root:zabbix /etc/zabbix - checkpath -q -f -m 0640 -o root:zabbix /etc/zabbix/*.conf -} diff --git a/net-analyzer/zabbix/metadata.xml b/net-analyzer/zabbix/metadata.xml index 05a299b3033d..d6088f15ce3c 100644 --- a/net-analyzer/zabbix/metadata.xml +++ b/net-analyzer/zabbix/metadata.xml @@ -1,17 +1,13 @@ -<?xml version='1.0' encoding='UTF-8'?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> <email>fordfrog@gentoo.org</email> <name>Miroslav Šulc</name> </maintainer> <maintainer type="person"> - <email>patrick@gentoo.org</email> - <name>Patrick Lauer</name> - </maintainer> - <maintainer type="person"> - <email>alicef@gentoo.org</email> - <name>Alice Ferrazzi</name> + <name>Florian Schmaus</name> + <email>flow@gentoo.org</email> </maintainer> <longdescription> ZABBIX is software for monitoring of your applications, network and servers. @@ -21,15 +17,17 @@ configure different types of notifications for pre-defined events. </longdescription> <use> <flag name="agent">Enable zabbix agent (for to-be-monitored machines)</flag> + <flag name="agent2">Enable go-based zabbix agent 2 (for to-be-monitored machines)</flag> <flag name="frontend">Enable zabbix web frontend</flag> <flag name="ipv6">Turn on support of IPv6</flag> - <flag name="proxy">Enable proxy support</flag> + <flag name="java">Enable Zabbix Java JMX Management Gateway</flag> + <flag name="libxml2">Use libxml2 client library</flag> + <flag name="odbc">Enable Database Monitor and use UnixODBC Library by default</flag> <flag name="openipmi">Enable openipmi things</flag> + <flag name="openssl">Use <pkg>dev-libs/openssl</pkg> as TLS backend</flag> + <flag name="proxy">Enable proxy support</flag> <flag name="server">Enable zabbix server</flag> <flag name="ssh">SSH v2 based checks</flag> - <flag name="odbc">Enable Database Monitor and use UnixODBC Library by default</flag> <flag name="static">Build statically linked binaries</flag> - <flag name="java">Enable Zabbix Java JMX Management Gateway</flag> - <flag name="libxml2">Use libxml2 client library</flag> </use> </pkgmetadata> diff --git a/net-analyzer/zabbix/zabbix-3.0.31-r2.ebuild b/net-analyzer/zabbix/zabbix-3.0.31-r2.ebuild deleted file mode 100644 index a0c92d82004e..000000000000 --- a/net-analyzer/zabbix/zabbix-3.0.31-r2.ebuild +++ /dev/null @@ -1,350 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -# needed to make webapp-config dep optional -WEBAPP_OPTIONAL="yes" -inherit flag-o-matic webapp java-pkg-opt-2 systemd toolchain-funcs - -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/stable/${PV}/${P}.tar.gz" -LICENSE="GPL-2" -SLOT="0/$(ver_cut 1-2)" -WEBAPP_MANUAL_SLOT="yes" -KEYWORDS="amd64 x86" -IUSE="+agent java curl frontend ipv6 xmpp ldap libxml2 mysql openipmi oracle +postgres proxy server ssh ssl snmp sqlite odbc static" -REQUIRED_USE="|| ( agent frontend proxy server ) - proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) ) - server? ( ^^ ( mysql oracle postgres odbc ) ) - static? ( !oracle !snmp )" - -COMMON_DEPEND=" - curl? ( net-misc/curl ) - 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 ) - oracle? ( dev-db/oracle-instantclient-basic ) - postgres? ( dev-db/postgresql:* ) - proxy? ( sys-libs/zlib ) - server? ( - dev-libs/libevent - sys-libs/zlib - ) - snmp? ( net-analyzer/net-snmp ) - sqlite? ( dev-db/sqlite ) - ssh? ( net-libs/libssh2 ) - ssl? ( dev-libs/openssl:=[-bindist] ) - xmpp? ( dev-libs/iksemel ) -" - -RDEPEND="${COMMON_DEPEND} - acct-group/zabbix - acct-user/zabbix - java? ( >=virtual/jre-1.8:* ) - mysql? ( virtual/mysql ) - proxy? ( net-analyzer/fping[suid] ) - server? ( - app-admin/webapp-config - dev-libs/libevent - dev-libs/libpcre - 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] ) - oracle? ( dev-lang/php[oci8-instant-client] ) - 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 -" - -PATCHES=( - "${FILESDIR}/${PN}-3.0.30-security-disable-PidFile.patch" - "${FILESDIR}/${PN}-3.0.30-mysql8.patch" - "${FILESDIR}/${P}-fix-cve-2020-15803.patch" -) - -S=${WORKDIR}/${MY_P} - -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 - if has_version 'dev-db/oracle-instantclient-basic'; then - ewarn - ewarn "Please ensure you have a full install of the Oracle client." - ewarn "dev-db/oracle-instantclient* is NOT sufficient." - ewarn - fi - fi - - if use frontend; then - webapp_pkg_setup - fi - - java-pkg-opt-2_pkg_setup -} - -src_prepare() { - default -} - -src_configure() { - econf \ - $(use_enable agent) \ - $(use_enable ipv6) \ - $(use_enable java) \ - $(use_enable proxy) \ - $(use_enable server) \ - $(use_enable static) \ - $(use_with curl libcurl) \ - $(use_with ldap) \ - $(use_with libxml2) \ - $(use_with mysql) \ - $(use_with odbc unixodbc) \ - $(use_with openipmi openipmi) \ - $(use_with oracle) \ - $(use_with postgres postgresql) \ - $(use_with snmp net-snmp) \ - $(use_with sqlite sqlite3) \ - $(use_with ssh ssh2) \ - $(use_with ssl openssl) \ - $(use_with xmpp jabber) -} - -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 - dodir "${dir}" - 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.init zabbix-server - - dosbin src/zabbix_server/zabbix_server - - insinto /usr/share/zabbix - doins -r "${S}"/database/ - - systemd_dounit "${FILESDIR}"/zabbix-server.service - systemd_newtmpfilesd "${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 - systemd_newtmpfilesd "${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 - systemd_newtmpfilesd "${FILESDIR}"/zabbix-agentd.tmpfiles zabbix-agentd.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 frontends/php/* "${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-0.9.27.jar \ - src/zabbix_java/lib/logback-console.xml \ - src/zabbix_java/lib/logback-core-0.9.27.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.6.1.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 (e.g. ~/.sendxmpprc when" - ewarn "using sendxmpp for Jabber alerts)." - ewarn - ewarn "To change the homedir use:" - ewarn " usermod -d /var/lib/zabbix/home zabbix" - ewarn - fi - fi - - if use server; then - 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 - - 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 - - if use server || use proxy ; then - # check for fping - fping_perms=$(stat -c %a /usr/sbin/fping 2>/dev/null) - case "${fping_perms}" in - 4[157][157][157]) - ;; - *) - ewarn - ewarn "If you want to use the checks 'icmpping' and 'icmppingsec'," - ewarn "you have to make /usr/sbin/fping setuid root and executable" - ewarn "by everyone. Run the following command to fix it:" - ewarn - ewarn " chmod u=rwsx,g=rx,o=rx /usr/sbin/fping" - ewarn - ewarn "Please be aware that this might impose a security risk," - ewarn "depending on the code quality of fping." - ewarn - ;; - esac - fi -} diff --git a/net-analyzer/zabbix/zabbix-4.0.27-r1.ebuild b/net-analyzer/zabbix/zabbix-4.0.27-r1.ebuild deleted file mode 100644 index b13d6cef7467..000000000000 --- a/net-analyzer/zabbix/zabbix-4.0.27-r1.ebuild +++ /dev/null @@ -1,349 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -# needed to make webapp-config dep optional -WEBAPP_OPTIONAL="yes" -inherit flag-o-matic webapp java-pkg-opt-2 systemd toolchain-funcs - -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/4.0/${P}.tar.gz" -LICENSE="GPL-2" -SLOT="0/$(ver_cut 1-2)" -WEBAPP_MANUAL_SLOT="yes" -KEYWORDS="amd64 x86" -IUSE="+agent java curl frontend ipv6 xmpp ldap libxml2 mysql openipmi oracle +postgres proxy server ssh ssl snmp sqlite odbc static" -REQUIRED_USE="|| ( agent frontend proxy server ) - proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) ) - server? ( ^^ ( mysql oracle postgres odbc ) ) - static? ( !oracle !snmp )" - -COMMON_DEPEND=" - curl? ( net-misc/curl ) - 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 ) - oracle? ( dev-db/oracle-instantclient-basic ) - postgres? ( dev-db/postgresql:* ) - proxy? ( sys-libs/zlib ) - server? ( - dev-libs/libevent - sys-libs/zlib - ) - snmp? ( net-analyzer/net-snmp ) - sqlite? ( dev-db/sqlite ) - ssh? ( net-libs/libssh2 ) - ssl? ( dev-libs/openssl:=[-bindist] ) - xmpp? ( dev-libs/iksemel ) -" - -RDEPEND="${COMMON_DEPEND} - acct-group/zabbix - acct-user/zabbix - java? ( >=virtual/jre-1.8:* ) - mysql? ( virtual/mysql ) - proxy? ( net-analyzer/fping[suid] ) - server? ( - app-admin/webapp-config - dev-libs/libevent - dev-libs/libpcre - 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] ) - oracle? ( dev-lang/php[oci8-instant-client] ) - 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 -" - -PATCHES=( - "${FILESDIR}/${PN}-4.0.18-modulepathfix.patch" - "${FILESDIR}/${PN}-3.0.30-security-disable-PidFile.patch" -) - -S=${WORKDIR}/${MY_P} - -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 - if has_version 'dev-db/oracle-instantclient-basic'; then - ewarn - ewarn "Please ensure you have a full install of the Oracle client." - ewarn "dev-db/oracle-instantclient* is NOT sufficient." - ewarn - fi - fi - - if use frontend; then - webapp_pkg_setup - fi - - java-pkg-opt-2_pkg_setup -} - -src_prepare() { - default -} - -src_configure() { - econf \ - $(use_enable agent) \ - $(use_enable ipv6) \ - $(use_enable java) \ - $(use_enable proxy) \ - $(use_enable server) \ - $(use_enable static) \ - $(use_with curl libcurl) \ - $(use_with ldap) \ - $(use_with libxml2) \ - $(use_with mysql) \ - $(use_with odbc unixodbc) \ - $(use_with openipmi openipmi) \ - $(use_with oracle) \ - $(use_with postgres postgresql) \ - $(use_with snmp net-snmp) \ - $(use_with sqlite sqlite3) \ - $(use_with ssh ssh2) \ - $(use_with ssl openssl) \ - $(use_with xmpp jabber) -} - -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 - dodir "${dir}" - 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.init zabbix-server - - dosbin src/zabbix_server/zabbix_server - - insinto /usr/share/zabbix - doins -r "${S}"/database/ - - systemd_dounit "${FILESDIR}"/zabbix-server.service - systemd_newtmpfilesd "${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 - systemd_newtmpfilesd "${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 - systemd_newtmpfilesd "${FILESDIR}"/zabbix-agentd.tmpfiles zabbix-agentd.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 frontends/php/* "${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-0.9.27.jar \ - src/zabbix_java/lib/logback-console.xml \ - src/zabbix_java/lib/logback-core-0.9.27.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.6.1.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 (e.g. ~/.sendxmpprc when" - ewarn "using sendxmpp for Jabber alerts)." - ewarn - ewarn "To change the homedir use:" - ewarn " usermod -d /var/lib/zabbix/home zabbix" - ewarn - fi - fi - - if use server; then - 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 - - 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 - - if use server || use proxy ; then - # check for fping - fping_perms=$(stat -c %a /usr/sbin/fping 2>/dev/null) - case "${fping_perms}" in - 4[157][157][157]) - ;; - *) - ewarn - ewarn "If you want to use the checks 'icmpping' and 'icmppingsec'," - ewarn "you have to make /usr/sbin/fping setuid root and executable" - ewarn "by everyone. Run the following command to fix it:" - ewarn - ewarn " chmod u=rwsx,g=rx,o=rx /usr/sbin/fping" - ewarn - ewarn "Please be aware that this might impose a security risk," - ewarn "depending on the code quality of fping." - ewarn - ;; - esac - fi -} diff --git a/net-analyzer/zabbix/zabbix-5.0.41.ebuild b/net-analyzer/zabbix/zabbix-5.0.41.ebuild new file mode 100644 index 000000000000..ff7c470a27bf --- /dev/null +++ b/net-analyzer/zabbix/zabbix-5.0.41.ebuild @@ -0,0 +1,379 @@ +# 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 zabbix-${PV}-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/libpcre + net-analyzer/fping[suid] + ) + selinux? ( sec-policy/selinux-zabbix ) + server? ( + app-admin/webapp-config + dev-libs/libpcre + 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] ) + oracle? ( dev-lang/php[oci8-instant-client] ) + 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}-5.0.22-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() { + econf \ + $(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) +} + +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 + dodir "${dir}" + 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 + + 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-5.0.42.ebuild b/net-analyzer/zabbix/zabbix-5.0.42.ebuild new file mode 100644 index 000000000000..635896e3e145 --- /dev/null +++ b/net-analyzer/zabbix/zabbix-5.0.42.ebuild @@ -0,0 +1,379 @@ +# 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 zabbix-${PV}-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/libpcre + net-analyzer/fping[suid] + ) + selinux? ( sec-policy/selinux-zabbix ) + server? ( + app-admin/webapp-config + dev-libs/libpcre + 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] ) + oracle? ( dev-lang/php[oci8-instant-client] ) + 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}-5.0.22-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() { + econf \ + $(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) +} + +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 + dodir "${dir}" + 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 + + 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-5.0.6-r1.ebuild b/net-analyzer/zabbix/zabbix-5.0.6-r1.ebuild deleted file mode 100644 index 688147d3fb15..000000000000 --- a/net-analyzer/zabbix/zabbix-5.0.6-r1.ebuild +++ /dev/null @@ -1,346 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -# needed to make webapp-config dep optional -WEBAPP_OPTIONAL="yes" -inherit flag-o-matic webapp java-pkg-opt-2 systemd toolchain-funcs - -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" -LICENSE="GPL-2" -SLOT="0/$(ver_cut 1-2)" -WEBAPP_MANUAL_SLOT="yes" -KEYWORDS="amd64 x86" -IUSE="+agent java curl frontend ipv6 ldap libxml2 mysql openipmi oracle +postgres proxy server ssh ssl snmp sqlite odbc static" -REQUIRED_USE="|| ( agent frontend proxy server ) - proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) ) - server? ( ^^ ( mysql oracle postgres odbc ) ) - static? ( !oracle !snmp )" - -COMMON_DEPEND=" - curl? ( net-misc/curl ) - 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 ) - oracle? ( dev-db/oracle-instantclient-basic ) - postgres? ( dev-db/postgresql:* ) - proxy? ( sys-libs/zlib ) - server? ( - dev-libs/libevent - sys-libs/zlib - ) - snmp? ( net-analyzer/net-snmp ) - sqlite? ( dev-db/sqlite ) - ssh? ( net-libs/libssh2 ) - ssl? ( dev-libs/openssl:=[-bindist] ) -" - -RDEPEND="${COMMON_DEPEND} - acct-group/zabbix - acct-user/zabbix - java? ( >=virtual/jre-1.8:* ) - mysql? ( virtual/mysql ) - proxy? ( net-analyzer/fping[suid] ) - server? ( - app-admin/webapp-config - dev-libs/libevent - dev-libs/libpcre - 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] ) - oracle? ( dev-lang/php[oci8-instant-client] ) - 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 -" - -PATCHES=( - "${FILESDIR}/${PN}-4.0.18-modulepathfix.patch" - "${FILESDIR}/${PN}-3.0.30-security-disable-PidFile.patch" -) - -S=${WORKDIR}/${MY_P} - -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 - if has_version 'dev-db/oracle-instantclient-basic'; then - ewarn - ewarn "Please ensure you have a full install of the Oracle client." - ewarn "dev-db/oracle-instantclient* is NOT sufficient." - ewarn - fi - fi - - if use frontend; then - webapp_pkg_setup - fi - - java-pkg-opt-2_pkg_setup -} - -src_prepare() { - default -} - -src_configure() { - econf \ - $(use_enable agent) \ - $(use_enable ipv6) \ - $(use_enable java) \ - $(use_enable proxy) \ - $(use_enable server) \ - $(use_enable static) \ - $(use_with curl libcurl) \ - $(use_with ldap) \ - $(use_with libxml2) \ - $(use_with mysql) \ - $(use_with odbc unixodbc) \ - $(use_with openipmi openipmi) \ - $(use_with oracle) \ - $(use_with postgres postgresql) \ - $(use_with snmp net-snmp) \ - $(use_with sqlite sqlite3) \ - $(use_with ssh ssh2) \ - $(use_with ssl openssl) -} - -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 - dodir "${dir}" - 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.init zabbix-server - - dosbin src/zabbix_server/zabbix_server - - insinto /usr/share/zabbix - doins -r "${S}"/database/ - - systemd_dounit "${FILESDIR}"/zabbix-server.service - systemd_newtmpfilesd "${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 - systemd_newtmpfilesd "${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 - systemd_newtmpfilesd "${FILESDIR}"/zabbix-agentd.tmpfiles zabbix-agentd.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-0.9.27.jar \ - src/zabbix_java/lib/logback-console.xml \ - src/zabbix_java/lib/logback-core-0.9.27.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.6.1.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 - 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 - - 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 - - if use server || use proxy ; then - # check for fping - fping_perms=$(stat -c %a /usr/sbin/fping 2>/dev/null) - case "${fping_perms}" in - 4[157][157][157]) - ;; - *) - ewarn - ewarn "If you want to use the checks 'icmpping' and 'icmppingsec'," - ewarn "you have to make /usr/sbin/fping setuid root and executable" - ewarn "by everyone. Run the following command to fix it:" - ewarn - ewarn " chmod u=rwsx,g=rx,o=rx /usr/sbin/fping" - ewarn - ewarn "Please be aware that this might impose a security risk," - ewarn "depending on the code quality of fping." - ewarn - ;; - esac - fi -} diff --git a/net-analyzer/zabbix/zabbix-5.0.7.ebuild b/net-analyzer/zabbix/zabbix-5.0.7.ebuild deleted file mode 100644 index 8f6e95562365..000000000000 --- a/net-analyzer/zabbix/zabbix-5.0.7.ebuild +++ /dev/null @@ -1,346 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -# needed to make webapp-config dep optional -WEBAPP_OPTIONAL="yes" -inherit flag-o-matic webapp java-pkg-opt-2 systemd toolchain-funcs - -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" -LICENSE="GPL-2" -SLOT="0/$(ver_cut 1-2)" -WEBAPP_MANUAL_SLOT="yes" -KEYWORDS="~amd64 ~x86" -IUSE="+agent java curl frontend ipv6 ldap libxml2 mysql openipmi oracle +postgres proxy server ssh ssl snmp sqlite odbc static" -REQUIRED_USE="|| ( agent frontend proxy server ) - proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) ) - server? ( ^^ ( mysql oracle postgres odbc ) ) - static? ( !oracle !snmp )" - -COMMON_DEPEND=" - curl? ( net-misc/curl ) - 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 ) - oracle? ( dev-db/oracle-instantclient-basic ) - postgres? ( dev-db/postgresql:* ) - proxy? ( sys-libs/zlib ) - server? ( - dev-libs/libevent - sys-libs/zlib - ) - snmp? ( net-analyzer/net-snmp ) - sqlite? ( dev-db/sqlite ) - ssh? ( net-libs/libssh2 ) - ssl? ( dev-libs/openssl:=[-bindist] ) -" - -RDEPEND="${COMMON_DEPEND} - acct-group/zabbix - acct-user/zabbix - java? ( >=virtual/jre-1.8:* ) - mysql? ( virtual/mysql ) - proxy? ( net-analyzer/fping[suid] ) - server? ( - app-admin/webapp-config - dev-libs/libevent - dev-libs/libpcre - 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] ) - oracle? ( dev-lang/php[oci8-instant-client] ) - 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 -" - -PATCHES=( - "${FILESDIR}/${PN}-4.0.18-modulepathfix.patch" - "${FILESDIR}/${PN}-3.0.30-security-disable-PidFile.patch" -) - -S=${WORKDIR}/${MY_P} - -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 - if has_version 'dev-db/oracle-instantclient-basic'; then - ewarn - ewarn "Please ensure you have a full install of the Oracle client." - ewarn "dev-db/oracle-instantclient* is NOT sufficient." - ewarn - fi - fi - - if use frontend; then - webapp_pkg_setup - fi - - java-pkg-opt-2_pkg_setup -} - -src_prepare() { - default -} - -src_configure() { - econf \ - $(use_enable agent) \ - $(use_enable ipv6) \ - $(use_enable java) \ - $(use_enable proxy) \ - $(use_enable server) \ - $(use_enable static) \ - $(use_with curl libcurl) \ - $(use_with ldap) \ - $(use_with libxml2) \ - $(use_with mysql) \ - $(use_with odbc unixodbc) \ - $(use_with openipmi openipmi) \ - $(use_with oracle) \ - $(use_with postgres postgresql) \ - $(use_with snmp net-snmp) \ - $(use_with sqlite sqlite3) \ - $(use_with ssh ssh2) \ - $(use_with ssl openssl) -} - -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 - dodir "${dir}" - 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.init zabbix-server - - dosbin src/zabbix_server/zabbix_server - - insinto /usr/share/zabbix - doins -r "${S}"/database/ - - systemd_dounit "${FILESDIR}"/zabbix-server.service - systemd_newtmpfilesd "${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 - systemd_newtmpfilesd "${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 - systemd_newtmpfilesd "${FILESDIR}"/zabbix-agentd.tmpfiles zabbix-agentd.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-0.9.27.jar \ - src/zabbix_java/lib/logback-console.xml \ - src/zabbix_java/lib/logback-core-0.9.27.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.6.1.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 - 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 - - 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 - - if use server || use proxy ; then - # check for fping - fping_perms=$(stat -c %a /usr/sbin/fping 2>/dev/null) - case "${fping_perms}" in - 4[157][157][157]) - ;; - *) - ewarn - ewarn "If you want to use the checks 'icmpping' and 'icmppingsec'," - ewarn "you have to make /usr/sbin/fping setuid root and executable" - ewarn "by everyone. Run the following command to fix it:" - ewarn - ewarn " chmod u=rwsx,g=rx,o=rx /usr/sbin/fping" - ewarn - ewarn "Please be aware that this might impose a security risk," - ewarn "depending on the code quality of fping." - ewarn - ;; - esac - fi -} diff --git a/net-analyzer/zabbix/zabbix-5.2.2-r1.ebuild b/net-analyzer/zabbix/zabbix-5.2.2-r1.ebuild deleted file mode 100644 index 688147d3fb15..000000000000 --- a/net-analyzer/zabbix/zabbix-5.2.2-r1.ebuild +++ /dev/null @@ -1,346 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -# needed to make webapp-config dep optional -WEBAPP_OPTIONAL="yes" -inherit flag-o-matic webapp java-pkg-opt-2 systemd toolchain-funcs - -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" -LICENSE="GPL-2" -SLOT="0/$(ver_cut 1-2)" -WEBAPP_MANUAL_SLOT="yes" -KEYWORDS="amd64 x86" -IUSE="+agent java curl frontend ipv6 ldap libxml2 mysql openipmi oracle +postgres proxy server ssh ssl snmp sqlite odbc static" -REQUIRED_USE="|| ( agent frontend proxy server ) - proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) ) - server? ( ^^ ( mysql oracle postgres odbc ) ) - static? ( !oracle !snmp )" - -COMMON_DEPEND=" - curl? ( net-misc/curl ) - 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 ) - oracle? ( dev-db/oracle-instantclient-basic ) - postgres? ( dev-db/postgresql:* ) - proxy? ( sys-libs/zlib ) - server? ( - dev-libs/libevent - sys-libs/zlib - ) - snmp? ( net-analyzer/net-snmp ) - sqlite? ( dev-db/sqlite ) - ssh? ( net-libs/libssh2 ) - ssl? ( dev-libs/openssl:=[-bindist] ) -" - -RDEPEND="${COMMON_DEPEND} - acct-group/zabbix - acct-user/zabbix - java? ( >=virtual/jre-1.8:* ) - mysql? ( virtual/mysql ) - proxy? ( net-analyzer/fping[suid] ) - server? ( - app-admin/webapp-config - dev-libs/libevent - dev-libs/libpcre - 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] ) - oracle? ( dev-lang/php[oci8-instant-client] ) - 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 -" - -PATCHES=( - "${FILESDIR}/${PN}-4.0.18-modulepathfix.patch" - "${FILESDIR}/${PN}-3.0.30-security-disable-PidFile.patch" -) - -S=${WORKDIR}/${MY_P} - -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 - if has_version 'dev-db/oracle-instantclient-basic'; then - ewarn - ewarn "Please ensure you have a full install of the Oracle client." - ewarn "dev-db/oracle-instantclient* is NOT sufficient." - ewarn - fi - fi - - if use frontend; then - webapp_pkg_setup - fi - - java-pkg-opt-2_pkg_setup -} - -src_prepare() { - default -} - -src_configure() { - econf \ - $(use_enable agent) \ - $(use_enable ipv6) \ - $(use_enable java) \ - $(use_enable proxy) \ - $(use_enable server) \ - $(use_enable static) \ - $(use_with curl libcurl) \ - $(use_with ldap) \ - $(use_with libxml2) \ - $(use_with mysql) \ - $(use_with odbc unixodbc) \ - $(use_with openipmi openipmi) \ - $(use_with oracle) \ - $(use_with postgres postgresql) \ - $(use_with snmp net-snmp) \ - $(use_with sqlite sqlite3) \ - $(use_with ssh ssh2) \ - $(use_with ssl openssl) -} - -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 - dodir "${dir}" - 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.init zabbix-server - - dosbin src/zabbix_server/zabbix_server - - insinto /usr/share/zabbix - doins -r "${S}"/database/ - - systemd_dounit "${FILESDIR}"/zabbix-server.service - systemd_newtmpfilesd "${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 - systemd_newtmpfilesd "${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 - systemd_newtmpfilesd "${FILESDIR}"/zabbix-agentd.tmpfiles zabbix-agentd.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-0.9.27.jar \ - src/zabbix_java/lib/logback-console.xml \ - src/zabbix_java/lib/logback-core-0.9.27.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.6.1.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 - 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 - - 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 - - if use server || use proxy ; then - # check for fping - fping_perms=$(stat -c %a /usr/sbin/fping 2>/dev/null) - case "${fping_perms}" in - 4[157][157][157]) - ;; - *) - ewarn - ewarn "If you want to use the checks 'icmpping' and 'icmppingsec'," - ewarn "you have to make /usr/sbin/fping setuid root and executable" - ewarn "by everyone. Run the following command to fix it:" - ewarn - ewarn " chmod u=rwsx,g=rx,o=rx /usr/sbin/fping" - ewarn - ewarn "Please be aware that this might impose a security risk," - ewarn "depending on the code quality of fping." - ewarn - ;; - esac - fi -} diff --git a/net-analyzer/zabbix/zabbix-5.2.3.ebuild b/net-analyzer/zabbix/zabbix-5.2.3.ebuild deleted file mode 100644 index 8f6e95562365..000000000000 --- a/net-analyzer/zabbix/zabbix-5.2.3.ebuild +++ /dev/null @@ -1,346 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -# needed to make webapp-config dep optional -WEBAPP_OPTIONAL="yes" -inherit flag-o-matic webapp java-pkg-opt-2 systemd toolchain-funcs - -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" -LICENSE="GPL-2" -SLOT="0/$(ver_cut 1-2)" -WEBAPP_MANUAL_SLOT="yes" -KEYWORDS="~amd64 ~x86" -IUSE="+agent java curl frontend ipv6 ldap libxml2 mysql openipmi oracle +postgres proxy server ssh ssl snmp sqlite odbc static" -REQUIRED_USE="|| ( agent frontend proxy server ) - proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) ) - server? ( ^^ ( mysql oracle postgres odbc ) ) - static? ( !oracle !snmp )" - -COMMON_DEPEND=" - curl? ( net-misc/curl ) - 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 ) - oracle? ( dev-db/oracle-instantclient-basic ) - postgres? ( dev-db/postgresql:* ) - proxy? ( sys-libs/zlib ) - server? ( - dev-libs/libevent - sys-libs/zlib - ) - snmp? ( net-analyzer/net-snmp ) - sqlite? ( dev-db/sqlite ) - ssh? ( net-libs/libssh2 ) - ssl? ( dev-libs/openssl:=[-bindist] ) -" - -RDEPEND="${COMMON_DEPEND} - acct-group/zabbix - acct-user/zabbix - java? ( >=virtual/jre-1.8:* ) - mysql? ( virtual/mysql ) - proxy? ( net-analyzer/fping[suid] ) - server? ( - app-admin/webapp-config - dev-libs/libevent - dev-libs/libpcre - 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] ) - oracle? ( dev-lang/php[oci8-instant-client] ) - 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 -" - -PATCHES=( - "${FILESDIR}/${PN}-4.0.18-modulepathfix.patch" - "${FILESDIR}/${PN}-3.0.30-security-disable-PidFile.patch" -) - -S=${WORKDIR}/${MY_P} - -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 - if has_version 'dev-db/oracle-instantclient-basic'; then - ewarn - ewarn "Please ensure you have a full install of the Oracle client." - ewarn "dev-db/oracle-instantclient* is NOT sufficient." - ewarn - fi - fi - - if use frontend; then - webapp_pkg_setup - fi - - java-pkg-opt-2_pkg_setup -} - -src_prepare() { - default -} - -src_configure() { - econf \ - $(use_enable agent) \ - $(use_enable ipv6) \ - $(use_enable java) \ - $(use_enable proxy) \ - $(use_enable server) \ - $(use_enable static) \ - $(use_with curl libcurl) \ - $(use_with ldap) \ - $(use_with libxml2) \ - $(use_with mysql) \ - $(use_with odbc unixodbc) \ - $(use_with openipmi openipmi) \ - $(use_with oracle) \ - $(use_with postgres postgresql) \ - $(use_with snmp net-snmp) \ - $(use_with sqlite sqlite3) \ - $(use_with ssh ssh2) \ - $(use_with ssl openssl) -} - -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 - dodir "${dir}" - 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.init zabbix-server - - dosbin src/zabbix_server/zabbix_server - - insinto /usr/share/zabbix - doins -r "${S}"/database/ - - systemd_dounit "${FILESDIR}"/zabbix-server.service - systemd_newtmpfilesd "${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 - systemd_newtmpfilesd "${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 - systemd_newtmpfilesd "${FILESDIR}"/zabbix-agentd.tmpfiles zabbix-agentd.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-0.9.27.jar \ - src/zabbix_java/lib/logback-console.xml \ - src/zabbix_java/lib/logback-core-0.9.27.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.6.1.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 - 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 - - 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 - - if use server || use proxy ; then - # check for fping - fping_perms=$(stat -c %a /usr/sbin/fping 2>/dev/null) - case "${fping_perms}" in - 4[157][157][157]) - ;; - *) - ewarn - ewarn "If you want to use the checks 'icmpping' and 'icmppingsec'," - ewarn "you have to make /usr/sbin/fping setuid root and executable" - ewarn "by everyone. Run the following command to fix it:" - ewarn - ewarn " chmod u=rwsx,g=rx,o=rx /usr/sbin/fping" - ewarn - ewarn "Please be aware that this might impose a security risk," - ewarn "depending on the code quality of fping." - ewarn - ;; - esac - fi -} diff --git a/net-analyzer/zabbix/zabbix-6.0.27.ebuild b/net-analyzer/zabbix/zabbix-6.0.27.ebuild new file mode 100644 index 000000000000..e79c51a185e1 --- /dev/null +++ b/net-analyzer/zabbix/zabbix-6.0.27.ebuild @@ -0,0 +1,382 @@ +# 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 zabbix-${PV}-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] ) + oracle? ( dev-lang/php[oci8-instant-client] ) + 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 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.0.28.ebuild b/net-analyzer/zabbix/zabbix-6.0.28.ebuild new file mode 100644 index 000000000000..186f30cc734e --- /dev/null +++ b/net-analyzer/zabbix/zabbix-6.0.28.ebuild @@ -0,0 +1,382 @@ +# 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 zabbix-${PV}-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] ) + oracle? ( dev-lang/php[oci8-instant-client] ) + 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 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.0.29.ebuild b/net-analyzer/zabbix/zabbix-6.0.29.ebuild new file mode 100644 index 000000000000..44884d9f45ff --- /dev/null +++ b/net-analyzer/zabbix/zabbix-6.0.29.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.12.ebuild b/net-analyzer/zabbix/zabbix-6.4.12.ebuild new file mode 100644 index 000000000000..2fc51b6f2e74 --- /dev/null +++ b/net-analyzer/zabbix/zabbix-6.4.12.ebuild @@ -0,0 +1,386 @@ +# 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 zabbix-${PV}-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] ) + oracle? ( dev-lang/php[oci8-instant-client] ) + 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 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 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.13.ebuild b/net-analyzer/zabbix/zabbix-6.4.13.ebuild new file mode 100644 index 000000000000..3cba4e107176 --- /dev/null +++ b/net-analyzer/zabbix/zabbix-6.4.13.ebuild @@ -0,0 +1,386 @@ +# 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 zabbix-${PV}-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] ) + oracle? ( dev-lang/php[oci8-instant-client] ) + 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 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 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.14.ebuild b/net-analyzer/zabbix/zabbix-6.4.14.ebuild new file mode 100644 index 000000000000..1f01c04f346d --- /dev/null +++ b/net-analyzer/zabbix/zabbix-6.4.14.ebuild @@ -0,0 +1,393 @@ +# 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" + "${FILESDIR}/${PN}-6.4.6-clang16-build-fix.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/zmap/files/zmap-2.1.1-always-install-config.patch b/net-analyzer/zmap/files/zmap-2.1.1-always-install-config.patch new file mode 100644 index 000000000000..b3a8f9003dc5 --- /dev/null +++ b/net-analyzer/zmap/files/zmap-2.1.1-always-install-config.patch @@ -0,0 +1,20 @@ +We always want to install configs as the host machine may be different from +the one where zmap is installed to. Plus we have CONFIG_PROTECT in Gentoo +for protecting the user's existing configuration. + +Bug: https://bugs.gentoo.org/885707 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -135,11 +135,7 @@ message(STATUS "Default ZMap configuration file location is /etc/zmap") + foreach(EACH_CONF ${CONF_FILES}) + get_filename_component(CONF_BASENAME ${EACH_CONF} NAME) + message(STATUS "Checking if ${CONF_BASENAME} exists there...") +- if(NOT EXISTS "/etc/zmap/${CONF_BASENAME}") +- install(FILES ${EACH_CONF} DESTINATION ${CONFIG_DESTINATION}) +- else() +- message(WARNING "Existing configuration file detected at /etc/zmap/${CONF_BASENAME}, ${CONF_BASENAME} from sources will NOT be installed. Please check and install manually!") +- endif() ++ install(FILES ${EACH_CONF} DESTINATION ${CONFIG_DESTINATION}) + endforeach() + + # Allow Debian Packaging diff --git a/net-analyzer/zmap/metadata.xml b/net-analyzer/zmap/metadata.xml index 2204ae3c97cf..378248ac6c65 100644 --- a/net-analyzer/zmap/metadata.xml +++ b/net-analyzer/zmap/metadata.xml @@ -1,13 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> - <email>jakov.smolic@sartura.hr</email> - <name>Jakov Smolic</name> - </maintainer> - <maintainer type="project"> - <email>proxy-maint@gentoo.org</email> - <name>Proxy Maintainers</name> + <email>jsmolic@gentoo.org</email> + <name>Jakov Smolić</name> </maintainer> <longdescription> ZMap is an open-source network scanner that enables researchers to easily diff --git a/net-analyzer/zmap/zmap-2.1.1-r2.ebuild b/net-analyzer/zmap/zmap-2.1.1-r2.ebuild deleted file mode 100644 index be82641d5c7a..000000000000 --- a/net-analyzer/zmap/zmap-2.1.1-r2.ebuild +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -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 x86" -IUSE="mongo redis" - -RDEPEND="dev-libs/gmp:0 - net-libs/libpcap - dev-libs/json-c:= - mongo? ( dev-db/mongodb ) - redis? ( dev-libs/hiredis )" -DEPEND="${RDEPEND} - dev-util/gengetopt - sys-devel/flex - dev-util/byacc" - -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 - -DWITH_MONGO="$(usex mongo)" - -DWITH_REDIS="$(usex redis)" - ) - cmake_src_configure -} - -FILECAPS=( cap_net_raw=ep usr/sbin/zmap ) diff --git a/net-analyzer/zmap/zmap-2.1.1-r5.ebuild b/net-analyzer/zmap/zmap-2.1.1-r5.ebuild new file mode 100644 index 000000000000..b413d47fc165 --- /dev/null +++ b/net-analyzer/zmap/zmap-2.1.1-r5.ebuild @@ -0,0 +1,56 @@ +# 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:= + net-libs/libpcap + dev-libs/json-c:= + mongo? ( + dev-db/mongodb + dev-libs/mongo-c-driver + ) + redis? ( dev-libs/hiredis:= ) +" +DEPEND="${RDEPEND}" +BDEPEND=" + dev-util/gengetopt + app-alternatives/lex + dev-util/byacc +" + +PATCHES=( + "${FILESDIR}"/${PN}-2.1.1-always-install-config.patch +) + +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 + -DWITH_MONGO="$(usex mongo)" + -DWITH_REDIS="$(usex redis)" + ) + + cmake_src_configure +} diff --git a/net-analyzer/zmap/zmap-9999.ebuild b/net-analyzer/zmap/zmap-9999.ebuild index 4d5b862277d5..5d5794b8f52a 100644 --- a/net-analyzer/zmap/zmap-9999.ebuild +++ b/net-analyzer/zmap/zmap-9999.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit cmake fcaps git-r3 @@ -14,23 +14,30 @@ SLOT="0" IUSE="redis" RDEPEND=" - dev-libs/gmp:0 + dev-libs/gmp:= net-libs/libpcap dev-libs/json-c:= - redis? ( dev-libs/hiredis )" -DEPEND="${RDEPEND} + redis? ( dev-libs/hiredis:= ) +" +DEPEND="${RDEPEND}" +BDEPEND=" dev-util/gengetopt - sys-devel/flex + app-alternatives/lex dev-util/byacc " +PATCHES=( + "${FILESDIR}"/${PN}-2.1.1-always-install-config.patch +) + +FILECAPS=( cap_net_raw=ep usr/sbin/zmap ) + src_configure() { local mycmakeargs=( -DENABLE_DEVELOPMENT=OFF -DWITH_WERROR=OFF -DWITH_REDIS="$(usex redis)" - ) + ) + cmake_src_configure } - -FILECAPS=( cap_net_raw=ep usr/sbin/zmap ) diff --git a/net-analyzer/zniper/metadata.xml b/net-analyzer/zniper/metadata.xml index 74c2baebb4ec..dce3f3be66c0 100644 --- a/net-analyzer/zniper/metadata.xml +++ b/net-analyzer/zniper/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>netmon@gentoo.org</email> diff --git a/net-analyzer/zniper/zniper-1.0-r1.ebuild b/net-analyzer/zniper/zniper-1.0-r1.ebuild deleted file mode 100644 index dae03274def1..000000000000 --- a/net-analyzer/zniper/zniper-1.0-r1.ebuild +++ /dev/null @@ -1,45 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit toolchain-funcs - -DESCRIPTION="Displays and kill active TCP connections seen by the selected interface" -HOMEPAGE="http://www.signedness.org/tools/" -SRC_URI="https://dev.gentoo.org/~jer/${P}.tgz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="amd64 x86" - -DEPEND=" - net-libs/libpcap - sys-libs/ncurses -" -RDEPEND=" - ${DEPEND} - virtual/pkgconfig -" - -S=${WORKDIR}/"zniper" - -src_prepare() { - sed -i \ - -e 's| -o | $(LDFLAGS)&|g' \ - -e 's|@make|@$(MAKE)|g' \ - -e 's|-lncurses|$(shell $(PKG_CONFIG) --libs ncurses)|g' \ - Makefile || die - tc-export PKG_CONFIG -} - -src_compile() { - emake \ - CC=$(tc-getCC) \ - CFLAGS="${CFLAGS}" \ - linux_x86 -} - -src_install() { - dobin zniper - doman zniper.1 -} diff --git a/net-analyzer/zniper/zniper-1.0-r3.ebuild b/net-analyzer/zniper/zniper-1.0-r3.ebuild new file mode 100644 index 000000000000..e9aa11ad3172 --- /dev/null +++ b/net-analyzer/zniper/zniper-1.0-r3.ebuild @@ -0,0 +1,44 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit toolchain-funcs + +DESCRIPTION="Displays and kill active TCP connections seen by the selected interface" +HOMEPAGE="http://www.signedness.org/tools/" +SRC_URI="https://dev.gentoo.org/~jsmolic/distfiles/${P}.tgz" +S="${WORKDIR}/zniper" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="amd64 x86" + +RDEPEND=" + net-libs/libpcap + sys-libs/ncurses:= +" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" + +src_prepare() { + default + sed -i \ + -e 's| -o | $(LDFLAGS)&|g' \ + -e 's|@make|@$(MAKE)|g' \ + -e 's|-lncurses|$(shell $(PKG_CONFIG) --libs ncurses)|g' \ + Makefile || die + tc-export PKG_CONFIG +} + +src_compile() { + emake \ + CC="$(tc-getCC)" \ + CFLAGS="${CFLAGS}" \ + linux_x86 +} + +src_install() { + dobin zniper + doman zniper.1 +} |