diff options
Diffstat (limited to 'net-analyzer')
391 files changed, 4686 insertions, 16357 deletions
diff --git a/net-analyzer/2ping/2ping-4.5.1.ebuild b/net-analyzer/2ping/2ping-4.5.1.ebuild index beba48f3681..0e3433304a9 100644 --- a/net-analyzer/2ping/2ping-4.5.1.ebuild +++ b/net-analyzer/2ping/2ping-4.5.1.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="7" -PYTHON_COMPAT=( python3_{7..10} ) +PYTHON_COMPAT=( python3_{9..10} ) inherit distutils-r1 diff --git a/net-analyzer/2ping/metadata.xml b/net-analyzer/2ping/metadata.xml index 620d9c7161d..6a2729c6013 100644 --- a/net-analyzer/2ping/metadata.xml +++ b/net-analyzer/2ping/metadata.xml @@ -1,10 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>blueness@gentoo.org</email> - <name>Anthony G. Basile</name> - </maintainer> + <!-- maintainer-needed --> <use> <flag name="server">Install the server init scripts.</flag> </use> diff --git a/net-analyzer/alive/metadata.xml b/net-analyzer/alive/metadata.xml index dce3f3be66c..69f19320e11 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 "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/angst/Manifest b/net-analyzer/angst/Manifest deleted file mode 100644 index 7b9db686f0f..00000000000 --- 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 42a09344010..00000000000 --- 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 1021faa5b53..00000000000 --- 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 a2bcf1a1869..00000000000 --- 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 16d8b53b6a3..00000000000 --- 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 f3694291725..00000000000 --- a/net-analyzer/angst/metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>netmon@gentoo.org</email> - <name>Gentoo network monitoring and analysis project</name> - </maintainer> - <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 f57c2ae5716..4b130a04d47 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-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -16,7 +16,7 @@ KEYWORDS="~amd64" DEPEND=" sys-devel/flex - virtual/yacc + app-alternatives/yacc " DOCS=( AUTHORS ChangeLog NEWS README TODO ) PATCHES=( diff --git a/net-analyzer/argus-clients/Manifest b/net-analyzer/argus-clients/Manifest index e93bb4e9c8d..bec9030f51d 100644 --- a/net-analyzer/argus-clients/Manifest +++ b/net-analyzer/argus-clients/Manifest @@ -1 +1,2 @@ DIST argus-clients-3.0.8.3.tar.gz 2753929 BLAKE2B 561b945ce5beb8d8d016579921417f405f421fd2afe2369ff0a4c5b8aaed44eca7591b43e64db00396cf963cc550753207c9b0e8d21d6b99d8c1ea0faaddb0e9 SHA512 ce6f6aaa21452f60c72498b5410cdc650eed6eec6d949daf7226e93f22d193db175e8051073cbfd258c127ed7cb445d6673ae38f386982dc19632ac55539960e +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.4.ebuild b/net-analyzer/argus-clients/argus-clients-3.0.8.4.ebuild new file mode 100644 index 00000000000..e3762e93f9b --- /dev/null +++ b/net-analyzer/argus-clients/argus-clients-3.0.8.4.ebuild @@ -0,0 +1,76 @@ +# Copyright 1999-2022 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=" + 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.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/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 00000000000..ac974dbdf39 --- /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 00000000000..b6a322fb691 --- /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 3c7f800f1c8..08109ceb82f 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 "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/argus-3.0.8.3-r1.ebuild b/net-analyzer/argus/argus-3.0.8.3-r2.ebuild index a4176cf571c..e316b6bc37e 100644 --- a/net-analyzer/argus/argus-3.0.8.3-r1.ebuild +++ b/net-analyzer/argus/argus-3.0.8.3-r2.ebuild @@ -1,13 +1,14 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 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" +S="${WORKDIR}"/${P/_rc/.rc.} LICENSE="GPL-3" SLOT="0" @@ -35,8 +36,8 @@ PATCHES=( "${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 ) -S=${WORKDIR}/${P/_rc/.rc.} src_prepare() { find . -type f -execdir chmod +w {} \; #561360 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 00000000000..2e9720c0432 --- /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 dce3f3be66c..3d34f5bdfde 100644 --- a/net-analyzer/argus/metadata.xml +++ b/net-analyzer/argus/metadata.xml @@ -1,8 +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> + <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/arping/arping-2.23.ebuild b/net-analyzer/arping/arping-2.23.ebuild index f143eadf7e1..51a79eee32f 100644 --- a/net-analyzer/arping/arping-2.23.ebuild +++ b/net-analyzer/arping/arping-2.23.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -12,7 +12,7 @@ if [[ ${PV} == 9999 ]] ; then 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" + KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux" S="${WORKDIR}/${PN}-${P}" fi 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 09d3520a5b4..00000000000 --- 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-r4.ebuild index 556c3128dad..1c3be5b08d7 100644 --- a/net-analyzer/authforce/authforce-0.9.9-r3.ebuild +++ b/net-analyzer/authforce/authforce-0.9.9-r4.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -12,7 +12,7 @@ SLOT="0" KEYWORDS="amd64 ~ppc x86" IUSE="curl nls" -RDEPEND="sys-libs/readline:0= +RDEPEND="sys-libs/readline:= curl? ( net-misc/curl )" DEPEND="${RDEPEND}" BDEPEND="nls? ( sys-devel/gettext )" @@ -25,11 +25,14 @@ PATCHES=( "${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 + + gunzip doc/${PN}.1.gz || die + sed -i -e "s/${PN}.1.gz/${PN}.1/g" \ -e "s/\/mang/\/man1/g" doc/Makefile* || die } 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 00000000000..fec77215435 --- /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/bing/Manifest b/net-analyzer/bing/Manifest index 52c4ade6d53..77b3d8d308a 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.3.5.ebuild index 565ed702e87..b3449c8b807 100644 --- a/net-analyzer/bing/bing-1.1.3-r2.ebuild +++ b/net-analyzer/bing/bing-1.3.5.ebuild @@ -1,18 +1,22 @@ -# 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="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" +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 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 00000000000..424a591c154 --- /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/bwping/Manifest b/net-analyzer/bwping/Manifest index f8062264225..e0f5b0fe3da 100644 --- a/net-analyzer/bwping/Manifest +++ b/net-analyzer/bwping/Manifest @@ -1,3 +1 @@ -DIST bwping-2.3.tar.gz 119043 BLAKE2B 2780f22a2cb541821aae3ddf0eaa5f2cb662ec8f190c44f7e28a092f4e07f9b19d1388b9ddaec0133cedef894c6ff64a9e53035fd73e44a8f0aae518c8b9dc7c SHA512 e8afed0d4ff0ae668f1700e3c93e4b6298e4861568d4786630826bf0f3519089602b9562c92b2c3bb97904faea0da6a084fb60cc69bc3a0a931bd0f55af3ee49 -DIST bwping-2.4.tar.gz 112687 BLAKE2B cbf2854ab5cf6e926db4e959e3e228b8dda6d5624898710de6bf0be4f7813ff85e088acba4b72e3f7d02ffec9f6feaf02720e915850e50daca2c7c3c5c775883 SHA512 e57bf644196a31acc845d4864d189595b1bca22b03ce7330581143ca369668f0dbccc23c936d985f334e03f9e5462a4298d714ceb56815a377ce1adec15364e6 DIST bwping-2.5.tar.gz 113076 BLAKE2B c2a01b1d1d9fb83c2f0e40e2b1967d0e1e5a939d912372637558aa84cea0bca08f080cc8d980906d346ca44b39b7f37b54b0d6e18f834928bd59ddd056af43ac SHA512 2c271215476c8f1e0758aaae0e1730c526a326eeb3c7ffac3d8fac5783dbbe84d97fbb6732bfa7199ea8e4caf81a8dc9bd54ee36b63ece46dd2286880c734371 diff --git a/net-analyzer/bwping/bwping-2.3.ebuild b/net-analyzer/bwping/bwping-2.3.ebuild deleted file mode 100644 index 63580768616..00000000000 --- a/net-analyzer/bwping/bwping-2.3.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.4.ebuild b/net-analyzer/bwping/bwping-2.4.ebuild deleted file mode 100644 index 0b6bec7fa5c..00000000000 --- a/net-analyzer/bwping/bwping-2.4.ebuild +++ /dev/null @@ -1,16 +0,0 @@ -# Copyright 1999-2022 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/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/bwping-2.5.ebuild b/net-analyzer/bwping/bwping-2.5.ebuild index 310ecf23d0f..bb17cbaa8b5 100644 --- a/net-analyzer/bwping/bwping-2.5.ebuild +++ b/net-analyzer/bwping/bwping-2.5.ebuild @@ -9,7 +9,7 @@ SRC_URI="https://github.com/oleg-derevenetz/bwping/releases/download/RELEASE_${P LICENSE="BSD" SLOT="0" -KEYWORDS="~amd64 ~sparc ~x86" +KEYWORDS="amd64 ~sparc x86" src_test() { [[ ${UID} = 0 ]] && default diff --git a/net-analyzer/cacti/Manifest b/net-analyzer/cacti/Manifest index 860499480ba..89938bf84fc 100644 --- a/net-analyzer/cacti/Manifest +++ b/net-analyzer/cacti/Manifest @@ -1,4 +1 @@ -DIST cacti-1.2.17.tar.gz 38344112 BLAKE2B e555fc99560d10e94181c38b50e6f839532fb3dc66ff688b36a7efd10c15304e7636c9b4b483763fcea751317bcb283bb2bd8f813d5759c98aed6bbf02fd256a SHA512 94ae75b2494a91c536906c7bbeaa948d16c7ad96ed3a62c1eb21175f92c01787c6849960bbc791e04b3df46edbfd3cd787eb825bb423ce0814c0904edb2c915d -DIST cacti-1.2.19.tar.gz 38477886 BLAKE2B 7d72ecd376c633f1a4e46d3ed69977eb4d342deb900aabcbccbe6213368d67f75909f55c5e1bf21dcd8e422b4504dc1a25a63fe7cf26394d4b43a35db0cedce3 SHA512 076397f4cf048dac6e0c9bb8a4889ba94ca9e40c4d53c2c142ed9e19c7a0dc5c5aa8e2321563b914635a753b59b215926a1a73723fa41d1006473cc34667ad70 -DIST cacti-1.2.20.tar.gz 40715952 BLAKE2B 5cf85d075a69b3242d04df099fa5a48401d5f138bc71d71aa47bc6331b4db5b76a71c6c6a56ad4098efe7a064b7d75cd8998b13317b265afbf4238fe9d0b7f3a SHA512 b708f4431bc27baa839df6b00a4e582577a328e3aff2b55abfba38863de776371f9ba86b58582baf98db73e2b7cf1d68bbaf3a0996fa8fc91c4811fda637050c DIST cacti-1.2.21.tar.gz 40798454 BLAKE2B 86eae6743c07e45b4b06202cca072a385f45d2021159f0f5160a8c2a8eb8f3a2f9db63512515602d1c3eb6be4b53f5755c20d6da2194ff445c133a2bcdb33e27 SHA512 084ff9135dd0a92596a4d65f2fd461c8e84907ff87e467f6d144ee3b52ef7aeb44ffa5a8c25e74e5ff25588bc6c5b13b44ab2f24ef5e1c6652513b5c2a39f78d diff --git a/net-analyzer/cacti/cacti-1.2.17.ebuild b/net-analyzer/cacti/cacti-1.2.17.ebuild deleted file mode 100644 index 6a0752cd418..00000000000 --- a/net-analyzer/cacti/cacti-1.2.17.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.19.ebuild b/net-analyzer/cacti/cacti-1.2.19.ebuild deleted file mode 100644 index 84568ddcd51..00000000000 --- a/net-analyzer/cacti/cacti-1.2.19.ebuild +++ /dev/null @@ -1,49 +0,0 @@ -# Copyright 1999-2022 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.20.ebuild b/net-analyzer/cacti/cacti-1.2.20.ebuild deleted file mode 100644 index 831a6dd6858..00000000000 --- a/net-analyzer/cacti/cacti-1.2.20.ebuild +++ /dev/null @@ -1,49 +0,0 @@ -# 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/carl/Manifest b/net-analyzer/carl/Manifest deleted file mode 100644 index 8a178454b64..00000000000 --- 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-r5.ebuild b/net-analyzer/carl/carl-0.9-r5.ebuild deleted file mode 100644 index a8d33e65770..00000000000 --- a/net-analyzer/carl/carl-0.9-r5.ebuild +++ /dev/null @@ -1,23 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -PYTHON_COMPAT=( python3_{8..9} pypy3 ) -DISTUTILS_USE_SETUPTOOLS=no - -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 e48a5ab0e03..00000000000 --- a/net-analyzer/carl/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> -<maintainer type="project"> - <email>netmon@gentoo.org</email> - <name>Gentoo network monitoring and analysis project</name> -</maintainer> -</pkgmetadata> diff --git a/net-analyzer/chronograf/Manifest b/net-analyzer/chronograf/Manifest index b37ecbcf363..b906fdb9c76 100644 --- a/net-analyzer/chronograf/Manifest +++ b/net-analyzer/chronograf/Manifest @@ -1,431 +1,3 @@ +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 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.8.5.ebuild b/net-analyzer/chronograf/chronograf-1.8.5.ebuild index e1ce27c1a19..75faf808985 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/darkstat/Manifest b/net-analyzer/darkstat/Manifest index 72513312afd..1a0ef22ae56 100644 --- a/net-analyzer/darkstat/Manifest +++ b/net-analyzer/darkstat/Manifest @@ -1,2 +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-r3.ebuild b/net-analyzer/darkstat/darkstat-3.0.719-r3.ebuild deleted file mode 100644 index f14539d204e..00000000000 --- a/net-analyzer/darkstat/darkstat-3.0.719-r3.ebuild +++ /dev/null @@ -1,73 +0,0 @@ -# Copyright 1999-2021 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.719-r4.ebuild b/net-analyzer/darkstat/darkstat-3.0.719-r4.ebuild deleted file mode 100644 index 1f62dd3d13c..00000000000 --- a/net-analyzer/darkstat/darkstat-3.0.719-r4.ebuild +++ /dev/null @@ -1,80 +0,0 @@ -# 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://www.unix4lyfe.org/git/darkstat" - inherit git-r3 -else - SRC_URI="https://unix4lyfe.org/${PN}/${P}.tar.bz2" - 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 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() { - # Workaround bug #141619 - DARKSTAT_CHROOT_DIR=$( - sed -n 's/^#CHROOT=\(.*\)/\1/p' "${EROOT}"/etc/conf.d/darkstat - ) - - 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 "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}/${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 index 3f38088b33e..3e6de7f9ed7 100644 --- a/net-analyzer/darkstat/darkstat-3.0.721-r1.ebuild +++ b/net-analyzer/darkstat/darkstat-3.0.721-r1.ebuild @@ -12,7 +12,7 @@ if [[ ${PV} == *9999* ]] ; then inherit git-r3 else SRC_URI="https://github.com/emikulic/darkstat/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~ppc ~x86" + KEYWORDS="amd64 ppc x86" fi LICENSE="GPL-2" diff --git a/net-analyzer/dhcp_probe/Manifest b/net-analyzer/dhcp_probe/Manifest index d14483774cf..5ed1a3a8246 100644 --- a/net-analyzer/dhcp_probe/Manifest +++ b/net-analyzer/dhcp_probe/Manifest @@ -1,2 +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 3819fc35ca7..00000000000 --- 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 index 4bcdb5ae288..c7d6357a1e1 100644 --- a/net-analyzer/dhcp_probe/dhcp_probe-1.3.1.ebuild +++ b/net-analyzer/dhcp_probe/dhcp_probe-1.3.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -13,19 +13,11 @@ LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~x86" -DEPEND="net-libs/libpcap - >=net-libs/libnet-1.1.2.1-r2" +DEPEND=" + net-libs/libnet + net-libs/libpcap" RDEPEND="${DEPEND}" -DOCS=( - AUTHORS - ChangeLog - NEWS - README - TODO - extras/dhcp_probe.cf.sample -) - PATCHES=( "${FILESDIR}"/${PN}-1.3.1-respect-AR.patch "${FILESDIR}"/${PN}-1.3.1-fix-configure-CPP.patch @@ -50,7 +42,7 @@ src_configure() { src_install() { default - dodoc "${FILESDIR}"/${PN}_mail + 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 2d5599c0622..00000000000 --- 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 d9d3d5aa898..00000000000 --- 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 41af750416b..00000000000 --- 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 dcd79ffc58b..00000000000 --- 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 4151b461bbf..00000000000 --- 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 c27ad646e6c..00000000000 --- 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 c8184144a59..00000000000 --- 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 56f8686eaeb..00000000000 --- 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/egressor/Manifest b/net-analyzer/egressor/Manifest deleted file mode 100644 index 09b734e121f..00000000000 --- 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 6a3ea8056e3..00000000000 --- a/net-analyzer/egressor/egressor-1.0-r2.ebuild +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit 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" -S="${WORKDIR}" - -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 -" -PATCHES=( - "${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 03368b05dba..00000000000 --- 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 be7cb4f15c6..00000000000 --- 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 dce3f3be66c..00000000000 --- a/net-analyzer/egressor/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> -<maintainer type="project"> - <email>netmon@gentoo.org</email> - <name>Gentoo network monitoring and analysis project</name> -</maintainer> -</pkgmetadata> diff --git a/net-analyzer/ettercap/ettercap-0.8.3.1.ebuild b/net-analyzer/ettercap/ettercap-0.8.3.1.ebuild index 05db91778f2..9cda1724861 100644 --- a/net-analyzer/ettercap/ettercap-0.8.3.1.ebuild +++ b/net-analyzer/ettercap/ettercap-0.8.3.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -45,7 +45,7 @@ DEPEND="${RDEPEND} sys-apps/groff ) test? ( dev-libs/check ) sys-devel/flex - virtual/yacc" + app-alternatives/yacc" src_prepare() { sed -i "s:Release:Release Gentoo:" CMakeLists.txt || die diff --git a/net-analyzer/ettercap/ettercap-9999.ebuild b/net-analyzer/ettercap/ettercap-9999.ebuild index 07c3e35f652..b050ccc4f5d 100644 --- a/net-analyzer/ettercap/ettercap-9999.ebuild +++ b/net-analyzer/ettercap/ettercap-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -45,7 +45,7 @@ DEPEND="${RDEPEND} sys-apps/groff ) test? ( dev-libs/check ) sys-devel/flex - virtual/yacc" + app-alternatives/yacc" src_prepare() { sed -i "s:Release:Release Gentoo:" CMakeLists.txt || die diff --git a/net-analyzer/fail2ban/Manifest b/net-analyzer/fail2ban/Manifest index 44e3f95a048..ab84e563946 100644 --- a/net-analyzer/fail2ban/Manifest +++ b/net-analyzer/fail2ban/Manifest @@ -1,2 +1 @@ -DIST fail2ban-0.11.2.tar.gz 559552 BLAKE2B 0c61c1d5f6eb23d585533fbb84e69343cb305df188537a97002489318292c6056447c4c221c9d4d4cde6cca52f0c2fb877b597957f703e4d6707801a646e52b0 SHA512 46b27abd947b00ea64106dbac563ef8afef38eec86684024d47d9a0e8c1969ff864ad6df7f4f8de2aa3eb1af6d769fb6796592d9f0e35521d5f95f17b8cade97 -DIST fail2ban-1.0.1.tar.gz 582122 BLAKE2B 1fe1e5b3d6a1790304c29066b7a8edcb5a6ea11bea6fd8a2bf5f42a4725db1d5bfdd9ed1215a51bfc0eeccafa8a0e93c45940e897ceba7335965126f9b913ab0 SHA512 a4d0ee5405225b1ec950f3209bc304c1168c644d06309a187d77119f6bea12c382db046130a86411aad4210b458a16ee092269dc7953400950969a34550c6da5 +DIST fail2ban-1.0.2.tar.gz 583295 BLAKE2B 84eb5e3487c4db734f4f0a36af142d520e1cc53c2960893ee2f05ff4e78133860be59ed9580fa0d972509a03c17e5d9458b8e3f6b470a4c3154f10911f94691e SHA512 688a84361b5794e1658f53d2d200ce752fe1e3320ddb1742c32c4b4b82a79ace16ae464e7ea3eeb94a0e862bcac73c2d3a0e61dd7b28e179a4c857f950d74dbb diff --git a/net-analyzer/fail2ban/fail2ban-1.0.1.ebuild b/net-analyzer/fail2ban/fail2ban-1.0.2-r1.ebuild index cf108a52442..53863b7983d 100644 --- a/net-analyzer/fail2ban/fail2ban-1.0.1.ebuild +++ b/net-analyzer/fail2ban/fail2ban-1.0.2-r1.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2022 Gentoo Authors +# 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_{8..11} ) +PYTHON_COMPAT=( python3_{9..11} ) inherit bash-completion-r1 distutils-r1 systemd tmpfiles @@ -40,6 +40,7 @@ DOCS=( ChangeLog DEVELOP README.md THANKS TODO doc/run-rootless.txt ) PATCHES=( "${FILESDIR}"/${PN}-0.11.2-adjust-apache-logs-paths.patch + "${FILESDIR}"/${P}-configreader-warning.patch ) python_prepare_all() { diff --git a/net-analyzer/fail2ban/fail2ban-0.11.2-r4.ebuild b/net-analyzer/fail2ban/fail2ban-1.0.2.ebuild index ffabcf3a0b7..4d8875e9a44 100644 --- a/net-analyzer/fail2ban/fail2ban-0.11.2-r4.ebuild +++ b/net-analyzer/fail2ban/fail2ban-1.0.2.ebuild @@ -1,20 +1,21 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -PYTHON_COMPAT=( python3_{8..10} ) DISTUTILS_SINGLE_IMPL=1 +PYTHON_COMPAT=( python3_{9..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/${PN}/${PN}" + EGIT_REPO_URI="https://github.com/fail2ban/fail2ban" inherit git-r3 else - SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + SRC_URI="https://github.com/fail2ban/fail2ban/archive/${PV}.tar.gz -> ${P}.tar.gz" KEYWORDS="~alpha amd64 arm arm64 hppa ppc ppc64 sparc x86" fi @@ -38,12 +39,7 @@ RDEPEND=" DOCS=( ChangeLog DEVELOP README.md THANKS TODO doc/run-rootless.txt ) PATCHES=( - "${FILESDIR}"/${P}-fix-tests-for-2021.patch "${FILESDIR}"/${PN}-0.11.2-adjust-apache-logs-paths.patch - "${FILESDIR}"/${P}-fix-2to3-usage.patch - "${FILESDIR}"/${P}-fix-systemd-test.patch - "${FILESDIR}"/${P}-fix-py3.10-collections.patch - "${FILESDIR}"/${P}-upstream-openrc.patch ) python_prepare_all() { diff --git a/net-analyzer/fail2ban/fail2ban-9999.ebuild b/net-analyzer/fail2ban/fail2ban-9999.ebuild index cf108a52442..779449fafb8 100644 --- a/net-analyzer/fail2ban/fail2ban-9999.ebuild +++ b/net-analyzer/fail2ban/fail2ban-9999.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2022 Gentoo Authors +# 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_{8..11} ) +PYTHON_COMPAT=( python3_{9..11} ) inherit bash-completion-r1 distutils-r1 systemd tmpfiles diff --git a/net-analyzer/fail2ban/files/fail2ban-0.11.2-fix-2to3-usage.patch b/net-analyzer/fail2ban/files/fail2ban-0.11.2-fix-2to3-usage.patch deleted file mode 100644 index 9098d096e8a..00000000000 --- a/net-analyzer/fail2ban/files/fail2ban-0.11.2-fix-2to3-usage.patch +++ /dev/null @@ -1,109 +0,0 @@ -https://github.com/fail2ban/fail2ban/commit/7f22c4873aed3b5ffce0953f079f3c1977297c9a -https://github.com/fail2ban/fail2ban/commit/5ac303df8a171f748330d4c645ccbf1c2c7f3497 -https://github.com/fail2ban/fail2ban/commit/d6b884f3b72b8a42b21da863836569ef6836c2ea -https://github.com/fail2ban/fail2ban/issues/3098 -https://bugs.gentoo.org/818733 - -From: "Sergey G. Brester" <serg.brester@sebres.de> -Date: Sun, 19 Sep 2021 18:36:02 +0200 -Subject: [PATCH] remove 2to3 in setup (should be called outside before setup) - ---- a/setup.py -+++ b/setup.py -@@ -39,14 +39,6 @@ - if setuptools is None: - from distutils.command.install import install - from distutils.command.install_scripts import install_scripts --try: -- # python 3.x -- from distutils.command.build_py import build_py_2to3 -- from distutils.command.build_scripts import build_scripts_2to3 -- _2to3 = True --except ImportError: -- # python 2.x -- _2to3 = False - - import os - from os.path import isfile, join, isdir, realpath - -From: sebres <info@sebres.de> -Date: Sun, 19 Sep 2021 18:49:18 +0200 -Subject: [PATCH] fix gh-3098: build fails with error in fail2ban setup - command: use_2to3 is invalid (setuptools 58+) - ---- a/setup.py -+++ b/setup.py -@@ -48,7 +48,7 @@ - from glob import glob - - from fail2ban.setup import updatePyExec -- -+from fail2ban.version import version - - source_dir = os.path.realpath(os.path.dirname( - # __file__ seems to be overwritten sometimes on some python versions (e.g. bug of 2.6 by running under cProfile, etc.): -@@ -112,22 +112,12 @@ def update_scripts(self, dry_run=False): - # Wrapper to specify fail2ban own options: - class install_command_f2b(install): - user_options = install.user_options + [ -- ('disable-2to3', None, 'Specify to deactivate 2to3, e.g. if the install runs from fail2ban test-cases.'), - ('without-tests', None, 'without tests files installation'), - ] - def initialize_options(self): -- self.disable_2to3 = None - self.without_tests = not with_tests - install.initialize_options(self) - def finalize_options(self): -- global _2to3 -- ## in the test cases 2to3 should be already done (fail2ban-2to3): -- if self.disable_2to3: -- _2to3 = False -- if _2to3: -- cmdclass = self.distribution.cmdclass -- cmdclass['build_py'] = build_py_2to3 -- cmdclass['build_scripts'] = build_scripts_2to3 - if self.without_tests: - self.distribution.scripts.remove('bin/fail2ban-testcases') - -@@ -178,7 +168,6 @@ def run(self): - if setuptools: - setup_extra = { - 'test_suite': "fail2ban.tests.utils.gatherTests", -- 'use_2to3': True, - } - else: - setup_extra = {} -@@ -202,9 +191,6 @@ def run(self): - ('/usr/share/doc/fail2ban', doc_files) - ) - --# Get version number, avoiding importing fail2ban. --# This is due to tests not functioning for python3 as 2to3 takes place later --exec(open(join("fail2ban", "version.py")).read()) - - setup( - name = "fail2ban", -From: sebres <info@sebres.de> -Date: Sun, 19 Sep 2021 18:52:34 +0200 -Subject: [PATCH] amend to fix gh-3098: no option `--disable-2to3` anymore - ---- a/fail2ban/tests/misctestcase.py -+++ b/fail2ban/tests/misctestcase.py -@@ -111,7 +111,7 @@ def testSetupInstallDryRun(self): - supdbgout = ' >/dev/null 2>&1' if unittest.F2B.log_level >= logging.DEBUG else '' # HEAVYDEBUG - try: - # try dry-run: -- os.system("%s %s --dry-run install --disable-2to3 --root=%s%s" -+ os.system("%s %s --dry-run install --root=%s%s" - % (sys.executable, self.setup , tmp, supdbgout)) - # check nothing was created: - self.assertTrue(not os.listdir(tmp)) -@@ -127,7 +127,7 @@ def testSetupInstallRoot(self): - # suppress stdout (and stderr) if not heavydebug - supdbgout = ' >/dev/null' if unittest.F2B.log_level >= logging.DEBUG else '' # HEAVYDEBUG - try: -- self.assertEqual(os.system("%s %s install --disable-2to3 --root=%s%s" -+ self.assertEqual(os.system("%s %s install --root=%s%s" - % (sys.executable, self.setup, tmp, supdbgout)), 0) - - def strippath(l): diff --git a/net-analyzer/fail2ban/files/fail2ban-0.11.2-fix-py3.10-collections.patch b/net-analyzer/fail2ban/files/fail2ban-0.11.2-fix-py3.10-collections.patch deleted file mode 100644 index 6cf4e194b08..00000000000 --- a/net-analyzer/fail2ban/files/fail2ban-0.11.2-fix-py3.10-collections.patch +++ /dev/null @@ -1,33 +0,0 @@ ---- a/fail2ban/server/action.py -+++ b/fail2ban/server/action.py -@@ -30,7 +30,7 @@ import tempfile - import threading - import time - from abc import ABCMeta --from collections import MutableMapping -+from collections.abc import MutableMapping - - from .failregex import mapTag2Opt - from .ipdns import DNSUtils ---- a/fail2ban/server/actions.py -+++ b/fail2ban/server/actions.py -@@ -28,7 +28,7 @@ import logging - import os - import sys - import time --from collections import Mapping -+from collections.abc import Mapping - try: - from collections import OrderedDict - except ImportError: ---- a/fail2ban/server/jails.py -+++ b/fail2ban/server/jails.py -@@ -22,7 +22,7 @@ __copyright__ = "Copyright (c) 2004 Cyril Jaquier, 2013- Yaroslav Halchenko" - __license__ = "GPL" - - from threading import Lock --from collections import Mapping -+from collections.abc import Mapping - - from ..exceptions import DuplicateJailException, UnknownJailException - from .jail import Jail diff --git a/net-analyzer/fail2ban/files/fail2ban-0.11.2-fix-systemd-test.patch b/net-analyzer/fail2ban/files/fail2ban-0.11.2-fix-systemd-test.patch deleted file mode 100644 index 865ce19912b..00000000000 --- a/net-analyzer/fail2ban/files/fail2ban-0.11.2-fix-systemd-test.patch +++ /dev/null @@ -1,22 +0,0 @@ -https://github.com/fail2ban/fail2ban/pull/3037 -https://bugs.gentoo.org/794931 - -From: Mike Gilbert <floppym@gentoo.org> -Date: Tue, 8 Jun 2021 17:48:12 -0400 -Subject: [PATCH] tests: improve detection of readable systemd journal - -Look for system.journal in journal sub-directory. -Add -readable to the find command. - -Bug: https://bugs.gentoo.org/794931 ---- a/fail2ban/tests/filtertestcase.py -+++ b/fail2ban/tests/filtertestcase.py -@@ -1396,7 +1396,7 @@ def _getRuntimeJournal(self): - # check one at at time until the first hit - for systemd_var in 'system-runtime-logs', 'system-state-logs': - tmp = Utils.executeCmd( -- 'find "$(systemd-path %s)" -name system.journal' % systemd_var, -+ 'find "$(systemd-path %s)/journal" -name system.journal -readable' % systemd_var, - timeout=10, shell=True, output=True - ) - self.assertTrue(tmp) diff --git a/net-analyzer/fail2ban/files/fail2ban-0.11.2-fix-tests-for-2021.patch b/net-analyzer/fail2ban/files/fail2ban-0.11.2-fix-tests-for-2021.patch deleted file mode 100644 index 36193b18193..00000000000 --- a/net-analyzer/fail2ban/files/fail2ban-0.11.2-fix-tests-for-2021.patch +++ /dev/null @@ -1,50 +0,0 @@ -https://github.com/fail2ban/fail2ban/issues/2904 - -From 747d4683221b5584f9663695fb48145689b42ceb Mon Sep 17 00:00:00 2001 -From: sebres <info@sebres.de> -Date: Mon, 4 Jan 2021 02:42:38 +0100 -Subject: [PATCH] fixes century selector of %ExY and %Exy in datepattern for - tests, considering interval from 2005 (alternate now) to now; + better - grouping algorithm for resulting century RE - ---- - fail2ban/server/strptime.py | 24 ++++++++++++++++++++++-- - 1 file changed, 22 insertions(+), 2 deletions(-) - -diff --git a/fail2ban/server/strptime.py b/fail2ban/server/strptime.py -index 1464a96d1f..39fc795865 100644 ---- a/fail2ban/server/strptime.py -+++ b/fail2ban/server/strptime.py -@@ -36,10 +36,30 @@ def _getYearCentRE(cent=(0,3), distance=3, now=(MyTime.now(), MyTime.alternateNo - Thereby respect possible run in the test-cases (alternate date used there) - """ - cent = lambda year, f=cent[0], t=cent[1]: str(year)[f:t] -+ def grp(exprset): -+ c = None -+ if len(exprset) > 1: -+ for i in exprset: -+ if c is None or i[0:-1] == c: -+ c = i[0:-1] -+ else: -+ c = None -+ break -+ if not c: -+ for i in exprset: -+ if c is None or i[0] == c: -+ c = i[0] -+ else: -+ c = None -+ break -+ if c: -+ return "%s%s" % (c, grp([i[len(c):] for i in exprset])) -+ return ("(?:%s)" % "|".join(exprset) if len(exprset[0]) > 1 else "[%s]" % "".join(exprset)) \ -+ if len(exprset) > 1 else "".join(exprset) - exprset = set( cent(now[0].year + i) for i in (-1, distance) ) - if len(now) and now[1]: -- exprset |= set( cent(now[1].year + i) for i in (-1, distance) ) -- return "(?:%s)" % "|".join(exprset) if len(exprset) > 1 else "".join(exprset) -+ exprset |= set( cent(now[1].year + i) for i in xrange(-1, now[0].year-now[1].year+1, distance) ) -+ return grp(sorted(list(exprset))) - - timeRE = TimeRE() - diff --git a/net-analyzer/fail2ban/files/fail2ban-0.11.2-upstream-openrc.patch b/net-analyzer/fail2ban/files/fail2ban-0.11.2-upstream-openrc.patch deleted file mode 100644 index bbe655124d3..00000000000 --- a/net-analyzer/fail2ban/files/fail2ban-0.11.2-upstream-openrc.patch +++ /dev/null @@ -1,247 +0,0 @@ -https://github.com/fail2ban/fail2ban/pull/2182 - -diff --git a/MANIFEST b/MANIFEST -index 48c751a0..c2df1e51 100644 ---- a/MANIFEST -+++ b/MANIFEST -@@ -393,8 +393,8 @@ files/fail2ban.service.in - files/fail2ban-tmpfiles.conf - files/fail2ban.upstart - files/gen_badbots --files/gentoo-confd --files/gentoo-initd -+files/fail2ban-openrc.conf -+files/fail2ban-openrc.init.in - files/ipmasq-ZZZzzz_fail2ban.rul - files/logwatch/fail2ban - files/logwatch/fail2ban-0.8.log -diff --git a/files/fail2ban-openrc.conf b/files/fail2ban-openrc.conf -new file mode 100644 -index 00000000..9454ef68 ---- /dev/null -+++ b/files/fail2ban-openrc.conf -@@ -0,0 +1,2 @@ -+# For available options, please run "fail2ban-server --help". -+#FAIL2BAN_OPTIONS="-x" -diff --git a/files/fail2ban-openrc.init.in b/files/fail2ban-openrc.init.in -new file mode 100755 -index 00000000..2c56ee3a ---- /dev/null -+++ b/files/fail2ban-openrc.init.in -@@ -0,0 +1,86 @@ -+#!/sbin/openrc-run -+# This file is part of Fail2Ban. -+# -+# Fail2Ban 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 2 of the License, or -+# (at your option) any later version. -+# -+# Fail2Ban 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 Fail2Ban; if not, write to the Free Software -+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -+# -+# Author: Sireyessire, Cyril Jaquier -+# -+ -+description="Ban hosts that cause multiple authentication errors" -+description_reload="reload configuration without dropping bans" -+extra_started_commands="reload" -+ -+# Can't (and shouldn't) be changed by the end-user. -+# -+# Note that @BINDIR@ is already supplied by the build system. Some -+# day, it might be nice to have @RUNDIR@ supplied by the build system -+# as well, so that we don't have to hard-code /run here. -+FAIL2BAN_RUNDIR="/run/${RC_SVCNAME}" -+FAIL2BAN_SOCKET="${FAIL2BAN_RUNDIR}/${RC_SVCNAME}.sock" -+ -+# The fail2ban-client program is also capable of starting and stopping -+# the server, but things are simpler if we let start-stop-daemon do it. -+command="@BINDIR@/fail2ban-server" -+pidfile="${FAIL2BAN_RUNDIR}/${RC_SVCNAME}.pid" -+ -+# We force the pidfile/socket location in this service script because -+# we're taking responsibility for ensuring that their parent directory -+# exists and has the correct permissions (which we can't do if the -+# user is allowed to change them). -+command_args="${FAIL2BAN_OPTIONS} -p ${pidfile} -s ${FAIL2BAN_SOCKET}" -+retry="30" -+ -+depend() { -+ use logger -+ after iptables -+} -+ -+checkconfig() { -+ "${command}" ${command_args} --test -+} -+ -+start_pre() { -+ # If this isn't a restart, make sure that the user's config isn't -+ # busted before we try to start the daemon (this will produce -+ # better error messages than if we just try to start it blindly). -+ # -+ # If, on the other hand, this *is* a restart, then the stop_pre -+ # action will have ensured that the config is usable and we don't -+ # need to do that again. -+ if [ "${RC_CMD}" != "restart" ] ; then -+ checkconfig || return $? -+ fi -+ checkpath -d "${FAIL2BAN_RUNDIR}" -+} -+ -+stop_pre() { -+ # If this is a restart, check to make sure the user's config -+ # isn't busted before we stop the running daemon. -+ if [ "${RC_CMD}" = "restart" ] ; then -+ checkconfig || return $? -+ fi -+} -+ -+reload() { -+ # The fail2ban-client uses an undocumented protocol to tell -+ # the server to reload(), so we have to use it here rather -+ # than e.g. sending a signal to the server daemon. Note that -+ # the reload will fail (on the server side) if the new config -+ # is invalid; we therefore don't need to test it ourselves -+ # with checkconfig() before initiating the reload. -+ ebegin "Reloading ${RC_SVCNAME}" -+ "@BINDIR@/fail2ban-client" ${command_args} reload -+ eend $? "Failed to reload ${RC_SVCNAME}" -+} -diff --git a/files/gentoo-confd b/files/gentoo-confd -deleted file mode 100644 -index 00d19f8b..00000000 ---- a/files/gentoo-confd -+++ /dev/null -@@ -1,8 +0,0 @@ --# Config file for /etc/init.d/fail2ban --# --# For information on options, see "/usr/bin/fail2ban-client -h". -- --FAIL2BAN_OPTIONS="" -- --# Force execution of the server even if the socket already exists: --#FAIL2BAN_OPTIONS="-x" -diff --git a/files/gentoo-initd b/files/gentoo-initd -deleted file mode 100755 -index 0fb157cd..00000000 ---- a/files/gentoo-initd -+++ /dev/null -@@ -1,60 +0,0 @@ --#!/sbin/openrc-run --# This file is part of Fail2Ban. --# --# Fail2Ban 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 2 of the License, or --# (at your option) any later version. --# --# Fail2Ban 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 Fail2Ban; if not, write to the Free Software --# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. --# --# Author: Sireyessire, Cyril Jaquier --# -- --description="Daemon to ban hosts that cause multiple authentication errors" --description_reload="reload configuration" --description_showlog="show fail2ban logs" --extra_started_commands="reload showlog" -- --FAIL2BAN="/usr/bin/fail2ban-client ${FAIL2BAN_OPTIONS}" -- --depend() { -- need net -- need logger -- after iptables --} -- --start() { -- ebegin "Starting fail2ban" -- mkdir -p /var/run/fail2ban || return 1 -- # remove stalled sock file after system crash -- # bug 347477 -- rm -f /var/run/fail2ban/fail2ban.sock || return 1 -- start-stop-daemon --start --pidfile /var/run/fail2ban/fail2ban.pid \ -- -- ${FAIL2BAN} start -- eend $? "Failed to start fail2ban" --} -- --stop() { -- ebegin "Stopping fail2ban" -- start-stop-daemon --stop --pidfile /var/run/fail2ban/fail2ban.pid --retry 30 \ -- -- ${FAIL2BAN} stop -- eend $? "Failed to stop fail2ban" --} -- --reload() { -- ebegin "Reloading fail2ban" -- ${FAIL2BAN} reload -- eend $? "Failed to reload fail2ban" --} -- --showlog(){ -- less /var/log/fail2ban.log --} -diff --git a/setup.py b/setup.py -index 98413273..91f71cf2 100755 ---- a/setup.py -+++ b/setup.py -@@ -89,24 +89,27 @@ class install_scripts_f2b(install_scripts): - if install_dir.startswith(root): - install_dir = install_dir[len(root):] - except: # pragma: no cover -- print('WARNING: Cannot find root-base option, check the bin-path to fail2ban-scripts in "fail2ban.service".') -- print('Creating %s/fail2ban.service (from fail2ban.service.in): @BINDIR@ -> %s' % (buildroot, install_dir)) -- with open(os.path.join(source_dir, 'files/fail2ban.service.in'), 'r') as fn: -- lines = fn.readlines() -- fn = None -- if not dry_run: -- fn = open(os.path.join(buildroot, 'fail2ban.service'), 'w') -- try: -- for ln in lines: -- ln = re.sub(r'@BINDIR@', lambda v: install_dir, ln) -- if dry_run: -- sys.stdout.write(' | ' + ln) -- continue -- fn.write(ln) -- finally: -- if fn: fn.close() -- if dry_run: -- print(' `') -+ print('WARNING: Cannot find root-base option, check the bin-path to fail2ban-scripts in "fail2ban.service" and "fail2ban-openrc.init".') -+ -+ scripts = ['fail2ban.service', 'fail2ban-openrc.init'] -+ for script in scripts: -+ print('Creating %s/%s (from %s.in): @BINDIR@ -> %s' % (buildroot, script, script, install_dir)) -+ with open(os.path.join(source_dir, 'files/%s.in' % script), 'r') as fn: -+ lines = fn.readlines() -+ fn = None -+ if not dry_run: -+ fn = open(os.path.join(buildroot, script), 'w') -+ try: -+ for ln in lines: -+ ln = re.sub(r'@BINDIR@', lambda v: install_dir, ln) -+ if dry_run: -+ sys.stdout.write(' | ' + ln) -+ continue -+ fn.write(ln) -+ finally: -+ if fn: fn.close() -+ if dry_run: -+ print(' `') - - - # Wrapper to specify fail2ban own options: 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 00000000000..748e507e4a2 --- /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/flent/Manifest b/net-analyzer/flent/Manifest deleted file mode 100644 index 9b8f56346cb..00000000000 --- 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 265d9cefe20..00000000000 --- 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_{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 60c810ab37e..00000000000 --- a/net-analyzer/flent/metadata.xml +++ /dev/null @@ -1,14 +0,0 @@ -<?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> - <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/fping/Manifest b/net-analyzer/fping/Manifest index 196c468ebd2..5d58b6f9d31 100644 --- a/net-analyzer/fping/Manifest +++ b/net-analyzer/fping/Manifest @@ -1,2 +1 @@ -DIST fping-5.0.tar.gz 185281 BLAKE2B 6dbb6708ecb55c1f1281bcd9e298475a1ad3a21aa81d8488b61cb39ad07d1d7285247a3c39883cbaae0b1a0e4403b6340ea7ec43411b81546f0e8eeefb02ef88 SHA512 c843f7bb7c4e3289c4dd9eb8ae2ab93a363316c0000aac9187f79580a3d2505df179f2e0ae9e0a791c74bfc9e17c476874f8e122dfa6ad74930498c4e02d0de3 DIST fping-5.1.tar.gz 191224 BLAKE2B 2fb344e650b5a359fb8780f2c599455d39405ae823edf695ee4385aa2661dc5811e088bafa1b9f53846ee90c0afa959a92832381a03346d1fda048eb4e7ee098 SHA512 1a208da8dcd99093d0512af5d85ba5e7b5743ec97993d24c1fe612bb58d93090ac1ba0952f648aa075f16d390a77c4be65e394ae56dbede2a6914e0e8c68e2bd 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 63138d3e2d2..00000000000 --- 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/fping-5.0.ebuild b/net-analyzer/fping/fping-5.0.ebuild deleted file mode 100644 index 36614ec7655..00000000000 --- a/net-analyzer/fping/fping-5.0.ebuild +++ /dev/null @@ -1,35 +0,0 @@ -# Copyright 1999-2022 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 ~riscv 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.ebuild b/net-analyzer/fping/fping-5.1.ebuild index 07d43604bf0..5ff5eaf654b 100644 --- a/net-analyzer/fping/fping-5.1.ebuild +++ b/net-analyzer/fping/fping-5.1.ebuild @@ -11,7 +11,7 @@ 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" +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 ) diff --git a/net-analyzer/fping/metadata.xml b/net-analyzer/fping/metadata.xml index 25ff5caf849..162af0fb9ea 100644 --- a/net-analyzer/fping/metadata.xml +++ b/net-analyzer/fping/metadata.xml @@ -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/fragroute/fragroute-1.2.6-r4.ebuild b/net-analyzer/fragroute/fragroute-1.2.6-r4.ebuild index 664c3d346e8..4dabe888f8a 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/gnome-nettool/gnome-nettool-42.0.ebuild b/net-analyzer/gnome-nettool/gnome-nettool-42.0.ebuild index cd1094cb845..43103575b16 100644 --- a/net-analyzer/gnome-nettool/gnome-nettool-42.0.ebuild +++ b/net-analyzer/gnome-nettool/gnome-nettool-42.0.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python3_{8..10} ) +PYTHON_COMPAT=( python3_{9..11} ) inherit gnome.org gnome2-utils meson python-any-r1 xdg DESCRIPTION="Graphical front-ends to various networking command-line" diff --git a/net-analyzer/gnome-nettool/metadata.xml b/net-analyzer/gnome-nettool/metadata.xml index 7b343b06be8..fc638e18fbe 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 "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/gr-fosphor/Manifest b/net-analyzer/gr-fosphor/Manifest index 10e1e37143d..d483f1e5b1d 100644 --- a/net-analyzer/gr-fosphor/Manifest +++ b/net-analyzer/gr-fosphor/Manifest @@ -1,2 +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/gr-fosphor-0.0_p20200131-r1.ebuild b/net-analyzer/gr-fosphor/gr-fosphor-0.0_p20200131-r1.ebuild deleted file mode 100644 index a95757d28db..00000000000 --- a/net-analyzer/gr-fosphor/gr-fosphor-0.0_p20200131-r1.ebuild +++ /dev/null @@ -1,59 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{8..10} ) - -inherit 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="defdd4aca6cd157ccc3b10ea16b5b4f552f34b96" - 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.8*:0=[qt5,${PYTHON_SINGLE_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="dev-lang/swig:0" - -PATCHES=( "${FILESDIR}"/${P}-htmldir.patch ) - -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 -} diff --git a/net-analyzer/gr-fosphor/gr-fosphor-0.0_p20210108.ebuild b/net-analyzer/gr-fosphor/gr-fosphor-0.0_p20210108.ebuild index 0ec8b0bdf89..cb6a2c1eacc 100644 --- a/net-analyzer/gr-fosphor/gr-fosphor-0.0_p20210108.ebuild +++ b/net-analyzer/gr-fosphor/gr-fosphor-0.0_p20210108.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python3_{8..10} ) +PYTHON_COMPAT=( python3_{9..10} ) inherit cmake python-single-r1 diff --git a/net-analyzer/gr-fosphor/gr-fosphor-9999.ebuild b/net-analyzer/gr-fosphor/gr-fosphor-9999.ebuild index efd198c13e9..40d07fd7b4f 100644 --- a/net-analyzer/gr-fosphor/gr-fosphor-9999.ebuild +++ b/net-analyzer/gr-fosphor/gr-fosphor-9999.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python3_{8..10} ) +PYTHON_COMPAT=( python3_{9..10} ) inherit cmake python-single-r1 @@ -14,7 +14,7 @@ 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" @@ -29,7 +29,8 @@ 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 @@ -41,7 +42,22 @@ RDEPEND=" dev-qt/qtwidgets:5 )" DEPEND="${RDEPEND}" -BDEPEND="dev-lang/swig:0" +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_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 @@ -55,3 +71,9 @@ 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 e2304ffe68e..2b496fa3b1f 100644 --- a/net-analyzer/gr-fosphor/metadata.xml +++ b/net-analyzer/gr-fosphor/metadata.xml @@ -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/graphite-web-1.1.10.ebuild b/net-analyzer/graphite-web/graphite-web-1.1.10.ebuild index ca42298c3bf..fac6c20abff 100644 --- a/net-analyzer/graphite-web/graphite-web-1.1.10.ebuild +++ b/net-analyzer/graphite-web/graphite-web-1.1.10.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( python3_{7..10} ) +PYTHON_COMPAT=( python3_{9..10} ) DISTUTILS_USE_SETUPTOOLS=no # export USE_SETUPTOOLS to activate inherit distutils-r1 prefix diff --git a/net-analyzer/graphite-web/graphite-web-1.1.8-r3.ebuild b/net-analyzer/graphite-web/graphite-web-1.1.8-r3.ebuild index ba068f3f4c1..ecd178a9d3d 100644 --- a/net-analyzer/graphite-web/graphite-web-1.1.8-r3.ebuild +++ b/net-analyzer/graphite-web/graphite-web-1.1.8-r3.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( python3_{7..9} ) +PYTHON_COMPAT=( python3_9 ) DISTUTILS_USE_SETUPTOOLS=no # export USE_SETUPTOOLS to activate inherit distutils-r1 prefix diff --git a/net-analyzer/gvm-tools/gvm-tools-21.10.0-r1.ebuild b/net-analyzer/gvm-tools/gvm-tools-21.10.0-r1.ebuild index 33c7d664715..ab454bfd915 100644 --- a/net-analyzer/gvm-tools/gvm-tools-21.10.0-r1.ebuild +++ b/net-analyzer/gvm-tools/gvm-tools-21.10.0-r1.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python3_{8..10} ) +PYTHON_COMPAT=( python3_{9..10} ) DISTUTILS_USE_PEP517=poetry inherit distutils-r1 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 fbe91199bbf..9d22337afa9 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.6-r1.ebuild b/net-analyzer/hexinject/hexinject-1.6-r2.ebuild index e36c1803461..bfef01f88b8 100644 --- a/net-analyzer/hexinject/hexinject-1.6-r1.ebuild +++ b/net-analyzer/hexinject/hexinject-1.6-r2.ebuild @@ -1,13 +1,14 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="6" +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" @@ -18,13 +19,9 @@ 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 } diff --git a/net-analyzer/hydra/Manifest b/net-analyzer/hydra/Manifest index 62f2f9a362a..64c4c34ffc8 100644 --- a/net-analyzer/hydra/Manifest +++ b/net-analyzer/hydra/Manifest @@ -1,4 +1 @@ -DIST hydra-9.1.tar.gz 611846 BLAKE2B 9a5b6dc52b5f4069bf326e86728ebaf8c1fe018536f3943b83493de934703bff6770ae3f7a9a223ee00b5f52f7bd10ee4ddc272e1bbad00c399aa19cc0c083ba SHA512 863176375fe1aae4c0a2b74c11aba297682d66e522c98c926c539348309b0af4e407e460b4cb803d2c83c008787c73f7f1e56ac6aca9791351e1b596c2e4fbb2 -DIST hydra-9.2.tar.gz 614176 BLAKE2B 102c744fbdd3702c624b1c8339178883b689db093d9f1c66d8e04816327eb8095f3e3133f889b2a6ee6dcabb9e5af0c71ec8470731b4b174021fbd79741d05e7 SHA512 ee8ecd854b61ac9d708098c8a0d9a128d8b80b38db1a2ba8eb06de6fbbc6865135d994620ade8e3742fb993899274ed9d8fd0e95bed7a9fbeb1ca9e182540322 -DIST hydra-9.3.tar.gz 829856 BLAKE2B 5ae1ab77f64d2bc17bd8389acf8a47201d84455a82f5ae28ab740594571a13ab145f5981efdfb09ddab3d6cc443e171e4664bff08c1a6b2f08169dea4f87ba54 SHA512 06d2ed61492c76d16ff3b2fbbde3938f79d6038c979a2af949f9b4d116a1506943e0a3a246da4d1bc8848cf440097e6175962e3fdf3e7644dd36ad7c2f6b2ce4 DIST hydra-9.4.tar.gz 833465 BLAKE2B 2ba7f7e4a70c4f6c9dc4ec94d652ab7534cb0fb17b88412dfcf1e651d9f31af573ab9acd2d9cb698da6462f4744f53dfb8f87a437c32bebfa4f9a04f2f9136c0 SHA512 de5a1e73673fdc2f193cfb1aeec337c9d8faad52b06524850f352a797a4a5ef08cba8fc51da96fed1db01d141127e58c2aa874027f51c40a94a474de778d5241 diff --git a/net-analyzer/hydra/files/hydra-9.2-respect-cflags-more.patch b/net-analyzer/hydra/files/hydra-9.2-respect-cflags-more.patch deleted file mode 100644 index 8d158640803..00000000000 --- a/net-analyzer/hydra/files/hydra-9.2-respect-cflags-more.patch +++ /dev/null @@ -1,26 +0,0 @@ -Don't inject hardening CFLAGS. We already have these by default in Gentoo. ---- a/configure -+++ b/configure -@@ -1376,22 +1376,6 @@ if [ -n "$CRYPTO_PATH" ]; then - echo " ... RSA_generate_key()$RSA found" - 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" --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 --test -x $TMPC && GCCSEC="yes" --grep -q fPI $TMPC.c.err || GCCSECOPT="-pie -fPIE $GCCSECOPT" --rm -f "$TMPC" --$CC $GCCSECOPT -Wl,-z,now -Wl,-z,relro -o $TMPC $TMPC.c > /dev/null 2> $TMPC.c.err --test -x $TMPC && { LDSEC="yes" ; GCCSECOPT="$GCCSECOPT -Wl,-z,now -Wl,-z,relro" ; } --rm -f $TMPC $TMPC.c $TMPC.c.err --echo " Compiling... $GCCSEC" --echo " Linking... $LDSEC" -- - echo - XDEFINES="" - XLIBS="" diff --git a/net-analyzer/hydra/files/hydra-9.3-pcre2.patch b/net-analyzer/hydra/files/hydra-9.3-pcre2.patch deleted file mode 100644 index bb12936254b..00000000000 --- a/net-analyzer/hydra/files/hydra-9.3-pcre2.patch +++ /dev/null @@ -1,113 +0,0 @@ -https://github.com/vanhauser-thc/thc-hydra/commit/c82e5d51c5595374e6b7801bfc84c26a497d8989.patch -https://bugs.gentoo.org/838031 - -From c82e5d51c5595374e6b7801bfc84c26a497d8989 Mon Sep 17 00:00:00 2001 -From: vanhauser-thc <vh@thc.org> -Date: Tue, 1 Mar 2022 14:56:05 +0100 -Subject: [PATCH] switch to pcre2 - ---- a/configure -+++ b/configure -@@ -380,21 +380,21 @@ if [ "X" = "X$CURSES_PATH" -o "X" = "X$CURSES_IPATH" ]; then - CURSES_IPATH="" - fi - --echo "Checking for pcre (libpcre/pcre.h) ..." -+echo "Checking for pcre2 (libpcre/pcre.h) ..." - for i in $LIBDIRS ; do - if [ "X" = "X$PCRE_PATH" ]; then -- if [ -f "$i/libpcre.so" -o -f "$i/libpcre.dylib" -o -f "$i/libpcre.a" ]; then -+ if [ -f "$i/libpcre2-8.so" -o -f "$i/libpcre2-8.dylib" -o -f "$i/libpcre2-8.a" ]; then - PCRE_PATH="$i" - fi - fi - if [ "X" = "X$PCRE_PATH" ]; then -- TMP_LIB=`/bin/ls $i/libpcre.so* 2> /dev/null | grep libpcre.` -+ TMP_LIB=`/bin/ls $i/libpcre2*.so* 2> /dev/null | grep libpcre.` - if [ -n "$TMP_LIB" ]; then - PCRE_PATH="$i" - fi - fi - if [ "X" = "X$PCRE_PATH" ]; then -- TMP_LIB=`/bin/ls $i/libpcre.dll* 2> /dev/null | grep libpcre.` -+ TMP_LIB=`/bin/ls $i/libpcre2*.dll* 2> /dev/null | grep libpcre.` - if [ -n "$TMP_LIB" ]; then - PCRE_PATH="$i" - fi -@@ -402,20 +402,20 @@ for i in $LIBDIRS ; do - done - for i in $INCDIRS ; do - if [ "X" != "X$PCRE_PATH" ]; then -- if [ -f "$i/pcre.h" ]; then -+ if [ -f "$i/pcre2.h" ]; then - PCRE_IPATH="$i" - fi - fi - done - if [ "X" != "X$DEBUG" ]; then - echo DEBUG: PCRE_PATH=$PCRE_PATH/libpcre -- echo DEBUG: PCRE_IPATH=$PCRE_IPATH/pcre.h -+ echo DEBUG: PCRE_IPATH=$PCRE_IPATH/pcre2.h - fi - if [ -n "$PCRE_PATH" -a -n "$PCRE_IPATH" ]; then -- echo " ... found" -+ echo " ... found" - fi - if [ "X" = "X$PCRE_PATH" -o "X" = "X$PCRE_IPATH" ]; then -- echo " ... NOT found, server response checks will be less reliable" -+ echo " ... NOT found, server response checks will be less reliable" - PCRE_PATH="" - PCRE_IPATH="" - fi -@@ -1649,7 +1649,7 @@ if [ -n "$IDN_PATH" ]; then - XLIBS="$XLIBS -lidn" - fi - if [ -n "$PCRE_PATH" ]; then -- XLIBS="$XLIBS -lpcre" -+ XLIBS="$XLIBS -lpcre2-8" - fi - if [ -n "$MYSQL_PATH" ]; then - XLIBS="$XLIBS -lmysqlclient" ---- a/hydra-mod.c -+++ b/hydra-mod.c -@@ -7,7 +7,8 @@ - #include <openssl/ssl.h> - #endif - #ifdef HAVE_PCRE --#include <pcre.h> -+#define PCRE2_CODE_UNIT_WIDTH 8 -+#include <pcre2.h> - #endif - - #define MAX_CONNECT_RETRY 1 -@@ -1291,19 +1292,23 @@ void hydra_set_srcport(int32_t port) { src_port = port; } - - #ifdef HAVE_PCRE - int32_t hydra_string_match(char *str, const char *regex) { -- pcre *re = NULL; -- int32_t offset_error = 0; -- const char *error = NULL; -+ pcre2_code *re = NULL; -+ int32_t error_code = 0; -+ PCRE2_SIZE error_offset; - int32_t rc = 0; - -- re = pcre_compile(regex, PCRE_CASELESS | PCRE_DOTALL, &error, &offset_error, NULL); -+ re = pcre2_compile(regex, PCRE2_ZERO_TERMINATED, PCRE2_CASELESS | PCRE2_DOTALL, &error_code, &error_offset, NULL); - if (re == NULL) { -- fprintf(stderr, "[ERROR] PCRE compilation failed at offset %d: %s\n", offset_error, error); -+ fprintf(stderr, "[ERROR] PCRE compilation failed at offset %d: %d\n", error_offset, error_code); - return 0; - } - -- rc = pcre_exec(re, NULL, str, strlen(str), 0, 0, NULL, 0); -- if (rc >= 0) { -+ pcre2_match_data *match_data = pcre2_match_data_create_from_pattern(re, NULL); -+ rc = pcre2_match(re, str, PCRE2_ZERO_TERMINATED, 0, 0, match_data, NULL); -+ pcre2_match_data_free(match_data); -+ pcre2_code_free(re); -+ -+ if (rc >= 1) { - return 1; - } - return 0; diff --git a/net-analyzer/hydra/hydra-9.1-r1.ebuild b/net-analyzer/hydra/hydra-9.1-r1.ebuild deleted file mode 100644 index 4998a4103fe..00000000000 --- a/net-analyzer/hydra/hydra-9.1-r1.ebuild +++ /dev/null @@ -1,122 +0,0 @@ -# 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="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 memcached mongodb mysql 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= ) - dev-libs/openssl:0= - memcached? ( dev-libs/libmemcached[sasl] ) - mongodb? ( dev-libs/mongo-c-driver ) - mysql? ( dev-db/mysql-connector-c:0= ) - ncurses? ( sys-libs/ncurses:= ) - oracle? ( dev-db/oracle-instantclient[sdk] ) - pcre? ( dev-libs/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 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.2-r1.ebuild b/net-analyzer/hydra/hydra-9.2-r1.ebuild deleted file mode 100644 index f5072411a36..00000000000 --- a/net-analyzer/hydra/hydra-9.2-r1.ebuild +++ /dev/null @@ -1,123 +0,0 @@ -# Copyright 1999-2022 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" -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 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= ) - dev-libs/openssl:0= - memcached? ( dev-libs/libmemcached[sasl] ) - mongodb? ( dev-libs/mongo-c-driver ) - mysql? ( dev-db/mysql-connector-c:0= ) - ncurses? ( sys-libs/ncurses:= ) - oracle? ( dev-db/oracle-instantclient[sdk] ) - pcre? ( dev-libs/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}" -BDEPEND="virtual/pkgconfig" - -PATCHES=( - "${FILESDIR}"/${PN}-9.2-respect-cflags-more.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 -} - -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 '-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.3-r1.ebuild b/net-analyzer/hydra/hydra-9.3-r1.ebuild deleted file mode 100644 index 5ce501996e2..00000000000 --- a/net-analyzer/hydra/hydra-9.3-r1.ebuild +++ /dev/null @@ -1,127 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit toolchain-funcs - -DESCRIPTION="Parallelized network login hacker" -HOMEPAGE="https://github.com/vanhauser-thc/thc-hydra" -SRC_URI="https://github.com/vanhauser-thc/thc-hydra/archive/v${PV}.tar.gz -> ${P}.tar.gz" -S="${WORKDIR}/thc-${P}" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" -IUSE="debug firebird gcrypt gtk idn memcached mongodb mysql ncurses oracle pcre postgres rdp libssh samba subversion zlib" - -RDEPEND=" - dev-libs/openssl:= - gtk? ( - dev-libs/atk - dev-libs/glib:2 - x11-libs/gdk-pixbuf:2 - x11-libs/gtk+:2 - ) - firebird? ( dev-db/firebird ) - gcrypt? ( dev-libs/libgcrypt ) - idn? ( net-dns/libidn:0= ) - memcached? ( dev-libs/libmemcached[sasl] ) - mongodb? ( dev-libs/mongo-c-driver ) - mysql? ( dev-db/mysql-connector-c:0= ) - ncurses? ( sys-libs/ncurses:= ) - oracle? ( dev-db/oracle-instantclient[sdk] ) - pcre? ( dev-libs/libpcre2 ) - postgres? ( dev-db/postgresql:* ) - rdp? ( net-misc/freerdp ) - libssh? ( >=net-libs/libssh-0.4.0 ) - samba? ( net-fs/samba ) - subversion? ( dev-vcs/subversion ) - zlib? ( sys-libs/zlib )" -DEPEND="${RDEPEND}" -BDEPEND="virtual/pkgconfig" - -PATCHES=( - "${FILESDIR}"/${P}-pcre2.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' - - 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.4.ebuild b/net-analyzer/hydra/hydra-9.4.ebuild index 156d8dd3593..2eb786561e3 100644 --- a/net-analyzer/hydra/hydra-9.4.ebuild +++ b/net-analyzer/hydra/hydra-9.4.ebuild @@ -12,7 +12,7 @@ S="${WORKDIR}"/thc-${P} LICENSE="GPL-3" SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" +KEYWORDS="amd64 ~ppc x86" IUSE="debug firebird gcrypt gtk idn memcached mongodb mysql ncurses oracle pcre postgres rdp libssh samba subversion zlib" RDEPEND=" diff --git a/net-analyzer/icinga2/Manifest b/net-analyzer/icinga2/Manifest index e61495e8539..77b6640673a 100644 --- a/net-analyzer/icinga2/Manifest +++ b/net-analyzer/icinga2/Manifest @@ -1,2 +1 @@ -DIST icinga2-2.13.4.tar.gz 9662432 BLAKE2B fdae71d081a646b2f70d768b43c56602221d585997a1fca96d2f6c30c27eb6344a443a1d12981c94542fdb77443b40be3c4ec87796a82bfcab1b53fe6b46e0ec SHA512 454eb03587c66de2697d0d604fab37ae4ce243653357cd3295998ab9b58287acefc27876e06e530b8bd6bb4d96c1289a1f05ef25f0b19573123a0cf1d99b5cfb -DIST icinga2-2.13.5.tar.gz 9663739 BLAKE2B 9ce884cfd66eb6ab9a6977c8e751465bbec30605c0b62302850e2533ea5b3bfa003074807ad21a4338d37c41fac59454eb65edbca7ab7c4897ecd74a4d41ff1f SHA512 7ac8970292795b8675a8fdc25ee0a68c6fe506d7413fe9c3c61e90ca159bdf01af43343de2217cbb4b5e446139c97e8b115b4dcd10b8ef68e884a07b80669f5d +DIST icinga2-2.13.6.tar.gz 9666870 BLAKE2B 50fd463ddb5d5d01ae96cb8457f2c4044c126c308f3d142bb6eb5ac95cf1f5704cd911236acd71ed7b77a596c07e65a96bbebce028bd666126324447d4f91aad SHA512 5fcf480c305487c7988d6cacfcb64c768c0f0e749704247c3d0ded746284ff5485e0a3d25c82fba1305414d47067a9eb80f84de594267ddf050a0b913825cd71 diff --git a/net-analyzer/icinga2/files/icinga2-2.13.6-boost-1.81.patch b/net-analyzer/icinga2/files/icinga2-2.13.6-boost-1.81.patch new file mode 100644 index 00000000000..426dc5a1daa --- /dev/null +++ b/net-analyzer/icinga2/files/icinga2-2.13.6-boost-1.81.patch @@ -0,0 +1,93 @@ +https://bugs.gentoo.org/888063 +https://github.com/Icinga/icinga2/issues/9618 +https://github.com/Icinga/icinga2/pull/9624 + +From 5bcbc96e221bb3aafc370449941bfbd70939915c Mon Sep 17 00:00:00 2001 +From: "Alexander A. Klimov" <alexander.klimov@icinga.com> +Date: Wed, 4 Jan 2023 17:02:19 +0100 +Subject: [PATCH 1/2] Handle boost::beast::http::basic_fields#set() signature + change (v1.81) + +Make String convertible to boost::beast::string_view (always working), +not boost::string_view (broken). +--- a/lib/base/string.cpp ++++ b/lib/base/string.cpp +@@ -128,15 +128,15 @@ String::operator const std::string&() const + } + + /** +- * Conversion function to boost::string_view. ++ * Conversion function to boost::beast::string_view. + * + * This allows using String as the value for HTTP headers in boost::beast::http::basic_fields::set. + * +- * @return A boost::string_view representing this string. ++ * @return A boost::beast::string_view representing this string. + */ +-String::operator boost::string_view() const ++String::operator boost::beast::string_view() const + { +- return boost::string_view(m_Data); ++ return boost::beast::string_view(m_Data); + } + + const char *String::CStr() const +--- a/lib/base/string.hpp ++++ b/lib/base/string.hpp +@@ -5,6 +5,7 @@ + + #include "base/i2-base.hpp" + #include "base/object.hpp" ++#include <boost/beast/core.hpp> + #include <boost/range/iterator.hpp> + #include <boost/utility/string_view.hpp> + #include <functional> +@@ -73,7 +74,7 @@ class String + bool operator<(const String& rhs) const; + + operator const std::string&() const; +- operator boost::string_view() const; ++ operator boost::beast::string_view() const; + + const char *CStr() const; + + +From 99c2d69dc85dfcd044e4a83d4894aa52eedfe09d Mon Sep 17 00:00:00 2001 +From: "Alexander A. Klimov" <alexander.klimov@icinga.com> +Date: Wed, 4 Jan 2023 17:34:49 +0100 +Subject: [PATCH 2/2] Handle boost::beast::http::basic_fields#operator[]() + signature change (v1.81) + +Use always working std::string(x), not broken x.to_string(). +(x is a return value.) +--- a/lib/remote/httphandler.cpp ++++ b/lib/remote/httphandler.cpp +@@ -58,7 +58,7 @@ void HttpHandler::ProcessRequest( + Dictionary::Ptr node = m_UrlTree; + std::vector<HttpHandler::Ptr> handlers; + +- Url::Ptr url = new Url(request.target().to_string()); ++ Url::Ptr url = new Url(std::string(request.target())); + auto& path (url->GetPath()); + + for (std::vector<String>::size_type i = 0; i <= path.size(); i++) { +--- a/lib/remote/httpserverconnection.cpp ++++ b/lib/remote/httpserverconnection.cpp +@@ -246,7 +246,7 @@ bool HandleAccessControl( + if (!allowedOrigins.empty()) { + auto& origin (request[http::field::origin]); + +- if (allowedOrigins.find(origin.to_string()) != allowedOrigins.end()) { ++ if (allowedOrigins.find(std::string(origin)) != allowedOrigins.end()) { + response.set(http::field::access_control_allow_origin, origin); + } + +@@ -536,7 +536,7 @@ void HttpServerConnection::ProcessMessages(boost::asio::yield_context yc) + if (!authenticatedUser) { + CpuBoundWork fetchingAuthenticatedUser (yc); + +- authenticatedUser = ApiUser::GetByAuthHeader(request[http::field::authorization].to_string()); ++ authenticatedUser = ApiUser::GetByAuthHeader(std::string(request[http::field::authorization])); + } + + Log logMsg (LogInformation, "HttpServerConnection"); diff --git a/net-analyzer/icinga2/icinga2-2.13.5.ebuild b/net-analyzer/icinga2/icinga2-2.13.5.ebuild deleted file mode 100644 index b95acf553b6..00000000000 --- a/net-analyzer/icinga2/icinga2-2.13.5.ebuild +++ /dev/null @@ -1,145 +0,0 @@ -# Copyright 1999-2022 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 lto 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=" - 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 ) )" - -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 -R icinga:icinga /etc/icinga2 - fperms 0750 /etc/icinga2 - fowners icinga:icinga /var/lib/icinga2 - fowners -R icinga:icingacmd /var/lib/icinga2/api - fowners -R icinga:icingacmd /var/lib/icinga2/certificate-requests - fowners -R icinga:icingacmd /var/lib/icinga2/certs - fowners icinga:icinga /var/spool/icinga2 - fowners icinga:icinga /var/spool/icinga2/perfdata - fowners icinga:icingacmd /var/log/icinga2 - - fperms ug+rwX,o-rwx /etc/icinga2 - fperms ug+rwX,o-rwx /var/lib/icinga2 - fperms ug+rwX,o-rwx /var/spool/icinga2 - fperms ug+rwX,o-rwx /var/log/icinga2 - - if use vim-syntax; then - insinto /usr/share/vim/vimfiles - doins -r "${WORKDIR}"/${P}/tools/syntax/vim/ftdetect - doins -r "${WORKDIR}"/${P}/tools/syntax/vim/syntax - fi - - if use nano-syntax; then - insinto /usr/share/nano - doins "${WORKDIR}"/${P}/tools/syntax/nano/icinga2.nanorc - fi -} - -pkg_postinst() { - if [[ "${PV}" != 9999 ]]; then - local v - for v in ${REPLACING_VERSIONS}; do - if ver_test "${PV}" -gt "${v}"; then - elog "DB IDO schema upgrade may be required." - elog "https://www.icinga.com/docs/icinga2/latest/doc/16-upgrading-icinga-2/" - fi - done - fi -} diff --git a/net-analyzer/icinga2/icinga2-2.13.4.ebuild b/net-analyzer/icinga2/icinga2-2.13.6-r1.ebuild index b95acf553b6..6eb6102ef4c 100644 --- a/net-analyzer/icinga2/icinga2-2.13.4.ebuild +++ b/net-analyzer/icinga2/icinga2-2.13.6-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -46,6 +46,10 @@ RDEPEND=" REQUIRED_USE="!minimal? ( || ( mariadb mysql postgres ) )" +PATCHES=( + "${FILESDIR}"/${P}-boost-1.81.patch +) + src_configure() { local mycmakeargs=( -DICINGA2_UNITY_BUILD=$(usex jumbo-build) diff --git a/net-analyzer/ifmetric/ifmetric-0.3-r2.ebuild b/net-analyzer/ifmetric/ifmetric-0.3-r3.ebuild index f5e962992ff..df13f75e594 100644 --- a/net-analyzer/ifmetric/ifmetric-0.3-r2.ebuild +++ b/net-analyzer/ifmetric/ifmetric-0.3-r3.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 DESCRIPTION="Set metrics of all IPv4 routes attached to a given network interface at once" HOMEPAGE="http://0pointer.de/lennart/projects/ifmetric/" @@ -13,15 +13,11 @@ KEYWORDS="~amd64 ~ppc x86" DEPEND="sys-kernel/linux-headers" -DOCS=( - README - doc/README.html -) - PATCHES=( "${FILESDIR}"/${P}-ul.patch "${FILESDIR}"/${P}-replybuf.patch ) +HTML_DOCS=( doc/README.html ) src_configure() { # man page and HTML are already generated diff --git a/net-analyzer/iftop/files/ax_pthread.m4 b/net-analyzer/iftop/files/ax_pthread.m4 deleted file mode 100644 index 6d400ed4e8e..00000000000 --- 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/iftop-1.0_pre4-r4.ebuild b/net-analyzer/iftop/iftop-1.0_pre4-r4.ebuild deleted file mode 100644 index 859e1521f63..00000000000 --- a/net-analyzer/iftop/iftop-1.0_pre4-r4.ebuild +++ /dev/null @@ -1,46 +0,0 @@ -# Copyright 1999-2022 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/ https://code.blinkace.com/pdw/iftop" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 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 index 306eb156f61..62a25552b56 100644 --- a/net-analyzer/iftop/iftop-1.0_pre4-r5.ebuild +++ b/net-analyzer/iftop/iftop-1.0_pre4-r5.ebuild @@ -12,7 +12,7 @@ S="${WORKDIR}"/${P/_/} LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" RDEPEND=" net-libs/libpcap diff --git a/net-analyzer/ike-scan/Manifest b/net-analyzer/ike-scan/Manifest index adfb9c5d927..992eb7171b8 100644 --- a/net-analyzer/ike-scan/Manifest +++ b/net-analyzer/ike-scan/Manifest @@ -1,2 +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-openssl-libdir.patch b/net-analyzer/ike-scan/files/ike-scan-1.9.5-openssl-libdir.patch new file mode 100644 index 00000000000..0ee12dc2f90 --- /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 aa8522dc3d6..00000000000 --- a/net-analyzer/ike-scan/ike-scan-1.9.4.ebuild +++ /dev/null @@ -1,43 +0,0 @@ -# Copyright 1999-2021 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="ssl" - -DEPEND=" - ssl? ( - dev-libs/openssl: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 index acfffd464bb..da10ef3cd21 100644 --- a/net-analyzer/ike-scan/ike-scan-1.9.5.ebuild +++ b/net-analyzer/ike-scan/ike-scan-1.9.5.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://github.com/royhills/ike-scan/archive/${PV}.tar.gz -> ${P}.tar.g LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" +KEYWORDS="~amd64 ~ppc x86" IUSE="ssl" DEPEND="ssl? ( dev-libs/openssl:= )" @@ -19,6 +19,7 @@ RDEPEND="${DEPEND}" PATCHES=( "${FILESDIR}"/${PN}-1.9.5-clang-16.patch + "${FILESDIR}"/${PN}-1.9.5-openssl-libdir.patch ) src_prepare() { @@ -33,7 +34,8 @@ src_prepare() { } src_configure() { - econf $(use_with ssl openssl) + econf \ + $(use_with ssl openssl "${ESYSROOT}"/usr) } src_install() { diff --git a/net-analyzer/ike-scan/metadata.xml b/net-analyzer/ike-scan/metadata.xml index d5af4bcfaf1..7d61f5907a0 100644 --- a/net-analyzer/ike-scan/metadata.xml +++ b/net-analyzer/ike-scan/metadata.xml @@ -5,4 +5,7 @@ <email>netmon@gentoo.org</email> <name>Gentoo network monitoring and analysis project</name> </maintainer> + <upstream> + <remote-id type="github">royhills/ike-scan</remote-id> + </upstream> </pkgmetadata> diff --git a/net-analyzer/ipaudit/Manifest b/net-analyzer/ipaudit/Manifest index 1d5b03465bf..403c37514f3 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 fce596bdb7e..00000000000 --- a/net-analyzer/ipaudit/ipaudit-1.0_beta2-r1.ebuild +++ /dev/null @@ -1,23 +0,0 @@ -# Copyright 1999-2022 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 00000000000..dc1733d1694 --- /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/ippl/ippl-1.4.14-r6.ebuild b/net-analyzer/ippl/ippl-1.4.14-r6.ebuild index 1cddf3d999f..6b7cda25bbc 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-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -14,7 +14,7 @@ SLOT="0" KEYWORDS="amd64 ~ppc x86" BDEPEND=" - virtual/yacc + app-alternatives/yacc sys-devel/flex" RDEPEND="acct-user/ippl" 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 00000000000..15ed9ff0960 --- /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 a47abfc9e1a..9906ae64ea9 100644 --- a/net-analyzer/labrea/labrea-2.5_p1.ebuild +++ b/net-analyzer/labrea/labrea-2.5_p1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -26,6 +26,7 @@ PATCHES=( "${FILESDIR}"/${P/_p/-stable-}-incdir.patch "${FILESDIR}"/${P/_p*}-pcap_open.patch "${FILESDIR}"/${PN}-2.5-libdir.patch + "${FILESDIR}"/${P}-clang16.patch ) src_prepare() { diff --git a/net-analyzer/linkchecker/linkchecker-10.0.1.ebuild b/net-analyzer/linkchecker/linkchecker-10.0.1.ebuild index a8763abda74..b1cc402ab43 100644 --- a/net-analyzer/linkchecker/linkchecker-10.0.1.ebuild +++ b/net-analyzer/linkchecker/linkchecker-10.0.1.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( python3_{7..9} ) +PYTHON_COMPAT=( python3_9 ) PYTHON_REQ_USE="sqlite?" inherit bash-completion-r1 distutils-r1 optfeature diff --git a/net-analyzer/linkchecker/linkchecker-10.1.0.ebuild b/net-analyzer/linkchecker/linkchecker-10.1.0.ebuild index 6cc868a4f61..228488bd17f 100644 --- a/net-analyzer/linkchecker/linkchecker-10.1.0.ebuild +++ b/net-analyzer/linkchecker/linkchecker-10.1.0.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python3_{7..10} ) +PYTHON_COMPAT=( python3_{9..10} ) PYTHON_REQ_USE="sqlite?" inherit bash-completion-r1 distutils-r1 optfeature diff --git a/net-analyzer/linkchecker/linkchecker-9999.ebuild b/net-analyzer/linkchecker/linkchecker-9999.ebuild index 2664028efa3..c473050a791 100644 --- a/net-analyzer/linkchecker/linkchecker-9999.ebuild +++ b/net-analyzer/linkchecker/linkchecker-9999.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python3_{7..10} ) +PYTHON_COMPAT=( python3_{9..10} ) PYTHON_REQ_USE="sqlite?" inherit bash-completion-r1 distutils-r1 optfeature diff --git a/net-analyzer/macchanger/macchanger-1.7.0_p5_p4.ebuild b/net-analyzer/macchanger/macchanger-1.7.0_p5_p4-r2.ebuild index ed18fd45624..5ec79a35f5a 100644 --- a/net-analyzer/macchanger/macchanger-1.7.0_p5_p4.ebuild +++ b/net-analyzer/macchanger/macchanger-1.7.0_p5_p4-r2.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +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 @@ -14,6 +14,7 @@ SRC_URI=" 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 @@ -38,7 +39,11 @@ src_install() { newdoc "${WORKDIR}"/debian/changelog debian.changelog - dodir /usr/bin - dosym ../../sbin/macchanger /usr/bin/macchanger + # 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/monitoring-plugins/Manifest b/net-analyzer/monitoring-plugins/Manifest index 5d730fce575..e19b4b8e6a6 100644 --- a/net-analyzer/monitoring-plugins/Manifest +++ b/net-analyzer/monitoring-plugins/Manifest @@ -1 +1,2 @@ DIST monitoring-plugins-2.3.1.tar.gz 2529669 BLAKE2B 8dbbab78c1e57e249024fe57439acb41960585f2cccba20d03ca75a04b87e84752665f49cfe545c6a409d29094077dac0485aef872586f853e2f0f2187bf5070 SHA512 0ae76bc776997ed23d142ad9a688edc4df9b8ec0f9539b446e4fb4849a165cc88e97cbfb3a7a9a450de452e021d38f2e4ada7e8a22d78cf58e17e266472d01d7 +DIST monitoring-plugins-2.3.2.tar.gz 2766966 BLAKE2B 1a9c35e8df22d5666005b4b79f5a7ee878c0d4be1e98039f341b198a658747010e8c9d1c0a1818d67a402e5c302ec5eb5073628d52c29caf41dbc2ce57c18f6c SHA512 d155f09ddd99f4e0d065627d3bf8768e13ae3f58ed25912f33b070cd24d6f3f43243616ec3e2d496dec633feee6b1f14950035a928034a1413f725814e850765 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 b7406bc9af8..00000000000 --- 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/metadata.xml b/net-analyzer/monitoring-plugins/metadata.xml index 68181ed33f2..37237fb7544 100644 --- a/net-analyzer/monitoring-plugins/metadata.xml +++ b/net-analyzer/monitoring-plugins/metadata.xml @@ -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.3.1-r3.ebuild b/net-analyzer/monitoring-plugins/monitoring-plugins-2.3.1-r4.ebuild index 70689ddedd5..bee2b77ec73 100644 --- a/net-analyzer/monitoring-plugins/monitoring-plugins-2.3.1-r3.ebuild +++ b/net-analyzer/monitoring-plugins/monitoring-plugins-2.3.1-r4.ebuild @@ -76,11 +76,12 @@ src_configure() { 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" ) + # 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="/bin/ping -6 -n -U -w %d -c %d %s" ) + myconf+=( --with-ping6-command="$(command -v ping) -6 -n -U -w %d -c %d %s" ) fi econf \ diff --git a/net-analyzer/monitoring-plugins/monitoring-plugins-2.3.1-r2.ebuild b/net-analyzer/monitoring-plugins/monitoring-plugins-2.3.2-r1.ebuild index 98c4b159221..ee3f8666e96 100644 --- a/net-analyzer/monitoring-plugins/monitoring-plugins-2.3.1-r2.ebuild +++ b/net-analyzer/monitoring-plugins/monitoring-plugins-2.3.2-r1.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI="8" inherit flag-o-matic @@ -57,8 +57,6 @@ RDEPEND="${DEPEND} # At least one test is interactive. RESTRICT="test" -PATCHES=( "${FILESDIR}/define-own-mysql-port-constant.patch" ) - src_configure() { append-flags -fno-strict-aliasing @@ -74,11 +72,12 @@ src_configure() { 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" ) + # 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="/bin/ping -6 -n -U -w %d -c %d %s" ) + myconf+=( --with-ping6-command="$(command -v ping) -6 -n -U -w %d -c %d %s" ) fi econf \ diff --git a/net-analyzer/mrtg/Manifest b/net-analyzer/mrtg/Manifest index ee8725bdc3d..6a206f51905 100644 --- a/net-analyzer/mrtg/Manifest +++ b/net-analyzer/mrtg/Manifest @@ -1,2 +1 @@ DIST mrtg-2.17.10.tar.gz 1084792 BLAKE2B a2e69c651a1428514fbe1f4d04cbddde9c7ed3b865d57f204814ec797dabd414c16b03d34bd19a005257938dd9bd2de0e99f641222f240c907fa5f67429710f1 SHA512 b1c5232f1b3dcec39adc4fb5a423738f9470ad470e91c6a918cf3f875e71af263d8e03694c3d66129b2653fa498d8d9d9b95349fe90e9d2e0b3ed6c09d06e080 -DIST mrtg-2.17.8.tar.gz 1102598 BLAKE2B d5d513de641087f6daa207f154bbcca0196ccc8cba79a03ad6916c9c0065980745be3746953063127fc017d57e235ff67252531380fc9f68c9e5c3332d5230ce SHA512 c1dbeb5ce065b2b071d18e1eec1100d56eb7c4c654562de530139acee27ad57614354b74e3d0777cb6d4470a58ed6acae0f1af9c6f7115bf329132a68b6e0aaa diff --git a/net-analyzer/mrtg/mrtg-2.17.10.ebuild b/net-analyzer/mrtg/mrtg-2.17.10.ebuild index a29090ce930..3884adeb380 100644 --- a/net-analyzer/mrtg/mrtg-2.17.10.ebuild +++ b/net-analyzer/mrtg/mrtg-2.17.10.ebuild @@ -9,7 +9,7 @@ SRC_URI="https://oss.oetiker.ch/mrtg/pub/${P}.tar.gz https://github.com/oetiker/ LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86" +KEYWORDS="~alpha amd64 ~arm ~hppa ppc ppc64 sparc x86" IUSE="selinux" DEPEND="dev-lang/perl diff --git a/net-analyzer/mrtg/mrtg-2.17.8.ebuild b/net-analyzer/mrtg/mrtg-2.17.8.ebuild deleted file mode 100644 index 83edb448022..00000000000 --- a/net-analyzer/mrtg/mrtg-2.17.8.ebuild +++ /dev/null @@ -1,49 +0,0 @@ -# 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" - -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/munin/Manifest b/net-analyzer/munin/Manifest index a9b904ac9c6..f4701d18726 100644 --- a/net-analyzer/munin/Manifest +++ b/net-analyzer/munin/Manifest @@ -2,3 +2,4 @@ DIST munin-2.0.67-gentoo-1.tar.xz 3980 BLAKE2B 5aae9c29befa761f797d362c90d810051 DIST munin-2.0.67.tar.gz 2258670 BLAKE2B 374b336403433d612b7998c77e6eb4f0eb68ffda4204ae6bc3c303f7667154c2ce606ffa27226c5644f3e6f71655c939b749da925136f59be4762891af49e2b1 SHA512 a8381491dfa15572438d9acda7a09feb0c3918ebe49e7bcfce5c172b36b4a5a0472bd6d06f5fad41270af0510b3fe115509d146f372df7fa47ed4aa1ec5f95d4 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-remove-Date-Manip-DM5.patch 3587 BLAKE2B fab1fb61607e83aac5cbd699c93015d77ca6e58d9734a5a6bc17af6c3c7695ddf4257104cd69db4d3b3e1d36bb1d66a1893ddb51bfc52d0a1dd2efb3ba32a9c0 SHA512 976d7a50de6437a26fa77917368ab604c1987f686030e097c200fe9ebebd08e5fae10c04640cadbfecef90eda76ba123cf303d2d671cefa78b09752d1f6757af diff --git a/net-analyzer/munin/munin-2.0.67-r7.ebuild b/net-analyzer/munin/munin-2.0.67-r7.ebuild index 08d21fe6d7b..6368339dd6f 100644 --- a/net-analyzer/munin/munin-2.0.67-r7.ebuild +++ b/net-analyzer/munin/munin-2.0.67-r7.ebuild @@ -97,7 +97,7 @@ DEPEND="${DEPEND_COM} dev-perl/IO-Socket-INET6 )" RDEPEND="${DEPEND_COM} - virtual/awk + app-alternatives/awk ipmi? ( >=sys-libs/freeipmi-1.1.6-r1 ) java? ( >=virtual/jre-1.8:* 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 00000000000..a2e3e857ae2 --- /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.69.ebuild b/net-analyzer/munin/munin-2.0.69.ebuild index 4808bb940fc..769dec8a5ea 100644 --- a/net-analyzer/munin/munin-2.0.69.ebuild +++ b/net-analyzer/munin/munin-2.0.69.ebuild @@ -97,7 +97,7 @@ DEPEND="${DEPEND_COM} dev-perl/IO-Socket-INET6 )" RDEPEND="${DEPEND_COM} - virtual/awk + app-alternatives/awk ipmi? ( >=sys-libs/freeipmi-1.1.6-r1 ) java? ( >=virtual/jre-1.8:* diff --git a/net-analyzer/nagios-check_multiple/nagios-check_multiple-0.0.1-r1.ebuild b/net-analyzer/nagios-check_multiple/nagios-check_multiple-0.0.1-r1.ebuild index 3918f3822ea..009545a959b 100644 --- a/net-analyzer/nagios-check_multiple/nagios-check_multiple-0.0.1-r1.ebuild +++ b/net-analyzer/nagios-check_multiple/nagios-check_multiple-0.0.1-r1.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( python{3_8,3_9,3_10} ) +PYTHON_COMPAT=( python{3_9,3_10} ) DISTUTILS_USE_SETUPTOOLS=no inherit distutils-r1 diff --git a/net-analyzer/nagios-core/Manifest b/net-analyzer/nagios-core/Manifest index 1e1a39a1a09..55ab91ada6a 100644 --- a/net-analyzer/nagios-core/Manifest +++ b/net-analyzer/nagios-core/Manifest @@ -1,2 +1,4 @@ DIST nagios-4.4.7.tar.gz 11340759 BLAKE2B 4316e6cfc7f576d0fe5ba075aba2931dc850c97fe84b124eceeefaa6c01563c0639c8cecf751e086d5a6f9c0a1079f7e9bd013f961956d7d59536dea4516cf86 SHA512 92adc74e687bcbbd742075c8c7222d42c90795a4eb7582e3f1f492349db8200c61f390bf3c4cab4b023c5c111353a43f5dd687b0ee5ab6a8775444e06d42517b +DIST nagios-4.4.8.tar.gz 11339420 BLAKE2B 785705824a5a47d5f20ac0f3d756d51d6362e230514e486e1dc1fa10488a9f7ca724cc96635f2965aac1bb9dc76dee3cf2ab4e2c1be77b239540b87d1a139a21 SHA512 56448628e54b9467d14978b039fc7b37f48be624757a1bd9fe16810101f3ce4a5d740e1c9c367d2b3a8bc408a56bdf295955d8b73d5d74ee92f4750b908e88a7 +DIST nagios-4.4.9.tar.gz 11339450 BLAKE2B 9f99c889ebd070130cbb8bfdbb91b6b0e340a66134b2f2f20d98df08319f713db5a51a9070199e4f842876e06b52b4b0cb65dd2c40fb26508a184db3a36a5650 SHA512 59279cd35f329394481e4b3d3f5c3e2418125adeef98f0a8551c2ccf62720459e54c18f8a914be72fb5c2300ab7a69e115f262bfe3aedcf7226380621b32cd8c DIST nagios-core-gentoo-icons-20141125.tar 40960 BLAKE2B 31c1953e1160c7c7b89606b72b1a80407e4c1b7a7938b40bd1c577cd0c309dd88ca6b775d692a9b846dbf67736537fa9c91e56aa15fdd447769608ca525bff09 SHA512 bf109879cddd6136b76baba55d0b60b2596e37431dcf5ce0905d34a9fa292ebf7e4bde82d9a084362c486e8fac344c76d88f9298b1b85541ed70ffd608493766 diff --git a/net-analyzer/nagios-core/files/nagios-core-4.4.7-upgrade-sslfix.patch b/net-analyzer/nagios-core/files/nagios-core-4.4.7-upgrade-sslfix.patch deleted file mode 100644 index c89f096caaa..00000000000 --- a/net-analyzer/nagios-core/files/nagios-core-4.4.7-upgrade-sslfix.patch +++ /dev/null @@ -1,120 +0,0 @@ -From 5fd2e1541a873e87f689de601beb3bc35910740d Mon Sep 17 00:00:00 2001 -From: Doug Nazar <nazard@nazar.ca> -Date: Wed, 22 Jun 2022 15:07:03 -0400 -Subject: [PATCH 1/2] Fix SSL handling during upgrade check - -Only update counters if we've received data, not on error (-1) since -we can then overwrite the stack, causing fault. - -my_ssl_connect() can return before initializing ssl & ctx. Ensure NULL -initialization so *_free() are no-ops. - -Cleanly shutdown the channel after receiving all data. - -Use the client version of the TLS method to match the other options. ---- - base/netutils.c | 22 ++++++++++++---------- - base/utils.c | 4 ++-- - 2 files changed, 14 insertions(+), 12 deletions(-) - -diff --git a/base/netutils.c b/base/netutils.c -index 08ee40dd7..689b56f9b 100644 ---- a/base/netutils.c -+++ b/base/netutils.c -@@ -154,7 +154,7 @@ int my_ssl_connect(const char *host_name, int port, int *sd, SSL **ssl, SSL_CTX - - #if OPENSSL_VERSION_NUMBER >= 0x10100000 - -- method = TLS_method(); -+ method = TLS_client_method(); - - #else /* OPENSSL_VERSION_NUMBER >= 0x10100000 */ - -@@ -268,11 +268,11 @@ int my_ssl_sendall(int s, SSL *ssl, const char *buf, int *len, int timeout) { - /* If we hit one of these two errors, we just want to select() the socket again */ - break; - } -+ } else { -+ total_sent += n; -+ bytes_left -= n; - } - -- total_sent += n; -- bytes_left -= n; -- - /* make sure we haven't overrun the timeout */ - time(¤t_time); - if(current_time - start_time > timeout) { -@@ -337,17 +337,19 @@ int my_ssl_recvall(int s, SSL *ssl, char *buf, int *len, int timeout) { - n = SSL_read(ssl, buf + total_received, bytes_left); - if(n <= 0) { - int error = SSL_get_error(ssl, n); -+ /* If we hit one of these two errors, we just want to select() the socket again */ - if (error != SSL_ERROR_WANT_READ && error != SSL_ERROR_WANT_WRITE) { -- /* An actual error happened */ -- /* If we hit one of these two errors, we just want to select() the socket again */ -+ /* EOF or an actual error happened */ -+ if (error == SSL_ERROR_ZERO_RETURN) -+ SSL_shutdown(ssl); - break; - } -+ } else { -+ /* apply bytes we received */ -+ total_received += n; -+ bytes_left -= n; - } - -- /* apply bytes we received */ -- total_received += n; -- bytes_left -= n; -- - /* make sure we haven't overrun the timeout */ - time(¤t_time); - if(current_time - start_time > timeout) { -diff --git a/base/utils.c b/base/utils.c -index 79c6efba6..e83f7176a 100644 ---- a/base/utils.c -+++ b/base/utils.c -@@ -3379,8 +3379,8 @@ int query_update_api(void) { - } - - #ifdef HAVE_SSL -- SSL *ssl; -- SSL_CTX *ctx; -+ SSL *ssl = NULL; -+ SSL_CTX *ctx = NULL; - - int result = my_ssl_connect(api_server, 443, &sd, &ssl, &ctx, 2); - if(sd > 0 && result != ERROR) { - -From a2c1415f14db6bbce9ba3d1d5a0c8218dd8c4fb8 Mon Sep 17 00:00:00 2001 -From: Doug Nazar <nazard@nazar.ca> -Date: Wed, 22 Jun 2022 15:14:34 -0400 -Subject: [PATCH 2/2] Silence warning about port_str not large enough for port. - ---- - base/netutils.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/base/netutils.c b/base/netutils.c -index 689b56f9b..1fb1ec6a9 100644 ---- a/base/netutils.c -+++ b/base/netutils.c -@@ -46,7 +46,7 @@ int my_ssl_connect(const char *host_name, int port, int *sd, SSL **ssl, SSL_CTX - hints.ai_socktype = SOCK_STREAM; - - /* make sure our static port_str is long enough */ -- if(port > 65535) -+ if(port < 0 || port > 65535) - return ERROR; - - snprintf(port_str, sizeof(port_str), "%d", port); -@@ -385,7 +385,7 @@ int my_tcp_connect(const char *host_name, int port, int *sd, int timeout) { - hints.ai_socktype = SOCK_STREAM; - - /* make sure our static port_str is long enough */ -- if(port > 65535) -+ if(port < 0 || port > 65535) - return ERROR; - - snprintf(port_str, sizeof(port_str), "%d", port); diff --git a/net-analyzer/nagios-core/nagios-core-4.4.7-r1.ebuild b/net-analyzer/nagios-core/nagios-core-4.4.8.ebuild index 86ae6181458..e0583cea138 100644 --- a/net-analyzer/nagios-core/nagios-core-4.4.7-r1.ebuild +++ b/net-analyzer/nagios-core/nagios-core-4.4.8.ebuild @@ -90,8 +90,6 @@ RDEPEND="${CONFIGURE_DEPEND} S="${WORKDIR}/${MY_P}" -PATCHES=( "${FILESDIR}/${P}-upgrade-sslfix.patch" ) - src_configure() { local myconf diff --git a/net-analyzer/nagios-core/nagios-core-4.4.9.ebuild b/net-analyzer/nagios-core/nagios-core-4.4.9.ebuild new file mode 100644 index 00000000000..e0583cea138 --- /dev/null +++ b/net-analyzer/nagios-core/nagios-core-4.4.9.ebuild @@ -0,0 +1,266 @@ +# Copyright 1999-2022 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-icinga-openvpn/nagios-icinga-openvpn-0.0.1-r2.ebuild b/net-analyzer/nagios-icinga-openvpn/nagios-icinga-openvpn-0.0.1-r2.ebuild index eb19ebd9067..d16004eadc1 100644 --- a/net-analyzer/nagios-icinga-openvpn/nagios-icinga-openvpn-0.0.1-r2.ebuild +++ b/net-analyzer/nagios-icinga-openvpn/nagios-icinga-openvpn-0.0.1-r2.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( python3_8 python3_9 python3_10 ) +PYTHON_COMPAT=( python3_9 python3_10 ) DISTUTILS_USE_SETUPTOOLS=no inherit distutils-r1 diff --git a/net-analyzer/nagios-plugins-linux-madrisan/Manifest b/net-analyzer/nagios-plugins-linux-madrisan/Manifest index 985aed02d71..68974a286f8 100644 --- a/net-analyzer/nagios-plugins-linux-madrisan/Manifest +++ b/net-analyzer/nagios-plugins-linux-madrisan/Manifest @@ -1,2 +1,2 @@ -DIST nagios-plugins-linux-madrisan-29.tar.xz 392700 BLAKE2B edc93bfb113cb12ce8a345e38627881decb952cb1e7a948dcdced2aaa9c940956b75a7c8f7ad1b72daac132236ab27762b6f8b14a5098eaac648bafae6dfdb33 SHA512 412464b894fe2a0953e495c7c87604ed6b282f65fd1988043757b162ba4fecf9e8f9740e7e09ec2dad8ba8d80fa928df4d7e644260538117d19776f4883045f6 DIST nagios-plugins-linux-madrisan-30.tar.xz 391164 BLAKE2B 3b16d0e61a68153fa90bed4c3540d9457546d2448b3b0da2b9313cd99e9b65f44c6f8d52322500570510171a049759ab85855f262d0581c6f926a96fbfe268dd SHA512 c02f81b6bbd4a0453780d9301a5cd1be67b9640e1b75d06c626a433b6e544fb4649c9b14e8e9a2c84dc6917aaf2011fb9a864ef36fef661bbcd673fa00bc5d57 +DIST nagios-plugins-linux-madrisan-31.tar.xz 401556 BLAKE2B 5eca1e96f14b518d9ab5304bb2a54ba47f194bf22cea8445d7fef0769c3b14c800e4ed24c5c0ca32f0daf53aa81a0bd52234478c606a8d2d1a12e96abb90179c SHA512 34d8ae400766e9c7ddd246998f004a50c87ec9ad8dc13deb8e31fc6fcfa07fbe5af2f091d0523b93d06b26438d1a25240bd82d60946e5897bc257fff7c1b73d0 diff --git a/net-analyzer/nagios-plugins-linux-madrisan/nagios-plugins-linux-madrisan-29.ebuild b/net-analyzer/nagios-plugins-linux-madrisan/nagios-plugins-linux-madrisan-31.ebuild index 7d39abb4343..6e71445b286 100644 --- a/net-analyzer/nagios-plugins-linux-madrisan/nagios-plugins-linux-madrisan-29.ebuild +++ b/net-analyzer/nagios-plugins-linux-madrisan/nagios-plugins-linux-madrisan-31.ebuild @@ -1,4 +1,4 @@ -# Copyright 2021 Gentoo Authors +# Copyright 2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 diff --git a/net-analyzer/nagios-plugins/Manifest b/net-analyzer/nagios-plugins/Manifest index 01a7d6cad44..349c22b0a91 100644 --- a/net-analyzer/nagios-plugins/Manifest +++ b/net-analyzer/nagios-plugins/Manifest @@ -1 +1,2 @@ DIST nagios-plugins-2.4.0.tar.gz 2738643 BLAKE2B 695c3804aec592dad0ae1f2f19222a5ae066944de4169beba08dd1e7beee51c5082679dfc1cf5adc052758e3142f33187ebde9636af19ae313f1448867764878 SHA512 f6f4cd604d28161f36c1429dbfa8f07e9fa468d8d8c21925d53d7049f0765504cb785e1f1189a0c93aa1f0cd1fe3985409c420b7724aa39790836af5c3f725ff +DIST nagios-plugins-2.4.2.tar.gz 2740092 BLAKE2B 73101f0d439a10bbc0e5d576fe1cf60f115eead00e4611e2f820ebde86390daf1904a45603389a6ad0a9fdb0f14fb49b429ad571159f605df5490f9798fc18d1 SHA512 43448483301c8f5fb9be9b496514a9e15199c320b2a320bb93c4fc6f6fcd35f2a469f980916b37b2b7e565edcb14eea1692f290b0a7bca9364e298eb42af63ce diff --git a/net-analyzer/nagios-plugins/nagios-plugins-2.4.0.ebuild b/net-analyzer/nagios-plugins/nagios-plugins-2.4.0-r2.ebuild index 32f8cfa8021..ea52cc31e22 100644 --- a/net-analyzer/nagios-plugins/nagios-plugins-2.4.0.ebuild +++ b/net-analyzer/nagios-plugins/nagios-plugins-2.4.0-r2.ebuild @@ -87,11 +87,12 @@ src_configure() { 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" ) + # 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="/bin/ping6 -n -U -w %d -c %d %s" ) + myconf+=( --with-ping6-command="$(command -v ping6) -n -U -w %d -c %d %s" ) fi econf \ diff --git a/net-analyzer/nagios-plugins/nagios-plugins-2.4.0-r1.ebuild b/net-analyzer/nagios-plugins/nagios-plugins-2.4.2-r2.ebuild index 732d59f1bb7..54c610e10a6 100644 --- a/net-analyzer/nagios-plugins/nagios-plugins-2.4.0-r1.ebuild +++ b/net-analyzer/nagios-plugins/nagios-plugins-2.4.2-r2.ebuild @@ -1,17 +1,15 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -inherit flag-o-matic - 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" +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 @@ -64,10 +62,6 @@ DOCS=( THANKS ) -PATCHES=( - "${FILESDIR}/define-own-mysql-port-constant.patch" -) - src_prepare() { default @@ -78,10 +72,6 @@ src_prepare() { } src_configure() { - # Disable -fstrict-aliasing until check_ntp can be fixed, - # https://github.com/nagios-plugins/nagios-plugins/issues/665 - append-cflags $(test-flags-CC -fno-strict-aliasing) - # Use an array to prevent econf from mangling the ping args. local myconf=() @@ -93,11 +83,12 @@ src_configure() { 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" ) + # 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="/bin/ping6 -n -U -w %d -c %d %s" ) + myconf+=( --with-ping6-command="$(command -v ping6) -n -U -w %d -c %d %s" ) fi econf \ diff --git a/net-analyzer/nagios/nagios-4.4.8.ebuild b/net-analyzer/nagios/nagios-4.4.8.ebuild new file mode 100644 index 00000000000..25c696692b7 --- /dev/null +++ b/net-analyzer/nagios/nagios-4.4.8.ebuild @@ -0,0 +1,15 @@ +# Copyright 1999-2022 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.9.ebuild b/net-analyzer/nagios/nagios-4.4.9.ebuild new file mode 100644 index 00000000000..25c696692b7 --- /dev/null +++ b/net-analyzer/nagios/nagios-4.4.9.ebuild @@ -0,0 +1,15 @@ +# Copyright 1999-2022 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/nagstamon/Manifest b/net-analyzer/nagstamon/Manifest index 9d6155c96c4..0924dfc1ce5 100644 --- a/net-analyzer/nagstamon/Manifest +++ b/net-analyzer/nagstamon/Manifest @@ -1,3 +1,2 @@ -DIST Nagstamon-3.4.1.tar.gz 563745 BLAKE2B 3ac35c90757eb525e7e7953f63a8798a0087470e4a94161987f3c382b6be43240aa8b5c44f279d23d841dbf9e4536f38d3f5e2f63234538a00fe6b6e0ee9c680 SHA512 68f8a7345c606b8ad4511b34e2d76383faf8831202c9429ab24eeb215073984f00f580c83a7f5e348f7d4104d3c82bd6f4661939801444e463c3fcf64c8240bd -DIST nagstamon-3.6.0.tar.gz 573998 BLAKE2B 6cc1e7918d8a7a53255fbd1661b8a41c0f3f414341da64724e566ceb95378590ed325fea757fffcdccf33533c8e34ca235036b47323f89bfcb3d06007a0cf43e SHA512 4da9b20c518129857ff86fa4aa4aa7507fce6c5b43fc917a4b8681d36e69f267045ab35c2f6922bde55536bf55e753f61b4fc184165e2f6d9eb6cb9b00703c69 +DIST nagstamon-3.10.1.tar.gz 574520 BLAKE2B 104d082a610c26af47d61b911094c51e3981947e19ed026bc725e479382bcec2b3d36c36400c379c738c970e1cb36183859e1dd132e1fe78c30be3f20688287f SHA512 83da92cc0d5ceaf7abbf2f2e289a2e83cbcb3bb4239d12f594da7543942a3945cfae68cfa9ecc33aa619967d1d35e1b88d4bb76398364c2f9754174fdd62649c DIST nagstamon-3.8.0.tar.gz 585689 BLAKE2B 8ab52762bac4797ded3834a94a382174855504b8e39224938f8f720a4aaaf4b3885fb487504ed09d973210b90f612852964bdcc87a6b2dc7c6b07bebfdeacffe SHA512 d34d1c52ddadbafcd583a5e61f7f305ffc8f722d8c007bbefeee6501475f01612e810154bc5815abe27e9c43e4e695a8ec189dcc5b2b487840d79f92eb3edc43 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 26bb22fec4d..00000000000 --- 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.10.1-setup.patch b/net-analyzer/nagstamon/files/nagstamon-3.10.1-setup.patch new file mode 100644 index 00000000000..28bb98e1b49 --- /dev/null +++ b/net-analyzer/nagstamon/files/nagstamon-3.10.1-setup.patch @@ -0,0 +1,28 @@ +--- 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.4.1-unknown-version-id.patch b/net-analyzer/nagstamon/files/nagstamon-3.4.1-unknown-version-id.patch deleted file mode 100644 index a71d9d97e5b..00000000000 --- 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/nagstamon-3.6.0.ebuild b/net-analyzer/nagstamon/nagstamon-3.10.1.ebuild index adf94467dd0..f7ec50949af 100644 --- a/net-analyzer/nagstamon/nagstamon-3.6.0.ebuild +++ b/net-analyzer/nagstamon/nagstamon-3.10.1.ebuild @@ -1,12 +1,14 @@ -# 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 -PYTHON_COMPAT=( python3_{7,8,9} ) +PYTHON_COMPAT=( python3_{9,10,11} ) inherit python-r1 distutils-r1 +distutils_enable_tests pytest + MY_PN="Nagstamon" MY_P="${MY_PN}-${PV/_p/-}" @@ -18,7 +20,7 @@ SRC_URI="https://github.com/HenriWahl/Nagstamon/archive/v${PV}.tar.gz -> ${P}.ta LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="" +IUSE="test" REQUIRED_USE="${PYTHON_REQUIRED_USE}" RDEPEND="${PYTHON_DEPS} @@ -36,11 +38,12 @@ RDEPEND="${PYTHON_DEPS} >=dev-python/python-xlib-0.19[${PYTHON_USEDEP}] dev-python/requests-kerberos[${PYTHON_USEDEP}]" DEPEND="${RDEPEND} - dev-python/setuptools[${PYTHON_USEDEP}]" + dev-python/setuptools[${PYTHON_USEDEP}] + test? ( dev-python/pylint[${PYTHON_USEDEP}] )" S="${WORKDIR}/${MY_P}" -PATCHES=( "${FILESDIR}/${PN}-3.0-setup.patch" ) +PATCHES=( "${FILESDIR}/${PN}-3.10.1-setup.patch" ) src_prepare() { default_src_prepare 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 1ab07d830d9..00000000000 --- a/net-analyzer/nagstamon/nagstamon-3.4.1-r1.ebuild +++ /dev/null @@ -1,53 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{7,8,9} ) - -inherit 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/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/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/nagstamon/nagstamon-3.8.0.ebuild b/net-analyzer/nagstamon/nagstamon-3.8.0.ebuild index 5c88fc18e54..884f21f6a67 100644 --- a/net-analyzer/nagstamon/nagstamon-3.8.0.ebuild +++ b/net-analyzer/nagstamon/nagstamon-3.8.0.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python3_{8,9,10} ) +PYTHON_COMPAT=( python3_{9,10} ) inherit python-r1 distutils-r1 diff --git a/net-analyzer/nbtscan/Manifest b/net-analyzer/nbtscan/Manifest index 8ce623844a6..b7743fc9115 100644 --- a/net-analyzer/nbtscan/Manifest +++ b/net-analyzer/nbtscan/Manifest @@ -1,2 +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/metadata.xml b/net-analyzer/nbtscan/metadata.xml index dce3f3be66c..93276067098 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 "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 c8ce98992d7..00000000000 --- 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 index a004786f28b..567fd3977c0 100644 --- a/net-analyzer/nbtscan/nbtscan-1.7.2.ebuild +++ b/net-analyzer/nbtscan/nbtscan-1.7.2.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://github.com/resurrecting-open-source-projects/${PN}/archive/${PV LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos" +KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos" DOCS=( AUTHORS CONTRIBUTING.md ChangeLog NEWS README.md ) diff --git a/net-analyzer/ndoutils/ndoutils-2.1.3-r2.ebuild b/net-analyzer/ndoutils/ndoutils-2.1.3-r3.ebuild index 784309fee43..044cb36975f 100644 --- a/net-analyzer/ndoutils/ndoutils-2.1.3-r2.ebuild +++ b/net-analyzer/ndoutils/ndoutils-2.1.3-r3.ebuild @@ -1,12 +1,14 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 + 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" +S="${WORKDIR}/${PN}-${P}" LICENSE="GPL-2" SLOT="0" @@ -14,30 +16,19 @@ KEYWORDS="~amd64 ~ppc ~x86" # We require the "nagios" user from net-analyzer/nagios-core at build # time. -DEPEND="dev-db/mysql-connector-c +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" + "${FILESDIR}"/format-security.patch + "${FILESDIR}"/ndoutils-2.0.0-asprintf.patch + "${FILESDIR}"/sample-config-piddir.patch + "${FILESDIR}"/openrc-init.patch ) src_configure() { @@ -58,34 +49,38 @@ 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 + 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 - systemd_newunit "startup/default-service" "${PN}.service" + newinitd startup/openrc-init ndo2db + newconfd startup/openrc-conf ndo2db - # The documentation isn't installed by the build system - dodoc -r docs/html - - insinto "/usr/share/${PN}" + insinto /usr/share/ndoutils doins -r db # These need to be executable... - exeinto "/usr/share/${PN}/db" + 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/${PN}/db/installdb" /usr/bin/ndoutils-installdb - dosym "../share/${PN}/db/upgradedb" /usr/bin/ndoutils-upgradedb + dosym ../share/ndoutils/db/installdb /usr/bin/ndoutils-installdb + dosym ../share/ndoutils/db/upgradedb /usr/bin/ndoutils-upgradedb + + keepdir /var/lib/nagios } pkg_postinst() { diff --git a/net-analyzer/nessus-agent-bin/Manifest b/net-analyzer/nessus-agent-bin/Manifest index 9c7c01927b6..38af83c26c7 100644 --- a/net-analyzer/nessus-agent-bin/Manifest +++ b/net-analyzer/nessus-agent-bin/Manifest @@ -1 +1 @@ -DIST NessusAgent-10.2.0-es8.x86_64.rpm 14581300 BLAKE2B b12ddf7a6b2d14f322ef22b66045d463ac482b3d6db3e351b2fde5f463266e3e97e14933c89c193a54615b748b065ea01de333b2d5a22a127d823edffaeba9b5 SHA512 d1c52b934eace8dc3d6c4d63089b7f7c4143ad55e2226155b9355262a0323129297723fff2664ddf2b201b2cd02d8668b7503668610d94162670dcd965fee917 +DIST NessusAgent-10.3.1-es8.x86_64.rpm 18369680 BLAKE2B c3658b9a870d157539a9de3c1913a2dc4e350177845abb108cb5c0a172c73f52765d025c0510001702e3944a2b347f83afea76635dc54d2c118388b20c8b9b02 SHA512 cf03df4179fbee756e20bfbe02cd1f07a9f12ed103f33a172b5eaa70500966a1af80858924b3ea384b1ba8756078981899595f80031c0ec8b12160c989720473 diff --git a/net-analyzer/nessus-agent-bin/nessus-agent-bin-10.2.0.ebuild b/net-analyzer/nessus-agent-bin/nessus-agent-bin-10.3.1.ebuild index 67bf24f29e0..eaffa49c058 100644 --- a/net-analyzer/nessus-agent-bin/nessus-agent-bin-10.2.0.ebuild +++ b/net-analyzer/nessus-agent-bin/nessus-agent-bin-10.3.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 diff --git a/net-analyzer/nessus-bin/Manifest b/net-analyzer/nessus-bin/Manifest index 034d886e3e0..c86406296d0 100644 --- a/net-analyzer/nessus-bin/Manifest +++ b/net-analyzer/nessus-bin/Manifest @@ -1 +1 @@ -DIST Nessus-10.3.0-es8.x86_64.rpm 50755492 BLAKE2B 6b73d9a5f9d1d2c783960162df01eb82925fafad4c1e2154136f46a6acac2422fa71ae909dceee6cff5b397263d2633fac8747475031f293a88b519fa966f032 SHA512 1447736dcc68b232dbcb91eeaf23dc7efbb344ae54e56e66733238d64f7bd2b0c60520fee7ddef4f3868ed11e843432153602c03d57e3b27a2fd94062ebd8cdf +DIST Nessus-10.4.2-es8.x86_64.rpm 55108384 BLAKE2B fd1f76b95ec2b2c33749f25b93b66dc053a600f137f9c30a754d4dd38f1aef6179c61ce699f30d13f9e4463dca35e0c0124ed20ff11035f511917edb08761cb6 SHA512 3ca06c25c2909097c747b77768684e1842e7b73901d869f95f916ca0d0cf17cf15a16d128d8cd1a4de3299cd84eec643d6fa2932b2eb2900230ae4e664083d34 diff --git a/net-analyzer/nessus-bin/nessus-bin-10.3.0.ebuild b/net-analyzer/nessus-bin/nessus-bin-10.4.2.ebuild index 0692bd7052b..3be0e651b61 100644 --- a/net-analyzer/nessus-bin/nessus-bin-10.3.0.ebuild +++ b/net-analyzer/nessus-bin/nessus-bin-10.4.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -20,6 +20,9 @@ RESTRICT="mirror fetch strip" QA_PREBUILT="opt/nessus/bin/nasl opt/nessus/bin/ndbg opt/nessus/bin/nessus-mkrand + opt/nessus/bin/openssl + opt/nessus/lib/nessus/fips.so + opt/nessus/lib/nessus/legacy.so opt/nessus/lib/nessus/libjemalloc.so.2 opt/nessus/lib/nessus/libnessus-glibc-fix.so opt/nessus/lib/nessus/iconv/*.so diff --git a/net-analyzer/net-snmp/Manifest b/net-analyzer/net-snmp/Manifest index 4d596093fe9..e203e4bdb4f 100644 --- a/net-analyzer/net-snmp/Manifest +++ b/net-analyzer/net-snmp/Manifest @@ -1,3 +1,2 @@ DIST net-snmp-5.7.3-patches-3.tar.xz 3176 BLAKE2B 1a71d6743afb841f664c6058e32c7c411af62b0f36acd3bb9251804893ed12f462a0c5bab828e309eeec7824def2dca8fa866350b90a62ec4f0df1141b51ecae SHA512 d8a91b9668320a1e19d062eb86dd4d16beb7c2d15ac7ebbb9d2a4bd298af39bbb0a2613504dbb0057cccdec731f08f2308c5a15395e1fbc29bb0611ed8aca636 -DIST net-snmp-5.9.1.tar.gz 6781346 BLAKE2B 4242ca77372005f995dfd228bec51d35b6b0f8c0ab0e44ed40cdb3cc0578b64e97444ffcb074dceca30739deadb46e68f1c75e87d3f1768d81b5e084b0fc0f5f SHA512 ae158ab41961ee2064d85187337979e6ff6ba90f3136b8a960e9ae46ee1408d9d2f0c5c4dfc3a3302e6dbb357cddf1221489435288c4f52182a03e94a9e450c3 DIST net-snmp-5.9.3.tar.gz 6646950 BLAKE2B b8e3de60e178ec16ad2848ad77f3bd4cbd35eaa9be103c0fa5d17514c29df4e69015ac53b54c9e565e3032b0c0bb47c19729e65310a6acefae901e101ea49451 SHA512 a476df4967029a2eb03d27b0e250170785d0a8c143d49b900ee958c3cbdfaccd415b70af40f6fbed9cb8819d522c35a6073a431091d908ccc7c018fa0aaa2abc 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 04eafbbe9c5..00000000000 --- 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.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 00000000000..785f5ee57d1 --- /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 00000000000..83d05a86f0a --- /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 00000000000..8b825ae8cf5 --- /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 00000000000..c92c88cfbb2 --- /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 00000000000..1eb880bb960 --- /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/net-snmp-5.9.3.ebuild b/net-analyzer/net-snmp/net-snmp-5.9.3-r1.ebuild index cb44c78a2d0..eedf5f64304 100644 --- a/net-analyzer/net-snmp/net-snmp-5.9.3.ebuild +++ b/net-analyzer/net-snmp/net-snmp-5.9.3-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -6,7 +6,7 @@ EAPI=8 DISTUTILS_OPTIONAL=yes DISTUTILS_SINGLE_IMPL=yes GENTOO_DEPEND_ON_PERL=no -PYTHON_COMPAT=( python3_{8..10} ) +PYTHON_COMPAT=( python3_{9..10} ) WANT_AUTOMAKE=none inherit autotools distutils-r1 perl-module systemd @@ -20,7 +20,7 @@ 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 ~mips ppc ppc64 ~riscv ~s390 sparc x86" + KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86" fi SRC_URI+=" https://dev.gentoo.org/~jsmolic/distfiles/${PN}-5.7.3-patches-3.tar.xz" @@ -91,6 +91,7 @@ PATCHES=( "${FILESDIR}"/${PN}-5.8.1-mysqlclient.patch "${FILESDIR}"/${PN}-5.9-MakeMaker.patch "${FILESDIR}"/${PN}-5.9.2-fix-LDFLAGS.patch + "${FILESDIR}"/${P}-configure-clang16.patch "${FILESDIR}"/${PN}-99999999-tinfo.patch ) diff --git a/net-analyzer/net-snmp/net-snmp-5.9.1-r2.ebuild b/net-analyzer/net-snmp/net-snmp-5.9.3-r2.ebuild index 27c7ee6c22e..7a0b5a52d30 100644 --- a/net-analyzer/net-snmp/net-snmp-5.9.1-r2.ebuild +++ b/net-analyzer/net-snmp/net-snmp-5.9.3-r2.ebuild @@ -1,27 +1,33 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 DISTUTILS_OPTIONAL=yes DISTUTILS_SINGLE_IMPL=yes GENTOO_DEPEND_ON_PERL=no -PYTHON_COMPAT=( python3_{8..10} ) +PYTHON_COMPAT=( python3_{9..10} ) 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/~jsmolic/distfiles/${PN}-5.7.3-patches-3.tar.xz - https://github.com/net-snmp/net-snmp/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz -" +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" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86" IUSE=" X bzip2 doc elf kmem ipv6 lm-sensors mfd-rewrites minimal mysql netlink pcap pci perl python rpm selinux smux ssl tcpd ucd-compat zlib @@ -69,6 +75,7 @@ RDEPEND=" virtual/perl-Data-Dumper virtual/perl-Getopt-Long dev-perl/JSON + dev-perl/Mail-Sender dev-perl/TermReadKey virtual/perl-Term-ReadLine ) @@ -77,26 +84,35 @@ RDEPEND=" " 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 + "${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 @@ -132,7 +148,6 @@ src_configure() { $(use_with ssl openssl) \ $(use_with tcpd libwrap) \ $(use_with zlib) \ - --disable-static \ --enable-shared \ --with-default-snmp-version="3" \ --with-ldflags="${LDFLAGS}" \ diff --git a/net-analyzer/net-snmp/net-snmp-9999.ebuild b/net-analyzer/net-snmp/net-snmp-9999.ebuild index 1aed4861943..7a0b5a52d30 100644 --- a/net-analyzer/net-snmp/net-snmp-9999.ebuild +++ b/net-analyzer/net-snmp/net-snmp-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -6,7 +6,7 @@ EAPI=8 DISTUTILS_OPTIONAL=yes DISTUTILS_SINGLE_IMPL=yes GENTOO_DEPEND_ON_PERL=no -PYTHON_COMPAT=( python3_{8..10} ) +PYTHON_COMPAT=( python3_{9..10} ) WANT_AUTOMAKE=none inherit autotools distutils-r1 perl-module systemd @@ -20,7 +20,7 @@ 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 ~mips ~ppc ~x86" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" fi SRC_URI+=" https://dev.gentoo.org/~jsmolic/distfiles/${PN}-5.7.3-patches-3.tar.xz" @@ -84,14 +84,15 @@ RDEPEND=" " PATCHES=( - "${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}-5.9.2-fix-LDFLAGS.patch - "${FILESDIR}"/${PN}-99999999-tinfo.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() { 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 00000000000..36fda8614ee --- /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/netcat-110.20180111-r2.ebuild b/net-analyzer/netcat/netcat-110.20180111-r2.ebuild new file mode 100644 index 00000000000..4739880a5d2 --- /dev/null +++ b/net-analyzer/netcat/netcat-110.20180111-r2.ebuild @@ -0,0 +1,66 @@ +# Copyright 1999-2022 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 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc64-solaris ~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/netdata/Manifest b/net-analyzer/netdata/Manifest index a20cda07720..8c5a710024a 100644 --- a/net-analyzer/netdata/Manifest +++ b/net-analyzer/netdata/Manifest @@ -1,3 +1,5 @@ DIST netdata-1.35.1.tar.gz 22335562 BLAKE2B a715f26f1318f01ce45266bbc78ada5ec2e3516f7ff2a6fda77829433398986bc564b377362097ea7c2595ac01911a817be124c9f0ba560dd00ae5001a080da7 SHA512 43cbf099841fe2547b7de56610f811e55fdf2e9af3dc18fde818e09de1125a7f8d57f6a16f2dee8ea4b9e6f2683959549810a1ea7f8f7b5007eb7069bfddb477 DIST netdata-1.36.0.tar.gz 24794657 BLAKE2B f3230f5c279a5a203f9245a1d74f254961cafe060d285fcd63f968c5f33cd2c4393288c44262eb12665c6471d757d65a9a2406c7d80997736ada6189ba1c8450 SHA512 1748c5f6ea392b6cfc6b761632bc632422fb6910f53fb26a796003cdc0048f28ab550daa0658a6d5de5fec65b0a5aae8f44f68ec65c19f06b11eda6fd337c8d4 DIST netdata-1.36.1.tar.gz 24795841 BLAKE2B e58ca0a4ffb48169833a412ca234e6d1771f5bc179010bd4ee5f597768e63c147e1d0dfd65f52579901ad42760a98de74be9417d6cf6b3a150683551399927ab SHA512 2ff01c816dbdd975450a7cebd292d9a1c6bf1822aa6efb56b846a90e5a01d1faac898e1a87b155fd6fa20f26d098e1d80042b12c0ff22b05260e14f3f552546d +DIST netdata-1.37.0.tar.gz 25151327 BLAKE2B 7e83df21e50d721d7e8a226fbc4470972393ab086fa575298b36f5699dfa4fffa406ce8a532661b1adfb7b5755e69c227f85f7c36e96f3cc585004082c25eda2 SHA512 7234d8b414df6674e612718085f446b1321833772d2d28e01da13f1d296b772e5dc73bf39495ab9a8db7f3118f3053000c16d6b17fe2a28e8340cef0d208d4bf +DIST netdata-1.37.1.tar.gz 25160143 BLAKE2B 9efd0edeb6d2d76338c98c794c4e81a00a951e40e9fe4682030f04c28b1a9895bac0c06a695b055ce94cbf1fb55c516364daec026759134a590e645a2c380ca6 SHA512 fa60f11b79c89fb8b1d825c7d395b294f291e6b72acb1c9b47212c145ca2e6c28b9370ebdbb1c8666884e2b714e2fd8ba498ffc6b428361b93471e4d555cdfa7 diff --git a/net-analyzer/netdata/metadata.xml b/net-analyzer/netdata/metadata.xml index 666206a1789..e43c8960717 100644 --- a/net-analyzer/netdata/metadata.xml +++ b/net-analyzer/netdata/metadata.xml @@ -11,7 +11,6 @@ <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> diff --git a/net-analyzer/netdata/netdata-1.35.1.ebuild b/net-analyzer/netdata/netdata-1.35.1.ebuild index 3df5ef6ecd4..43f41d50852 100644 --- a/net-analyzer/netdata/netdata-1.35.1.ebuild +++ b/net-analyzer/netdata/netdata-1.35.1.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python{3_8,3_9,3_10} ) +PYTHON_COMPAT=( python{3_9,3_10} ) inherit autotools fcaps flag-o-matic linux-info python-single-r1 systemd toolchain-funcs @@ -20,7 +20,7 @@ HOMEPAGE="https://github.com/netdata/netdata https://my-netdata.io/" LICENSE="GPL-3+ MIT BSD" SLOT="0" -IUSE="caps cloud +compression cpu_flags_x86_sse2 cups +dbengine ipmi +jsonc kinesis +lto mongodb mysql nfacct nodejs postgres prometheus +python tor xen" +IUSE="caps cloud +compression cpu_flags_x86_sse2 cups +dbengine ipmi +jsonc +lto mongodb mysql nfacct nodejs postgres prometheus +python tor xen" REQUIRED_USE=" mysql? ( python ) python? ( ${PYTHON_REQUIRED_USE} ) @@ -40,7 +40,7 @@ RDEPEND=" net-misc/curl net-misc/wget sys-apps/util-linux - virtual/awk + app-alternatives/awk caps? ( sys-libs/libcap ) cups? ( net-print/cups ) dbengine? ( @@ -53,7 +53,6 @@ RDEPEND=" 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 @@ -109,7 +108,7 @@ src_configure() { $(use_enable dbengine) \ $(use_enable nfacct plugin-nfacct) \ $(use_enable ipmi plugin-freeipmi) \ - $(use_enable kinesis exporting-kinesis) \ + --disable-exporting-kinesis \ $(use_enable lto lto) \ $(use_enable mongodb exporting-mongodb) \ $(use_enable prometheus exporting-prometheus-remote-write) \ diff --git a/net-analyzer/netdata/netdata-1.36.0.ebuild b/net-analyzer/netdata/netdata-1.36.0.ebuild index 3df5ef6ecd4..43f41d50852 100644 --- a/net-analyzer/netdata/netdata-1.36.0.ebuild +++ b/net-analyzer/netdata/netdata-1.36.0.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python{3_8,3_9,3_10} ) +PYTHON_COMPAT=( python{3_9,3_10} ) inherit autotools fcaps flag-o-matic linux-info python-single-r1 systemd toolchain-funcs @@ -20,7 +20,7 @@ HOMEPAGE="https://github.com/netdata/netdata https://my-netdata.io/" LICENSE="GPL-3+ MIT BSD" SLOT="0" -IUSE="caps cloud +compression cpu_flags_x86_sse2 cups +dbengine ipmi +jsonc kinesis +lto mongodb mysql nfacct nodejs postgres prometheus +python tor xen" +IUSE="caps cloud +compression cpu_flags_x86_sse2 cups +dbengine ipmi +jsonc +lto mongodb mysql nfacct nodejs postgres prometheus +python tor xen" REQUIRED_USE=" mysql? ( python ) python? ( ${PYTHON_REQUIRED_USE} ) @@ -40,7 +40,7 @@ RDEPEND=" net-misc/curl net-misc/wget sys-apps/util-linux - virtual/awk + app-alternatives/awk caps? ( sys-libs/libcap ) cups? ( net-print/cups ) dbengine? ( @@ -53,7 +53,6 @@ RDEPEND=" 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 @@ -109,7 +108,7 @@ src_configure() { $(use_enable dbengine) \ $(use_enable nfacct plugin-nfacct) \ $(use_enable ipmi plugin-freeipmi) \ - $(use_enable kinesis exporting-kinesis) \ + --disable-exporting-kinesis \ $(use_enable lto lto) \ $(use_enable mongodb exporting-mongodb) \ $(use_enable prometheus exporting-prometheus-remote-write) \ diff --git a/net-analyzer/netdata/netdata-1.36.1-r1.ebuild b/net-analyzer/netdata/netdata-1.36.1-r1.ebuild index 55547588614..2b50034f988 100644 --- a/net-analyzer/netdata/netdata-1.36.1-r1.ebuild +++ b/net-analyzer/netdata/netdata-1.36.1-r1.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python{3_8,3_9,3_10} ) +PYTHON_COMPAT=( python{3_9,3_10} ) inherit autotools fcaps flag-o-matic linux-info python-single-r1 systemd toolchain-funcs @@ -20,7 +20,7 @@ HOMEPAGE="https://github.com/netdata/netdata https://my-netdata.io/" LICENSE="GPL-3+ MIT BSD" SLOT="0" -IUSE="caps cloud +compression cpu_flags_x86_sse2 cups +dbengine ipmi +jsonc kinesis +lto mongodb mysql nfacct nodejs postgres prometheus +python tor xen" +IUSE="caps cloud +compression cpu_flags_x86_sse2 cups +dbengine ipmi +jsonc +lto mongodb mysql nfacct nodejs postgres prometheus +python tor xen" REQUIRED_USE=" mysql? ( python ) python? ( ${PYTHON_REQUIRED_USE} ) @@ -40,7 +40,7 @@ RDEPEND=" net-misc/curl net-misc/wget sys-apps/util-linux - virtual/awk + app-alternatives/awk caps? ( sys-libs/libcap ) cups? ( net-print/cups ) dbengine? ( @@ -53,7 +53,6 @@ RDEPEND=" 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 @@ -109,7 +108,7 @@ src_configure() { $(use_enable dbengine) \ $(use_enable nfacct plugin-nfacct) \ $(use_enable ipmi plugin-freeipmi) \ - $(use_enable kinesis exporting-kinesis) \ + --disable-exporting-kinesis \ $(use_enable lto lto) \ $(use_enable mongodb exporting-mongodb) \ $(use_enable prometheus exporting-prometheus-remote-write) \ diff --git a/net-analyzer/netdata/netdata-1.37.0.ebuild b/net-analyzer/netdata/netdata-1.37.0.ebuild new file mode 100644 index 00000000000..2b50034f988 --- /dev/null +++ b/net-analyzer/netdata/netdata-1.37.0.ebuild @@ -0,0 +1,158 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +PYTHON_COMPAT=( python{3_9,3_10} ) + +inherit autotools fcaps flag-o-matic linux-info python-single-r1 systemd toolchain-funcs + +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 ~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="caps cloud +compression cpu_flags_x86_sse2 cups +dbengine ipmi +jsonc +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 + app-alternatives/awk + caps? ( sys-libs/libcap ) + cups? ( net-print/cups ) + dbengine? ( + app-arch/lz4:= + dev-libs/judy + dev-libs/openssl:= + ) + dev-libs/libuv:= + cloud? ( dev-libs/protobuf:= ) + compression? ( sys-libs/zlib ) + ipmi? ( sys-libs/freeipmi ) + jsonc? ( 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 + )" +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() { + if use ppc64; then + # bundled dlib does not support vsx on big-endian + # https://github.com/davisking/dlib/issues/397 + [[ $(tc-endian) == big ]] && append-flags -mno-vsx + fi + + econf \ + --localstatedir="${EPREFIX}"/var \ + --with-user=netdata \ + --without-bundled-protobuf \ + $(use_enable cloud) \ + $(use_enable jsonc) \ + $(use_enable cups plugin-cups) \ + $(use_enable dbengine) \ + $(use_enable nfacct plugin-nfacct) \ + $(use_enable ipmi plugin-freeipmi) \ + --disable-exporting-kinesis \ + $(use_enable lto lto) \ + $(use_enable mongodb exporting-mongodb) \ + $(use_enable prometheus exporting-prometheus-remote-write) \ + $(use_enable xen plugin-xenstat) \ + $(use_enable cpu_flags_x86_sse2 x86-sse) \ + $(use_with compression zlib) +} + +src_compile() { + emake clean + default +} + +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 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 +} diff --git a/net-analyzer/netdata/netdata-1.37.1.ebuild b/net-analyzer/netdata/netdata-1.37.1.ebuild new file mode 100644 index 00000000000..2b50034f988 --- /dev/null +++ b/net-analyzer/netdata/netdata-1.37.1.ebuild @@ -0,0 +1,158 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +PYTHON_COMPAT=( python{3_9,3_10} ) + +inherit autotools fcaps flag-o-matic linux-info python-single-r1 systemd toolchain-funcs + +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 ~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="caps cloud +compression cpu_flags_x86_sse2 cups +dbengine ipmi +jsonc +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 + app-alternatives/awk + caps? ( sys-libs/libcap ) + cups? ( net-print/cups ) + dbengine? ( + app-arch/lz4:= + dev-libs/judy + dev-libs/openssl:= + ) + dev-libs/libuv:= + cloud? ( dev-libs/protobuf:= ) + compression? ( sys-libs/zlib ) + ipmi? ( sys-libs/freeipmi ) + jsonc? ( 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 + )" +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() { + if use ppc64; then + # bundled dlib does not support vsx on big-endian + # https://github.com/davisking/dlib/issues/397 + [[ $(tc-endian) == big ]] && append-flags -mno-vsx + fi + + econf \ + --localstatedir="${EPREFIX}"/var \ + --with-user=netdata \ + --without-bundled-protobuf \ + $(use_enable cloud) \ + $(use_enable jsonc) \ + $(use_enable cups plugin-cups) \ + $(use_enable dbengine) \ + $(use_enable nfacct plugin-nfacct) \ + $(use_enable ipmi plugin-freeipmi) \ + --disable-exporting-kinesis \ + $(use_enable lto lto) \ + $(use_enable mongodb exporting-mongodb) \ + $(use_enable prometheus exporting-prometheus-remote-write) \ + $(use_enable xen plugin-xenstat) \ + $(use_enable cpu_flags_x86_sse2 x86-sse) \ + $(use_with compression zlib) +} + +src_compile() { + emake clean + default +} + +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 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 +} diff --git a/net-analyzer/netdata/netdata-9999.ebuild b/net-analyzer/netdata/netdata-9999.ebuild index 532e8e6f8fd..3d8927777fe 100644 --- a/net-analyzer/netdata/netdata-9999.ebuild +++ b/net-analyzer/netdata/netdata-9999.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python{3_8,3_9,3_10} ) +PYTHON_COMPAT=( python{3_9,3_10} ) inherit autotools fcaps flag-o-matic linux-info python-single-r1 systemd toolchain-funcs @@ -20,7 +20,7 @@ HOMEPAGE="https://github.com/netdata/netdata https://my-netdata.io/" LICENSE="GPL-3+ MIT BSD" SLOT="0" -IUSE="caps cloud +compression cpu_flags_x86_sse2 cups +dbengine ipmi +jsonc kinesis +lto mongodb mysql nfacct nodejs postgres prometheus +python tor xen" +IUSE="caps cloud +compression cpu_flags_x86_sse2 cups +dbengine ipmi +jsonc +lto mongodb mysql nfacct nodejs postgres prometheus +python tor xen" REQUIRED_USE=" mysql? ( python ) python? ( ${PYTHON_REQUIRED_USE} ) @@ -40,7 +40,7 @@ RDEPEND=" net-misc/curl net-misc/wget sys-apps/util-linux - virtual/awk + app-alternatives/awk caps? ( sys-libs/libcap ) cups? ( net-print/cups ) dbengine? ( @@ -53,7 +53,6 @@ RDEPEND=" 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 @@ -109,7 +108,7 @@ src_configure() { $(use_enable dbengine) \ $(use_enable nfacct plugin-nfacct) \ $(use_enable ipmi plugin-freeipmi) \ - $(use_enable kinesis exporting-kinesis) \ + --disable-exporting-kinesis \ $(use_enable lto lto) \ $(use_enable mongodb exporting-mongodb) \ $(use_enable prometheus exporting-prometheus-remote-write) \ diff --git a/net-analyzer/nethogs/Manifest b/net-analyzer/nethogs/Manifest index 733e8a3e1c8..c56737e97dd 100644 --- a/net-analyzer/nethogs/Manifest +++ b/net-analyzer/nethogs/Manifest @@ -1,2 +1 @@ -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/nethogs-0.8.6-r1.ebuild b/net-analyzer/nethogs/nethogs-0.8.6-r1.ebuild deleted file mode 100644 index e0f115871a5..00000000000 --- a/net-analyzer/nethogs/nethogs-0.8.6-r1.ebuild +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -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 ~ia64 x86" - -DOCS=( DESIGN README.decpcap.txt README.md ) - -RDEPEND=" - net-libs/libpcap - sys-libs/ncurses:0= -" -DEPEND="${RDEPEND}" -BDEPEND=" - virtual/pkgconfig -" - -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/nethogs/nethogs-0.8.7.ebuild b/net-analyzer/nethogs/nethogs-0.8.7.ebuild index 67bfac5facf..e4615e43c29 100644 --- a/net-analyzer/nethogs/nethogs-0.8.7.ebuild +++ b/net-analyzer/nethogs/nethogs-0.8.7.ebuild @@ -11,7 +11,7 @@ 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" +KEYWORDS="amd64 ~arm ~ia64 x86" RDEPEND="net-libs/libpcap sys-libs/ncurses:=" diff --git a/net-analyzer/netio/netio-1.33.ebuild b/net-analyzer/netio/netio-1.33.ebuild index a5a43f45b6d..b4f396af8c4 100644 --- a/net-analyzer/netio/netio-1.33.ebuild +++ b/net-analyzer/netio/netio-1.33.ebuild @@ -1,23 +1,21 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 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" +S="${WORKDIR}" 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} +BDEPEND="app-arch/unzip" src_prepare() { edos2unix *.c *.h *.doc diff --git a/net-analyzer/netperf/netperf-2.7.0-r4.ebuild b/net-analyzer/netperf/netperf-2.7.0-r4.ebuild index 51a9ab06b8d..f2cbe9c445a 100644 --- a/net-analyzer/netperf/netperf-2.7.0-r4.ebuild +++ b/net-analyzer/netperf/netperf-2.7.0-r4.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -8,7 +8,7 @@ inherit flag-o-matic DESCRIPTION="Network performance benchmark" HOMEPAGE="http://www.netperf.org/" SRC_URI="ftp://ftp.netperf.org/${PN}/${P}.tar.bz2" -KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86" +KEYWORDS="~alpha amd64 arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86" LICENSE="netperf" SLOT="0" @@ -47,6 +47,7 @@ src_prepare() { 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 \ 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 f5c61737f7a..d1f04a33a2d 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/netpipe-3.7.2.ebuild b/net-analyzer/netpipe/netpipe-3.7.2-r1.ebuild index 894cf55c72a..1cda1d25fa4 100644 --- a/net-analyzer/netpipe/netpipe-3.7.2.ebuild +++ b/net-analyzer/netpipe/netpipe-3.7.2-r1.ebuild @@ -1,16 +1,18 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 inherit toolchain-funcs -MY_PN=NetPIPE -MY_P=${MY_PN}-${PV} +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" @@ -24,21 +26,20 @@ DOCS=( dox/netpipe_paper.ps dox/np_cluster2002.pdf dox/np_euro.pdf - ) +) -PATCHES=( - "${FILESDIR}"/${P}-fix-makefile.patch - ) +PATCHES=( "${FILESDIR}"/${P}-fix-makefile.patch ) -S="${WORKDIR}"/${MY_P} +src_configure() { + tc-export CC +} src_compile() { - emake CC="$(tc-getCC)" LD="$(tc-getLD)" memcpy tcp $(usex ipv6 tcp6 '') + emake memcpy tcp $(usev ipv6 tcp6) } src_install() { - dobin NPmemcpy NPtcp - use ipv6 && dobin NPtcp6 + dobin NPmemcpy NPtcp $(usev ipv6 NPtcp6) doman dox/netpipe.1 einstalldocs } 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 00000000000..e1b0cbd115b --- /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 00000000000..7a89ce111e9 --- /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/netwatch-1.3.0.1-r4.ebuild b/net-analyzer/netwatch/netwatch-1.3.0.1-r5.ebuild index df2471e3538..a7215c4e36d 100644 --- a/net-analyzer/netwatch/netwatch-1.3.0.1-r4.ebuild +++ b/net-analyzer/netwatch/netwatch-1.3.0.1-r5.ebuild @@ -1,26 +1,25 @@ -# 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 +EAPI=8 -MY_PV=$(ver_cut 1-3)-$(ver_cut 4) +inherit autotools flag-o-matic 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" +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" -IUSE="doc" -RDEPEND="sys-libs/ncurses" +RDEPEND="sys-libs/ncurses:=" DEPEND=" ${RDEPEND} - sys-kernel/linux-headers - virtual/pkgconfig -" + sys-kernel/linux-headers" +BDEPEND="virtual/pkgconfig" + PATCHES=( "${FILESDIR}"/${P}-append_ldflags.patch "${FILESDIR}"/${P}-open.patch @@ -29,22 +28,23 @@ PATCHES=( "${FILESDIR}"/${P}-includes.patch "${FILESDIR}"/${P}-tinfo.patch "${FILESDIR}"/${P}-fno-common.patch + "${FILESDIR}"/${P}-lto-mismatch.patch + "${FILESDIR}"/${P}-clang16.patch ) -S=${WORKDIR}/${PN}-$(ver_cut 1-3) src_prepare() { default + eautoreconf + + append-flags -fno-strict-aliasing #861203 } src_install() { dosbin netresolv netwatch - doman netwatch.1 - dodoc BUGS CHANGES README* TODO + einstalldocs - if use doc; then - docinto html - dodoc NetwatchKeyCommands.html - fi + docinto html + dodoc NetwatchKeyCommands.html } diff --git a/net-analyzer/nfdump/nfdump-1.6.24.ebuild b/net-analyzer/nfdump/nfdump-1.6.24.ebuild index d4302f132f6..4fad577222f 100644 --- a/net-analyzer/nfdump/nfdump-1.6.24.ebuild +++ b/net-analyzer/nfdump/nfdump-1.6.24.ebuild @@ -29,7 +29,7 @@ RDEPEND=" DEPEND="${RDEPEND}" BDEPEND=" sys-devel/flex - virtual/yacc + app-alternatives/yacc doc? ( app-doc/doxygen media-gfx/graphviz diff --git a/net-analyzer/nfdump/nfdump-1.7.0.1.ebuild b/net-analyzer/nfdump/nfdump-1.7.0.1.ebuild index db24ffe43a6..4fad577222f 100644 --- a/net-analyzer/nfdump/nfdump-1.7.0.1.ebuild +++ b/net-analyzer/nfdump/nfdump-1.7.0.1.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://github.com/phaag/nfdump/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="BSD" SLOT="0/${PV}" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="debug doc jnat ftconv nfpcapd nfprofile nftrack nsel readpcap sflow" REQUIRED_USE="?? ( jnat nsel )" @@ -29,7 +29,7 @@ RDEPEND=" DEPEND="${RDEPEND}" BDEPEND=" sys-devel/flex - virtual/yacc + app-alternatives/yacc doc? ( app-doc/doxygen media-gfx/graphviz 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 00000000000..eb3758e8db2 --- /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 0c81e02df62..51aab562d73 100644 --- a/net-analyzer/ngrep/metadata.xml +++ b/net-analyzer/ngrep/metadata.xml @@ -16,5 +16,6 @@ </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-r1.ebuild b/net-analyzer/ngrep/ngrep-1.47-r2.ebuild index 4dbf881dcf4..ccfd27b71f0 100644 --- a/net-analyzer/ngrep/ngrep-1.47-r1.ebuild +++ b/net-analyzer/ngrep/ngrep-1.47-r2.ebuild @@ -1,7 +1,7 @@ -# 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 @@ -26,10 +26,16 @@ RDEPEND=" acct-user/ngrep " -PATCHES=( "${FILESDIR}"/${PN}-1.47-regex.patch ) +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 } diff --git a/net-analyzer/nmap/metadata.xml b/net-analyzer/nmap/metadata.xml index 25a70961182..e31f57e3f59 100644 --- a/net-analyzer/nmap/metadata.xml +++ b/net-analyzer/nmap/metadata.xml @@ -9,17 +9,15 @@ <email>dilfridge@gentoo.org</email> <name>Andreas K. Hüttel</name> </maintainer> - <maintainer type="person"> - <email>zlogene@gentoo.org</email> - <name>Mikle Kolyada</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="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="symlink">Install symlink to nc</flag> <flag name="system-lua">Use <pkg>dev-lang/lua</pkg> instead of the bundled liblua</flag> + <flag name="zenmap">Install the GTK+ based nmap GUI, zenmap</flag> </use> <upstream> <remote-id type="github">nmap/nmap</remote-id> diff --git a/net-analyzer/nmap/nmap-7.92-r2.ebuild b/net-analyzer/nmap/nmap-7.92-r2.ebuild index 699b452ebd6..2c418afbe2a 100644 --- a/net-analyzer/nmap/nmap-7.92-r2.ebuild +++ b/net-analyzer/nmap/nmap-7.92-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -13,9 +13,6 @@ if [[ ${PV} == *9999* ]] ; then inherit git-r3 EGIT_REPO_URI="https://github.com/nmap/nmap" - - # Just in case for now as future seems undecided. - LICENSE="NPSL" else VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/nmap.asc inherit verify-sig @@ -25,7 +22,7 @@ else KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" - LICENSE="|| ( NPSL GPL-2 )" + LICENSE="|| ( NPSL-0.92 NPSL-0.95 GPL-2 )" fi SLOT="0" diff --git a/net-analyzer/nmap/nmap-7.93.ebuild b/net-analyzer/nmap/nmap-7.93-r2.ebuild index 7c6ddc0d5bf..0b02e213c5e 100644 --- a/net-analyzer/nmap/nmap-7.93.ebuild +++ b/net-analyzer/nmap/nmap-7.93-r2.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 LUA_COMPAT=( lua5-3 ) LUA_REQ_USE="deprecated" -PYTHON_COMPAT=( python3_{8..11} ) +PYTHON_COMPAT=( python3_{9..11} ) inherit autotools lua-single python-any-r1 toolchain-funcs DESCRIPTION="Network exploration tool and security / port scanner" @@ -22,10 +22,11 @@ else 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" + 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 GPL-2 )" +# https://github.com/nmap/nmap/issues/2199 +LICENSE="|| ( NPSL-0.94 NPSL-0.95 )" SLOT="0" IUSE="ipv6 libssh2 ncat nping +nse ssl symlink +system-lua" REQUIRED_USE=" diff --git a/net-analyzer/nmap/nmap-9999.ebuild b/net-analyzer/nmap/nmap-9999.ebuild index 7fc911c6d87..8617f57210b 100644 --- a/net-analyzer/nmap/nmap-9999.ebuild +++ b/net-analyzer/nmap/nmap-9999.ebuild @@ -1,12 +1,14 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 LUA_COMPAT=( lua5-3 ) LUA_REQ_USE="deprecated" -PYTHON_COMPAT=( python3_{8..11} ) -inherit autotools lua-single python-any-r1 toolchain-funcs +PYTHON_COMPAT=( python3_{9..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/" @@ -25,10 +27,12 @@ else 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 GPL-2 )" +# https://github.com/nmap/nmap/issues/2199 +LICENSE="NPSL-0.95" SLOT="0" -IUSE="ipv6 libssh2 ncat nping +nse ssl symlink +system-lua" +IUSE="ipv6 libssh2 ncat ndiff nping nls +nse ssl symlink +system-lua zenmap" REQUIRED_USE=" + ${PYTHON_REQUIRED_USE} system-lua? ( nse ${LUA_REQUIRED_USE} ) symlink? ( ncat ) " @@ -37,12 +41,14 @@ 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? ( sys-libs/zlib ) - ssl? ( dev-libs/openssl:0= ) + ssl? ( dev-libs/openssl:= ) symlink? ( ncat? ( !net-analyzer/netcat @@ -50,11 +56,18 @@ RDEPEND=" ) ) system-lua? ( ${LUA_DEPS} ) + zenmap? ( + ${PYTHON_DEPS} + $(python_gen_cond_dep ' + dev-python/pygobject:3[${PYTHON_USEDEP}] + ') + ) " DEPEND="${RDEPEND}" BDEPEND=" ${PYTHON_DEPS} virtual/pkgconfig + nls? ( sys-devel/gettext ) " if [[ ${PV} != *9999* ]] ; then @@ -75,17 +88,26 @@ PATCHES=( ) pkg_setup() { - python-any-r1_pkg_setup + python-single-r1_pkg_setup use system-lua && lua-single_pkg_setup } 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}' \ @@ -105,23 +127,27 @@ src_configure() { export ac_cv_path_PYTHON="${PYTHON}" export am_cv_pathless_PYTHON="${EPYTHON}" - # 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="${ESYSROOT}"/usr \ - --without-dpdk \ - --without-ndiff \ - --without-zenmap + local myeconfargs=( + $(use_enable ipv6) + $(use_enable nls) + $(use_with libssh2) + $(use_with ncat) + $(use_with ndiff) + $(use_with nping) + $(use_with ssl openssl) + $(use_with zenmap) + $(usex libssh2 --with-zlib) + $(usex nse --with-liblua=$(usex system-lua yes included '' '') --without-liblua) + $(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() { @@ -146,5 +172,9 @@ src_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/nmbscan/nmbscan-1.2.5-r1.ebuild b/net-analyzer/nmbscan/nmbscan-1.2.5-r1.ebuild index f98da58998d..763b105c51e 100644 --- a/net-analyzer/nmbscan/nmbscan-1.2.5-r1.ebuild +++ b/net-analyzer/nmbscan/nmbscan-1.2.5-r1.ebuild @@ -15,7 +15,7 @@ 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/nrpe/Manifest b/net-analyzer/nrpe/Manifest index b156a037513..f81d01f0091 100644 --- a/net-analyzer/nrpe/Manifest +++ b/net-analyzer/nrpe/Manifest @@ -1,3 +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/nrpe-4.1.0.ebuild b/net-analyzer/nrpe/nrpe-4.1.0.ebuild new file mode 100644 index 00000000000..88306182ea6 --- /dev/null +++ b/net-analyzer/nrpe/nrpe-4.1.0.ebuild @@ -0,0 +1,100 @@ +# Copyright 1999-2022 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/openbsd-netcat/Manifest b/net-analyzer/openbsd-netcat/Manifest index 8d8c74dd8b1..737ca62b79d 100644 --- a/net-analyzer/openbsd-netcat/Manifest +++ b/net-analyzer/openbsd-netcat/Manifest @@ -1,6 +1,6 @@ -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.190-darwin.patch b/net-analyzer/openbsd-netcat/files/openbsd-netcat-1.190-darwin.patch deleted file mode 100644 index 72a3fe8ed9f..00000000000 --- a/net-analyzer/openbsd-netcat/files/openbsd-netcat-1.190-darwin.patch +++ /dev/null @@ -1,86 +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,16 @@ - # 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 - -@@ -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" - -@@ -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"); - } -@@ -1100,6 +1099,8 @@ - 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/openbsd-netcat-1.190.ebuild b/net-analyzer/openbsd-netcat/openbsd-netcat-1.190.ebuild deleted file mode 100644 index 70a973b584c..00000000000 --- a/net-analyzer/openbsd-netcat/openbsd-netcat-1.190.ebuild +++ /dev/null @@ -1,55 +0,0 @@ -# Copyright 1999-2022 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" -KEYWORDS="amd64 arm64 ~ppc64 x86 ~amd64-linux ~x64-macos" - -BDEPEND="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 d82b685da2a..00000000000 --- a/net-analyzer/openbsd-netcat/openbsd-netcat-1.195.ebuild +++ /dev/null @@ -1,55 +0,0 @@ -# Copyright 1999-2022 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" -KEYWORDS="amd64 arm64 ppc64 x86 ~amd64-linux ~x64-macos" - -BDEPEND="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}"/${PN}-1.190-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 index e877bbe04ee..b60dcaa1673 100644 --- a/net-analyzer/openbsd-netcat/openbsd-netcat-1.218_p5.ebuild +++ b/net-analyzer/openbsd-netcat/openbsd-netcat-1.218_p5.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -16,7 +16,7 @@ S="${WORKDIR}"/netcat-openbsd-${MY_PV} LICENSE="BSD" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x64-macos" +KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 ~riscv x86 ~amd64-linux ~x64-macos" RDEPEND=" !net-analyzer/netcat 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 00000000000..df4845a4787 --- /dev/null +++ b/net-analyzer/openbsd-netcat/openbsd-netcat-1.219_p1.ebuild @@ -0,0 +1,69 @@ +# 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 + !net-analyzer/netcat6 + !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.195-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 7dac2d80b69..f305491728b 100644 --- a/net-analyzer/openvas-scanner/Manifest +++ b/net-analyzer/openvas-scanner/Manifest @@ -1,4 +1 @@ -DIST openvas-scanner-20.8.1.tar.gz 431985 BLAKE2B 60b328dc261bf48f37aa2727f4b63904c898467f989abef8f05e29329a24d0d98c13690005c5c7a8c93f899db709771ea60832927f169f6779707a1fac602368 SHA512 6114f37a91a3dd42c3693f10548a7727fb88fbe535ce511b164a440d5ace1c736d4c8a45db9a7e83b9abbd376c4d6b13afd3d23a995a5d089329a2bb8bd71cec DIST openvas-scanner-21.4.4.tar.gz 460601 BLAKE2B 66d627e76912735539399aed637fdc07a7d13c9e4eb142498dcf181b8ea952dd93107bcc1f2ef577126178ff3dad1e5f6e50d67840692cd49f7352e3a726ce8f SHA512 f2fe1f802b14fc41ee0d7657d031d318b651c3ec9ef554b33379a7459d40c17b44525c8f666ccb9670868576c101766936dd0c700778e46683bf43f0683834b6 -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 diff --git a/net-analyzer/openvas-scanner/files/gvm-feed-sync-20.8.1.sh b/net-analyzer/openvas-scanner/files/gvm-feed-sync-20.8.1.sh deleted file mode 100644 index 178f49eb049..00000000000 --- a/net-analyzer/openvas-scanner/files/gvm-feed-sync-20.8.1.sh +++ /dev/null @@ -1,45 +0,0 @@ -#!/bin/sh -# Copyright 1999-2021 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-feed-sync --type GVMD_DATA --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-feed-sync --type SCAP &>/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-feed-sync --type CERT &>/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/gvm-feed-sync.cron b/net-analyzer/openvas-scanner/files/gvm-feed-sync.cron deleted file mode 100644 index 5563b92929b..00000000000 --- 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 ba21632a4d6..00000000000 --- 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-6.0.1-sbin.patch b/net-analyzer/openvas-scanner/files/openvas-scanner-6.0.1-sbin.patch deleted file mode 100644 index d5b8a2a6b62..00000000000 --- 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/openvassd-daemon.conf b/net-analyzer/openvas-scanner/files/openvassd-daemon.conf deleted file mode 100644 index 6bb70d16535..00000000000 --- 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 5dfb8b52745..00000000000 --- 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 9bd7332134f..00000000000 --- 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.service b/net-analyzer/openvas-scanner/files/openvassd.service deleted file mode 100644 index b7d7df8bbab..00000000000 --- 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.conf.example b/net-analyzer/openvas-scanner/files/redis.conf.example deleted file mode 100644 index 6a41211aaae..00000000000 --- 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 d89ae96ec8e..20db261053a 100644 --- a/net-analyzer/openvas-scanner/metadata.xml +++ b/net-analyzer/openvas-scanner/metadata.xml @@ -10,8 +10,6 @@ <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"> diff --git a/net-analyzer/openvas-scanner/openvas-scanner-20.8.1.ebuild b/net-analyzer/openvas-scanner/openvas-scanner-20.8.1.ebuild deleted file mode 100644 index 9dbdf06bee9..00000000000 --- a/net-analyzer/openvas-scanner/openvas-scanner-20.8.1.ebuild +++ /dev/null @@ -1,132 +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 toolchain-funcs - -MY_PN="openvas" -MY_DN="openvassd" - -DESCRIPTION="Open Vulnerability Assessment Scanner" -HOMEPAGE="https://www.greenbone.net/en/ 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="cron extras snmp test" -RESTRICT="!test? ( test )" - -DEPEND=" - acct-group/gvm - acct-user/gvm - app-crypt/gpgme:= - dev-db/redis - dev-libs/glib - dev-libs/libgcrypt:= - dev-libs/libksba - >=net-analyzer/gvm-libs-20.8.0 - snmp? ( 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 )" - -PATCHES=( - "${FILESDIR}"/${PN}-7.0.1-disable-automagic-dep.patch - "${FILESDIR}"/${PN}-7.0.1-fix-linking-with-lld.patch - #qa fix for rpath - "${FILESDIR}"/${P}-rpath-qa-fix.patch -) - -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 - - #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" - "-DBUILD_WITH_SNMP=$(usex snmp)" - ) - 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 - newexe "${FILESDIR}/gvm-feed-sync-${PV}.sh" 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/openvas-scanner/openvas-scanner-6.0.1.ebuild b/net-analyzer/openvas-scanner/openvas-scanner-6.0.1.ebuild deleted file mode 100644 index cabd334cd52..00000000000 --- a/net-analyzer/openvas-scanner/openvas-scanner-6.0.1.ebuild +++ /dev/null @@ -1,135 +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="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 6aae6a5c5fe..00000000000 --- a/net-analyzer/openvas-scanner/openvas-scanner-7.0.1.ebuild +++ /dev/null @@ -1,127 +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 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 snmp 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 - snmp? ( 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 )" - -PATCHES=( - "${FILESDIR}"/${P}-disable-automagic-dep.patch - "${FILESDIR}"/${P}-fix-linking-with-lld.patch -) - -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" - "-DBUILD_WITH_SNMP=$(usex snmp)" - ) - 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/ospd-openvas/ospd-openvas-21.4.4-r4.ebuild b/net-analyzer/ospd-openvas/ospd-openvas-21.4.4-r4.ebuild index a7791ba4ba2..d10742383f6 100644 --- a/net-analyzer/ospd-openvas/ospd-openvas-21.4.4-r4.ebuild +++ b/net-analyzer/ospd-openvas/ospd-openvas-21.4.4-r4.ebuild @@ -1,9 +1,9 @@ -# Copyright 2020-2022 Gentoo Authors +# Copyright 2020-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python3_{8..10} ) +PYTHON_COMPAT=( python3_{9..10} ) DISTUTILS_USE_PEP517=poetry inherit distutils-r1 systemd diff --git a/net-analyzer/packit/Manifest b/net-analyzer/packit/Manifest index 743b4bac828..62512f7495e 100644 --- a/net-analyzer/packit/Manifest +++ b/net-analyzer/packit/Manifest @@ -1,2 +1 @@ -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 d6bfdf6fb74..00000000000 --- 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.7-configure.patch b/net-analyzer/packit/files/packit-1.7-configure.patch deleted file mode 100644 index 0f87f0408d8..00000000000 --- a/net-analyzer/packit/files/packit-1.7-configure.patch +++ /dev/null @@ -1,67 +0,0 @@ -https://github.com/resurrecting-open-source-projects/packit/pull/19 -https://bugs.gentoo.org/816753 - -From 030cdc3f6ded1d206ca16dacc19aef181adba708 Mon Sep 17 00:00:00 2001 -From: Sam James <sam@gentoo.org> -Date: Thu, 14 Oct 2021 08:11:24 +0100 -Subject: [PATCH 1/2] configure.ac: fix autoreconf with newer automake - -Newer automake forbids repeated calls to AM_INIT_AUTOMAKE. - -Bug: https://bugs.gentoo.org/816753 -Signed-off-by: Sam James <sam@gentoo.org> ---- a/configure.ac -+++ b/configure.ac -@@ -29,7 +29,6 @@ - AC_PREREQ([2.69]) - AC_INIT([packit], [1.7], [https://github.com/resurrecting-open-source-projects/packit/issues]) - AC_CONFIG_SRCDIR([src/main.c]) --AM_INIT_AUTOMAKE - AC_CONFIG_HEADERS(config.h) - AC_MSG_RESULT(beginning auto-configuration process for packit...) - AC_PREFIX_DEFAULT(/usr/local) - -From f62d3d40ff99ac39e7cbdea9991bec639a16d3a0 Mon Sep 17 00:00:00 2001 -From: Sam James <sam@gentoo.org> -Date: Thu, 14 Oct 2021 08:12:14 +0100 -Subject: [PATCH 2/2] configure.ac: don't ignore failure to find packages - -Signed-off-by: Sam James <sam@gentoo.org> ---- a/configure.ac -+++ b/configure.ac -@@ -146,7 +146,7 @@ AC_CHECK_HEADERS(libnet.h,, LIBNET="no") - if test "$LIBNET" = "no"; then - echo "" - echo "Error: Can't find libnet 1.1.0 or greater. Visit https://github.com/sam-github/libnet for the latest version." -- exit; -+ exit 1; - fi - - AC_ARG_WITH(libpcap_includes, -@@ -161,7 +161,7 @@ AC_CHECK_HEADERS(pcap.h,, LIBPCAP="no") - if test "$LIBNET" = "no"; then - echo "" - echo "Error: Can't find Libpcap. Visit https://github.com/the-tcpdump-group/libpcap for the latest version." -- exit; -+ exit 1; - fi - - dnl Checks for library functions. -@@ -181,7 +181,7 @@ AC_CHECK_LIB(net, libnet_build_ipv4,, LIBNET="no") - if test "$LIBNET" = "no"; then - echo "" - echo "Error: Can't find libnet 1.1.0 or greater. Visit https://github.com/sam-github/libnet for the latest version." -- exit; -+ exit 1; - fi - - AC_ARG_WITH(libpcap_libraries, -@@ -196,7 +196,7 @@ AC_CHECK_LIB(pcap, pcap_open_live,, LIBPCAP="no") - if test "$LIBPCAP" = "no"; then - echo "" - echo "Error: Can't find Libpcap. Visit https://github.com/the-tcpdump-group/libpcap for the latest version." -- exit; -+ exit 1; - else - AC_CHECK_LIB(pcap, pcap_setnonblock,, SETNONBLOCK="no") - if test "$SETNONBLOCK" = "no"; then diff --git a/net-analyzer/packit/metadata.xml b/net-analyzer/packit/metadata.xml index dce3f3be66c..fc9bbe0d2a6 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 "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.7.ebuild b/net-analyzer/packit/packit-1.7.ebuild deleted file mode 100644 index a1576a6b050..00000000000 --- a/net-analyzer/packit/packit-1.7.ebuild +++ /dev/null @@ -1,34 +0,0 @@ -# Copyright 1999-2021 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.7-configure.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 index 77ed5d2691a..4e1f8358e69 100644 --- a/net-analyzer/packit/packit-1.8.ebuild +++ b/net-analyzer/packit/packit-1.8.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://github.com/resurrecting-open-source-projects/packit/archive/${P LICENSE="GPL-2" 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/libnet:1.1 net-libs/libpcap" diff --git a/net-analyzer/packit/packit-9999.ebuild b/net-analyzer/packit/packit-9999.ebuild deleted file mode 100644 index d58eaf300f8..00000000000 --- 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 index 9cce41e4841..479aaeec520 100644 --- a/net-analyzer/pathload/files/pathload-1.3.2-clang16.patch +++ b/net-analyzer/pathload/files/pathload-1.3.2-clang16.patch @@ -8,3 +8,27 @@ https://bugs.gentoo.org/870661 -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/pinger/files/pinger-0.33-clang16.patch b/net-analyzer/pinger/files/pinger-0.33-clang16.patch new file mode 100644 index 00000000000..1a6fe6cf03d --- /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/pinger-0.33-r1.ebuild b/net-analyzer/pinger/pinger-0.33-r1.ebuild index 32bfd97f82a..38ed420ff7d 100644 --- a/net-analyzer/pinger/pinger-0.33-r1.ebuild +++ b/net-analyzer/pinger/pinger-0.33-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -35,6 +35,7 @@ DOCS=( AUTHORS BUGS ChangeLog NEWS README ) PATCHES=( "${FILESDIR}"/${P}-gentoo.patch "${FILESDIR}"/${P}-musl-int-types.patch + "${FILESDIR}"/${P}-clang16.patch ) src_prepare() { diff --git a/net-analyzer/pmacct/Manifest b/net-analyzer/pmacct/Manifest index 17b03eeb9f4..8c016cfe1db 100644 --- a/net-analyzer/pmacct/Manifest +++ b/net-analyzer/pmacct/Manifest @@ -1 +1,2 @@ DIST pmacct-1.7.7.tar.gz 2149629 BLAKE2B 00357cbf1f52452c4a9ee9807e2c18f823019521cc9cb99553fe262826d7343e286694d666c7bab59e62767598ff373b3abafbecfdd43a823ba8784777740643 SHA512 7bc4c48041f023b5cd7ba927722478b0008d751bdb679f44beb2b281f4b16cb0bafb211d0fb947516ca80f86082f1bce578973ec298f4947ffd9d063a44bd00b +DIST pmacct-1.7.8.tar.gz 2175335 BLAKE2B 1b95d48c479d59f2d4a7654e870e6f61c984c57c31aebbfb9fbf86f2d1027cde6a0f334489f33186bbb19ee7bdf94726f0053faa4829273de2d1975f58dff97f SHA512 df576644688ddb1957aa1583b101b96d86ab404c1416e0709b1bc85d691d13841bdb92a37a4526bc9273101dd11e3134d2fb35c06d2cbcde8e5bf7e84751a1c2 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 00000000000..71672082461 --- /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 index 55db903b6ab..71672082461 100644 --- a/net-analyzer/pmacct/pmacct-9999.ebuild +++ b/net-analyzer/pmacct/pmacct-9999.ebuild @@ -7,6 +7,7 @@ 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 @@ -84,6 +85,7 @@ src_configure() { $(use_enable zmq) --without-external-deps + --disable-ebpf --disable-debug --disable-mongodb ) @@ -94,6 +96,7 @@ src_configure() { src_install() { default + local dirname for dirname in examples sql telemetry; do docinto ${dirname} dodoc -r ${dirname}/* diff --git a/net-analyzer/pnp4nagios/Manifest b/net-analyzer/pnp4nagios/Manifest index e33adf3e6b1..b4ecca13885 100644 --- a/net-analyzer/pnp4nagios/Manifest +++ b/net-analyzer/pnp4nagios/Manifest @@ -1 +1 @@ -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 diff --git a/net-analyzer/pnp4nagios/files/pnp4nagios-0.6.26-magic-quotes.patch b/net-analyzer/pnp4nagios/files/pnp4nagios-0.6.26-magic-quotes.patch deleted file mode 100644 index 7f1d8ae0cf5..00000000000 --- a/net-analyzer/pnp4nagios/files/pnp4nagios-0.6.26-magic-quotes.patch +++ /dev/null @@ -1,23 +0,0 @@ -# https://github.com/lingej/pnp4nagios/commit/08ce9e26171b888c8e3b036b6693fd8f751970a8 -diff --git a/lib/kohana/system/libraries/Input.php b/lib/kohana/system/libraries/Input.php -index 0e23c80..b0b24f8 100644 ---- a/lib/kohana/system/libraries/Input.php -+++ b/lib/kohana/system/libraries/Input.php -@@ -54,14 +54,14 @@ public function __construct() - if (Input::$instance === NULL) - { - // magic_quotes_runtime is enabled -- if (get_magic_quotes_runtime()) -+ if (function_exists('get_magic_quotes_runtime')) - { -- set_magic_quotes_runtime(0); -+ ini_set('magic_quotes_runtime', 0); - Kohana::log('debug', 'Disable magic_quotes_runtime! It is evil and deprecated: http://php.net/magic_quotes'); - } - - // magic_quotes_gpc is enabled -- if (get_magic_quotes_gpc()) -+ if (function_exists('get_magic_quotes_gpc')) - { - $this->magic_quotes_gpc = TRUE; - Kohana::log('debug', 'Disable magic_quotes_gpc! It is evil and deprecated: http://php.net/magic_quotes'); diff --git a/net-analyzer/pnp4nagios/files/pnp4nagios-0.6.26-sizeof.patch b/net-analyzer/pnp4nagios/files/pnp4nagios-0.6.26-sizeof.patch deleted file mode 100644 index 360b4be4f76..00000000000 --- a/net-analyzer/pnp4nagios/files/pnp4nagios-0.6.26-sizeof.patch +++ /dev/null @@ -1,357 +0,0 @@ -# https://github.com/lingej/pnp4nagios/commit/d5e04540d52238dfcb877d7116316ba1be8c1963 -diff --git a/share/pnp/application/controllers/ajax.php b/share/pnp/application/controllers/ajax.php -index 9e0428d..c5f89e2 100644 ---- a/share/pnp/application/controllers/ajax.php -+++ b/share/pnp/application/controllers/ajax.php -@@ -59,7 +59,7 @@ public function basket($action=FALSE){ - - if($action == "list"){ - $basket = $this->session->get("basket"); -- if(is_array($basket) && sizeof($basket) > 0){ -+ if(is_array($basket) && (!empty($basket))){ - foreach($basket as $item){ - printf("<li class=\"ui-state-default %s\" id=\"%s\"><a title=\"%s\" id=\"%s\"><img width=12px height=12px src=\"%smedia/images/remove.png\"></a>%s</li>\n", - "basket_action_remove", -@@ -135,7 +135,7 @@ public function basket($action=FALSE){ - echo "Action $action not known"; - } - $basket = $this->session->get("basket"); -- if(is_array($basket) && sizeof($basket) == 0){ -+ if(is_array($basket) && empty($basket)){ - echo Kohana::lang('common.basket-empty'); - }else{ - echo "<div align=\"center\" class=\"p2\">\n"; -diff --git a/share/pnp/application/controllers/image.php b/share/pnp/application/controllers/image.php -index b41ca83..869435c 100644 ---- a/share/pnp/application/controllers/image.php -+++ b/share/pnp/application/controllers/image.php -@@ -47,7 +47,7 @@ public function index() - $this->rrdtool->streamImage("ERROR: NOT_AUTHORIZED"); - - #print Kohana::debug($this->data->STRUCT); -- if(sizeof($this->data->STRUCT) > 0){ -+ if(!empty($this->data->STRUCT)){ - $image = $this->rrdtool->doImage($this->data->STRUCT[0]['RRD_CALL']); - }else{ - $image = FALSE; -diff --git a/share/pnp/application/controllers/page.php b/share/pnp/application/controllers/page.php -index 7bd877e..fcfffe8 100644 ---- a/share/pnp/application/controllers/page.php -+++ b/share/pnp/application/controllers/page.php -@@ -58,7 +58,7 @@ public function index(){ - - public function basket(){ - $basket = $this->session->get("basket"); -- if(is_array($basket) && sizeof($basket) > 0){ -+ if(is_array($basket) && (!empty($basket))){ - $this->data->buildBasketStruct($basket,$this->view); - $this->template->page->basket_box = $this->add_view('basket_box'); - $this->template->page->header->title = Kohana::lang('common.page-basket'); -diff --git a/share/pnp/application/controllers/pdf.php b/share/pnp/application/controllers/pdf.php -index 15f2ab4..d590859 100644 ---- a/share/pnp/application/controllers/pdf.php -+++ b/share/pnp/application/controllers/pdf.php -@@ -202,7 +202,7 @@ public function basket(){ - } - $this->data->getTimeRange($this->start,$this->end,$this->view); - $basket = $this->session->get("basket"); -- if(is_array($basket) && sizeof($basket) > 0){ -+ if(is_array($basket) && (!empty($basket))){ - $this->data->buildBasketStruct($basket,$this->view); - } - //echo Kohana::debug($this->data->STRUCT); -diff --git a/share/pnp/application/helpers/rrd.php b/share/pnp/application/helpers/rrd.php -index 81bb257..ea9f99b 100644 ---- a/share/pnp/application/helpers/rrd.php -+++ b/share/pnp/application/helpers/rrd.php -@@ -207,7 +207,7 @@ public static function gprint($vname=FALSE, $cf="AVERAGE", $text="%6.2lf %s"){ - if(is_array($cf)){ - foreach($cf as $key => $val){ - $line .= sprintf("GPRINT:%s:%s:",$vname,$val); -- if($key == sizeof($cf)-1){ -+ if($key == count($cf)-1){ - $line .= '"'.$text.' '.ucfirst(strtolower($val)).'\\l" '; - }else{ - $line .= '"'.$text.' '.ucfirst(strtolower($val)).'" '; -@@ -234,7 +234,7 @@ public static function gprinta($vname=FALSE, $cf="AVERAGE", $text="%6.2lf %s", $ - if(is_array($cf)){ - foreach($cf as $key => $val){ - $line .= sprintf("GPRINT:%s:%s:",$vname,$val); -- if(($key == sizeof($cf)-1)and($align != "")){ -+ if(($key == count($cf)-1)and($align != "")){ - $line .= '"'.$text.' '.ucfirst(strtolower($val)).$align.'" '; - }else{ - $line .= '"'.$text.' '.ucfirst(strtolower($val)).'" '; -diff --git a/share/pnp/application/lib/json.php b/share/pnp/application/lib/json.php -index 0cddbdd..d0e3171 100644 ---- a/share/pnp/application/lib/json.php -+++ b/share/pnp/application/lib/json.php -@@ -375,7 +375,7 @@ function encode($var) - */ - - // treat as a JSON object -- if (is_array($var) && count($var) && (array_keys($var) !== range(0, sizeof($var) - 1))) { -+ if (is_array($var) && count($var) && (array_keys($var) !== range(0, count($var) - 1))) { - $properties = array_map(array($this, 'name_value'), - array_keys($var), - array_values($var)); -diff --git a/share/pnp/application/models/auth.php b/share/pnp/application/models/auth.php -index 77f28d2..11d785a 100644 ---- a/share/pnp/application/models/auth.php -+++ b/share/pnp/application/models/auth.php -@@ -116,11 +116,7 @@ public function is_authorized($host = FALSE, $service = NULL){ - $result = $this->queryLivestatus($query); - } - -- if(sizeof($result) > 0){ -- return TRUE; -- }else{ -- return FALSE; -- } -+ return (!empty($result)); - } - - -diff --git a/share/pnp/application/models/config.php b/share/pnp/application/models/config.php -index 44e3d12..7a6b8e0 100644 ---- a/share/pnp/application/models/config.php -+++ b/share/pnp/application/models/config.php -@@ -68,7 +68,7 @@ public function read_config(){ - $views = array(); - include ($config_file); - $array_b = $views; -- if(sizeof($views) == 0 ){ -+ if(empty($views)){ - $views = $array_a; - } - } -diff --git a/share/pnp/application/models/data.php b/share/pnp/application/models/data.php -index 63b0e24..74e8821 100644 ---- a/share/pnp/application/models/data.php -+++ b/share/pnp/application/models/data.php -@@ -45,11 +45,11 @@ public function getSpecialTemplates(){ - } - } - } -- if(sizeof($templates) > 0){ -+ if(empty($templates)){ -+ return FALSE; -+ }else{ - sort($templates); - return $templates; -- }else{ -- return FALSE; - } - } - -@@ -97,7 +97,9 @@ public function getHosts() { - throw new Kohana_User_Exception('Perfdata Dir', "Can not open $path"); - } - } -- if(sizeof($hosts)>0){ -+ if(empty($hosts)){ -+ throw new Kohana_Exception('error.perfdata-dir-empty', $conf['rrdbase'] ); -+ }else{ - # Obtain a list of columns - foreach ($hosts as $key => $row) { - $sort[$key] = $row['sort']; -@@ -105,8 +107,6 @@ public function getHosts() { - # Sort the data with volume descending, edition ascending - # Add $data as the last parameter, to sort by the common key - array_multisort($sort, SORT_ASC, $hosts); -- }else{ -- throw new Kohana_Exception('error.perfdata-dir-empty', $conf['rrdbase'] ); - } - return $hosts; - } -@@ -147,7 +147,7 @@ function getRawServices($hostname) { - }else{ - throw new Kohana_Exception('error.perfdata-dir-for-host', $path, $hostname ); - } -- if( is_array($services) && sizeof($services) > 0){ -+ if( is_array($services) && (!empty($services))){ - # Obtain a list of columns - foreach ($services as $key => $row) { - $sort[$key] = $row['name']; -@@ -205,7 +205,7 @@ function getServices($hostname) { - $i++; - } - #print Kohana::debug($services); -- if( is_array($services) && sizeof($services) > 0){ -+ if( is_array($services) && (!empty($services))){ - # Obtain a list of columns - foreach ($services as $key => $row) { - $sort[$key] = $row['sort']; -@@ -214,7 +214,7 @@ function getServices($hostname) { - # Add $data as the last parameter, to sort by the common key - array_multisort($sort, SORT_STRING, $services); - } -- if(is_array($host) && sizeof($host) > 0 ){ -+ if(is_array($host) && (!empty($host))){ - array_unshift($services, $host[0]); - } - return $services; -@@ -232,7 +232,7 @@ public function getFirstService($hostname) { - break; - } - } -- if(sizeof($srv) == 0){ -+ if(empty($srv)){ - throw new Kohana_Exception('error.get-first-service', $hostname ); - } - return $srv['name']; -@@ -250,7 +250,7 @@ public function getFirstHost() { - break; - } - } -- if(sizeof($host) == 0){ -+ if(empty($host)){ - throw new Kohana_Exception('error.get-first-host'); - } - return $host['name']; -@@ -693,7 +693,7 @@ public function getTimeRange($start=FALSE ,$end=FALSE ,$view="") { - } - - $view=intval( pnp::clean($view) ); -- if($view >= sizeof($this->config->views)){ -+ if($view >= count($this->config->views)){ - $view = 1; - } - -@@ -735,7 +735,7 @@ public function getTimeRange($start=FALSE ,$end=FALSE ,$view="") { - $timerange['f_end'] = date($this->config->conf['date_fmt'],$end); - $timerange['cmd'] = " --start $start --end $end "; - $timerange['type'] = "views"; -- for ($i = 0; $i < sizeof($this->config->views); $i++) { -+ for ($i = 0; $i < count($this->config->views); $i++) { - $timerange[$i]['title'] = $this->config->views[$i]['title']; - $timerange[$i]['start'] = $end - $this->config->views[$i]['start']; - $timerange[$i]['f_start'] = date($this->config->conf['date_fmt'],$end - $this->config->views[$i]['start']); -@@ -747,7 +747,7 @@ public function getTimeRange($start=FALSE ,$end=FALSE ,$view="") { - } - - public function buildBasketStruct($basket,$view = NULL){ -- if(is_array($basket) && sizeof($basket) > 0){ -+ if(is_array($basket) && (!empty($basket))){ - if($view == ""){ - $views = array_keys($this->config->views); - }else{ -@@ -757,9 +757,9 @@ public function buildBasketStruct($basket,$view = NULL){ - foreach($basket as $item){ - # explode host::service::source - $slices = explode("::",$item); -- if(sizeof($slices) == 2) -+ if(count($slices) == 2) - $this->buildDataStruct($slices[0], $slices[1], $view); -- if(sizeof($slices) == 3) -+ if(count($slices) == 3) - $this->buildDataStruct($slices[0], $slices[1], $view, $slices[2]); - } - # break on custom time ranges -@@ -806,12 +806,12 @@ public function buildPageStruct($page,$view){ - } - } - #print Kohana::debug($servicelist); -- if(sizeof($servicelist) > 0 ){ -+ if(empty($servicelist)){ -+ $this->ERROR = "ERROR: ". Kohana::lang('error.no-data-for-page', $page.".cfg" ); -+ }else{ - foreach($servicelist as $s){ - $this->buildDataStruct($s['host'],$s['service'],$view,$s['source']); - } -- }else{ -- $this->ERROR = "ERROR: ". Kohana::lang('error.no-data-for-page', $page.".cfg" ); - } - } - -@@ -962,11 +962,11 @@ public function getPages() { - die("Cannot open directory: $path"); - } - } -- if(sizeof($pages)>0){ -+ if(empty($pages)){ -+ return FALSE; -+ }else{ - - natsort($pages); -- }else{ -- return FALSE; - } - return $pages; - } -@@ -976,10 +976,10 @@ public function getPages() { - */ - public function getFirstPage(){ - $pages = $this->getPages(); -- if(sizeof($pages) > 0 ){ -- return urldecode($pages[0]); -- }else{ -+ if(empty($pages)){ - return FALSE; -+ }else{ -+ return urldecode($pages[0]); - } - } - -@@ -1093,7 +1093,7 @@ public function tplGetServices ($hostregex=FALSE, $serviceregex = ''){ - } - } - -- if(sizeof($new_hosts) == 0){ -+ if(empty($new_hosts)){ - throw new Kohana_Exception('error.tpl-no-hosts-found', $hostregex); - } - -@@ -1101,7 +1101,7 @@ public function tplGetServices ($hostregex=FALSE, $serviceregex = ''){ - $new_services = array(); - foreach($new_hosts as $host){ - $services = $this->getRawServices($host); -- if(sizeof($services) == 0){ -+ if(empty($services)){ - throw new Kohana_Exception('error.tpl-no-services-found', $serviceregex); - } - foreach($services as $service){ -@@ -1115,7 +1115,7 @@ public function tplGetServices ($hostregex=FALSE, $serviceregex = ''){ - } - } - -- if(sizeof($new_services) == 0){ -+ if(empty($new_services)){ - throw new Kohana_Exception('error.tpl-no-services-found', $serviceregex); - } - -diff --git a/share/pnp/application/views/basket_box.php b/share/pnp/application/views/basket_box.php -index ea8a72c..2a4e0e6 100644 ---- a/share/pnp/application/views/basket_box.php -+++ b/share/pnp/application/views/basket_box.php -@@ -6,7 +6,7 @@ - echo Kohana::lang('common.basket-box-header')."</div>\n"; - echo "<div class=\"p4 ui-widget-content ui-corner-bottom\">\n"; - echo "<div id=\"basket_items\">\n"; --if(is_array($basket) && sizeof($basket) > 0 ){ -+if(is_array($basket) && !empty($basket)){ - foreach($basket as $key=>$item){ - echo "<li class=\"ui-state-default basket_action_remove\" id=\"". - $item."\"><a title=\"".Kohana::lang('common.basket-remove', $item)."\"". -@@ -16,7 +16,7 @@ - pnp::shorten($item)."</li>\n"; - } - } --if(is_array($basket) && sizeof($basket) > 0 ){ -+if(is_array($basket) && !empty($basket)){ - echo "<div align=\"center\" class=\"p2\">\n"; - echo "<button id=\"basket-show\">".Kohana::lang('common.basket-show')."</button>\n"; - echo "<button id=\"basket-clear\">".Kohana::lang('common.basket-clear')."</button>\n"; -diff --git a/share/pnp/templates.dist/pnp-runtime.php b/share/pnp/templates.dist/pnp-runtime.php -index 21c4ae3..a668fdc 100644 ---- a/share/pnp/templates.dist/pnp-runtime.php -+++ b/share/pnp/templates.dist/pnp-runtime.php -@@ -34,7 +34,7 @@ - # - $ds_name[2] = "Errors and updates"; - $def[2] = ''; --for($i=2; $i <= sizeof($DS); $i++) { -+for($i=2; $i <= count($DS); $i++) { - $def[2] .= rrd::def("var$i", $RRDFILE[$i], $DS[$i] , "AVERAGE") ; - $def[2] .= rrd::line1("var$i", rrd::color($i), rrd::cut(ucfirst($LABEL[$i]),12) ); - $def[2] .= rrd::gprint("var$i", array('LAST', 'MAX', 'AVERAGE'), "%4.0lf$UNIT[$i]"); 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 00000000000..21f9c89ed94 --- /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 00000000000..2407bb6c51e --- /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/pnp4nagios-0.6.26-r11.ebuild b/net-analyzer/pnp4nagios/pnp4nagios-0.6.26_p20221106.ebuild index 043414bfa90..3df8d7c6aed 100644 --- a/net-analyzer/pnp4nagios/pnp4nagios-0.6.26-r11.ebuild +++ b/net-analyzer/pnp4nagios/pnp4nagios-0.6.26_p20221106.ebuild @@ -1,11 +1,13 @@ # Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 DESCRIPTION="A performance data analyzer for nagios" HOMEPAGE="http://www.pnp4nagios.org/" -SRC_URI="mirror://sourceforge/${PN}/PNP-0.6/${P}.tar.gz" +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" @@ -17,11 +19,15 @@ 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 )" +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 @@ -29,28 +35,32 @@ 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 - media-fonts/dejavu apache2? ( >=www-servers/apache-2.4[${APACHE_MODS}] )" PATCHES=( "${FILESDIR}/${PN}-0.6.14-makefile.patch" - "${FILESDIR}/${PN}-0.6.26-magic-quotes.patch" - "${FILESDIR}/${PN}-0.6.26-sizeof.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 - 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}" \ + 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() { @@ -64,8 +74,8 @@ src_install() { 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" + 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 @@ -96,7 +106,7 @@ src_install() { 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 "${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" diff --git a/net-analyzer/prelude-correlator/Manifest b/net-analyzer/prelude-correlator/Manifest deleted file mode 100644 index cc6b68131e9..00000000000 --- a/net-analyzer/prelude-correlator/Manifest +++ /dev/null @@ -1 +0,0 @@ -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 cdb55dfbac9..00000000000 --- 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 6e75689ca03..00000000000 --- 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 8bec03f7870..00000000000 --- 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 7b763c30c13..00000000000 --- 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 e5b33cb13b4..00000000000 --- a/net-analyzer/prelude-correlator/metadata.xml +++ /dev/null @@ -1,14 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <!-- maintainer-needed --> - <longdescription lang="en"> - 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.2.0.ebuild b/net-analyzer/prelude-correlator/prelude-correlator-5.2.0.ebuild deleted file mode 100644 index e317719f5e8..00000000000 --- a/net-analyzer/prelude-correlator/prelude-correlator-5.2.0.ebuild +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{8..10} ) - -inherit distutils-r1 systemd tmpfiles - -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/${PV}/${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" - newtmpfiles "${FILESDIR}/${PN}.run" "${PN}.conf" - - newinitd "${FILESDIR}/${PN}.initd" "${PN}" -} - -pkg_postinst() { - tmpfiles_process ${PN}.conf -} diff --git a/net-analyzer/prelude-lml-rules/Manifest b/net-analyzer/prelude-lml-rules/Manifest deleted file mode 100644 index 258928ff65d..00000000000 --- a/net-analyzer/prelude-lml-rules/Manifest +++ /dev/null @@ -1 +0,0 @@ -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 fcf1cd64f68..00000000000 --- a/net-analyzer/prelude-lml-rules/metadata.xml +++ /dev/null @@ -1,5 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <!-- maintainer-needed --> - </pkgmetadata> 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 e93bb67f978..00000000000 --- 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 621a92c59ab..00000000000 --- a/net-analyzer/prelude-lml/Manifest +++ /dev/null @@ -1 +0,0 @@ -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 dab4ea8a6bb..00000000000 --- 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/messag |